prisma-generator-express 1.11.3 → 1.11.4

package/dist/helpers/generateQsParser.js

@@ -3,48 +3,54 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateParseQueryParams = void 0;
 function generateParseQueryParams() {
     return `/**
-    * Type guard to check if a value is an object.
-    * @param {unknown} value - The value to check.
-    * @returns {boolean} True if the value is an object, false otherwise.
-    */
-  const isObject = (value: unknown): value is Record<string, unknown> => {
-    return typeof value === "object" && value !== null;
-  };
-  
-  /**
-    * Parses a query value to convert strings to their respective types.
-    * @param {string} value - The query value to parse.
-    * @returns {any} The parsed value.
-    */
-  const parseQueryValue = (value: string): unknown => {
-    if (value === "true") return true;
-    if (value === "false") return false;
-    if (value === "null") return null;
-    if (!isNaN(Number(value))) return Number(value);
-    return value;
-  };
-  
-  /**
-    * Recursively parses query parameters to convert strings to their respective types.
-    * @param {unknown} params - The query parameters to parse.
-    * @returns {unknown} The parsed query parameters.
-    */
-  export const parseQueryParams = (params: unknown): unknown => {
-    if (typeof params === "string") {
-      return parseQueryValue(params);
-    }
-    if (Array.isArray(params)) {
-      return params.map(parseQueryParams);
-    }
-    if (isObject(params)) {
-      const parsedParams: Record<string, unknown> = {};
-      for (const key in params) {
-        parsedParams[key] = parseQueryParams(params[key]);
-      }
-      return parsedParams;
-    }
-    return params;
-  };`;
+  * Type guard to check if a value is an object.
+  * @param {unknown} value - The value to check.
+  * @returns {boolean} True if the value is an object, false otherwise.
+  */
+ const isObject = (value: unknown): value is Record<string, unknown> => {
+   return typeof value === "object" && value !== null;
+ };
+ 
+ /**
+  * Parses a query value to convert strings to their respective types.
+  * @param {string} value - The query value to parse.
+  * @returns {any} The parsed value.
+  */
+ const parseQueryValue = (value: string): unknown => {
+   if (value === "true") return true;
+   if (value === "false") return false;
+   if (value === "null") return null;
+   if (!isNaN(Number(value))) return Number(value);
+   return value;
+ };
+ 
+ /**
+  * Recursively parses query parameters to convert strings to their respective types.
+  * @param {unknown} params - The query parameters to parse.
+  * @returns {unknown} The parsed query parameters.
+  */
+ export const parseQueryParams = (params: unknown): unknown => {
+   if (typeof params === "string") {
+     return parseQueryValue(params);
+   }
+   if (Array.isArray(params)) {
+     return params.map(parseQueryParams);
+   }
+   if (isObject(params)) {
+     const parsedParams: Record<string, unknown> = {};
+     for (const key in params) {
+       if (key === "AND" || key === "OR" || key === "NOT") {
+         parsedParams[key] = Array.isArray(params[key])
+           ? (params[key] as unknown[]).map(parseQueryParams)
+           : parseQueryParams(params[key]);
+       } else {
+         parsedParams[key] = parseQueryParams(params[key]);
+       }
+     }
+     return parsedParams;
+   }
+   return params;
+ };`;
 }
 exports.generateParseQueryParams = generateParseQueryParams;
 //# sourceMappingURL=generateQsParser.js.map

package/dist/helpers/generateQsParser.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateQsParser.js","sourceRoot":"","sources":["../../src/helpers/generateQsParser.ts"],"names":[],"mappings":";;;AAAA,SAAgB,wBAAwB;IACtC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA0CJ,CAAA;AACL,CAAC;AA5CD,4DA4CC"}
+{"version":3,"file":"generateQsParser.js","sourceRoot":"","sources":["../../src/helpers/generateQsParser.ts"],"names":[],"mappings":";;;AAAA,SAAgB,wBAAwB;IACtC,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAgDL,CAAA;AACJ,CAAC;AAlDD,4DAkDC"}

package/dist/helpers/generateRouteFile.js

@@ -21,6 +21,7 @@ import { ${modelName}Aggregate } from './${modelName}Aggregate';
 import { ${modelName}Count } from './${modelName}Count';
 import { ${modelName}GroupBy } from './${modelName}GroupBy';
 import { RouteConfig } from "../RouteConfig";
+import qs from "qs";
 import { parseQueryParams } from "../ParseQueryParams";
 
 const defaultBeforeAfter = {
@@ -45,8 +46,8 @@ export function ${routerFunctionName}(config: RouteConfig<RequestHandler>) {
     handler: RequestHandler
   ) => {
     router[method](basePath + path, (req, res, next) => {
-      req.query = parseQueryParams(req.query) as ParsedQs;
-      next();
+      if (req.query)
+        req.query = parseQueryParams(qs.parse(req.query as Record<string, string>)) as ParsedQs;      next();
     }, ...middlewares, handler);
   };
 

package/dist/helpers/generateRouteFile.js.map

@@ -1 +1 @@
-{"version":3,"file":"generateRouteFile.js","sourceRoot":"","sources":["../../src/helpers/generateRouteFile.ts"],"names":[],"mappings":";;;AAEA,SAAgB,sBAAsB,CAAC,EACrC,KAAK,GAGN;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAA;IAC5B,MAAM,kBAAkB,GAAG,GAAG,SAAS,QAAQ,CAAA;IAE/C,OAAO;;;WAGE,SAAS,uBAAuB,SAAS;WACzC,SAAS,sBAAsB,SAAS;WACxC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,oBAAoB,SAAS;WACtC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,oBAAoB,SAAS;WACtC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,oBAAoB,SAAS;WACtC,SAAS,oBAAoB,SAAS;WACtC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,uBAAuB,SAAS;WACzC,SAAS,mBAAmB,SAAS;WACrC,SAAS,qBAAqB,SAAS;;;;;;;;;;qCAUb,SAAS;;;;;kBAK5B,kBAAkB;;iFAE6C,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;0CAgB9D,SAAS;;;;;;;;qCAQd,SAAS;;;;;;;;wCAQN,SAAS;;;;;;;;sCAQX,SAAS;;;;;;;;0CAQL,SAAS;;;;;;;;qCAQd,SAAS;;;;;;;;yCAQL,SAAS;;;;;;;;uCAQX,SAAS;;;;;;;;wCAQR,SAAS;;;;;;;;4CAQL,SAAS;;;;;;;;8CAQP,SAAS;;;;;;;;0CAQb,SAAS;;;;;;;;4CAQP,SAAS;;;;;;;;CAQpD,CAAA;AACD,CAAC;AAjKD,wDAiKC"}
+{"version":3,"file":"generateRouteFile.js","sourceRoot":"","sources":["../../src/helpers/generateRouteFile.ts"],"names":[],"mappings":";;;AAEA,SAAgB,sBAAsB,CAAC,EACrC,KAAK,GAGN;IACC,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAA;IAC5B,MAAM,kBAAkB,GAAG,GAAG,SAAS,QAAQ,CAAA;IAE/C,OAAO;;;WAGE,SAAS,uBAAuB,SAAS;WACzC,SAAS,sBAAsB,SAAS;WACxC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,oBAAoB,SAAS;WACtC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,oBAAoB,SAAS;WACtC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,oBAAoB,SAAS;WACtC,SAAS,oBAAoB,SAAS;WACtC,SAAS,wBAAwB,SAAS;WAC1C,SAAS,uBAAuB,SAAS;WACzC,SAAS,mBAAmB,SAAS;WACrC,SAAS,qBAAqB,SAAS;;;;;;;;;;;qCAWb,SAAS;;;;;kBAK5B,kBAAkB;;iFAE6C,SAAS,CAAC,WAAW,EAAE;;;;;;;;;;;;;;;;0CAgB9D,SAAS;;;;;;;;qCAQd,SAAS;;;;;;;;wCAQN,SAAS;;;;;;;;sCAQX,SAAS;;;;;;;;0CAQL,SAAS;;;;;;;;qCAQd,SAAS;;;;;;;;yCAQL,SAAS;;;;;;;;uCAQX,SAAS;;;;;;;;wCAQR,SAAS;;;;;;;;4CAQL,SAAS;;;;;;;;8CAQP,SAAS;;;;;;;;0CAQb,SAAS;;;;;;;;4CAQP,SAAS;;;;;;;;CAQpD,CAAA;AACD,CAAC;AAlKD,wDAkKC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "prisma-generator-express",
   "description": "Prisma generator of Express CRUD API",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "main": "dist/generator.js",
   "license": "MIT",
   "bin": {

package/src/helpers/generateQsParser.ts

@@ -1,45 +1,51 @@
 export function generateParseQueryParams() {
   return `/**
-    * Type guard to check if a value is an object.
-    * @param {unknown} value - The value to check.
-    * @returns {boolean} True if the value is an object, false otherwise.
-    */
-  const isObject = (value: unknown): value is Record<string, unknown> => {
-    return typeof value === "object" && value !== null;
-  };
-  
-  /**
-    * Parses a query value to convert strings to their respective types.
-    * @param {string} value - The query value to parse.
-    * @returns {any} The parsed value.
-    */
-  const parseQueryValue = (value: string): unknown => {
-    if (value === "true") return true;
-    if (value === "false") return false;
-    if (value === "null") return null;
-    if (!isNaN(Number(value))) return Number(value);
-    return value;
-  };
-  
-  /**
-    * Recursively parses query parameters to convert strings to their respective types.
-    * @param {unknown} params - The query parameters to parse.
-    * @returns {unknown} The parsed query parameters.
-    */
-  export const parseQueryParams = (params: unknown): unknown => {
-    if (typeof params === "string") {
-      return parseQueryValue(params);
-    }
-    if (Array.isArray(params)) {
-      return params.map(parseQueryParams);
-    }
-    if (isObject(params)) {
-      const parsedParams: Record<string, unknown> = {};
-      for (const key in params) {
-        parsedParams[key] = parseQueryParams(params[key]);
-      }
-      return parsedParams;
-    }
-    return params;
-  };`
+  * Type guard to check if a value is an object.
+  * @param {unknown} value - The value to check.
+  * @returns {boolean} True if the value is an object, false otherwise.
+  */
+ const isObject = (value: unknown): value is Record<string, unknown> => {
+   return typeof value === "object" && value !== null;
+ };
+ 
+ /**
+  * Parses a query value to convert strings to their respective types.
+  * @param {string} value - The query value to parse.
+  * @returns {any} The parsed value.
+  */
+ const parseQueryValue = (value: string): unknown => {
+   if (value === "true") return true;
+   if (value === "false") return false;
+   if (value === "null") return null;
+   if (!isNaN(Number(value))) return Number(value);
+   return value;
+ };
+ 
+ /**
+  * Recursively parses query parameters to convert strings to their respective types.
+  * @param {unknown} params - The query parameters to parse.
+  * @returns {unknown} The parsed query parameters.
+  */
+ export const parseQueryParams = (params: unknown): unknown => {
+   if (typeof params === "string") {
+     return parseQueryValue(params);
+   }
+   if (Array.isArray(params)) {
+     return params.map(parseQueryParams);
+   }
+   if (isObject(params)) {
+     const parsedParams: Record<string, unknown> = {};
+     for (const key in params) {
+       if (key === "AND" || key === "OR" || key === "NOT") {
+         parsedParams[key] = Array.isArray(params[key])
+           ? (params[key] as unknown[]).map(parseQueryParams)
+           : parseQueryParams(params[key]);
+       } else {
+         parsedParams[key] = parseQueryParams(params[key]);
+       }
+     }
+     return parsedParams;
+   }
+   return params;
+ };`
 }

package/src/helpers/generateRouteFile.ts

@@ -25,6 +25,7 @@ import { ${modelName}Aggregate } from './${modelName}Aggregate';
 import { ${modelName}Count } from './${modelName}Count';
 import { ${modelName}GroupBy } from './${modelName}GroupBy';
 import { RouteConfig } from "../RouteConfig";
+import qs from "qs";
 import { parseQueryParams } from "../ParseQueryParams";
 
 const defaultBeforeAfter = {
@@ -49,8 +50,8 @@ export function ${routerFunctionName}(config: RouteConfig<RequestHandler>) {
     handler: RequestHandler
   ) => {
     router[method](basePath + path, (req, res, next) => {
-      req.query = parseQueryParams(req.query) as ParsedQs;
-      next();
+      if (req.query)
+        req.query = parseQueryParams(qs.parse(req.query as Record<string, string>)) as ParsedQs;      next();
     }, ...middlewares, handler);
   };