fix: check nullable for snakeToCamel

packages/api-server/src/base/gw-config.ts

@@ -394,6 +394,7 @@ function toConfigEoaScripts(nodeInfo: NodeInfo) {
 }
 
 function toApiNodeInfo(nodeInfo: GwNodeInfo): NodeInfo {
+  // todo: use determinable converting to replace snakeToCamel
   return snakeToCamel(nodeInfo, ["code_hash", "hash_type"]);
 }
 

packages/api-server/src/util.ts

@@ -28,7 +28,17 @@ export function toSnake(s: string) {
   return s.replace(/[A-Z]/g, (letter) => `_${letter.toLowerCase()}`);
 }
 
-// convert object key snake_name => camelName
+export function isObjectOrArray(obj: any) {
+  if (
+    Object.prototype.toString.call(obj) === "[object Object]" ||
+    Object.prototype.toString.call(obj) === "[object Array]"
+  ) {
+    return true;
+  }
+  return false;
+}
+
+// convert object/array key snake_name => camelName
 export function snakeToCamel(
   t: object,
   excludeKeys: string[] = [],
@@ -38,12 +48,13 @@ export function snakeToCamel(
     throw new Error("[snakeToCamel] recursive depth reached max limit.");
   }
 
+  if (!isObjectOrArray(t)) {
+    return t;
+  }
+
   let camel: any = {};
   Object.entries(t).map(([key, value]) => {
-    let newValue =
-      typeof value === "object"
-        ? snakeToCamel(value, excludeKeys, depthLimit - 1)
-        : value;
+    let newValue = snakeToCamel(value, excludeKeys, depthLimit - 1);
     const newKey = excludeKeys.includes(key) ? key : toCamel(key);
     camel[newKey] = Array.isArray(value) ? Object.values(newValue) : newValue;
   });
@@ -60,12 +71,13 @@ export function camelToSnake(
     throw new Error("[camelToSnake] recursive depth reached max limit.");
   }
 
+  if (!isObjectOrArray(t)) {
+    return t;
+  }
+
   let snake: any = {};
   Object.entries(t).map(([key, value]) => {
-    let newValue =
-      typeof value === "object"
-        ? camelToSnake(value, excludeKeys, depthLimit - 1)
-        : value;
+    let newValue = camelToSnake(value, excludeKeys, depthLimit - 1);
     const newKey = excludeKeys.includes(key) ? key : toSnake(key);
     snake[newKey] = Array.isArray(value) ? Object.values(newValue) : newValue;
   });

packages/api-server/tests/utils/convention.test.ts

@@ -18,6 +18,11 @@ test("snakeToCamel", (t) => {
         },
       },
       hello_array: [{ first_array: 1 }],
+      hello_nullable: {
+        null_val: null,
+        nan_val: NaN,
+        undefined_val: undefined,
+      },
     },
   };
   const expectObj = {
@@ -36,6 +41,11 @@ test("snakeToCamel", (t) => {
         },
       },
       helloArray: [{ firstArray: 1 }],
+      helloNullable: {
+        nullVal: null,
+        nanVal: NaN,
+        undefinedVal: undefined,
+      },
     },
   };
   t.deepEqual(snakeToCamel(obj), expectObj);
@@ -58,6 +68,11 @@ test("camelToSnake", (t) => {
         },
       },
       hello_array: [{ first_array: 1 }],
+      hello_nullable: {
+        null_val: null,
+        nan_val: NaN,
+        undefined_val: undefined,
+      },
     },
   };
   const obj = {
@@ -76,6 +91,11 @@ test("camelToSnake", (t) => {
         },
       },
       helloArray: [{ firstArray: 1 }],
+      helloNullable: {
+        nullVal: null,
+        nanVal: NaN,
+        undefinedVal: undefined,
+      },
     },
   };
   t.deepEqual(camelToSnake(obj), expectObj);