@expressots/adapter-express 1.4.0 → 1.5.0

package/lib/CHANGELOG.md

@@ -1,5 +1,32 @@
 
 
+## [1.5.0](https://github.com/expressots/adapter-express/compare/1.4.0...1.5.0) (2024-06-11)
+
+
+### Features
+
+* bump @commitlint/config-conventional from 17.7.0 to 19.2.2 ([c4db260](https://github.com/expressots/adapter-express/commit/c4db260694b492e5744dc7c59ce4edae23053ec8))
+* bump @release-it/conventional-changelog from 7.0.1 to 7.0.2 ([d063fd9](https://github.com/expressots/adapter-express/commit/d063fd9ff2b405eb69197b70cad72334d814b6bf))
+* bump eslint-config-prettier from 9.0.0 to 9.1.0 ([20ca753](https://github.com/expressots/adapter-express/commit/20ca753e4297889506af98e6caa5b1f374aded59))
+* bump husky from 8.0.3 to 9.0.11 ([8cb065e](https://github.com/expressots/adapter-express/commit/8cb065e49e209b2a6ab56d07a712df30596350ca))
+* bump prettier from 3.0.3 to 3.3.1 ([872c7ba](https://github.com/expressots/adapter-express/commit/872c7ba7072c1cfb36a7efe74be0b41f6aea541b))
+* bump prettier from 3.3.1 to 3.3.2 ([5edd349](https://github.com/expressots/adapter-express/commit/5edd3490f1a6fa48a65694a9c146c2ec69a264d3))
+* bump release-it from 16.1.5 to 16.3.0 ([5febf25](https://github.com/expressots/adapter-express/commit/5febf2517dec9857d59ec189829262dafcc63fbd))
+
+
+### Bug Fixes
+
+* decorator method case confict fix ([cdf0fbd](https://github.com/expressots/adapter-express/commit/cdf0fbd6c864a0e538372dc102664538112f0e30))
+* init commit ([55359bf](https://github.com/expressots/adapter-express/commit/55359bf31acfdf0186f6916cd0dc1897d1f24cd2))
+* patch issue where not using http decorator shows incorrect code ([975e451](https://github.com/expressots/adapter-express/commit/975e45112181088bcb9d8f1487e8272deb49d3df))
+* remove comments and logs for prod build ([cd0151b](https://github.com/expressots/adapter-express/commit/cd0151be92f1cb73b6040a72db6d4f1268ae6cfc))
+* remove unused method param in find param pattern ([fd40872](https://github.com/expressots/adapter-express/commit/fd4087276672a6b3c34563736892e4065a497bfa))
+
+
+### Code Refactoring
+
+* without and with decor in the same route conflict ([469f65e](https://github.com/expressots/adapter-express/commit/469f65e9248aefe5db084608684ca211204c2f5b))
+
 ## [1.4.0](https://github.com/expressots/adapter-express/compare/1.3.0...1.4.0) (2024-06-07)
 
 

package/lib/cjs/adapter-express/express-utils/decorators.js

@@ -17,16 +17,14 @@ function controller(path, ...middleware) {
             path,
             target,
         };
-        const pathMetadata = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.path, Reflect);
-        const statusCodeMetadata = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.statusCode, Reflect);
-        let statusCodePathMapping = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.httpCode, Reflect);
-        if (!statusCodePathMapping) {
-            statusCodePathMapping = {};
-        }
+        const pathMetadata = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.path, Reflect) || {};
+        const statusCodeMetadata = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.statusCode, Reflect) || {};
+        const statusCodePathMapping = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.httpCode, Reflect) || {};
         for (const key in pathMetadata) {
             if (statusCodeMetadata && statusCodeMetadata[key]) {
-                const realPath = pathMetadata[key] === "/" ? path : `${path}${pathMetadata[key]}`;
-                statusCodePathMapping[realPath] = statusCodeMetadata[key];
+                const realPath = pathMetadata[key]["path"] === "/" ? path : `${path}${pathMetadata[key]["path"]}`;
+                statusCodePathMapping[`${realPath}/-${pathMetadata[key]["method"].toLowerCase()}`] =
+                    statusCodeMetadata[key];
             }
         }
         Reflect.defineMetadata(constants_1.HTTP_CODE_METADATA.httpCode, statusCodePathMapping, Reflect);
@@ -148,11 +146,17 @@ function enhancedHttpMethod(method, path, ...middleware) {
         let metadataList = [];
         let pathMetadata = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.path, Reflect);
         if (pathMetadata) {
-            pathMetadata[key] = path;
+            pathMetadata[key] = {
+                path,
+                method,
+            };
         }
         else {
             pathMetadata = {};
-            pathMetadata[key] = path;
+            pathMetadata[key] = {
+                path,
+                method,
+            };
         }
         Reflect.defineMetadata(constants_1.HTTP_CODE_METADATA.path, pathMetadata, Reflect);
         if (!Reflect.hasOwnMetadata(constants_1.METADATA_KEY.controllerMethod, target.constructor)) {
@@ -193,11 +197,17 @@ function httpMethod(method, path, ...middleware) {
         let metadataList = [];
         let pathMetadata = Reflect.getOwnMetadata(constants_1.HTTP_CODE_METADATA.path, Reflect);
         if (pathMetadata) {
-            pathMetadata[key] = path;
+            pathMetadata[key] = {
+                path,
+                method,
+            };
         }
         else {
             pathMetadata = {};
-            pathMetadata[key] = path;
+            pathMetadata[key] = {
+                path,
+                method,
+            };
         }
         Reflect.defineMetadata(constants_1.HTTP_CODE_METADATA.path, pathMetadata, Reflect);
         if (!Reflect.hasOwnMetadata(constants_1.METADATA_KEY.controllerMethod, target.constructor)) {

package/lib/cjs/adapter-express/express-utils/http-status-middleware.js

@@ -12,18 +12,47 @@ class HttpStatusCodeMiddleware extends core_1.ExpressoMiddleware {
     use(req, res, next) {
         const statusCodeMapping = Reflect.getMetadata(constants_1.HTTP_CODE_METADATA.httpCode, Reflect);
         let path = req.path.endsWith("/") ? req.path.slice(0, -1) : req.path;
+        const formattedMethod = req.method.toLowerCase();
         if (path === "/" || path === "") {
             path = "/";
         }
+        path = `${path}/-${formattedMethod}`;
         const statusCode = statusCodeMapping[path];
         if (statusCode) {
             res.status(statusCode);
         }
         else {
-            this.setDefaultStatusCode(req, res);
+            const patternMatchStatusCode = this.findMatchingParameterPath(path, statusCodeMapping);
+            if (patternMatchStatusCode) {
+                res.status(patternMatchStatusCode);
+            }
+            else {
+                this.setDefaultStatusCode(req, res);
+            }
         }
         next();
     }
+    /**
+     * Find the matching parameter path.
+     * @param path - The path to match.
+     * @param mapping - The mapping to check.
+     * @param method - The method to check.
+     * @returns The status code if found, otherwise null.
+     **/
+    findMatchingParameterPath(path, mapping) {
+        for (const pathCode in mapping) {
+            const patternCheck = new RegExp("^" + pathCode.replace(/:[^\s/]+/g, "([^/]+)") + "$");
+            if (patternCheck.test(path)) {
+                return mapping[pathCode];
+            }
+        }
+        return null;
+    }
+    /**
+     * Set the default status code based on the request method.
+     * @param req - The request object.
+     * @param res - The response object.
+     **/
     setDefaultStatusCode(req, res) {
         switch (req.method.toLowerCase()) {
             case "get":
@@ -35,6 +64,9 @@ class HttpStatusCodeMiddleware extends core_1.ExpressoMiddleware {
             case "put":
                 res.statusCode = 204;
                 break;
+            case "patch":
+                res.statusCode = 204;
+                break;
             case "delete":
                 res.statusCode = 204;
                 break;

package/lib/cjs/types/adapter-express/express-utils/http-status-middleware.d.ts

@@ -7,5 +7,18 @@ import { ExpressoMiddleware } from "@expressots/core";
  */
 export declare class HttpStatusCodeMiddleware extends ExpressoMiddleware {
     use(req: Request, res: Response, next: NextFunction): void | Promise<void>;
+    /**
+     * Find the matching parameter path.
+     * @param path - The path to match.
+     * @param mapping - The mapping to check.
+     * @param method - The method to check.
+     * @returns The status code if found, otherwise null.
+     **/
+    private findMatchingParameterPath;
+    /**
+     * Set the default status code based on the request method.
+     * @param req - The request object.
+     * @param res - The response object.
+     **/
     private setDefaultStatusCode;
 }

package/lib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/adapter-express",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Expressots - modern, fast, lightweight nodejs web framework (@adapter-express)",
   "author": "",
   "main": "./lib/cjs/index.js",
@@ -74,19 +74,19 @@
   "devDependencies": {
     "@codecov/vite-plugin": "^0.0.1-beta.6",
     "@commitlint/cli": "18.0.0",
-    "@commitlint/config-conventional": "17.7.0",
+    "@commitlint/config-conventional": "19.2.2",
     "@expressots/core": "latest",
-    "@release-it/conventional-changelog": "7.0.1",
+    "@release-it/conventional-changelog": "7.0.2",
     "@types/express": "4.17.21",
     "@types/node": "20.4.9",
     "@typescript-eslint/eslint-plugin": "6.6.0",
     "@typescript-eslint/parser": "6.6.0",
     "@vitest/coverage-v8": "^1.4.0",
     "eslint": "8.48.0",
-    "eslint-config-prettier": "9.0.0",
-    "husky": "8.0.3",
-    "prettier": "3.0.3",
-    "release-it": "16.1.5",
+    "eslint-config-prettier": "9.1.0",
+    "husky": "9.0.11",
+    "prettier": "3.3.2",
+    "release-it": "16.3.0",
     "ts-jest": "29.0.5",
     "typescript": "5.2.2",
     "vite": "^5.2.8",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@expressots/adapter-express",
-  "version": "1.4.0",
+  "version": "1.5.0",
   "description": "Expressots - modern, fast, lightweight nodejs web framework (@adapter-express)",
   "author": "",
   "main": "./lib/cjs/index.js",
@@ -74,19 +74,19 @@
   "devDependencies": {
     "@codecov/vite-plugin": "^0.0.1-beta.6",
     "@commitlint/cli": "18.0.0",
-    "@commitlint/config-conventional": "17.7.0",
+    "@commitlint/config-conventional": "19.2.2",
     "@expressots/core": "latest",
-    "@release-it/conventional-changelog": "7.0.1",
+    "@release-it/conventional-changelog": "7.0.2",
     "@types/express": "4.17.21",
     "@types/node": "20.4.9",
     "@typescript-eslint/eslint-plugin": "6.6.0",
     "@typescript-eslint/parser": "6.6.0",
     "@vitest/coverage-v8": "^1.4.0",
     "eslint": "8.48.0",
-    "eslint-config-prettier": "9.0.0",
-    "husky": "8.0.3",
-    "prettier": "3.0.3",
-    "release-it": "16.1.5",
+    "eslint-config-prettier": "9.1.0",
+    "husky": "9.0.11",
+    "prettier": "3.3.2",
+    "release-it": "16.3.0",
     "ts-jest": "29.0.5",
     "typescript": "5.2.2",
     "vite": "^5.2.8",