@tsed/platform-express 8.12.5 → 8.13.1

package/lib/esm/components/PlatformExpress.js

@@ -5,9 +5,11 @@ import { PlatformExceptions } from "@tsed/platform-exceptions";
 import { adapter, application, createContext, PlatformAdapter, PlatformBuilder, PlatformHandler, PlatformResponse } from "@tsed/platform-http";
 import { PlatformHandlerType } from "@tsed/platform-router";
 import Express from "express";
+import { version } from "express/package.json" with { type: "json" };
 import { staticsMiddleware } from "../middlewares/staticsMiddleware.js";
 import { PlatformExpressHandler } from "../services/PlatformExpressHandler.js";
 import { PlatformExpressResponse } from "../services/PlatformExpressResponse.js";
+import { convertPath } from "../utils/convertPath.js";
 function callNext(next, metadata, $ctx) {
     if (metadata.type !== PlatformHandlerType.RESPONSE_FN) {
         return next && $ctx.error && !$ctx.isDone() ? next($ctx.error) : next();
@@ -67,13 +69,24 @@ export class PlatformExpress extends PlatformAdapter {
     }
     mapLayers(layers) {
         const rawApp = this.app.getApp();
+        const v = `v${version.split(".")[0]}`;
         layers.forEach((layer) => {
-            switch (layer.method) {
-                case "statics":
-                    rawApp.use(layer.path, this.statics(layer.path, layer.opts));
-                    return;
+            const handlers = layer.getArgs(false);
+            const { path, wildcard } = convertPath(layer.path, v);
+            layer.path = path;
+            if (layer.method === "statics") {
+                rawApp.use(path, this.statics(path, layer.opts));
+                return;
             }
-            rawApp[layer.method](...layer.getArgs());
+            if (wildcard) {
+                handlers.unshift(((req, _, next) => {
+                    if (req.params["0"] && !req.params[wildcard]) {
+                        req.params[wildcard] = req.params["0"];
+                    }
+                    next();
+                }));
+            }
+            rawApp[layer.method](path, ...handlers);
         });
     }
     mapHandler(handler, metadata) {

package/lib/esm/index.js

@@ -8,3 +8,4 @@ export * from "./interfaces/PlatformExpressStaticsOptions.js";
 export * from "./middlewares/staticsMiddleware.js";
 export * from "./services/PlatformExpressHandler.js";
 export * from "./services/PlatformExpressResponse.js";
+export * from "./utils/convertPath.js";

package/lib/esm/utils/convertPath.js

@@ -0,0 +1,91 @@
+import { isString } from "@tsed/core";
+/**
+ * Converts a path to v4 format
+ */
+function convertPathToV4(path) {
+    const segments = path.split("/");
+    const parsed = segments.reduce((options, segment, index) => {
+        const isLastSegment = index === segments.length - 1;
+        if (isLastSegment && (segment === "*" || segment === "(.*)")) {
+            options.wildcard = "*";
+            options.path.push("*");
+            return options;
+        }
+        if (isLastSegment && segment.startsWith("*")) {
+            options.wildcard = segment.substring(1);
+            options.path.push("*");
+            return options;
+        }
+        if (segment.startsWith(":") && segment.endsWith("*")) {
+            options.wildcard = segment.substring(1, segment.length - 1);
+            options.path.push("*");
+            return options;
+        }
+        if (segment.startsWith("{")) {
+            // Handle v5 style parameters like /{param}
+            const paramName = segment.substring(1, segment.length - 1);
+            options.path.push(`${paramName}?`);
+            return options;
+        }
+        options.path.push(segment);
+        return options;
+    }, { path: [], wildcard: undefined });
+    return {
+        path: parsed.path.join("/"),
+        wildcard: parsed.wildcard
+    };
+}
+/**
+ * Converts a path to v5 format
+ */
+function convertPathToV5(path) {
+    const segments = path.split("/");
+    const parsed = segments.reduce((options, segment, index) => {
+        const isLastSegment = index === segments.length - 1;
+        if (isLastSegment && (segment === "*" || segment === "(.*)")) {
+            options.wildcard = "*";
+            options.path.push("{*wildcard}");
+            return options;
+        }
+        if (isLastSegment && segment.startsWith("*")) {
+            options.wildcard = segment.substring(1);
+            options.path.push(segment);
+            return options;
+        }
+        if (segment.startsWith(":")) {
+            if (segment.endsWith("?")) {
+                options.path.push(`{:${segment.substring(1, segment.length - 1)}}`);
+                return options;
+            }
+            if (isLastSegment && segment.endsWith("*")) {
+                options.wildcard = segment.substring(1, segment.length - 1);
+                options.path.push(`{*${options.wildcard}}`);
+                return options;
+            }
+        }
+        if (isLastSegment && segment.startsWith("{*")) {
+            // Handle v5 style parameters like /{param}
+            options.wildcard = segment.substring(2, segment.length - 1);
+        }
+        options.path.push(segment);
+        return options;
+    }, { path: [], wildcard: undefined });
+    return {
+        path: parsed.path.join("/"),
+        wildcard: parsed.wildcard
+    };
+}
+/**
+ * Converts a path between v4 and v5 formats
+ */
+export function convertPath(path, framework) {
+    if (isString(path)) {
+        if (framework === "v4") {
+            return convertPathToV4(path);
+        }
+        else {
+            return convertPathToV5(path);
+        }
+    }
+    return { path };
+}

package/lib/types/components/PlatformExpress.d.ts

@@ -49,7 +49,7 @@ export declare class PlatformExpress extends PlatformAdapter<Express.Application
         app: Express.Express;
         callback: () => Express.Express;
     };
-    statics(endpoint: string, options: PlatformStaticsOptions): (request: any, response: any, next: any) => void;
+    statics(endpoint: string | RegExp, options: PlatformStaticsOptions): (request: any, response: any, next: any) => void;
     bodyParser(type: "json" | "text" | "urlencoded", additionalOptions?: any): any;
     private configureViewsEngine;
 }

package/lib/types/index.d.ts

@@ -8,3 +8,4 @@ export * from "./interfaces/PlatformExpressStaticsOptions.js";
 export * from "./middlewares/staticsMiddleware.js";
 export * from "./services/PlatformExpressHandler.js";
 export * from "./services/PlatformExpressResponse.js";
+export * from "./utils/convertPath.js";

package/lib/types/utils/convertPath.d.ts

@@ -0,0 +1,10 @@
+type Framework = "v4" | "v5";
+interface ConvertPathResult {
+    path: string | RegExp;
+    wildcard?: string;
+}
+/**
+ * Converts a path between v4 and v5 formats
+ */
+export declare function convertPath(path: string | RegExp, framework: Framework): ConvertPathResult;
+export {};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@tsed/platform-express",
   "description": "A TypeScript Framework on top of Express",
   "type": "module",
-  "version": "8.12.5",
+  "version": "8.13.1",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
   "module": "./lib/esm/index.js",
@@ -58,20 +58,19 @@
     "tslib": "2.7.0"
   },
   "devDependencies": {
-    "@tsed/barrels": "8.12.5",
-    "@tsed/core": "8.12.5",
-    "@tsed/di": "8.12.5",
-    "@tsed/platform-http": "8.12.5",
-    "@tsed/platform-test-sdk": "8.12.5",
-    "@tsed/platform-views": "8.12.5",
-    "@tsed/typescript": "8.12.5",
+    "@tsed/barrels": "8.13.1",
+    "@tsed/core": "8.13.1",
+    "@tsed/di": "8.13.1",
+    "@tsed/platform-http": "8.13.1",
+    "@tsed/platform-test-sdk": "8.13.1",
+    "@tsed/platform-views": "8.13.1",
+    "@tsed/typescript": "8.13.1",
     "@types/body-parser": "1.19.5",
     "@types/compression": "1.7.5",
     "@types/cookie-parser": "1.4.7",
     "@types/express": "^4.17.21",
     "@types/express-session": "1.18.1",
     "@types/method-override": "0.0.35",
-    "@types/multer": "^1.4.12",
     "body-parser": "1.20.3",
     "compression": "1.7.4",
     "cookie-parser": "1.4.6",
@@ -82,7 +81,7 @@
     "express-session": "1.18.1",
     "method-override": "3.0.0",
     "typescript": "5.4.5",
-    "vitest": "3.1.4"
+    "vitest": "3.2.4"
   },
   "peerDependencies": {
     "@tsed/core": ">=8.0.0",
@@ -93,7 +92,6 @@
     "@tsed/platform-http": ">=8.0.0",
     "@tsed/platform-views": ">=8.0.0",
     "@tsed/schema": ">=8.0.0",
-    "@types/multer": "^1.4.5",
     "body-parser": "^1.19.0",
     "cross-env": "7.0.3",
     "express": ">=4.17.1",