gg-express 1.0.83 → 1.0.88

package/dist/v2/generateStaticRouteFileV2.js

@@ -50,7 +50,10 @@ function parentInputToCode(data) {
                 const recusiveResult = recursiveExtract(target[keyName], keyName);
                 tempResult.push(recusiveResult);
             }
-            result = `${result} \n ${parentKeyName} : { ${tempResult.join(",")} }`;
+            if (parentKeyName === "root")
+                result = ` { ${tempResult.join(",")} } `;
+            else
+                result = `${result} \n ${parentKeyName} : { ${tempResult.join(",")} }`;
         }
         // check array ---------------------------
         else if (Array.isArray(target)) {
@@ -70,8 +73,8 @@ function parentInputToCode(data) {
         }
         return `${result}`;
     };
-    const result = recursiveExtract(data, "data");
-    return `${result} `;
+    const result = recursiveExtract(data, "root");
+    return `${result}`;
 }
 function generateStaticRouteFileV2(appName, data) {
     const interfaceName = `staticRouteInterface_${appName}_v2`;
@@ -80,10 +83,11 @@ function generateStaticRouteFileV2(appName, data) {
         return keyName
             .map((keyName) => `
             "${keyName}" : {
-            requireParams : { ${data[keyName].requireParams} },
-            responseStructure : { ${data[keyName].responseStructure},    
+            requireParams :  ${data[keyName].requireParams} ,
+            responseStructure : { 
+            data : ${data[keyName].responseStructure},    
             status: "SUCCESS" | "ERROR",
-            message: string } 
+            message: string }
       }`)
             .join(", ");
     };

package/dist/v2/output/apiConnector_hotel_v2.js

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

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

@@ -2,9 +2,7 @@ export interface staticRouteInterface_hotel_v2 {
     get: {
         "/api/hotel/users/id": {
             requireParams: {
-                data: {
-                    id: number;
-                };
+                id: number;
             };
             responseStructure: {
                 data: {
@@ -21,9 +19,7 @@ export interface staticRouteInterface_hotel_v2 {
     post: {
         "/api/hotel/booking/id": {
             requireParams: {
-                data: {
-                    id: number;
-                };
+                id: number;
             };
             responseStructure: {
                 data: {

package/dist/v2/run_v2.test.d.ts

@@ -1 +1,23 @@
-export {};
+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";
+    };
+};

package/dist/v2/run_v2.test.js

@@ -12,17 +12,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.hotel_model_const_temp = void 0;
 const express_1 = __importDefault(require("express"));
 const GGExpressV2_1 = __importDefault(require("./GGExpressV2"));
 const typeResolver_1 = require("./typeResolver");
-const apiConnector_hotel_v2_1 = require("./output/apiConnector_hotel_v2");
-// import { GGApi_v2 } from "./output/apiConnector_hotel_v2"
+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",
+    },
+};
 function run() {
     const app = (0, express_1.default)();
     const ggapp = new GGExpressV2_1.default(app, "hotel", ["./output"]);
     ggapp.get("/api/hotel/users/id", {
         requireParams: {
             id: "number",
+            data: exports.hotel_model_const_temp["booking"],
+            name: "string",
+            status: ["on", "off"],
         },
         responseStructure: {
             userData: (0, typeResolver_1.toArray)({
@@ -31,8 +56,11 @@ function run() {
             }),
         },
     }, (req, res, next) => {
-        console.log(req.query);
-        req.query.id;
+        // req.query.data.bookingStatus===''
+        req.query.name;
+        console.log("req.query", req.query);
+        console.log("req.query.id", req.query.id);
+        // req.query.data.bookingStatus
         return res.json({
             message: "",
             status: "SUCCESS",
@@ -50,6 +78,7 @@ function run() {
             },
         },
     }, (req, res, next) => {
+        req.body.id;
         return res.json({
             message: "",
             status: "SUCCESS",
@@ -64,15 +93,20 @@ function run() {
     app.listen(3002, () => __awaiter(this, void 0, void 0, function* () {
         yield ggapp.generateAPIFiles();
         console.log("done");
-        process.exit(0);
+        // process.exit(0)
     }));
 }
-run();
-const x = new apiConnector_hotel_v2_1.GGApi_v2();
-x.post("/api/hotel/booking/id", {
-    data: { id: 1 },
-}).then((response) => {
-    response.status === "ERROR";
-    response.data.bookingData;
-    response.data.bookingData.roomNumber;
-});
+// run()
+// setTimeout(() => {
+//   const x = new GGApi_v2()
+//   //@ts-ignore
+//   x.get("http://localhost:3002/api/hotel/users/id", {
+//     id: 1,
+//   })
+//     .then((response) => {
+//       console.log("response", response)
+//     })
+//     .catch((error) => {
+//       console.error("fetch error")
+//     })
+// }, 3000)

package/dist/v2/typeResolver.d.ts

@@ -3,9 +3,9 @@ export type CustomType = BaseType | `${BaseType}?` | `${BaseType}~` | `${BaseTyp
 export type InputNest = {
     [key in string]: CustomType;
 };
-type InputEnum = string[] | number[];
+type InputEnum = readonly (string | number)[];
 export type InputParent = {
-    [key in string]: CustomType | InputNest | InputNest[] | InputParent | InputParent[] | InputEnum;
+    [key in string]: CustomType | InputParent | InputParent[] | InputEnum;
 };
 type ResolveBase<T extends BaseType> = T extends "string" ? string : T extends "string[]" ? string[] : T extends "number" ? number : T extends "number[]" ? number[] : never;
 export declare const toArray: <T extends InputParent>(input: T) => T[];
@@ -15,7 +15,7 @@ type checkEnum<T> = T extends InputEnum ? T[number] : convertNest<T>;
 type convertChildObjet<T> = {
     [K in keyof T]: chooseType<T[K]>;
 };
-type convertObject<T> = T extends object ? convertChildObjet<T> : checkEnum<T>;
+type convertObject<T> = T extends readonly any[] ? checkEnum<T> : T extends object ? convertChildObjet<T> : checkEnum<T>;
 type chooseType<T> = T extends InputEnum ? T[number] : convertObject<T>;
 export type convertRoot<T> = {
     [K in keyof T]: chooseType<T[K]>;

package/package.json

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

package/src/v2/generateStaticRouteFileV2.ts

@@ -1,6 +1,5 @@
 import { Method } from "./GGExpressV2"
-import { CustomType, InputNest, InputParent, toArray } from "./typeResolver"
-import fs from "fs"
+import { InputParent } from "./typeResolver"
 type routeList = {
   method: Method
   url: string
@@ -72,7 +71,9 @@ function parentInputToCode(data: InputParent) {
         const recusiveResult = recursiveExtract(target[keyName], keyName)
         tempResult.push(recusiveResult)
       }
-      result = `${result} \n ${parentKeyName} : { ${tempResult.join(",")} }`
+      if (parentKeyName === "root") result = ` { ${tempResult.join(",")} } `
+      else
+        result = `${result} \n ${parentKeyName} : { ${tempResult.join(",")} }`
     }
 
     // check array ---------------------------
@@ -89,14 +90,14 @@ function parentInputToCode(data: InputParent) {
           .join(",")}] `
       // nest or input nest
       else if (typeof target[0] === "object")
-        for (const row of target as InputNest[] | InputParent[]) {
+        for (const row of target as InputParent[]) {
           result = result + " " + recursiveExtract(row, parentKeyName) + "[] "
         }
     }
     return `${result}`
   }
-  const result = recursiveExtract(data, "data")
-  return `${result} `
+  const result = recursiveExtract(data, "root")
+  return `${result}`
 }
 export function generateStaticRouteFileV2(appName: string, data: routeList[]) {
   const interfaceName = `staticRouteInterface_${appName}_v2`
@@ -106,10 +107,11 @@ export function generateStaticRouteFileV2(appName: string, data: routeList[]) {
       .map(
         (keyName) => `
             "${keyName}" : {
-            requireParams : { ${data[keyName].requireParams} },
-            responseStructure : { ${data[keyName].responseStructure},    
+            requireParams :  ${data[keyName].requireParams} ,
+            responseStructure : { 
+            data : ${data[keyName].responseStructure},    
             status: "SUCCESS" | "ERROR",
-            message: string } 
+            message: string }
       }`
       )
       .join(", ")

package/src/v2/output/apiConnector_hotel_v2.ts

@@ -1,3 +1,4 @@
+
 import axios from "axios"
 import { staticRouteInterface_hotel_v2 } from "./staticRouteInterface_hotel_v2"
 
@@ -10,7 +11,7 @@ export class GGApi_v2 {
   ): Promise<staticRouteInterface_hotel_v2["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(url as string, { params: { data: requireParams } })
+        .get(url as string, { params: requireParams })
         .then((response) => {
           resolve(response.data)
         })

package/src/v2/output/staticRouteInterface_hotel_v2.ts

@@ -1,32 +1,24 @@
-export interface staticRouteInterface_hotel_v2 {
-  get: {
-    "/api/hotel/users/id": {
-      requireParams: {
-        data: { id: number }
-      }
-      responseStructure: {
-        data: {
-          userData: { id: number; name: string }[]
-        }
-        status: "SUCCESS" | "ERROR"
-        message: string
-      }
-    }
+
+  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 : {   },
   }
-  post: {
-    "/api/hotel/booking/id": {
-      requireParams: {
-        data: { id: number }
-      }
-      responseStructure: {
-        data: {
-          bookingData: { id: number; roomNumber: string }
-        }
-        status: "SUCCESS" | "ERROR"
-        message: string
-      }
-    }
-  }
-  put: {}
-  delete: {}
-}
+  

package/src/v2/run_v2.test.ts

@@ -2,7 +2,31 @@ import express, { Express } from "express"
 import GGExpressV2 from "./GGExpressV2"
 import { toArray } from "./typeResolver"
 import { GGApi_v2 } from "./output/apiConnector_hotel_v2"
-// import { GGApi_v2 } from "./output/apiConnector_hotel_v2"
+
+export const 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",
+  },
+} as const
+
 function run() {
   const app = express()
   const ggapp = new GGExpressV2<"hotel">(app, "hotel", ["./output"])
@@ -11,6 +35,9 @@ function run() {
     {
       requireParams: {
         id: "number",
+        data: hotel_model_const_temp["booking"],
+        name: "string",
+        status: ["on", "off"],
       },
       responseStructure: {
         userData: toArray({
@@ -20,8 +47,11 @@ function run() {
       },
     },
     (req, res, next) => {
-      console.log(req.query)
-      req.query.id
+      // req.query.data.bookingStatus===''
+      req.query.name
+      console.log("req.query", req.query)
+      console.log("req.query.id", req.query.id)
+      // req.query.data.bookingStatus
       return res.json({
         message: "",
         status: "SUCCESS",
@@ -43,6 +73,7 @@ function run() {
       },
     },
     (req, res, next) => {
+      req.body.id
       return res.json({
         message: "",
         status: "SUCCESS",
@@ -59,16 +90,21 @@ function run() {
   app.listen(3002, async () => {
     await ggapp.generateAPIFiles()
     console.log("done")
-    process.exit(0)
+    // process.exit(0)
   })
 }
-run()
+// run()
 
-const x = new GGApi_v2()
-x.post("/api/hotel/booking/id", {
-  data: { id: 1 },
-}).then((response) => {
-  response.status === "ERROR"
-  response.data.bookingData
-  response.data.bookingData.roomNumber
-})
+// setTimeout(() => {
+//   const x = new GGApi_v2()
+//   //@ts-ignore
+//   x.get("http://localhost:3002/api/hotel/users/id", {
+//     id: 1,
+//   })
+//     .then((response) => {
+//       console.log("response", response)
+//     })
+//     .catch((error) => {
+//       console.error("fetch error")
+//     })
+// }, 3000)

package/src/v2/typeResolver.ts

@@ -6,12 +6,15 @@ export type CustomType =
   | `${BaseType}?~`
 
 export type InputNest = { [key in string]: CustomType }
-type InputEnum = string[] | number[]
+
+// Allow readonly tuples (from `as const`) to be treated as enums.
+// type InputEnum = readonly string[] | readonly number[]
+type InputEnum = readonly (string | number)[]
 export type InputParent = {
   [key in string]:
     | CustomType
-    | InputNest
-    | InputNest[]
+    // | InputNest
+    // | InputNest[]
     | InputParent
     | InputParent[]
     | InputEnum
@@ -93,7 +96,14 @@ type checkEnum<T> = T extends InputEnum ? T[number] : convertNest<T>
 type convertChildObjet<T> = {
   [K in keyof T]: chooseType<T[K]>
 }
-type convertObject<T> = T extends object ? convertChildObjet<T> : checkEnum<T>
+// type convertObject<T> = T extends object ? convertChildObjet<T> : checkEnum<T>
+
+type convertObject<T> = T extends readonly any[]
+  ? checkEnum<T>
+  : T extends object
+  ? convertChildObjet<T>
+  : checkEnum<T>
+
 type chooseType<T> = T extends InputEnum ? T[number] : convertObject<T>
 export type convertRoot<T> = {
   [K in keyof T]: chooseType<T[K]>