bun-plugin-stx 0.2.324 → 0.2.326

package/dist/{chunk-37vp8yms.js → chunk-y6mw5qdq.js}

@@ -1699,8 +1699,7 @@ else {
         // Remove old page scripts
         document.querySelectorAll('script[data-stx-page]').forEach(function(s){s.remove()});
         if(pushState!==false)writeHistory(pushState,url+(hash||''));
-        updateNav();
-        updateActiveLinks();
+        refreshCurrentLinks();
         if(o.scrollToTop&&!hash)window.scrollTo({top:0,behavior:'instant'});
         else if(hash){var el=document.querySelector(hash);if(el)el.scrollIntoView({behavior:'smooth'})}
         window.dispatchEvent(new CustomEvent('stx:navigate',{detail:{url:url}}));
@@ -2150,8 +2149,7 @@ else {
       if(pushState!==false)writeHistory(pushState,url+(hash||''));
 
       // Update active nav links
-      updateNav();
-      updateActiveLinks();
+      refreshCurrentLinks();
 
       // Scroll
       if(o.scrollToTop&&!hash)window.scrollTo({top:0,behavior:'instant'});
@@ -2559,7 +2557,14 @@ else {
   // Null for links the router does not own (another origin, a bare #fragment,
   // anything unparseable), which are left exactly as the server rendered them.
   function normPath(p){return p.length>1&&p.charAt(p.length-1)==='/'?p.slice(0,-1):p}
-  function linkState(href){
+  // Paths beyond the link's own that make it current: a tab bar's Calendar
+  // tab stays lit on a workout opened from it (data-stx-active-match, a
+  // space-separated list of path prefixes).
+  function matchesAny(list,cur){
+    if(!list)return false;
+    return list.split(/\\s+/).some(function(p){p=normPath(p);return p&&(cur===p||cur.indexOf(p+'/')===0)});
+  }
+  function linkState(href,also){
     if(!href||href.charAt(0)==='#')return null;
     var u;
     try{u=new URL(href,location.href)}catch(e){return null}
@@ -2571,27 +2576,39 @@ else {
     // point at this path, exactly one is.
     var have=new URLSearchParams(location.search),q=true;
     u.searchParams.forEach(function(v,k){if(have.getAll(k).indexOf(v)===-1)q=false});
+    var matched=matchesAny(also,cur);
     return {
       exact:q&&path===cur,
-      active:q&&(path==='/'?cur==='/':(cur===path||cur.indexOf(path+'/')===0))
+      active:q&&(path==='/'?cur==='/':(cur===path||cur.indexOf(path+'/')===0))||matched,
+      matched:matched
     };
   }
 
   function updateNav(){
     document.querySelectorAll('nav a[href], #mobileNav a[href], [data-stx-nav] a[href]').forEach(function(a){
       if(!a.hasAttribute('data-stx-link'))return;
-      var st=linkState(a.getAttribute('href'));
+      var st=linkState(a.getAttribute('href'),a.getAttribute('data-stx-active-match'));
       if(!st)return;
       var ac=a.getAttribute('data-stx-active-class')||'active';
-      if(st.exact)ac.split(' ').forEach(function(cls){if(cls)a.classList.add(cls)});else ac.split(' ').forEach(function(cls){if(cls)a.classList.remove(cls)});
+      if(st.exact||st.matched)ac.split(' ').forEach(function(cls){if(cls)a.classList.add(cls)});else ac.split(' ').forEach(function(cls){if(cls)a.classList.remove(cls)});
     });
   }
 
+  // Both passes, always in this order. A link inside a <nav> is current only on
+  // its own page (or one it names in data-stx-active-match), so updateNav has
+  // the last word. Navigation used to run them the other way round, which lit
+  // a nav's parent links by prefix after an in-app navigation but not after a
+  // full load of the same URL.
+  function refreshCurrentLinks(){
+    updateActiveLinks();
+    updateNav();
+  }
+
   function updateActiveLinks(){
     // Update active classes on <stx-link> elements (and legacy data-stx-link)
     var links=document.querySelectorAll('[data-stx-link]');
     links.forEach(function(link){
-      var st=linkState(link.getAttribute('to')||link.getAttribute('href')||'');
+      var st=linkState(link.getAttribute('to')||link.getAttribute('href')||'',link.getAttribute('data-stx-active-match'));
       if(!st)return;
       var ac=link.getAttribute('active-class')||link.getAttribute('data-stx-active-class')||'active';
       var eac=link.getAttribute('exact-active-class')||link.getAttribute('data-stx-exact-active-class')||'exact-active';
@@ -2722,8 +2739,7 @@ else {
   function init(){
     injectStyles();
     injectViewTransitionCSS();
-    updateActiveLinks();
-    updateNav();
+    refreshCurrentLinks();
   }
 
   if(document.readyState==='loading')document.addEventListener('DOMContentLoaded',init);else init();

package/dist/serve.js

@@ -9328,8 +9328,11 @@ After installing: bun add bun-plugin-stx`);
   const cssCssCache = boundedCache(options.cssCacheLimit ?? 512);
   const hmrClients = new Set;
   const hmrEncoder = new TextEncoder;
+  let hmrVersion = 0;
   function broadcastHmr(event) {
-    const payload = hmrEncoder.encode(`data: ${JSON.stringify(event)}
+    if (event.type !== "build-error")
+      hmrVersion++;
+    const payload = hmrEncoder.encode(`data: ${JSON.stringify({ ...event, version: hmrVersion })}
 
 `);
     for (const c of hmrClients) {
@@ -9375,16 +9378,17 @@ function __stxOverlay(errs){
   el.innerHTML=h;
 }
 `;
-  const HMR_CLIENT_SCRIPT = `<script data-stx-hmr>(()=>{if(window.__stxHmr)return;window.__stxHmr=1;${HMR_OVERLAY_JS}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');function swapFragment(){var r=window.stxRouter;if(r&&typeof r.refresh==='function'){try{return r.refresh().then(function(ok){if(!ok)location.reload()},function(){location.reload()})}catch(_){location.reload()}}else{location.reload()}}function reloadStores(){var s=window.stx;if(!s||typeof s.__hmrReplaceStores!=='function'){location.reload();return}fetch('/_stx/stores.js',{cache:'no-store'}).then(function(r){return r.ok?r.text():null}).then(function(code){if(code===null){location.reload();return}s.__hmrReplaceStores(code)}).catch(function(){location.reload()})}es.onmessage=function(e){try{var m=JSON.parse(e.data);if(m.type==='reload')location.reload();else if(m.type==='css')bust();else if(m.type==='fragment')swapFragment();else if(m.type==='store')reloadStores();else if(m.type==='build-error')__stxOverlay(m.errors)}catch(_){}};es.onerror=function(){if(es.readyState===2){setTimeout(function(){location.reload()},400)}}})()</script>`;
+  const HMR_CLIENT_SCRIPT = `<script data-stx-hmr>(()=>{if(window.__stxHmr)return;window.__stxHmr=1;${HMR_OVERLAY_JS}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 version=__STX_HMR_VERSION__,es=null;function swapFragment(){var r=window.stxRouter;if(r&&typeof r.refresh==='function'){try{return r.refresh().then(function(ok){if(!ok)location.reload()},function(){location.reload()})}catch(_){location.reload()}}else{location.reload()}}function reloadStores(){var s=window.stx;if(!s||typeof s.__hmrReplaceStores!=='function'){location.reload();return}fetch('/_stx/stores.js',{cache:'no-store'}).then(function(r){return r.ok?r.text():null}).then(function(code){if(code===null){location.reload();return}s.__hmrReplaceStores(code)}).catch(function(){location.reload()})}function connect(){var source=new EventSource('/_stx/hmr');es=source;source.onmessage=function(e){try{var m=JSON.parse(e.data);if(m.type==='connected'){if(typeof m.version==='number'&&m.version!==version)location.reload();return}if(typeof m.version==='number')version=m.version;if(m.type==='reload')location.reload();else if(m.type==='css')bust();else if(m.type==='fragment')swapFragment();else if(m.type==='store')reloadStores();else if(m.type==='build-error')__stxOverlay(m.errors)}catch(_){}};source.onerror=function(){if(es===source&&source.readyState===2){setTimeout(function(){location.reload()},400)}}}connect();addEventListener('pagehide',function(){if(es){es.close();es=null}});addEventListener('pageshow',function(e){if(e.persisted&&!es)connect()})})()</script>`;
   function injectHmrClient(html) {
     if (!html || production)
       return html;
     refreshBuildErrors();
+    const client = HMR_CLIENT_SCRIPT.replace("__STX_HMR_VERSION__", String(hmrVersion));
     const closeBody = html.lastIndexOf("</body>");
     if (closeBody === -1) {
-      return html + HMR_CLIENT_SCRIPT;
+      return html + client;
     }
-    return html.slice(0, closeBody) + HMR_CLIENT_SCRIPT + html.slice(closeBody);
+    return html.slice(0, closeBody) + client + html.slice(closeBody);
   }
   let currentBuildErrors = [];
   async function refreshBuildErrors() {
@@ -9787,7 +9791,7 @@ function __stxOverlay(errs){
     rebuildDiscoveredPagePaths(kept);
     await indexPageMiddleware(kept);
     try {
-      const { Router } = await import("./chunk-37vp8yms.js");
+      const { Router } = await import("./chunk-y6mw5qdq.js");
       const pagesDirs = patterns.map((p) => p.replace(/\/$/, "")).filter(Boolean);
       const router = new Router(process19.cwd(), { pagesDirs, stateDir: stateDirName(), exclude: options.exclude });
       if (!options.quiet)
@@ -10531,7 +10535,7 @@ ${block}`;
                     start(c) {
                       controller = c;
                       hmrClients.add(c);
-                      c.enqueue(hmrEncoder.encode(`data: {"type":"connected"}
+                      c.enqueue(hmrEncoder.encode(`data: {"type":"connected","version":${hmrVersion}}
 
 `));
                       if (currentBuildErrors.length > 0) {

package/package.json

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