jh-be-tools 1.0.47 → 1.0.48

package/dist/api-request/apiRequest.d.ts

@@ -1,4 +1,4 @@
-import { AxiosError, AxiosRequestConfig, AxiosResponseHeaders } from 'axios';
+import { AxiosError, AxiosRequestConfig, AxiosResponseHeaders, AxiosResponse } from 'axios';
 import { RouteDef } from '../route-handler/routeCreation';
 export interface QueryData {
     params?: Record<string, string>;
@@ -12,9 +12,13 @@ export interface Request {
     serviceName: string;
     queryData?: QueryData;
 }
+export interface ProcessingMethods {
+    pre?: (request: QueryData) => Promise<QueryData>;
+    post?: (response: AxiosResponse) => AxiosResponse;
+}
 export interface Error {
     serviceName: string;
     status: number;
     error: AxiosError;
 }
-export declare const request: <Response>(req: Request) => Promise<Response>;
+export declare const request: <Response>(req: Request, processing?: ProcessingMethods) => Promise<Response>;

package/dist/api-request/apiRequest.js

@@ -35,10 +35,17 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = void 0;
 const axios_1 = __importStar(require("axios"));
-const request = async (req) => {
-    const { baseUrl, definition, queryData, serviceName } = req;
+const request = async (req, processing) => {
+    const { baseUrl, definition, serviceName } = req;
+    let { queryData } = req;
     let path = `${baseUrl}${definition.path}`;
     let func;
+    if (processing?.pre) {
+        if (!queryData) {
+            queryData = {};
+        }
+        queryData = await processing.pre(queryData);
+    }
     switch (definition.method) {
         case 'get':
             if (queryData?.body) {
@@ -68,12 +75,17 @@ const request = async (req) => {
     if (req.queryData && req.queryData.params) {
         path = replaceUrlParams(path, req.queryData.params);
     }
+    let response;
     try {
-        return await baseQuery(func, path, queryData);
+        response = await baseQuery(func, path, queryData);
     }
     catch (error) {
         return errorHandler(error, serviceName);
     }
+    if (processing?.post) {
+        response = processing.post(response);
+    }
+    return response.data;
 };
 exports.request = request;
 const baseQuery = async (func, path, req) => {
@@ -82,10 +94,10 @@ const baseQuery = async (func, path, req) => {
         params: req?.query,
     };
     if (req?.body) {
-        return (await func(path, req.body, options)).data;
+        return (await func(path, req.body, options));
     }
     else {
-        return (await func(path, options)).data;
+        return (await func(path, options));
     }
 };
 const errorHandler = (error, serviceName) => {

package/dist/config/eslint.config.d.mts

@@ -104,10 +104,11 @@ declare const _default: (import("eslint").Linter.Config<import("eslint").Linter.
         })[];
         'import/export': string;
         quotes: string[];
-        "prettier/prettier": (string | {
+        'prettier/prettier': (string | {
             singleQuote: boolean;
             semi: boolean;
             useTabs: boolean;
+            printWidth: number;
         })[];
         semi: string[];
         indent: string[];

package/dist/config/eslint.config.mjs

@@ -58,10 +58,10 @@ export default [
                 },
             ],
             'import/export': 'off',
-            "quotes": ["off"],
-            "prettier/prettier": ["error", { "singleQuote": true, "semi": false, useTabs: true }],
-            "semi": ['error', 'never'],
-            'indent': ['error', 'tab'],
+            quotes: ['off'],
+            'prettier/prettier': ['error', { singleQuote: true, semi: false, useTabs: true, printWidth: 150 }],
+            semi: ['error', 'never'],
+            indent: ['error', 'tab'],
         },
     },
     {

package/dist/route-handler/routeCreation.d.ts

@@ -1,10 +1,11 @@
-import { Router } from 'express';
+import { Router, RequestHandler } from 'express';
 import { RouteSchema } from './routeHandler';
 export type RouteMethods = 'get' | 'post' | 'put' | 'delete';
 export type RouteDef = {
     method: RouteMethods;
     path: string;
     routeSchema: RouteSchema;
+    middleware?: RequestHandler[];
 };
 export type RouteData = [RouteDef, (req?: any) => any];
 export declare const createRoutes: (routeData: RouteData[], router: Router) => void;

package/dist/route-handler/routeCreation.js

@@ -4,7 +4,8 @@ exports.createRoutes = void 0;
 const routeHandler_1 = require("./routeHandler");
 const createRoute = (meta, route) => {
     return (app) => {
-        app[meta.method](meta.path, async (req, res) => {
+        const middlewares = meta.middleware ?? [];
+        app[meta.method](meta.path, ...middlewares, async (req, res) => {
             await (0, routeHandler_1.routeHandler)(req, res, route, meta.routeSchema);
         });
     };

package/dist/route-handler/routeHandler.js

@@ -2,19 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.routeHandler = void 0;
 const routeHandler = async (req, res, fun, schema) => {
-    if (schema.request) {
-        try {
-            await schema.request.parseAsync({
-                body: req.body,
-                query: req.query,
-                params: req.params,
-            });
-        }
-        catch (error) {
-            console.log(JSON.stringify(error));
-            return res.status(400).json(error.errors);
-        }
-    }
+    if (!(await parseRequest(schema, req, res)))
+        return;
     let data;
     let status;
     try {
@@ -29,15 +18,39 @@ const routeHandler = async (req, res, fun, schema) => {
         }
         return res.status(500).json(error);
     }
+    if (!(await parseResponse(schema, res, data)))
+        return;
+    res.status(status).json({ data });
+};
+exports.routeHandler = routeHandler;
+const parseRequest = async (schema, req, res) => {
+    if (schema.request) {
+        try {
+            await schema.request.parseAsync({
+                body: req.body,
+                query: req.query,
+                params: req.params,
+                headers: req.headers,
+            });
+        }
+        catch (error) {
+            console.log(JSON.stringify(error));
+            res.status(400).json(error.errors);
+            return false;
+        }
+    }
+    return true;
+};
+const parseResponse = async (schema, res, data) => {
     if (schema.response) {
         try {
             await schema.response.parseAsync({ data });
         }
         catch (error) {
             console.log(JSON.stringify(error));
-            return res.status(500).json(error);
+            res.status(500).json(error.errors);
+            return false;
         }
     }
-    res.status(status).json({ data });
+    return true;
 };
-exports.routeHandler = routeHandler;

package/dist/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"root":["../src/index.ts","../src/api-request/apirequest.ts","../src/config/eslint.config.mjs","../src/config/prettier.config.js","../src/create-package-index-files/createpackageindexfiles.ts","../src/route-handler/routecreation.ts","../src/route-handler/routehandler.ts"],"version":"5.8.2"}
+{"root":["../src/index.ts","../src/api-request/apirequest.ts","../src/config/eslint.config.mjs","../src/create-package-index-files/createpackageindexfiles.ts","../src/route-handler/routecreation.ts","../src/route-handler/routehandler.ts"],"version":"5.8.2"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jh-be-tools",
-	"version": "1.0.47",
+	"version": "1.0.48",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -21,18 +21,18 @@
 		"zod": "^3.24.2"
 	},
 	"peerDependencies": {
-		"eslint": "^9.23.0",
+		"@eslint/compat": "^1.2.4",
+		"@eslint/eslintrc": "^3.3.1",
+		"@eslint/js": "^9.23.0",
 		"@typescript-eslint/eslint-plugin": "^8.27.0",
 		"@typescript-eslint/parser": "^8.27.0",
+		"eslint": "^9.23.0",
 		"eslint-config-prettier": "^10.1.1",
 		"eslint-plugin-import": "^2.31.0",
 		"eslint-plugin-n": "^17.16.2",
 		"eslint-plugin-node": "^11.1.0",
 		"eslint-plugin-prettier": "^5.2.1",
-		"eslint-plugin-unused-imports": "^4.1.4",
-		"@eslint/compat": "^1.2.4",
-		"@eslint/eslintrc": "^3.3.1",
-		"@eslint/js": "^9.23.0"
+		"eslint-plugin-unused-imports": "^4.1.4"
 	},
 	"bin": {
 		"createPackageIndexFiles": "./dist/create-package-index-files/createPackageIndexFiles.js"