bun-plugin-stx 0.2.139 → 0.2.141

package/dist/{chunk-9e56perq.js → chunk-7xv85mm2.js}

@@ -879,7 +879,7 @@ function getRouterScript() {
     // Re-localizing would map it back to the *current* locale and no-op.
     if(!force) url=withCurrentLocale(url);
     log('[router] navigate() called:',url,'isNavigating:',isNavigating);
-    if(isNavigating)return;
+    if(isNavigating)return Promise.resolve(false);
     // Resolve against the current document URL, matching native <a> semantics.
     // With location.origin as the base, any relative href ('?status=resolved',
     // '#anchor', './sibling') resolved to the SITE ROOT \u2014 so filter tabs,
@@ -887,13 +887,13 @@ function getRouterScript() {
     // the SPA interceptor was active (#1777).
     var t=new URL(url,location.href);
 
-    if(t.origin!==location.origin){location.href=url;return}
+    if(t.origin!==location.origin){location.href=url;return Promise.resolve(false)}
 
     if(t.pathname===location.pathname&&t.hash){
       if(pushState!==false)history.pushState({},'',t.href);
       var el=document.querySelector(t.hash);
       if(el)el.scrollIntoView({behavior:'smooth'});
-      return;
+      return Promise.resolve(true);
     }
 
     // Skip if user clicks a link to the page they're already on. We
@@ -902,7 +902,7 @@ function getRouterScript() {
     // entry \u2014 without this allowance, hitting back would early-return
     // and the visible page content would be left frozen on the
     // forward-navigation page.
-    if(pushState!==false&&t.href===location.href&&!t.hash&&!force)return;
+    if(pushState!==false&&t.href===location.href&&!t.hash&&!force)return Promise.resolve(false);
 
     isNavigating=true;
     document.body.classList.add(o.loadingClass);
@@ -921,22 +921,22 @@ function getRouterScript() {
       if(checkLayoutChange(layoutCache[targetPath],url,layoutGroupCache[targetPath])){
         // Layout changed \u2014 fetch full page and do full document swap
         log('[router] cache hit but layout changed \u2014 fetching full page');
-        fetch(url,{headers:{'Accept':'text/html'}}).then(function(r){
+        return fetch(url,{headers:{'Accept':'text/html'}}).then(function(r){
           if(!r.ok)throw new Error(r.status);
           return r.text();
         }).then(function(html){
           log('[router] full page fetched from cache path, len:',html.length);
-          swap(html,targetPath,pushState,targetHash);
+          return swap(html,targetPath,pushState,targetHash);
         }).catch(function(err){
           console.error('[router] full page fetch error:',err);
           location.href=url;
         }).finally(done);
-        return;
       }
       pendingContainerAttrs=attrsCache[targetPath]||'';
-      swap(cache[targetPath],targetPath,pushState,targetHash);
-      applyTitle(titleCache[targetPath]);
-      done();
+      return Promise.resolve(swap(cache[targetPath],targetPath,pushState,targetHash)).then(function(){
+        applyTitle(titleCache[targetPath]);
+        return true;
+      }).finally(done);
     }
 else {
       if(force&&cache[targetPath])evictCache(targetPath);
@@ -944,7 +944,7 @@ else {
       // the page content. Custom app-shell containers need full documents so
       // the router does not inject a <main> fragment into the wrong element.
       var wantsFragment=shouldUseFragmentResponse();
-      fetch(url,{headers:wantsFragment?{'X-STX-Router':'true','Accept':'text/html'}:{'Accept':'text/html'}}).then(function(r){
+      return fetch(url,{headers:wantsFragment?{'X-STX-Router':'true','Accept':'text/html'}:{'Accept':'text/html'}}).then(function(r){
         if(!r.ok)throw new Error(r.status);
         var isFragment=wantsFragment&&r.headers.get('X-STX-Fragment')==='true';
         var newLayout=r.headers.get('X-STX-Layout')||'';
@@ -969,10 +969,12 @@ else {
         if(result.isFragment)result.html='<!--stx-fragment-->'+result.html;
         if(o.cache)setCache(targetPath,result.html,result.layout,result.layoutGroup,result.title,result.containerAttrs);
         pendingContainerAttrs=result.isFragment?(result.containerAttrs||''):'';
-        swap(result.html,targetPath,pushState,targetHash);
-        // Fragment swaps carry no <head>; apply the title from the header.
-        // Full-document swaps already set document.title from the <title> tag.
-        if(result.isFragment)applyTitle(result.title);
+        return Promise.resolve(swap(result.html,targetPath,pushState,targetHash)).then(function(){
+          // Fragment swaps carry no <head>; apply the title from the header.
+          // Full-document swaps already set document.title from the <title> tag.
+          if(result.isFragment)applyTitle(result.title);
+          return true;
+        });
       }).catch(function(err){
         console.error('[router] fetch error:',err);
         location.href=url;
@@ -994,10 +996,10 @@ else {
   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}
+    if(!isFragment&&!isStxDocument(html)){log('[router] non-stx document \u2014 full navigation to:',url);location.href=url;return Promise.resolve(false)}
     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}
+    if(!currentContent){log('[router] no container \u2014 falling back');location.href=url;return Promise.resolve(false)}
 
     // Fragment mode: server returned just the page content (no document wrapper)
     if(isFragment){
@@ -1155,16 +1157,23 @@ else {
         // THEN fire stx:load \u2014 now _latestSetup is set and processElement has the right scope
         window.dispatchEvent(new Event('stx:load'));
       }
-      if(runViewTransition(doFragSwap)){}
-      else{currentContent.style.transition='opacity 0.12s ease-out';currentContent.style.opacity='0';setTimeout(function(){doFragSwap();currentContent.style.opacity='1';setTimeout(function(){currentContent.style.transition=''},150)},120)}
-      return;
+      return new Promise(function(resolve,reject){
+        function completeFragSwap(){
+          try{
+            doFragSwap();
+            resolve(true);
+          }catch(err){reject(err)}
+        }
+        if(runViewTransition(completeFragSwap)){}
+        else{currentContent.style.transition='opacity 0.12s ease-out';currentContent.style.opacity='0';setTimeout(function(){completeFragSwap();currentContent.style.opacity='1';setTimeout(function(){currentContent.style.transition=''},150)},120)}
+      });
     }
 
     // Full document mode: parse with DOMParser and extract container content
     var parser=new DOMParser();
     var doc=parser.parseFromString(html,'text/html');
     var newContent=doc.querySelector(containerSel)||doc.querySelector('[data-stx-content]')||doc.querySelector('main');
-    if(!newContent){location.href=url;return}
+    if(!newContent){location.href=url;return Promise.resolve(false)}
 
     // Clean up existing signals/effects
     if(window.stx&&window.stx._cleanupContainer){
@@ -1456,18 +1465,26 @@ else {
       }
     }
 
-    if(runViewTransition(doSwap)){
-    }
+    return new Promise(function(resolve,reject){
+      function completeSwap(){
+        try{
+          doSwap();
+          resolve(true);
+        }catch(err){reject(err)}
+      }
+      if(runViewTransition(completeSwap)){
+      }
 else {
-      // Fallback fade for browsers without View Transitions API
-      currentContent.style.transition='opacity 0.12s ease-out';
-      currentContent.style.opacity='0';
-      setTimeout(function(){
-        doSwap();
-        currentContent.style.opacity='1';
-        setTimeout(function(){currentContent.style.transition=''},150);
-      },120);
-    }
+        // Fallback fade for browsers without View Transitions API
+        currentContent.style.transition='opacity 0.12s ease-out';
+        currentContent.style.opacity='0';
+        setTimeout(function(){
+          completeSwap();
+          currentContent.style.opacity='1';
+          setTimeout(function(){currentContent.style.transition=''},150);
+        },120);
+      }
+    });
   }
 
   // \u2500\u2500 Link interception \u2500\u2500

package/dist/serve.d.ts

@@ -114,6 +114,10 @@ export declare interface ServeOptions {
   componentsDir?: string
   layoutsDir?: string
   partialsDir?: string
+  watchDirs?: string[]
+  renderCache?: boolean
+  renderCacheVary?: 'request' | 'source'
+  prewarmRenderCache?: boolean | number
   publicDir?: string
   quiet?: boolean
   autoIncrementPort?: boolean | number

package/dist/serve.js

@@ -8995,7 +8995,8 @@ After installing: bun add bun-plugin-stx`);
   let discoveredPagePaths = null;
   let assetsInitialized = false;
   const htmlCache = new Map;
-  const ENABLE_HTML_CACHE = false;
+  const ENABLE_HTML_CACHE = options.renderCache === true;
+  const RENDER_CACHE_VARY = options.renderCacheVary ?? "request";
   const crosswindCssCache = new Map;
   const hmrClients = new Set;
   const hmrEncoder = new TextEncoder;
@@ -9031,12 +9032,15 @@ After installing: bun add bun-plugin-stx`);
           return;
         const f = String(filename);
         const isStxLike = f.endsWith(".stx") || f.endsWith(".md") || f.endsWith(".html");
+        const isCode = f.endsWith(".js") || f.endsWith(".ts") || f.endsWith(".tsx") || f.endsWith(".mts") || f.endsWith(".cts");
+        const isData = f.endsWith(".json");
         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)
+        const isAsset = isCss || isCode || 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 && !isData)
           return;
-        if (isStxLike) {
-          sourceFiles = null;
+        if (isStxLike || isCode || isData) {
+          if (isStxLike)
+            sourceFiles = null;
           routes.clear();
           htmlCache.clear();
           crosswindCssCache.clear();
@@ -9053,7 +9057,8 @@ After installing: bun add bun-plugin-stx`);
     layoutsDir,
     partialsDir,
     publicDir,
-    "resources/assets"
+    "resources/assets",
+    ...options.watchDirs ?? []
   ]) {
     if (!dir)
       continue;
@@ -9209,14 +9214,24 @@ After installing: bun add bun-plugin-stx`);
     context.__stxServeContext = full;
     globalThis.__stxServeContext = full;
   }
-  function htmlCacheKey(filePath) {
+  function htmlCacheKey(filePath, reqCtx) {
+    if (RENDER_CACHE_VARY === "source")
+      return filePath;
+    if (reqCtx) {
+      try {
+        return `${filePath}\x00${JSON.stringify(reqCtx)}`;
+      } catch {
+        return `${filePath}\x00uncacheable:${crypto.randomUUID()}`;
+      }
+    }
     const loc = i18nConfig ? activeServeLocale ?? i18nConfig.defaultLocale : "";
     const search = activeServeSearch || "";
     const host = activeServeHost || "";
     const cookies = activeServeCookieHeader;
-    if (!loc && !search && !host && !cookies)
+    const ip = activeServeIp;
+    if (!loc && !search && !host && !cookies && !ip)
       return filePath;
-    return `${filePath}\x00${loc}\x00${search}\x00${host}\x00${cookies}`;
+    return `${filePath}\x00${loc}\x00${search}\x00${host}\x00${cookies}\x00${ip}`;
   }
   const builtInMiddleware = authConfig === null ? {} : {
     auth: (_req, ctx) => {
@@ -9325,7 +9340,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-9e56perq.js");
+      const { Router } = await import("./chunk-7xv85mm2.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName() });
       if (!options.quiet)
@@ -9392,7 +9407,7 @@ After installing: bun add bun-plugin-stx`);
       dir = nodePath.dirname(dir);
     }
     try {
-      const mod = await import("./chunk-11kz6apt.js");
+      const mod = await import("./chunk-45dqy4z3.js");
       crosswindModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
       return crosswindModule;
     } catch {
@@ -9517,7 +9532,7 @@ After installing: bun add bun-plugin-stx`);
       reqCtx.responseStatus = extractPageResponseStatus(content) ?? 200;
     const skipCacheHint = /(?:^|[^\w$])__stx_skip_cache\s*=\s*true/.test(content);
     if (ENABLE_HTML_CACHE && !skipCacheHint) {
-      const cacheKey = htmlCacheKey(filePath);
+      const cacheKey = htmlCacheKey(filePath, reqCtx);
       const cachedEntry = htmlCache.get(cacheKey);
       if (cachedEntry && await templateSignatureFresh(cachedEntry.signature))
         return cachedEntry.html;
@@ -9584,7 +9599,7 @@ After installing: bun add bun-plugin-stx`);
     }
     if (ENABLE_HTML_CACHE && !context.__stx_skip_cache && !skipCacheHint) {
       const signature = await buildTemplateSignature(filePath, dependencies);
-      htmlCache.set(htmlCacheKey(filePath), { html: output, signature });
+      htmlCache.set(htmlCacheKey(filePath, reqCtx), { html: output, signature });
     }
     return output;
   }
@@ -10472,6 +10487,24 @@ ${trailingPageScripts.join(`
   if (actualPort !== port && !options.quiet) {
     console.warn(`\x1B[33m[stx]\x1B[0m port ${port} in use \u2014 using \x1B[1m${actualPort}\x1B[0m instead`);
   }
+  if (ENABLE_HTML_CACHE && options.prewarmRenderCache) {
+    const requestedConcurrency = typeof options.prewarmRenderCache === "number" ? Math.floor(options.prewarmRenderCache) : 4;
+    const concurrency = Math.max(1, requestedConcurrency);
+    (async () => {
+      const files = await discoverFiles();
+      const pending = [...new Set(files.map(stxViewFileToRoutePath).filter((routePath) => routePath !== null))];
+      let nextIndex = 0;
+      await Promise.all(Array.from({ length: Math.min(concurrency, pending.length) }, async () => {
+        while (nextIndex < pending.length) {
+          const routePath = pending[nextIndex++];
+          try {
+            const response = await fetch(`http://127.0.0.1:${actualPort}${routePath}`);
+            await response.arrayBuffer();
+          } catch {}
+        }
+      }));
+    })().catch(() => {});
+  }
   if (options.reusePort) {
     const graceMs = Number(process19.env.SHUTDOWN_GRACE_MS) || 15000;
     process19.once("SIGTERM", () => {

package/package.json

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