gg-express 1.0.81 → 1.0.83

package/dist/run.test.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -109,8 +118,9 @@ function run() {
             },
         });
     });
-    app.listen(3002, () => {
-        ggapp.generateAPIFiles();
-    });
+    app.listen(3002, () => __awaiter(this, void 0, void 0, function* () {
+        yield ggapp.generateAPIFiles();
+        process.exit();
+    }));
 }
 run();

package/dist/v2/GGExpressV2.d.ts

@@ -2,7 +2,7 @@ import { NextFunction, Request, Response } from "express";
 import Express from "express-serve-static-core";
 import { convertRoot, InputParent } from "./typeResolver";
 export type Method = "get" | "post" | "put" | "delete";
-type ReqByMethod<M extends Method, RQ extends InputParent> = M extends "get" ? convertRoot<MyRequestQuery<RQ>> : convertRoot<MyRequestBody<RQ>>;
+type MyRequest<M extends Method, RQ extends InputParent> = M extends "get" ? convertRoot<MyRequestQuery<RQ>> : convertRoot<MyRequestBody<RQ>>;
 type MyRequestQuery<T extends InputParent> = Request<{}, {}, {}, T, {}>;
 type MyRequestBody<T extends InputParent> = Request<{}, {}, T, {}, {}>;
 type MyResponse<T extends InputParent> = Response<{
@@ -19,19 +19,19 @@ export default class GGExpressV2<appName extends string> {
     get<RQ extends InputParent, RS extends InputParent>(url: `/api/${appName | "seed"}/${string}` | `/api/${appName | "seed"}/${string}`[], options: {
         requireParams: RQ;
         responseStructure: RS;
-    }, ...middlewares: Array<(req: ReqByMethod<"get", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
+    }, ...middlewares: Array<(req: MyRequest<"get", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
     post<RQ extends InputParent, RS extends InputParent>(url: `/api/${appName | "seed"}/${string}` | `/api/${appName | "seed"}/${string}`[], options: {
         requireParams: RQ;
         responseStructure: RS;
-    }, ...middlewares: Array<(req: ReqByMethod<"post", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
+    }, ...middlewares: Array<(req: MyRequest<"post", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
     put<RQ extends InputParent, RS extends InputParent>(url: `/api/${appName | "seed"}/${string}` | `/api/${appName | "seed"}/${string}`[], options: {
         requireParams: RQ;
         responseStructure: RS;
-    }, ...middlewares: Array<(req: ReqByMethod<"put", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
+    }, ...middlewares: Array<(req: MyRequest<"put", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
     delete<RQ extends InputParent, RS extends InputParent>(url: `/api/${appName | "seed"}/${string}` | `/api/${appName | "seed"}/${string}`[], options: {
         requireParams: RQ;
         responseStructure: RS;
-    }, ...middlewares: Array<(req: ReqByMethod<"delete", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
+    }, ...middlewares: Array<(req: MyRequest<"delete", RQ>, res: MyResponse<RS>, next: NextFunction) => any>): Express.Express;
     generateAPIFiles(): Promise<void>;
     private generateStaticRouteFile;
 }

package/dist/v2/generateGGApi_v2.js

@@ -20,7 +20,7 @@ export class GGApi_v2 {
   ): Promise<${tempInterfaceName}["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/dist/v2/run_v2.test.js

@@ -32,6 +32,7 @@ function run() {
         },
     }, (req, res, next) => {
         console.log(req.query);
+        req.query.id;
         return res.json({
             message: "",
             status: "SUCCESS",
@@ -49,7 +50,6 @@ function run() {
             },
         },
     }, (req, res, next) => {
-        console.log(req.query);
         return res.json({
             message: "",
             status: "SUCCESS",

package/package.json

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

package/src/run.test.ts

@@ -119,8 +119,9 @@ function run() {
       })
     }
   )
-  app.listen(3002, () => {
-    ggapp.generateAPIFiles()
+  app.listen(3002, async () => {
+    await ggapp.generateAPIFiles()
+    process.exit()
   })
 }
 run()

package/src/v2/GGExpressV2.ts

@@ -9,9 +9,11 @@ import { generateGGApi_v2 } from "./generateGGApi_v2"
 type Unarray<T> = T extends (infer U)[] ? U : T
 export type Method = "get" | "post" | "put" | "delete"
 
-type ReqByMethod<M extends Method, RQ extends InputParent> = M extends "get"
-  ? convertRoot<MyRequestQuery<RQ>>
-  : convertRoot<MyRequestBody<RQ>>
+type MyRequest<M extends Method, RQ extends InputParent> = M extends "get"
+  ? //get
+    convertRoot<MyRequestQuery<RQ>>
+  : // post, put, delete
+    convertRoot<MyRequestBody<RQ>>
 
 type MyRequestQuery<T extends InputParent> = Request<{}, {}, {}, T, {}>
 type MyRequestBody<T extends InputParent> = Request<{}, {}, T, {}, {}>
@@ -52,7 +54,7 @@ export default class GGExpressV2<appName extends string> {
     },
     ...middlewares: Array<
       (
-        req: ReqByMethod<M, RQ>,
+        req: MyRequest<M, RQ>,
         res: MyResponse<RS>,
         next: NextFunction
       ) => void | Promise<void>
@@ -85,7 +87,7 @@ export default class GGExpressV2<appName extends string> {
         (mw) =>
           ((req: Request, res: Response, next: NextFunction) =>
             mw(
-              req as unknown as ReqByMethod<M, RQ>,
+              req as unknown as MyRequest<M, RQ>,
               res as MyResponse<RS>,
               next
             )) as Express.RequestHandler
@@ -102,7 +104,7 @@ export default class GGExpressV2<appName extends string> {
     },
     ...middlewares: Array<
       (
-        req: ReqByMethod<"get", RQ>,
+        req: MyRequest<"get", RQ>,
         res: MyResponse<RS>,
         next: NextFunction
       ) => any
@@ -121,7 +123,7 @@ export default class GGExpressV2<appName extends string> {
     },
     ...middlewares: Array<
       (
-        req: ReqByMethod<"post", RQ>,
+        req: MyRequest<"post", RQ>,
         res: MyResponse<RS>,
         next: NextFunction
       ) => any
@@ -139,7 +141,7 @@ export default class GGExpressV2<appName extends string> {
     },
     ...middlewares: Array<
       (
-        req: ReqByMethod<"put", RQ>,
+        req: MyRequest<"put", RQ>,
         res: MyResponse<RS>,
         next: NextFunction
       ) => any
@@ -157,7 +159,7 @@ export default class GGExpressV2<appName extends string> {
     },
     ...middlewares: Array<
       (
-        req: ReqByMethod<"delete", RQ>,
+        req: MyRequest<"delete", RQ>,
         res: MyResponse<RS>,
         next: NextFunction
       ) => any

package/src/v2/generateGGApi_v2.ts

@@ -18,7 +18,7 @@ export class GGApi_v2 {
   ): Promise<${tempInterfaceName}["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/apiConnector_hotel_v2.ts

@@ -1,4 +1,3 @@
-
 import axios from "axios"
 import { staticRouteInterface_hotel_v2 } from "./staticRouteInterface_hotel_v2"
 

package/src/v2/output/staticRouteInterface_hotel_v2.ts

@@ -1,26 +1,32 @@
-
-  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 } 
-      } },
-    post : { 
-            "/api/hotel/booking/id" : {
-            requireParams : {  
- data : { 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: {
+        data: { id: number }
+      }
+      responseStructure: {
+        data: {
+          userData: { id: number; name: string }[]
+        }
+        status: "SUCCESS" | "ERROR"
+        message: string
+      }
+    }
   }
-  
+  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

@@ -21,6 +21,7 @@ function run() {
     },
     (req, res, next) => {
       console.log(req.query)
+      req.query.id
       return res.json({
         message: "",
         status: "SUCCESS",
@@ -42,7 +43,6 @@ function run() {
       },
     },
     (req, res, next) => {
-      console.log(req.query)
       return res.json({
         message: "",
         status: "SUCCESS",