bxo 0.0.5-dev.8 → 0.0.5-dev.9

package/index.ts

@@ -252,16 +252,38 @@ export default class BXO {
       const routeSegments = route.path.split('/').filter(Boolean);
       const pathSegments = pathname.split('/').filter(Boolean);
 
-      if (routeSegments.length !== pathSegments.length) continue;
-
       const params: Record<string, string> = {};
       let isMatch = true;
 
+      // Handle wildcard at the end (catch-all)
+      const hasWildcardAtEnd = routeSegments.length > 0 && routeSegments[routeSegments.length - 1] === '*';
+      
+      if (hasWildcardAtEnd) {
+        // For catch-all wildcard, path must have at least as many segments as route (minus the wildcard)
+        if (pathSegments.length < routeSegments.length - 1) continue;
+      } else {
+        // For exact matching (with possible single-segment wildcards), lengths must match
+        if (routeSegments.length !== pathSegments.length) continue;
+      }
+
       for (let i = 0; i < routeSegments.length; i++) {
         const routeSegment = routeSegments[i];
         const pathSegment = pathSegments[i];
 
-        if (!routeSegment || !pathSegment) {
+        if (!routeSegment) {
+          isMatch = false;
+          break;
+        }
+
+        // Handle catch-all wildcard at the end
+        if (routeSegment === '*' && i === routeSegments.length - 1) {
+          // Wildcard at end matches remaining path segments
+          const remainingPath = pathSegments.slice(i).join('/');
+          params['*'] = remainingPath;
+          break;
+        }
+
+        if (!pathSegment) {
           isMatch = false;
           break;
         }
@@ -269,6 +291,9 @@ export default class BXO {
         if (routeSegment.startsWith(':')) {
           const paramName = routeSegment.slice(1);
           params[paramName] = decodeURIComponent(pathSegment);
+        } else if (routeSegment === '*') {
+          // Single segment wildcard
+          params['*'] = decodeURIComponent(pathSegment);
         } else if (routeSegment !== pathSegment) {
           isMatch = false;
           break;
@@ -289,16 +314,38 @@ export default class BXO {
       const routeSegments = route.path.split('/').filter(Boolean);
       const pathSegments = pathname.split('/').filter(Boolean);
 
-      if (routeSegments.length !== pathSegments.length) continue;
-
       const params: Record<string, string> = {};
       let isMatch = true;
 
+      // Handle wildcard at the end (catch-all)
+      const hasWildcardAtEnd = routeSegments.length > 0 && routeSegments[routeSegments.length - 1] === '*';
+      
+      if (hasWildcardAtEnd) {
+        // For catch-all wildcard, path must have at least as many segments as route (minus the wildcard)
+        if (pathSegments.length < routeSegments.length - 1) continue;
+      } else {
+        // For exact matching (with possible single-segment wildcards), lengths must match
+        if (routeSegments.length !== pathSegments.length) continue;
+      }
+
       for (let i = 0; i < routeSegments.length; i++) {
         const routeSegment = routeSegments[i];
         const pathSegment = pathSegments[i];
 
-        if (!routeSegment || !pathSegment) {
+        if (!routeSegment) {
+          isMatch = false;
+          break;
+        }
+
+        // Handle catch-all wildcard at the end
+        if (routeSegment === '*' && i === routeSegments.length - 1) {
+          // Wildcard at end matches remaining path segments
+          const remainingPath = pathSegments.slice(i).join('/');
+          params['*'] = remainingPath;
+          break;
+        }
+
+        if (!pathSegment) {
           isMatch = false;
           break;
         }
@@ -306,6 +353,9 @@ export default class BXO {
         if (routeSegment.startsWith(':')) {
           const paramName = routeSegment.slice(1);
           params[paramName] = decodeURIComponent(pathSegment);
+        } else if (routeSegment === '*') {
+          // Single segment wildcard
+          params['*'] = decodeURIComponent(pathSegment);
         } else if (routeSegment !== pathSegment) {
           isMatch = false;
           break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bxo",
   "module": "index.ts",
-  "version": "0.0.5-dev.8",
+  "version": "0.0.5-dev.9",
   "description": "A simple and lightweight web framework for Bun",
   "type": "module",
   "devDependencies": {