@barefootjs/xslate 0.30.0 → 0.30.3

package/dist/adapter/index.js

@@ -188282,6 +188282,7 @@ class XslateAdapter extends BaseAdapter {
   _loweringMatchers = [];
   localConstants = [];
   staticLoopSourceBoundNames = new Set;
+  loopBoundNames = new Map;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188298,6 +188299,7 @@ class XslateAdapter extends BaseAdapter {
     this.booleanTypedProps = collectBooleanTypedProps(ir);
     this.localConstants = ir.metadata.localConstants ?? [];
     this.staticLoopSourceBoundNames = collectLoopBoundNames2(ir);
+    this.loopBoundNames.clear();
     this.nullableOptionalProps = collectNullableOptionalProps(ir);
     this.stringValueNames = collectStringValueNames(ir);
     this.moduleStringConsts = collectModuleStringConsts(ir.metadata.localConstants);
@@ -188629,7 +188631,35 @@ ${whenTrue}
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`);
+    const loopBound = [];
+    if (loop.objectIteration === "entries") {
+      loopBound.push("__bf_pair", loop.index ?? param, param);
+    } else if (loop.objectIteration === "keys" || loop.objectIteration === "values") {
+      loopBound.push(param);
+    } else if (loop.iterationShape === "keys") {
+      loopBound.push("__bf_item", param);
+    } else if (supportableDestructure) {
+      loopBound.push("__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name));
+      if (loop.index)
+        loopBound.push(loop.index);
+    } else {
+      loopBound.push(param);
+      if (loop.index)
+        loopBound.push(loop.index);
+    }
+    for (const d of loop.preamble?.declarations ?? [])
+      loopBound.push(d.name);
+    for (const n of loopBound) {
+      this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
+    }
     const childrenUnderLoop = this.renderChildren(loop.children);
+    for (const n of loopBound) {
+      const c = (this.loopBoundNames.get(n) ?? 1) - 1;
+      if (c <= 0)
+        this.loopBoundNames.delete(n);
+      else
+        this.loopBoundNames.set(n, c);
+    }
     this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
     const bodyChildren = loop.bodyIsItemConditional && loop.key ? `<: $bf.comment("loop-i:" ~ ${this.convertExpressionToKolon(loop.key)}) | mark_raw :>
@@ -188807,7 +188837,7 @@ ${children}`;
       }
       const bareId = value.expr.trim();
       const normalizedBareId = this.propsObjectName && bareId.startsWith(`${this.propsObjectName}.`) ? bareId.slice(this.propsObjectName.length + 1) : bareId;
-      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId)) {
+      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId) && !this.isLoopBoundName(normalizedBareId)) {
         const perl2 = this.convertExpressionToKolon(value.expr);
         const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr) ? `${name}="<: $bf.bool_str(${perl2}) :>"` : `${name}="<: ${perl2} :>"`;
         return `
@@ -189082,8 +189112,13 @@ Options:
     }
     if (!/^[A-Za-z_$][\w$]*$/.test(bare))
       return false;
+    if (this.isLoopBoundName(bare))
+      return false;
     return this.booleanTypedProps.has(bare);
   }
+  isLoopBoundName(name) {
+    return this.loopBoundNames.has(name);
+  }
   _resolveLiteralConst(name) {
     if (this.staticLoopSourceBoundNames.has(name))
       return null;

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

@@ -114,6 +114,20 @@ export declare class XslateAdapter extends BaseAdapter implements IRNodeEmitter<
      * `collectLoopBoundNames` use in `collectStringValueNames`.
      */
     private staticLoopSourceBoundNames;
+    /**
+     * Names currently bound by an enclosing loop body — the block-param
+     * locals `renderLoop` introduces (item, index, per-binding destructure
+     * fields, `.map()` preamble declarations) — ref-counted so nested loops
+     * compose. This is the POSITION-ACCURATE twin of the coarse
+     * `staticLoopSourceBoundNames` above: that set is a whole-component
+     * union used only to guard static-const inlining (safe to over-suppress
+     * there — the fallback is just "don't inline"), whereas the boolean-prop
+     * and nullable-optional classification sites need to know whether a name
+     * is loop-bound AT THIS POSITION, because for those two the coarse
+     * fallback would silently mis-render a genuine prop occurrence outside
+     * the loop too (#2488).
+     */
+    private loopBoundNames;
     /**
      * Optional, no-default props that are `undef` when the caller omits them.
      * Their bare-reference attribute emission is guarded with Kolon `defined` so
@@ -326,6 +340,8 @@ export declare class XslateAdapter extends BaseAdapter implements IRNodeEmitter<
         consequent: string;
     } | null;
     isBooleanTypedPropRef(expr: string): boolean;
+    /** Position-accurate loop-bound-name check — see `loopBoundNames`'s docstring. */
+    private isLoopBoundName;
     /**
      * Inline a const (any scope) whose initializer is a pure numeric or
      * single-quoted string literal (`const totalPages = 5`, #1897

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

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

package/dist/build.js

@@ -188282,6 +188282,7 @@ class XslateAdapter extends BaseAdapter {
   _loweringMatchers = [];
   localConstants = [];
   staticLoopSourceBoundNames = new Set;
+  loopBoundNames = new Map;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188298,6 +188299,7 @@ class XslateAdapter extends BaseAdapter {
     this.booleanTypedProps = collectBooleanTypedProps(ir);
     this.localConstants = ir.metadata.localConstants ?? [];
     this.staticLoopSourceBoundNames = collectLoopBoundNames2(ir);
+    this.loopBoundNames.clear();
     this.nullableOptionalProps = collectNullableOptionalProps(ir);
     this.stringValueNames = collectStringValueNames(ir);
     this.moduleStringConsts = collectModuleStringConsts(ir.metadata.localConstants);
@@ -188629,7 +188631,35 @@ ${whenTrue}
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`);
+    const loopBound = [];
+    if (loop.objectIteration === "entries") {
+      loopBound.push("__bf_pair", loop.index ?? param, param);
+    } else if (loop.objectIteration === "keys" || loop.objectIteration === "values") {
+      loopBound.push(param);
+    } else if (loop.iterationShape === "keys") {
+      loopBound.push("__bf_item", param);
+    } else if (supportableDestructure) {
+      loopBound.push("__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name));
+      if (loop.index)
+        loopBound.push(loop.index);
+    } else {
+      loopBound.push(param);
+      if (loop.index)
+        loopBound.push(loop.index);
+    }
+    for (const d of loop.preamble?.declarations ?? [])
+      loopBound.push(d.name);
+    for (const n of loopBound) {
+      this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
+    }
     const childrenUnderLoop = this.renderChildren(loop.children);
+    for (const n of loopBound) {
+      const c = (this.loopBoundNames.get(n) ?? 1) - 1;
+      if (c <= 0)
+        this.loopBoundNames.delete(n);
+      else
+        this.loopBoundNames.set(n, c);
+    }
     this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
     const bodyChildren = loop.bodyIsItemConditional && loop.key ? `<: $bf.comment("loop-i:" ~ ${this.convertExpressionToKolon(loop.key)}) | mark_raw :>
@@ -188807,7 +188837,7 @@ ${children}`;
       }
       const bareId = value.expr.trim();
       const normalizedBareId = this.propsObjectName && bareId.startsWith(`${this.propsObjectName}.`) ? bareId.slice(this.propsObjectName.length + 1) : bareId;
-      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId)) {
+      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId) && !this.isLoopBoundName(normalizedBareId)) {
         const perl2 = this.convertExpressionToKolon(value.expr);
         const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr) ? `${name}="<: $bf.bool_str(${perl2}) :>"` : `${name}="<: ${perl2} :>"`;
         return `
@@ -189082,8 +189112,13 @@ Options:
     }
     if (!/^[A-Za-z_$][\w$]*$/.test(bare))
       return false;
+    if (this.isLoopBoundName(bare))
+      return false;
     return this.booleanTypedProps.has(bare);
   }
+  isLoopBoundName(name) {
+    return this.loopBoundNames.has(name);
+  }
   _resolveLiteralConst(name) {
     if (this.staticLoopSourceBoundNames.has(name))
       return null;

package/dist/index.js

@@ -188282,6 +188282,7 @@ class XslateAdapter extends BaseAdapter {
   _loweringMatchers = [];
   localConstants = [];
   staticLoopSourceBoundNames = new Set;
+  loopBoundNames = new Map;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188298,6 +188299,7 @@ class XslateAdapter extends BaseAdapter {
     this.booleanTypedProps = collectBooleanTypedProps(ir);
     this.localConstants = ir.metadata.localConstants ?? [];
     this.staticLoopSourceBoundNames = collectLoopBoundNames2(ir);
+    this.loopBoundNames.clear();
     this.nullableOptionalProps = collectNullableOptionalProps(ir);
     this.stringValueNames = collectStringValueNames(ir);
     this.moduleStringConsts = collectModuleStringConsts(ir.metadata.localConstants);
@@ -188629,7 +188631,35 @@ ${whenTrue}
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`);
+    const loopBound = [];
+    if (loop.objectIteration === "entries") {
+      loopBound.push("__bf_pair", loop.index ?? param, param);
+    } else if (loop.objectIteration === "keys" || loop.objectIteration === "values") {
+      loopBound.push(param);
+    } else if (loop.iterationShape === "keys") {
+      loopBound.push("__bf_item", param);
+    } else if (supportableDestructure) {
+      loopBound.push("__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name));
+      if (loop.index)
+        loopBound.push(loop.index);
+    } else {
+      loopBound.push(param);
+      if (loop.index)
+        loopBound.push(loop.index);
+    }
+    for (const d of loop.preamble?.declarations ?? [])
+      loopBound.push(d.name);
+    for (const n of loopBound) {
+      this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
+    }
     const childrenUnderLoop = this.renderChildren(loop.children);
+    for (const n of loopBound) {
+      const c = (this.loopBoundNames.get(n) ?? 1) - 1;
+      if (c <= 0)
+        this.loopBoundNames.delete(n);
+      else
+        this.loopBoundNames.set(n, c);
+    }
     this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
     const bodyChildren = loop.bodyIsItemConditional && loop.key ? `<: $bf.comment("loop-i:" ~ ${this.convertExpressionToKolon(loop.key)}) | mark_raw :>
@@ -188807,7 +188837,7 @@ ${children}`;
       }
       const bareId = value.expr.trim();
       const normalizedBareId = this.propsObjectName && bareId.startsWith(`${this.propsObjectName}.`) ? bareId.slice(this.propsObjectName.length + 1) : bareId;
-      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId)) {
+      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId) && !this.isLoopBoundName(normalizedBareId)) {
         const perl2 = this.convertExpressionToKolon(value.expr);
         const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr) ? `${name}="<: $bf.bool_str(${perl2}) :>"` : `${name}="<: ${perl2} :>"`;
         return `
@@ -189082,8 +189112,13 @@ Options:
     }
     if (!/^[A-Za-z_$][\w$]*$/.test(bare))
       return false;
+    if (this.isLoopBoundName(bare))
+      return false;
     return this.booleanTypedProps.has(bare);
   }
+  isLoopBoundName(name) {
+    return this.loopBoundNames.has(name);
+  }
   _resolveLiteralConst(name) {
     if (this.staticLoopSourceBoundNames.has(name))
       return null;
@@ -189167,7 +189202,8 @@ var conformancePins = {
 // src/render-divergences.ts
 var renderDivergences = {
   "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)",
-  "composite-row-child-aliased-prop": "same #2460 defect as `aliased-destructured-prop`, inside a keyed `.map()` loop row: the nested child's renamed prop (`{ n: count }`) is always undefined, so both rows render an empty count (https://github.com/piconic-ai/barefootjs/issues/2460)"
+  "composite-row-child-aliased-prop": "same #2460 defect as `aliased-destructured-prop`, inside a keyed `.map()` loop row: the nested child's renamed prop (`{ n: count }`) is always undefined, so both rows render an empty count (https://github.com/piconic-ai/barefootjs/issues/2460)",
+  "loop-param-shadows-spread-const": "a .map() param shadowing an object const is resolved by `emitSpread` against `localConstants` with no loop-shadow check, so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)"
 };
 export {
   xslateAdapter,

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,iBAkB/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,iBAwB/B,CAAA"}

package/lib/BarefootJS/Backend/Xslate.pm

@@ -1,5 +1,5 @@
 package BarefootJS::Backend::Xslate;
-our $VERSION = "0.29.0";
+our $VERSION = "0.30.2";
 use strict;
 use warnings;
 use utf8;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/xslate",
-  "version": "0.30.0",
+  "version": "0.30.3",
   "description": "Text::Xslate (Kolon) adapter for BarefootJS — compiles IR to .tx templates and ships the Xslate rendering backend; runs under any PSGI/Plack app",
   "type": "module",
   "main": "./dist/index.js",
@@ -55,14 +55,14 @@
     "directory": "packages/adapter-xslate"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.30.0"
+    "@barefootjs/shared": "0.30.3"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.30.0",
+    "@barefootjs/jsx": "0.30.2",
     "typescript": "^5.0.0"
   }
 }

package/src/adapter/xslate-adapter.ts

@@ -259,6 +259,21 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
    */
   private staticLoopSourceBoundNames: Set<string> = new Set()
 
+  /**
+   * Names currently bound by an enclosing loop body — the block-param
+   * locals `renderLoop` introduces (item, index, per-binding destructure
+   * fields, `.map()` preamble declarations) — ref-counted so nested loops
+   * compose. This is the POSITION-ACCURATE twin of the coarse
+   * `staticLoopSourceBoundNames` above: that set is a whole-component
+   * union used only to guard static-const inlining (safe to over-suppress
+   * there — the fallback is just "don't inline"), whereas the boolean-prop
+   * and nullable-optional classification sites need to know whether a name
+   * is loop-bound AT THIS POSITION, because for those two the coarse
+   * fallback would silently mis-render a genuine prop occurrence outside
+   * the loop too (#2488).
+   */
+  private loopBoundNames: Map<string, number> = new Map()
+
   /**
    * Optional, no-default props that are `undef` when the caller omits them.
    * Their bare-reference attribute emission is guarded with Kolon `defined` so
@@ -292,6 +307,7 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
     this.booleanTypedProps = collectBooleanTypedProps(ir)
     this.localConstants = ir.metadata.localConstants ?? []
     this.staticLoopSourceBoundNames = collectLoopBoundNames(ir)
+    this.loopBoundNames.clear()
     this.nullableOptionalProps = collectNullableOptionalProps(ir)
     this.stringValueNames = collectStringValueNames(ir)
     this.moduleStringConsts = collectModuleStringConsts(ir.metadata.localConstants)
@@ -889,7 +905,40 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
     const preambleLines = (loop.preamble?.declarations ?? []).map(
       d => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`,
     )
+    // Names this loop binds in body scope, for the position-accurate
+    // `loopBoundNames` guard (#2488) — mirrors the ERB adapter's `loopBound`
+    // derivation, adapted to what THIS renderLoop actually binds: the
+    // for-header target(s) (`loopVar` / `objectIteration` key+value /
+    // `iterationShape === 'keys'`'s `param`), each `indexLocalLines` name
+    // (explicit index, or a destructure binding), and the `.map()`
+    // preamble's declared locals. Ref-counted so nested loops compose.
+    const loopBound: string[] = []
+    if (loop.objectIteration === 'entries') {
+      // `.kv()` binds the pair var the key/value locals are derived from (#2488).
+      loopBound.push('__bf_pair', loop.index ?? param, param)
+    } else if (loop.objectIteration === 'keys' || loop.objectIteration === 'values') {
+      loopBound.push(param)
+    } else if (loop.iterationShape === 'keys') {
+      // The header still binds the throwaway loop var; `param` is only the
+      // index alias derived from it beneath (#2488).
+      loopBound.push('__bf_item', param)
+    } else if (supportableDestructure) {
+      loopBound.push('__bf_item', ...(loop.paramBindings ?? []).map(b => b.name))
+      if (loop.index) loopBound.push(loop.index)
+    } else {
+      loopBound.push(param)
+      if (loop.index) loopBound.push(loop.index)
+    }
+    for (const d of loop.preamble?.declarations ?? []) loopBound.push(d.name)
+    for (const n of loopBound) {
+      this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1)
+    }
     const childrenUnderLoop = this.renderChildren(loop.children)
+    for (const n of loopBound) {
+      const c = (this.loopBoundNames.get(n) ?? 1) - 1
+      if (c <= 0) this.loopBoundNames.delete(n)
+      else this.loopBoundNames.set(n, c)
+    }
     this.currentLoopKeyDepth = prevLoopKeyDepth
     this.inLoop = prevInLoop
     void renderedChildren
@@ -1269,7 +1318,11 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
         !isBooleanAttr(name) &&
         !value.presenceOrUndefined &&
         /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) &&
-        this.nullableOptionalProps.has(normalizedBareId)
+        this.nullableOptionalProps.has(normalizedBareId) &&
+        // Inside a `.map()` callback, a param that shadows a nullable
+        // optional prop's name is the row binding, not the prop — skip the
+        // spurious `defined` guard (#2488).
+        !this.isLoopBoundName(normalizedBareId)
       ) {
         const perl = this.convertExpressionToKolon(value.expr)
         const body =
@@ -1750,9 +1803,18 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
       bare = bare.slice(this.propsObjectName.length + 1)
     }
     if (!/^[A-Za-z_$][\w$]*$/.test(bare)) return false
+    // Inside a `.map()` callback, a param that shares a boolean prop's name
+    // is the ROW binding, not the prop — route it through plain string
+    // emission instead of `$bf.bool_str` (#2488).
+    if (this.isLoopBoundName(bare)) return false
     return this.booleanTypedProps.has(bare)
   }
 
+  /** Position-accurate loop-bound-name check — see `loopBoundNames`'s docstring. */
+  private isLoopBoundName(name: string): boolean {
+    return this.loopBoundNames.has(name)
+  }
+
   /**
    * Inline a const (any scope) whose initializer is a pure numeric or
    * single-quoted string literal (`const totalPages = 5`, #1897

package/src/render-divergences.ts

@@ -32,4 +32,10 @@ export const renderDivergences: RenderDivergences = {
     '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)',
   'composite-row-child-aliased-prop':
     'same #2460 defect as `aliased-destructured-prop`, inside a keyed `.map()` loop row: the nested child\'s renamed prop (`{ n: count }`) is always undefined, so both rows render an empty count (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-spread-const':
+    'a .map() param shadowing an object const is resolved by `emitSpread` against `localConstants` with no loop-shadow check, so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)',
 }