stx-router 0.2.147 → 0.2.149

package/dist/matcher.d.ts

@@ -1,3 +1,19 @@
 export declare function filePathToPattern(filePath: string, pagesDir: string): string;
+/**
+ * Compile a route pattern into a regex and the parameter names its capture
+ * groups correspond to.
+ *
+ * Single left-to-right pass, which is the whole point. Doing it as three
+ * successive `.replace()` sweeps - optional, then catch-all, then required -
+ * collects the names in *sweep* order while the capture groups end up in
+ * *pattern* order, and the two disagree the moment one pattern mixes kinds.
+ *
+ * `/:owner/:repository/tree/:ref/:path*` collected as
+ * `[path, owner, repository, ref]` against groups `(owner)(repository)(ref)(path)`,
+ * so every value was bound to the wrong name: a repository browser given a URL
+ * showed the root of a repository named after the branch. Nothing errored -
+ * the regex matched and the page rendered - which is why it reads as a routing
+ * mystery rather than an off-by-one.
+ */
 export declare function patternToRegex(pattern: string): { regex: RegExp, params: string[] };
 export declare function matchRoute(pathname: string, routes: { pattern: string, regex: RegExp, params: string[] }[]): { route: typeof routes[0], params: Record<string, string> } | null;

package/dist/matcher.js

@@ -13,21 +13,33 @@ export function filePathToPattern(filePath, pagesDir) {
 }
 export function patternToRegex(pattern) {
   const params = [];
-  let regexStr = pattern.replace(/[.+^${}()|[\]\\]/g, "\\$&");
-  regexStr = regexStr.replace(/\/:([^/]+)\?/g, (_, name) => {
-    params.push(name);
-    return "(?:/([^/]+))?";
-  });
-  regexStr = regexStr.replace(/:([^/]+)\*/g, (_, name) => {
-    params.push(name);
-    return "(.+)";
-  });
-  regexStr = regexStr.replace(/:([^/]+)/g, (_, name) => {
-    params.push(name);
-    return "([^/]+)";
-  });
-  regexStr = `^${regexStr}$`;
-  return { regex: new RegExp(regexStr), params };
+  let regexStr = "", i = 0;
+  while (i < pattern.length) {
+    const rest = pattern.slice(i), optional = /^\/:([^/?*]+)\?/.exec(rest);
+    if (optional) {
+      params.push(optional[1]);
+      regexStr += "(?:/([^/]+))?";
+      i += optional[0].length;
+      continue;
+    }
+    const catchAll = /^:([^/?*]+)\*/.exec(rest);
+    if (catchAll) {
+      params.push(catchAll[1]);
+      regexStr += "(.+)";
+      i += catchAll[0].length;
+      continue;
+    }
+    const required = /^:([^/?*]+)/.exec(rest);
+    if (required) {
+      params.push(required[1]);
+      regexStr += "([^/]+)";
+      i += required[0].length;
+      continue;
+    }
+    regexStr += pattern[i].replace(/[.+^${}()|[\]\\*?]/g, "\\$&");
+    i += 1;
+  }
+  return { regex: new RegExp(`^${regexStr}$`), params };
 }
 export function matchRoute(pathname, routes) {
   const normalizedPath = pathname === "" ? "/" : pathname;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stx-router",
   "type": "module",
-  "version": "0.2.147",
+  "version": "0.2.149",
   "description": "File-based router for STX — .stx template discovery, nested layouts, typed route params, middleware, and client-side SPA navigation.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",