@barefootjs/client 0.21.0 → 0.21.2

package/dist/runtime/index.js

@@ -640,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);
@@ -665,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))

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;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"}
+{"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/standalone.js

@@ -1048,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);
@@ -1073,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))

package/package.json

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

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
     }