From 5471672ee5636dbb0a1d82d2809d94100fc8675a Mon Sep 17 00:00:00 2001
From: hide_d <hided62@gmail.com>
Date: Wed, 29 Dec 2021 05:46:35 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20APIPathGen=20=EC=B6=94=EC=83=81?=
 =?UTF-8?q?=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hwe/ts/SammoAPI.ts        | 11 +++++++++--
 hwe/ts/SammoRootAPI.ts    |  9 ++++++++-
 hwe/ts/util/APIPathGen.ts | 26 ++++++--------------------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/hwe/ts/SammoAPI.ts b/hwe/ts/SammoAPI.ts
index 31f9dada..db2338c9 100644
--- a/hwe/ts/SammoAPI.ts
+++ b/hwe/ts/SammoAPI.ts
@@ -7,7 +7,7 @@ async function done<ResultType extends ValidResponse>(args?: Record<string, unkn
 async function done<ResultType extends ValidResponse>(args: Record<string, unknown> | undefined, returnError: false): Promise<ResultType>;
 async function done<ResultType extends ValidResponse, ErrorType extends InvalidResponse>(args: Record<string, unknown> | undefined, returnError: true): Promise<ResultType | ErrorType>;
 
-async function done<ResultType extends ValidResponse, ErrorType extends InvalidResponse>(args?: Record<string, unknown>, returnError = false): Promise<ResultType | ErrorType>{
+async function done<ResultType extends ValidResponse, ErrorType extends InvalidResponse>(args?: Record<string, unknown>, returnError = false): Promise<ResultType | ErrorType> {
     console.error(`Can't directly call. ${args}, ${returnError}. Use auto-generated path API.`);
     return callSammoAPI<ResultType, ErrorType>([], args, true);
 }
@@ -43,4 +43,11 @@ const apiRealPath = {
     },
 } as const;
 
-export const SammoAPI = APIPathGen(apiRealPath);
\ No newline at end of file
+export const SammoAPI = APIPathGen<typeof done, typeof apiRealPath>(apiRealPath, (path: string[]) => {
+    return (args?: Record<string, unknown>, returnError?: boolean) => {
+        if (returnError) {
+            return callSammoAPI(path.join('/'), args, true);
+        }
+        return callSammoAPI(path.join('/'), args);
+    };
+});
\ No newline at end of file
diff --git a/hwe/ts/SammoRootAPI.ts b/hwe/ts/SammoRootAPI.ts
index 4fb8a075..fe3f5413 100644
--- a/hwe/ts/SammoRootAPI.ts
+++ b/hwe/ts/SammoRootAPI.ts
@@ -20,4 +20,11 @@ const apiRealPath = {
     },
 } as const;
 
-export const SammoRootAPI = APIPathGen(apiRealPath);
\ No newline at end of file
+export const SammoRootAPI = APIPathGen<typeof done, typeof apiRealPath>(apiRealPath, (path: string[]) => {
+    return (args?: Record<string, unknown>, returnError?: boolean) => {
+        if (returnError) {
+            return callSammoAPI(path.join('/'), args, true);
+        }
+        return callSammoAPI(path.join('/'), args);
+    };
+});
\ No newline at end of file
diff --git a/hwe/ts/util/APIPathGen.ts b/hwe/ts/util/APIPathGen.ts
index 7ba5bed7..eee9c623 100644
--- a/hwe/ts/util/APIPathGen.ts
+++ b/hwe/ts/util/APIPathGen.ts
@@ -1,40 +1,26 @@
-import { InvalidResponse } from "@/defs";
-import { callSammoAPI, ValidResponse } from "./callSammoAPI";
+type SubValue<V extends (...args: unknown[]) => unknown> = V | { [property: string]: SubValue<V> };
 
-export type CurryCall<ResultType extends ValidResponse, ErrorType extends InvalidResponse> =
-    ((args?: Record<string, unknown>) => Promise<ResultType>)
-    | ((args: Record<string, unknown> | undefined, returnError: false) => Promise<ResultType>)
-    | ((args: Record<string, unknown> | undefined, returnError: true) => Promise<ResultType | ErrorType>);
-
-type SubValue<ResultType extends ValidResponse, ErrorType extends InvalidResponse> = CurryCall<ResultType, ErrorType> | { [property: string]: SubValue<ResultType, ErrorType> };
-
-export function APIPathGen<ResultType extends ValidResponse, ErrorType extends InvalidResponse, T extends { [property: string]: SubValue<ResultType, ErrorType> },>(obj: T, path?: string[]): T {
+export function APIPathGen<V extends () => unknown, T extends { [property: string]: SubValue<V> }>(obj: T, callback: (path: string[]) => V, path?: string[]): T {
     return new Proxy(obj, {
         get(target, key: string) {
             let nextPath: string[];
             if (path === undefined) {
                 nextPath = [key];
             }
-            else{
+            else {
                 nextPath = path;
                 nextPath.push(key);
             }
 
             if (!(key in target)) {
-                throw `${nextPath.join('/')} is not exists`;
+                throw `${nextPath} is not exists`;
             }
 
             const next = target[key];
             if (typeof (next) === 'function') {
-                const callAPI: CurryCall<ResultType, ErrorType> = (args: Record<string, unknown> | undefined, returnError?: boolean) => {
-                    if (returnError) {
-                        return callSammoAPI<ResultType, ErrorType>(nextPath.join('/'), args, returnError);
-                    }
-                    return callSammoAPI<ResultType>(nextPath.join('/'), args, false);
-                }
-                return callAPI;
+                return callback(nextPath);
             }
-            return APIPathGen(next, nextPath);
+            return APIPathGen(next, callback, nextPath);
         }
     })
 }
\ No newline at end of file