gg-express 1.0.97 → 1.0.99

package/dist/staticRouteInterface_hotel.d.ts

@@ -7,7 +7,24 @@ export interface staticRouteInterface_hotel {
                 };
                 data: {
                     id: number;
-                    name: "A" | "B";
+                    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;
                 }[];
             };
             responseStructure: {

package/dist/v2/GGExpressV2.d.ts

@@ -5,11 +5,16 @@ export type Method = "get" | "post" | "put" | "delete";
 type MyRequest<M extends Method, RQ extends ConstSchemaType> = M extends "get" ? TypeResolve<MyRequestQuery<RQ>> : TypeResolve<MyRequestBody<RQ>>;
 type MyRequestQuery<T extends ConstSchemaType> = Request<{}, {}, {}, T, {}>;
 type MyRequestBody<T extends ConstSchemaType> = Request<{}, {}, T, {}, {}>;
-type MyResponse<T extends ConstSchemaType> = Response<{
-    status: "SUCCESS" | "ERROR" | "SERVER_ERROR";
+type SuccessResponse<T extends ConstSchemaType> = {
+    status: "SUCCESS";
     message: string;
     data: TypeResolve<T>;
-}>;
+};
+type ErrorResponse = {
+    status: "ERROR" | "SERVER_ERROR";
+    message: string;
+};
+type MyResponse<T extends ConstSchemaType> = Response<SuccessResponse<T> | ErrorResponse>;
 export default class GGExpressV2<appName extends string> {
     express: Express.Express;
     private outputPath;

package/dist/v2/GGExpressV2.js

@@ -43,7 +43,7 @@ class GGExpressV2 {
         // Express handler ต้องกว้าง
         (req, res, next) => next(), 
         // แต่ middleware ของคุณจะถูก wrap ทีละตัว
-        ...middlewares.map((mw) => ((req, res, next) => mw(req, res, next))));
+        ...middlewares.map((mw) => (req, res, next) => mw(req, res, next)));
     }
     get(url, options, ...middlewares) {
         return this.rootMethod("get", url, options, ...middlewares);

package/dist/v2/generateStaticRouteFileV2.js

@@ -62,9 +62,12 @@ function parentInputToCode(data) {
                 typeof target[0] === "string" ||
                 target[0] === null ||
                 target[0] === undefined)
-                return `${parentKeyName} : [${target
+                // return `${parentKeyName} : [${(target as string[])
+                //   .map((word) => ` "${word}" `)
+                //   .join(",")}] `
+                return `${parentKeyName} : ${target
                     .map((word) => ` "${word}" `)
-                    .join(",")}] `;
+                    .join("|")} `;
             // nest or input nest
             else if (typeof target[0] === "object")
                 for (const row of target) {

package/dist/v2/output/staticRouteInterface_hotel_v2.d.ts

@@ -3,12 +3,57 @@ export interface staticRouteInterface_hotel_v2 {
         "/api/hotel/users/id": {
             requireParams: {
                 id: number;
+                data: {
+                    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;
+                };
+                name: string;
+                status: "on" | "off";
             };
             responseStructure: {
                 data: {
-                    userData: {
-                        id: number;
-                        name: string;
+                    x: string;
+                    data: {
+                        zoneID: number;
+                        zoneName: string;
+                        data: {
+                            itemID: number;
+                            itemEachHotelID: number;
+                            itemName: string;
+                            requisitionQty: {
+                                expected: number;
+                                actual: number;
+                            };
+                            zoneStockQty: {
+                                begin: number;
+                                end: number;
+                            };
+                            usedQty: number;
+                            lossQty: number;
+                            damageQty: number;
+                            returnQty: {
+                                expected: number;
+                                actual: number;
+                            };
+                            notReturnQty: number;
+                        }[];
                     }[];
                 };
                 status: "SUCCESS" | "ERROR";

package/dist/v2/run_v2.test.js

@@ -142,13 +142,30 @@ function run() {
             },
         });
     });
+    ggapp.post("/api/hotel/booking/id", {
+        requireParams: {
+            id: "number",
+        },
+        responseStructure: {
+            bookingData: {
+                id: "number",
+                roomNumber: "string",
+            },
+        },
+    }, (req, res, next) => {
+        req.body.id;
+        return res.json({
+            status: "ERROR",
+            message: "",
+        });
+    });
     app.listen(3002, () => __awaiter(this, void 0, void 0, function* () {
         yield ggapp.generateAPIFiles();
         console.log("done");
         // process.exit(0)
     }));
 }
-// run()
+run();
 // setTimeout(() => {
 //   const x = new GGApi_v2()
 //   //@ts-ignore

package/package.json

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

package/src/staticRouteInterface_hotel.ts

@@ -1,56 +1,30 @@
 export interface staticRouteInterface_hotel {
-  get: {
-    "/api/hotel/users/id": {
-      requireParams: {
-        parameter: { files: string[] }
-        data: { id: number; name: "A" | "B" }[]
-      }
-      responseStructure: {
-        status: "SUCCESS" | "ERROR"
-        message: string
-        parameter: { numberOfPeople: number; itemName: string }
-        data: { id: number; name: string }[]
-      }
-    }
-    "/api/seed/memo/id": {
-      requireParams: {
-        parameter: { files: string[] }
-        data: { id: number; name: "A" | "B" }[]
-      }
-      responseStructure: {
-        status: "SUCCESS" | "ERROR"
-        message: string
-        parameter: { numberOfPeople: number; itemName: string }
-        data: { id: number; name: string }[]
-      }
-    }
-    "/api/hotel/memo/id": {
-      requireParams: {
-        parameter: { files: string[] }
-        data: { id: number; name: "A" | "B" }[]
-      }
-      responseStructure: {
-        status: "SUCCESS" | "ERROR"
-        message: string
-        parameter: { numberOfPeople: number; itemName: string }
-        data: { id: number; name: string }[]
-      }
-    }
-  }
-  post: {
-    "/api/hotel/item": {
-      requireParams: {
-        parameter: Partial<{ lotNumber: number }>
-        data: Partial<{ id: number; name: "item-1" | "item-2"; price: number }>
-      }
-      responseStructure: {
-        status: "SUCCESS" | "ERROR"
-        message: string
-        parameter: { numberOfPeople: number; itemName: string }
-        data: { id: number; name: string }[]
-      }
-    }
-  }
-  put: {}
-  delete: {}
-}
+        get : {  "/api/hotel/users/id" : { 
+              requireParams : { parameter:{ files : string[]}, data:{ 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}[]},
+              responseStructure : { 
+              status : "SUCCESS" | "ERROR",
+              message : string,
+              parameter : { numberOfPeople : number, itemName : string}, data : {  id : number, name : string } []}
+            }  ,  "/api/seed/memo/id" : { 
+              requireParams : { parameter:{ files : string[]}, data:{ id : number, name : "A" | "B"}[]},
+              responseStructure : { 
+              status : "SUCCESS" | "ERROR",
+              message : string,
+              parameter : { numberOfPeople : number, itemName : string}, data : {  id : number, name : string } []}
+            }  ,  "/api/hotel/memo/id" : { 
+              requireParams : { parameter:{ files : string[]}, data:{ id : number, name : "A" | "B"}[]},
+              responseStructure : { 
+              status : "SUCCESS" | "ERROR",
+              message : string,
+              parameter : { numberOfPeople : number, itemName : string}, data : {  id : number, name : string } []}
+            }  },
+        post : {  "/api/hotel/item" : { 
+              requireParams : { parameter:Partial<{ lotNumber : number}>, data:Partial<{ id : number, name : "item-1" | "item-2", price : number}>},
+              responseStructure : { 
+              status : "SUCCESS" | "ERROR",
+              message : string,
+              parameter : { numberOfPeople : number, itemName : string}, data : {  id : number, name : string } []}
+            }  },
+        put : {  },
+        delete : {  },
+      }

package/src/v2/GGExpressV2.ts

@@ -6,7 +6,6 @@ import { generateStaticRouteFileV2 } from "./generateStaticRouteFileV2"
 import path from "path"
 import { generateGGApi_v2 } from "./generateGGApi_v2"
 
-type Unarray<T> = T extends (infer U)[] ? U : T
 export type Method = "get" | "post" | "put" | "delete"
 
 type MyRequest<M extends Method, RQ extends ConstSchemaType> = M extends "get"
@@ -18,12 +17,22 @@ type MyRequest<M extends Method, RQ extends ConstSchemaType> = M extends "get"
 type MyRequestQuery<T extends ConstSchemaType> = Request<{}, {}, {}, T, {}>
 type MyRequestBody<T extends ConstSchemaType> = Request<{}, {}, T, {}, {}>
 
-type MyResponse<T extends ConstSchemaType> = Response<{
-  status: "SUCCESS" | "ERROR" | "SERVER_ERROR"
+type SuccessResponse<T extends ConstSchemaType> = {
+  status: "SUCCESS"
   message: string
   data: TypeResolve<T>
-}>
+}
 
+type ErrorResponse = {
+  status: "ERROR" | "SERVER_ERROR"
+  message: string
+}
+type MyResponse<T extends ConstSchemaType> = Response<
+  SuccessResponse<T> | ErrorResponse
+>
+type GGHandlerReturn<RS extends ConstSchemaType> = Response<
+  MyResponse<RS>
+> | void // สำหรับ next()
 const myExpressRouteList: {
   method: "get" | "post" | "put" | "delete"
   url: string
@@ -84,13 +93,8 @@ export default class GGExpressV2<appName extends string> {
 
       // แต่ middleware ของคุณจะถูก wrap ทีละตัว
       ...middlewares.map(
-        (mw) =>
-          ((req: Request, res: Response, next: NextFunction) =>
-            mw(
-              req as unknown as MyRequest<M, RQ>,
-              res as MyResponse<RS>,
-              next
-            )) as Express.RequestHandler
+        (mw) => (req: Request, res: Response, next: NextFunction) =>
+          mw(req as unknown as MyRequest<M, RQ>, res as MyResponse<RS>, next)
       )
     )
   }

package/src/v2/generateStaticRouteFileV2.ts

@@ -85,9 +85,12 @@ function parentInputToCode(data: ConstSchemaType) {
         target[0] === null ||
         target[0] === undefined
       )
-        return `${parentKeyName} : [${(target as string[])
+        // return `${parentKeyName} : [${(target as string[])
+        //   .map((word) => ` "${word}" `)
+        //   .join(",")}] `
+        return `${parentKeyName} : ${(target as string[])
           .map((word) => ` "${word}" `)
-          .join(",")}] `
+          .join("|")} `
       // nest or input nest
       else if (typeof target[0] === "object")
         for (const row of target as ConstSchemaType[]) {

package/src/v2/output/staticRouteInterface_hotel_v2.ts

@@ -1,24 +1,69 @@
-
-  export interface staticRouteInterface_hotel_v2  {
-    get :  { 
-            "/api/hotel/users/id" : {
-            requireParams :   { id : number }  ,
-            responseStructure : { 
-            data :  {   
- userData : { id : number,name : string }[]  } ,    
-            status: "SUCCESS" | "ERROR",
-            message: string }
-      } },
-    post : { 
-            "/api/hotel/booking/id" : {
-            requireParams :   { id : number }  ,
-            responseStructure : { 
-            data :  {  
- bookingData : { id : number,roomNumber : string } } ,    
-            status: "SUCCESS" | "ERROR",
-            message: string }
-      }  },
-    put : {   },
-    delete : {   },
+export interface staticRouteInterface_hotel_v2 {
+  get: {
+    "/api/hotel/users/id": {
+      requireParams: {
+        id: number
+        data: {
+          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
+        }
+        name: string
+        status: "on" | "off"
+      }
+      responseStructure: {
+        data: {
+          x: string
+          data: {
+            zoneID: number
+            zoneName: string
+            data: {
+              itemID: number
+              itemEachHotelID: number
+              itemName: string
+              requisitionQty: { expected: number; actual: number }
+              zoneStockQty: { begin: number; end: number }
+              usedQty: number
+              lossQty: number
+              damageQty: number
+              returnQty: { expected: number; actual: number }
+              notReturnQty: number
+            }[]
+          }[]
+        }
+        status: "SUCCESS" | "ERROR"
+        message: string
+      }
+    }
   }
-  
+  post: {
+    "/api/hotel/booking/id": {
+      requireParams: { id: number }
+      responseStructure: {
+        data: {
+          bookingData: { id: number; roomNumber: string }
+        }
+        status: "SUCCESS" | "ERROR"
+        message: string
+      }
+    }
+  }
+  put: {}
+  delete: {}
+}

package/src/v2/run_v2.test.ts

@@ -139,13 +139,35 @@ function run() {
     }
   )
 
+  ggapp.post(
+    "/api/hotel/booking/id",
+    {
+      requireParams: {
+        id: "number",
+      },
+      responseStructure: {
+        bookingData: {
+          id: "number",
+          roomNumber: "string",
+        },
+      },
+    },
+    (req, res, next) => {
+      req.body.id
+      return res.json({
+        status: "ERROR",
+        message: "",
+      })
+    }
+  )
+
   app.listen(3002, async () => {
     await ggapp.generateAPIFiles()
     console.log("done")
     // process.exit(0)
   })
 }
-// run()
+run()
 
 // setTimeout(() => {
 //   const x = new GGApi_v2()

package/src/v2/typeResolver.ts

@@ -10,6 +10,7 @@ type BaseType =
 
 type CustomType = BaseType | `${BaseType}?` | `${BaseType}~` | `${BaseType}?~`
 type InputEnum = readonly string[] | readonly number[]
+
 export type ConstSchemaType = {
   [key in string]: CustomType | ConstSchemaType | ConstSchemaType[] | InputEnum
 }