@barefootjs/erb 0.29.0 → 0.30.2

package/dist/adapter/erb-adapter.d.ts

@@ -61,7 +61,6 @@ export declare class ErbAdapter extends BaseAdapter implements IRNodeEmitter<Erb
     private rootScopeNodes;
     private options;
     private errors;
-    private inLoop;
     /**
      * `IRLoop.depth` of the loop currently being rendered (save/restore
      * around `renderChildren(loop.children)`, mirroring `inLoop` above).

package/dist/adapter/erb-adapter.d.ts.map

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

package/dist/adapter/index.js

@@ -187313,7 +187313,8 @@ import {
   resolveDangerousInnerHtml,
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
-  resolveStaticLoopSource
+  resolveStaticLoopSource,
+  derivesScopeFromSlot
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188374,7 +188375,6 @@ class ErbAdapter extends BaseAdapter {
   rootScopeNodes = new Set;
   options;
   errors = [];
-  inLoop = false;
   currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
@@ -188784,16 +188784,16 @@ ${whenTrue}
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? rubyLocal(param) : rubyLocal(loop.index ?? "_i");
     const loopBound = loop.objectIteration === "entries" ? [param, loop.index ?? "_k"] : loop.objectIteration === "keys" || loop.objectIteration === "values" || loop.iterationShape === "keys" ? [param] : supportableDestructure ? ["__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name), loop.index ?? "_i"] : [param, loop.index ?? "_i"];
+    const preambleDecls = loop.preamble?.declarations ?? [];
+    for (const d of preambleDecls)
+      loopBound.push(d.name);
     for (const n of loopBound) {
       this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
     }
-    const prevInLoop = this.inLoop;
-    this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const renderedChildren = this.renderChildren(loop.children);
     this.currentLoopKeyDepth = prevLoopKeyDepth;
-    this.inLoop = prevInLoop;
     const children = loop.bodyIsItemConditional && loop.key ? `<%= bf.comment("loop-i:" + bf.string(${this.convertExpressionToRuby(loop.key)})) %>
 ${renderedChildren}` : renderedChildren;
     const lines = [];
@@ -188851,6 +188851,7 @@ ${renderedChildren}` : renderedChildren;
         }
       }
     }
+    const preambleLines = preambleDecls.map((d) => `<%- ${rubyLocal(d.name)} = ${this.convertExpressionToRuby(d.raw, d.valueParsed)} -%>`);
     if (loop.filterPredicate) {
       let filterCond;
       if (loop.filterPredicate.predicate) {
@@ -188861,9 +188862,11 @@ ${renderedChildren}` : renderedChildren;
         filterCond = "true";
       }
       lines.push(`<%- if bf.truthy?(${filterCond}) -%>`);
+      lines.push(...preambleLines);
       lines.push(children);
       lines.push(`<%- end -%>`);
     } else {
+      lines.push(...preambleLines);
       lines.push(children);
     }
     for (const n of loopBound) {
@@ -188907,10 +188910,7 @@ ${renderedChildren}` : renderedChildren;
       if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
       if (p.value.kind === "jsx-children" && p.name !== "children") {
-        const prevInLoop = this.inLoop;
-        this.inLoop = false;
         const slotBody = this.renderChildren(p.value.children);
-        this.inLoop = prevInLoop;
         const suffix = `${this.childrenCaptureCounter++}`;
         const lenVar = `__bf_len_${suffix}`;
         const rawVar = `__bf_praw_${suffix}`;
@@ -188923,16 +188923,13 @@ ${renderedChildren}` : renderedChildren;
       if (lowered)
         propParts.push(lowered);
     }
-    if (comp.slotId && !this.inLoop) {
+    if (derivesScopeFromSlot(comp)) {
       propParts.push(`${rubySymbolKey("_bf_slot")} '${comp.slotId}'`);
     }
     const tplName = this.toTemplateName(comp.name);
     const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length > 0) {
-      const prevInLoop = this.inLoop;
-      this.inLoop = false;
       const childrenBody = this.renderChildren(effectiveChildren);
-      this.inLoop = prevInLoop;
       const suffix = comp.slotId ?? `c${this.childrenCaptureCounter++}`;
       const lenVar = `__bf_len_${suffix}`;
       const capVar = `__bf_children_${suffix}`;

package/dist/build.js

@@ -187313,7 +187313,8 @@ import {
   resolveDangerousInnerHtml,
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
-  resolveStaticLoopSource
+  resolveStaticLoopSource,
+  derivesScopeFromSlot
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188374,7 +188375,6 @@ class ErbAdapter extends BaseAdapter {
   rootScopeNodes = new Set;
   options;
   errors = [];
-  inLoop = false;
   currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
@@ -188784,16 +188784,16 @@ ${whenTrue}
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? rubyLocal(param) : rubyLocal(loop.index ?? "_i");
     const loopBound = loop.objectIteration === "entries" ? [param, loop.index ?? "_k"] : loop.objectIteration === "keys" || loop.objectIteration === "values" || loop.iterationShape === "keys" ? [param] : supportableDestructure ? ["__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name), loop.index ?? "_i"] : [param, loop.index ?? "_i"];
+    const preambleDecls = loop.preamble?.declarations ?? [];
+    for (const d of preambleDecls)
+      loopBound.push(d.name);
     for (const n of loopBound) {
       this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
     }
-    const prevInLoop = this.inLoop;
-    this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const renderedChildren = this.renderChildren(loop.children);
     this.currentLoopKeyDepth = prevLoopKeyDepth;
-    this.inLoop = prevInLoop;
     const children = loop.bodyIsItemConditional && loop.key ? `<%= bf.comment("loop-i:" + bf.string(${this.convertExpressionToRuby(loop.key)})) %>
 ${renderedChildren}` : renderedChildren;
     const lines = [];
@@ -188851,6 +188851,7 @@ ${renderedChildren}` : renderedChildren;
         }
       }
     }
+    const preambleLines = preambleDecls.map((d) => `<%- ${rubyLocal(d.name)} = ${this.convertExpressionToRuby(d.raw, d.valueParsed)} -%>`);
     if (loop.filterPredicate) {
       let filterCond;
       if (loop.filterPredicate.predicate) {
@@ -188861,9 +188862,11 @@ ${renderedChildren}` : renderedChildren;
         filterCond = "true";
       }
       lines.push(`<%- if bf.truthy?(${filterCond}) -%>`);
+      lines.push(...preambleLines);
       lines.push(children);
       lines.push(`<%- end -%>`);
     } else {
+      lines.push(...preambleLines);
       lines.push(children);
     }
     for (const n of loopBound) {
@@ -188907,10 +188910,7 @@ ${renderedChildren}` : renderedChildren;
       if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
       if (p.value.kind === "jsx-children" && p.name !== "children") {
-        const prevInLoop = this.inLoop;
-        this.inLoop = false;
         const slotBody = this.renderChildren(p.value.children);
-        this.inLoop = prevInLoop;
         const suffix = `${this.childrenCaptureCounter++}`;
         const lenVar = `__bf_len_${suffix}`;
         const rawVar = `__bf_praw_${suffix}`;
@@ -188923,16 +188923,13 @@ ${renderedChildren}` : renderedChildren;
       if (lowered)
         propParts.push(lowered);
     }
-    if (comp.slotId && !this.inLoop) {
+    if (derivesScopeFromSlot(comp)) {
       propParts.push(`${rubySymbolKey("_bf_slot")} '${comp.slotId}'`);
     }
     const tplName = this.toTemplateName(comp.name);
     const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length > 0) {
-      const prevInLoop = this.inLoop;
-      this.inLoop = false;
       const childrenBody = this.renderChildren(effectiveChildren);
-      this.inLoop = prevInLoop;
       const suffix = comp.slotId ?? `c${this.childrenCaptureCounter++}`;
       const lenVar = `__bf_len_${suffix}`;
       const capVar = `__bf_children_${suffix}`;

package/dist/conformance-pins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eA8I7B,CAAA"}
+{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eAyI7B,CAAA"}

package/dist/index.js

@@ -187313,7 +187313,8 @@ import {
   resolveDangerousInnerHtml,
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
-  resolveStaticLoopSource
+  resolveStaticLoopSource,
+  derivesScopeFromSlot
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188374,7 +188375,6 @@ class ErbAdapter extends BaseAdapter {
   rootScopeNodes = new Set;
   options;
   errors = [];
-  inLoop = false;
   currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
@@ -188784,16 +188784,16 @@ ${whenTrue}
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? rubyLocal(param) : rubyLocal(loop.index ?? "_i");
     const loopBound = loop.objectIteration === "entries" ? [param, loop.index ?? "_k"] : loop.objectIteration === "keys" || loop.objectIteration === "values" || loop.iterationShape === "keys" ? [param] : supportableDestructure ? ["__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name), loop.index ?? "_i"] : [param, loop.index ?? "_i"];
+    const preambleDecls = loop.preamble?.declarations ?? [];
+    for (const d of preambleDecls)
+      loopBound.push(d.name);
     for (const n of loopBound) {
       this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
     }
-    const prevInLoop = this.inLoop;
-    this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const renderedChildren = this.renderChildren(loop.children);
     this.currentLoopKeyDepth = prevLoopKeyDepth;
-    this.inLoop = prevInLoop;
     const children = loop.bodyIsItemConditional && loop.key ? `<%= bf.comment("loop-i:" + bf.string(${this.convertExpressionToRuby(loop.key)})) %>
 ${renderedChildren}` : renderedChildren;
     const lines = [];
@@ -188851,6 +188851,7 @@ ${renderedChildren}` : renderedChildren;
         }
       }
     }
+    const preambleLines = preambleDecls.map((d) => `<%- ${rubyLocal(d.name)} = ${this.convertExpressionToRuby(d.raw, d.valueParsed)} -%>`);
     if (loop.filterPredicate) {
       let filterCond;
       if (loop.filterPredicate.predicate) {
@@ -188861,9 +188862,11 @@ ${renderedChildren}` : renderedChildren;
         filterCond = "true";
       }
       lines.push(`<%- if bf.truthy?(${filterCond}) -%>`);
+      lines.push(...preambleLines);
       lines.push(children);
       lines.push(`<%- end -%>`);
     } else {
+      lines.push(...preambleLines);
       lines.push(children);
     }
     for (const n of loopBound) {
@@ -188907,10 +188910,7 @@ ${renderedChildren}` : renderedChildren;
       if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
       if (p.value.kind === "jsx-children" && p.name !== "children") {
-        const prevInLoop = this.inLoop;
-        this.inLoop = false;
         const slotBody = this.renderChildren(p.value.children);
-        this.inLoop = prevInLoop;
         const suffix = `${this.childrenCaptureCounter++}`;
         const lenVar = `__bf_len_${suffix}`;
         const rawVar = `__bf_praw_${suffix}`;
@@ -188923,16 +188923,13 @@ ${renderedChildren}` : renderedChildren;
       if (lowered)
         propParts.push(lowered);
     }
-    if (comp.slotId && !this.inLoop) {
+    if (derivesScopeFromSlot(comp)) {
       propParts.push(`${rubySymbolKey("_bf_slot")} '${comp.slotId}'`);
     }
     const tplName = this.toTemplateName(comp.name);
     const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length > 0) {
-      const prevInLoop = this.inLoop;
-      this.inLoop = false;
       const childrenBody = this.renderChildren(effectiveChildren);
-      this.inLoop = prevInLoop;
       const suffix = comp.slotId ?? `c${this.childrenCaptureCounter++}`;
       const lenVar = `__bf_len_${suffix}`;
       const capVar = `__bf_children_${suffix}`;
@@ -189266,7 +189263,6 @@ var erbAdapter = new ErbAdapter;
 // src/conformance-pins.ts
 var conformancePins = {
   "filter-typeof-predicate": [{ code: "BF021", severity: "error" }],
-  "map-preamble-branch-body": [{ code: "BF021", severity: "error" }],
   "map-array-builder-body": [{ code: "BF021", severity: "error" }],
   "map-array-builder-escaping": [{ code: "BF021", severity: "error" }],
   "fill-unsupported": [{ code: "BF101", severity: "error" }],
@@ -189291,7 +189287,10 @@ var conformancePins = {
 };
 // src/render-divergences.ts
 var renderDivergences = {
-  "composite-row-child-component": "a child component nested inside a dynamic loop row gets a random `Name_<id>` scope id from `render_child` instead of the parent-derived `<parent>_s0` the reference emits (https://github.com/piconic-ai/barefootjs/issues/2444)"
+  "aliased-destructured-prop": "aliased destructured prop `{ n: count }` loses its rename — template vars, ssr-defaults, and the props bridge all key off the local name, so the prop is always undefined (https://github.com/piconic-ai/barefootjs/issues/2460)",
+  "loop-param-shadows-bool-prop": 'a .map() param sharing a boolean prop\'s name is routed through the bool lowering in attribute position (renders "true"/"false" instead of the row string) — `collectBooleanTypedProps` lacks the loop-bound-name subtraction its sibling `collectStringValueNames` got in #2236 (https://github.com/piconic-ai/barefootjs/issues/2488)',
+  "loop-param-shadows-spread-const": "a .map() param shadowing an object const is resolved by `emitSpread` against `localConstants` with no loop-shadow check (the live `loopBoundNames` map exists but is not consulted on this path), so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)",
+  "loop-param-shadows-record-template-span": 'a dynamic-key element access on a loop row (`tone[k]`) renders empty: row hashes deserialize with SYMBOL keys while the dynamic key is a STRING, so `tone["a"]` is nil (https://github.com/piconic-ai/barefootjs/issues/2491)'
 };
 export {
   renderDivergences,

package/dist/render-divergences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-divergences.d.ts","sourceRoot":"","sources":["../src/render-divergences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBAe/B,CAAA"}
+{"version":3,"file":"render-divergences.d.ts","sourceRoot":"","sources":["../src/render-divergences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBA0B/B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/erb",
-  "version": "0.29.0",
+  "version": "0.30.2",
   "description": "ERB (Embedded Ruby) adapter for BarefootJS — compiles IR to .erb templates and ships the Ruby rendering backend; runs under any Rack app (Sinatra, Rails)",
   "type": "module",
   "main": "./dist/index.js",
@@ -54,14 +54,14 @@
     "directory": "packages/adapter-erb"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.29.0"
+    "@barefootjs/shared": "0.30.2"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.29.0",
+    "@barefootjs/jsx": "0.30.2",
     "typescript": "^5.0.0"
   }
 }

package/src/adapter/erb-adapter.ts

@@ -93,6 +93,7 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
+  derivesScopeFromSlot,
 } from '@barefootjs/jsx'
 import { isAriaBooleanAttr, isBooleanResultExpr, isExplicitStringCall } from './boolean-result.ts'
 import type { ParsedExpr, LoweringMatcher, LoopBindingPathSegment } from '@barefootjs/jsx'
@@ -182,7 +183,6 @@ export class ErbAdapter extends BaseAdapter implements IRNodeEmitter<ErbRenderCt
   private rootScopeNodes: Set<IRNode> = new Set()
   private options: Required<ErbAdapterOptions>
   private errors: CompilerError[] = []
-  private inLoop: boolean = false
   /**
    * `IRLoop.depth` of the loop currently being rendered (save/restore
    * around `renderChildren(loop.children)`, mirroring `inLoop` above).
@@ -981,16 +981,21 @@ export class ErbAdapter extends BaseAdapter implements IRNodeEmitter<ErbRenderCt
         : supportableDestructure
           ? ['__bf_item', ...(loop.paramBindings ?? []).map(b => b.name), loop.index ?? '_i']
           : [param, loop.index ?? '_i']
+    // A `.map()` callback preamble lowers to one per-row Ruby local per
+    // declaration (#2447). The names must be loop-bound for the whole body,
+    // or `ErbTopLevelEmitter.identifier` renders each read as `v[:cls]` —
+    // a vars-Hash key nothing ever seeds, i.e. the empty attribute this
+    // fixes. Phase 1 guarantees `declarations` is present or the loop was
+    // already refused, so there is no partial-lowering case here.
+    const preambleDecls = loop.preamble?.declarations ?? []
+    for (const d of preambleDecls) loopBound.push(d.name)
     for (const n of loopBound) {
       this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1)
     }
-    const prevInLoop = this.inLoop
-    this.inLoop = true
     const prevLoopKeyDepth = this.currentLoopKeyDepth
     this.currentLoopKeyDepth = loop.depth
     const renderedChildren = this.renderChildren(loop.children)
     this.currentLoopKeyDepth = prevLoopKeyDepth
-    this.inLoop = prevInLoop
 
     // Whole-item conditional: prepend an always-present
     // `<!--bf-loop-i:KEY-->` anchor before each item's (possibly empty)
@@ -1104,6 +1109,15 @@ export class ErbAdapter extends BaseAdapter implements IRNodeEmitter<ErbRenderCt
     }
     }
 
+    // Per-row preamble locals (#2447), in source order so a later
+    // initializer sees an earlier local — same as the source block. Emitted
+    // INSIDE the filter guard below, matching JS evaluation order: a
+    // `.filter(p).map(cb)` chain never runs `cb`'s body for a filtered-out
+    // item.
+    const preambleLines = preambleDecls.map(
+      d => `<%- ${rubyLocal(d.name)} = ${this.convertExpressionToRuby(d.raw, d.valueParsed)} -%>`,
+    )
+
     // Handle filter().map() pattern by wrapping children in if-condition
     if (loop.filterPredicate) {
       let filterCond: string
@@ -1137,9 +1151,11 @@ export class ErbAdapter extends BaseAdapter implements IRNodeEmitter<ErbRenderCt
         filterCond = 'true'
       }
       lines.push(`<%- if bf.truthy?(${filterCond}) -%>`)
+      lines.push(...preambleLines)
       lines.push(children)
       lines.push(`<%- end -%>`)
     } else {
+      lines.push(...preambleLines)
       lines.push(children)
     }
 
@@ -1231,10 +1247,7 @@ export class ErbAdapter extends BaseAdapter implements IRNodeEmitter<ErbRenderCt
       // SSR (Hono renders neither; the client JS wires them at hydration).
       if ((p.name.match(/^on[A-Z]/) || p.name === 'ref') && p.value.kind === 'expression') continue
       if (p.value.kind === 'jsx-children' && p.name !== 'children') {
-        const prevInLoop = this.inLoop
-        this.inLoop = false
         const slotBody = this.renderChildren(p.value.children)
-        this.inLoop = prevInLoop
         // Purely counter-based — NOT derived from `p.name` or `comp.slotId`.
         // A JSX prop name can contain characters (`data-slot`) that aren't
         // valid in a Ruby local variable name, and `comp.slotId` alone
@@ -1255,9 +1268,9 @@ export class ErbAdapter extends BaseAdapter implements IRNodeEmitter<ErbRenderCt
       if (lowered) propParts.push(lowered)
     }
     // Pass slot ID so the child renderer can set correct scope ID for
-    // hydration. Skip for loop children — they use ComponentName_random
-    // pattern instead.
-    if (comp.slotId && !this.inLoop) {
+    // hydration. Skipped for a loop item root — it uses the
+    // ComponentName_random pattern instead (#2444).
+    if (derivesScopeFromSlot(comp)) {
       propParts.push(`${rubySymbolKey('_bf_slot')} '${comp.slotId}'`)
     }
     const tplName = this.toTemplateName(comp.name)
@@ -1282,10 +1295,7 @@ export class ErbAdapter extends BaseAdapter implements IRNodeEmitter<ErbRenderCt
       // tags and the children — the slice captures byte-for-byte whatever
       // `_erbout` gained in between, so any interposed template text would
       // leak into (or out of) the capture.
-      const prevInLoop = this.inLoop
-      this.inLoop = false
       const childrenBody = this.renderChildren(effectiveChildren)
-      this.inLoop = prevInLoop
       const suffix = comp.slotId ?? `c${this.childrenCaptureCounter++}`
       const lenVar = `__bf_len_${suffix}`
       const capVar = `__bf_children_${suffix}`

package/src/conformance-pins.ts

@@ -16,11 +16,6 @@ export const conformancePins: ConformancePins = {
   // JS-runtime target runs it, a DSL adapter surfaces BF021 + `/* @client */`.
   // See spec/callback-fidelity.md.
   'filter-typeof-predicate': [{ code: 'BF021', severity: 'error' }],
-  // A `.map()` body with a `const`/`let` preamble before its branches:
-  // a JS runtime folds it, a DSL adapter can't carry the loop-local into a
-  // conditional branch template, so it refuses with BF021 + `/* @client */`.
-  // See spec/callback-fidelity.md.
-  'map-preamble-branch-body': [{ code: 'BF021', severity: 'error' }],
   'map-array-builder-body': [{ code: 'BF021', severity: 'error' }],
   'map-array-builder-escaping': [{ code: 'BF021', severity: 'error' }],
   // `.fill(value)` mutates the receiver in place — no template lowering

package/src/render-divergences.ts

@@ -20,13 +20,24 @@ export const renderDivergences: RenderDivergences = {
   // instead of a fixed regex-shape catalogue) now correctly seeds `todos`
   // from `(props.initialTodos ?? []).map(t => ({ ...t, editing: false }))`.
 
-  // #2444: a child component nested inside a dynamic loop row whose root
-  // is a plain element (`composite` loop plan + `nestedComponents`) is
-  // rendered through the runtime's `render_child`, which mints its own
-  // `Badge_<random>` scope id instead of deriving the parent-scope +
-  // mount-slot id (`test_s0`) the Hono reference emits. Content is
-  // correct; only `bf-s` diverges. Same class as the `grandchild-
-  // composition` CSR skip.
-  'composite-row-child-component':
-    'a child component nested inside a dynamic loop row gets a random `Name_<id>` scope id from `render_child` instead of the parent-derived `<parent>_s0` the reference emits (https://github.com/piconic-ai/barefootjs/issues/2444)',
+  // Onboarding TSX-fidelity fixtures (PR #2461): `expectedHtml` is
+  // hand-authored to the CORRECT output because the emission bug lives in
+  // the shared compiler layer — every adapter, including the Hono
+  // reference, currently emits the broken form (verified against this
+  // adapter's emitted template; see each fixture's docstring). Graduate
+  // by fixing the shared emission, regenerating `expectedHtml` from the
+  // fixed reference, and deleting these lines (and the matching hono
+  // `skipJsx` entries).
+  'aliased-destructured-prop':
+    'aliased destructured prop `{ n: count }` loses its rename — template vars, ssr-defaults, and the props bridge all key off the local name, so the prop is always undefined (https://github.com/piconic-ai/barefootjs/issues/2460)',
+
+  // #2482 audit follow-ups: loop-scope holes in per-adapter name
+  // classification. Graduate by applying the loop-bound-name guards
+  // described in each issue and deleting the line.
+  'loop-param-shadows-bool-prop':
+    'a .map() param sharing a boolean prop\'s name is routed through the bool lowering in attribute position (renders "true"/"false" instead of the row string) — `collectBooleanTypedProps` lacks the loop-bound-name subtraction its sibling `collectStringValueNames` got in #2236 (https://github.com/piconic-ai/barefootjs/issues/2488)',
+  'loop-param-shadows-spread-const':
+    'a .map() param shadowing an object const is resolved by `emitSpread` against `localConstants` with no loop-shadow check (the live `loopBoundNames` map exists but is not consulted on this path), so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)',
+  'loop-param-shadows-record-template-span':
+    'a dynamic-key element access on a loop row (`tone[k]`) renders empty: row hashes deserialize with SYMBOL keys while the dynamic key is a STRING, so `tone["a"]` is nil (https://github.com/piconic-ai/barefootjs/issues/2491)',
 }