@stacksjs/bun-router 0.0.21 → 0.0.23

package/dist/cli.js

@@ -2047,7 +2047,7 @@ function getPrefix() {
 }
 var prefix = getPrefix();
 // package.json
-var version = "0.0.21";
+var version = "0.0.23";
 
 // src/cli/middleware.ts
 import fs2 from "fs/promises";

package/dist/index.js

@@ -3074,7 +3074,19 @@ function findPrebuiltView(stxFilePath, viewsDir) {
   }
   return null;
 }
-async function renderStxFile(filePath, viewsDir, data, routingConfig) {
+function parseCookies(header) {
+  const jar = {};
+  for (const part of String(header ?? "").split(";")) {
+    const cut = part.indexOf("=");
+    if (cut < 0)
+      continue;
+    try {
+      jar[part.slice(0, cut).trim()] = decodeURIComponent(part.slice(cut + 1).trim());
+    } catch {}
+  }
+  return jar;
+}
+async function renderStxFile(filePath, viewsDir, data, routingConfig, request2) {
   const stxModule = "@stacksjs/stx";
   const stx = await import(stxModule);
   if (!stx.processDirectives || !stx.extractVariables) {
@@ -3085,11 +3097,42 @@ async function renderStxFile(filePath, viewsDir, data, routingConfig) {
   const scriptContent = scriptMatch ? scriptMatch[1] : "";
   let templateContent = scriptMatch ? content.replace(/<script\s+server\s*>[\s\S]*?<\/script>/i, "") : content;
   templateContent = templateContent.replace(/<script\s+client\s*>/gi, "<script>");
+  const asked = { status: 200, headers: {} };
+  const headerBag = data.headers ?? {};
+  const cookieHeader = String(headerBag.cookie ?? headerBag.Cookie ?? "");
+  const requestUrl = String(data.url ?? "");
+  const search = requestUrl.includes("?") ? requestUrl.slice(requestUrl.indexOf("?")) : "";
+  const serveContext = {
+    url: requestUrl,
+    path: String(data.path ?? ""),
+    search,
+    host: String(headerBag.host ?? ""),
+    cookieHeader,
+    cookies: parseCookies(cookieHeader),
+    ip: "",
+    locale: null,
+    params: data.params ?? {},
+    method: String(data.method ?? "GET"),
+    request: request2
+  };
   const context = {
     __filename: filePath,
     __dirname: dirname(filePath),
     props: data,
-    ...data
+    ...data,
+    __stxServeContext: serveContext,
+    setResponseStatus: (status) => {
+      if (Number.isInteger(status) && status >= 100 && status <= 599)
+        asked.status = status;
+    },
+    notFound: (status = 404) => {
+      asked.status = Number.isInteger(status) && status >= 400 && status <= 599 ? status : 404;
+    },
+    setResponseHeader: (name, value) => {
+      if (name)
+        asked.headers[String(name)] = String(value);
+    },
+    definePageMeta: () => {}
   };
   if (scriptContent) {
     await stx.extractVariables(scriptContent, context, filePath);
@@ -3103,7 +3146,14 @@ async function renderStxFile(filePath, viewsDir, data, routingConfig) {
     layoutsDir: resolvedLayoutsDir,
     partialsDir: resolvedPartialsDir
   };
-  return stx.processDirectives(templateContent, context, filePath, config2, new Set);
+  const html = await stx.processDirectives(templateContent, context, filePath, config2, new Set);
+  const recordedStatus = Number(context.__stxResponseStatus);
+  const recordedHeaders = context.__stxResponseHeaders;
+  return {
+    html,
+    status: Number.isInteger(recordedStatus) && recordedStatus >= 100 && recordedStatus <= 599 ? recordedStatus : asked.status,
+    headers: { ...asked.headers, ...recordedHeaders ?? {} }
+  };
 }
 function createViewHandler(filePath, viewsDir, config2, queryPreservationConfig) {
   return async (req) => {
@@ -3133,11 +3183,11 @@ function createViewHandler(filePath, viewsDir, config2, queryPreservationConfig)
         });
       }
       if (filePath.endsWith(".stx")) {
-        let html = await renderStxFile(filePath, viewsDir, data, config2);
-        html = applyQueryPreservation(html);
+        const rendered = await renderStxFile(filePath, viewsDir, data, config2, req);
+        const html = applyQueryPreservation(rendered.html);
         return new Response(html, {
-          status: 200,
-          headers: { "Content-Type": "text/html; charset=utf-8" }
+          status: rendered.status,
+          headers: { "Content-Type": "text/html; charset=utf-8", ...rendered.headers }
         });
       }
       let content = await Bun.file(filePath).text();
@@ -6752,6 +6802,12 @@ class RouteTrie {
           type: "wildcard",
           value: "*"
         });
+      } else if (/^\{[^{}/]+\}\*$/.test(part)) {
+        segments.push({
+          type: "wildcard",
+          value: part,
+          paramName: part.slice(1, part.indexOf("}"))
+        });
       } else if (part.startsWith("{") && part.endsWith("}")) {
         const paramPart = part.slice(1, -1);
         const [paramName, pattern] = paramPart.split(":");
@@ -6837,6 +6893,7 @@ class RouteTrie {
       case "wildcard":
         if (!node.wildcardChild) {
           node.wildcardChild = new TrieNode;
+          node.wildcardChild.paramName = segment.paramName ?? null;
         }
         this.insertRoute(node.wildcardChild, compiled, segmentIndex + 1);
         break;
@@ -6886,7 +6943,7 @@ class RouteTrie {
     if (node.wildcardChild) {
       const compiled = node.wildcardChild.getRoute(method);
       if (compiled) {
-        params.wildcard = segments.slice(segmentIndex).join("/");
+        params[node.wildcardChild.paramName ?? "wildcard"] = segments.slice(segmentIndex).join("/");
         return {
           route: compiled.route,
           params,
@@ -7029,8 +7086,18 @@ class RouteCompiler {
     }
   }
   convertToURLPattern(path, constraints) {
+    let staticPath = path;
+    let catchAll = null;
+    const namedCatchAll = staticPath.match(/\{([^{}/]+)\}\*$/);
+    if (namedCatchAll) {
+      catchAll = namedCatchAll[1];
+      staticPath = staticPath.slice(0, namedCatchAll.index);
+    } else if (staticPath.endsWith("*")) {
+      catchAll = "wildcard";
+      staticPath = staticPath.slice(0, -1);
+    }
     const paramTokens = [];
-    const withTokens = path.replace(/\{([^}]+)\}/g, (_m, inner) => {
+    const withTokens = staticPath.replace(/\{([^}]+)\}/g, (_m, inner) => {
       paramTokens.push(inner);
       return `\x00${paramTokens.length - 1}\x00`;
     });
@@ -7047,6 +7114,8 @@ class RouteCompiler {
       const leadingSlash = token.startsWith("/") ? "/" : "";
       return isOptional ? `(?:${leadingSlash}${group})?` : `${leadingSlash}${group}`;
     });
+    if (catchAll !== null)
+      regexPattern += `(?<${catchAll}>${constraints?.[catchAll] ?? ".+"})`;
     const regex = new RegExp(`^${regexPattern}$`);
     return {
       exec: (pathname) => {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/bun-router",
   "type": "module",
-  "version": "0.0.21",
+  "version": "0.0.23",
   "description": "A fast, type-safe router for Bun.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",