gg-express 1.0.150 → 1.0.151

package/dist/v3/GGExpressV3.js

@@ -17,7 +17,6 @@ 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");
 const myExpressRouteList = [];
 function wrapAsync(fn) {
     return (req, res, next) => {
@@ -48,19 +47,20 @@ class GGExpressV3 {
         });
         return this.express[method](url, 
         // (req: Request, res: Response, next: NextFunction) => next(),
-        autoNumber_1.autoTypeMiddleware, (req, res, next) => {
+        // autoTypeMiddleware,
+        (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)
             try {
                 if (method === "get" &&
                     isEmptyZodObject(options.requireParams.data) === false) {
-                    req.query.data = options.requireParams.data.parse(autoCastBySchema(req.query.data, options.requireParams.data));
+                    req.query.data = options.requireParams.data.parse(req.query.data);
                 }
                 else if (method === "post" ||
                     method === "put" ||
                     method === "delete") {
-                    req.body.data.data = options.requireParams.data.parse(autoCastBySchema(req.body.data.data, options.requireParams.data));
+                    req.body.data.data = options.requireParams.data.parse(req.body.data.data);
                 }
             }
             catch (error) {
@@ -108,42 +108,3 @@ exports.default = GGExpressV3;
 function isEmptyZodObject(schema) {
     return schema instanceof zod_1.default.ZodObject && Object.keys(schema.shape).length === 0;
 }
-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;
-    }
-    // 🔥 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;
-    }
-    // 🔥 ARRAY
-    if (typeName === "ZodArray") {
-        const itemSchema = schema._def.type;
-        if (!Array.isArray(value))
-            return value;
-        return value.map((v) => autoCastBySchema(v, itemSchema));
-    }
-    return value;
-}

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

@@ -1,6 +1,6 @@
 export interface staticRouteInterface_hotel_v3 {
     get: {
-        "/api/v2/hotel/users/id": {
+        "/api/v3/hotel/users/id": {
             requireParams: {
                 data: {
                     name: string;
@@ -15,7 +15,7 @@ export interface staticRouteInterface_hotel_v3 {
                 message: string;
             };
         };
-        "/api/v2/hotel/users/empty": {
+        "/api/v3/hotel/users/empty": {
             requireParams: {
                 data: {};
             };
@@ -29,11 +29,12 @@ export interface staticRouteInterface_hotel_v3 {
         };
     };
     post: {
-        "/api/v2/hotel/item": {
+        "/api/v3/hotel/item": {
             requireParams: {
                 data: {
                     name: string;
                     price: number;
+                    taxID: string;
                 };
             };
             responseStructure: {

package/dist/v3/test.d.ts

@@ -0,0 +1,25 @@
+import { NextFunction } from "express";
+export declare const hotel_model_const_temp: {
+    readonly booking: {
+        readonly id: "number";
+        readonly bookingGroupID: "number";
+        readonly checkInDate: "string";
+        readonly checkOutDate: "string";
+        readonly checkInTime: "string";
+        readonly checkOutTime: "string";
+        readonly roomRate: "number";
+        readonly extraBedRate: "number";
+        readonly roomNumber: "string?~";
+        readonly editTime: "string";
+        readonly createTime: "string";
+        readonly shiftDate: "string";
+        readonly shiftName: "string~";
+        readonly userName: "string";
+        readonly bookingStatus: readonly ["ACTIVE", "CLOSE", "CANCEL", "NO_SHOW"];
+        readonly is_specificRoom: "number";
+        readonly guestCount: "number";
+        readonly reasonToCancel: "string";
+        readonly note: "string?~";
+    };
+};
+export declare const addMyTestMW: (req: any, res: any, next: NextFunction) => void;

package/dist/v3/test.js

@@ -0,0 +1,150 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addMyTestMW = exports.hotel_model_const_temp = void 0;
+const express_1 = __importDefault(require("express"));
+const zod_1 = require("zod");
+const GGExpressV3_1 = __importDefault(require("./GGExpressV3"));
+const apiConnector_hotel_v3_1 = require("./output/apiConnector_hotel_v3");
+exports.hotel_model_const_temp = {
+    booking: {
+        id: "number",
+        bookingGroupID: "number",
+        checkInDate: "string",
+        checkOutDate: "string",
+        checkInTime: "string",
+        checkOutTime: "string",
+        roomRate: "number",
+        extraBedRate: "number",
+        roomNumber: "string?~",
+        editTime: "string",
+        createTime: "string",
+        shiftDate: "string",
+        shiftName: "string~",
+        userName: "string",
+        bookingStatus: ["ACTIVE", "CLOSE", "CANCEL", "NO_SHOW"],
+        is_specificRoom: "number",
+        guestCount: "number",
+        reasonToCancel: "string",
+        note: "string?~",
+    },
+};
+const addMyTestMW = (req, res, next) => {
+    req.myTest = "1234";
+    next();
+};
+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/v3/hotel/users/id", {
+        requireParams: {
+            data: zod_1.z.object({
+                name: zod_1.z.string(),
+                age: zod_1.z.number(),
+            }),
+        },
+        responseStructure: zod_1.z.object({
+            value: zod_1.z.string(),
+            address: zod_1.z.string(),
+        }),
+    }, (req, res, next) => {
+        req.query.data.age;
+        res.json({
+            data: {
+                value: "",
+                address: "",
+            },
+            message: "",
+        });
+    });
+    ggapp.get("/api/v3/hotel/users/empty", {
+        requireParams: {
+            data: zod_1.z.object({}),
+        },
+        responseStructure: zod_1.z.object({
+            value: zod_1.z.string(),
+            address: zod_1.z.string(),
+        }),
+    }, (req, res, next) => {
+        res.json({
+            data: {
+                value: "",
+                address: "",
+            },
+            message: "",
+        });
+    });
+    ggapp.post("/api/v3/hotel/item", {
+        requireParams: {
+            data: zod_1.z.object({
+                name: zod_1.z.string(),
+                price: zod_1.z.number(),
+                taxID: zod_1.z.string(),
+            }),
+        },
+        responseStructure: zod_1.z.object({
+            value: zod_1.z.number(),
+            address: zod_1.z.string(),
+        }),
+    }, (req, res, next) => {
+        console.log(req.body.data.data);
+        res.json({
+            data: {
+                value: 0,
+                address: "",
+            },
+            message: "",
+        });
+    });
+    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/v3/hotel/item", {
+            data: {
+                name: "tin",
+                price: 20,
+                taxID: "1559900272111",
+            },
+        })
+            .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/empty", {
+        //     data: {},
+        //   })
+        //   .catch((error) => {
+        //     console.log(error)
+        //   })
+    }));
+}
+run();

package/package.json

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

package/src/v3/GGExpressV3.ts

@@ -103,7 +103,7 @@ export default class GGExpressV3<
     return this.express[method](
       url,
       // (req: Request, res: Response, next: NextFunction) => next(),
-      autoTypeMiddleware,
+      // autoTypeMiddleware,
       (req, res, next) => {
         // console.log("req.url", req.url)
         // if (req.query) console.log("req.query", req.query)
@@ -114,7 +114,7 @@ export default class GGExpressV3<
             isEmptyZodObject(options.requireParams.data) === false
           ) {
             req.query.data = options.requireParams.data.parse(
-              autoCastBySchema(req.query.data, options.requireParams.data),
+              req.query.data,
             ) as any
           } else if (
             method === "post" ||
@@ -122,7 +122,7 @@ export default class GGExpressV3<
             method === "delete"
           ) {
             req.body.data.data = options.requireParams.data.parse(
-              autoCastBySchema(req.body.data.data, options.requireParams.data),
+              req.body.data.data,
             )
           }
         } catch (error) {
@@ -264,55 +264,3 @@ function isEmptyZodObject(
 ): schema is z.ZodObject<Record<string, never>> {
   return schema instanceof z.ZodObject && Object.keys(schema.shape).length === 0
 }
-
-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
-  }
-
-  // 🔥 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
-  }
-
-  // 🔥 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 value
-}

package/src/v3/output/staticRouteInterface_hotel_v3.ts

@@ -1,7 +1,7 @@
 
   export interface staticRouteInterface_hotel_v3  {
     get :  { 
-            "/api/v2/hotel/users/id" : {
+            "/api/v3/hotel/users/id" : {
             requireParams :  { data :{
     name: string;
     age: number;
@@ -14,7 +14,7 @@
             },
            
       }, 
-            "/api/v2/hotel/users/empty" : {
+            "/api/v3/hotel/users/empty" : {
             requireParams :  { data :{} },responseStructure : { 
                     data : {
     value: string;
@@ -25,10 +25,11 @@
            
       } },
     post : { 
-            "/api/v2/hotel/item" : {
+            "/api/v3/hotel/item" : {
             requireParams :  { data :{
     name: string;
     price: number;
+    taxID: string;
 } },responseStructure : { 
                     data : {
     value: number;

package/src/v3/{run_v3.test.ts → test.ts}

@@ -1,6 +1,6 @@
 import express, { NextFunction } from "express"
+import { z } from "zod"
 import GGExpressV3 from "./GGExpressV3"
-import z from "zod"
 import { GGApi_v3 } from "./output/apiConnector_hotel_v3"
 
 export const hotel_model_const_temp = {
@@ -39,9 +39,9 @@ function run() {
   //   if (req.body) console.log("req.body", req.body)
   //   next()
   // })
-  const ggapp = new GGExpressV3<"hotel", "/api/v2">(app, "hotel", ["./output"])
+  const ggapp = new GGExpressV3<"hotel", "/api/v3">(app, "hotel", ["./output"])
   ggapp.get(
-    "/api/v2/hotel/users/id",
+    "/api/v3/hotel/users/id",
     {
       requireParams: {
         data: z.object({
@@ -66,7 +66,7 @@ function run() {
     },
   )
   ggapp.get(
-    "/api/v2/hotel/users/empty",
+    "/api/v3/hotel/users/empty",
     {
       requireParams: {
         data: z.object({}),
@@ -87,12 +87,13 @@ function run() {
     },
   )
   ggapp.post(
-    "/api/v2/hotel/item",
+    "/api/v3/hotel/item",
     {
       requireParams: {
         data: z.object({
           name: z.string(),
           price: z.number(),
+          taxID: z.string(),
         }),
       },
       responseStructure: z.object({
@@ -101,8 +102,7 @@ function run() {
       }),
     },
     (req, res, next) => {
-      req.body.data.data.price
-      req.body.data.data.name
+      console.log(req.body.data.data)
       res.json({
         data: {
           value: 0,
@@ -119,16 +119,17 @@ function run() {
     // 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) => {
-    //     console.log(error)
-    //   })
+    api
+      .post("/api/v3/hotel/item", {
+        data: {
+          name: "tin",
+          price: 20,
+          taxID: "1559900272111",
+        },
+      })
+      .catch((error) => {
+        console.log(error)
+      })
     // api
     //   .get("/api/v2/hotel/users/id", {
     //     data: {