bun-plugin-stx 0.2.65 → 0.2.66

package/dist/{chunk-ap5bhr00.js → chunk-wv4bcqba.js}

@@ -913,7 +913,18 @@ else {
           // re-execute because each page has its own setup.
           var h=hashScript(code);
           var isSetup=code.indexOf('__stx_setup_')!==-1;
-          if(!isSetup&&executedScriptHashes[h]){
+          // Compute isAlreadyScoped first so the dedup check can exempt
+          // self-contained IIFE scripts. data-stx-scoped scope IIFEs
+          // (the (function(){ ... })() shape) must re-execute on every
+          // navigation. They own their own scope and won't collide
+          // with prior runs, AND _cleanupContainer deleted their
+          // entry from window.stx._scopes on the way out. Without
+          // this exemption, navigating away and back leaves the page
+          // leaf with no scope registered: bindIf/@event never re-bind
+          // and all :if branches stay visible at once.
+          // Mirrors the full-doc swap path's runAlways escape below.
+          var isAlreadyScoped=code.trimStart().charAt(0)==='('||code.trimStart().charAt(0)===';'||code.indexOf('window.stx.mount')>-1;
+          if(!isSetup&&!isAlreadyScoped&&executedScriptHashes[h]){
             log('[router] skipping already-executed script (hash dedup)');
             return;
           }
@@ -923,13 +934,6 @@ else {
           if(hasImport){
             ns.type='module';
           }
-          // Wrap in block scope to prevent const/let collisions on re-navigation.
-          // Without this, navigating away and back throws "Identifier has already
-          // been declared" because the previous page's top-level const/let are
-          // still in the global scope. Skip the wrap for module scripts \u2014
-          // they get their own scope from ESM, and top-level 'import' is
-          // illegal inside a block, which would throw SyntaxError.
-          var isAlreadyScoped=code.trimStart().charAt(0)==='('||code.trimStart().charAt(0)===';'||code.indexOf('window.stx.mount')>-1;
           ns.textContent=(hasImport||isAlreadyScoped)?code:'{'+code+'}';
           ns.setAttribute('data-stx-page','');
           document.body.appendChild(ns);

package/dist/serve.d.ts

@@ -1,3 +1,4 @@
+export declare function bundleBrowserAsset(entrypoint: string): Promise<Response>;
 /**
  * Start the STX development server
  * @param options Server options with patterns and port

package/dist/serve.js

@@ -8730,6 +8730,53 @@ var staticContentTypes = {
   otf: "font/otf",
   eot: "application/vnd.ms-fontobject"
 };
+var bundledAssetExtensions = new Set(["ts", "tsx", "mts", "cts"]);
+function isBundledAssetExtension(ext) {
+  return Boolean(ext && bundledAssetExtensions.has(ext));
+}
+function getAssetExtension(pathname) {
+  return pathname.split(".").pop()?.toLowerCase();
+}
+function isSafeAssetPath(pathname) {
+  if (pathname.includes("\x00"))
+    return false;
+  return !pathname.split("/").some((segment) => segment === "..");
+}
+function assetRequestPaths(pathname) {
+  const paths = [
+    pathname,
+    pathname.replace(/^\/assets\//, "/resources/assets/"),
+    pathname.replace(/^\/resources\/assets\//, "/assets/")
+  ];
+  return [...new Set(paths)];
+}
+async function bundleBrowserAsset(entrypoint) {
+  const result = await Bun.build({
+    entrypoints: [entrypoint],
+    format: "esm",
+    minify: false,
+    packages: "bundle",
+    sourcemap: "inline",
+    target: "browser"
+  });
+  if (!result.success) {
+    const message = result.logs.map((log4) => log4.message).join(`
+`) || "Unable to build TypeScript asset";
+    return new Response(message, {
+      status: 500,
+      headers: {
+        "Content-Type": "text/plain; charset=utf-8",
+        "Cache-Control": "no-cache"
+      }
+    });
+  }
+  return new Response(await result.outputs[0].text(), {
+    headers: {
+      "Content-Type": "application/javascript",
+      "Cache-Control": "no-cache"
+    }
+  });
+}
 async function serve(options) {
   const stxConfig = await loadConfig6({
     name: "stx",
@@ -8770,6 +8817,32 @@ After installing: bun add bun-plugin-stx`);
   const routes = new Map;
   let sourceFiles = null;
   let assetsInitialized = false;
+  const htmlCache = new Map;
+  const crosswindCssCache = new Map;
+  const hmrClients = new Set;
+  const hmrEncoder = new TextEncoder;
+  function broadcastHmr(event) {
+    const payload = hmrEncoder.encode(`data: ${JSON.stringify(event)}
+
+`);
+    for (const c of hmrClients) {
+      try {
+        c.enqueue(payload);
+      } catch {
+        hmrClients.delete(c);
+      }
+    }
+  }
+  const HMR_CLIENT_SCRIPT = `<script data-stx-hmr>(()=>{if(window.__stxHmr)return;window.__stxHmr=1;function bust(){var ls=document.querySelectorAll('link[rel="stylesheet"]');for(var i=0;i<ls.length;i++){var l=ls[i];var u=new URL(l.href,location.href);u.searchParams.set('v',Date.now().toString(36));l.href=u.toString()}}var es=new EventSource('/_stx/hmr');es.onmessage=function(e){try{var m=JSON.parse(e.data);if(m.type==='reload')location.reload();else if(m.type==='css')bust()}catch(_){}};es.onerror=function(){if(es.readyState===2){setTimeout(function(){location.reload()},400)}}})()</script>`;
+  function injectHmrClient(html) {
+    if (!html)
+      return html;
+    const closeBody = html.lastIndexOf("</body>");
+    if (closeBody === -1) {
+      return html + HMR_CLIENT_SCRIPT;
+    }
+    return html.slice(0, closeBody) + HMR_CLIENT_SCRIPT + html.slice(closeBody);
+  }
   const watchersStarted = new Set;
   const startWatcher = (dir) => {
     if (watchersStarted.has(dir))
@@ -8779,15 +8852,34 @@ After installing: bun add bun-plugin-stx`);
         if (!filename)
           return;
         const f = String(filename);
-        if (!f.endsWith(".stx") && !f.endsWith(".md") && !f.endsWith(".html"))
+        const isStxLike = f.endsWith(".stx") || f.endsWith(".md") || f.endsWith(".html");
+        const isCss = f.endsWith(".css");
+        const isAsset = isCss || f.endsWith(".js") || f.endsWith(".ts") || f.endsWith(".tsx") || f.endsWith(".mts") || f.endsWith(".cts") || f.endsWith(".jpg") || f.endsWith(".jpeg") || f.endsWith(".png") || f.endsWith(".gif") || f.endsWith(".svg") || f.endsWith(".webp") || f.endsWith(".avif") || f.endsWith(".woff") || f.endsWith(".woff2") || f.endsWith(".ttf") || f.endsWith(".otf");
+        if (!isStxLike && !isAsset)
           return;
-        sourceFiles = null;
-        routes.clear();
+        if (isStxLike) {
+          sourceFiles = null;
+          routes.clear();
+          htmlCache.clear();
+          crosswindCssCache.clear();
+        }
+        broadcastHmr(isCss && !isStxLike ? { type: "css", file: f } : { type: "reload", file: f });
       });
       watcher.on("error", () => {});
       watchersStarted.add(dir);
     } catch {}
   };
+  for (const dir of [
+    componentsDir,
+    layoutsDir,
+    partialsDir,
+    publicDir,
+    "resources/assets"
+  ]) {
+    if (!dir)
+      continue;
+    startWatcher(dir);
+  }
   const pageMiddlewareByPath = new Map;
   const pageMiddlewarePatterns = [];
   function compileRoutePattern(urlPath) {
@@ -8971,7 +9063,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-ap5bhr00.js");
+      const { Router } = await import("./chunk-wv4bcqba.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs });
       console.log(`[stx] Generated ${router.routes.length} routes \u2192 .stx/routes.ts`);
@@ -8992,7 +9084,6 @@ After installing: bun add bun-plugin-stx`);
       }
     } catch {}
   }
-  const htmlCache = new Map;
   async function templateSignatureFresh(sig) {
     for (const [p, expected] of sig) {
       const stat4 = await nodeFs.stat(p).catch(() => null);
@@ -9015,7 +9106,6 @@ After installing: bun add bun-plugin-stx`);
   let crosswindModule = null;
   let crosswindLoadAttempted = false;
   let crosswindUserConfigPromise = null;
-  const crosswindCssCache = new Map;
   async function loadCrosswind() {
     if (crosswindLoadAttempted)
       return crosswindModule;
@@ -9292,9 +9382,20 @@ After installing: bun add bun-plugin-stx`);
       const regexPatterns = [
         new RegExp(`^${routePattern}$`)
       ];
+      const fileRouteNoIndex = fileRouteBase.replace(/\/index$/, "");
+      if (fileRouteNoIndex !== fileRouteBase) {
+        const noIndexPattern = fileRouteNoIndex.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
+        regexPatterns.push(new RegExp(`^${noIndexPattern}$`));
+      }
       if (fileRouteBase.startsWith("pages/")) {
-        const prettyPattern = fileRouteBase.slice(6).replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
+        const prettyBase = fileRouteBase.slice(6);
+        const prettyPattern = prettyBase.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
         regexPatterns.push(new RegExp(`^${prettyPattern}$`));
+        const prettyNoIndex = prettyBase.replace(/\/index$/, "");
+        if (prettyNoIndex !== prettyBase) {
+          const prettyNoIndexPattern = prettyNoIndex.replace(/\[([^\]]+)\]/g, "([^/]+)").replace(/\//g, "\\/");
+          regexPatterns.push(new RegExp(`^${prettyNoIndexPattern}$`));
+        }
       }
       for (const regex of regexPatterns) {
         const match = normalizedPath.match(regex);
@@ -9472,6 +9573,7 @@ ${html}`;
     try {
       _server = bunServe({
         port: actualPort,
+        idleTimeout: 0,
         async fetch(req) {
           const url = new URL(req.url);
           let path = url.pathname;
@@ -9490,6 +9592,40 @@ ${html}`;
             if (req.method === "OPTIONS") {
               return new Response(null, { headers: corsHeaders });
             }
+            if (path === "/_stx/hmr") {
+              let controller;
+              let keepalive;
+              const stream = new ReadableStream({
+                start(c) {
+                  controller = c;
+                  hmrClients.add(c);
+                  c.enqueue(hmrEncoder.encode(`data: {"type":"connected"}
+
+`));
+                  keepalive = setInterval(() => {
+                    try {
+                      c.enqueue(hmrEncoder.encode(`: keepalive
+
+`));
+                    } catch {}
+                  }, 15000);
+                },
+                cancel() {
+                  if (keepalive)
+                    clearInterval(keepalive);
+                  if (controller)
+                    hmrClients.delete(controller);
+                }
+              });
+              return new Response(stream, {
+                headers: {
+                  "Content-Type": "text/event-stream",
+                  "Cache-Control": "no-cache, no-transform",
+                  Connection: "keep-alive",
+                  "X-Accel-Buffering": "no"
+                }
+              });
+            }
             if (options.onRequest) {
               const customResponse = await options.onRequest(req);
               if (customResponse)
@@ -9737,7 +9873,7 @@ ${pageSetupScripts.join(`
                 runtimeCount++;
                 return runtimeCount === 1 ? match : "";
               });
-              return new Response(cleaned, {
+              return new Response(injectHmrClient(cleaned), {
                 headers: {
                   "Content-Type": "text/html; charset=utf-8",
                   "Cache-Control": "no-cache",
@@ -9747,7 +9883,7 @@ ${pageSetupScripts.join(`
             }
             const contentWithExt = await getRoute(`${path}.html`);
             if (contentWithExt) {
-              return new Response(contentWithExt, {
+              return new Response(injectHmrClient(contentWithExt), {
                 headers: {
                   "Content-Type": "text/html; charset=utf-8",
                   "Cache-Control": "no-cache",
@@ -9772,34 +9908,26 @@ ${pageSetupScripts.join(`
             }
             if (path.startsWith("/assets/") || path.startsWith("/resources/assets/")) {
               await ensureAssets();
-              const possiblePaths = [
-                path,
-                path.replace(/^\/assets\//, "/resources/assets/"),
-                path.replace(/^\/resources\/assets\//, "/assets/")
-              ];
-              for (const assetPath of possiblePaths) {
+              let assetPathname;
+              try {
+                assetPathname = decodeURIComponent(path);
+              } catch {
+                return new Response("Invalid asset path", { status: 400 });
+              }
+              if (!isSafeAssetPath(assetPathname))
+                return new Response("Invalid asset path", { status: 400 });
+              for (const assetPath of assetRequestPaths(assetPathname)) {
                 try {
-                  const filePath = `.${assetPath}`;
+                  const filePath = nodePath.resolve(process19.cwd(), `.${assetPath}`);
                   const file = Bun.file(filePath);
                   if (await file.exists()) {
-                    const ext = assetPath.split(".").pop()?.toLowerCase();
-                    if (ext === "ts") {
-                      const transpiler = new Bun.Transpiler({
-                        loader: "ts"
-                      });
-                      const code = await file.text();
-                      const transpiled = transpiler.transformSync(code);
-                      return new Response(transpiled, {
-                        headers: {
-                          "Content-Type": "application/javascript",
-                          "Cache-Control": "no-cache"
-                        }
-                      });
-                    }
+                    const ext = getAssetExtension(assetPath);
+                    if (isBundledAssetExtension(ext))
+                      return bundleBrowserAsset(filePath);
                     return new Response(file, {
                       headers: {
                         "Content-Type": staticContentTypes[ext || ""] || "application/octet-stream",
-                        "Cache-Control": "public, max-age=31536000"
+                        "Cache-Control": "no-cache"
                       }
                     });
                   }
@@ -9829,7 +9957,7 @@ ${pageSetupScripts.join(`
                         return new Response(file, {
                           headers: {
                             "Content-Type": staticContentTypes[ext || ""] || "application/octet-stream",
-                            "Cache-Control": "public, max-age=3600"
+                            "Cache-Control": "no-cache"
                           }
                         });
                       }
@@ -9860,7 +9988,7 @@ ${pageSetupScripts.join(`
             }
             const routesList = availableRoutes.join(`
 `);
-            return new Response(`
+            return new Response(injectHmrClient(`
         <!DOCTYPE html>
         <html>
           <head>
@@ -9887,7 +10015,7 @@ ${pageSetupScripts.join(`
             <ul>${routesList}</ul>
           </body>
         </html>
-      `, {
+      `), {
               status: 404,
               headers: { "Content-Type": "text/html; charset=utf-8" }
             });
@@ -9963,5 +10091,6 @@ if (import.meta.main) {
   main().catch(console.error);
 }
 export {
-  serve
+  serve,
+  bundleBrowserAsset
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.65",
+  "version": "0.2.66",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -73,7 +73,7 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.64",
-    "stx-router": "0.2.57"
+    "@stacksjs/stx": "0.2.66",
+    "stx-router": "0.2.66"
   }
 }