bun-plugin-stx 0.2.148 → 0.2.150

package/dist/{chunk-7xv85mm2.js → chunk-8nbccnre.js}

@@ -75,21 +75,35 @@ function filePathToPattern(filePath, pagesDir) {
 }
 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 = "";
+  let i = 0;
+  while (i < pattern.length) {
+    const rest = pattern.slice(i);
+    const 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 };
 }
 function matchRoute(pathname, routes) {
   const normalizedPath = pathname === "" ? "/" : pathname;
@@ -105,6 +119,10 @@ function matchRoute(pathname, routes) {
   }
   return null;
 }
+function bracketPathToRegex(routePath) {
+  const pattern = routePath.replace(/\[\[([^\]]+)\]\]/g, ":$1?").replace(/\[([^\]]+)\]/g, ":$1").replace(/:\.\.\.([^/]+)/g, ":$1*");
+  return patternToRegex(pattern);
+}
 
 // ../router/src/nested-layouts.ts
 import fs2 from "fs";
@@ -1705,6 +1723,7 @@ export {
   createMiddlewareContext,
   createClientCookieManager,
   clearMiddleware,
+  bracketPathToRegex,
   abortNavigation,
   Router
 };

package/dist/serve.js

@@ -9361,7 +9361,7 @@ After installing: bun add bun-plugin-stx`);
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-7xv85mm2.js");
+      const { Router } = await import("./chunk-8nbccnre.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName() });
       if (!options.quiet)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.148",
+  "version": "0.2.150",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",