@technomoron/api-server-base 1.0.40 → 1.0.42

package/README.txt

@@ -92,6 +92,7 @@ refreshExpiry (number, default 30 * 24 * 60 * 60 * 1000) Refresh token lifetime
 authApi (boolean, default false) Toggle you can use when mounting auth routes.
 devMode (boolean, default false) Custom hook for development only features.
 debug (boolean, default false) When true the server logs inbound requests via dumpRequest.
+hydrateGetBody (boolean, default true) Copy query parameters into `req.body` for GET requests; set false if you prefer untouched bodies.
 
 Tip: If you add new configuration fields in downstream projects, extend ApiServerConf and update fillConfig so defaults stay aligned.
 

package/dist/cjs/{api-server-base.js → api-server-base.cjs}

@@ -44,6 +44,24 @@ function guess_exception_text(error, defMsg = 'Unknown Error') {
     }
     return msg.length > 0 ? msg.join(' / ') : defMsg;
 }
+function isPlainObject(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function hydrateGetBody(req) {
+    if ((req.method ?? '').toUpperCase() !== 'GET') {
+        return;
+    }
+    const query = isPlainObject(req.query) ? req.query : null;
+    if (!query || Object.keys(query).length === 0) {
+        return;
+    }
+    const body = isPlainObject(req.body) ? req.body : null;
+    if (!body || Object.keys(body).length === 0) {
+        req.body = { ...query };
+        return;
+    }
+    req.body = { ...query, ...body };
+}
 class ApiError extends Error {
     constructor({ code, message, data, errors }) {
         const msg = guess_exception_text(message, '[Unknown error (null/undefined)]');
@@ -72,7 +90,8 @@ function fillConfig(config) {
         accessExpiry: config.accessExpiry ?? 60 * 15,
         refreshExpiry: config.refreshExpiry ?? 30 * 24 * 60 * 60 * 1000,
         authApi: config.authApi ?? false,
-        devMode: config.devMode ?? false
+        devMode: config.devMode ?? false,
+        hydrateGetBody: config.hydrateGetBody ?? true
     };
 }
 class ApiServer {
@@ -309,6 +328,9 @@ class ApiServer {
                     token: '',
                     tokenData: null
                 });
+                if (this.config.hydrateGetBody) {
+                    hydrateGetBody(apiReq.req);
+                }
                 if (this.config.debug) {
                     this.dumpRequest(apiReq);
                 }

package/dist/cjs/api-server-base.d.ts

@@ -98,6 +98,7 @@ export interface ApiServerConf {
     refreshExpiry: number;
     authApi: boolean;
     devMode: boolean;
+    hydrateGetBody: boolean;
 }
 export declare class ApiServer {
     app: Application;

package/dist/cjs/{index.js → index.cjs}

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApiError = exports.ApiModule = exports.ApiServer = void 0;
-var api_server_base_js_1 = require("./api-server-base.js");
+var api_server_base_js_1 = require("./api-server-base.cjs");
 Object.defineProperty(exports, "ApiServer", { enumerable: true, get: function () { return __importDefault(api_server_base_js_1).default; } });
-var api_server_base_js_2 = require("./api-server-base.js");
+var api_server_base_js_2 = require("./api-server-base.cjs");
 Object.defineProperty(exports, "ApiModule", { enumerable: true, get: function () { return api_server_base_js_2.ApiModule; } });
 Object.defineProperty(exports, "ApiError", { enumerable: true, get: function () { return api_server_base_js_2.ApiError; } });

package/dist/esm/api-server-base.d.ts

@@ -98,6 +98,7 @@ export interface ApiServerConf {
     refreshExpiry: number;
     authApi: boolean;
     devMode: boolean;
+    hydrateGetBody: boolean;
 }
 export declare class ApiServer {
     app: Application;

package/dist/esm/api-server-base.js

@@ -37,6 +37,24 @@ function guess_exception_text(error, defMsg = 'Unknown Error') {
     }
     return msg.length > 0 ? msg.join(' / ') : defMsg;
 }
+function isPlainObject(value) {
+    return !!value && typeof value === 'object' && !Array.isArray(value);
+}
+function hydrateGetBody(req) {
+    if ((req.method ?? '').toUpperCase() !== 'GET') {
+        return;
+    }
+    const query = isPlainObject(req.query) ? req.query : null;
+    if (!query || Object.keys(query).length === 0) {
+        return;
+    }
+    const body = isPlainObject(req.body) ? req.body : null;
+    if (!body || Object.keys(body).length === 0) {
+        req.body = { ...query };
+        return;
+    }
+    req.body = { ...query, ...body };
+}
 export class ApiError extends Error {
     constructor({ code, message, data, errors }) {
         const msg = guess_exception_text(message, '[Unknown error (null/undefined)]');
@@ -64,7 +82,8 @@ function fillConfig(config) {
         accessExpiry: config.accessExpiry ?? 60 * 15,
         refreshExpiry: config.refreshExpiry ?? 30 * 24 * 60 * 60 * 1000,
         authApi: config.authApi ?? false,
-        devMode: config.devMode ?? false
+        devMode: config.devMode ?? false,
+        hydrateGetBody: config.hydrateGetBody ?? true
     };
 }
 export class ApiServer {
@@ -301,6 +320,9 @@ export class ApiServer {
                     token: '',
                     tokenData: null
                 });
+                if (this.config.hydrateGetBody) {
+                    hydrateGetBody(apiReq.req);
+                }
                 if (this.config.debug) {
                     this.dumpRequest(apiReq);
                 }

package/package.json

@@ -1,16 +1,16 @@
 {
 	"name": "@technomoron/api-server-base",
-	"version": "1.0.40",
+	"version": "1.0.42",
 	"description": "Api Server Skeleton / Base Class",
 	"type": "module",
-	"main": "./dist/cjs/index.js",
+	"main": "./dist/cjs/index.cjs",
 	"module": "./dist/esm/index.js",
 	"types": "./dist/esm/index.d.ts",
 	"exports": {
 		".": {
 			"types": "./dist/esm/index.d.ts",
 			"import": "./dist/esm/index.js",
-			"require": "./dist/cjs/index.js"
+			"require": "./dist/cjs/index.cjs"
 		}
 	},
 	"repository": {
@@ -26,12 +26,12 @@
 	"homepage": "https://github.com/technomoron/api-server-base#readme",
 	"scripts": {
 		"scrub": "rm -rf ./node_modules/ pnpm-lock.yaml ./dist/",
-		"build:cjs": "tsc --project tsconfig/tsconfig.cjs.json",
+		"build:cjs": "tsc --project tsconfig/tsconfig.cjs.json && node scripts/prepare-cjs.cjs",
 		"build:esm": "tsc --project tsconfig/tsconfig.esm.json",
-		"build": "tsc --project tsconfig/tsconfig.cjs.json && tsc --project tsconfig/tsconfig.esm.json",
+		"build": "npm run build:cjs && npm run build:esm",
 		"test": "vitest run",
 		"test:watch": "vitest --watch",
-		"prepublishOnly": "tsc --project tsconfig/tsconfig.cjs.json && tsc --project tsconfig/tsconfig.esm.json",
+		"prepublishOnly": "npm run build:cjs && npm run build:esm",
 		"lint": "eslint --ext .js,.ts,.vue ./",
 		"lintfix": "eslint --fix --ext .js,.ts,.vue ./",
 		"format": "eslint --fix --ext .js,.ts,.vue ./ && prettier --write \"**/*.{js,jsx,ts,tsx,vue,json,css,scss,md}\"",
@@ -41,7 +41,7 @@
 	"dependencies": {
 		"@types/cookie-parser": "^1.4.9",
 		"@types/cors": "^2.8.19",
-		"@types/express": "^4 || ^5",
+		"@types/express": "^4.17.21",
 		"@types/jsonwebtoken": "^9.0.9",
 		"@types/multer": "^1.4.13",
 		"cookie-parser": "^1.4.7",