code cleanup

Author: forman

dashi/src/lib/utils/fetchApiResult.ts

@@ -38,7 +38,11 @@ export async function fetchApiResult<T, P extends unknown[]>(
   }
 }
 
-export async function callApi<T>(url: string, init?: RequestInit): Promise<T> {
+export async function callApi<T, RT = T>(
+  url: string,
+  init?: RequestInit,
+  transform?: (data: RT) => T,
+): Promise<T> {
   const response = await fetch(url, init);
   const apiResponse = await response.json();
   if (typeof apiResponse === "object") {
@@ -52,7 +56,7 @@ export async function callApi<T>(url: string, init?: RequestInit): Promise<T> {
       });
     }
     if (hasOwnProperty(apiResponse, "result")) {
-      return apiResponse.result;
+      return transform ? transform(apiResponse.result) : apiResponse.result;
     }
   }
   throw new ApiException({ message: `unexpected response from ${url}` });

dashi/src/lib/utils/isObject.ts

@@ -0,0 +1,5 @@
+export function isObject(
+  value: unknown,
+): value is { [key: string | number]: unknown } {
+  return typeof value === "object" && value !== null;
+}

dashi/src/lib/utils/objPath.ts

@@ -1,10 +1,14 @@
+import { isObject } from "@/lib/utils/isObject";
+
 export type ObjPath = (string | number)[];
 
+type Obj = Record<string | number, unknown>;
+
 export function getValue(obj: object, path: ObjPath): unknown {
   let value: unknown = obj;
   for (const key of path) {
-    if (typeof value === "object") {
-      value = (value as unknown as Record<string, unknown>)[key];
+    if (isObject(value)) {
+      value = (value as Obj)[key];
     } else {
       return undefined;
     }
@@ -21,41 +25,36 @@ export function setValue<S extends object>(
 }
 
 export function _setValue<S extends object>(
-  obj: S,
+  obj: S | undefined,
   path: ObjPath,
   value: unknown,
 ): S | undefined {
   if (path.length === 1) {
     const key = path[0];
-    if (typeof obj === "object") {
+    if (isObject(obj)) {
       const oldValue = obj[key];
       if (value === oldValue) {
         return obj;
       }
-      const newObj = Array.isArray(obj)
-        ? ([...obj] as unknown[])
-        : ({ ...obj } as Record<string, unknown>);
+      const newObj = (Array.isArray(obj) ? [...obj] : { ...obj }) as Obj;
       newObj[key] = value;
       return newObj as S;
     } else if (obj === undefined) {
-      const newObj =
-        typeof key === "number"
-          ? ([] as unknown[])
-          : ({} as Record<string, unknown>);
+      const newObj = (typeof key === "number" ? [] : {}) as Obj;
       newObj[key] = value;
       return newObj as S;
     }
   } else if (path.length > 1) {
-    if (typeof obj === "object") {
+    if (isObject(obj)) {
       const key = path[0];
       const subObj = obj[key];
-      const newSubObj = setValue(subObj, path.slice(1), value);
-      if (subObj !== newSubObj) {
-        const newObj = Array.isArray(obj)
-          ? ([...obj] as unknown[])
-          : ({ ...obj } as Record<string, unknown>);
-        newObj[key] = newSubObj;
-        return newObj as S;
+      if (isObject(subObj) || subObj === undefined) {
+        const newSubObj = _setValue(subObj, path.slice(1), value);
+        if (subObj !== newSubObj) {
+          const newObj = (Array.isArray(obj) ? [...obj] : { ...obj }) as Obj;
+          newObj[key] = newSubObj;
+          return newObj as S;
+        }
       }
     }
   }