@barefootjs/client 0.32.0 → 0.33.1

package/dist/csr-adapter.js

@@ -169152,6 +169152,7 @@ var ErrorCodes = {
   MISSING_KEY_IN_LIST: "BF023",
   MISSING_KEY_IN_NESTED_LIST: "BF024",
   UNSUPPORTED_DESTRUCTURE_REST: "BF025",
+  RETURN_VALUE_NOT_JSX: "BF027",
   PROPS_DESTRUCTURING: "BF043",
   SIGNAL_GETTER_NOT_CALLED: "BF044",
   JSX_IN_LOCAL_FUNCTION: "BF045",
@@ -169183,6 +169184,7 @@ var errorMessages = {
   [ErrorCodes.MISSING_KEY_IN_LIST]: "Missing key attribute in list rendering. Add a key prop for efficient updates",
   [ErrorCodes.MISSING_KEY_IN_NESTED_LIST]: "Nested .map() loop requires key attribute for event delegation. Add a key prop to elements in the inner loop",
   [ErrorCodes.UNSUPPORTED_DESTRUCTURE_REST]: "Computed property key in .map() callback destructure is not supported. Rewrite the callback to destructure explicit bindings (e.g., `({ a, b }) => ...`) so the compiler can rewrite references to per-item signal accessors.",
+  [ErrorCodes.RETURN_VALUE_NOT_JSX]: "Component's return value is not recognized as JSX — return the JSX expression directly instead of binding it to a local variable first.",
   [ErrorCodes.PROPS_DESTRUCTURING]: "Props destructuring in function parameters breaks reactivity. Use props object directly.",
   [ErrorCodes.SIGNAL_GETTER_NOT_CALLED]: "Signal/memo getter passed without calling it. Use getter() to read the value.",
   [ErrorCodes.JSX_IN_LOCAL_FUNCTION]: "Local function returns JSX but cannot be inlined. Extract it as a top-level PascalCase component or use a single return statement.",
@@ -169801,6 +169803,8 @@ function matchToLocaleDateStringCall(callee, args, metadata) {
   let tz = null;
   const probeOptions = {};
   for (const prop of options.properties) {
+    if (prop.kind === "spread")
+      return null;
     if (prop.value.kind !== "literal" || prop.value.literalType !== "string")
       return null;
     const value = String(prop.value.value);
@@ -170943,6 +170947,8 @@ function matchQueryHrefCall(callee, args, localNames) {
     return null;
   const triples = [];
   for (const p of obj.properties) {
+    if (p.kind === "spread")
+      return null;
     const v = p.value;
     if (v.kind === "conditional" && isOmitBranch(v.alternate)) {
       triples.push({ guard: v.test, key: p.key, value: v.consequent });

package/dist/runtime/index.d.ts

@@ -23,7 +23,7 @@ export { findScope, find, $, $c, $t, qsa, qsaChildScope, qsaChildScopes, cssEsca
 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';
+export { insert, findCondContainer, type BranchConfig, type BranchTemplateResult } from './insert.ts';
 export { __bfSlot } from './branch-slot.ts';
 export { __bfText } from './dynamic-text.ts';
 export { hydratedScopes } from './hydration-state.ts';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,sBAAsB,EACtB,UAAU,EACV,cAAc,EACd,UAAU,EACV,SAAS,EACT,OAAO,EACP,OAAO,EACP,KAAK,EACL,eAAe,EACf,SAAS,EACT,OAAO,EACP,gBAAgB,EAOhB,kBAAkB,EAClB,KAAK,gBAAgB,EACrB,sBAAsB,EACtB,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,IAAI,EACT,KAAK,SAAS,EACd,KAAK,QAAQ,EACb,KAAK,iBAAiB,EACtB,KAAK,cAAc,GACpB,MAAM,6BAA6B,CAAA;AAEpC,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACtB,KAAK,aAAa,GACnB,MAAM,uBAAuB,CAAA;AAE9B,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,MAAM,EAAE,KAAK,UAAU,EAAE,MAAM,YAAY,CAAA;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,SAAS,EAAE,KAAK,WAAW,EAAE,KAAK,eAAe,EAAE,MAAM,kBAAkB,CAAA;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAI9C,OAAO,EACL,aAAa,EACb,UAAU,EACV,cAAc,EACd,eAAe,EACf,KAAK,OAAO,GACb,MAAM,cAAc,CAAA;AAGrB,OAAO,EACL,YAAY,EACZ,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,cAAc,GACpB,MAAM,aAAa,CAAA;AAIpB,OAAO,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAA;AAI3D,OAAO,EAAE,YAAY,EAAE,KAAK,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACvF,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAA;AAK3C,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,KAAK,QAAQ,EAAE,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAG5K,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAA;AAG3F,OAAO,EACL,eAAe,EACf,YAAY,EACZ,WAAW,EACX,SAAS,EACT,UAAU,EACV,UAAU,EACV,gBAAgB,EAKhB,QAAQ,EACR,UAAU,EACV,kBAAkB,EAClB,KAAK,QAAQ,GACd,MAAM,gBAAgB,CAAA;AAGvB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AACtD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;AAGvC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC9G,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAA;AAChC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,YAAY,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACpH,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3F,OAAO,EAAE,MAAM,EAAE,KAAK,YAAY,EAAE,KAAK,oBAAoB,EAAE,MAAM,aAAa,CAAA;AAClF,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAA;AAQ3C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAG5C,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAGpC,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AAG1D,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/runtime/index.ts"],"names":[],"mappings":"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"}

package/dist/runtime/index.js

@@ -1487,7 +1487,14 @@ function renderChild(name, props, key, slotSuffix) {
   if (!templateFn) {
     return `<div ${bfsAttr}${slotAttrs}${keyAttr}></div>`;
   }
-  const raw = templateFn(props);
+  const prevParentScopeId = _parentScopeId;
+  _parentScopeId = `${scopePrefix}${suffix}`;
+  let raw;
+  try {
+    raw = templateFn(props);
+  } finally {
+    _parentScopeId = prevParentScopeId;
+  }
   let html = raw.trim().replace(PLACEHOLDER_ATTR_PATTERN, _parentScopeId ? ` bf-s="${_parentScopeId}"` : "");
   const firstElMatch = html.match(/<(\w+)/);
   if (!firstElMatch)
@@ -2916,6 +2923,15 @@ function findCondStartInRange(anchor, id) {
   }
   return null;
 }
+function findCondContainer(scope, id) {
+  const want = `bf-cond-start:${id}`;
+  for (const comment of commentsInScope(scope)) {
+    if (comment.nodeValue === want) {
+      return comment.parentElement ?? scope;
+    }
+  }
+  return scope;
+}
 var EMPTY_SLOTS = [];
 function normalizeTemplate(value) {
   return typeof value === "string" ? { html: value, slots: EMPTY_SLOTS } : value;
@@ -3319,6 +3335,7 @@ export {
   flushHydration,
   findSiblingSlot,
   findScope,
+  findCondContainer,
   find,
   escapeTextOrNode,
   escapeTextOrMarkup,

package/dist/runtime/insert.d.ts

@@ -5,6 +5,27 @@
  * SolidJS-inspired replacement for legacy cond() that properly
  * handles event binding for both branches.
  */
+/**
+ * Resolve the DOM element that actually hosts an element-scoped loop-row
+ * conditional's branch content (#2705). A nested `mapArray` inside the
+ * branch's `bindEvents` needs a container to search for its own loop
+ * markers, but has no `bf="<slot>"` marker to query when the conditional
+ * sits inside a wrapper element the container-slot collector never visits
+ * (`collectInnerLoops`'s branch walk only sees elements INSIDE the
+ * branch's own IR subtree — a wrapper enclosing the conditional from the
+ * outside, e.g. `<article>{cond && items.map(...)}</article>`, is never
+ * one of them, so `containerSlotId` comes back `null`).
+ *
+ * The one DOM anchor available in that case is the conditional's own
+ * `<!--bf-cond-start:id-->` marker: whatever element that marker's parent
+ * is, is where `insert()` keeps the branch's content — adopted from SSR or
+ * freshly spliced by `updateFragmentConditional`, either way the marker
+ * stays put as one of the range's boundaries. Falls back to `scope` itself
+ * when no such marker is found (an element-conditional branch with no
+ * comment markers, or a conditional with no wrapper at all — `scope` IS
+ * the right container in that shape too) — never throws.
+ */
+export declare function findCondContainer(scope: Element, id: string): Element;
 /**
  * Result returned by a branch's `template()` when the template captures
  * live DOM nodes via `__bfSlot` (#1213). `html` carries the marker-bearing

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

@@ -1 +1 @@
-{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../src/runtime/insert.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAmFH;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,IAAI,EAAE,CAAA;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,QAAQ,EAAE,MAAM,MAAM,GAAG,oBAAoB,CAAA;IAE7C;;;;;;OAMG;IACH,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;CACrF;AAyBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,MAAM,CACpB,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,IAAI,EAC/B,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,OAAO,EAC1B,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,YAAY,EACvB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CA+IN"}
+{"version":3,"file":"insert.d.ts","sourceRoot":"","sources":["../../src/runtime/insert.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAmFH;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAQrE;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,IAAI,EAAE,CAAA;CACd;AAED;;;GAGG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,QAAQ,EAAE,MAAM,MAAM,GAAG,oBAAoB,CAAA;IAE7C;;;;;;OAMG;IACH,UAAU,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,OAAO,CAAA;KAAE,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;CACrF;AAyBD;;;;;;;;;;;;GAYG;AACH,wBAAgB,MAAM,CACpB,KAAK,EAAE,OAAO,GAAG,OAAO,GAAG,IAAI,EAC/B,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,MAAM,OAAO,EAC1B,QAAQ,EAAE,YAAY,EACtB,SAAS,EAAE,YAAY,EACvB,IAAI,CAAC,EAAE,MAAM,GACZ,IAAI,CA+IN"}

package/dist/runtime/standalone.js

@@ -1893,7 +1893,14 @@ function renderChild(name, props, key, slotSuffix) {
   if (!templateFn) {
     return `<div ${bfsAttr}${slotAttrs}${keyAttr}></div>`;
   }
-  const raw = templateFn(props);
+  const prevParentScopeId = _parentScopeId;
+  _parentScopeId = `${scopePrefix}${suffix}`;
+  let raw;
+  try {
+    raw = templateFn(props);
+  } finally {
+    _parentScopeId = prevParentScopeId;
+  }
   let html = raw.trim().replace(PLACEHOLDER_ATTR_PATTERN, _parentScopeId ? ` bf-s="${_parentScopeId}"` : "");
   const firstElMatch = html.match(/<(\w+)/);
   if (!firstElMatch)
@@ -3316,6 +3323,15 @@ function findCondStartInRange(anchor, id) {
   }
   return null;
 }
+function findCondContainer(scope, id) {
+  const want = `bf-cond-start:${id}`;
+  for (const comment of commentsInScope(scope)) {
+    if (comment.nodeValue === want) {
+      return comment.parentElement ?? scope;
+    }
+  }
+  return scope;
+}
 var EMPTY_SLOTS = [];
 function normalizeTemplate(value) {
   return typeof value === "string" ? { html: value, slots: EMPTY_SLOTS } : value;
@@ -3718,6 +3734,7 @@ export {
   flushHydration,
   findSiblingSlot,
   findScope,
+  findCondContainer,
   find,
   escapeTextOrNode,
   escapeTextOrMarkup,

package/package.json

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

package/src/runtime/component.ts

@@ -441,25 +441,25 @@ 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)
+  // Push `_parentScopeId` to THIS child's own derived scope while its
+  // `templateFn` evaluates, so a grandchild rendered inside it derives its
+  // scope from THIS scope rather than the caller's (#2649). Without this a
+  // third composition level collapses onto the second: with `_parentScopeId`
+  // left at the caller's id, a grandchild whose slot suffix happens to match
+  // this child's OWN slot suffix computes the exact same string as this
+  // child's bf-s (`grandchild-composition`'s `test_s0` reused instead of
+  // deriving `test_s0_s0`). Restored via `finally` so a sibling rendered
+  // after this call (or the caller's own remaining template) sees the
+  // original `_parentScopeId`, matching the caller-restore discipline
+  // `materializeComponent` already uses around its own `templateFn` call.
+  const prevParentScopeId = _parentScopeId
+  _parentScopeId = `${scopePrefix}${suffix}`
+  let raw: string
+  try {
+    raw = templateFn(props)
+  } finally {
+    _parentScopeId = prevParentScopeId
+  }
 
   // The placeholder substitution is anchored to the exact `bf-s="…"`
   // shape so user content that contains the sentinel as text survives

package/src/runtime/index.ts

@@ -125,7 +125,7 @@ export { findScope, find, $, $c, $t, qsa, qsaChildScope, qsaChildScopes, cssEsca
 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'
+export { insert, findCondContainer, type BranchConfig, type BranchTemplateResult } from './insert.ts'
 export { __bfSlot } from './branch-slot.ts'
 // `__bfText` (dynamic-text.ts) and `$t` (query.ts) are kept: one narrow
 // emission site — a `@client`-nested-inside-a-top-level-conditional dynamic

package/src/runtime/insert.ts

@@ -87,6 +87,36 @@ function findCondStartInRange(anchor: Comment, id: string): Comment | null {
   return null
 }
 
+/**
+ * Resolve the DOM element that actually hosts an element-scoped loop-row
+ * conditional's branch content (#2705). A nested `mapArray` inside the
+ * branch's `bindEvents` needs a container to search for its own loop
+ * markers, but has no `bf="<slot>"` marker to query when the conditional
+ * sits inside a wrapper element the container-slot collector never visits
+ * (`collectInnerLoops`'s branch walk only sees elements INSIDE the
+ * branch's own IR subtree — a wrapper enclosing the conditional from the
+ * outside, e.g. `<article>{cond && items.map(...)}</article>`, is never
+ * one of them, so `containerSlotId` comes back `null`).
+ *
+ * The one DOM anchor available in that case is the conditional's own
+ * `<!--bf-cond-start:id-->` marker: whatever element that marker's parent
+ * is, is where `insert()` keeps the branch's content — adopted from SSR or
+ * freshly spliced by `updateFragmentConditional`, either way the marker
+ * stays put as one of the range's boundaries. Falls back to `scope` itself
+ * when no such marker is found (an element-conditional branch with no
+ * comment markers, or a conditional with no wrapper at all — `scope` IS
+ * the right container in that shape too) — never throws.
+ */
+export function findCondContainer(scope: Element, id: string): Element {
+  const want = `bf-cond-start:${id}`
+  for (const comment of commentsInScope(scope)) {
+    if (comment.nodeValue === want) {
+      return (comment.parentElement as Element | null) ?? scope
+    }
+  }
+  return scope
+}
+
 /**
  * Result returned by a branch's `template()` when the template captures
  * live DOM nodes via `__bfSlot` (#1213). `html` carries the marker-bearing