@barefootjs/jsx 0.26.4 → 0.27.0

package/src/__tests__/child-components-in-map.test.ts

@@ -211,7 +211,7 @@ describe('child components inside .map() (#344)', () => {
     expect(clientJs!.content).toContain('toggleRow(index)')
   })
 
-  test('dynamic signal array: component generates reconcileElements with createComponent', () => {
+  test('dynamic signal array: component generates mapArray with createComponent', () => {
     const source = `
       'use client'
       import { createSignal } from '@barefootjs/client'
@@ -321,7 +321,7 @@ describe('child components inside .map() (#344)', () => {
     const uniqueVars = new Set(allVars)
     expect(allVars.length).toBe(uniqueVars.size)
 
-    // Component slot ref ($c) and reconcileElements should both be present
+    // Component slot ref ($c) and mapArray should both be present
     expect(content).toContain('$c(__scope')
     expect(content).toContain('mapArray')
   })
@@ -355,7 +355,7 @@ describe('child components inside .map() (#344)', () => {
     expect(clientJs).toBeDefined()
     const content = clientJs!.content
 
-    // Should use reconcileElements with createComponent
+    // Should use mapArray with createComponent
     expect(content).toContain('mapArray')
     expect(content).toContain("createComponent('TableRow'")
 
@@ -650,7 +650,7 @@ describe('child components inside .map() (#344)', () => {
     expect(clientJs).toBeDefined()
     const content = clientJs!.content
 
-    // Dynamic array should use reconcileElements and event delegation
+    // Dynamic array should use mapArray and event delegation
     expect(content).toContain('mapArray')
     expect(content).toContain(".addEventListener('click', (__bfEvt) => {")
     expect(content).toContain('handleClick(item.id)')

package/src/__tests__/client-js-generation.test.ts

@@ -151,7 +151,7 @@ describe('Client JS generation', () => {
   })
 
   describe('map with index parameter', () => {
-    test('includes index parameter in reconcileElements renderItem callback', () => {
+    test('includes index parameter in mapArray renderItem callback', () => {
       const source = `
         'use client'
         import { createMemo } from '@barefootjs/client'
@@ -1760,7 +1760,10 @@ describe('Client JS generation', () => {
       // update. See `preamble-region-patch.test.ts` for the full region
       // contract (row-template marker, region-patch effect, SSR parity).
       expect(clientJs?.content).toContain('${escapeText(label)}')
-      expect(clientJs?.content).toContain('patchSlotRange')
+      // Slot unification A3: preamble regions now write through a claimed
+      // 'markup' slot instead of `patchSlotRange`.
+      expect(clientJs?.content).toContain("kind: 'markup'")
+      expect(clientJs?.content).toContain('lazySlots(__el')
     })
 
     test('handles block body with multiple variable declarations', () => {
@@ -2423,11 +2426,12 @@ describe('Client JS generation', () => {
       expect(clientJs).toBeDefined()
       const content = clientJs!.content
 
-      // Text node updates route through `__bfText`, which renders nullish
-      // values as '' (not the string "undefined") and also splices live
-      // Nodes by identity (#1663). The nullish guard moved from the inline
-      // `String(__val ?? '')` assignment into that helper.
-      expect(content).toContain('__bfText(')
+      // Text node updates route through a claimed 'markup' slot writer (slot
+      // unification A3), whose `writeMarkup` renders nullish values as ''
+      // (not the string "undefined") and also splices live Nodes by
+      // identity (#1663) — the same contract `__bfText` used to provide.
+      // The nullish guard lives in the runtime writer, not inline here.
+      expect(content).toContain("kind: 'markup'")
       expect(content).not.toMatch(/\.nodeValue = String\(__val\)(?! )/)
     })
 
@@ -2464,8 +2468,10 @@ describe('Client JS generation', () => {
       expect(clientJs).toBeDefined()
       const content = clientJs!.content
 
-      // text() inside a component inside a conditional uses $t() in branch-scoped effect
-      expect(content).toContain('$t(__branchScope')
+      // text() inside a component inside a conditional writes through a
+      // claimed 'markup' slot built fresh in the branch's own bindEvents
+      // (slot unification A3) — re-claimed on every branch activation.
+      expect(content).toContain("lazySlots(__branchScope, [{ id: '^s2', kind: 'markup', path: [] }])")
     })
 
     test('propagates insideConditional through fragment children', () => {
@@ -2495,8 +2501,10 @@ describe('Client JS generation', () => {
       expect(clientJs).toBeDefined()
       const content = clientJs!.content
 
-      // text() inside a fragment inside a conditional uses $t() in branch-scoped effect
-      expect(content).toContain('$t(__branchScope')
+      // text() inside a fragment inside a conditional writes through a
+      // claimed 'markup' slot built fresh in the branch's own bindEvents
+      // (slot unification A3) — re-claimed on every branch activation.
+      expect(content).toContain("lazySlots(__branchScope, [{ id: 's2', kind: 'markup', path: [] }])")
     })
   })
 

package/src/__tests__/composite-branch-loop.test.ts

@@ -2,7 +2,7 @@
  * BarefootJS Compiler - Composite loops inside conditional branches (#724)
  *
  * Verifies that loops with child components inside ternary conditionals
- * generate reconcileElements with createComponent in the branch's bindEvents.
+ * generate mapArray with createComponent in the branch's bindEvents.
  */
 
 import { describe, test, expect } from 'bun:test'
@@ -52,7 +52,7 @@ describe('composite loops inside conditional branches (#724)', () => {
     expect(clientJs).toBeDefined()
     const js = clientJs!.content
 
-    // Should use reconcileElements inside the branch's bindEvents
+    // Should use mapArray inside the branch's bindEvents
     expect(js).toContain('mapArray(')
 
     // After O-1's mode-collapse PR, child component init goes through the

package/src/__tests__/cross-file-client-signal.test.ts

@@ -104,7 +104,11 @@ export function Viewer() {
     const files = Object.fromEntries(r.files.map(f => [f.path, f.content]))
     const ssr = Object.values(files).find(c => c.includes('export function Viewer'))
     expect(ssr).toBeDefined()
-    expect(ssr).toContain('client:s')
+    // Slot unification Step B: `{val()}` is the SPAN's only, non-adjacent
+    // child, so its marker pair is elided entirely (see the identical note
+    // in module-level-signal.audit.test.ts) — the client's claim plan
+    // creates the missing Text node from `elidedPath` alone.
+    expect(ssr).not.toContain('bfText(')
     expect(ssr).not.toContain("const val = () =>")
   })
 

package/src/__tests__/early-return-scope-var-ref.test.ts

@@ -65,12 +65,10 @@ describe('JSX expression referencing a local declared inside an early-return if-
 
     const content = clientJsContent(result)
 
-    // Pre-fix: emitted `updateClientMarker(__scope, 's4', aLocal)` at
-    // outer init scope — `aLocal` undefined. Post-fix: the JSX is
-    // inlined directly into the template, so the createEffect /
-    // updateClientMarker block is not needed at all for this static
-    // shape.
-    expect(content).not.toContain('updateClientMarker')
+    // Pre-fix, `aLocal` leaked into a reactive-update block at outer init
+    // scope where it doesn't exist (see file docstring). Post-fix: the JSX
+    // is inlined directly into the template, so no reactive-update block is
+    // needed at all for this static shape.
     expect(content).not.toMatch(/\baLocal\b/)
 
     const hydrate = hydrateLine(result)
@@ -97,9 +95,10 @@ describe('JSX expression referencing a local declared inside an early-return if-
     const content = clientJsContent(result)
     // The bare `label` identifier must not appear in the emitted init
     // function — it's resolved to its initializer value at IR-build
-    // time.
-    expect(content).not.toMatch(/updateClientMarker\([^)]*\blabel\b[^)]*\)/)
-    expect(content).toContain("updateClientMarker(__scope, 's4', 'hello')")
+    // time. `@client` writes through a claimed 'text' slot writer
+    // (`claim-slots.ts`).
+    expect(content).not.toMatch(/__bfw_\w+\([^)]*\blabel\b[^)]*\)/)
+    expect(content).toContain("__bfw_s4('s4', 'hello')")
   })
 
   test('ternary scope var (`readOnly ? null : <jsx/>`) routes to client-only conditional', () => {
@@ -124,8 +123,8 @@ describe('JSX expression referencing a local declared inside an early-return if-
     expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0)
 
     const content = clientJsContent(result)
-    // Pre-fix: `updateClientMarker(__scope, 's*', compactResize)`
-    // referenced an undeclared name. Post-fix: the ternary becomes an
+    // Pre-fix, `compactResize` leaked into the emitted reactive-update
+    // block as an undeclared name. Post-fix: the ternary becomes an
     // IRConditional with `clientOnly: true`, routed through `insert()`
     // — and `props.readOnly` is rewritten to `_p.readOnly`.
     expect(content).not.toMatch(/\bcompactResize\b/)

package/src/__tests__/inline-jsx-callback.test.ts

@@ -440,10 +440,12 @@ describe('inline JSX as object-literal arrow value (#1663)', () => {
     expect(js).toMatch(/hydrate\(\s*['"]BFInlineJsxCallback1(?:__|['"])/)
   })
 
-  test('dynamic JSX-returning call routes the slot through __bfText', () => {
+  test('dynamic JSX-returning call routes the slot through a claimed markup slot', () => {
     // The child expression `{themeLogo(props.id)}` evaluates to a live
     // component element on the client; the slot update must splice it in by
-    // identity via __bfText rather than stringify it into "[object …]".
+    // identity via a claimed 'markup' slot writer (slot unification A3)
+    // rather than stringify it into "[object …]" — the same contract
+    // `__bfText` used to provide.
     const source = `
       'use client'
       import { BrandLogo } from './brand-logo'
@@ -458,7 +460,7 @@ describe('inline JSX as object-literal arrow value (#1663)', () => {
       }
     `
     const js = clientJs(source)
-    expect(js).toContain('__bfText(')
-    expect(js).toMatch(/__bfText[^']*from '@barefootjs\/client\/runtime'/)
+    expect(js).toContain("kind: 'markup'")
+    expect(js).toMatch(/lazySlots[^']*from '@barefootjs\/client\/runtime'/)
   })
 })

package/src/__tests__/ir-jsx-props.test.ts

@@ -359,11 +359,12 @@ describe('JSX props (#559)', () => {
 
       const clientJs = result.files.find(f => f.type === 'clientJs')
       expect(clientJs).toBeDefined()
-      // The text update routes through `__bfText`, which preserves the
-      // server-rendered DOM for `__isSlot` values (and splices live Nodes
-      // by identity) instead of the old inline `nodeValue = String(...)`
-      // assignment. The `__isSlot` guard now lives inside that helper (#1663).
-      expect(clientJs!.content).toContain('__bfText')
+      // The text update routes through a claimed 'markup' slot writer (slot
+      // unification A3), whose `writeMarkup` preserves the server-rendered
+      // DOM for `__isSlot` values (and splices live Nodes by identity)
+      // instead of the old inline `nodeValue = String(...)` assignment —
+      // the same contract `__bfText` used to provide (#1663).
+      expect(clientJs!.content).toContain("kind: 'markup'")
     })
   })
 })

package/src/__tests__/loop-fallback-wrap.test.ts

@@ -18,7 +18,7 @@
  * and the conditional follow-up (#941), so this loop widening closes
  * the divergence gap between the allow-list path and the AST-flag path.
  *
- * Over-reconciliation of a pure-call array has a real cost (reconcileList
+ * Over-reconciliation of a pure-call array has a real cost (mapArray
  * is not a cheap primitive), so the fixture sweep in the accompanying
  * PR measures byte delta too; but the silent-drop bug this closes is
  * the expensive one — a frozen client list is a visible correctness
@@ -89,8 +89,8 @@ describe('Solid-style wrap-by-default fallback for loops (#943)', () => {
 
   test('inline literal array stays static (optimisation preserved)', () => {
     // `[1, 2, 3]` is an ArrayLiteralExpression with no calls — the
-    // existing static-render path is the right call. No reconcileList /
-    // mapArray should appear.
+    // existing static-render path is the right call. No `mapArray` call
+    // should appear.
     const source = `
       'use client'
       import { createSignal } from '@barefootjs/client'
@@ -107,7 +107,6 @@ describe('Solid-style wrap-by-default fallback for loops (#943)', () => {
 
     const clientJs = getClientJs(source, 'List.tsx')
     expect(clientJs).not.toMatch(/\bmapArray\s*\(/)
-    expect(clientJs).not.toMatch(/\breconcileList\s*\(/)
   })
 
   test('prop array compiles to mapArray (#1586)', () => {

package/src/__tests__/module-level-signal.audit.test.ts

@@ -234,8 +234,13 @@ export function Counter() {
     const ssr = files['Counter.tsx']
     // SSR template should NOT declare count as a getter
     expect(ssr).not.toContain('const count = () =>')
-    // SSR template should have a client-only placeholder (not the value)
-    expect(ssr).toContain('client:s')
+    // Slot unification Step B: `{count()}` is the SPAN's only, non-adjacent
+    // child, so `client-only-elision.ts` elides its marker pair entirely —
+    // no `bfText`/`bfTextEnd` call reaches the SSR output at all. The
+    // client's claim plan (`Counter.client.js`) creates the missing Text
+    // node from `elidedPath` alone; see `claim-slots.test.ts`'s
+    // "markerless text kind" describe block for the runtime contract.
+    expect(ssr).not.toContain('bfText(')
   })
 
   test('full compile: exported signal uses `export const` in client JS', () => {

package/src/__tests__/nested-loop-conditional.test.ts

@@ -134,13 +134,14 @@ describe('nested loops/conditionals inside mapArray (#830, #839)', () => {
     expect(mapArrayCount).toBeGreaterThanOrEqual(3)
   })
 
-  test('reactive text inside conditional inside inner loop uses re-query pattern (#840)', () => {
+  test('reactive text inside conditional inside inner loop uses re-claim pattern (#840)', () => {
     // When a reactive text is inside a conditional branch inside a nested (inner) loop,
     // insert() may replace the SSR element after the text node is captured.
-    // The generated code must use the re-query pattern:
-    //   createEffect(() => { const [__rt] = $t(...) ... })
-    // NOT the capture-then-effect pattern:
-    //   { const [__rt] = $t(...); if (__rt) createEffect(() => ...) }
+    // Slot unification A3: the generated code must re-claim on EVERY run via
+    // a fresh `claimSlots(...).write(...)` call inside the effect body — not
+    // a `lazySlots` writer built once outside it, which would go stale once
+    // insert() swaps the branch's DOM (see `stringifyInnerLoops`' docstring
+    // in `ir-to-client-js/control-flow/stringify/inner-loop.ts`).
     const source = `
       'use client'
       import { createSignal } from '@barefootjs/client'
@@ -175,8 +176,9 @@ describe('nested loops/conditionals inside mapArray (#830, #839)', () => {
     expect(clientJs).toBeDefined()
     const content = clientJs!.content
 
-    // Re-query pattern: $t() inside createEffect so it always finds the live node
-    expect(content).toContain('createEffect(() => { const [__rt] = $t(')
+    // Re-claim pattern: a fresh `claimSlots(...)` call inside createEffect so
+    // it always resolves against the live node, never a cached stale ref.
+    expect(content).toMatch(/createEffect\(\(\) => \{ claimSlots\(__innerEl\w*, \[\{ id: 's\d+', kind: 'text', path: \[\] \}\]\)\.write\('s\d+', String\(/)
   })
 
   test('event handler inside conditional branch of loop item appears in bindEvents (#839)', () => {

package/src/__tests__/nested-loop-reactive-attrs.test.ts

@@ -339,7 +339,7 @@ describe('reactive attributes inside a nested .map() body (#135)', () => {
     // The innermost loop's per-item renderItem must emit BOTH a
     // reactive-text effect for `panel.text` and a reactive-attr effect
     // for `panel.cls` — the bug dropped only the former.
-    expect(content).toMatch(/createEffect\(\(\) => \{[\s\S]*?\.textContent = String\(panel\(\)\.text\)/)
+    expect(content).toMatch(/createEffect\(\(\) => \{[\s\S]*?__bfw_\w+\('s\d+', String\(panel\(\)\.text\)\)/)
     expect(content).toContain("setAttribute('class'")
   })
 
@@ -395,7 +395,7 @@ describe('reactive attributes inside a nested .map() body (#135)', () => {
     // textContent write — `labelAt(` also appears in the static template
     // clone, so asserting it independently would pass even with the
     // effect missing (the exact regression here).
-    expect(content).toMatch(/createEffect\(\(\) => \{[\s\S]*?\.textContent = String\(labelAt\(pi\)\)/)
+    expect(content).toMatch(/createEffect\(\(\) => \{[\s\S]*?__bfw_\w+\('s\d+', String\(labelAt\(pi\)\)\)/)
     expect(content).toContain("setAttribute('class'")
   })
 })

package/src/__tests__/preamble-region-patch.test.ts

@@ -11,9 +11,13 @@
  * the preamble's `declaredNames` is classified as a preamble-patched
  * region — slot-marked like an ordinary reactive text (so SSR/CSR row
  * templates render `<!--bf:sN-->...<!--/-->` / `{bfText("sN")}` the same
- * door a reactive text uses), but wired on the client via a dedicated
- * `patchSlotRange`-based region-patch effect rather than a `reactiveTexts`
- * `.textContent` assignment (which would corrupt the array-joined markup).
+ * door a reactive text uses), but wired on the client via a claimed
+ * 'markup' slot writer (`@barefootjs/client/runtime/claim-slots.ts`) rather
+ * than a `reactiveTexts` `.textContent` assignment (which would corrupt the
+ * array-joined markup). Dedup — skip the DOM write when the new value
+ * matches the writer's own held `last` value — lives inside that writer;
+ * every write, including the first, applies unless deduped (see
+ * `claim-slots.ts`'s module docstring).
  */
 
 import { describe, test, expect } from 'bun:test'
@@ -68,7 +72,8 @@ describe('preamble-region-patch (#2389)', () => {
     expect(clientJs).toMatch(/<!--bf:s\d+-->\$\{Array\.isArray\(cells\) \? cells\.join\(''\) : \(cells \?\? ''\)\}<!--\/-->/)
 
     const hono = compileWith(new HonoAdapter())
-    expect(hono.clientJs).toContain('patchSlotRange')
+    expect(hono.clientJs).toContain("kind: 'markup'")
+    expect(hono.clientJs).toContain('lazySlots(__el')
     // Hono SSR renders the SAME slotId through `renderExpression`'s generic
     // `{bfText("id")}...{bfTextEnd()}` door — no bespoke region handling.
     const slotMatch = /<!--bf:(s\d+)-->\$\{Array\.isArray\(cells\)/.exec(hono.clientJs)
@@ -81,15 +86,16 @@ describe('preamble-region-patch (#2389)', () => {
 
   test('(b) renderItem emits the region-patch effect, re-running the preamble in accessor form', () => {
     const { clientJs } = compileWith(new TestAdapter())
-    expect(clientJs).toContain('patchSlotRange')
+    expect(clientJs).toContain("kind: 'markup'")
     // The preamble re-runs inside the effect with the loop-param accessor
     // wrap (`t().done`), not the plain (`t.done`) form used at the
     // top-level construction line.
     expect(clientJs).toMatch(/createEffect\(\(\) => \{\s*const stateLabel = t\(\)\.done/)
-    // First run only records (trusts SSR/CSR mount-time content); only a
-    // SUBSEQUENT change patches via patchSlotRange.
-    expect(clientJs).toMatch(/if \(__last_\w+ === undefined\) \{ __last_\w+ = __html_\w+; return \}/)
-    expect(clientJs).toMatch(/patchSlotRange\(__el, 's\d+', __html_\w+\)/)
+    // The write goes through the claimed 'markup' writer — dedup (skip an
+    // unchanged string, on every write including the first) now lives
+    // inside `writeMarkup` itself (`claim-slots.ts`), not a per-region
+    // `__last` local next to the write call.
+    expect(clientJs).toMatch(/__bfw_\w+\('s\d+', Array\.isArray\(cells\)/)
   })
 
   test('(c) a loop without a preamble gets no region', () => {
@@ -102,7 +108,7 @@ describe('preamble-region-patch (#2389)', () => {
       }
     `
     const { clientJs } = compileWith(new TestAdapter(), source)
-    expect(clientJs).not.toContain('patchSlotRange')
+    expect(clientJs).not.toContain("kind: 'markup'")
   })
 
   test('(c) a static-array loop with a preamble gets no region', () => {
@@ -123,7 +129,7 @@ describe('preamble-region-patch (#2389)', () => {
       }
     `
     const { clientJs } = compileWith(new TestAdapter(), source)
-    expect(clientJs).not.toContain('patchSlotRange')
+    expect(clientJs).not.toContain("kind: 'markup'")
   })
 
   test('(d) a preamble local never referenced by an expression child gets no region', () => {
@@ -145,6 +151,6 @@ describe('preamble-region-patch (#2389)', () => {
       }
     `
     const { clientJs } = compileWith(new TestAdapter(), source)
-    expect(clientJs).not.toContain('patchSlotRange')
+    expect(clientJs).not.toContain("kind: 'markup'")
   })
 })

package/src/__tests__/profile-cond-binding-ids.test.ts

@@ -60,8 +60,9 @@ describe('conditional binding-effect ids (#1795 Phase 1)', () => {
     const on = clientJs(true)
     // Branch reactive attribute effect (createDisposableEffect with the class write).
     expect(on).toMatch(/setAttribute\('class'[\s\S]*?}, "Disclosure#binding:s\d+"\)\)/)
-    // Branch reactive text effect (__bfText path).
-    expect(on).toMatch(/__bfText\([\s\S]*?}, "Disclosure#binding:s\d+"\)\)/)
+    // Branch reactive text effect (claimed 'markup' slot writer, slot
+    // unification A3).
+    expect(on).toMatch(/__bfw_\w+\([\s\S]*?}, "Disclosure#binding:s\d+"\)\)/)
   })
 
   test('buildIdIndex resolves conditional / attribute / text binding ids to source loc', () => {

package/src/__tests__/profile-loop-binding-ids.test.ts

@@ -50,9 +50,10 @@ describe('loop-child binding-effect ids (#1795 Phase 2)', () => {
 
   test('profile on: loop-child text effects carry #binding ids', () => {
     const on = clientJs(true)
-    // Both `{it.t}` and `{it.n}` text effects.
-    expect(on).toMatch(/__rt_s\d+\.textContent = String\(it\(\)\.t\) }, "List#binding:s\d+"\)/)
-    expect(on).toMatch(/__rt_s\d+\.textContent = String\(it\(\)\.n\) }, "List#binding:s\d+"\)/)
+    // Both `{it.t}` and `{it.n}` text effects write through the row's
+    // claimed 'text' slot writer (slot unification A3).
+    expect(on).toMatch(/__bfw_\w+\('s\d+', String\(it\(\)\.t\)\) }, "List#binding:s\d+"\)/)
+    expect(on).toMatch(/__bfw_\w+\('s\d+', String\(it\(\)\.n\)\) }, "List#binding:s\d+"\)/)
   })
 
   test('profile on: the loop-child attribute effect carries a #binding id', () => {

package/src/__tests__/profile-nested-binding-ids.test.ts

@@ -112,12 +112,17 @@ describe('nested loop binding ids (#1795 Phase 3)', () => {
   test('loop-child conditional insert() and its branch text carry ids', () => {
     const on = clientJs(nestedSource, 'Nested', true)
     // The branch-arm text (`{r.label}` inside the conditional's true arm) —
-    // __bfText (not a naive `.textContent = String(...)`) so a Child-position
-    // expression whose value is a live Node splices by identity instead of
-    // stringifying (#2347).
-    expect(on).toMatch(/__rt_s\d+ = __bfText\(__rt_s\d+, r\(\)\.label\) }, "Nested#binding:s\d+"\)/)
+    // a claimed 'markup' slot writer (slot unification A3), built fresh in
+    // the branch's own bindEvents, so a Child-position expression whose
+    // value is a live Node splices by identity instead of stringifying
+    // (#2347) — the same contract `__bfText` used to provide. Wrapped in
+    // `escapeTextOrNode` (A3 follow-up): a string value must be escaped
+    // before this 'markup' writer's `innerHTML =` insertion, matching what
+    // the initial SSR/CSR template already does for the same expression;
+    // a live Node passes through untouched.
+    expect(on).toMatch(/__bfw_\w+\('s\d+', escapeTextOrNode\(r\(\)\.label\)\) }, "Nested#binding:s\d+"\)/)
     // The inner loop's child text (`{t}`).
-    expect(on).toMatch(/String\(t\(\)\) }, "Nested#binding:s\d+"\)/)
+    expect(on).toMatch(/String\(t\(\)\)\) }, "Nested#binding:s\d+"\)/)
   })
 
   test('branch-scoped loop (loop inside a conditional) attributes its mapArray', () => {
@@ -132,7 +137,7 @@ describe('nested loop binding ids (#1795 Phase 3)', () => {
     const emitted = assertNoCoverageGap(staticLoopSource, 'StaticLoop')
     expect(emitted.length).toBeGreaterThanOrEqual(1)
     const on = clientJs(staticLoopSource, 'StaticLoop', true)
-    expect(on).toMatch(/textContent = String\(n\(\)\) }, "StaticLoop#binding:s\d+"\)/)
+    expect(on).toMatch(/__bfw_\w+\('s\d+', String\(n\(\)\)\) }, "StaticLoop#binding:s\d+"\)/)
   })
 
   test('component loop attributes its mapArray', () => {

package/src/__tests__/reactive-attrs-in-map.test.ts

@@ -68,7 +68,7 @@ describe('reactive attributes inside .map() callbacks', () => {
     expect(clientJs!.content).toContain('disabled')
   })
 
-  test('dynamic array: reactive className handled by reconcileElements re-render (no extra effect needed)', () => {
+  test('dynamic array: reactive className handled by mapArray re-render (no extra effect needed)', () => {
     const source = `
       'use client'
 
@@ -91,7 +91,7 @@ describe('reactive attributes inside .map() callbacks', () => {
 
     const clientJs = result.files.find(f => f.type === 'clientJs')
     expect(clientJs).toBeDefined()
-    // Dynamic arrays use reconcileElements which re-creates items on signal change
+    // Dynamic arrays use mapArray which re-creates items on signal change
     expect(clientJs!.content).toContain('mapArray')
   })
 
@@ -228,9 +228,11 @@ describe('reactive attributes inside .map() callbacks', () => {
     const result = compileJSX(source, 'L.tsx', { adapter })
     expect(result.errors.filter(e => e.severity === 'error')).toHaveLength(0)
     const js = result.files.find(f => f.type === 'clientJs')!.content
-    // Both effects must still be present.
+    // Both effects must still be present. The text effect writes through a
+    // claimed 'text' slot writer now (slot unification A3), not a bare
+    // `.textContent =` assignment.
     expect(js).toContain("setAttribute('class'")
-    expect(js).toMatch(/textContent\s*=\s*String\(item\.name\)/)
+    expect(js).toMatch(/__bfw_\w+\('s\d+', String\(item\.name\)\)/)
     // But there must be exactly one `items.forEach` call (not two).
     const forEachMatches = js.match(/items\.forEach\(/g) ?? []
     expect(forEachMatches.length).toBe(1)

package/src/__tests__/template-closure.test.ts

@@ -203,7 +203,7 @@ describe('#1128 — template body never reaches init-scope identifiers', () => {
 
     expect(tpl).not.toMatch(/\bitems\b/)
     // Bare `undefined.map(...)` would throw; substitute `[]` so the
-    // template renders an empty list and reconcileList populates it.
+    // template renders an empty list and mapArray populates it.
     expect(tpl).toMatch(/\$\{\[\]\.map\(/)
   })
 

package/src/compiler.ts

@@ -16,6 +16,7 @@ import { analyzeComponent, listComponentFunctions, createProgramForFile, needsTy
 import { jsxToIR } from './jsx-to-ir.ts'
 import { stripClientBuiltinImports } from './builtins.ts'
 import { generateClientJs, generateClientJsWithSourceMap, analyzeClientNeeds } from './ir-to-client-js/index.ts'
+import { decideClientOnlyElision } from './ir-to-client-js/client-only-elision.ts'
 import { emitModuleLevelDeclarations } from './ir-to-client-js/emit-module-level.ts'
 import { RUNTIME_MODULE, detectUsedImports as detectUsedImportsFromCode } from './ir-to-client-js/imports.ts'
 import { setActiveComponentScope, computeFileScope } from './ir-to-client-js/component-scope.ts'
@@ -140,6 +141,10 @@ function compileMultipleComponents(
     componentIR.metadata.clientAnalysis = analyzeClientNeeds(componentIR)
     checkRichTypeMethodCalls(componentIR.root, componentIR.metadata, errors)
 
+    // Slot unification Step B — see the single-component path's identical
+    // call for why this must run before adapter.generate/generateClientJs.
+    decideClientOnlyElision(componentIR.root)
+
     if (options.cssLayerPrefix) {
       applyCssLayerPrefix(componentIR, options.cssLayerPrefix)
     }
@@ -619,6 +624,12 @@ export function compileJSX(
   componentIR.metadata.clientAnalysis = analyzeClientNeeds(componentIR)
   checkRichTypeMethodCalls(componentIR.root, componentIR.metadata, errors)
 
+  // Slot unification Step B (`spec/slot-unification.md` §5 Step B): decide
+  // marker elision ONCE, mutating `componentIR.root` in place, before either
+  // `adapter.generate` or `generateClientJs` run below — both must see the
+  // SAME `markerless`/`elidedPath` flags on the SAME IR nodes.
+  decideClientOnlyElision(componentIR.root)
+
   // Cross-file @client signal sources: identify which import sources
   // need `.client.js` path rewriting in the client bundle.
   if (ctx.importedClientSignalNames.size > 0) {

package/src/index.ts

@@ -65,6 +65,7 @@ export { createProgramForCorpus, type SharedProgramOptions } from './shared-prog
 
 // JSX to IR transformer
 export { jsxToIR } from './jsx-to-ir.ts'
+export { decideClientOnlyElision } from './ir-to-client-js/client-only-elision.ts'
 
 // Module exports generation (compiler layer)
 export { generateModuleExports, extractFunctionParams, formatParamWithType, findReachableNames } from './module-exports.ts'