gg-express 1.0.97 → 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg-express",
-  "version": "1.0.97",
+  "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

@@ -139,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/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
 }