gg-express 1.0.86 → 1.0.88

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,15 +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");
+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)({
@@ -29,8 +56,11 @@ function run() {
             }),
         },
     }, (req, res, next) => {
+        // 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",

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.86",
+  "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
@@ -91,7 +90,7 @@ 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) + "[] "
         }
     }

package/src/v2/run_v2.test.ts

@@ -2,6 +2,31 @@ import express, { Express } from "express"
 import GGExpressV2 from "./GGExpressV2"
 import { toArray } from "./typeResolver"
 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"])
@@ -10,6 +35,9 @@ function run() {
     {
       requireParams: {
         id: "number",
+        data: hotel_model_const_temp["booking"],
+        name: "string",
+        status: ["on", "off"],
       },
       responseStructure: {
         userData: toArray({
@@ -19,9 +47,11 @@ function run() {
       },
     },
     (req, res, next) => {
+      // 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",

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]>