@stacksjs/bun-router 0.0.20 → 0.0.22

package/dist/cli.js

@@ -2047,7 +2047,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version = "0.0.20";
+var version = "0.0.22";
 
 // src/cli/middleware.ts
 import fs2 from "fs/promises";

package/dist/index.js

@@ -6752,6 +6752,12 @@ class RouteTrie {
           type: "wildcard",
           value: "*"
         });
+      } else if (/^\{[^{}/]+\}\*$/.test(part)) {
+        segments.push({
+          type: "wildcard",
+          value: part,
+          paramName: part.slice(1, part.indexOf("}"))
+        });
       } else if (part.startsWith("{") && part.endsWith("}")) {
         const paramPart = part.slice(1, -1);
         const [paramName, pattern] = paramPart.split(":");
@@ -6837,6 +6843,7 @@ class RouteTrie {
       case "wildcard":
         if (!node.wildcardChild) {
           node.wildcardChild = new TrieNode;
+          node.wildcardChild.paramName = segment.paramName ?? null;
         }
         this.insertRoute(node.wildcardChild, compiled, segmentIndex + 1);
         break;
@@ -6886,7 +6893,7 @@ class RouteTrie {
     if (node.wildcardChild) {
       const compiled = node.wildcardChild.getRoute(method);
       if (compiled) {
-        params.wildcard = segments.slice(segmentIndex).join("/");
+        params[node.wildcardChild.paramName ?? "wildcard"] = segments.slice(segmentIndex).join("/");
         return {
           route: compiled.route,
           params,
@@ -7029,8 +7036,18 @@ class RouteCompiler {
     }
   }
   convertToURLPattern(path, constraints) {
+    let staticPath = path;
+    let catchAll = null;
+    const namedCatchAll = staticPath.match(/\{([^{}/]+)\}\*$/);
+    if (namedCatchAll) {
+      catchAll = namedCatchAll[1];
+      staticPath = staticPath.slice(0, namedCatchAll.index);
+    } else if (staticPath.endsWith("*")) {
+      catchAll = "wildcard";
+      staticPath = staticPath.slice(0, -1);
+    }
     const paramTokens = [];
-    const withTokens = path.replace(/\{([^}]+)\}/g, (_m, inner) => {
+    const withTokens = staticPath.replace(/\{([^}]+)\}/g, (_m, inner) => {
       paramTokens.push(inner);
       return `\x00${paramTokens.length - 1}\x00`;
     });
@@ -7047,6 +7064,8 @@ class RouteCompiler {
       const leadingSlash = token.startsWith("/") ? "/" : "";
       return isOptional ? `(?:${leadingSlash}${group})?` : `${leadingSlash}${group}`;
     });
+    if (catchAll !== null)
+      regexPattern += `(?<${catchAll}>${constraints?.[catchAll] ?? ".+"})`;
     const regex = new RegExp(`^${regexPattern}$`);
     return {
       exec: (pathname) => {
@@ -8693,6 +8712,13 @@ class Router {
       const value = params?.[name];
       return value !== undefined ? value : defaultValue;
     };
+    enhancedReq.getParamAsInt = (name) => {
+      const value = params?.[name];
+      if (value === undefined || value.trim() === "")
+        return null;
+      const parsed = Number(value);
+      return Number.isSafeInteger(parsed) ? parsed : null;
+    };
     enhancedReq.params = params || {};
     return enhancedReq;
   }
@@ -9353,6 +9379,15 @@ if (!RequestWithMacros.hasMacro("getParam")) {
     return value !== undefined ? value : defaultValue;
   });
 }
+if (!RequestWithMacros.hasMacro("getParamAsInt")) {
+  RequestWithMacros.macro("getParamAsInt", function(name) {
+    const value = this.params?.[name];
+    if (value === undefined || value.trim() === "")
+      return null;
+    const parsed = Number(value);
+    return Number.isSafeInteger(parsed) ? parsed : null;
+  });
+}
 if (!RequestWithMacros.hasMacro("get")) {
   RequestWithMacros.macro("get", function(key, defaultValue) {
     const value = getParsedURL(this).searchParams.get(key);

package/dist/types.d.ts

@@ -695,6 +695,11 @@ export interface EnhancedRequest extends Request, Omit<RequestMacroMethods, 'ip'
      * `$request->route('name')` ergonomics.
      */
     getParam: <T = string>(name: string, defaultValue?: T) => T | undefined;
+    /**
+     * Read a route parameter as a safe integer. Missing, fractional, and
+     * otherwise invalid numeric values return null.
+     */
+    getParamAsInt: (name: string) => number | null;
     /**
      * Query parameters from the URL
      */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/bun-router",
   "type": "module",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "A fast, type-safe router for Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",