bun-plugin-stx 0.2.46 → 0.2.51

package/dist/{chunk-nyzhqegd.js → chunk-0nwya50v.js}

@@ -1,4 +1,8 @@
 // @bun
+import {
+  deriveLayoutGroup,
+  extractLayoutMetadata
+} from "./chunk-93ete56h.js";
 import"./chunk-2mx7fq49.js";
 
 // ../router/src/file-router.ts
@@ -153,25 +157,35 @@ function scanDirectory(dir, extensions) {
 class Router {
   routes;
   pagesDir;
+  pagesDirs;
   config;
   constructor(baseDir, config = {}) {
     this.config = config;
-    this.pagesDir = path4.resolve(baseDir, config.pagesDir || "pages");
+    const rawDirs = config.pagesDirs && config.pagesDirs.length > 0 ? config.pagesDirs : [config.pagesDir || "pages"];
+    this.pagesDirs = rawDirs.map((d) => path4.resolve(baseDir, d));
+    this.pagesDir = this.pagesDirs[0];
     const extensions = config.extensions || [".stx"];
-    const files = scanDirectory(this.pagesDir, extensions);
-    this.routes = files.map((filePath) => {
-      const pattern = filePathToPattern(filePath, this.pagesDir);
-      const { regex, params } = patternToRegex(pattern);
-      const layouts = config.layouts !== false ? resolveLayoutChain(filePath, this.pagesDir) : [];
-      return {
-        pattern,
-        regex,
-        params,
-        filePath,
-        isDynamic: params.length > 0,
-        layout: layouts.length > 0 ? layouts[layouts.length - 1] : undefined
-      };
-    });
+    const seenPatterns = new Set;
+    this.routes = [];
+    for (const dir of this.pagesDirs) {
+      const files = scanDirectory(dir, extensions);
+      for (const filePath of files) {
+        const pattern = filePathToPattern(filePath, dir);
+        if (seenPatterns.has(pattern))
+          continue;
+        seenPatterns.add(pattern);
+        const { regex, params } = patternToRegex(pattern);
+        const layouts = config.layouts !== false ? resolveLayoutChain(filePath, dir) : [];
+        this.routes.push({
+          pattern,
+          regex,
+          params,
+          filePath,
+          isDynamic: params.length > 0,
+          layout: layouts.length > 0 ? layouts[layouts.length - 1] : undefined
+        });
+      }
+    }
     this.routes.sort((a, b) => {
       if (!a.isDynamic && b.isDynamic)
         return -1;
@@ -575,6 +589,8 @@ function getRouterScript() {
   var defaults={container:'main',loadingClass:'stx-navigating',viewTransitions:true,cache:true,scrollToTop:true,prefetch:true,progress:true,progressColor:'#78dce8',progressHeight:'2px',interceptAllLinks:false};
   var o=Object.assign({},defaults,window.__stxRouterConfig||{},window.STX_ROUTER_OPTIONS||{});
   var containerSel=o.container;
+  var debug=!!o.debug;
+  function log(){if(debug&&typeof console!=='undefined'&&console.log)console.log.apply(console,arguments)}
 
   // \u2500\u2500 Progress bar (0\u2192100% at top of viewport) \u2500\u2500
   // Native loading indicator baked into the router. Starts when navigation
@@ -666,6 +682,7 @@ function getRouterScript() {
   // Layout group detection \u2014 layouts in the same group share a <main> container.
   // Only truly different layout groups trigger a full page reload.
   var layoutCache={};
+  var layoutGroupCache={};
   // Track executed script hashes to prevent redeclaration errors on navigation.
   // Layout-level scripts (theme, nav setup) execute on initial page load and
   // should NOT re-execute when navigating to another page with the same layout.
@@ -679,33 +696,50 @@ function getRouterScript() {
     var text=s.textContent||'';
     if(text.trim()&&!s.hasAttribute('src'))executedScriptHashes[hashScript(text)]=1;
   });
-  function getLayoutGroup(layout){
+  function cacheKey(url){
+    var u=new URL(url,location.origin);
+    return u.pathname+u.search;
+  }
+  function defaultLayoutGroup(layout){
     if(!layout)return 'app';
-    if(layout.indexOf('auth')!==-1||layout.indexOf('guest')!==-1)return 'auth';
-    return 'app';
+    var clean=String(layout).replace(/\\\\/g,'/');
+    var parts=clean.split('/').filter(Boolean);
+    var idx=parts.lastIndexOf('layouts');
+    var part=idx>=0?parts[idx+1]:parts[parts.length-1];
+    return part?part.replace(/\\.stx$/i,''):'app';
+  }
+  function getCurrentLayoutGroup(){
+    var meta=document.querySelector('meta[name="stx-layout-group"]');
+    if(meta&&meta.getAttribute('content'))return meta.getAttribute('content');
+    var layout=document.querySelector('meta[name="stx-layout"]');
+    return defaultLayoutGroup(layout?layout.getAttribute('content'):'');
+  }
+  function getDocLayoutGroup(doc,layout){
+    var meta=doc&&doc.querySelector?doc.querySelector('meta[name="stx-layout-group"]'):null;
+    return meta&&meta.getAttribute('content')?meta.getAttribute('content'):defaultLayoutGroup(layout||'');
   }
-  function checkLayoutChange(newLayout,targetUrl){
+  function checkLayoutChange(newLayout,targetUrl,newGroup){
     var currentLayout=document.querySelector('meta[name="stx-layout"]');
     var curLayoutName=currentLayout?currentLayout.getAttribute('content'):'';
-    var curGroup=getLayoutGroup(curLayoutName);
-    var newGroup=getLayoutGroup(newLayout);
-    console.log('[router] layout check: current='+curLayoutName+'('+curGroup+') new='+(newLayout||'')+'('+newGroup+')');
+    var curGroup=getCurrentLayoutGroup();
+    var nextGroup=newGroup||defaultLayoutGroup(newLayout);
+    log('[router] layout check: current='+curLayoutName+'('+curGroup+') new='+(newLayout||'')+'('+nextGroup+')');
     // Different layout GROUP (e.g. app \u2192 auth): full reload
-    if(curGroup!==newGroup){
-      console.log('[router] layout group change:',curGroup,'\u2192',newGroup,'\u2014 full reload to:',targetUrl);
+    if(curGroup!==nextGroup){
+      log('[router] layout group change:',curGroup,'\u2192',nextGroup,'\u2014 full reload to:',targetUrl);
       return true;
     }
     // Same group but different SPECIFIC layout (e.g. layouts/app \u2192 layouts/coach):
     // full body swap so nav, sidebar, and other layout-level elements update
     if(curLayoutName && newLayout && curLayoutName!==newLayout){
-      console.log('[router] layout name change:',curLayoutName,'\u2192',newLayout,'\u2014 full body swap');
+      log('[router] layout name change:',curLayoutName,'\u2192',newLayout,'\u2014 full body swap');
       return true;
     }
     return false;
   }
 
   function navigate(url,pushState,force){
-    console.log('[router] navigate() called:',url,'isNavigating:',isNavigating);
+    log('[router] navigate() called:',url,'isNavigating:',isNavigating);
     if(isNavigating)return;
     var t=new URL(url,location.origin);
 
@@ -718,27 +752,33 @@ function getRouterScript() {
       return;
     }
 
-    if(t.href===location.href&&!t.hash&&!force)return;
+    // Skip if user clicks a link to the page they're already on. We
+    // deliberately allow popstate (pushState===false) through because
+    // the browser has already updated location.href to the popped
+    // 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;
 
     isNavigating=true;
     document.body.classList.add(o.loadingClass);
     startProgress();
 
     var targetHref=t.href;
-    var targetPath=t.pathname;
+    var targetPath=cacheKey(url);
     var targetHash=t.hash;
 
     function done(){isNavigating=false;document.body.classList.remove(o.loadingClass);finishProgress()}
 
     if(o.cache&&cache[targetPath]&&!force){
-      if(checkLayoutChange(layoutCache[targetPath],url)){
+      if(checkLayoutChange(layoutCache[targetPath],url,layoutGroupCache[targetPath])){
         // Layout changed \u2014 fetch full page and do full document swap
-        console.log('[router] cache hit but layout changed \u2014 fetching full page');
+        log('[router] cache hit but layout changed \u2014 fetching full page');
         fetch(url,{headers:{'Accept':'text/html'}}).then(function(r){
           if(!r.ok)throw new Error(r.status);
           return r.text();
         }).then(function(html){
-          console.log('[router] full page fetched from cache path, len:',html.length);
+          log('[router] full page fetched from cache path, len:',html.length);
           swap(html,targetPath,pushState,targetHash);
         }).catch(function(err){
           console.error('[router] full page fetch error:',err);
@@ -756,23 +796,24 @@ else {
         if(!r.ok)throw new Error(r.status);
         var isFragment=r.headers.get('X-STX-Fragment')==='true';
         var newLayout=r.headers.get('X-STX-Layout')||'';
+        var newGroup=r.headers.get('X-STX-Layout-Group')||'';
         // Layout change? Fetch the FULL page (no X-STX-Router header) and do full document swap
-        if(isFragment&&checkLayoutChange(newLayout,url)){
-          console.log('[router] layout change \u2014 fetching full page for document swap');
+        if(isFragment&&checkLayoutChange(newLayout,url,newGroup)){
+          log('[router] layout change \u2014 fetching full page for document swap');
           return fetch(url,{headers:{'Accept':'text/html'}}).then(function(fullRes){
-            console.log('[router] full page fetched:',fullRes.status,'ok:',fullRes.ok);
+            log('[router] full page fetched:',fullRes.status,'ok:',fullRes.ok);
             if(!fullRes.ok)throw new Error(fullRes.status);
             return fullRes.text().then(function(html){
-              console.log('[router] full page html length:',html.length);
-              return{html:html,isFragment:false,layout:newLayout};
+              log('[router] full page html length:',html.length);
+              return{html:html,isFragment:false,layout:newLayout,layoutGroup:newGroup};
             });
           });
         }
-        return r.text().then(function(html){return{html:html,isFragment:isFragment,layout:newLayout}});
+        return r.text().then(function(html){return{html:html,isFragment:isFragment,layout:newLayout,layoutGroup:newGroup}});
       }).then(function(result){
         if(!result)return;
         if(result.isFragment)result.html='<!--stx-fragment-->'+result.html;
-        if(o.cache){cache[targetPath]=result.html;layoutCache[targetPath]=result.layout}
+        if(o.cache){cache[targetPath]=result.html;layoutCache[targetPath]=result.layout;layoutGroupCache[targetPath]=result.layoutGroup}
         swap(result.html,targetPath,pushState,targetHash);
       }).catch(function(err){
         console.error('[router] fetch error:',err);
@@ -785,8 +826,8 @@ else {
     var isFragment=html.indexOf('<!--stx-fragment-->')===0;
     if(isFragment)html=html.slice('<!--stx-fragment-->'.length);
     var currentContent=getContainer();
-    console.log('[router] swap: isFragment='+isFragment+' container='+!!currentContent+' htmlLen='+html.length);
-    if(!currentContent){console.log('[router] no container \u2014 falling back');location.href=url;return}
+    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}
 
     // Fragment mode: server returned just the page content (no document wrapper)
     if(isFragment){
@@ -841,10 +882,22 @@ else {
         else if(hash){var el=document.querySelector(hash);if(el)el.scrollIntoView({behavior:'smooth'})}
         window.dispatchEvent(new CustomEvent('stx:navigate',{detail:{url:url}}));
         // Execute page scripts FIRST \u2014 they define setup functions and set _latestSetup
-        console.log('[router] frag scripts:', fragScripts.length);
+        log('[router] frag scripts:', fragScripts.length);
         document.querySelectorAll('script[data-stx-page]').forEach(function(s){s.remove()});
         fragScripts.forEach(function(code){
-          console.log('[router] exec script len:', code.length, 'has __stx_setup:', code.indexOf('__stx_setup')>-1);
+          log('[router] exec script len:', code.length, 'has __stx_setup:', code.indexOf('__stx_setup')>-1);
+          // Skip scripts that were already executed (layout-level partials
+          // like theme.stx, stores.stx, nav.stx). Their top-level const/let
+          // declarations would throw "Identifier has already been declared"
+          // on re-execution. Setup functions (__stx_setup_) must always
+          // re-execute because each page has its own setup.
+          var h=hashScript(code);
+          var isSetup=code.indexOf('__stx_setup_')!==-1;
+          if(!isSetup&&executedScriptHashes[h]){
+            log('[router] skipping already-executed script (hash dedup)');
+            return;
+          }
+          executedScriptHashes[h]=1;
           var ns=document.createElement('script');
           // Wrap in block scope to prevent const/let collisions on re-navigation.
           // Without this, navigating away and back throws "Identifier has already
@@ -855,7 +908,7 @@ else {
           ns.setAttribute('data-stx-page','');
           document.body.appendChild(ns);
         });
-        console.log('[router] scripts done. _latestSetup:', !!window.stx._latestSetup);
+        log('[router] scripts done. _latestSetup:', !!window.stx._latestSetup);
         // THEN fire stx:load \u2014 now _latestSetup is set and processElement has the right scope
         window.dispatchEvent(new Event('stx:load'));
       }
@@ -927,12 +980,14 @@ else {
       if(newBody){
         var newMeta=doc.querySelector('meta[name="stx-layout"]');
         var curMeta=document.querySelector('meta[name="stx-layout"]');
-        var curGroup=getLayoutGroup(curMeta?curMeta.getAttribute('content'):'');
-        var newGroup=getLayoutGroup(newMeta?newMeta.getAttribute('content'):'');
-        isLayoutChange=curGroup!==newGroup;
+        var curLayout=curMeta?curMeta.getAttribute('content'):'';
+        var newLayout=newMeta?newMeta.getAttribute('content'):'';
+        var curGroup=getCurrentLayoutGroup();
+        var newGroup=getDocLayoutGroup(doc,newLayout);
+        isLayoutChange=curGroup!==newGroup||(curLayout&&newLayout&&curLayout!==newLayout);
       }
       if(isLayoutChange&&newBody){
-        console.log('[router] full body swap for layout change');
+        log('[router] full body swap for layout change');
         // Replace entire body content \u2014 layout chrome and all
         var bodyHTML=newBody.innerHTML.replace(new RegExp('<scr'+'ipt\\\\b[^>]*>[\\\\s\\\\S]*?<\\\\/scr'+'ipt\\\\s*>','gi'),'');
         document.body.innerHTML=bodyHTML;
@@ -943,6 +998,10 @@ else {
         var freshMeta=doc.querySelector('meta[name="stx-layout"]');
         if(oldMeta&&freshMeta)oldMeta.setAttribute('content',freshMeta.getAttribute('content')||'');
         else if(freshMeta){var m=document.createElement('meta');m.name='stx-layout';m.content=freshMeta.getAttribute('content')||'';document.head.appendChild(m)}
+        var oldGroupMeta=document.querySelector('meta[name="stx-layout-group"]');
+        var freshGroupMeta=doc.querySelector('meta[name="stx-layout-group"]');
+        if(oldGroupMeta&&freshGroupMeta)oldGroupMeta.setAttribute('content',freshGroupMeta.getAttribute('content')||'');
+        else if(freshGroupMeta){var gm=document.createElement('meta');gm.name='stx-layout-group';gm.content=freshGroupMeta.getAttribute('content')||'';document.head.appendChild(gm)}
         // Update container reference for script execution below
         currentContent=document.querySelector(containerSel)||document.querySelector('main')||document.body;
       } else {
@@ -1130,12 +1189,12 @@ else {
     }
     if(!link){return}
     var href=link.getAttribute('href');
-    console.log('[router] click intercepted:',href,'container:',!!getContainer(),'defaultPrevented:',e.defaultPrevented);
-    if(!href||href.startsWith('http')||href.startsWith('#')||href.startsWith('mailto:')||href.startsWith('tel:')){console.log('[router] skipped:',href);return}
+    log('[router] click intercepted:',href,'container:',!!getContainer(),'defaultPrevented:',e.defaultPrevented);
+    if(!href||href.startsWith('http')||href.startsWith('#')||href.startsWith('mailto:')||href.startsWith('tel:')){log('[router] skipped:',href);return}
     if(link.target==='_blank'||link.hasAttribute('download'))return;
     e.preventDefault();
     e.stopPropagation();
-    console.log('[router] navigating to:',href);
+    log('[router] navigating to:',href);
     navigate(href);
   },true);
 
@@ -1151,15 +1210,17 @@ else {
       var link=e.target.closest('[data-stx-link]');
       if(!link)return;
       var href=link.getAttribute('href');
-      if(cache[href]||prefetching[href])return;
-      prefetching[href]=true;
+      var key=cacheKey(href);
+      if(cache[key]||prefetching[key])return;
+      prefetching[key]=true;
       fetch(href,{headers:{'X-STX-Router':'true','Accept':'text/html'}}).then(function(r){
         var isFrag=r.headers.get('X-STX-Fragment')==='true';
         var pLayout=r.headers.get('X-STX-Layout')||'';
-        return r.text().then(function(html){return{html:isFrag?'<!--stx-fragment-->'+html:html,layout:pLayout}});
+        var pGroup=r.headers.get('X-STX-Layout-Group')||'';
+        return r.text().then(function(html){return{html:isFrag?'<!--stx-fragment-->'+html:html,layout:pLayout,layoutGroup:pGroup}});
       }).then(function(result){
-        if(o.cache){cache[href]=result.html;layoutCache[href]=result.layout}
-      }).catch(function(){}).finally(function(){delete prefetching[href]});
+        if(o.cache){cache[key]=result.html;layoutCache[key]=result.layout;layoutGroupCache[key]=result.layoutGroup}
+      }).catch(function(){}).finally(function(){delete prefetching[key]});
     },true);
   }
 
@@ -1252,11 +1313,12 @@ else {
     navigate:navigate,
     navigateTo:navigate,
     prefetch:function(url){
-      if(!cache[url]){
-        fetch(url,{headers:{'X-STX-Router':'true'}}).then(function(r){var isFrag=r.headers.get('X-STX-Fragment')==='true';return r.text().then(function(html){return isFrag?'<!--stx-fragment-->'+html:html})}).then(function(html){cache[url]=html}).catch(function(){});
+      var key=cacheKey(url);
+      if(!cache[key]){
+        fetch(url,{headers:{'X-STX-Router':'true'}}).then(function(r){var isFrag=r.headers.get('X-STX-Fragment')==='true';var pLayout=r.headers.get('X-STX-Layout')||'';var pGroup=r.headers.get('X-STX-Layout-Group')||'';return r.text().then(function(html){return{html:isFrag?'<!--stx-fragment-->'+html:html,layout:pLayout,layoutGroup:pGroup}})}).then(function(result){cache[key]=result.html;layoutCache[key]=result.layout;layoutGroupCache[key]=result.layoutGroup}).catch(function(){});
       }
     },
-    clearCache:function(){for(var k in cache)delete cache[k]},
+    clearCache:function(){for(var k in cache)delete cache[k];for(var lk in layoutCache)delete layoutCache[lk];for(var gk in layoutGroupCache)delete layoutGroupCache[gk]},
     cache:cache,
     swap:swap,
     updateNav:updateNav
@@ -1298,6 +1360,8 @@ export {
   formatRoutes,
   findErrorPage,
   filePathToPattern,
+  extractLayoutMetadata,
+  deriveLayoutGroup,
   defineRoutes,
   defineRoute,
   defineMiddleware,

package/dist/chunk-93ete56h.js

@@ -0,0 +1,23 @@
+// @bun
+// ../router/src/layout-metadata.ts
+function deriveLayoutGroup(layoutPath) {
+  const normalized = layoutPath.replace(/\\/g, "/");
+  const segments = normalized.split("/").filter(Boolean);
+  const layoutsIndex = segments.lastIndexOf("layouts");
+  const layoutSegment = layoutsIndex >= 0 ? segments[layoutsIndex + 1] : segments.at(-1);
+  if (!layoutSegment)
+    return "app";
+  return layoutSegment.replace(/\.stx$/i, "") || "app";
+}
+function extractLayoutMetadata(html) {
+  const layoutMeta = html.match(/<meta\b[^>]*name=["']stx-layout["'][^>]*content=["']([^"']+)["'][^>]*>/i);
+  const groupMeta = html.match(/<meta\b[^>]*name=["']stx-layout-group["'][^>]*content=["']([^"']+)["'][^>]*>/i);
+  const layoutComment = html.match(/<!--\s*stx-layout:\s*([^ ]+)\s*-->/i);
+  const layout = layoutMeta?.[1] || layoutComment?.[1] || "";
+  return {
+    layout,
+    group: groupMeta?.[1] || deriveLayoutGroup(layout)
+  };
+}
+
+export { deriveLayoutGroup, extractLayoutMetadata };

package/dist/serve.js

@@ -1,5 +1,8 @@
 #!/usr/bin/env bun
 // @bun
+import {
+  deriveLayoutGroup
+} from "./chunk-93ete56h.js";
 import {
   __require
 } from "./chunk-2mx7fq49.js";
@@ -8956,9 +8959,9 @@ After installing: bun add bun-plugin-stx`);
     pageMiddlewarePatterns.length = 0;
     await Promise.all(files.map((f) => detectPageMiddleware(f)));
     try {
-      const { Router } = await import("./chunk-nyzhqegd.js");
-      const pagesDir = patterns[0]?.replace(/\/$/, "") || "pages";
-      const router = new Router(process19.cwd(), { pagesDir });
+      const { Router } = await import("./chunk-0nwya50v.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`);
     } catch (e) {}
     return files;
@@ -9540,6 +9543,7 @@ ${output}`;
         if (isSpaNav) {
           const layoutMatch = content.match(/<!-- stx-layout: ([^ ]+) -->/);
           const pageLayout = layoutMatch ? layoutMatch[1] : "default";
+          const pageLayoutGroup = deriveLayoutGroup(pageLayout);
           let fragment = content;
           const headStyles = [];
           const headMatch = content.match(/<head\b[^>]*>([\s\S]*?)<\/head>/i);
@@ -9608,6 +9612,7 @@ ${pageSetupScripts.join(`
               "Content-Type": "text/html; charset=utf-8",
               "X-STX-Fragment": "true",
               "X-STX-Layout": pageLayout,
+              "X-STX-Layout-Group": pageLayoutGroup,
               "Cache-Control": "no-cache",
               ...corsHeaders
             }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.46",
+  "version": "0.2.51",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -43,8 +43,9 @@
       "import": "./dist/serve.js"
     },
     "./*": {
-      "bun": "./dist/*",
-      "import": "./dist/*"
+      "bun": "./dist/*.js",
+      "types": "./dist/*.d.ts",
+      "import": "./dist/*.js"
     }
   },
   "module": "./dist/index.js",
@@ -72,6 +73,7 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.46"
+    "@stacksjs/stx": "0.2.51",
+    "stx-router": "0.2.51"
   }
 }