gg-express 1.0.135 → 1.0.136

package/dist/v3/GGExpressV3.d.ts

@@ -4,6 +4,9 @@ import z from "zod";
 export type Method = "get" | "post" | "put" | "delete";
 type MyQueryRequest<RQ extends z.ZodTypeAny> = Request<{}, {}, {}, MyRequestStructure<RQ>, {}>;
 type MyBodyRequest<RQ extends z.ZodTypeAny> = Request<{}, {}, MyRequestStructure<RQ>, {}, {}>;
+export type RequestStructure<RQ extends z.ZodTypeAny> = {
+    data: RQ;
+};
 type MyRequestStructure<RQ extends z.ZodTypeAny> = {
     data: z.infer<RQ>;
 };
@@ -15,19 +18,19 @@ export default class GGExpressV3<appName extends string, urlPrefix extends strin
     constructor(app: Express.Express, appName: appName, outputPath: string[]);
     private rootMethod;
     get<RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny>(url: `${urlPrefix}/${appName}/${string}` | `${urlPrefix}/${appName}/${string}`[], options: {
-        requireParams: RQ;
+        requireParams: RequestStructure<RQ>;
         responseStructure: RS;
     }, ...middlewares: Array<(req: MyQueryRequest<RQ>, res: MyResponse<RS>, next: NextFunction) => void | Promise<void>>): Express.Express;
     post<RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny>(url: `${urlPrefix}/${appName}/${string}` | `${urlPrefix}/${appName}/${string}`[], options: {
-        requireParams: RQ;
+        requireParams: RequestStructure<RQ>;
         responseStructure: RS;
     }, ...middlewares: Array<(req: MyBodyRequest<RQ>, res: MyResponse<RS>, next: NextFunction) => void | Promise<void>>): Express.Express;
     put<RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny>(url: `${urlPrefix}/${appName}/${string}` | `${urlPrefix}/${appName}/${string}`[], options: {
-        requireParams: RQ;
+        requireParams: RequestStructure<RQ>;
         responseStructure: RS;
     }, ...middlewares: Array<(req: MyBodyRequest<RQ>, res: MyResponse<RS>, next: NextFunction) => void | Promise<void>>): Express.Express;
     delete<RQ extends z.ZodTypeAny, RS extends z.ZodTypeAny>(url: `${urlPrefix}/${appName}/${string}` | `${urlPrefix}/${appName}/${string}`[], options: {
-        requireParams: RQ;
+        requireParams: RequestStructure<RQ>;
         responseStructure: RS;
     }, ...middlewares: Array<(req: MyBodyRequest<RQ>, res: MyResponse<RS>, next: NextFunction) => void | Promise<void>>): Express.Express;
     generateAPIFiles(): Promise<void>;

package/dist/v3/generateStaticRouteFileV3.d.ts

@@ -1,11 +1,11 @@
 import z from "zod";
-import { Method } from "./GGExpressV3";
+import { Method, RequestStructure } from "./GGExpressV3";
 import ts from "typescript";
 export declare function typeNodeToString(node: ts.TypeNode): string;
 export type routeListV3 = {
     method: Method;
     url: string;
-    requireParams: z.ZodTypeAny;
+    requireParams: RequestStructure<z.ZodTypeAny>;
     responseStructure: z.ZodTypeAny;
 };
 export declare function generateStaticRouteFileV3(appName: string, data: routeListV3[]): string;

package/dist/v3/generateStaticRouteFileV3.js

@@ -25,7 +25,7 @@ function prepareExportInterfaceData(data) {
 function extract(allData, prepareRoute) {
     for (const route of allData) {
         const auxiliaryTypeStore = (0, zod_to_ts_1.createAuxiliaryTypeStore)();
-        const requireParamsCode = (0, zod_to_ts_1.zodToTs)(route.requireParams, {
+        const requireParamsCode = (0, zod_to_ts_1.zodToTs)(route.requireParams.data, {
             auxiliaryTypeStore,
         });
         const responseStructureCode = (0, zod_to_ts_1.zodToTs)(route.responseStructure, {
@@ -44,7 +44,7 @@ function generateStaticRouteFileV3(appName, data) {
         const keyName = Object.keys(data);
         return keyName
             .map((keyName) => {
-            const requireLine = `requireParams :  ${data[keyName].requireParams}`;
+            const requireLine = `requireParams :  { data :${data[keyName].requireParams} }`;
             const responseLine = `responseStructure : { 
                     data : ${data[keyName].responseStructure},    
                     message: string

package/dist/v3/output/apiConnector_hotel_v3.js

@@ -12,7 +12,7 @@ class GGApi_v3 {
     get(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .get(this.urlPrefix + url, { params: requireParams })
+                .get((this.urlPrefix + url), { params: requireParams })
                 .then((response) => {
                 resolve(response.data);
             })
@@ -25,7 +25,7 @@ class GGApi_v3 {
     post(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .post(this.urlPrefix + url, { data: requireParams })
+                .post((this.urlPrefix + url), { data: requireParams })
                 .then((response) => {
                 resolve(response.data);
             })
@@ -38,7 +38,7 @@ class GGApi_v3 {
     put(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .put(this.urlPrefix + url, { data: requireParams })
+                .put((this.urlPrefix + url), { data: requireParams })
                 .then((response) => {
                 resolve(response.data);
             })
@@ -51,7 +51,9 @@ class GGApi_v3 {
     delete(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .delete(this.urlPrefix + url, { data: { data: requireParams } })
+                .delete((this.urlPrefix + url), {
+                data: { data: requireParams },
+            })
                 .then((response) => {
                 resolve(response.data);
             })

package/dist/v3/output/staticRouteInterface_hotel_v3.d.ts

@@ -2,8 +2,10 @@ export interface staticRouteInterface_hotel_v3 {
     get: {
         "/api/v2/hotel/users/id": {
             requireParams: {
-                name: string;
-                age: number;
+                data: {
+                    name: string;
+                    age: number;
+                };
             };
             responseStructure: {
                 data: {
@@ -13,21 +15,24 @@ export interface staticRouteInterface_hotel_v3 {
                 message: string;
             };
         };
+    };
+    post: {
         "/api/v2/hotel/item": {
             requireParams: {
-                name: string;
-                price?: number | undefined;
+                data: {
+                    name: string;
+                    price?: number | undefined;
+                };
             };
             responseStructure: {
                 data: {
-                    value: string;
+                    value: number;
                     address: string;
                 };
                 message: string;
             };
         };
     };
-    post: {};
     put: {};
     delete: {};
 }

package/dist/v3/run_v3.test.js

@@ -16,6 +16,7 @@ exports.addMyTestMW = exports.hotel_model_const_temp = void 0;
 const express_1 = __importDefault(require("express"));
 const GGExpressV3_1 = __importDefault(require("./GGExpressV3"));
 const zod_1 = __importDefault(require("zod"));
+const apiConnector_hotel_v3_1 = require("./output/apiConnector_hotel_v3");
 exports.hotel_model_const_temp = {
     booking: {
         id: "number",
@@ -48,10 +49,12 @@ function run() {
     const app = (0, express_1.default)();
     const ggapp = new GGExpressV3_1.default(app, "hotel", ["./output"]);
     ggapp.get("/api/v2/hotel/users/id", {
-        requireParams: zod_1.default.object({
-            name: zod_1.default.string(),
-            age: zod_1.default.number(),
-        }),
+        requireParams: {
+            data: zod_1.default.object({
+                name: zod_1.default.string(),
+                age: zod_1.default.number(),
+            }),
+        },
         responseStructure: zod_1.default.object({
             value: zod_1.default.string(),
             address: zod_1.default.string(),
@@ -60,10 +63,12 @@ function run() {
         req.query.data.age;
     }, () => { });
     ggapp.post("/api/v2/hotel/item", {
-        requireParams: zod_1.default.object({
-            name: zod_1.default.string(),
-            price: zod_1.default.number().optional(),
-        }),
+        requireParams: {
+            data: zod_1.default.object({
+                name: zod_1.default.string(),
+                price: zod_1.default.number().optional(),
+            }),
+        },
         responseStructure: zod_1.default.object({
             value: zod_1.default.number(),
             address: zod_1.default.string(),
@@ -77,11 +82,13 @@ function run() {
             value: 1,
         });
     });
-    // const api = new GGApi_v3({ urlPrefix: "xxx" })
-    // api.get("/api/v2/hotel/item", {
-    //   name: "",
-    //   price: 3,
-    // })
+    const api = new apiConnector_hotel_v3_1.GGApi_v3({ urlPrefix: "xxx" });
+    api.get("/api/v2/hotel/users/id", {
+        data: {
+            name: "",
+            age: 0,
+        },
+    });
     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.135",
+  "version": "1.0.136",
   "description": "",
   "main": "dist/main.js",
   "scripts": {

package/src/v3/GGExpressV3.ts

@@ -29,6 +29,10 @@ type MyBodyRequest<RQ extends z.ZodTypeAny> = Request<
   {}
 >
 
+export type RequestStructure<RQ extends z.ZodTypeAny> = {
+  data: RQ
+}
+
 type MyRequestStructure<RQ extends z.ZodTypeAny> = {
   data: z.infer<RQ>
 }
@@ -65,7 +69,7 @@ export default class GGExpressV3<
     method: M,
     url: string | string[],
     options: {
-      requireParams: RQ
+      requireParams: RequestStructure<RQ>
       responseStructure: RS
     },
     ...middlewares: Array<
@@ -110,7 +114,7 @@ export default class GGExpressV3<
       | `${urlPrefix}/${appName}/${string}`
       | `${urlPrefix}/${appName}/${string}`[],
     options: {
-      requireParams: RQ
+      requireParams: RequestStructure<RQ>
       responseStructure: RS
     },
     ...middlewares: Array<
@@ -133,7 +137,7 @@ export default class GGExpressV3<
       | `${urlPrefix}/${appName}/${string}`
       | `${urlPrefix}/${appName}/${string}`[],
     options: {
-      requireParams: RQ
+      requireParams: RequestStructure<RQ>
       responseStructure: RS
     },
     ...middlewares: Array<
@@ -156,7 +160,7 @@ export default class GGExpressV3<
       | `${urlPrefix}/${appName}/${string}`
       | `${urlPrefix}/${appName}/${string}`[],
     options: {
-      requireParams: RQ
+      requireParams: RequestStructure<RQ>
       responseStructure: RS
     },
     ...middlewares: Array<
@@ -179,7 +183,7 @@ export default class GGExpressV3<
       | `${urlPrefix}/${appName}/${string}`
       | `${urlPrefix}/${appName}/${string}`[],
     options: {
-      requireParams: RQ
+      requireParams: RequestStructure<RQ>
       responseStructure: RS
     },
     ...middlewares: Array<

package/src/v3/generateStaticRouteFileV3.ts

@@ -1,5 +1,5 @@
 import z from "zod"
-import { Method } from "./GGExpressV3"
+import { Method, RequestStructure } from "./GGExpressV3"
 import { ConstSchemaType, CustomType } from "../v2/typeResolver"
 import { createAuxiliaryTypeStore, zodToTs } from "zod-to-ts"
 import ts from "typescript"
@@ -20,7 +20,7 @@ export function typeNodeToString(node: ts.TypeNode): string {
 export type routeListV3 = {
   method: Method
   url: string
-  requireParams: z.ZodTypeAny
+  requireParams: RequestStructure<z.ZodTypeAny>
   responseStructure: z.ZodTypeAny
 }
 
@@ -49,7 +49,7 @@ function extract(
 ): PrepareRouteStructure {
   for (const route of allData) {
     const auxiliaryTypeStore = createAuxiliaryTypeStore()
-    const requireParamsCode = zodToTs(route.requireParams, {
+    const requireParamsCode = zodToTs(route.requireParams.data, {
       auxiliaryTypeStore,
     })
     const responseStructureCode = zodToTs(route.responseStructure, {
@@ -73,7 +73,7 @@ export function generateStaticRouteFileV3(
 
     return keyName
       .map((keyName) => {
-        const requireLine = `requireParams :  ${data[keyName].requireParams}`
+        const requireLine = `requireParams :  { data :${data[keyName].requireParams} }`
         const responseLine = `responseStructure : { 
                     data : ${data[keyName].responseStructure},    
                     message: string

package/src/v3/output/apiConnector_hotel_v3.ts

@@ -1,20 +1,19 @@
-
 import axios from "axios"
 import { staticRouteInterface_hotel_v3 } from "./staticRouteInterface_hotel_v3"
 
 export class GGApi_v3 {
-  urlPrefix : string
-  constructor(input:{ urlPrefix : string }) {
+  urlPrefix: string
+  constructor(input: { urlPrefix: string }) {
     this.urlPrefix = input.urlPrefix
   }
 
   get<T extends keyof staticRouteInterface_hotel_v3["get"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["get"][T]["requireParams"]
+    requireParams: staticRouteInterface_hotel_v3["get"][T]["requireParams"],
   ): Promise<staticRouteInterface_hotel_v3["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(this.urlPrefix + url as string, { params: requireParams })
+        .get((this.urlPrefix + url) as string, { params: requireParams })
         .then((response) => {
           resolve(response.data)
         })
@@ -27,11 +26,11 @@ export class GGApi_v3 {
 
   post<T extends keyof staticRouteInterface_hotel_v3["post"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["post"][T]["requireParams"]
+    requireParams: staticRouteInterface_hotel_v3["post"][T]["requireParams"],
   ): Promise<staticRouteInterface_hotel_v3["post"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .post(this.urlPrefix + url as string, { data: requireParams })
+        .post((this.urlPrefix + url) as string, { data: requireParams })
         .then((response) => {
           resolve(response.data)
         })
@@ -43,11 +42,11 @@ export class GGApi_v3 {
   }
   put<T extends keyof staticRouteInterface_hotel_v3["put"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["put"][T]["requireParams"]
+    requireParams: staticRouteInterface_hotel_v3["put"][T]["requireParams"],
   ): Promise<staticRouteInterface_hotel_v3["put"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .put(this.urlPrefix + url as string, { data: requireParams })
+        .put((this.urlPrefix + url) as string, { data: requireParams })
         .then((response) => {
           resolve(response.data)
         })
@@ -59,11 +58,13 @@ export class GGApi_v3 {
   }
   delete<T extends keyof staticRouteInterface_hotel_v3["delete"]>(
     url: T,
-    requireParams: staticRouteInterface_hotel_v3["delete"][T]["requireParams"]
+    requireParams: staticRouteInterface_hotel_v3["delete"][T]["requireParams"],
   ): Promise<staticRouteInterface_hotel_v3["delete"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .delete(this.urlPrefix + url as string, { data: { data: requireParams } })
+        .delete((this.urlPrefix + url) as string, {
+          data: { data: requireParams },
+        })
         .then((response) => {
           resolve(response.data)
         })

package/src/v3/output/staticRouteInterface_hotel_v3.ts

@@ -1,34 +1,38 @@
-
-  export interface staticRouteInterface_hotel_v3  {
-    get :  { 
-            "/api/v2/hotel/users/id" : {
-            requireParams :  {
-    name: string;
-    age: number;
-},responseStructure : { 
-                    data : {
-    value: string;
-    address: string;
-},    
-                    message: string
-            },
-           
-      }, 
-            "/api/v2/hotel/item" : {
-            requireParams :  {
-    name: string;
-    price?: number | undefined;
-},responseStructure : { 
-                    data : {
-    value: string;
-    address: string;
-},    
-                    message: string
-            },
-           
-      } },
-    post : {   },
-    put : {   },
-    delete : {   },
+export interface staticRouteInterface_hotel_v3 {
+  get: {
+    "/api/v2/hotel/users/id": {
+      requireParams: {
+        data: {
+          name: string
+          age: number
+        }
+      }
+      responseStructure: {
+        data: {
+          value: string
+          address: string
+        }
+        message: string
+      }
+    }
   }
-  
+  post: {
+    "/api/v2/hotel/item": {
+      requireParams: {
+        data: {
+          name: string
+          price?: number | undefined
+        }
+      }
+      responseStructure: {
+        data: {
+          value: number
+          address: string
+        }
+        message: string
+      }
+    }
+  }
+  put: {}
+  delete: {}
+}

package/src/v3/run_v3.test.ts

@@ -37,10 +37,12 @@ function run() {
   ggapp.get(
     "/api/v2/hotel/users/id",
     {
-      requireParams: z.object({
-        name: z.string(),
-        age: z.number(),
-      }),
+      requireParams: {
+        data: z.object({
+          name: z.string(),
+          age: z.number(),
+        }),
+      },
       responseStructure: z.object({
         value: z.string(),
         address: z.string(),
@@ -54,10 +56,12 @@ function run() {
   ggapp.post(
     "/api/v2/hotel/item",
     {
-      requireParams: z.object({
-        name: z.string(),
-        price: z.number().optional(),
-      }),
+      requireParams: {
+        data: z.object({
+          name: z.string(),
+          price: z.number().optional(),
+        }),
+      },
       responseStructure: z.object({
         value: z.number(),
         address: z.string(),
@@ -73,11 +77,13 @@ function run() {
       })
     },
   )
-  // const api = new GGApi_v3({ urlPrefix: "xxx" })
-  // api.get("/api/v2/hotel/item", {
-  //   name: "",
-  //   price: 3,
-  // })
+  const api = new GGApi_v3({ urlPrefix: "xxx" })
+  api.get("/api/v2/hotel/users/id", {
+    data: {
+      name: "",
+      age: 0,
+    },
+  })
 
   app.listen(3002, async () => {
     await ggapp.generateAPIFiles()