@tsed/platform-fastify 8.12.4 → 8.13.0

package/lib/esm/components/PlatformFastify.js

@@ -13,6 +13,7 @@ import { PlatformHandlerType } from "@tsed/platform-router";
 import Fastify from "fastify";
 import { PlatformFastifyRequest } from "../services/PlatformFastifyRequest.js";
 import { PlatformFastifyResponse } from "../services/PlatformFastifyResponse.js";
+import { convertPath } from "../utils/convertPath.js";
 export class PlatformFastify extends PlatformAdapter {
     constructor() {
         super(...arguments);
@@ -45,22 +46,24 @@ export class PlatformFastify extends PlatformAdapter {
         const { app } = this;
         const rawApp = app.getApp();
         layers.forEach((layer) => {
+            const { path, wildcard } = convertPath(layer.path);
+            const handlers = layer.getArgs(false);
             switch (layer.method) {
                 case "use":
                     if (rawApp.use) {
-                        rawApp.use(...layer.getArgs());
+                        rawApp.use(path, handlers);
                     }
                     return;
                 case "statics":
-                    this.statics(layer.path, layer.opts);
+                    this.statics(path, layer.opts);
                     // rawApp.register();
                     return;
             }
             try {
                 rawApp.route({
                     method: layer.method.toUpperCase(),
-                    url: layer.path,
-                    handler: this.compose(layer),
+                    url: path,
+                    handler: this.compose(layer, wildcard),
                     config: {
                         rawBody: layer.handlers.some((handler) => handler.opts?.paramsTypes?.RAW_BODY)
                     }
@@ -204,8 +207,12 @@ export class PlatformFastify extends PlatformAdapter {
         this.staticsDecorated = true;
         return null;
     }
-    compose(layer) {
-        return (req, reply) => {
+    compose(layer, wildcard) {
+        return (req, _) => {
+            const params = req.params;
+            if (wildcard && params["*"] && !params[wildcard]) {
+                params[wildcard] = params["*"];
+            }
             return runInContext(req.$ctx, async () => {
                 const $ctx = req.$ctx;
                 $ctx.next = null;

package/lib/esm/index.js

@@ -6,3 +6,4 @@ export * from "./interfaces/interfaces.js";
 export * from "./interfaces/PlatformFastifySettings.js";
 export * from "./services/PlatformFastifyRequest.js";
 export * from "./services/PlatformFastifyResponse.js";
+export * from "./utils/convertPath.js";

package/lib/esm/utils/convertPath.js

@@ -0,0 +1,37 @@
+import { isString } from "@tsed/core";
+export function convertPath(path) {
+    if (isString(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("{:") && segment.endsWith("}")) {
+                // Handle v5 style parameters like /{param}
+                const paramName = segment.substring(2, 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
+        };
+    }
+    return { path };
+}

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

@@ -40,6 +40,6 @@ export declare class PlatformFastify extends PlatformAdapter<FastifyInstance> {
     getServers(): any[];
     bodyParser(type: string, opts: Record<string, any> | undefined): any;
     statics(endpoint: string, options: PlatformStaticsOptions): any;
-    protected compose(layer: PlatformLayer): (req: FastifyRequest, reply: FastifyReply) => Promise<Promise<void>>;
+    protected compose(layer: PlatformLayer, wildcard?: string): (req: FastifyRequest, _: FastifyReply) => Promise<Promise<void>>;
     protected resolvePlugins(): Promise<PlatformFastifyPluginLoadingOptions[]>;
 }

package/lib/types/index.d.ts

@@ -6,3 +6,4 @@ export * from "./interfaces/interfaces.js";
 export * from "./interfaces/PlatformFastifySettings.js";
 export * from "./services/PlatformFastifyRequest.js";
 export * from "./services/PlatformFastifyResponse.js";
+export * from "./utils/convertPath.js";

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

@@ -0,0 +1,6 @@
+interface ConvertPathResult {
+    path: string | RegExp;
+    wildcard?: string;
+}
+export declare function convertPath(path: string | RegExp): ConvertPathResult;
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@tsed/platform-fastify",
   "type": "module",
-  "version": "8.12.4",
+  "version": "8.13.0",
   "description": "Fastify package for Ts.ED framework",
   "source": "./src/index.ts",
   "main": "./lib/esm/index.js",
@@ -61,17 +61,17 @@
     "@fastify/cookie": "11.0.1",
     "@fastify/formbody": "8.0.1",
     "@fastify/session": "11.0.1",
-    "@tsed/barrels": "8.12.4",
-    "@tsed/core": "8.12.4",
-    "@tsed/di": "8.12.4",
-    "@tsed/platform-http": "8.12.4",
-    "@tsed/platform-test-sdk": "8.12.4",
+    "@tsed/barrels": "8.13.0",
+    "@tsed/core": "8.13.0",
+    "@tsed/di": "8.13.0",
+    "@tsed/platform-http": "8.13.0",
+    "@tsed/platform-test-sdk": "8.13.0",
     "@types/content-disposition": "^0.5.4",
     "cross-env": "7.0.3",
     "fastify": "5.3.2",
     "fastify-raw-body": "5.0.0",
     "ts-node": "10.9.2",
-    "vitest": "3.1.4"
+    "vitest": "3.2.4"
   },
   "peerDependencies": {
     "@fastify/accepts": ">=4.3.0",