jh-be-tools 1.0.47 → 1.0.49

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

@@ -1,5 +1,5 @@
-import { AxiosError, AxiosRequestConfig, AxiosResponseHeaders } from 'axios';
-import { RouteDef } from '../route-handler/routeCreation';
+import { AxiosError, AxiosRequestConfig, AxiosResponseHeaders, AxiosResponse } from 'axios';
+import { RouteDef } from '../route-handler/routeCreation.js';
 export interface QueryData {
     params?: Record<string, string>;
     query?: AxiosRequestConfig['params'];
@@ -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

@@ -1,59 +1,30 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-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;
+import axios, { AxiosError } from 'axios';
+export 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) {
                 throw Error('Get requests with body are not supported.');
             }
-            func = axios_1.default.get;
+            func = axios.get;
             break;
         case 'post':
-            func = axios_1.default.post;
+            func = axios.post;
             if (queryData && !queryData?.body) {
                 queryData.body = {};
             }
             break;
         case 'put':
-            func = axios_1.default.put;
+            func = axios.put;
             if (queryData && !queryData?.body) {
                 queryData.body = {};
             }
@@ -62,34 +33,38 @@ const request = async (req) => {
             if (queryData?.body) {
                 throw Error('Delete requests with body are not supported.');
             }
-            func = axios_1.default.delete;
+            func = axios.delete;
             break;
     }
     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) => {
     const options = {
         headers: { 'content-type': 'application/json', ...req?.headers },
         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) => {
-    if (!(error instanceof axios_1.AxiosError))
+    if (!(error instanceof AxiosError))
         throw error;
     throw {
         serviceName: 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

@@ -5,7 +5,7 @@ import { FlatCompat } from '@eslint/eslintrc';
 import js from '@eslint/js';
 import typescriptEslint from '@typescript-eslint/eslint-plugin';
 import tsParser from '@typescript-eslint/parser';
-import _import from 'eslint-plugin-import';
+import _import from '@eslint/eslint-plugin-module';
 import nodePlugin from 'eslint-plugin-n';
 import prettier from 'eslint-plugin-prettier';
 import unusedImports from 'eslint-plugin-unused-imports';
@@ -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/create-package-index-files/createPackageIndexFiles.js

@@ -1,40 +1,5 @@
 #! /usr/bin/env node
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs = __importStar(require("fs"));
+import * as fs from "fs";
 if (!fs.existsSync("./package-data/dist")) {
     fs.mkdirSync("./dist", { recursive: true });
 }

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './route-handler/routeHandler';
-export * from './route-handler/routeCreation';
-export * from './api-request/apiRequest';
+export * from './route-handler/routeHandler.js';
+export * from './route-handler/routeCreation.js';
+export * from './api-request/apiRequest.js';

package/dist/index.js

@@ -1,19 +1,3 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./route-handler/routeHandler"), exports);
-__exportStar(require("./route-handler/routeCreation"), exports);
-__exportStar(require("./api-request/apiRequest"), exports);
+export * from './route-handler/routeHandler.js';
+export * from './route-handler/routeCreation.js';
+export * from './api-request/apiRequest.js';

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

@@ -1,10 +1,11 @@
-import { Router } from 'express';
-import { RouteSchema } from './routeHandler';
+import { Router, RequestHandler } from 'express';
+import { RouteSchema } from './routeHandler.js';
 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

@@ -1,15 +1,12 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRoutes = void 0;
-const routeHandler_1 = require("./routeHandler");
+import { routeHandler } from './routeHandler.js';
 const createRoute = (meta, route) => {
     return (app) => {
-        app[meta.method](meta.path, async (req, res) => {
-            await (0, routeHandler_1.routeHandler)(req, res, route, meta.routeSchema);
+        const middlewares = meta.middleware ?? [];
+        app[meta.method](meta.path, ...middlewares, async (req, res) => {
+            await routeHandler(req, res, route, meta.routeSchema);
         });
     };
 };
-const createRoutes = (routeData, router) => {
+export const createRoutes = (routeData, router) => {
     routeData.forEach((data) => createRoute(...data)(router));
 };
-exports.createRoutes = createRoutes;

package/dist/route-handler/routeHandler.js

@@ -1,20 +1,6 @@
-"use strict";
-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);
-        }
-    }
+export const routeHandler = async (req, res, fun, schema) => {
+    if (!(await parseRequest(schema, req, res)))
+        return;
     let data;
     let status;
     try {
@@ -29,15 +15,38 @@ 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 });
+};
+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.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jh-be-tools",
-	"version": "1.0.47",
+	"version": "1.0.49",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -11,28 +11,30 @@
 	"author": "",
 	"license": "ISC",
 	"devDependencies": {
+		"@eslint/js": "^9.30.0",
 		"@types/express": "^5.0.1",
 		"@types/node": "^22.13.11",
-		"typescript": "^5.8.2"
+		"eslint": "^9.30.0",
+		"typescript": "^5.8.3",
+		"typescript-eslint": "^8.35.0"
 	},
 	"dependencies": {
-		"axios": "^1.8.4",
-		"express": "^4.21.2",
-		"zod": "^3.24.2"
+		"axios": "^1.1.0",
+		"express": "^5.1.0",
+		"zod": "^3.25.67"
 	},
 	"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"
@@ -40,5 +42,6 @@
 	"exports": {
 		"./eslint.config.mjs": "./dist/config/eslint.config.mjs",
 		".": "./dist/index.js"
-	}
+	},
+	"type": "module"
 }