stx-router 0.2.706 → 0.2.708

package/dist/client.js

@@ -590,7 +590,38 @@ function routerSource() {
   // Apply a page title captured from the fragment response's X-STX-Title
   // header (URI-encoded) so SPA swaps keep document.title in sync with the
   // page \u2014 full-document swaps set the title from the <title> tag directly.
-  function applyTitle(t){if(t){try{document.title=decodeURIComponent(t)}catch(e){document.title=t}}}
+  function applyTitle(t,html){
+    // The parsed metadata payload already set the title with the browser's
+    // complete entity decoder. A legacy header must not overwrite it.
+    if(html&&/^<!--stx-fragment(?: rt=[01])?--><template data-stx-page-head="1">/.test(html))return;
+    if(t){try{document.title=decodeURIComponent(t)}catch(e){document.title=t}}
+  }
+  // Only these page-owned tags are reconciled. Assets, security tokens,
+  // theme metadata and arbitrary attributes never enter the contract (#2121).
+  function pageMetadataTag(node){
+    var tag=node.tagName.toLowerCase(),out;
+    if(tag==='meta'){
+      var kind=node.hasAttribute('property')?'property':'name';
+      var name=(node.getAttribute(kind)||'').toLowerCase();
+      if(name!=='description'&&!/^(og|twitter):[\\w:]+$/.test(name))return null;
+      out=ce('meta');out.setAttribute(kind,name);out.setAttribute('content',node.getAttribute('content')||'');return out;
+    }
+    if(tag==='link'){
+      var rel=(node.getAttribute('rel')||'').toLowerCase(),lang=node.getAttribute('hreflang');
+      if(rel!=='canonical'&&!(rel==='alternate'&&lang))return null;
+      out=ce('link');out.setAttribute('rel',rel);out.setAttribute('href',node.getAttribute('href')||'');
+      if(rel==='alternate')out.setAttribute('hreflang',lang);return out;
+    }
+    return null;
+  }
+  function pageMetadataNodes(root){return Array.prototype.slice.call(root.querySelectorAll('meta,link'))}
+  function capturePageHead(){return pageMetadataNodes(document.head).map(function(node){var tag=pageMetadataTag(node);return tag?tag.outerHTML:''}).join('')}
+  function applyPageHead(html){
+    var doc=new DOMParser().parseFromString('<html><head>'+html+'</head><body></body></html>','text/html');
+    pageMetadataNodes(document.head).forEach(function(node){if(pageMetadataTag(node))node.remove()});
+    pageMetadataNodes(doc.head).forEach(function(node){var tag=pageMetadataTag(node);if(tag)document.head.appendChild(tag)});
+    var title=doc.head.querySelector('title');if(title)document.title=title.textContent;
+  }
   // \u2500\u2500 Container attributes \u2500\u2500
   // A fragment carries only the container's INNER content, so any layout that
   // lives on the destination's <main> itself (e.g. a centered auth page whose
@@ -1355,7 +1386,7 @@ function routerSource() {
       var loading=beforeSwap(cached,url);
       return (loading?loading.then(function(ok){if(!ok){if(!stale())recoverUnbound(url,ctx);return false}return swapCached()}):Promise.resolve(swapCached())).then(function(swapped){
         if(swapped===false)return false;
-        applyTitle(titleCache[targetPath]);
+        applyTitle(titleCache[targetPath],cached);
         // 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);
@@ -1431,7 +1462,7 @@ else {
           if(swapped===false)return false;
           // 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);
+          if(result.isFragment)applyTitle(result.title,result.html);
           return true;
         });
       }).catch(failed).finally(done);
@@ -1727,6 +1758,11 @@ else {
     var isFragment=!!fragMark;
     var declaredRuntime=fragMark&&fragMark[1]?fragMark[1]:'';
     if(isFragment)html=html.slice(fragMark[0].length);
+    var incomingHead=null;
+    if(isFragment){
+      var headPayload=/^<template data-stx-page-head="1">([\\s\\S]*?)<\\/template>\\n?/.exec(html);
+      if(headPayload){incomingHead=headPayload[1];html=html.slice(headPayload[0].length)}
+    }
     if(!isFragment&&!isStxDocument(html)){log('[router] non-stx document \u2014 full navigation to:',url);location.href=url;return Promise.resolve(false)}
     var ctx=pendingCtx||{direction:pushState==='replace'?'replace':pushState==='tab'?'tab':pushState===false?'pop':'push'};
     pendingCtx=null;
@@ -1974,6 +2010,7 @@ else {
               setDirection(ctx.direction);
               if(useScreens){scr=screenBegin(host,ctx,html,pushState!==false);currentContent=scr.el}
               beginPageSwap();
+              if(incomingHead!==null)applyPageHead(incomingHead);
               doFragSwap();
               if(scr)screenEnd(scr);
               resolve(true);
@@ -2330,6 +2367,7 @@ else {
       // Update title
       var newTitle=doc.querySelector('title');
       if(newTitle)document.title=newTitle.textContent;
+      applyPageHead(doc.head.innerHTML);
 
       // Update <html lang> from the destination doc so screen readers,
       // CSS :lang() selectors, and any i18n picker that mirrors
@@ -2586,6 +2624,7 @@ else {
   function saveEntry(e){
     var stx=window.stx||{};
     e.title=document.title;
+    e.head=capturePageHead();
     e.setup=stx._latestSetup;
     e.data=window.__STX_DATA__;
     e.config=window.__STX_RUNTIME_CONFIG__;
@@ -2595,6 +2634,7 @@ else {
   function restoreEntry(e){
     var stx=window.stx||{};
     if(e.title)document.title=e.title;
+    if(typeof e.head==='string')applyPageHead(e.head);
     if(e.setup)stx._latestSetup=e.setup;
     window.__STX_DATA__=e.data||{};
     window.__STX_RUNTIME_CONFIG__=e.config||{};
@@ -3418,7 +3458,7 @@ else {
         // 'replace' so re-rendered validation errors do not stack one history
         // entry per attempt.
         return Promise.resolve(swap(marked,cacheKey(action),'replace','')).then(function(){
-          applyTitle(r.headers.get('X-STX-Title')||'');
+          applyTitle(r.headers.get('X-STX-Title')||'',marked);
         });
       });
     }).catch(function(err){

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "stx-router",
   "type": "module",
-  "version": "0.2.706",
+  "version": "0.2.708",
   "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",