gg-express 1.0.96 → 1.0.98

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/run_v2.test.js

@@ -142,6 +142,23 @@ 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");

package/dist/v2/test_typeResolver.d.ts

@@ -1,12 +1,13 @@
 import { TypeResolve } from "./typeResolver";
 export declare const ReturnOfCalculateEachDateConst: {
-    readonly itemDetailData: [{
+    readonly itemDetailData: {
         readonly itemID: "number";
         readonly zoneID: "number";
-    }];
+    }[];
     readonly itemDetailData_v2: [{
         readonly id: "number";
     }];
+    readonly bool: "boolean";
     readonly requisitionQuantity: "number";
     readonly usedQuantity: "number";
     readonly date: "string";

package/dist/v2/test_typeResolver.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReturnOfCalculateEachDateConst = void 0;
+const typeResolver_1 = require("./typeResolver");
 const itemDetailDataConst = {
     itemID: "number",
     zoneID: "number",
@@ -9,14 +10,13 @@ const QuantityTypeConst = {
     requisitionQuantity: "number",
     usedQuantity: "number",
 };
-exports.ReturnOfCalculateEachDateConst = Object.assign(Object.assign({ date: "string", itemID: "number" }, QuantityTypeConst), { itemDetailData: [itemDetailDataConst], itemDetailData_v2: [{ id: "number" }] });
+exports.ReturnOfCalculateEachDateConst = Object.assign(Object.assign({ date: "string", itemID: "number" }, QuantityTypeConst), { itemDetailData: (0, typeResolver_1.toArray)(itemDetailDataConst), itemDetailData_v2: [{ id: "number" }], bool: "boolean" });
 const temp = {
-    itemDetailData: [
-        {
-            itemID: 0,
-            zoneID: 0,
-        },
-    ],
+    bool: true,
+    itemDetailData: (0, typeResolver_1.toArray)({
+        itemID: 0,
+        zoneID: 0,
+    }),
     itemDetailData_v2: [
         {
             id: 1,

package/dist/v2/typeResolver.d.ts

@@ -1,12 +1,12 @@
 type Unarray<T> = T extends (infer U)[] ? U : T;
-type BaseType = "string" | "number" | "string[]" | "number[]";
+type BaseType = "string" | "number" | "boolean" | "string[]" | "number[]" | "boolean[]";
 type CustomType = BaseType | `${BaseType}?` | `${BaseType}~` | `${BaseType}?~`;
 type InputEnum = readonly string[] | readonly number[];
 export type ConstSchemaType = {
     [key in string]: CustomType | ConstSchemaType | ConstSchemaType[] | 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 ConstSchemaType>(input: T) => T[];
+type ResolveBase<T extends BaseType> = T extends "string" ? string : T extends "string[]" ? string[] : T extends "number" ? number : T extends "number[]" ? number[] : T extends "boolean" ? boolean : T extends "boolean[]" ? boolean[] : never;
+export declare const toArray: <T>(input: T) => T[];
 type ResolveExtraType<T> = T extends `${infer B}?~` ? ResolveBase<B & BaseType> | null | undefined : T extends `${infer B}?` ? ResolveBase<B & BaseType> | undefined : T extends `${infer B}~` ? ResolveBase<B & BaseType> | null : ResolveBase<T & BaseType>;
 type chooseType<T> = T extends InputEnum ? T[number] : T extends any[] ? chooseType<Unarray<T>>[] : T extends object ? TypeResolve<T> : ResolveExtraType<T>;
 export type TypeResolve<T> = {

package/dist/v2/typeResolver.js

@@ -5,54 +5,3 @@ const toArray = (input) => {
     return [input];
 };
 exports.toArray = toArray;
-// let req2 = {
-//   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",
-//   },
-//   status: ["ACTIVE", "DISABLE"],
-//   rooms: toArray({
-//     id: "number",
-//     status: ["ON", "OFF"],
-//     roomNumber: "string",
-//     log: toArray({
-//       time: "string",
-//       logger: [{ info: "string" }],
-//     }),
-//   }),
-//   data: {
-//     level_1: {
-//       title: "string",
-//       level_2: {
-//         id: "number",
-//         name: "string",
-//       },
-//     },
-//   },
-// } as const satisfies InputParent
-// const data = {} as convertRoot<typeof req2>
-// data.booking.bookingStatus
-// data.status
-// const id = data.booking.id
-// const roomNumber = data.booking.bookingStatus === data.booking.bookingStatus
-// data.rooms.map((row) => row.status === "OFF")
-// data.data.level_1.level_2.id
-// data.booking.createTime
-// req2.data.level_1.level_2

package/package.json

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

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/run_v2.test.ts

@@ -1,5 +1,6 @@
 import express from "express"
 import GGExpressV2 from "./GGExpressV2"
+import { toArray } from "./typeResolver"
 
 export const hotel_model_const_temp = {
   booking: {
@@ -138,6 +139,28 @@ 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")

package/src/v2/test_typeResolver.ts

@@ -1,4 +1,4 @@
-import { TypeResolve, ConstSchemaType } from "./typeResolver"
+import { TypeResolve, ConstSchemaType, toArray } from "./typeResolver"
 
 const itemDetailDataConst = {
   itemID: "number",
@@ -13,8 +13,9 @@ export const ReturnOfCalculateEachDateConst = {
   date: "string",
   itemID: "number",
   ...QuantityTypeConst,
-  itemDetailData: [itemDetailDataConst],
+  itemDetailData: toArray(itemDetailDataConst),
   itemDetailData_v2: [{ id: "number" }],
+  bool: "boolean",
 } as const satisfies ConstSchemaType
 
 export type ReturnOfCalculateEachDate = TypeResolve<
@@ -22,12 +23,11 @@ export type ReturnOfCalculateEachDate = TypeResolve<
 >
 
 const temp: ReturnOfCalculateEachDate = {
-  itemDetailData: [
-    {
-      itemID: 0,
-      zoneID: 0,
-    },
-  ],
+  bool: true,
+  itemDetailData: toArray({
+    itemID: 0,
+    zoneID: 0,
+  }),
   itemDetailData_v2: [
     {
       id: 1,

package/src/v2/typeResolver.ts

@@ -1,9 +1,16 @@
 type Unarray<T> = T extends (infer U)[] ? U : T
 
-type BaseType = "string" | "number" | "string[]" | "number[]"
-type CustomType = BaseType | `${BaseType}?` | `${BaseType}~` | `${BaseType}?~`
+type BaseType =
+  | "string"
+  | "number"
+  | "boolean"
+  | "string[]"
+  | "number[]"
+  | "boolean[]"
 
+type CustomType = BaseType | `${BaseType}?` | `${BaseType}~` | `${BaseType}?~`
 type InputEnum = readonly string[] | readonly number[]
+
 export type ConstSchemaType = {
   [key in string]: CustomType | ConstSchemaType | ConstSchemaType[] | InputEnum
 }
@@ -15,10 +22,14 @@ type ResolveBase<T extends BaseType> = T extends "string"
   ? number
   : T extends "number[]"
   ? number[]
+  : T extends "boolean"
+  ? boolean
+  : T extends "boolean[]"
+  ? boolean[]
   : never
 
-export const toArray = <T extends ConstSchemaType>(input: T) => {
-  return [input]
+export const toArray = <T>(input: T): T[] => {
+  return [input] as T[]
 }
 
 type ResolveExtraType<T> =
@@ -34,8 +45,6 @@ type ResolveExtraType<T> =
     : // plain primitive
       ResolveBase<T & BaseType>
 
-// type checkEnum<T> = T extends InputEnum ? T[number] : ResolveExtraType<T>
-
 type chooseType<T> = T extends InputEnum
   ? T[number]
   : T extends any[]
@@ -43,62 +52,7 @@ type chooseType<T> = T extends InputEnum
   : T extends object
   ? TypeResolve<T>
   : ResolveExtraType<T>
-// : checkEnum<T>
 
 export type TypeResolve<T> = {
   [K in keyof T]: chooseType<T[K]>
 }
-
-// let req2 = {
-//   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",
-//   },
-//   status: ["ACTIVE", "DISABLE"],
-//   rooms: toArray({
-//     id: "number",
-//     status: ["ON", "OFF"],
-//     roomNumber: "string",
-//     log: toArray({
-//       time: "string",
-//       logger: [{ info: "string" }],
-//     }),
-//   }),
-
-//   data: {
-//     level_1: {
-//       title: "string",
-//       level_2: {
-//         id: "number",
-//         name: "string",
-//       },
-//     },
-//   },
-// } as const satisfies InputParent
-// const data = {} as convertRoot<typeof req2>
-
-// data.booking.bookingStatus
-// data.status
-// const id = data.booking.id
-// const roomNumber = data.booking.bookingStatus === data.booking.bookingStatus
-// data.rooms.map((row) => row.status === "OFF")
-// data.data.level_1.level_2.id
-// data.booking.createTime
-// req2.data.level_1.level_2