@pirxpilot/router 2.0.0 → 2.0.1

package/lib/matcher.js

@@ -47,7 +47,12 @@ export function createRegexMatcher(path) {
   };
 }
 
+const parameterRegex = /:([a-zA-Z_]\w*)/g;
+
 export function createURLPatternMatcher(pathname, { sensitive, end, strict }) {
+  // Extract parameter names from the pattern in order
+  const parameterOrder = new Set(pathname.matchAll(parameterRegex).map(m => m[1]));
+
   // Build the pattern:
   // - For end=false (prefix matching): add {/*}? to match optional trailing content
   // - For end=true with trailing=true: add {/}? to match optional trailing slash
@@ -70,9 +75,23 @@ export function createURLPatternMatcher(pathname, { sensitive, end, strict }) {
 
     const params = {};
     const keys = [];
+
+    // Process parameters in the order they appear in the pattern
+    // Use the preserved parameter order
+    for (const key of parameterOrder) {
+      const value = match.pathname.groups[key];
+      if (value !== undefined) {
+        keys.push(key);
+        params[key] = decodeParam(value);
+      }
+    }
+
+    // Also handle any additional groups not in parameterOrder (e.g., numbered groups)
     for (const [key, value] of Object.entries(match.pathname.groups)) {
       // Skip the default wildcard capture group '0'
       if (key === '0') continue;
+      // Skip if we already processed this key
+      if (parameterOrder.has(key)) continue;
       if (value !== undefined) {
         keys.push(key);
         params[key] = decodeParam(value);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pirxpilot/router",
   "description": "Simple middleware-style router",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "author": "Douglas Christopher Wilson <doug@somethingdoug.com>",
   "contributors": [
     "Blake Embrey <hello@blakeembrey.com>"