stx-router 0.2.450 → 0.2.452

package/dist/client.js

@@ -678,6 +678,34 @@ function routerSource() {
     var head=code.trimStart();
     return head.charAt(0)==='('||head.charAt(0)===';';
   }
+  // A component rendered inside a client loop is not an instance yet. Its root
+  // and scoped setup script sit in the loop's SOURCE -- the element carrying
+  // :for, or a descendant of it, as in <tr :for> > <td> > <Avatar> -- which
+  // bindFor turns into the row template and clones per item. The runtime runs
+  // the setup once per clone (hydrateComponentScopes), but only from a script
+  // that still carries data-stx-scoped and its code.
+  //
+  // Only the shape where the component root is itself the :for element was
+  // recognised. A component one level down was run here in place instead,
+  // registering a scope for markup that bindFor discards, and its placeholder
+  // was replaced by an executed script without data-stx-scoped. Every row
+  // cloned from that template had no setup to run: the props reached the row's
+  // root, but its own :if/:src stayed raw. Only on a routed visit, which is
+  // when a store already holds the rows, so it read as a timing bug.
+  function hasLoopAttr(el){
+    return el.hasAttribute('@for')||el.hasAttribute(':for')||el.hasAttribute('x-for');
+  }
+  function loopOwnsScopedScript(script,code){
+    if(!script)return false;
+    for(var cursor=script.parentNode;cursor&&cursor.nodeType===1;cursor=cursor.parentNode){
+      if(hasLoopAttr(cursor))return true;
+    }
+    var root=script.previousSibling;
+    while(root&&((root.nodeType===3&&!(root.textContent||'').trim())||root.nodeType===8))root=root.previousSibling;
+    if(!root||root.nodeType!==1||!root.hasAttribute('data-stx-scope')||!hasLoopAttr(root))return false;
+    var scopeId=root.getAttribute('data-stx-scope');
+    return !!scopeId&&code.indexOf(scopeId)!==-1;
+  }
   // A component scope script names the root it binds in data-stx-owner (#1958).
   // On navigation it runs only for a root that just ARRIVED: one swapped in
   // with the new content, which is not bound yet. A layout component that
@@ -1625,16 +1653,7 @@ else {
               if(template.contains(placeholder)||(template.content&&template.content.contains(placeholder)))
                 nestedScopedTemplate=true;
             });
-            var loopRoot=placeholder.previousSibling;
-            while(loopRoot&&(
-              (loopRoot.nodeType===3&&!(loopRoot.textContent||'').trim())
-              ||loopRoot.nodeType===8
-            ))loopRoot=loopRoot.previousSibling;
-            if(loopRoot&&loopRoot.nodeType===1&&loopRoot.hasAttribute('data-stx-scope')
-              &&(loopRoot.hasAttribute(':for')||loopRoot.hasAttribute('@for')||loopRoot.hasAttribute('x-for'))){
-              var loopScopeId=loopRoot.getAttribute('data-stx-scope');
-              scopedLoopSetup=!!loopScopeId&&code.indexOf(loopScopeId)!==-1;
-            }
+            scopedLoopSetup=loopOwnsScopedScript(placeholder,code);
           }
           if(entry.scoped&&(!placeholder||!placeholder.parentNode||nestedScopedTemplate||scopedLoopSetup)){
             log('[router] leaving loop-scoped script for component hydration');
@@ -1901,6 +1920,9 @@ else {
           var executable=!type||type==='text/javascript'||type==='application/javascript'||type==='module';
           if(!executable||!text.trim())return;
           if(isSignalsRuntimeScript(s,text)||text.indexOf('__stxRouter')!==-1){s.remove();return}
+          // Loop-owned component setup stays inert with its code, as the
+          // fragment path leaves it: bindFor runs it per row.
+          if(s.hasAttribute('data-stx-scoped')&&loopOwnsScopedScript(s,text)){s.setAttribute('type','application/stx-pending');return}
           var slot='document-'+(++routedBodyScriptId);
           var setupName=generatedSetupName(text);
           if(setupName)incomingSetupName=setupName;
@@ -1925,6 +1947,10 @@ else {
         document.body.innerHTML=bodyHTML;
         // Copy body attributes (class, data-stx, etc.)
         Array.from(newBody.attributes).forEach(function(attr){document.body.setAttribute(attr.name,attr.value)});
+        // Copying only adds. data-stx names the page setup that stx:load falls
+        // back to when no _latestSetup is set, so the outgoing page's name left
+        // behind on a destination without one ran the page being left.
+        if(!newBody.hasAttribute('data-stx'))document.body.removeAttribute('data-stx');
         // Update layout meta tag
         var oldMeta=qs(LAYOUT_META);
         var freshMeta=doc.querySelector(LAYOUT_META);
@@ -2113,6 +2139,12 @@ else {
 
       // Execute page scripts FIRST \u2014 they define setup functions and set _latestSetup
       function execScripts(){
+        // The outgoing page's setup is not this page's. A destination whose
+        // script defines no __stx_setup_ (a page that only calls useHead, say)
+        // left it in place, and stx:load ran it again here: its effects, its
+        // onMount -- HQ's calendar wrote ?athlete_id into /relax. Fragments
+        // never hit this only because the server prepends the same clear.
+        if(window.stx)window.stx._latestSetup=null;
         scripts.forEach(function(entry){
           var text=typeof entry==='string'?entry:entry.text;
           var runAlways=typeof entry==='string'?false:entry.runAlways;

package/package.json

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