bun-plugin-stx 0.2.84 → 0.2.86

package/dist/{chunk-sm4gbwrd.js → chunk-394anrmt.js}

@@ -889,9 +889,21 @@ else {
     }
   }
 
+  // A full document is only safe to partial-swap into the stx shell if it is
+  // itself stx-rendered. Pages served by another engine mounted on the same
+  // origin (e.g. a docs/blog generator) carry none of these markers; swapping
+  // their <main> + styles into the stx shell corrupts the layout. Detect them
+  // and hand off to a native full navigation instead.
+  function isStxDocument(html){
+    return html.indexOf('name="stx-layout"')!==-1
+      ||html.indexOf('__stxRouterConfig')!==-1
+      ||html.indexOf('data-stx-content')!==-1;
+  }
+
   function swap(html,url,pushState,hash){
     var isFragment=html.indexOf('<!--stx-fragment-->')===0;
     if(isFragment)html=html.slice('<!--stx-fragment-->'.length);
+    if(!isFragment&&!isStxDocument(html)){log('[router] non-stx document \u2014 full navigation to:',url);location.href=url;return}
     var currentContent=getContainer();
     log('[router] swap: isFragment='+isFragment+' container='+!!currentContent+' tag='+(currentContent&&currentContent.tagName)+' selector='+containerSel+' htmlLen='+html.length);
     if(!currentContent){log('[router] no container \u2014 falling back');location.href=url;return}

package/dist/serve.d.ts

@@ -1,16 +1,3 @@
-/**
- * Build the candidate regexes for a dynamic route file (stacksjs/stx#1927).
- *
- * `fileRouteBase` is the route path with the file extension already
- * stripped (e.g. `judges/[id]/profile/index`). Returns one regex per
- * acceptable URL shape:
- *   - the literal path with `[param]` → `([^/]+)`
- *   - the same with a trailing `/index` removed, so
- *     `judges/[id]/profile/index` also matches `judges/35/profile`
- *     (without this, nested dynamic routes 404 on hard reload)
- *   - both of the above again with a leading `pages/` stripped, for
- *     projects that nest routable views under `pages/`
- */
 export declare function buildDynamicRouteRegexes(fileRouteBase: string): RegExp[];
 /**
  * Are we serving in production? In production the built-in 404 must not
@@ -55,6 +42,42 @@ export declare function bundleBrowserAsset(entrypoint: string): Promise<Response
  * @param options Server options with patterns and port
  */
 export declare function serve(options: ServeOptions): Promise<void>;
+/**
+ * Build the candidate regexes for a dynamic route file (stacksjs/stx#1927).
+ *
+ * `fileRouteBase` is the route path with the file extension already
+ * stripped (e.g. `judges/[id]/profile/index`). Returns one regex per
+ * acceptable URL shape:
+ *   - the literal path with `[param]` → `([^/]+)`
+ *   - the same with a trailing `/index` removed, so
+ *     `judges/[id]/profile/index` also matches `judges/35/profile`
+ *     (without this, nested dynamic routes 404 on hard reload)
+ *   - both of the above again with a leading `pages/` stripped, for
+ *     projects that nest routable views under `pages/`
+ */
+/**
+ * Snapshot of the in-flight request, threaded from the fetch handler down to
+ * the `<script server>` render (stacksjs/stacks#1967).
+ *
+ * The module-level `activeServe*` singletons are NOT safe to read at render
+ * time: a render can suspend at an `await` (onRequest hooks, DB queries in
+ * server scripts) while a concurrent request — the HMR EventSource opens on
+ * every page load — runs its own handler and resets the singletons in its
+ * `finally`. Threading an immutable per-request snapshot removes that race;
+ * the singletons remain only as a fallback for legacy call sites.
+ */
+export declare interface ServeRequestContext {
+  url: string
+  path: string
+  search: string
+  host: string
+  cookieHeader: string
+  cookies: Record<string, string>
+  ip: string
+  locale: string | null
+  params: Record<string, string>
+  [key: string]: unknown
+}
 export declare interface ServeOptions {
   patterns: string[]
   port?: number
@@ -71,9 +94,10 @@ export declare interface ServeOptions {
   routes?: Record<string, (req: Request) => Response | Promise<Response>>
   onRequest?: (req: Request) =>
   | Response
+  | Record<string, unknown>
   | null
   | undefined
-  | Promise<Response | null | undefined>
+  | Promise<Response | Record<string, unknown> | null | undefined>
   middleware?: Record<string, MiddlewareHandler>
   globalMiddleware?: string[]
   middlewareGroups?: Record<string, string[]>

package/dist/serve.js

@@ -9133,16 +9133,31 @@ After installing: bun add bun-plugin-stx`);
       return typeof translate === "function" ? translate(key, values, loc) : key;
     };
   }
-  function injectServeRequestContext(context) {
-    if (activeServeSearch) {
-      context.__stxServeSearch = activeServeSearch;
-      globalThis.__stxServeSearch = activeServeSearch;
-    }
-    if (activeServeHost)
-      context.host = activeServeHost;
-    context.cookies = activeServeCookies;
-    if (activeServeIp)
-      context.ip = activeServeIp;
+  function injectServeRequestContext(context, reqCtx) {
+    const search = reqCtx ? reqCtx.search : activeServeSearch;
+    const host = reqCtx ? reqCtx.host : activeServeHost;
+    const cookies = reqCtx ? reqCtx.cookies : activeServeCookies;
+    const ip = reqCtx ? reqCtx.ip : activeServeIp;
+    context.__stxServeSearch = search;
+    globalThis.__stxServeSearch = search;
+    if (host)
+      context.host = host;
+    context.cookies = cookies;
+    if (ip)
+      context.ip = ip;
+    const full = reqCtx ?? {
+      url: "",
+      path: "",
+      search,
+      host,
+      cookieHeader: activeServeCookieHeader,
+      cookies,
+      ip,
+      locale: activeServeLocale,
+      params: {}
+    };
+    context.__stxServeContext = full;
+    globalThis.__stxServeContext = full;
   }
   function htmlCacheKey(filePath) {
     const loc = i18nConfig ? activeServeLocale ?? i18nConfig.defaultLocale : "";
@@ -9260,7 +9275,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-sm4gbwrd.js");
+      const { Router } = await import("./chunk-394anrmt.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs });
       if (!options.quiet)
@@ -9428,7 +9443,7 @@ After installing: bun add bun-plugin-stx`);
       return "";
     }
   }
-  async function processTemplate(filePath) {
+  async function processTemplate(filePath, reqCtx) {
     const content = await Bun.file(filePath).text();
     const skipCacheHint = /(?:^|[^\w$])__stx_skip_cache\s*=\s*true/.test(content);
     if (ENABLE_HTML_CACHE && !skipCacheHint) {
@@ -9451,7 +9466,8 @@ After installing: bun add bun-plugin-stx`);
     const { processDirectives, extractVariables, defaultConfig: defaultConfig4, generateSpaShell, injectRouterScript, resetHead } = await stxModule;
     resetHead();
     injectServeLocaleContext(context);
-    injectServeRequestContext(context);
+    injectServeRequestContext(context, reqCtx);
+    context.params = reqCtx?.params ?? {};
     for (const scriptBody of serverScripts) {
       await extractVariables(scriptBody, context, filePath);
     }
@@ -9507,7 +9523,7 @@ After installing: bun add bun-plugin-stx`);
     }
     return output;
   }
-  async function getRoute(requestPath) {
+  async function getRoute(requestPath, reqCtx) {
     const files = await discoverFiles();
     let normalizedPath = requestPath.startsWith("/") ? requestPath.slice(1) : requestPath;
     const possibleFiles = [];
@@ -9542,7 +9558,7 @@ After installing: bun add bun-plugin-stx`);
           }
         }
         if (normalizedFilePath === possible || relativeFilePath === possible) {
-          const output = await processTemplate(filePath);
+          const output = await processTemplate(filePath, reqCtx);
           return output;
         }
       }
@@ -9561,14 +9577,14 @@ After installing: bun add bun-plugin-stx`);
       const isIndexFile = fileRoute === "index" || fileRoute.endsWith("/index");
       const isRootRequest = requestPath === "/" || normalizedPath === "";
       if (`/${fileRoute}` === requestPath || fileRoute === normalizedPath || `/${fileRoute}.stx` === requestPath || `/${fileRoute}.md` === requestPath || `/${fileRoute}.html` === requestPath || isIndexFile && isRootRequest) {
-        const output = await processTemplate(filePath);
+        const output = await processTemplate(filePath, reqCtx);
         routes.set(requestPath, output);
         return output;
       }
       if (fileRoute.startsWith("pages/")) {
         const prettyRoute = fileRoute.slice(6);
         if (`/${prettyRoute}` === requestPath || prettyRoute === normalizedPath) {
-          const output = await processTemplate(filePath);
+          const output = await processTemplate(filePath, reqCtx);
           routes.set(requestPath, output);
           return output;
         }
@@ -9593,7 +9609,7 @@ After installing: bun add bun-plugin-stx`);
         if (match) {
           const paramNames = [...fileRouteBase.matchAll(/\[([^\]]+)\]/g)].map((m) => m[1]);
           const paramValues = match.slice(1);
-          const output = await processTemplateDynamic(filePath, paramNames, paramValues, normalizedPath);
+          const output = await processTemplateDynamic(filePath, paramNames, paramValues, normalizedPath, reqCtx);
           routes.set(requestPath, output);
           return output;
         }
@@ -9601,7 +9617,7 @@ After installing: bun add bun-plugin-stx`);
     }
     return null;
   }
-  async function processTemplateDynamic(filePath, paramNames, paramValues, routePath) {
+  async function processTemplateDynamic(filePath, paramNames, paramValues, routePath, reqCtx) {
     const content = await Bun.file(filePath).text();
     const serverScriptRegex = /<script\b([^>]*)\bserver\b[^>]*>([\s\S]*?)<\/script>/gi;
     const dynServerScripts = [];
@@ -9615,13 +9631,24 @@ After installing: bun add bun-plugin-stx`);
       __dirname: nodePath.dirname(filePath),
       __route: routePath
     };
+    const paramsObj = {};
     for (let i = 0;i < paramNames.length; i++) {
-      context[paramNames[i]] = paramValues[i];
+      let value = paramValues[i] ?? "";
+      try {
+        value = decodeURIComponent(value);
+      } catch {}
+      paramsObj[paramNames[i]] = value;
     }
+    for (const name of paramNames) {
+      context[name] = paramsObj[name];
+    }
+    context.params = paramsObj;
+    if (reqCtx)
+      reqCtx.params = paramsObj;
     const { processDirectives, extractVariables, defaultConfig: defaultConfig4, injectRouterScript: injectRouter, resetHead: resetHeadDyn } = await stxModule;
     resetHeadDyn();
     injectServeLocaleContext(context);
-    injectServeRequestContext(context);
+    injectServeRequestContext(context, reqCtx);
     for (const scriptBody of dynServerScripts) {
       await extractVariables(scriptBody, context, filePath);
     }
@@ -9651,10 +9678,6 @@ After installing: bun add bun-plugin-stx`);
     const dependencies = new Set;
     output = await processDirectives(output, context, filePath, config5, dependencies);
     if (paramNames.length > 0) {
-      const paramsObj = {};
-      for (let i = 0;i < paramNames.length; i++) {
-        paramsObj[paramNames[i]] = paramValues[i];
-      }
       const paramsScript = `<script>if(window.stx)window.stx._rp=${JSON.stringify(paramsObj)};else window.__stx_rp=${JSON.stringify(paramsObj)};</script>`;
       if (output.includes("</head>")) {
         output = output.replace("</head>", `${paramsScript}
@@ -9846,6 +9869,17 @@ ${html}`;
             activeServeCookieHeader = req.headers.get("cookie") || "";
             activeServeCookies = parseCookies(req);
             activeServeIp = server.requestIP(req)?.address || (req.headers.get("x-forwarded-for") || "").split(",")[0].trim();
+            const reqCtx = {
+              url: req.url,
+              path,
+              search: activeServeSearch,
+              host: activeServeHost,
+              cookieHeader: activeServeCookieHeader,
+              cookies: activeServeCookies,
+              ip: activeServeIp,
+              locale: activeServeLocale,
+              params: {}
+            };
             try {
               if (req.method === "OPTIONS") {
                 return new Response(null, { headers: corsHeaders });
@@ -9866,7 +9900,7 @@ ${html}`;
 
 `));
                       } catch {}
-                    }, 15000);
+                    }, 5000);
                   },
                   cancel() {
                     if (keepalive)
@@ -9885,9 +9919,11 @@ ${html}`;
                 });
               }
               if (options.onRequest) {
-                const customResponse = await options.onRequest(req);
-                if (customResponse)
-                  return customResponse;
+                const hookResult = await options.onRequest(req);
+                if (hookResult instanceof Response)
+                  return hookResult;
+                if (hookResult && typeof hookResult === "object")
+                  Object.assign(reqCtx, hookResult);
               }
               const route = resolveRouteMiddleware(path);
               const extraNames = extraProtectedPrefixes.some((p) => path === p || path.startsWith(p.endsWith("/") ? p : `${p}/`)) ? ["auth"] : [];
@@ -10030,9 +10066,9 @@ ${html}`;
               if (path === "/index")
                 path = "/";
               if (path === "/") {
-                const indexContent = await getRoute("/");
+                const indexContent = await getRoute("/", reqCtx);
                 if (!indexContent) {
-                  const homeContent = await getRoute("/home");
+                  const homeContent = await getRoute("/home", reqCtx);
                   if (homeContent) {
                     return new Response(null, {
                       status: 302,
@@ -10044,7 +10080,7 @@ ${html}`;
                   }
                 }
               }
-              const content = await getRoute(path);
+              const content = await getRoute(path, reqCtx);
               if (content) {
                 const isSpaNav = req.headers.get("X-STX-Router") === "true";
                 if (isSpaNav) {
@@ -10140,7 +10176,7 @@ ${pageSetupScripts.join(`
                   }
                 });
               }
-              const contentWithExt = await getRoute(`${path}.html`);
+              const contentWithExt = await getRoute(`${path}.html`, reqCtx);
               if (contentWithExt) {
                 return new Response(injectHmrClient(contentWithExt), {
                   headers: {
@@ -10231,7 +10267,7 @@ ${pageSetupScripts.join(`
               const isProd = isProductionServe();
               for (const custom404 of ["/404", "/errors/404"]) {
                 try {
-                  const customContent = await getRoute(custom404);
+                  const customContent = await getRoute(custom404, reqCtx);
                   if (customContent) {
                     return new Response(isProd ? customContent : injectHmrClient(customContent), {
                       status: 404,

package/package.json

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