@stacksjs/stx 0.2.149 → 0.2.151

package/dist/dev-server/serve-multi.js

@@ -8,6 +8,7 @@ import { partialsCache } from "../includes.js";
 import { stateDir } from "../state-dir.js";
 import { plugin as stxPlugin } from "../plugin.js";
 import { clearComponentCache } from "../utils.js";
+import { bracketPathToRegex } from "stx-router";
 import {
   colors,
   findAvailablePort,
@@ -275,9 +276,9 @@ export async function serveMultipleStxFiles(filePaths, options = {}) {
           if (routePath.endsWith("/index"))
             routePath = routePath.slice(0, -6) || "/";
           if (routePath.includes("[")) {
-            const paramNames = [...routePath.matchAll(/\[([^\]]+)\]/g)].map((m) => m[1]), regexStr = routePath.replace(/\[([^\]]+)\]/g, "([^/]+)");
+            const { regex, params: paramNames } = bracketPathToRegex(routePath);
             dynamicRoutes.push({
-              pattern: new RegExp(`^${regexStr}$`),
+              pattern: regex,
               paramNames,
               filePath: absolutePath,
               routeTemplate: routePath,

package/dist/production-server.js

@@ -4,6 +4,7 @@ import { serve } from "bun";
 import { loadManifest } from "./manifest.js";
 import { hydrateTemplateStream, hydrateFragment } from "./template-hydrator.js";
 import { extractLayoutMetadata } from "./app-shell.js";
+import { patternToRegex } from "stx-router";
 const MIME_TYPES = {
   ".js": "application/javascript",
   ".mjs": "application/javascript",
@@ -55,11 +56,8 @@ export async function startProductionServer(options = {}) {
   const exactRoutes = new Map, paramRoutes = [];
   for (const route of manifest.routes)
     if (route.hasParams) {
-      const paramNames = [], regexStr = route.pattern.replace(/:([^/]+)/g, (_, name) => {
-        paramNames.push(name);
-        return "([^/]+)";
-      });
-      paramRoutes.push({ regex: new RegExp(`^${regexStr}$`), route, paramNames });
+      const { regex, params: paramNames } = patternToRegex(route.pattern);
+      paramRoutes.push({ regex, route, paramNames });
     } else
       exactRoutes.set(route.pattern, route);
   const server = serve({

package/dist/ssr.js

@@ -3,6 +3,7 @@ import path from "node:path";
 import { errorLogger } from "./error-handling.js";
 import { processDirectives } from "./process.js";
 import { extractVariables } from "./utils.js";
+import { patternToRegex } from "stx-router";
 
 export class MemorySessionStore {
   store = new Map;
@@ -180,10 +181,7 @@ export function createApp(config = {}) {
     for (const route of routes) {
       if (route.method !== method && route.method !== "*")
         continue;
-      const paramNames = [], regexPattern = route.pattern.replace(/\/:(\w+)/g, (_, name) => {
-        paramNames.push(name);
-        return "/([^/]+)";
-      }).replace(/\//g, "\\/"), regex = new RegExp(`^${regexPattern}$`), match = pathname.match(regex);
+      const { regex, params: paramNames } = patternToRegex(route.pattern), match = pathname.match(regex);
       if (match) {
         const params = {};
         paramNames.forEach((name, i) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/stx",
   "type": "module",
-  "version": "0.2.149",
+  "version": "0.2.151",
   "description": "A performant UI Framework. Powered by Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -117,12 +117,12 @@
   "dependencies": {
     "@cwcss/crosswind": "^0.2.14",
     "@stacksjs/clapp": "^0.2.0",
-    "@stacksjs/desktop": "0.2.149",
-    "@stacksjs/sanitizer": "0.2.149",
+    "@stacksjs/desktop": "0.2.151",
+    "@stacksjs/sanitizer": "0.2.151",
     "@stacksjs/ts-i18n": "^0.1.11",
-    "bun-plugin-stx": "0.2.149",
+    "bun-plugin-stx": "0.2.151",
     "bunfig": "^0.15.17",
-    "stx-router": "0.2.149",
+    "stx-router": "0.2.151",
     "ts-broadcasting": "^0.0.9",
     "ts-images": "^0.1.9",
     "ts-syntax-highlighter": "^0.2.1"