gg-express 1.0.81 → 1.0.86

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

@@ -15,8 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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"
 function run() {
     const app = (0, express_1.default)();
     const ggapp = new GGExpressV2_1.default(app, "hotel", ["./output"]);
@@ -31,7 +29,8 @@ function run() {
             }),
         },
     }, (req, res, next) => {
-        console.log(req.query);
+        console.log("req.query", req.query);
+        console.log("req.query.id", req.query.id);
         return res.json({
             message: "",
             status: "SUCCESS",
@@ -49,7 +48,7 @@ function run() {
             },
         },
     }, (req, res, next) => {
-        console.log(req.query);
+        req.body.id;
         return res.json({
             message: "",
             status: "SUCCESS",
@@ -64,15 +63,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg-express",
-  "version": "1.0.81",
+  "version": "1.0.86",
   "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/generateStaticRouteFileV2.ts

@@ -72,7 +72,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 ---------------------------
@@ -95,8 +97,8 @@ function parentInputToCode(data: InputParent) {
     }
     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 +108,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

@@ -11,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

@@ -2,23 +2,21 @@
   export interface staticRouteInterface_hotel_v2  {
     get :  { 
             "/api/hotel/users/id" : {
-            requireParams : {  
- data : { id : number }  },
-            responseStructure : {  
- data : {   
+            requireParams :   { id : number }  ,
+            responseStructure : { 
+            data :  {   
  userData : { id : number,name : string }[]  } ,    
             status: "SUCCESS" | "ERROR",
-            message: string } 
+            message: string }
       } },
     post : { 
             "/api/hotel/booking/id" : {
-            requireParams : {  
- data : { id : number }  },
-            responseStructure : {  
- data : {  
+            requireParams :   { id : number }  ,
+            responseStructure : { 
+            data :  {  
  bookingData : { id : number,roomNumber : string } } ,    
             status: "SUCCESS" | "ERROR",
-            message: string } 
+            message: string }
       }  },
     put : {   },
     delete : {   },

package/src/v2/run_v2.test.ts

@@ -2,7 +2,6 @@ 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"
 function run() {
   const app = express()
   const ggapp = new GGExpressV2<"hotel">(app, "hotel", ["./output"])
@@ -20,7 +19,9 @@ function run() {
       },
     },
     (req, res, next) => {
-      console.log(req.query)
+      console.log("req.query", req.query)
+      console.log("req.query.id", req.query.id)
+
       return res.json({
         message: "",
         status: "SUCCESS",
@@ -42,7 +43,7 @@ function run() {
       },
     },
     (req, res, next) => {
-      console.log(req.query)
+      req.body.id
       return res.json({
         message: "",
         status: "SUCCESS",
@@ -59,16 +60,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)