gg-express 1.0.27 → 1.0.30

package/dist/GGApi.js

@@ -19,7 +19,7 @@ class GGApi {
     get(url, requireParams) {
         return new Promise((resolve, reject) => {
             axios_1.default
-                .get(url, { params: requireParams })
+                .get(url, { params: { data: requireParams } })
                 .then((response) => {
                 resolve(response.data);
             })
@@ -69,11 +69,13 @@ exports.GGApi = GGApi;
 function run() {
     return __awaiter(this, void 0, void 0, function* () {
         const api = new GGApi();
-        const data = yield api.post("/api/item", {
-            parameter: { bankID: 2 },
-            data: [{ id: 2, name: "2" }],
+        // const data = await api.post("/api/item", {
+        //   parameter: { lotNumber: 1223 },
+        //   data: [],
+        // })
+        const data2 = yield api.get(("http://localhost:3002" + "/api/users/id"), {
+            data: [{ id: 2 }, { id: 3 }, { id: 20 }],
         });
-        const data2 = yield api.get("/api/users", {});
-        data.data;
     });
 }
+run();

package/dist/GGExpress.js

@@ -14,6 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const chalk_1 = __importDefault(require("chalk"));
 const myExpressRouteList = [];
 class GGExpress {
     constructor(app, outputPath) {
@@ -112,7 +113,16 @@ class GGExpress {
                 let rawString = ``;
                 if (data.length === 0)
                     return "";
-                rawString = data
+                const filterDuplicateUrlOut = [];
+                for (let row of data) {
+                    const temp = filterDuplicateUrlOut.filter((fRow) => fRow.method === row.method && fRow.url === row.url);
+                    if (temp.length <= 0)
+                        filterDuplicateUrlOut.push(row);
+                    else {
+                        console.log(chalk_1.default.yellow(`!!! found duplicate url ${row.method} : ${row.url} -- system will keep only first one it found.`));
+                    }
+                }
+                rawString = filterDuplicateUrlOut
                     .map((row) => {
                     const parameterCode = genParamCodeParameter(row.requireParams);
                     const parameterDataCode = genDataParamCode(row.requireParams);
@@ -162,7 +172,7 @@ class GGExpress {
         return __awaiter(this, void 0, void 0, function* () {
             // const code = await fs.readFileSync("./GGApi.ts")
             const code = `
-    import axios from "axios"
+ import axios from "axios"
 import { staticRouteInterface } from "./staticRouteInterface"
 
 export class GGApi {
@@ -174,7 +184,7 @@ export class GGApi {
   ): Promise<staticRouteInterface["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(url as string, { params: requireParams })
+        .get(url as string, { params: { data: requireParams } })
         .then((response) => {
           resolve(response.data)
         })

package/dist/parseQueryJSON.d.ts

@@ -0,0 +1,2 @@
+import { NextFunction, Request, Response } from "express";
+export declare function parseQueryJSON(req: Request, res: Response, next: NextFunction): void;

package/dist/parseQueryJSON.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseQueryJSON = parseQueryJSON;
+function parseQueryJSON(req, res, next) {
+    // Check if there's any query parameter to parse
+    if (req.query) {
+        for (const key in req.query) {
+            if (Array.isArray(req.query[key])) {
+                // If the query param is an array of stringified JSON, parse each item
+                req.query[key] = req.query[key].map((item) => {
+                    try {
+                        return JSON.parse(item);
+                    }
+                    catch (err) {
+                        console.error(`Failed to parse query parameter: ${item}`);
+                        return item; // Return the original if parsing fails
+                    }
+                });
+            }
+            else if (typeof req.query[key] === "string") {
+                // If the query param is a stringified JSON, attempt to parse it
+                try {
+                    req.query[key] = JSON.parse(req.query[key]);
+                }
+                catch (err) {
+                    console.error(`Failed to parse query parameter: ${req.query[key]}`);
+                    // Keep the original string if parsing fails
+                }
+            }
+        }
+    }
+    next(); // Call next middleware in the stack
+}

package/dist/staticRouteInterface.d.ts

@@ -1,7 +1,11 @@
 export interface staticRouteInterface {
     get: {
-        "/api/users": {
-            requireParams: {};
+        "/api/users/id": {
+            requireParams: {
+                data: {
+                    id: number;
+                }[];
+            };
             responseStructure: {
                 status: "SUCCESS" | "ERROR";
                 message: string;
@@ -20,11 +24,12 @@ export interface staticRouteInterface {
         "/api/item": {
             requireParams: {
                 parameter: {
-                    bankID: number;
+                    lotNumber: number;
                 };
                 data: {
                     id: number;
                     name: string;
+                    price: number;
                 }[];
             };
             responseStructure: {

package/dist/test.js

@@ -8,11 +8,11 @@ const express_1 = __importDefault(require("express"));
 function run() {
     const app = (0, express_1.default)();
     const ggapp = new GGExpress_1.default(app, ["./"]);
-    ggapp.get("/api/users", {
+    ggapp.get("/api/users/id", {
         requireParams: {
             parameter: {},
-            dataType: "singleObject",
-            structure: {},
+            dataType: "arrayObject",
+            structure: { id: "number" },
         },
         responseStructure: {
             parameter: { numberOfPeople: "number", itemName: "string" },
@@ -23,7 +23,7 @@ function run() {
             },
         },
     }, (req, res, next) => {
-        const data = req.body.data.parameter;
+        console.log(req.query);
         return res.json({
             message: "",
             status: "SUCCESS",
@@ -80,7 +80,7 @@ function run() {
             },
         });
     });
-    app.listen(3000, () => {
+    app.listen(3002, () => {
         ggapp.generateAPIFiles();
     });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg-express",
-  "version": "1.0.27",
+  "version": "1.0.30",
   "description": "",
   "main": "dist/GGExpress.js",
   "scripts": {
@@ -13,6 +13,7 @@
     "@types/axios": "^0.14.0",
     "app-root-path": "^3.1.0",
     "axios": "^1.7.7",
+    "chalk": "^4.1.2",
     "express": "^4.21.1",
     "fs": "^0.0.1-security",
     "path": "^0.12.7"

package/src/GGApi.ts

@@ -10,7 +10,7 @@ export class GGApi {
   ): Promise<staticRouteInterface["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(url as string, { params: requireParams })
+        .get(url as string, { params: { data: requireParams } })
         .then((response) => {
           resolve(response.data)
         })
@@ -69,11 +69,16 @@ export class GGApi {
 
 async function run() {
   const api = new GGApi()
-  const data = await api.post("/api/item", {
-    parameter: { bankID: 2 },
-    data: [{ id: 2, name: "2" }],
-  })
+  // const data = await api.post("/api/item", {
+  //   parameter: { lotNumber: 1223 },
+  //   data: [],
+  // })
 
-  const data2 = await api.get("/api/users", {})
-  data.data
+  const data2 = await api.get(
+    ("http://localhost:3002" + "/api/users/id") as any,
+    {
+      data: [{ id: 2 }, { id: 3 }, { id: 20 }],
+    }
+  )
 }
+run()

package/src/GGExpress.ts

@@ -3,6 +3,8 @@ import { NextFunction, Request, Response } from "express"
 import Express from "express-serve-static-core"
 import fs from "fs"
 import path from "path"
+import chalk from "chalk"
+
 // export { GGApi } from "./GGApi"
 type Unarray<T> = T extends (infer U)[] ? U : T
 type AsConstArray<T extends readonly any[]> = [...T]
@@ -302,7 +304,23 @@ export default class GGExpress {
     const genInterfaceString = (data: typeof myExpressRouteList) => {
       let rawString = ``
       if (data.length === 0) return ""
-      rawString = data
+
+      const filterDuplicateUrlOut: typeof data = []
+      for (let row of data) {
+        const temp = filterDuplicateUrlOut.filter(
+          (fRow) => fRow.method === row.method && fRow.url === row.url
+        )
+        if (temp.length <= 0) filterDuplicateUrlOut.push(row)
+        else {
+          console.log(
+            chalk.yellow(
+              `!!! found duplicate url ${row.method} : ${row.url} -- system will keep only first one it found.`
+            )
+          )
+        }
+      }
+
+      rawString = filterDuplicateUrlOut
         .map((row) => {
           const parameterCode = genParamCodeParameter(row.requireParams)
           const parameterDataCode = genDataParamCode(row.requireParams)
@@ -357,7 +375,7 @@ export default class GGExpress {
   private async generateGGApi(filePathWithFileName: string) {
     // const code = await fs.readFileSync("./GGApi.ts")
     const code = `
-    import axios from "axios"
+ import axios from "axios"
 import { staticRouteInterface } from "./staticRouteInterface"
 
 export class GGApi {
@@ -369,7 +387,7 @@ export class GGApi {
   ): Promise<staticRouteInterface["get"][T]["responseStructure"]> {
     return new Promise((resolve, reject) => {
       axios
-        .get(url as string, { params: requireParams })
+        .get(url as string, { params: { data: requireParams } })
         .then((response) => {
           resolve(response.data)
         })

package/src/parseQueryJSON.ts

@@ -0,0 +1,33 @@
+import { NextFunction, Request, Response } from "express"
+
+export function parseQueryJSON(
+  req: Request,
+  res: Response,
+  next: NextFunction
+) {
+  // Check if there's any query parameter to parse
+  if (req.query) {
+    for (const key in req.query) {
+      if (Array.isArray(req.query[key])) {
+        // If the query param is an array of stringified JSON, parse each item
+        req.query[key] = req.query[key].map((item) => {
+          try {
+            return JSON.parse(item as any)
+          } catch (err) {
+            console.error(`Failed to parse query parameter: ${item}`)
+            return item // Return the original if parsing fails
+          }
+        })
+      } else if (typeof req.query[key] === "string") {
+        // If the query param is a stringified JSON, attempt to parse it
+        try {
+          req.query[key] = JSON.parse(req.query[key])
+        } catch (err) {
+          console.error(`Failed to parse query parameter: ${req.query[key]}`)
+          // Keep the original string if parsing fails
+        }
+      }
+    }
+  }
+  next() // Call next middleware in the stack
+}

package/src/staticRouteInterface.ts

@@ -1,13 +1,13 @@
 export interface staticRouteInterface {
-        get : {  "/api/users" : { 
-          requireParams : {},
+        get : {  "/api/users/id" : { 
+          requireParams : { data:{ id : number}[]},
           responseStructure : { 
           status : "SUCCESS" | "ERROR",
           message : string,
           parameter : { numberOfPeople : number, itemName : string}, data : {  id : number, name : string } []}
         }  },
         post : {  "/api/item" : { 
-          requireParams : { parameter:{ bankID : number} , data:{ id : number, name : string}[]},
+          requireParams : { parameter:{ lotNumber : number} , data:{ id : number, name : string, price : number}[]},
           responseStructure : { 
           status : "SUCCESS" | "ERROR",
           message : string,

package/src/test.ts

@@ -4,12 +4,12 @@ function run() {
   const app = express()
   const ggapp = new GGExpress(app, ["./"])
   ggapp.get(
-    "/api/users",
+    "/api/users/id",
     {
       requireParams: {
         parameter: {},
-        dataType: "singleObject",
-        structure: {},
+        dataType: "arrayObject",
+        structure: { id: "number" },
       },
       responseStructure: {
         parameter: { numberOfPeople: "number", itemName: "string" },
@@ -21,7 +21,7 @@ function run() {
       },
     },
     (req, res, next) => {
-      const data = req.body.data.parameter
+      console.log(req.query)
       return res.json({
         message: "",
         status: "SUCCESS",
@@ -33,6 +33,7 @@ function run() {
       })
     }
   )
+
   ggapp.post(
     "/api/item",
     {
@@ -84,7 +85,7 @@ function run() {
       })
     }
   )
-  app.listen(3000, () => {
+  app.listen(3002, () => {
     ggapp.generateAPIFiles()
   })
 }