@barefootjs/client 0.28.1 → 0.30.0

package/dist/runtime/component.d.ts

@@ -6,12 +6,39 @@
  */
 import type { ComponentDef } from './types.ts';
 export declare function setParentScopeId(id: string | null): void;
-/** Where `mapArray` wants a fresh loop row connected before its `init` runs. */
+/**
+ * Where `mapArray` wants a fresh loop row connected before its `init` runs.
+ *
+ * `mounted` is written back by `mountRowRoot` so the caller can undo the
+ * connection if the rest of the row's body then throws — see `createItemScope`.
+ * Without it a half-built row stays visible, which detached rows never did.
+ */
 export type RowMountPoint = {
     container: Node;
     anchor: Node | null;
+    mounted?: Element | null;
 };
 export declare function setRowMountPoint(p: RowMountPoint | null): RowMountPoint | null;
+/**
+ * Connect a loop row whose root is a template clone, before the emitted
+ * renderItem body's tail runs.
+ *
+ * The tail is where the row's nested children initialise (`upsertChild` and
+ * friends), and `useContext` resolves by walking `parentElement` — so a child
+ * that inits inside a detached row finds no ancestors and falls through to the
+ * global last-writer-wins context store, reading whichever provider on the page
+ * wrote last. `createComponent` row roots already avoid this by consuming the
+ * same ambient (step 7b); a clone root has no runtime function in the middle,
+ * so the compiler emits this call for it instead.
+ *
+ * Take-and-clear, like the `createComponent` path: a nested `createComponent`
+ * driven by this row's own children must not re-use the row's mount point.
+ *
+ * No-op when there is no ambient point — the hydration branch never calls this
+ * (its row came from SSR markup and is already in the document), and a loop
+ * runtime that does not hand one down leaves the row exactly as it was.
+ */
+export declare function mountRowRoot(el: Element): Element;
 /**
  * Create a component instance with DOM element and initialized state.
  *

package/dist/runtime/component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../src/runtime/component.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAS9C,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAExD;AAED,gFAAgF;AAChF,MAAM,MAAM,aAAa,GAAG;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,IAAI,GAAG,IAAI,CAAA;CAAE,CAAA;AAsBpE,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,aAAa,GAAG,IAAI,CAI9E;AAQD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH;;;GAGG;AACH;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAA;IACd,uDAAuD;IACvD,KAAK,EAAE,MAAM,CAAA;CACd;AAED,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,GAAG,YAAY,EAChC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EACrB,IAAI,CAAC,EAAE,uBAAuB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,GACvB,WAAW,CAcb;AA2ND;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAiDR;AA+DD;;;;;GAKG;AACH;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOjD;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAGjD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAG9D;AAID;;;;;;;;;;;;;GAaG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,gBAAgB,CAcjF"}
+{"version":3,"file":"component.d.ts","sourceRoot":"","sources":["../../src/runtime/component.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AASH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAS9C,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAExD;AAED;;;;;;GAMG;AACH,MAAM,MAAM,aAAa,GAAG;IAAE,SAAS,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,IAAI,GAAG,IAAI,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CAAA;AAsB9F,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,aAAa,GAAG,IAAI,GAAG,aAAa,GAAG,IAAI,CAI9E;AAQD;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,YAAY,CAAC,EAAE,EAAE,OAAO,GAAG,OAAO,CAQjD;AAED;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH;;;GAGG;AACH;;;;;GAKG;AACH,MAAM,WAAW,uBAAuB;IACtC,iDAAiD;IACjD,MAAM,EAAE,MAAM,CAAA;IACd,uDAAuD;IACvD,KAAK,EAAE,MAAM,CAAA;CACd;AAED,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,GAAG,YAAY,EAChC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,EACnC,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EACrB,IAAI,CAAC,EAAE,uBAAuB,EAC9B,OAAO,CAAC,EAAE,OAAO,GAAG,IAAI,GACvB,WAAW,CAcb;AAyOD;;;;;;;;;;;;GAYG;AACH,wBAAgB,WAAW,CACzB,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EACrB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAqER;AA+DD;;;;;GAKG;AACH;;;;;GAKG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAOjD;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,UAAU,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAGjD;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAG9D;AAID;;;;;;;;;;;;;GAaG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,gBAAgB,CAcjF"}

package/dist/runtime/index.d.ts

@@ -15,7 +15,7 @@ export { mapArrayLazy, type LazyRowEntry, type LazyRowPlan } from './map-array-l
 export { patchLeaf } from './patch-leaf.ts';
 export { claimSlots, lazySlots, lazyClaimSlots, textOrNode, type SlotSpec, type ClaimPlan, type ClaimedSlots, type ClaimedSlotsRW, type SlotWriter } from './claim-slots.ts';
 export { registerTemplate, getTemplate, hasTemplate, type TemplateFn } from './template.ts';
-export { createComponent, renderChild, parseHTML, escapeAttr, escapeText, escapeTextOrNode, } from './component.ts';
+export { createComponent, mountRowRoot, renderChild, parseHTML, escapeAttr, escapeText, escapeTextOrNode, } from './component.ts';
 export { applyRestAttrs } from './apply-rest-attrs.ts';
 export { spreadAttrs } from './spread-attrs.ts';
 export { styleToCss } from './style.ts';

package/dist/runtime/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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"}

package/dist/runtime/index.js

@@ -1361,6 +1361,14 @@ function takeRowMountPoint() {
   _rowMountPoint = null;
   return p;
 }
+function mountRowRoot(el) {
+  const p = takeRowMountPoint();
+  if (p) {
+    p.container.insertBefore(el, p.anchor);
+    p.mounted = el;
+  }
+  return el;
+}
 function createComponent(nameOrDef, props = {}, key, slot, mountAt) {
   const element = materializeComponent(nameOrDef, props, key, slot, mountAt);
   if (mountAt && mountAt.parentNode && element !== mountAt) {
@@ -1404,12 +1412,13 @@ function materializeComponent(nameOrDef, props = {}, key, slot, mountAt) {
   });
   const def = getRegisteredDef(name);
   const isCommentWrapper = def?.comment === true;
-  const scopeId = isCommentWrapper ? null : `${name}_${generateId()}`;
+  const derivedScopeId = slot?.parent && slot.mount ? `${slot.parent}_${slot.mount}` : null;
+  const scopeId = isCommentWrapper ? null : derivedScopeId ?? `${name}_${generateId()}`;
   const prevParentScopeId = _parentScopeId;
-  if (slot?.parent) {
-    _parentScopeId = slot.parent;
-  } else if (scopeId) {
+  if (scopeId) {
     _parentScopeId = scopeId;
+  } else if (slot?.parent) {
+    _parentScopeId = slot.parent;
   }
   let html;
   try {
@@ -1477,7 +1486,8 @@ function renderChild(name, props, key, slotSuffix) {
   if (!templateFn) {
     return `<div ${bfsAttr}${slotAttrs}${keyAttr}></div>`;
   }
-  let html = templateFn(props).trim().replace(PLACEHOLDER_ATTR_PATTERN, _parentScopeId ? ` bf-s="${_parentScopeId}"` : "");
+  const raw = templateFn(props);
+  let html = raw.trim().replace(PLACEHOLDER_ATTR_PATTERN, _parentScopeId ? ` bf-s="${_parentScopeId}"` : "");
   const firstElMatch = html.match(/<(\w+)/);
   if (!firstElMatch)
     return html;
@@ -1738,7 +1748,7 @@ function* itemRootElements(primaryEl) {
     if (n.nodeType === Node.COMMENT_NODE) {
       const v = n.nodeValue ?? "";
       if (v === BF_LOOP_ITEM || v === BF_LOOP_START || v.startsWith(startPrefix) || v === BF_LOOP_END || v.startsWith(endPrefix)) {
-        return;
+        break;
       }
     } else if (n.nodeType === Node.ELEMENT_NODE) {
       yield n;
@@ -1911,9 +1921,16 @@ function createItemScope(item, index, renderItem, existingPrimary, existingExtra
     const prevRowMount = ownsRowMount ? setRowMountPoint(rowMount) : null;
     try {
       primaryEl = renderItem(itemAccessor, index, existingPrimary);
+    } catch (err) {
+      const parked = rowMount?.mounted;
+      if (parked?.parentNode)
+        parked.remove();
+      throw err;
     } finally {
       if (ownsRowMount)
         setRowMountPoint(prevRowMount);
+      if (rowMount)
+        rowMount.mounted = null;
     }
     if (existingPrimary) {
       extras = existingExtras ?? [];
@@ -3248,6 +3265,7 @@ export {
   parseHTML,
   onMount,
   onCleanup,
+  mountRowRoot,
   mapArrayLazy,
   mapArrayAnchored,
   mapArray,

package/dist/runtime/map-array.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"map-array.d.ts","sourceRoot":"","sources":["../../src/runtime/map-array.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAqCH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,WAAW,EACtB,QAAQ,CAAC,EAAE,MAAM,GAChB;IAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CA+BhD;AA8DD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CA2B3E;AAkFD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EACxB,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,SAAS,EAAE,WAAW,GAAG,IAAI,EAC7B,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,IAAI,EACnD,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,KAAK,WAAW,EACjF,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CA6RN;AAqHD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,SAAS,EAAE,WAAW,GAAG,IAAI,EAC7B,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,IAAI,EACnD,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,KAAK,gBAAgB,GAAG,OAAO,EAC5F,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CA+FN"}
+{"version":3,"file":"map-array.d.ts","sourceRoot":"","sources":["../../src/runtime/map-array.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAqCH;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,WAAW,EACtB,QAAQ,CAAC,EAAE,MAAM,GAChB;IAAE,KAAK,EAAE,OAAO,GAAG,IAAI,CAAC;IAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAAA;CAAE,CA+BhD;AA8DD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mCAAmC,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CA2B3E;AA2FD;;;;;;;;;;GAUG;AACH,wBAAgB,QAAQ,CAAC,CAAC,EACxB,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,SAAS,EAAE,WAAW,GAAG,IAAI,EAC7B,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,IAAI,EACnD,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,KAAK,WAAW,EACjF,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CA6RN;AAqHD;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAChC,QAAQ,EAAE,MAAM,CAAC,EAAE,EACnB,SAAS,EAAE,WAAW,GAAG,IAAI,EAC7B,MAAM,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,IAAI,EACnD,UAAU,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,KAAK,gBAAgB,GAAG,OAAO,EAC5F,QAAQ,CAAC,EAAE,MAAM,EACjB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CA+FN"}

package/dist/runtime/qsa-item.d.ts

@@ -20,18 +20,22 @@
  *      cannot escape into a neighbouring item or into nodes outside the
  *      loop.
  *   3. The CSR-only `__bfExtras` stash. During renderItem-body setup
- *      (between the template clone and the function's return), the
- *      primary and extras are still detached nodes — `__el.nextSibling`
- *      is `null` and step 2 yields nothing. Reading `__bfExtras` lets
- *      lookups reach the still-pending extras before `mapArray` inserts
- *      them into the DOM.
+ *      (between the template clone and the function's return), the extras
+ *      are not siblings yet. Reading `__bfExtras` lets lookups reach them
+ *      before `mapArray` inserts them into the DOM.
  *
- * Step 3's reliance on the primary being detached during setup is why
- * `createItemScope` un-parks a row that turns out to carry extras: the
- * connect-before-init mount point applies to `createComponent` row roots,
- * which are single-root by construction and so never reach this module. An
- * attached primary would make step 2's sibling walk run past the item's own
- * roots into a neighbouring item's elements before step 3 is ever consulted.
+ * Step 3 must stay reachable whether or not the primary is attached, which
+ * is why step 2 ends its walk with `break` rather than `return`. Only the
+ * sibling walk is bounded; ending the generator there would skip the stash.
+ *
+ * This used to be a `return`, and the difference was invisible: with a
+ * detached primary `nextSibling` is `null`, so the walk never runs and
+ * control reaches the stash regardless. Attaching the primary made the very
+ * first sibling a boundary comment, which ended the generator before the
+ * stash was consulted and left the item's child placeholders unreplaced.
+ * Measured, not deduced — and note this is NOT the failure the earlier
+ * comment here described: the walk never ran past the item into a
+ * neighbouring one, it stopped correctly and then gave up too early.
  */
 /**
  * Find an element matching `selector` within an item's range. Searches

package/dist/runtime/qsa-item.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"qsa-item.d.ts","sourceRoot":"","sources":["../../src/runtime/qsa-item.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAsCH;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAQnF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EACrB,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,GAC3B,WAAW,GAAG,IAAI,CAuBpB"}
+{"version":3,"file":"qsa-item.d.ts","sourceRoot":"","sources":["../../src/runtime/qsa-item.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AA4CH;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,SAAS,EAAE,OAAO,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAQnF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,OAAO,EAClB,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC9B,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,EACrB,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,GAC3B,WAAW,GAAG,IAAI,CAuBpB"}

package/dist/runtime/standalone.js

@@ -1767,6 +1767,14 @@ function takeRowMountPoint() {
   _rowMountPoint = null;
   return p;
 }
+function mountRowRoot(el) {
+  const p = takeRowMountPoint();
+  if (p) {
+    p.container.insertBefore(el, p.anchor);
+    p.mounted = el;
+  }
+  return el;
+}
 function createComponent(nameOrDef, props = {}, key, slot, mountAt) {
   const element = materializeComponent(nameOrDef, props, key, slot, mountAt);
   if (mountAt && mountAt.parentNode && element !== mountAt) {
@@ -1810,12 +1818,13 @@ function materializeComponent(nameOrDef, props = {}, key, slot, mountAt) {
   });
   const def = getRegisteredDef(name);
   const isCommentWrapper = def?.comment === true;
-  const scopeId = isCommentWrapper ? null : `${name}_${generateId()}`;
+  const derivedScopeId = slot?.parent && slot.mount ? `${slot.parent}_${slot.mount}` : null;
+  const scopeId = isCommentWrapper ? null : derivedScopeId ?? `${name}_${generateId()}`;
   const prevParentScopeId = _parentScopeId;
-  if (slot?.parent) {
-    _parentScopeId = slot.parent;
-  } else if (scopeId) {
+  if (scopeId) {
     _parentScopeId = scopeId;
+  } else if (slot?.parent) {
+    _parentScopeId = slot.parent;
   }
   let html;
   try {
@@ -1883,7 +1892,8 @@ function renderChild(name, props, key, slotSuffix) {
   if (!templateFn) {
     return `<div ${bfsAttr}${slotAttrs}${keyAttr}></div>`;
   }
-  let html = templateFn(props).trim().replace(PLACEHOLDER_ATTR_PATTERN, _parentScopeId ? ` bf-s="${_parentScopeId}"` : "");
+  const raw = templateFn(props);
+  let html = raw.trim().replace(PLACEHOLDER_ATTR_PATTERN, _parentScopeId ? ` bf-s="${_parentScopeId}"` : "");
   const firstElMatch = html.match(/<(\w+)/);
   if (!firstElMatch)
     return html;
@@ -2144,7 +2154,7 @@ function* itemRootElements(primaryEl) {
     if (n.nodeType === Node.COMMENT_NODE) {
       const v = n.nodeValue ?? "";
       if (v === BF_LOOP_ITEM || v === BF_LOOP_START || v.startsWith(startPrefix) || v === BF_LOOP_END || v.startsWith(endPrefix)) {
-        return;
+        break;
       }
     } else if (n.nodeType === Node.ELEMENT_NODE) {
       yield n;
@@ -2316,9 +2326,16 @@ function createItemScope(item, index, renderItem, existingPrimary, existingExtra
     const prevRowMount = ownsRowMount ? setRowMountPoint(rowMount) : null;
     try {
       primaryEl = renderItem(itemAccessor, index, existingPrimary);
+    } catch (err) {
+      const parked = rowMount?.mounted;
+      if (parked?.parentNode)
+        parked.remove();
+      throw err;
     } finally {
       if (ownsRowMount)
         setRowMountPoint(prevRowMount);
+      if (rowMount)
+        rowMount.mounted = null;
     }
     if (existingPrimary) {
       extras = existingExtras ?? [];
@@ -3647,6 +3664,7 @@ export {
   parseHTML,
   onMount,
   onCleanup,
+  mountRowRoot,
   mapArrayLazy,
   mapArrayAnchored,
   mapArray,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/client",
-  "version": "0.28.1",
+  "version": "0.30.0",
   "description": "BarefootJS client package: reactive primitives (SSR-safe) plus browser runtime under the `/runtime` subpath (compiler target)",
   "type": "module",
   "main": "./dist/index.js",
@@ -55,7 +55,7 @@
     "directory": "packages/client"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.28.1"
+    "@barefootjs/shared": "0.30.0"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"

package/src/runtime/component.ts

@@ -25,8 +25,14 @@ export function setParentScopeId(id: string | null): void {
   _parentScopeId = id
 }
 
-/** Where `mapArray` wants a fresh loop row connected before its `init` runs. */
-export type RowMountPoint = { container: Node; anchor: Node | null }
+/**
+ * Where `mapArray` wants a fresh loop row connected before its `init` runs.
+ *
+ * `mounted` is written back by `mountRowRoot` so the caller can undo the
+ * connection if the rest of the row's body then throws — see `createItemScope`.
+ * Without it a half-built row stays visible, which detached rows never did.
+ */
+export type RowMountPoint = { container: Node; anchor: Node | null; mounted?: Element | null }
 
 // Ambient mount point for a loop row.
 //
@@ -60,6 +66,35 @@ function takeRowMountPoint(): RowMountPoint | null {
   return p
 }
 
+/**
+ * Connect a loop row whose root is a template clone, before the emitted
+ * renderItem body's tail runs.
+ *
+ * The tail is where the row's nested children initialise (`upsertChild` and
+ * friends), and `useContext` resolves by walking `parentElement` — so a child
+ * that inits inside a detached row finds no ancestors and falls through to the
+ * global last-writer-wins context store, reading whichever provider on the page
+ * wrote last. `createComponent` row roots already avoid this by consuming the
+ * same ambient (step 7b); a clone root has no runtime function in the middle,
+ * so the compiler emits this call for it instead.
+ *
+ * Take-and-clear, like the `createComponent` path: a nested `createComponent`
+ * driven by this row's own children must not re-use the row's mount point.
+ *
+ * No-op when there is no ambient point — the hydration branch never calls this
+ * (its row came from SSR markup and is already in the document), and a loop
+ * runtime that does not hand one down leaves the row exactly as it was.
+ */
+export function mountRowRoot(el: Element): Element {
+  const p = takeRowMountPoint()
+  if (p) {
+    p.container.insertBefore(el, p.anchor)
+    // Record it so the row can be un-mounted if the body throws after this.
+    p.mounted = el
+  }
+  return el
+}
+
 /**
  * Create a component instance with DOM element and initialized state.
  *
@@ -200,9 +235,18 @@ function materializeComponent(
   // already the inner component's root with its own bf-s. Don't overwrite
   // it (scopeId stays null), or `$c(__scope, 's0')` from the wrapper's
   // init resolves to null.
+  //
+  // `slot` is only supplied by `upsertChild` / `upsertChildItem` mounting a
+  // component nested below a loop row root — the SSR reference (Hono)
+  // derives that child's `bf-s` from `${hostScope}_${mountSlot}` rather
+  // than randomizing it (#2444), so CSR must match or the primary
+  // `(bf-h, bf-m)` SSR-scope lookup never finds the CSR-created element.
+  // A row root itself is never passed a `slot`, so it keeps its own
+  // random id, matching the reference behaviour.
   const def = getRegisteredDef(name)
   const isCommentWrapper = def?.comment === true
-  const scopeId = isCommentWrapper ? null : `${name}_${generateId()}`
+  const derivedScopeId = slot?.parent && slot.mount ? `${slot.parent}_${slot.mount}` : null
+  const scopeId = isCommentWrapper ? null : (derivedScopeId ?? `${name}_${generateId()}`)
 
   // 5. Generate HTML from props.
   //
@@ -211,13 +255,18 @@ function materializeComponent(
   // bf-m on child components — matching the SSR convention so a later
   // `$c(scope, 'sN')` lookup resolves them. Without this, CSR-created
   // children carry a random prefix and their event handlers never wire
-  // up (#1627). `slot.parent` takes precedence so hoisted-children
-  // placeholders (#1320) still resolve to the calling site's scope.
+  // up (#1627). `scopeId` takes precedence over `slot.parent` — once a
+  // slotted component derives its OWN scope id (above), that derived id
+  // is what ITS children must nest under, not the grandparent's `slot.parent`
+  // (that used to collapse a third composition level back onto the second,
+  // #2444's `grandchild-composition` case). A comment wrapper keeps
+  // `scopeId === null` and falls through to `slot?.parent`, preserving the
+  // hoisted-children placeholder resolution (#1320).
   const prevParentScopeId = _parentScopeId
-  if (slot?.parent) {
-    _parentScopeId = slot.parent
-  } else if (scopeId) {
+  if (scopeId) {
     _parentScopeId = scopeId
+  } else if (slot?.parent) {
+    _parentScopeId = slot.parent
   }
   let html: string
   try {
@@ -381,11 +430,31 @@ export function renderChild(
     return `<div ${bfsAttr}${slotAttrs}${keyAttr}></div>`
   }
 
+  // NOTE: does NOT push `_parentScopeId` to this child's own derived scope
+  // while `templateFn` evaluates. That was tried (deriving a GRANDCHILD's
+  // scope from this scope rather than the caller's, to fix a third
+  // composition level collapsing onto the second — `grandchild-composition`)
+  // but it collides with `comment: true` wrapper transparency (#1211
+  // synthesized inline-JSX-callback wrappers, e.g. a `renderNode` callback
+  // prop): such a wrapper's OWN scope element IS its single child's element,
+  // and its init resolves itself via `$c(scope, 's0')`'s short-suffix
+  // self-match fallback (`query.ts`'s `$cSingle`). Pushing this scope makes
+  // a nested descendant of that SAME child derive `..._s0_s0` whenever the
+  // descendant's own first slot id also happens to be `s0` — the PRECISE
+  // suffix match then finds that unrelated descendant instead of falling
+  // through to the self-match, silently misrouting `initChild` (confirmed
+  // via `site/ui`'s xyflow Highlight-Depth demo, where this broke the
+  // `--node-glow` style effect). `grandchild-composition` stays a known
+  // limitation (CSR conformance skip) until the self-match lookup can be
+  // made unambiguous against a nested descendant sharing the same slot
+  // suffix.
+  const raw = templateFn(props)
+
   // The placeholder substitution is anchored to the exact `bf-s="…"`
   // shape so user content that contains the sentinel as text survives
   // unchanged. When `_parentScopeId` is null (top-level render) the
   // attribute strips rather than emitting `bf-s=""`. (#1320)
-  let html = templateFn(props).trim().replace(
+  let html = raw.trim().replace(
     PLACEHOLDER_ATTR_PATTERN,
     _parentScopeId ? ` bf-s="${_parentScopeId}"` : '',
   )

package/src/runtime/index.ts

@@ -99,6 +99,7 @@ export { registerTemplate, getTemplate, hasTemplate, type TemplateFn } from './t
 // Component creation
 export {
   createComponent,
+  mountRowRoot,
   renderChild,
   parseHTML,
   escapeAttr,

package/src/runtime/map-array.ts

@@ -20,7 +20,7 @@
 
 import { createSignal, createEffect, createRoot } from '@barefootjs/client/reactive'
 import { hydratedScopes } from './hydration-state.ts'
-import { setRowMountPoint } from './component.ts'
+import { setRowMountPoint, type RowMountPoint } from './component.ts'
 import {
   BF_KEY,
   BF_LOOP_START,
@@ -234,7 +234,7 @@ function createItemScope<T>(
   existingPrimary?: HTMLElement,
   existingExtras?: HTMLElement[],
   existingStart?: Comment | null,
-  rowMount?: { container: Node; anchor: Node | null } | null,
+  rowMount?: RowMountPoint | null,
 ): ItemScope<T> {
   let primaryEl!: HTMLElement
   let dispose!: () => void
@@ -246,10 +246,11 @@ function createItemScope<T>(
     dispose = d
     const [itemAccessor, itemSetter] = createSignal(item)
     setItem = itemSetter
-    // Fresh row: hand the mount point to the row's own `createComponent` so
-    // its `init` observes a connected element. A renderItem body that clones a
-    // template instead of calling `createComponent` (composite / plain loops)
-    // leaves it unconsumed, hence the restore below rather than a plain clear.
+    // Fresh row: hand the mount point down so the row's own root — whether a
+    // `createComponent` call or a `mountRowRoot(clone)` — observes a connected
+    // element when the body's tail initialises its children. A body that does
+    // neither (a plain loop's clone) leaves the point unconsumed, hence the
+    // restore below rather than a plain clear.
     //
     // Only touch the ambient when we are the one setting it, and put back what
     // was there rather than `null`: this row's `init` can drive a nested
@@ -259,8 +260,16 @@ function createItemScope<T>(
     const prevRowMount = ownsRowMount ? setRowMountPoint(rowMount) : null
     try {
       primaryEl = renderItem(itemAccessor, index, existingPrimary)
+    } catch (err) {
+      // A row that connected itself and then failed to finish would stay
+      // visible as a half-built row. Detached rows never could, so undo the
+      // connection before rethrowing and keep the failure mode as it was.
+      const parked = rowMount?.mounted
+      if (parked?.parentNode) parked.remove()
+      throw err
     } finally {
       if (ownsRowMount) setRowMountPoint(prevRowMount)
+      if (rowMount) rowMount.mounted = null
     }
     if (existingPrimary) {
       extras = existingExtras ?? []

package/src/runtime/qsa-item.ts

@@ -20,18 +20,22 @@
  *      cannot escape into a neighbouring item or into nodes outside the
  *      loop.
  *   3. The CSR-only `__bfExtras` stash. During renderItem-body setup
- *      (between the template clone and the function's return), the
- *      primary and extras are still detached nodes — `__el.nextSibling`
- *      is `null` and step 2 yields nothing. Reading `__bfExtras` lets
- *      lookups reach the still-pending extras before `mapArray` inserts
- *      them into the DOM.
+ *      (between the template clone and the function's return), the extras
+ *      are not siblings yet. Reading `__bfExtras` lets lookups reach them
+ *      before `mapArray` inserts them into the DOM.
  *
- * Step 3's reliance on the primary being detached during setup is why
- * `createItemScope` un-parks a row that turns out to carry extras: the
- * connect-before-init mount point applies to `createComponent` row roots,
- * which are single-root by construction and so never reach this module. An
- * attached primary would make step 2's sibling walk run past the item's own
- * roots into a neighbouring item's elements before step 3 is ever consulted.
+ * Step 3 must stay reachable whether or not the primary is attached, which
+ * is why step 2 ends its walk with `break` rather than `return`. Only the
+ * sibling walk is bounded; ending the generator there would skip the stash.
+ *
+ * This used to be a `return`, and the difference was invisible: with a
+ * detached primary `nextSibling` is `null`, so the walk never runs and
+ * control reaches the stash regardless. Attaching the primary made the very
+ * first sibling a boundary comment, which ended the generator before the
+ * stash was consulted and left the item's child placeholders unreplaced.
+ * Measured, not deduced — and note this is NOT the failure the earlier
+ * comment here described: the walk never ran past the item into a
+ * neighbouring one, it stopped correctly and then gave up too early.
  */
 
 import { BF_LOOP_ITEM, BF_LOOP_START, BF_LOOP_END } from '@barefootjs/shared'
@@ -51,10 +55,16 @@ function* itemRootElements(primaryEl: Element): Iterable<Element> {
       // Hard stops: another item starts, or the loop range ends. The
       // BF_LOOP_START check defends against a sibling loop block whose
       // start marker happens to follow ours.
+      // `break`, not `return`: stop the SIBLING walk, but still fall through
+      // to the `__bfExtras` stash below. A `return` ends the generator, and
+      // the stash is the only way to reach extras that are not siblings yet.
+      // That difference is invisible while the primary is detached — then
+      // `nextSibling` is `null`, this loop never runs, and control reaches the
+      // stash anyway — and decides the outcome the moment it is attached.
       if (v === BF_LOOP_ITEM
           || v === BF_LOOP_START || v.startsWith(startPrefix)
           || v === BF_LOOP_END || v.startsWith(endPrefix)) {
-        return
+        break
       }
     } else if (n.nodeType === Node.ELEMENT_NODE) {
       yield n as Element