@tahminator/sapling 1.4.0 → 1.4.1

package/dist/src/annotation/controller.js

@@ -36,12 +36,14 @@ export function Controller({ prefix = "", deps = [] } = {
             const fn = controllerInstance[fnName];
             if (typeof fn !== "function")
                 continue;
-            const fp = prefix + path;
-            const routeKey = method + " " + fp;
+            // When path is a RegExp, use it directly without prefix
+            // When path is a string, prepend the prefix
+            const fp = path instanceof RegExp ? path : prefix + path;
+            const routeKey = method + " " + (path instanceof RegExp ? path.source : fp);
             // Only check for duplicates on non-middleware routes
             // Middleware (USE) can have duplicate paths, and different HTTP methods can share paths
             if (method !== "USE" && usedRoutes.has(routeKey)) {
-                throw new Error(`Duplicate route [${method}] "${fp}" detected in controller "${target.name}"`);
+                throw new Error(`Duplicate route [${method}] "${path instanceof RegExp ? path.source : fp}" detected in controller "${target.name}"`);
             }
             if (method !== "USE") {
                 usedRoutes.add(routeKey);
@@ -68,7 +70,7 @@ export function Controller({ prefix = "", deps = [] } = {
                 if (!response.writableEnded) {
                     response
                         .status(404)
-                        .send(Html404ErrorPage(`Cannot ${methodName.toUpperCase()} ${fp}`));
+                        .send(Html404ErrorPage(`Cannot ${methodName.toUpperCase()} ${path instanceof RegExp ? path.source : fp}`));
                 }
             }));
         }

package/dist/src/annotation/route.d.ts

@@ -5,40 +5,40 @@ import { RouteDefinition, ExpressRouterMethodKey } from "../types";
  */
 export declare function _Route({ method, path, }: {
     method: ExpressRouterMethodKey;
-    path: string | undefined;
+    path: string | RegExp | undefined;
 }): MethodDecorator;
 /**
  * Register GET route on the given path (default "") for the given controller.
  */
-export declare const GET: (path?: string | undefined) => MethodDecorator;
+export declare const GET: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Register POST route on the given path (default "") for the given controller.
  */
-export declare const POST: (path?: string | undefined) => MethodDecorator;
+export declare const POST: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Register PUT route on the given path (default "") for the given controller.
  */
-export declare const PUT: (path?: string | undefined) => MethodDecorator;
+export declare const PUT: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Register DELETE route on the given path (default "") for the given controller.
  */
-export declare const DELETE: (path?: string | undefined) => MethodDecorator;
+export declare const DELETE: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Register OPTIONS route on the given path (default "") for the given controller.
  */
-export declare const OPTIONS: (path?: string | undefined) => MethodDecorator;
+export declare const OPTIONS: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Register PATCH route on the given path (default "") for the given controller.
  */
-export declare const PATCH: (path?: string | undefined) => MethodDecorator;
+export declare const PATCH: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Register HEAD route on the given path (default "") for the given controller.
  */
-export declare const HEAD: (path?: string | undefined) => MethodDecorator;
+export declare const HEAD: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Register a middleware route on the given path (default "") for the given controller.
  */
-export declare const Middleware: (path?: string | undefined) => MethodDecorator;
+export declare const Middleware: (path?: string | RegExp | undefined) => MethodDecorator;
 /**
  * Given a class constructor, fetch all the routes attached.
  */

package/dist/src/annotation/route.js

@@ -8,7 +8,7 @@ export function _Route({ method, path = "", }) {
         var _a;
         const ctor = target.constructor;
         const list = (_a = _routeStore.get(ctor)) !== null && _a !== void 0 ? _a : [];
-        list.push({ method, path, fnName: String(propertyKey) });
+        list.push({ method, path: path !== null && path !== void 0 ? path : "", fnName: String(propertyKey) });
         _routeStore.set(ctor, list);
     };
 }

package/dist/src/types.d.ts

@@ -8,9 +8,9 @@ export type RouteDefinition = {
      */
     method: ExpressRouterMethodKey;
     /**
-     * The path to define the route on.
+     * The path to define the route on. Can be a string or RegExp.
      */
-    path: string;
+    path: string | RegExp;
     /**
      * The name of the function the `@Route` annotation was applied on.
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tahminator/sapling",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "A library to help you write cleaner Express.js code",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",