gg-express 1.0.140 → 1.0.142

package/dist/v3/GGExpressV3.js

@@ -16,6 +16,7 @@ const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const generateStaticRouteFileV3_1 = require("./generateStaticRouteFileV3");
 const generateGGApi_v3_1 = require("./generateGGApi_v3");
+const autoNumber_1 = require("./autoNumber");
 const myExpressRouteList = [];
 function wrapAsync(fn) {
     return (req, res, next) => {
@@ -45,8 +46,8 @@ class GGExpressV3 {
             });
         });
         return this.express[method](url, 
-        // Express handler ต้องกว้าง
-        (req, res, next) => next(), (req, res, next) => {
+        // (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);

package/dist/v3/autoNumber.d.ts

@@ -0,0 +1,4 @@
+import { NextFunction, Request, Response } from "express";
+import { z } from "zod";
+export declare function smartParse<T>(schema: z.ZodType<T>, input: unknown): T;
+export declare const autoTypeMiddleware: (req: Request, res: Response, next: NextFunction) => void;

package/dist/v3/autoNumber.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoTypeMiddleware = void 0;
+exports.smartParse = smartParse;
+function autoNumber(value) {
+    if (Array.isArray(value)) {
+        return value.map(autoNumber);
+    }
+    if (value && typeof value === "object") {
+        const newObj = {};
+        for (const key in value) {
+            newObj[key] = autoNumber(value[key]);
+        }
+        return newObj;
+    }
+    // convert numeric string
+    if (typeof value === "string" && value.trim() !== "") {
+        const num = Number(value);
+        if (!Number.isNaN(num))
+            return num;
+    }
+    return value;
+}
+function smartParse(schema, input) {
+    return schema.parse(autoNumber(input));
+}
+const autoTypeMiddleware = (req, res, next) => {
+    req.body = autoNumber(req.body);
+    req.query = autoNumber(req.query);
+    next();
+};
+exports.autoTypeMiddleware = autoTypeMiddleware;

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: requireParams })
+        .get(this.urlPrefix + url as string, { params: { data : 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: requireParams })
+                .get(this.urlPrefix + url, { params: { data: requireParams } })
                 .then((response) => {
                 resolve(response.data);
             })
@@ -25,7 +25,7 @@ class GGApi_v3 {
     post(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .post((this.urlPrefix + url), { data: requireParams })
+                .post(this.urlPrefix + url, { data: requireParams })
                 .then((response) => {
                 resolve(response.data);
             })
@@ -38,7 +38,7 @@ class GGApi_v3 {
     put(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .put((this.urlPrefix + url), { data: requireParams })
+                .put(this.urlPrefix + url, { data: requireParams })
                 .then((response) => {
                 resolve(response.data);
             })
@@ -51,9 +51,7 @@ class GGApi_v3 {
     delete(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .delete((this.urlPrefix + url), {
-                data: { data: requireParams },
-            })
+                .delete(this.urlPrefix + url, { data: { data: requireParams } })
                 .then((response) => {
                 resolve(response.data);
             })

package/dist/v3/run_v3.test.js

@@ -47,6 +47,7 @@ const addMyTestMW = (req, res, next) => {
 exports.addMyTestMW = addMyTestMW;
 function run() {
     const app = (0, express_1.default)();
+    app.use(express_1.default.json());
     const ggapp = new GGExpressV3_1.default(app, "hotel", ["./output"]);
     ggapp.get("/api/v2/hotel/users/id", {
         requireParams: {
@@ -68,7 +69,7 @@ function run() {
             },
             message: "",
         });
-    }, () => { });
+    });
     ggapp.post("/api/v2/hotel/item", {
         requireParams: {
             data: zod_1.default.object({
@@ -92,17 +93,35 @@ function run() {
             message: "",
         });
     });
-    const api = new apiConnector_hotel_v3_1.GGApi_v3({ urlPrefix: "xxx" });
-    api.get("/api/v2/hotel/users/id", {
-        data: {
-            name: "",
-            age: 0,
-        },
-    });
+    // 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");
         // process.exit(0)
+        const api = new apiConnector_hotel_v3_1.GGApi_v3({ urlPrefix: "http://127.0.0.1:3002" });
+        // api
+        //   .post("/api/v2/hotel/item", {
+        //     data: {
+        //       name: "tin",
+        //       price: 20,
+        //     },
+        //   })
+        //   .catch((error) => {})
+        api
+            .get("/api/v2/hotel/users/id", {
+            data: {
+                name: "tin",
+                age: 30,
+            },
+        })
+            .catch((error) => { });
     }));
 }
 run();

package/package.json

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

package/src/v3/GGExpressV3.ts

@@ -9,6 +9,7 @@ import {
   routeListV3,
 } from "./generateStaticRouteFileV3"
 import { generateGGApi_v3 } from "./generateGGApi_v3"
+import { autoTypeMiddleware } from "./autoNumber"
 
 export type Method = "get" | "post" | "put" | "delete"
 
@@ -101,8 +102,8 @@ export default class GGExpressV3<
 
     return this.express[method](
       url,
-      // Express handler ต้องกว้าง
-      (req: Request, res: Response, next: NextFunction) => next(),
+      // (req: Request, res: Response, next: NextFunction) => next(),
+      autoTypeMiddleware,
       (req, res, next: NextFunction) => {
         if (method === "get")
           //@ts-ignore

package/src/v3/autoNumber.ts

@@ -0,0 +1,35 @@
+import { NextFunction, Request, Response } from "express"
+import { z } from "zod"
+function autoNumber(value: any): any {
+  if (Array.isArray(value)) {
+    return value.map(autoNumber)
+  }
+
+  if (value && typeof value === "object") {
+    const newObj: any = {}
+    for (const key in value) {
+      newObj[key] = autoNumber(value[key])
+    }
+    return newObj
+  }
+
+  // convert numeric string
+  if (typeof value === "string" && value.trim() !== "") {
+    const num = Number(value)
+    if (!Number.isNaN(num)) return num
+  }
+
+  return value
+}
+export function smartParse<T>(schema: z.ZodType<T>, input: unknown): T {
+  return schema.parse(autoNumber(input))
+}
+export const autoTypeMiddleware = (
+  req: Request,
+  res: Response,
+  next: NextFunction,
+) => {
+  req.body = autoNumber(req.body)
+  req.query = autoNumber(req.query)
+  next()
+}

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: requireParams })
+        .get(this.urlPrefix + url as string, { params: { data : requireParams} })
         .then((response) => {
           resolve(response.data)
         })

package/src/v3/output/apiConnector_hotel_v3.ts

@@ -1,19 +1,20 @@
+
 import axios from "axios"
 import { staticRouteInterface_hotel_v3 } from "./staticRouteInterface_hotel_v3"
 
 export class GGApi_v3 {
-  urlPrefix: string
-  constructor(input: { urlPrefix: string }) {
+  urlPrefix : string
+  constructor(input:{ urlPrefix : string }) {
     this.urlPrefix = input.urlPrefix
   }
 
   get<T extends keyof staticRouteInterface_hotel_v3["get"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["get"][T]["requireParams"],
+    requireParams: staticRouteInterface_hotel_v3["get"][T]["requireParams"]
   ): Promise<staticRouteInterface_hotel_v3["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get((this.urlPrefix + url) as string, { params: requireParams })
+        .get(this.urlPrefix + url as string, { params: { data : requireParams} })
         .then((response) => {
           resolve(response.data)
         })
@@ -26,11 +27,11 @@ export class GGApi_v3 {
 
   post<T extends keyof staticRouteInterface_hotel_v3["post"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["post"][T]["requireParams"],
+    requireParams: staticRouteInterface_hotel_v3["post"][T]["requireParams"]
   ): Promise<staticRouteInterface_hotel_v3["post"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .post((this.urlPrefix + url) as string, { data: requireParams })
+        .post(this.urlPrefix + url as string, { data: requireParams })
         .then((response) => {
           resolve(response.data)
         })
@@ -42,11 +43,11 @@ export class GGApi_v3 {
   }
   put<T extends keyof staticRouteInterface_hotel_v3["put"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["put"][T]["requireParams"],
+    requireParams: staticRouteInterface_hotel_v3["put"][T]["requireParams"]
   ): Promise<staticRouteInterface_hotel_v3["put"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .put((this.urlPrefix + url) as string, { data: requireParams })
+        .put(this.urlPrefix + url as string, { data: requireParams })
         .then((response) => {
           resolve(response.data)
         })
@@ -58,13 +59,11 @@ export class GGApi_v3 {
   }
   delete<T extends keyof staticRouteInterface_hotel_v3["delete"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["delete"][T]["requireParams"],
+    requireParams: staticRouteInterface_hotel_v3["delete"][T]["requireParams"]
   ): Promise<staticRouteInterface_hotel_v3["delete"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .delete((this.urlPrefix + url) as string, {
-          data: { data: requireParams },
-        })
+        .delete(this.urlPrefix + url as string, { data: { data: requireParams } })
         .then((response) => {
           resolve(response.data)
         })

package/src/v3/output/staticRouteInterface_hotel_v3.ts

@@ -1,38 +1,34 @@
-export interface staticRouteInterface_hotel_v3 {
-  get: {
-    "/api/v2/hotel/users/id": {
-      requireParams: {
-        data: {
-          name: string
-          age: number
-        }
-      }
-      responseStructure: {
-        data: {
-          value: string
-          address: string
-        }
-        message: string
-      }
-    }
+
+  export interface staticRouteInterface_hotel_v3  {
+    get :  { 
+            "/api/v2/hotel/users/id" : {
+            requireParams :  { data :{
+    name: string;
+    age: number;
+} },responseStructure : { 
+                    data : {
+    value: string;
+    address: string;
+},    
+                    message: string
+            },
+           
+      } },
+    post : { 
+            "/api/v2/hotel/item" : {
+            requireParams :  { data :{
+    name: string;
+    price?: number | undefined;
+} },responseStructure : { 
+                    data : {
+    value: number;
+    address: string;
+},    
+                    message: string
+            },
+           
+      }  },
+    put : {   },
+    delete : {   },
   }
-  post: {
-    "/api/v2/hotel/item": {
-      requireParams: {
-        data: {
-          name: string
-          price?: number | undefined
-        }
-      }
-      responseStructure: {
-        data: {
-          value: number
-          address: string
-        }
-        message: string
-      }
-    }
-  }
-  put: {}
-  delete: {}
-}
+  

package/src/v3/run_v3.test.ts

@@ -33,6 +33,7 @@ export const addMyTestMW = (req: any, res: any, next: NextFunction) => {
 
 function run() {
   const app = express()
+  app.use(express.json())
   const ggapp = new GGExpressV3<"hotel", "/api/v2">(app, "hotel", ["./output"])
   ggapp.get(
     "/api/v2/hotel/users/id",
@@ -58,7 +59,6 @@ function run() {
         message: "",
       })
     },
-    () => {},
   )
   ggapp.post(
     "/api/v2/hotel/item",
@@ -87,18 +87,38 @@ function run() {
       })
     },
   )
-  const api = new GGApi_v3({ urlPrefix: "xxx" })
-  api.get("/api/v2/hotel/users/id", {
-    data: {
-      name: "",
-      age: 0,
-    },
-  })
+
+  // api
+  //   .get("/api/v2/hotel/users/id", {
+  //     data: {
+  //       name: "tin",
+  //       age: 30,
+  //     },
+  //   })
+  //   .catch((error) => {})
 
   app.listen(3002, async () => {
     await ggapp.generateAPIFiles()
     console.log("done")
     // process.exit(0)
+
+    const api = new GGApi_v3({ urlPrefix: "http://127.0.0.1:3002" })
+    // api
+    //   .post("/api/v2/hotel/item", {
+    //     data: {
+    //       name: "tin",
+    //       price: 20,
+    //     },
+    //   })
+    //   .catch((error) => {})
+    api
+      .get("/api/v2/hotel/users/id", {
+        data: {
+          name: "tin",
+          age: 30,
+        },
+      })
+      .catch((error) => {})
   })
 }
 run()