stx-router 0.2.607 → 0.2.611

package/dist/client.js

@@ -1321,7 +1321,13 @@ function routerSource() {
       // Cache hit \u2192 promote in LRU order so this entry survives eviction
       // longer than other entries that haven't been touched.
       touchCache(targetPath);
-      if(checkLayoutChange(layoutCache[targetPath],url,layoutGroupCache[targetPath])){
+      var cached=cache[targetPath];
+      // A whole document swaps in as it is: one prefetched across a layout
+      // change (prefetchLink), or kept from an earlier full-page answer. Only a
+      // fragment from another layout still needs its document fetched; asking
+      // again was a second round trip on every tap into another layout.
+      var isDoc=cached.indexOf('<!--stx-fragment')!==0;
+      if(!isDoc&&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');
         return routerFetch(url,{'Accept':'text/html'}).then(function(r){
@@ -1335,11 +1341,10 @@ function routerSource() {
           return swapWith(html,targetPath);
         }).catch(failed).finally(done);
       }
-      var cached=cache[targetPath];
       var swapCached=function(){
         if(stale())return false;
         pendingContainerAttrs=attrsCache[targetPath]||'';
-        pendingLayoutDecl=null;
+        pendingLayoutDecl=isDoc?{layout:layoutCache[targetPath]||'',group:layoutGroupCache[targetPath]||''}:null;
         return swapWith(cached,targetPath);
       };
       var loading=beforeSwap(cached,url);
@@ -1347,8 +1352,10 @@ function routerSource() {
         if(swapped===false)return false;
         applyTitle(titleCache[targetPath]);
         // Shown from the cache at once; asked again behind it, so a page that
-        // changed since says so (stx:updated) instead of staying stale.
-        revalidate(targetPath,url);
+        // changed since says so (stx:updated) instead of staying stale. Not a
+        // whole document: it would be compared with a fragment and always
+        // read as changed.
+        if(!isDoc)revalidate(targetPath,url);
         return true;
       }).finally(done);
     }
@@ -3520,6 +3527,16 @@ else {
     var wantsFragment=shouldUseFragmentResponse();
     prefetching[key]=fetch(href,{headers:wantsFragment?{'X-STX-Router':'true','Accept':'text/html'}:{'Accept':'text/html'}}).then(function(r){
       return readPrefetchResponse(r,wantsFragment);
+    }).then(function(result){
+      // A page in another layout cannot be swapped in as a fragment: the tap
+      // would read this answer, see the layout change, and fetch the whole
+      // document then (navigate). Fetch it now instead, while the person is
+      // still reaching for the link, so the tap is a swap like any other.
+      if(!result||result.html.indexOf('<!--stx-fragment')||!checkLayoutChange(result.layout,href,result.layoutGroup))return result;
+      // Same guards as any prefetch; the layout is the one the fragment declared.
+      return fetch(href,{headers:{'Accept':'text/html'}}).then(function(full){
+        return full.ok?readPrefetchResponse(full,false).then(function(doc){return doc&&(doc.layout=result.layout,doc.layoutGroup=result.layoutGroup,doc)}):null;
+      });
     }).then(function(result){
       if(result&&o.cache){
         setCache(key,result.html,result.layout,result.layoutGroup,result.title,result.containerAttrs);
@@ -3530,7 +3547,8 @@ else {
         // Its stylesheet too, so the tap never waits on cssLoadTimeout for a
         // sheet it could have had all along. Added unapplied (media=print),
         // as a navigation adds it; the swap makes it live.
-        if(result.html.indexOf('<!--stx-fragment')===0)preloadGeneratedCss(fragmentCssHrefs(result.html),location.href);
+        // A whole document's generated sheets too, named the same way in its head.
+        preloadGeneratedCss(fragmentCssHrefs(result.html),location.href);
       }
     }).catch(function(){}).finally(function(){delete prefetching[key]});
   }
@@ -3609,6 +3627,12 @@ else {
   // Answers false when a bundle failed: that page cannot bind, and is
   // recovered (recoverUnbound) rather than swapped in bare.
   function beforeSwap(html,base){
+    // Its generated stylesheets start now too, beside the bundles: the swap
+    // waits for them anyway, and fetched one after the other a tap paid for
+    // two round trips where one would do. The swap finds them here (pending
+    // or loaded) rather than starting them; a failed sheet is the swap's to
+    // handle, so it does not hold this up. Generated sheets are root paths.
+    preloadGeneratedCss(fragmentCssHrefs(html),location.href);
     var waits=loadModuleRegistries(html,base);
     if(!waits)return null;
     return Promise.race([

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stx-router",
   "type": "module",
-  "version": "0.2.607",
+  "version": "0.2.611",
   "description": "File-based router for STX — .stx template discovery, nested layouts, typed route params, middleware, and client-side SPA navigation.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",