jh-be-tools 1.0.22 → 1.0.24

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

@@ -1,20 +1,20 @@
 import { AxiosError, AxiosRequestConfig, AxiosHeaders } from 'axios';
-export interface Request {
-    path: string;
-    serviceName: string;
-    params?: AxiosRequestConfig['params'];
+import { RouteDef } from '../route-handler/routeCreation';
+export interface QueryData {
+    params?: Record<string, string>;
+    query?: AxiosRequestConfig['params'];
     headers?: AxiosHeaders;
     body?: unknown;
 }
+export interface Request {
+    baseUrl: string;
+    definition: RouteDef;
+    serviceName: string;
+    queryData?: QueryData;
+}
 export interface Error {
     serviceName: string;
     status: number;
     error: AxiosError;
 }
-export declare const request: {
-    get: <Response_1>(req: Request) => Promise<Response_1>;
-    post: <Response_2>(req: Request) => Promise<Response_2>;
-    put: <Response_3>(req: Request) => Promise<Response_3>;
-    patch: <Response_4>(req: Request) => Promise<Response_4>;
-    delete: <Response_5>(req: Request) => Promise<Response_5>;
-};
+export declare const request: <Response_1>(req: Request) => Promise<Response_1>;

package/dist/api-request/apiRequest.js

@@ -25,39 +25,45 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.request = void 0;
 const axios_1 = __importStar(require("axios"));
-const get = async (req) => {
-    return await baseQuery(req, axios_1.default.get);
-};
-const del = async (req) => {
-    if (req.body) {
-        throw new Error('delete requests do not work with body');
+const request = async (req) => {
+    const { baseUrl, definition, queryData, serviceName } = req;
+    let path = `${baseUrl}${definition.path}`;
+    let func;
+    switch (definition.method) {
+        case 'get':
+            func = axios_1.default.get;
+            break;
+        case 'post':
+            func = axios_1.default.post;
+            break;
+        case 'put':
+            func = axios_1.default.put;
+            break;
+        case 'delete':
+            func = axios_1.default.delete;
+            break;
+    }
+    if (req.queryData && req.queryData.params) {
+        path = replaceUrlParams(path, req.queryData.params);
+    }
+    try {
+        return await baseQuery(func, path, queryData);
+    }
+    catch (error) {
+        return errorHandler(error, serviceName);
     }
-    return await baseQuery(req, axios_1.default.delete);
-};
-const post = async (req) => {
-    return await baseQuery(req, axios_1.default.post);
-};
-const put = async (req) => {
-    return await baseQuery(req, axios_1.default.put);
-};
-const patch = async (req) => {
-    return await baseQuery(req, axios_1.default.patch);
 };
-const baseQuery = async (req, func) => {
+exports.request = request;
+const baseQuery = async (func, path, req) => {
     const options = {
-        headers: { 'content-type': 'application/json', ...req.headers },
-        params: req.params,
+        headers: { 'content-type': 'application/json', ...req?.headers },
+        params: req?.query,
     };
-    try {
-        if (req.body) {
-            return (await func(req.path, req.body, options)).data;
-        }
-        else {
-            return (await func(req.path, options)).data;
-        }
+    if (req?.body) {
+        return (await func(path, req.body, options)).data;
     }
-    catch (error) {
-        return errorHandler(error, req.serviceName);
+    else {
+        return (await func(path, options)).data;
     }
 };
 const errorHandler = (error, serviceName) => {
@@ -69,10 +75,8 @@ const errorHandler = (error, serviceName) => {
         error,
     };
 };
-exports.request = {
-    get,
-    post,
-    put,
-    patch,
-    delete: del,
+const replaceUrlParams = (url, params) => {
+    return url.replace(/:([a-zA-Z0-9_]+)/g, (match, key) => {
+        return params[key] || match;
+    });
 };

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

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

package/dist/route-handler/routeCreation.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createRoutes = void 0;
 const routeHandler_1 = require("./routeHandler");
-const createRoute = (method, path, route, schema) => {
+const createRoute = (meta, route) => {
     return (app) => {
-        app[method](path, async (req, res) => {
-            await (0, routeHandler_1.routeHandler)(req, res, route, schema);
+        app[meta.method](meta.path, async (req, res) => {
+            await (0, routeHandler_1.routeHandler)(req, res, route, meta.routeSchema);
         });
     };
 };

package/dist/route-handler/routeHandler.js

@@ -11,6 +11,7 @@ const routeHandler = async (req, res, fun, schema) => {
             });
         }
         catch (error) {
+            console.log(JSON.stringify(error));
             return res.status(400).json(error.errors);
         }
     }
@@ -23,6 +24,7 @@ const routeHandler = async (req, res, fun, schema) => {
         status = result?.status ?? defaultStatus;
     }
     catch (error) {
+        console.log(JSON.stringify(error));
         return res.status(500).json(error);
     }
     if (schema.response) {
@@ -30,6 +32,7 @@ const routeHandler = async (req, res, fun, schema) => {
             await schema.response.parseAsync({ data });
         }
         catch (error) {
+            console.log(JSON.stringify(error));
             return res.status(500).json(error);
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "jh-be-tools",
-	"version": "1.0.22",
+	"version": "1.0.24",
 	"description": "",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
@@ -17,11 +17,16 @@
 	},
 	"dependencies": {
 		"axios": "^1.6.7",
-		"express": "^4.21.1",
+		"express": "^4.21.2",
 		"pg": "^8.13.1",
 		"zod": "^3.23.8"
 	},
 	"bin": {
 		"createPackageIndexFiles": "./dist/create-package-index-files/createPackageIndexFiles.js"
+	},
+	"exports": {
+		"./eslint.config.mjs": "./src/config/eslint.config.mjs",
+		"./prettier": "./src/config/.prettierrc.json",
+		".": "./dist/index.js"
 	}
 }