gg-express 1.0.142 → 1.0.144

package/dist/v3/GGExpressV3.d.ts

@@ -3,12 +3,12 @@ import Express, { Request, Response } from "express-serve-static-core";
 import z from "zod";
 export type Method = "get" | "post" | "put" | "delete";
 type ReqStructure<RQ extends z.ZodTypeAny> = {
-    data: {
-        data: z.infer<RQ>;
-    };
+    data: z.infer<RQ>;
 };
 type MyQueryRequest<RQ extends z.ZodTypeAny> = Request<{}, {}, {}, ReqStructure<RQ>, {}>;
-type MyBodyRequest<RQ extends z.ZodTypeAny> = Request<{}, {}, ReqStructure<RQ>, {}, {}>;
+type MyBodyRequest<RQ extends z.ZodTypeAny> = Request<{}, {}, {
+    data: ReqStructure<RQ>;
+}, {}, {}>;
 export type RequestStructure<RQ extends z.ZodTypeAny> = {
     data: RQ;
 };

package/dist/v3/GGExpressV3.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const zod_1 = __importDefault(require("zod"));
 const generateStaticRouteFileV3_1 = require("./generateStaticRouteFileV3");
 const generateGGApi_v3_1 = require("./generateGGApi_v3");
 const autoNumber_1 = require("./autoNumber");
@@ -48,11 +49,18 @@ class GGExpressV3 {
         return this.express[method](url, 
         // (req: Request, res: Response, next: NextFunction) => next(),
         autoNumber_1.autoTypeMiddleware, (req, res, next) => {
-            if (method === "get")
-                //@ts-ignore
-                options.requireParams.data.parse(req.query.data.data);
-            else
-                options.requireParams.data.parse(req.body.data.data);
+            // console.log("req.url", req.url)
+            // if (req.query) console.log("req.query", req.query)
+            // 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));
+            }
+            else if (method === "post" ||
+                method === "put" ||
+                method === "delete") {
+                options.requireParams.data.parse(autoCastNumbers(req.body.data.data));
+            }
             next();
         }, 
         // แต่ middleware ของคุณจะถูก wrap ทีละตัว
@@ -88,3 +96,19 @@ class GGExpressV3 {
     }
 }
 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);
+    }
+    if (obj !== null && typeof obj === "object") {
+        return Object.fromEntries(Object.entries(obj).map(([k, v]) => [k, autoCastNumbers(v)]));
+    }
+    // auto convert string number
+    if (typeof obj === "string" && obj.trim() !== "" && !isNaN(Number(obj))) {
+        return Number(obj);
+    }
+    return obj;
+}

package/dist/v3/generateGGApi_v3.js

@@ -23,7 +23,7 @@ export class GGApi_v3 {
   ): Promise<${tempInterfaceName}["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(this.urlPrefix + url as string, { params: { data : requireParams} })
+        .get(this.urlPrefix + url as string, { params:  requireParams })
         .then((response) => {
           resolve(response.data)
         })

package/dist/v3/output/apiConnector_hotel_v3.js

@@ -12,7 +12,7 @@ class GGApi_v3 {
     get(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .get(this.urlPrefix + url, { params: { data: requireParams } })
+                .get(this.urlPrefix + url, { params: requireParams })
                 .then((response) => {
                 resolve(response.data);
             })

package/dist/v3/output/staticRouteInterface_hotel_v3.d.ts

@@ -15,13 +15,25 @@ export interface staticRouteInterface_hotel_v3 {
                 message: string;
             };
         };
+        "/api/v2/hotel/users/empty": {
+            requireParams: {
+                data: {};
+            };
+            responseStructure: {
+                data: {
+                    value: string;
+                    address: string;
+                };
+                message: string;
+            };
+        };
     };
     post: {
         "/api/v2/hotel/item": {
             requireParams: {
                 data: {
                     name: string;
-                    price?: number | undefined;
+                    price: number;
                 };
             };
             responseStructure: {

package/dist/v3/run_v3.test.js

@@ -48,6 +48,11 @@ exports.addMyTestMW = addMyTestMW;
 function run() {
     const app = (0, express_1.default)();
     app.use(express_1.default.json());
+    // app.use((req, res, next) => {
+    //   if (req.query) console.log("req.query", req.query)
+    //   if (req.body) console.log("req.body", req.body)
+    //   next()
+    // })
     const ggapp = new GGExpressV3_1.default(app, "hotel", ["./output"]);
     ggapp.get("/api/v2/hotel/users/id", {
         requireParams: {
@@ -61,7 +66,24 @@ function run() {
             address: zod_1.default.string(),
         }),
     }, (req, res, next) => {
-        req.query.data.data.age;
+        req.query.data.age;
+        res.json({
+            data: {
+                value: "",
+                address: "",
+            },
+            message: "",
+        });
+    });
+    ggapp.get("/api/v2/hotel/users/empty", {
+        requireParams: {
+            data: zod_1.default.object({}),
+        },
+        responseStructure: zod_1.default.object({
+            value: zod_1.default.string(),
+            address: zod_1.default.string(),
+        }),
+    }, (req, res, next) => {
         res.json({
             data: {
                 value: "",
@@ -74,7 +96,7 @@ function run() {
         requireParams: {
             data: zod_1.default.object({
                 name: zod_1.default.string(),
-                price: zod_1.default.number().optional(),
+                price: zod_1.default.number(),
             }),
         },
         responseStructure: zod_1.default.object({
@@ -82,7 +104,6 @@ function run() {
             address: zod_1.default.string(),
         }),
     }, (req, res, next) => {
-        // price/name come from body for POST
         req.body.data.data.price;
         req.body.data.data.name;
         res.json({
@@ -93,14 +114,6 @@ function run() {
             message: "",
         });
     });
-    // api
-    //   .get("/api/v2/hotel/users/id", {
-    //     data: {
-    //       name: "tin",
-    //       age: 30,
-    //     },
-    //   })
-    //   .catch((error) => {})
     app.listen(3002, () => __awaiter(this, void 0, void 0, function* () {
         yield ggapp.generateAPIFiles();
         console.log("done");
@@ -113,15 +126,24 @@ function run() {
         //       price: 20,
         //     },
         //   })
+        //   .catch((error) => {
+        //     console.log(error)
+        //   })
+        // api
+        //   .get("/api/v2/hotel/users/id", {
+        //     data: {
+        //       name: "tin",
+        //       age: 31,
+        //     },
+        //   })
         //   .catch((error) => {})
-        api
-            .get("/api/v2/hotel/users/id", {
-            data: {
-                name: "tin",
-                age: 30,
-            },
-        })
-            .catch((error) => { });
+        // api
+        //   .get("/api/v2/hotel/users/empty", {
+        //     data: {},
+        //   })
+        //   .catch((error) => {
+        //     console.log(error)
+        //   })
     }));
 }
 run();

package/package.json

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

package/src/v3/GGExpressV3.ts

@@ -16,7 +16,7 @@ export type Method = "get" | "post" | "put" | "delete"
 const myExpressRouteList: routeListV3[] = []
 
 type ReqStructure<RQ extends z.ZodTypeAny> = {
-  data: { data: z.infer<RQ> }
+  data: z.infer<RQ>
 }
 type MyQueryRequest<RQ extends z.ZodTypeAny> = Request<
   {},
@@ -28,7 +28,7 @@ type MyQueryRequest<RQ extends z.ZodTypeAny> = Request<
 type MyBodyRequest<RQ extends z.ZodTypeAny> = Request<
   {},
   {},
-  ReqStructure<RQ>,
+  { data: ReqStructure<RQ> },
   {},
   {}
 >
@@ -104,11 +104,22 @@ export default class GGExpressV3<
       url,
       // (req: Request, res: Response, next: NextFunction) => next(),
       autoTypeMiddleware,
-      (req, res, next: NextFunction) => {
-        if (method === "get")
-          //@ts-ignore
-          options.requireParams.data.parse(req.query.data.data)
-        else options.requireParams.data.parse(req.body.data.data)
+      (req, res, next) => {
+        // console.log("req.url", req.url)
+        // if (req.query) console.log("req.query", req.query)
+        // 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))
+        } else if (
+          method === "post" ||
+          method === "put" ||
+          method === "delete"
+        ) {
+          options.requireParams.data.parse(autoCastNumbers(req.body.data.data))
+        }
         next()
       },
 
@@ -238,3 +249,27 @@ export default class GGExpressV3<
     }
   }
 }
+function isEmptyZodObject(
+  schema: z.ZodTypeAny,
+): schema is z.ZodObject<Record<string, never>> {
+  return schema instanceof z.ZodObject && Object.keys(schema.shape).length === 0
+}
+
+function autoCastNumbers(obj: unknown): unknown {
+  if (Array.isArray(obj)) {
+    return obj.map(autoCastNumbers)
+  }
+
+  if (obj !== null && typeof obj === "object") {
+    return Object.fromEntries(
+      Object.entries(obj).map(([k, v]) => [k, autoCastNumbers(v)]),
+    )
+  }
+
+  // auto convert string number
+  if (typeof obj === "string" && obj.trim() !== "" && !isNaN(Number(obj))) {
+    return Number(obj)
+  }
+
+  return obj
+}

package/src/v3/generateGGApi_v3.ts

@@ -21,7 +21,7 @@ export class GGApi_v3 {
   ): Promise<${tempInterfaceName}["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(this.urlPrefix + url as string, { params: { data : requireParams} })
+        .get(this.urlPrefix + url as string, { params:  requireParams })
         .then((response) => {
           resolve(response.data)
         })

package/src/v3/output/apiConnector_hotel_v3.ts

@@ -14,7 +14,7 @@ export class GGApi_v3 {
   ): Promise<staticRouteInterface_hotel_v3["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(this.urlPrefix + url as string, { params: { data : requireParams} })
+        .get(this.urlPrefix + url as string, { params:  requireParams })
         .then((response) => {
           resolve(response.data)
         })

package/src/v3/output/staticRouteInterface_hotel_v3.ts

@@ -13,12 +13,22 @@
                     message: string
             },
            
+      }, 
+            "/api/v2/hotel/users/empty" : {
+            requireParams :  { data :{} },responseStructure : { 
+                    data : {
+    value: string;
+    address: string;
+},    
+                    message: string
+            },
+           
       } },
     post : { 
             "/api/v2/hotel/item" : {
             requireParams :  { data :{
     name: string;
-    price?: number | undefined;
+    price: number;
 } },responseStructure : { 
                     data : {
     value: number;

package/src/v3/run_v3.test.ts

@@ -34,6 +34,11 @@ export const addMyTestMW = (req: any, res: any, next: NextFunction) => {
 function run() {
   const app = express()
   app.use(express.json())
+  // app.use((req, res, next) => {
+  //   if (req.query) console.log("req.query", req.query)
+  //   if (req.body) console.log("req.body", req.body)
+  //   next()
+  // })
   const ggapp = new GGExpressV3<"hotel", "/api/v2">(app, "hotel", ["./output"])
   ggapp.get(
     "/api/v2/hotel/users/id",
@@ -50,7 +55,28 @@ function run() {
       }),
     },
     (req, res, next) => {
-      req.query.data.data.age
+      req.query.data.age
+      res.json({
+        data: {
+          value: "",
+          address: "",
+        },
+        message: "",
+      })
+    },
+  )
+  ggapp.get(
+    "/api/v2/hotel/users/empty",
+    {
+      requireParams: {
+        data: z.object({}),
+      },
+      responseStructure: z.object({
+        value: z.string(),
+        address: z.string(),
+      }),
+    },
+    (req, res, next) => {
       res.json({
         data: {
           value: "",
@@ -66,7 +92,7 @@ function run() {
       requireParams: {
         data: z.object({
           name: z.string(),
-          price: z.number().optional(),
+          price: z.number(),
         }),
       },
       responseStructure: z.object({
@@ -75,7 +101,6 @@ function run() {
       }),
     },
     (req, res, next) => {
-      // price/name come from body for POST
       req.body.data.data.price
       req.body.data.data.name
       res.json({
@@ -88,15 +113,6 @@ function run() {
     },
   )
 
-  // api
-  //   .get("/api/v2/hotel/users/id", {
-  //     data: {
-  //       name: "tin",
-  //       age: 30,
-  //     },
-  //   })
-  //   .catch((error) => {})
-
   app.listen(3002, async () => {
     await ggapp.generateAPIFiles()
     console.log("done")
@@ -110,15 +126,24 @@ function run() {
     //       price: 20,
     //     },
     //   })
+    //   .catch((error) => {
+    //     console.log(error)
+    //   })
+    // api
+    //   .get("/api/v2/hotel/users/id", {
+    //     data: {
+    //       name: "tin",
+    //       age: 31,
+    //     },
+    //   })
     //   .catch((error) => {})
-    api
-      .get("/api/v2/hotel/users/id", {
-        data: {
-          name: "tin",
-          age: 30,
-        },
-      })
-      .catch((error) => {})
+    // api
+    //   .get("/api/v2/hotel/users/empty", {
+    //     data: {},
+    //   })
+    //   .catch((error) => {
+    //     console.log(error)
+    //   })
   })
 }
 run()