@barefootjs/client 0.20.0 → 0.21.2

package/dist/runtime/date.d.ts

@@ -0,0 +1,25 @@
+/**
+ * Client-side runtime for the catalogued `Date` lowering (#2274, #2292).
+ *
+ * The compiler lowers a Date-typed prop's zero-arg accessor call
+ * (`createdAt.toISOString()`, matched by `datePlugin` /
+ * `DATE_METHODS` in `packages/jsx/src/date-lowering.ts`) to
+ * `date(recv, "op")` on every backend. Each backend's `date` runtime
+ * helper must agree byte-for-byte on the dispatched value — the shared
+ * oracle is the `date` reference function in
+ * `packages/adapter-tests/vectors/cases.ts`.
+ *
+ * The CLIENT receiver shape differs from the SSR/oracle one: props are
+ * JSON round-tripped with no type-aware revival
+ * (`packages/client/src/runtime/hydrate.ts` `parseProps`), so a
+ * `Date`-typed prop arrives at hydration as its `toJSON()` ISO string,
+ * not a real `Date` instance. `recv` is therefore either:
+ *   - a real `Date` (e.g. a value constructed client-side), or
+ *   - an ISO-8601 string (the hydrated-prop case).
+ * (No `{$date: ...}` envelope — that shape is test/oracle-only, never a
+ * runtime value.) Both are coerced via `new Date(recv)`; a nil or
+ * unparseable receiver degrades to the same zero value every backend
+ * documents ('' for toISOString, 0 otherwise) instead of throwing.
+ */
+export declare function date(recv: unknown, op: string): string | number;
+//# sourceMappingURL=date.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"date.d.ts","sourceRoot":"","sources":["../../src/runtime/date.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,IAAI,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAM/D"}

package/dist/runtime/index.d.ts

@@ -17,6 +17,7 @@ export { applyRestAttrs } from './apply-rest-attrs.ts';
 export { spreadAttrs } from './spread-attrs.ts';
 export { styleToCss } from './style.ts';
 export { findScope, find, $, $c, $t, qsa, qsaChildScope, qsaChildScopes, cssEscape, tAfter } from './query.ts';
+export { date } from './date.ts';
 export { hydrate, rehydrateAll, rehydrateScope, disposeScope, flushHydration, getRegisteredDef } from './hydrate.ts';
 export { registerComponent, getComponentInit, initChild, upsertChild } from './registry.ts';
 export { insert, type BranchConfig, type BranchTemplateResult } from './insert.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

@@ -174,6 +174,7 @@ var BF_PORTAL_ID = "bf-pi";
 var BF_PORTAL_PLACEHOLDER = "bf-pp";
 var BF_PARENT_OWNED_PREFIX = "^";
 var BF_SCOPE_COMMENT_PREFIX = "bf-scope:";
+var BF_SCOPE_COMMENT_END_PREFIX = "bf-/scope:";
 var BF_LOOP_START = "bf-loop";
 var BF_LOOP_END = "bf-/loop";
 var BF_LOOP_ITEM = "bf-loop-i";
@@ -494,7 +495,15 @@ function getPortalScopeId(element) {
   return info?.scopeId ?? null;
 }
 function getCommentScopeBoundary(commentNode) {
-  const isLoopItem = commentNode.nodeValue?.startsWith(`${BF_LOOP_ITEM}:`) ?? false;
+  const anchorValue = commentNode.nodeValue ?? "";
+  const isLoopItem = anchorValue.startsWith(`${BF_LOOP_ITEM}:`);
+  let endValue = null;
+  if (!isLoopItem && anchorValue.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+    const rest = anchorValue.slice(BF_SCOPE_COMMENT_PREFIX.length);
+    const pipeIdx = rest.indexOf("|");
+    endValue = BF_SCOPE_COMMENT_END_PREFIX + (pipeIdx >= 0 ? rest.slice(0, pipeIdx) : rest);
+  }
+  let legacyBoundary = null;
   let node = commentNode.nextSibling;
   while (node) {
     if (node.nodeType === Node.COMMENT_NODE) {
@@ -503,13 +512,18 @@ function getCommentScopeBoundary(commentNode) {
         if (value.startsWith(`${BF_LOOP_ITEM}:`) || value.startsWith(`${BF_LOOP_END}:`)) {
           return node;
         }
-      } else if (value.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+      } else if (endValue && value === endValue) {
         return node;
+      } else if (value.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+        if (!endValue)
+          return node;
+        if (!legacyBoundary)
+          legacyBoundary = node;
       }
     }
     node = node.nextSibling;
   }
-  return null;
+  return legacyBoundary;
 }
 
 // src/runtime/query.ts
@@ -626,7 +640,41 @@ function belongsToScope(element, scope) {
   if (element.getAttribute(BF_SCOPE))
     return false;
   const nearestScope = element.closest(`[${BF_SCOPE}]`);
-  return nearestScope === scope;
+  if (nearestScope !== scope)
+    return false;
+  return !isInsideNestedCommentScope(element, scope);
+}
+function isInsideNestedCommentScope(element, scope) {
+  let current = element;
+  while (current !== scope) {
+    const parent = current.parentNode;
+    if (!parent)
+      return false;
+    if (isTopLevelCommentScopeNode(current))
+      return true;
+    current = parent;
+  }
+  return false;
+}
+function isTopLevelCommentScopeNode(node) {
+  const parent = node.parentNode;
+  if (!parent)
+    return false;
+  let depth = 0;
+  let sib = parent.firstChild;
+  while (sib) {
+    if (sib === node)
+      return depth > 0;
+    if (sib.nodeType === Node.COMMENT_NODE) {
+      const value = sib.nodeValue ?? "";
+      if (value.startsWith(BF_SCOPE_COMMENT_PREFIX))
+        depth++;
+      else if (value.startsWith(BF_SCOPE_COMMENT_END_PREFIX) && depth > 0)
+        depth--;
+    }
+    sib = sib.nextSibling;
+  }
+  return false;
 }
 function isInCommentScopeRange(element, commentNode) {
   const boundary = getCommentScopeBoundary(commentNode);
@@ -651,7 +699,8 @@ function find(scope, selector, ignoreScope) {
     if (commentInfo) {
       if (candidate.parentElement === commentInfo.commentNode.parentElement)
         return candidate;
-      if (!candidate.closest(`[${BF_SCOPE}]`))
+      const nearestScope = candidate.closest(`[${BF_SCOPE}]`);
+      if (!nearestScope || !isInCommentScopeRange(nearestScope, commentInfo.commentNode))
         return candidate;
     } else {
       if (belongsToScope(candidate, scope))
@@ -766,9 +815,48 @@ function $cSingle(scope, id) {
     }
     if (scope.matches?.(`[${BF_SCOPE}$="_${cleanId}"]`))
       return scope;
-    return null;
+    return findCommentChildScope(scope, parentScopeIds, cleanId);
+  }
+  return findChildScope(scope, `[${BF_SCOPE}$="_${cleanId}"]`) ?? findCommentChildScope(scope, [], cleanId);
+}
+function findCommentChildScope(scope, parentIds, slotId) {
+  for (const comment of commentsInScope(scope)) {
+    const id = parseCommentScopeId(comment.nodeValue ?? "", BF_SCOPE_COMMENT_PREFIX);
+    if (!id)
+      continue;
+    const matches = parentIds.length > 0 ? parentIds.some((parentId) => id === `${parentId}_${slotId}`) : id.endsWith(`_${slotId}`) && !NESTED_SLOT_SUFFIX.test(id);
+    if (!matches)
+      continue;
+    const proxyEl = nextElementSibling(comment) ?? comment.parentElement;
+    if (!proxyEl)
+      return null;
+    commentScopeRegistry.set(proxyEl, { commentNode: comment, scopeId: id });
+    return proxyEl;
+  }
+  return null;
+}
+function* commentsInScope(scope) {
+  const commentInfo = commentScopeRegistry.get(scope);
+  if (commentInfo) {
+    const boundary = getCommentScopeBoundary(commentInfo.commentNode);
+    let node = commentInfo.commentNode.nextSibling;
+    while (node && node !== boundary) {
+      if (node.nodeType === Node.COMMENT_NODE) {
+        yield node;
+      } else if (node.nodeType === Node.ELEMENT_NODE) {
+        yield* commentsUnder(node);
+      }
+      node = node.nextSibling;
+    }
+    return;
+  }
+  yield* commentsUnder(scope);
+}
+function* commentsUnder(root) {
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_COMMENT);
+  while (walker.nextNode()) {
+    yield walker.currentNode;
   }
-  return findChildScope(scope, `[${BF_SCOPE}$="_${cleanId}"]`);
 }
 function findChildScope(scope, selector) {
   if (scope.matches?.(selector))
@@ -868,7 +956,10 @@ function findSsrScopeBySlotIn(parent, slotId, anchorScope, selfMatch) {
   const suffixSelector = `[${BF_SCOPE}$="_${slotId}"]`;
   if (selfMatch && parent.matches(suffixSelector))
     return parent;
-  return parent.querySelector(suffixSelector);
+  const bySuffix = parent.querySelector(suffixSelector);
+  if (bySuffix)
+    return bySuffix;
+  return findCommentChildScope(parent, parentBfs ? [parentBfs] : [], slotId);
 }
 
 // src/runtime/registry.ts
@@ -2280,6 +2371,16 @@ function spreadAttrs(obj) {
   }
   return parts.join(" ");
 }
+// src/runtime/date.ts
+function date(recv, op) {
+  const zero = op === "toISOString" ? "" : 0;
+  if (recv === null || recv === undefined)
+    return zero;
+  const d = recv instanceof Date ? recv : new Date(recv);
+  if (Number.isNaN(d.getTime()))
+    return zero;
+  return d[op]();
+}
 // src/runtime/insert.ts
 import { createEffect as createEffect3, untrack as untrack2 } from "@barefootjs/client/reactive";
 function makeRegion(scope) {
@@ -2676,6 +2777,7 @@ function render(container, nameOrDef, props = {}) {
   for (const node of Array.from(tpl.content.childNodes)) {
     container.appendChild(node);
   }
+  container.appendChild(document.createComment(`${BF_SCOPE_COMMENT_END_PREFIX}${scopeId}`));
   const proxyEl = rootElements[0];
   commentScopeRegistry.set(proxyEl, { commentNode, scopeId });
   init(proxyEl, props);
@@ -2756,6 +2858,7 @@ export {
   escapeAttr,
   endTurn,
   disposeScope,
+  date,
   cssEscape,
   createSignal2 as createSignal,
   createSelector,

package/dist/runtime/query.d.ts

@@ -74,6 +74,30 @@ export declare function $(scope: Element | null, ...ids: string[]): (Element | n
  * Always returns an array — callers use destructuring.
  */
 export declare function $c(scope: Element | null, ...ids: string[]): (Element | null)[];
+/**
+ * Resolve a comment-anchored child scope (fragment-root child, #2289).
+ *
+ * A child component whose root is a JSX Fragment has no element carrying
+ * `bf-s`/`bf-h`/`bf-m` — its scope is declared by a
+ * `<!--bf-scope:<parentId>_<slotId>|h=...|m=...-->` comment. The element
+ * selectors in `$cSingle` / `findSsrScopeBySlotIn` can never match it, so
+ * without this fallback the parent's `initChild(...)` receives `null` and
+ * the child is never initialized: every callback prop dies silently and
+ * no reactive update ever reaches the child.
+ *
+ * Matches on the scope id embedded in the comment (`<parentId>_<slotId>`,
+ * the same convention the element path's `[bf-s$="<parentId>_<slotId>"]`
+ * selector relies on) rather than on the `|h=`/`|m=` segments — the scope
+ * id is the first `|`-free token, so matching it cannot be confused by
+ * props JSON that happens to contain `|h=`.
+ *
+ * On match, the proxy element (first element sibling after the comment,
+ * falling back to the comment's parent) is registered in
+ * `commentScopeRegistry` so the child's own `$`/`$t` queries walk the
+ * comment range — the same wiring `hydrateCommentScope` performs for
+ * walker-owned root fragments.
+ */
+export declare function findCommentChildScope(scope: Element, parentIds: readonly string[], slotId: string): Element | null;
 /**
  * Find Text nodes for reactive text expressions marked by comment nodes.
  * Expects marker format: <!--bf:sX-->text<!--/-->

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

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/runtime/query.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,sFAAsF;AACtF,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAGJ,CAAA;AAqCnC;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,EACjC,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,GAAG,IAAI,CAoDhB;AA6HD;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAClB,KAAK,EAAE,OAAO,GAAG,IAAI,EACrB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,GAAG,IAAI,CA2BhB;AAuBD;;;;;;;GAOG;AACH,wBAAgB,GAAG,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CA0BxE;AA+CD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAU9E;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,CAO1E;AAED;;;;;;;;GAQG;AACH,wBAAgB,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAO7E;AAED;;;;;GAKG;AACH,wBAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAE9E;AA+FD;;;;;;;GAOG;AACH,wBAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAkC3E;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAS3D;AAED,OAAO,EAAE,oBAAoB,IAAI,MAAM,EAAE,CAAA"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/runtime/query.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,sFAAsF;AACtF,eAAO,MAAM,SAAS,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAGJ,CAAA;AAqCnC;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,OAAO,GAAG,QAAQ,GAAG,IAAI,EACjC,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,GAAG,IAAI,CAoDhB;AAiLD;;;;;;;;;;GAUG;AACH,wBAAgB,IAAI,CAClB,KAAK,EAAE,OAAO,GAAG,IAAI,EACrB,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,OAAO,GACpB,OAAO,GAAG,IAAI,CAiChB;AAuBD;;;;;;;GAOG;AACH,wBAAgB,GAAG,CAAC,EAAE,EAAE,OAAO,GAAG,IAAI,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CA0BxE;AA+CD;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,IAAI,CAU9E;AAED;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,EAAE,CAO1E;AAED;;;;;;;;GAQG;AACH,wBAAgB,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAO7E;AAED;;;;;GAKG;AACH,wBAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAE9E;AAkDD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,OAAO,EACd,SAAS,EAAE,SAAS,MAAM,EAAE,EAC5B,MAAM,EAAE,MAAM,GACb,OAAO,GAAG,IAAI,CAehB;AAmFD;;;;;;;GAOG;AACH,wBAAgB,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC,EAAE,CAkC3E;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAS3D;AAED,OAAO,EAAE,oBAAoB,IAAI,MAAM,EAAE,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/runtime/render.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,OAAO,KAAK,EAAE,YAAY,EAAU,MAAM,YAAY,CAAA;AAEtD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,MAAM,CACpB,SAAS,EAAE,WAAW,EACtB,SAAS,EAAE,MAAM,GAAG,YAAY,EAChC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,IAAI,CAiFN"}
+{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../src/runtime/render.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAQH,OAAO,KAAK,EAAE,YAAY,EAAU,MAAM,YAAY,CAAA;AAEtD;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AACH,wBAAgB,MAAM,CACpB,SAAS,EAAE,WAAW,EACtB,SAAS,EAAE,MAAM,GAAG,YAAY,EAChC,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAClC,IAAI,CAoFN"}

package/dist/runtime/scope.d.ts

@@ -24,8 +24,12 @@ export declare function getPortalScopeId(element: Element): string | null;
  * Find the end boundary for a comment-based scope.
  *
  * The boundary depends on the anchor's kind:
- *  - `bf-scope:` anchor (fragment-root component): boundary is the next
- *    `bf-scope:` comment or the end of the parent's children (unchanged).
+ *  - `bf-scope:` anchor (fragment-root component): boundary is this scope's
+ *    own `bf-/scope:<scopeId>` end marker when present (#2289). Without one
+ *    (SSR HTML from an adapter runtime predating the end marker), fall back
+ *    to the next `bf-scope:` comment or the end of the parent's children —
+ *    the historical heuristic, which over-extends the range past the
+ *    fragment's real last root.
  *  - `bf-loop-i:<key>` anchor (loop item, #1665): boundary is the next
  *    loop-item anchor (`bf-loop-i:*`) or the loop end marker (`bf-/loop:*`),
  *    so one item's range never bleeds into the next item or past the loop.

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

@@ -1 +1 @@
-{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../src/runtime/scope.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,oCAA2C,CAAA;AAE5E;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGhE;AAED;;;;;;;;;GASG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,CAiBzE"}
+{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../src/runtime/scope.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,OAAO,CAAA;IACpB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,oCAA2C,CAAA;AAE5E;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAGhE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CAAC,WAAW,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,CAqCzE"}

package/dist/runtime/slot-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"slot-resolver.d.ts","sourceRoot":"","sources":["../../src/runtime/slot-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH;;gEAEgE;AAChE,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,MAAM,CAInF;AAED;;;;6BAI6B;AAC7B,wBAAgB,aAAa,CAC3B,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,GAC3B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAEnC;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EACvC,SAAS,EAAE,OAAO,GACjB,WAAW,GAAG,IAAI,CAapB"}
+{"version":3,"file":"slot-resolver.d.ts","sourceRoot":"","sources":["../../src/runtime/slot-resolver.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH;;gEAEgE;AAChE,wBAAgB,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,GAAG,MAAM,CAInF;AAED;;;;6BAI6B;AAC7B,wBAAgB,aAAa,CAC3B,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,OAAO,GAAG,IAAI,GAC3B;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAEnC;AAED;;;;;;;;;GASG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,OAAO,GAAG,IAAI,GAAG,SAAS,EACvC,SAAS,EAAE,OAAO,GACjB,WAAW,GAAG,IAAI,CAsBpB"}

package/dist/runtime/standalone.js

@@ -10,6 +10,7 @@ var BF_PORTAL_ID = "bf-pi";
 var BF_PORTAL_PLACEHOLDER = "bf-pp";
 var BF_PARENT_OWNED_PREFIX = "^";
 var BF_SCOPE_COMMENT_PREFIX = "bf-scope:";
+var BF_SCOPE_COMMENT_END_PREFIX = "bf-/scope:";
 var BF_LOOP_START = "bf-loop";
 var BF_LOOP_END = "bf-/loop";
 var BF_LOOP_ITEM = "bf-loop-i";
@@ -902,7 +903,15 @@ function getPortalScopeId(element) {
   return info?.scopeId ?? null;
 }
 function getCommentScopeBoundary(commentNode) {
-  const isLoopItem = commentNode.nodeValue?.startsWith(`${BF_LOOP_ITEM}:`) ?? false;
+  const anchorValue = commentNode.nodeValue ?? "";
+  const isLoopItem = anchorValue.startsWith(`${BF_LOOP_ITEM}:`);
+  let endValue = null;
+  if (!isLoopItem && anchorValue.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+    const rest = anchorValue.slice(BF_SCOPE_COMMENT_PREFIX.length);
+    const pipeIdx = rest.indexOf("|");
+    endValue = BF_SCOPE_COMMENT_END_PREFIX + (pipeIdx >= 0 ? rest.slice(0, pipeIdx) : rest);
+  }
+  let legacyBoundary = null;
   let node = commentNode.nextSibling;
   while (node) {
     if (node.nodeType === Node.COMMENT_NODE) {
@@ -911,13 +920,18 @@ function getCommentScopeBoundary(commentNode) {
         if (value.startsWith(`${BF_LOOP_ITEM}:`) || value.startsWith(`${BF_LOOP_END}:`)) {
           return node;
         }
-      } else if (value.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+      } else if (endValue && value === endValue) {
         return node;
+      } else if (value.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+        if (!endValue)
+          return node;
+        if (!legacyBoundary)
+          legacyBoundary = node;
       }
     }
     node = node.nextSibling;
   }
-  return null;
+  return legacyBoundary;
 }
 
 // src/runtime/query.ts
@@ -1034,7 +1048,41 @@ function belongsToScope(element, scope) {
   if (element.getAttribute(BF_SCOPE))
     return false;
   const nearestScope = element.closest(`[${BF_SCOPE}]`);
-  return nearestScope === scope;
+  if (nearestScope !== scope)
+    return false;
+  return !isInsideNestedCommentScope(element, scope);
+}
+function isInsideNestedCommentScope(element, scope) {
+  let current = element;
+  while (current !== scope) {
+    const parent = current.parentNode;
+    if (!parent)
+      return false;
+    if (isTopLevelCommentScopeNode(current))
+      return true;
+    current = parent;
+  }
+  return false;
+}
+function isTopLevelCommentScopeNode(node) {
+  const parent = node.parentNode;
+  if (!parent)
+    return false;
+  let depth = 0;
+  let sib = parent.firstChild;
+  while (sib) {
+    if (sib === node)
+      return depth > 0;
+    if (sib.nodeType === Node.COMMENT_NODE) {
+      const value = sib.nodeValue ?? "";
+      if (value.startsWith(BF_SCOPE_COMMENT_PREFIX))
+        depth++;
+      else if (value.startsWith(BF_SCOPE_COMMENT_END_PREFIX) && depth > 0)
+        depth--;
+    }
+    sib = sib.nextSibling;
+  }
+  return false;
 }
 function isInCommentScopeRange(element, commentNode) {
   const boundary = getCommentScopeBoundary(commentNode);
@@ -1059,7 +1107,8 @@ function find(scope, selector, ignoreScope) {
     if (commentInfo) {
       if (candidate.parentElement === commentInfo.commentNode.parentElement)
         return candidate;
-      if (!candidate.closest(`[${BF_SCOPE}]`))
+      const nearestScope = candidate.closest(`[${BF_SCOPE}]`);
+      if (!nearestScope || !isInCommentScopeRange(nearestScope, commentInfo.commentNode))
         return candidate;
     } else {
       if (belongsToScope(candidate, scope))
@@ -1174,9 +1223,48 @@ function $cSingle(scope, id) {
     }
     if (scope.matches?.(`[${BF_SCOPE}$="_${cleanId}"]`))
       return scope;
-    return null;
+    return findCommentChildScope(scope, parentScopeIds, cleanId);
+  }
+  return findChildScope(scope, `[${BF_SCOPE}$="_${cleanId}"]`) ?? findCommentChildScope(scope, [], cleanId);
+}
+function findCommentChildScope(scope, parentIds, slotId) {
+  for (const comment of commentsInScope(scope)) {
+    const id = parseCommentScopeId(comment.nodeValue ?? "", BF_SCOPE_COMMENT_PREFIX);
+    if (!id)
+      continue;
+    const matches = parentIds.length > 0 ? parentIds.some((parentId) => id === `${parentId}_${slotId}`) : id.endsWith(`_${slotId}`) && !NESTED_SLOT_SUFFIX.test(id);
+    if (!matches)
+      continue;
+    const proxyEl = nextElementSibling(comment) ?? comment.parentElement;
+    if (!proxyEl)
+      return null;
+    commentScopeRegistry.set(proxyEl, { commentNode: comment, scopeId: id });
+    return proxyEl;
+  }
+  return null;
+}
+function* commentsInScope(scope) {
+  const commentInfo = commentScopeRegistry.get(scope);
+  if (commentInfo) {
+    const boundary = getCommentScopeBoundary(commentInfo.commentNode);
+    let node = commentInfo.commentNode.nextSibling;
+    while (node && node !== boundary) {
+      if (node.nodeType === Node.COMMENT_NODE) {
+        yield node;
+      } else if (node.nodeType === Node.ELEMENT_NODE) {
+        yield* commentsUnder(node);
+      }
+      node = node.nextSibling;
+    }
+    return;
+  }
+  yield* commentsUnder(scope);
+}
+function* commentsUnder(root) {
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_COMMENT);
+  while (walker.nextNode()) {
+    yield walker.currentNode;
   }
-  return findChildScope(scope, `[${BF_SCOPE}$="_${cleanId}"]`);
 }
 function findChildScope(scope, selector) {
   if (scope.matches?.(selector))
@@ -1276,7 +1364,10 @@ function findSsrScopeBySlotIn(parent, slotId, anchorScope, selfMatch) {
   const suffixSelector = `[${BF_SCOPE}$="_${slotId}"]`;
   if (selfMatch && parent.matches(suffixSelector))
     return parent;
-  return parent.querySelector(suffixSelector);
+  const bySuffix = parent.querySelector(suffixSelector);
+  if (bySuffix)
+    return bySuffix;
+  return findCommentChildScope(parent, parentBfs ? [parentBfs] : [], slotId);
 }
 
 // src/runtime/registry.ts
@@ -2682,6 +2773,16 @@ function spreadAttrs(obj) {
   }
   return parts.join(" ");
 }
+// src/runtime/date.ts
+function date(recv, op) {
+  const zero = op === "toISOString" ? "" : 0;
+  if (recv === null || recv === undefined)
+    return zero;
+  const d = recv instanceof Date ? recv : new Date(recv);
+  if (Number.isNaN(d.getTime()))
+    return zero;
+  return d[op]();
+}
 // src/runtime/insert.ts
 function makeRegion(scope) {
   if (scope.nodeType === Node.COMMENT_NODE) {
@@ -3076,6 +3177,7 @@ function render(container, nameOrDef, props = {}) {
   for (const node of Array.from(tpl.content.childNodes)) {
     container.appendChild(node);
   }
+  container.appendChild(document.createComment(`${BF_SCOPE_COMMENT_END_PREFIX}${scopeId}`));
   const proxyEl = rootElements[0];
   commentScopeRegistry.set(proxyEl, { commentNode, scopeId });
   init(proxyEl, props);
@@ -3156,6 +3258,7 @@ export {
   escapeAttr,
   endTurn,
   disposeScope,
+  date,
   cssEscape,
   createSignal,
   createSelector,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/client",
-  "version": "0.20.0",
+  "version": "0.21.2",
   "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.20.0"
+    "@barefootjs/shared": "0.21.2"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"

package/src/runtime/date.ts

@@ -0,0 +1,30 @@
+/**
+ * Client-side runtime for the catalogued `Date` lowering (#2274, #2292).
+ *
+ * The compiler lowers a Date-typed prop's zero-arg accessor call
+ * (`createdAt.toISOString()`, matched by `datePlugin` /
+ * `DATE_METHODS` in `packages/jsx/src/date-lowering.ts`) to
+ * `date(recv, "op")` on every backend. Each backend's `date` runtime
+ * helper must agree byte-for-byte on the dispatched value — the shared
+ * oracle is the `date` reference function in
+ * `packages/adapter-tests/vectors/cases.ts`.
+ *
+ * The CLIENT receiver shape differs from the SSR/oracle one: props are
+ * JSON round-tripped with no type-aware revival
+ * (`packages/client/src/runtime/hydrate.ts` `parseProps`), so a
+ * `Date`-typed prop arrives at hydration as its `toJSON()` ISO string,
+ * not a real `Date` instance. `recv` is therefore either:
+ *   - a real `Date` (e.g. a value constructed client-side), or
+ *   - an ISO-8601 string (the hydrated-prop case).
+ * (No `{$date: ...}` envelope — that shape is test/oracle-only, never a
+ * runtime value.) Both are coerced via `new Date(recv)`; a nil or
+ * unparseable receiver degrades to the same zero value every backend
+ * documents ('' for toISOString, 0 otherwise) instead of throwing.
+ */
+export function date(recv: unknown, op: string): string | number {
+  const zero = op === 'toISOString' ? '' : 0
+  if (recv === null || recv === undefined) return zero
+  const d = recv instanceof Date ? recv : new Date(recv as string | number)
+  if (Number.isNaN(d.getTime())) return zero
+  return (d as unknown as Record<string, () => string | number>)[op]()
+}

package/src/runtime/index.ts

@@ -103,6 +103,7 @@ export { styleToCss } from './style.ts'
 
 // Runtime helpers
 export { findScope, find, $, $c, $t, qsa, qsaChildScope, qsaChildScopes, cssEscape, tAfter } from './query.ts'
+export { date } from './date.ts'
 export { hydrate, rehydrateAll, rehydrateScope, disposeScope, flushHydration, getRegisteredDef } from './hydrate.ts'
 export { registerComponent, getComponentInit, initChild, upsertChild } from './registry.ts'
 export { insert, type BranchConfig, type BranchTemplateResult } from './insert.ts'

package/src/runtime/query.ts

@@ -8,7 +8,7 @@
 
 import { commentScopeRegistry, getCommentScopeBoundary } from './scope.ts'
 import { hydratedScopes } from './hydration-state.ts'
-import { BF_SCOPE, BF_SLOT, BF_PORTAL_OWNER, BF_PARENT_OWNED_PREFIX, BF_SCOPE_COMMENT_PREFIX } from '@barefootjs/shared'
+import { BF_SCOPE, BF_SLOT, BF_PORTAL_OWNER, BF_PARENT_OWNED_PREFIX, BF_SCOPE_COMMENT_PREFIX, BF_SCOPE_COMMENT_END_PREFIX } from '@barefootjs/shared'
 
 /** CSS attribute-value escape with a fallback for environments lacking CSS.escape. */
 export const cssEscape: (s: string) => string =
@@ -222,7 +222,59 @@ function belongsToScope(element: Element, scope: Element): boolean {
 
   // Check if nearest scope matches
   const nearestScope = element.closest(`[${BF_SCOPE}]`)
-  return nearestScope === scope
+  if (nearestScope !== scope) return false
+
+  // A fragment-rooted child mounted between `element` and `scope` has no
+  // `bf-s` element of its own (#2302) — `closest()` walks straight past it
+  // to `scope`, so a slot search on `scope` can wrongly claim a descendant
+  // that actually belongs to that nested child's comment scope. Reject it.
+  return !isInsideNestedCommentScope(element, scope)
+}
+
+/**
+ * True if some ancestor of `element` (strictly below `scope`) is a
+ * top-level node of a fragment-rooted child's `<!--bf-scope:...-->` range —
+ * i.e. `element` structurally belongs to a nested child component even
+ * though that child has no `bf-s`-attributed element for `.closest()` to
+ * stop at, and regardless of whether `commentScopeRegistry` has registered
+ * it yet (a parent's own slot lookups can run before its child-scope
+ * lookups register the child, #2302).
+ */
+function isInsideNestedCommentScope(element: Element, scope: Element): boolean {
+  let current: Node = element
+  while (current !== scope) {
+    const parent: Node | null = current.parentNode
+    if (!parent) return false
+    if (isTopLevelCommentScopeNode(current)) return true
+    current = parent
+  }
+  return false
+}
+
+/**
+ * True if `node` falls inside a `<!--bf-scope:...-->` … `<!--bf-/scope:...-->`
+ * range among its own siblings — i.e. `node` is (or is inside) a top-level
+ * element of a fragment-rooted child mounted as `node`'s sibling. Single
+ * left-to-right pass over the sibling list with a nesting depth counter, so
+ * a nested child's own begin/end pair doesn't prematurely close an outer
+ * one. Missing end markers (older SSR output) leave depth un-decremented,
+ * matching `getCommentScopeBoundary`'s legacy end-of-parent fallback.
+ */
+function isTopLevelCommentScopeNode(node: Node): boolean {
+  const parent = node.parentNode
+  if (!parent) return false
+  let depth = 0
+  let sib: Node | null = parent.firstChild
+  while (sib) {
+    if (sib === node) return depth > 0
+    if (sib.nodeType === Node.COMMENT_NODE) {
+      const value = (sib as Comment).nodeValue ?? ''
+      if (value.startsWith(BF_SCOPE_COMMENT_PREFIX)) depth++
+      else if (value.startsWith(BF_SCOPE_COMMENT_END_PREFIX) && depth > 0) depth--
+    }
+    sib = sib.nextSibling
+  }
+  return false
 }
 
 /**
@@ -271,10 +323,16 @@ export function find(
     if (ignoreScope) return candidate
     if (commentInfo) {
       // Comment scope: top-level siblings in the comment range are always
-      // accepted (even if they have bf-s, like proxy elements). Descendants
-      // are accepted only if not inside a nested bf-s scope.
+      // accepted (even if they have bf-s, like proxy elements). A descendant
+      // nested inside one of those siblings is accepted unless a *nested*
+      // child scope sits between it and this one — i.e. its nearest bf-s
+      // ancestor falls within this comment's own sibling range. An ancestor
+      // bf-s element outside that range doesn't disqualify the candidate:
+      // a fragment-root child mounted inside a normal parent island always
+      // has one, and `.closest()` alone can't tell the two apart (#2302).
       if (candidate.parentElement === commentInfo.commentNode.parentElement) return candidate
-      if (!candidate.closest(`[${BF_SCOPE}]`)) return candidate
+      const nearestScope = candidate.closest(`[${BF_SCOPE}]`)
+      if (!nearestScope || !isInCommentScopeRange(nearestScope, commentInfo.commentNode)) return candidate
     } else {
       if (belongsToScope(candidate, scope)) return candidate
     }
@@ -492,11 +550,91 @@ function $cSingle(scope: Element | null, id: string): Element | null {
     // Precise match found nothing. Check if scope itself matches the short suffix
     // (fragment root / inlined component where scope IS the child).
     if (scope.matches?.(`[${BF_SCOPE}$="_${cleanId}"]`)) return scope
-    return null
+    // Fragment-root child: no element carries the child's scope id — it is
+    // declared by a bf-scope: comment instead (#2289).
+    return findCommentChildScope(scope, parentScopeIds, cleanId)
   }
 
   // Fallback: no parent scope ID available — use short suffix match (best-effort)
   return findChildScope(scope, `[${BF_SCOPE}$="_${cleanId}"]`)
+    ?? findCommentChildScope(scope, [], cleanId)
+}
+
+/**
+ * Resolve a comment-anchored child scope (fragment-root child, #2289).
+ *
+ * A child component whose root is a JSX Fragment has no element carrying
+ * `bf-s`/`bf-h`/`bf-m` — its scope is declared by a
+ * `<!--bf-scope:<parentId>_<slotId>|h=...|m=...-->` comment. The element
+ * selectors in `$cSingle` / `findSsrScopeBySlotIn` can never match it, so
+ * without this fallback the parent's `initChild(...)` receives `null` and
+ * the child is never initialized: every callback prop dies silently and
+ * no reactive update ever reaches the child.
+ *
+ * Matches on the scope id embedded in the comment (`<parentId>_<slotId>`,
+ * the same convention the element path's `[bf-s$="<parentId>_<slotId>"]`
+ * selector relies on) rather than on the `|h=`/`|m=` segments — the scope
+ * id is the first `|`-free token, so matching it cannot be confused by
+ * props JSON that happens to contain `|h=`.
+ *
+ * On match, the proxy element (first element sibling after the comment,
+ * falling back to the comment's parent) is registered in
+ * `commentScopeRegistry` so the child's own `$`/`$t` queries walk the
+ * comment range — the same wiring `hydrateCommentScope` performs for
+ * walker-owned root fragments.
+ */
+export function findCommentChildScope(
+  scope: Element,
+  parentIds: readonly string[],
+  slotId: string,
+): Element | null {
+  for (const comment of commentsInScope(scope)) {
+    const id = parseCommentScopeId(comment.nodeValue ?? '', BF_SCOPE_COMMENT_PREFIX)
+    if (!id) continue
+    const matches = parentIds.length > 0
+      ? parentIds.some(parentId => id === `${parentId}_${slotId}`)
+      : id.endsWith(`_${slotId}`) && !NESTED_SLOT_SUFFIX.test(id)
+    if (!matches) continue
+
+    const proxyEl = nextElementSibling(comment) ?? comment.parentElement
+    if (!proxyEl) return null
+    commentScopeRegistry.set(proxyEl, { commentNode: comment, scopeId: id })
+    return proxyEl
+  }
+  return null
+}
+
+/**
+ * Enumerate comment nodes in a scope's DOM range: the comment-scope
+ * sibling range for comment-anchored scopes, the element subtree
+ * otherwise. Mirrors candidatesInScope's notion of "where the scope's
+ * content lives", but yields comments instead of elements.
+ */
+function* commentsInScope(scope: Element): Generator<Comment> {
+  const commentInfo = commentScopeRegistry.get(scope)
+
+  if (commentInfo) {
+    const boundary = getCommentScopeBoundary(commentInfo.commentNode)
+    let node: Node | null = commentInfo.commentNode.nextSibling
+    while (node && node !== boundary) {
+      if (node.nodeType === Node.COMMENT_NODE) {
+        yield node as Comment
+      } else if (node.nodeType === Node.ELEMENT_NODE) {
+        yield* commentsUnder(node as Element)
+      }
+      node = node.nextSibling
+    }
+    return
+  }
+
+  yield* commentsUnder(scope)
+}
+
+function* commentsUnder(root: Element): Generator<Comment> {
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_COMMENT)
+  while (walker.nextNode()) {
+    yield walker.currentNode as Comment
+  }
 }
 
 /**

package/src/runtime/render.ts

@@ -6,7 +6,7 @@
  * never import this module.
  */
 
-import { BF_SCOPE, BF_SCOPE_COMMENT_PREFIX } from '@barefootjs/shared'
+import { BF_SCOPE, BF_SCOPE_COMMENT_PREFIX, BF_SCOPE_COMMENT_END_PREFIX } from '@barefootjs/shared'
 import { setParentScopeId } from './component.ts'
 import { hydratedScopes } from './hydration-state.ts'
 import { getComponentInit } from './registry.ts'
@@ -119,6 +119,9 @@ export function render(
   for (const node of Array.from(tpl.content.childNodes)) {
     container.appendChild(node)
   }
+  // Close the range so scope queries never leak past the fragment's last
+  // root (mirrors the SSR end marker, #2289).
+  container.appendChild(document.createComment(`${BF_SCOPE_COMMENT_END_PREFIX}${scopeId}`))
 
   const proxyEl = rootElements[0]
   commentScopeRegistry.set(proxyEl, { commentNode, scopeId })

package/src/runtime/scope.ts

@@ -5,7 +5,7 @@
  * Maps an element to its comment node and the sibling range boundary.
  */
 
-import { BF_SCOPE_COMMENT_PREFIX, BF_LOOP_ITEM, BF_LOOP_END } from '@barefootjs/shared'
+import { BF_SCOPE_COMMENT_PREFIX, BF_SCOPE_COMMENT_END_PREFIX, BF_LOOP_ITEM, BF_LOOP_END } from '@barefootjs/shared'
 
 /**
  * Information about a comment-based scope.
@@ -33,14 +33,31 @@ export function getPortalScopeId(element: Element): string | null {
  * Find the end boundary for a comment-based scope.
  *
  * The boundary depends on the anchor's kind:
- *  - `bf-scope:` anchor (fragment-root component): boundary is the next
- *    `bf-scope:` comment or the end of the parent's children (unchanged).
+ *  - `bf-scope:` anchor (fragment-root component): boundary is this scope's
+ *    own `bf-/scope:<scopeId>` end marker when present (#2289). Without one
+ *    (SSR HTML from an adapter runtime predating the end marker), fall back
+ *    to the next `bf-scope:` comment or the end of the parent's children —
+ *    the historical heuristic, which over-extends the range past the
+ *    fragment's real last root.
  *  - `bf-loop-i:<key>` anchor (loop item, #1665): boundary is the next
  *    loop-item anchor (`bf-loop-i:*`) or the loop end marker (`bf-/loop:*`),
  *    so one item's range never bleeds into the next item or past the loop.
  */
 export function getCommentScopeBoundary(commentNode: Comment): Node | null {
-  const isLoopItem = commentNode.nodeValue?.startsWith(`${BF_LOOP_ITEM}:`) ?? false
+  const anchorValue = commentNode.nodeValue ?? ''
+  const isLoopItem = anchorValue.startsWith(`${BF_LOOP_ITEM}:`)
+
+  // Exact end-marker value for a scope anchor: `bf-/scope:<scopeId>`. The
+  // scope id is the `|`-free head of the anchor value, so a nested child
+  // scope's markers (different id) never terminate this range.
+  let endValue: string | null = null
+  if (!isLoopItem && anchorValue.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+    const rest = anchorValue.slice(BF_SCOPE_COMMENT_PREFIX.length)
+    const pipeIdx = rest.indexOf('|')
+    endValue = BF_SCOPE_COMMENT_END_PREFIX + (pipeIdx >= 0 ? rest.slice(0, pipeIdx) : rest)
+  }
+
+  let legacyBoundary: Node | null = null
   let node: Node | null = commentNode.nextSibling
   while (node) {
     if (node.nodeType === Node.COMMENT_NODE) {
@@ -49,11 +66,18 @@ export function getCommentScopeBoundary(commentNode: Comment): Node | null {
         if (value.startsWith(`${BF_LOOP_ITEM}:`) || value.startsWith(`${BF_LOOP_END}:`)) {
           return node
         }
-      } else if (value.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+      } else if (endValue && value === endValue) {
         return node
+      } else if (value.startsWith(BF_SCOPE_COMMENT_PREFIX)) {
+        // Historically the range ended at the next scope comment. When this
+        // anchor can have an end marker, keep scanning: the comment seen
+        // here may belong to a nested child scope inside the range, not to
+        // a sibling that terminates it.
+        if (!endValue) return node
+        if (!legacyBoundary) legacyBoundary = node
       }
     }
     node = node.nextSibling
   }
-  return null // End of parent's children
+  return legacyBoundary // null → end of parent's children
 }

package/src/runtime/slot-resolver.ts

@@ -11,7 +11,7 @@
  */
 
 import { BF_SCOPE, BF_HOST, BF_AT } from '@barefootjs/shared'
-import { cssEscape } from './query.ts'
+import { cssEscape, findCommentChildScope } from './query.ts'
 
 /** Resolve the host scope id for a slot lookup. Prefers the explicit
  *  `anchorScope` because the immediate `parent` element may be a freshly-
@@ -62,5 +62,14 @@ export function findSsrScopeBySlotIn(
 
   const suffixSelector = `[${BF_SCOPE}$="_${slotId}"]`
   if (selfMatch && parent.matches(suffixSelector)) return parent as HTMLElement
-  return parent.querySelector(suffixSelector) as HTMLElement | null
+  const bySuffix = parent.querySelector(suffixSelector) as HTMLElement | null
+  if (bySuffix) return bySuffix
+
+  // Fragment-root child: its scope is a bf-scope: comment, not an element
+  // carrying (bf-h, bf-m) — resolve the comment's proxy element (#2289).
+  return findCommentChildScope(
+    parent,
+    parentBfs ? [parentBfs] : [],
+    slotId,
+  ) as HTMLElement | null
 }