gg-express 1.0.144 → 1.0.146

package/dist/v3/GGExpressV3.js

@@ -54,12 +54,12 @@ class GGExpressV3 {
             // if (req.body) console.log("req.body", req.body)
             if (method === "get" &&
                 isEmptyZodObject(options.requireParams.data) === false) {
-                options.requireParams.data.parse(autoCastNumbers(req.query.data));
+                options.requireParams.data.parse(autoCastBySchema(req.query.data, options.requireParams.data));
             }
             else if (method === "post" ||
                 method === "put" ||
                 method === "delete") {
-                options.requireParams.data.parse(autoCastNumbers(req.body.data.data));
+                options.requireParams.data.parse(autoCastBySchema(req.body.data.data, options.requireParams.data));
             }
             next();
         }, 
@@ -99,16 +99,42 @@ exports.default = GGExpressV3;
 function isEmptyZodObject(schema) {
     return schema instanceof zod_1.default.ZodObject && Object.keys(schema.shape).length === 0;
 }
-function autoCastNumbers(obj) {
-    if (Array.isArray(obj)) {
-        return obj.map(autoCastNumbers);
+function autoCastBySchema(value, schema) {
+    const typeName = schema._def.typeName;
+    // 🔥 STRING
+    if (typeName === "ZodString") {
+        if (typeof value === "number") {
+            return String(value);
+        }
+        return value;
+    }
+    // 🔥 NUMBER
+    if (typeName === "ZodNumber") {
+        if (typeof value === "string" &&
+            value.trim() !== "" &&
+            !isNaN(Number(value))) {
+            return Number(value);
+        }
+        return value;
     }
-    if (obj !== null && typeof obj === "object") {
-        return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, autoCastNumbers(v)]));
+    // 🔥 OBJECT (recursive)
+    if (typeName === "ZodObject") {
+        const shape = schema.shape;
+        if (typeof value !== "object" || value === null) {
+            return value;
+        }
+        const result = {};
+        for (const key in shape) {
+            result[key] = autoCastBySchema(value[key], shape[key]);
+        }
+        return result;
     }
-    // auto convert string number
-    if (typeof obj === "string" && obj.trim() !== "" && !isNaN(Number(obj))) {
-        return Number(obj);
+    // 🔥 ARRAY
+    if (typeName === "ZodArray") {
+        const itemSchema = schema._def.type;
+        if (!Array.isArray(value))
+            return value;
+        return value.map((v) => autoCastBySchema(v, itemSchema));
     }
-    return obj;
+    return value;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg-express",
-  "version": "1.0.144",
+  "version": "1.0.146",
   "description": "",
   "main": "dist/main.js",
   "scripts": {

package/src/v3/GGExpressV3.ts

@@ -112,13 +112,17 @@ export default class GGExpressV3<
           method === "get" &&
           isEmptyZodObject(options.requireParams.data) === false
         ) {
-          options.requireParams.data.parse(autoCastNumbers(req.query.data))
+          options.requireParams.data.parse(
+            autoCastBySchema(req.query.data, options.requireParams.data),
+          )
         } else if (
           method === "post" ||
           method === "put" ||
           method === "delete"
         ) {
-          options.requireParams.data.parse(autoCastNumbers(req.body.data.data))
+          options.requireParams.data.parse(
+            autoCastBySchema(req.body.data.data, options.requireParams.data),
+          )
         }
         next()
       },
@@ -255,21 +259,54 @@ function isEmptyZodObject(
   return schema instanceof z.ZodObject && Object.keys(schema.shape).length === 0
 }
 
-function autoCastNumbers(obj: unknown): unknown {
-  if (Array.isArray(obj)) {
-    return obj.map(autoCastNumbers)
+function autoCastBySchema(value: any, schema: z.ZodTypeAny): any {
+  const typeName = (schema as any)._def.typeName
+
+  // 🔥 STRING
+  if (typeName === "ZodString") {
+    if (typeof value === "number") {
+      return String(value)
+    }
+    return value
   }
 
-  if (obj !== null && typeof obj === "object") {
-    return Object.fromEntries(
-      Object.entries(obj).map(([k, v]) => [k, autoCastNumbers(v)]),
-    )
+  // 🔥 NUMBER
+  if (typeName === "ZodNumber") {
+    if (
+      typeof value === "string" &&
+      value.trim() !== "" &&
+      !isNaN(Number(value))
+    ) {
+      return Number(value)
+    }
+    return value
+  }
+
+  // 🔥 OBJECT (recursive)
+  if (typeName === "ZodObject") {
+    const shape = (schema as any).shape
+
+    if (typeof value !== "object" || value === null) {
+      return value
+    }
+
+    const result: any = {}
+
+    for (const key in shape) {
+      result[key] = autoCastBySchema(value[key], shape[key])
+    }
+
+    return result
   }
 
-  // auto convert string number
-  if (typeof obj === "string" && obj.trim() !== "" && !isNaN(Number(obj))) {
-    return Number(obj)
+  // 🔥 ARRAY
+  if (typeName === "ZodArray") {
+    const itemSchema = (schema as any)._def.type
+
+    if (!Array.isArray(value)) return value
+
+    return value.map((v) => autoCastBySchema(v, itemSchema))
   }
 
-  return obj
+  return value
 }