@barefootjs/rust 0.31.4 → 0.31.5

package/dist/adapter/index.js

@@ -187314,8 +187314,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  collectLoopBoundNames,
-  derivesScopeFromSlot
+  derivesScopeFromSlot,
+  BindingScope
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188315,8 +188315,7 @@ class MinijinjaAdapter extends BaseAdapter {
   _searchParamsLocals = new Set;
   _loweringMatchers = [];
   localConstants = [];
-  staticLoopSourceBoundNames = new Set;
-  loopBoundNames = new Map;
+  scope = BindingScope.EMPTY;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188332,8 +188331,7 @@ class MinijinjaAdapter extends BaseAdapter {
     this.propsParams = ir.metadata.propsParams.map((p) => ({ name: p.name }));
     this.booleanTypedProps = collectBooleanTypedProps(ir);
     this.localConstants = ir.metadata.localConstants ?? [];
-    this.staticLoopSourceBoundNames = collectLoopBoundNames(ir);
-    this.loopBoundNames.clear();
+    this.scope = BindingScope.EMPTY;
     this.nullableOptionalProps = collectNullableOptionalProps(ir);
     this.stringValueNames = collectStringValueNames(ir);
     this.moduleStringConsts = collectModuleStringConsts(ir.metadata.localConstants);
@@ -188627,7 +188625,7 @@ ${whenTrue}
       });
     }
     const staticItems = resolveStaticLoopSource(loop.arrayParsed, this.localConstants, {
-      isNameShadowed: (name) => this.staticLoopSourceBoundNames.has(name)
+      isNameShadowed: this.scope.asShadowPredicate()
     });
     const staticArray = staticItems !== null ? staticValueToMinijinja(staticItems) : null;
     const arrayName = loop.array.trim();
@@ -188681,42 +188679,15 @@ ${whenTrue}
     this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
+    const prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(loop);
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${minijinjaIdent(d.name)} = ${this.convertExpressionToJinja(d.raw, d.valueParsed)} %}`);
-    const loopBound = [];
-    if (loop.objectIteration === "entries") {
-      loopBound.push(loop.index ?? param, param);
-    } else if (loop.objectIteration === "keys") {
-      loopBound.push(param, "__bf_v");
-    } else if (loop.objectIteration === "values") {
-      loopBound.push("__bf_k", 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:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
 ${childrenUnderLoop}` : childrenUnderLoop;
+    this.scope = prevScope;
     const lines = [];
     lines.push(`{{ bf.comment("loop:${loop.markerId}") | safe }}`);
     const forHeader = loop.objectIteration === "entries" ? `{% for ${minijinjaIdent(loop.index ?? param)}, ${minijinjaIdent(param)} in ${array}|items %}` : loop.objectIteration === "keys" ? `{% for ${minijinjaIdent(param)}, __bf_v in ${array}|items %}` : loop.objectIteration === "values" ? `{% for __bf_k, ${minijinjaIdent(param)} in ${array}|items %}` : `{% for ${minijinjaIdent(loopVar)} in ${array} %}`;
@@ -188948,7 +188919,7 @@ ${name}="{{ bf.string(${val}) }}"
       if (ternaryDict !== null) {
         return `{{ bf.spread_attrs(${ternaryDict}) | safe }}`;
       }
-      if (/^[A-Za-z_$][\w$]*$/.test(trimmed) && !this.loopBoundNames.has(trimmed)) {
+      if (/^[A-Za-z_$][\w$]*$/.test(trimmed) && !this.scope.isBound(trimmed)) {
         const localConst = (this.localConstants ?? []).find((c) => c.name === trimmed && !c.isModule);
         if (localConst?.value !== undefined) {
           const initTrimmed = localConst.value.trim();
@@ -189183,7 +189154,7 @@ Options:
     return this.booleanTypedProps.has(bare);
   }
   isLoopBoundName(name) {
-    return this.loopBoundNames.has(name);
+    return this.scope.isBound(name);
   }
   shouldBoolStr(expr, name) {
     if (isExplicitStringCall(expr))
@@ -189191,7 +189162,7 @@ Options:
     return isBooleanResultExpr(expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(expr);
   }
   _resolveLiteralConst(name) {
-    if (this.staticLoopSourceBoundNames.has(name))
+    if (this.scope.isBound(name))
       return null;
     const c = (this.localConstants ?? []).find((lc) => lc.name === name);
     if (c?.value === undefined)
@@ -189205,9 +189176,7 @@ Options:
     return null;
   }
   _resolveStaticRecordLiteral(objectName, key) {
-    if (this.staticLoopSourceBoundNames.has(objectName))
-      return null;
-    const hit = lookupStaticRecordLiteral(objectName, key, this.localConstants);
+    const hit = lookupStaticRecordLiteral(objectName, key, this.localConstants, (name) => this.scope.isBound(name));
     if (!hit)
       return null;
     return hit.kind === "number" ? hit.text : `'${escapeMinijinjaSingleQuoted(hit.text)}'`;

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

@@ -193,29 +193,24 @@ export declare class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitt
      */
     private localConstants;
     /**
-     * Every name a `.map()`/`.filter()` loop callback binds as its item/index
-     * parameter anywhere in the component (#2208 fable review). A static
-     * loop-SOURCE name (e.g. a function-scope `const items = [...]`) must
-     * never resolve through `resolveStaticLoopSource` at a use site where a
-     * DIFFERENT, enclosing loop's own callback param shadows it — same
-     * shadowing hazard, and same coarse-but-safe mitigation, as #2212's
-     * `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 (#2488) and `emitSpread`'s
-     * local-const fallback (#2489) need to know whether a name is loop-bound
-     * AT THIS POSITION, because for those the coarse fallback would silently
-     * mis-render a genuine occurrence of the same name outside the loop too.
-     */
-    private loopBoundNames;
+     * The one canonical, position-accurate "names bound by an enclosing loop
+     * callback" service (#2482 Stage 2) — replaces the two ad-hoc devices
+     * this adapter used to carry side by side: a coarse whole-component
+     * shadow-name Set (built once at `generate()` entry, used only to guard
+     * static-const inlining) and a ref-counted, position-accurate live map
+     * (pushed/popped around `renderLoop`'s body, used for the boolean-prop/
+     * nullable-optional classification sites (#2488) and `emitSpread`'s
+     * local-const fallback (#2489)). Both consulted the "is this name
+     * loop-bound" question with DIFFERENT meanings — the coarse/live drift
+     * #2482 Stage 2 ends. Every shadow-guard site now reads this ONE
+     * threaded, immutable scope: `enterLoopRow`/pop-by-reference around
+     * `renderChildren(loop.children)` in `renderLoop`, mirroring the Stage
+     * 1a/1b `ctx.scope` precedent in `jsx-to-ir.ts`. `IRLoop` already
+     * structurally satisfies `LoopBindingSource`
+     * (`param`/`index`/`paramBindings`/`preamble`), so `renderLoop` passes
+     * the loop node straight to `enterLoopRow`.
+     */
+    private scope;
     /**
      * Optional, no-default props that are `None` when the caller omits them.
      * Their bare-reference attribute emission is guarded with a Jinja
@@ -430,7 +425,7 @@ export declare class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitt
         consequent: string;
     } | null;
     isBooleanTypedPropRef(expr: string): boolean;
-    /** Position-accurate loop-bound-name check — see `loopBoundNames`'s docstring. */
+    /** Position-accurate loop-bound-name check — see `this.scope`'s docstring. */
     private isLoopBoundName;
     /**
      * Whether an attribute-value expression should route through
@@ -452,14 +447,13 @@ export declare class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitt
      * context, so a bare reference would resolve to Undefined.
      *
      * The lookup is a flat name match with no notion of AST scope, so a
-     * name that any loop callback binds as its item/index param never
-     * inlines (#2221) — the occurrence may be the loop's own (shadowing)
-     * binding, and substituting the outer const's value there renders every
-     * iteration with the same hard-coded literal. Coarse (a genuinely
-     * non-shadowed same-named const elsewhere in the component also stops
-     * inlining, falling back to the bare identifier) but safe — the same
-     * trade-off as #2212's `collectLoopBoundNames` use in
-     * `collectStringValueNames`.
+     * name bound by the CURRENTLY ENCLOSING loop's item/index/destructure/
+     * preamble param never inlines (#2221) — the occurrence may be the
+     * loop's own (shadowing) binding, and substituting the outer const's
+     * value there renders every iteration with the same hard-coded literal.
+     * Position-accurate via the threaded `this.scope` (#2482 Stage 2) — a
+     * same-named const elsewhere in the component, outside any loop that
+     * shadows it, still inlines.
      */
     private _resolveLiteralConst;
     /**
@@ -470,11 +464,13 @@ export declare class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitt
      * scope, so an enclosing loop callback's own param of the same name
      * (`.map((cfg) => <li>{cfg.x}</li>)` shadowing a module `const cfg = {…}`)
      * still resolved to the OUTER const's member value at every iteration
-     * (#2237) — the sibling hazard to #2221's `_resolveLiteralConst`. Same
-     * coarse-but-safe `staticLoopSourceBoundNames` guard: any name a loop
-     * binds anywhere in the component never inlines, falling back to the bare
-     * `cfg.x` member expression (which a minijinja `for` loop binds correctly
-     * at the shadowed occurrences).
+     * (#2237) — the sibling hazard to #2221's `_resolveLiteralConst`.
+     * Position-accurate via the threaded `this.scope` (#2482 Stage 2), passed
+     * as `lookupStaticRecordLiteral`'s required guard: a name the CURRENTLY
+     * ENCLOSING loop binds never inlines, falling back to the bare `cfg.x`
+     * member expression (which a minijinja `for` loop binds correctly at the
+     * shadowed occurrence); a same-named const elsewhere, outside any loop
+     * that shadows it, still inlines.
      */
     private _resolveStaticRecordLiteral;
     private _resolveModuleStringConst;

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

@@ -1 +1 @@
-{"version":3,"file":"minijinja-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/minijinja-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"minijinja-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/minijinja-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAiHG;AAEH,OAAO,KAAK,EACV,WAAW,EACX,MAAM,EACN,SAAS,EACT,MAAM,EACN,YAAY,EACZ,aAAa,EACb,MAAM,EACN,WAAW,EACX,UAAU,EACV,MAAM,EACN,aAAa,EACb,UAAU,EACV,OAAO,EAKP,yBAAyB,EAE1B,MAAM,iBAAiB,CAAA;AACxB,OAAO,EACL,WAAW,EACX,KAAK,aAAa,EAClB,KAAK,sBAAsB,EAE3B,KAAK,aAAa,EAClB,KAAK,UAAU,EAgChB,MAAM,iBAAiB,CAAA;AAKxB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAA;AA6BpD,YAAY,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AAC7D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,gBAAgB,CAAA;AA8B7D,qBAAa,gBAAiB,SAAQ,WAAY,YAAW,aAAa,CAAC,cAAc,CAAC;IACxF,IAAI,SAAc;IAClB,SAAS,SAAQ;IACjB,qBAAqB,UAAO;IAE5B;;;;;OAKG;IACH,kBAAkB,EAAE,yBAAyB,CAA2B;IAExE,OAAO,CAAC,aAAa,CAAa;IAClC;;;uCAGmC;IACnC,OAAO,CAAC,cAAc,CAAyB;IAC/C,OAAO,CAAC,OAAO,CAAmC;IAClD,OAAO,CAAC,MAAM,CAAsB;IACpC,OAAO,CAAC,MAAM,CAAiB;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,mBAAmB,CAAI;IAC/B;;;;;OAKG;IACH,OAAO,CAAC,eAAe,CAAsB;IAC7C,OAAO,CAAC,WAAW,CAAyB;IAC5C,OAAO,CAAC,iBAAiB,CAAyB;IAClD;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB,CAAyB;IAEjD;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB,CAAiC;IAE3D;;;;;;;OAOG;IACH,OAAO,CAAC,mBAAmB,CAAyB;IAEpD;;;;;OAKG;IACH,OAAO,CAAC,iBAAiB,CAAwB;IAEjD;;;;;OAKG;IACH,OAAO,CAAC,cAAc,CAAmC;IAEzD;;;;;;;;;;;;;;;;;OAiBG;IACH,OAAO,CAAC,KAAK,CAAmC;IAEhD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB,CAAyB;IAEtD,YAAY,OAAO,GAAE,uBAA4B,EAMhD;IAED,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,aAAa,CA6EzE;IAMD,OAAO,CAAC,2BAA2B;IAqDnC;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/B;IAMD,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAE5F;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAI7B;IAED,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAEzC;IAED,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAEpG;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAEtF;IAED,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAEhG;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAE9F;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7B;IAED,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAEpG;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAe9F;IAED,uEAAuE;IACvE,OAAO,CAAC,kBAAkB;IAmB1B;;;;;;;;;;;;;;;;;OAiBG;IACH,OAAO,CAAC,0BAA0B;IAYlC,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,CAAC,cAAc,CAAC,GAAG,MAAM,CAExF;IAMD,aAAa,CAAC,OAAO,EAAE,SAAS,GAAG,MAAM,CAqCxC;IAED;;;;;OAKG;IACH,OAAO,CAAC,wBAAwB;IA2BhC,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA6B3C;IAMD,iBAAiB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAuC7C;IAED,OAAO,CAAC,gBAAgB;IAOxB;;;OAGG;IACH,OAAO,CAAC,2BAA2B;IAcnC,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgT/B;IAMD;;;;;;;;OAQG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAoCpC;IAED;;;;;;;;;;OAUG;IACH,OAAO,CAAC,2BAA2B;IAUnC;;;;;;;;;;;;;;;;;;OAkBG;IACH,OAAO,CAAC,4BAA4B;IAiBpC,eAAe,CAAC,IAAI,EAAE,WAAW,GAAG,MAAM,CA8FzC;IAED,OAAO,CAAC,sBAAsB,CAAI;IAElC;+DAC2D;IAC3D,OAAO,CAAC,kBAAkB,CAAI;IAE9B,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,iBAAiB;IA0BzB,OAAO,CAAC,cAAc;IAWtB,OAAO,CAAC,UAAU;IAYT,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAQ1C;IAMD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAqKlC;IAED;;;;;;;;;OASG;IACH,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,gBAAgB;IAoCxB,iBAAiB,CAAC,eAAe,EAAE,MAAM,GAAG,MAAM,CAIjD;IAED,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEvC;IAED,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEvC;IAMD;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAuB7B,OAAO,CAAC,kCAAkC;IAoC1C;;;;;OAKG;IACH,OAAO,CAAC,iCAAiC;IAmBzC;;;;;OAKG;IACH,OAAO,CAAC,+BAA+B;IAuBvC;;;;;;;OAOG;IACH,OAAO,KAAK,OAAO,GASlB;IAED;;;;;OAKG;IACH,OAAO,KAAK,SAAS,GASpB;IAED,sEAAsE;IACtE,OAAO,KAAK,OAAO,GAKlB;IAED,OAAO,CAAC,wBAAwB;IAyEhC;;;;;OAKG;IACH,OAAO,CAAC,uBAAuB;IAK/B;;;;;;;OAOG;IACH,OAAO,CAAC,iBAAiB;IAOzB;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAI/B;;gFAE4E;IAC5E,OAAO,CAAC,kBAAkB;IAI1B;;;;OAIG;IACH,8BAA8B,CAC5B,IAAI,EAAE,MAAM,GACX;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAgBlD;IAED,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAW3C;IAED,8EAA8E;IAC9E,OAAO,CAAC,eAAe;IAIvB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,aAAa;IAKrB;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,oBAAoB;IAW5B;;;;;;;;;;;;;;;OAeG;IACH,OAAO,CAAC,2BAA2B;IAQnC,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,gBAAgB;IAcxB,iFAAiF;IACjF,OAAO,CAAC,4BAA4B;CAGrC;AAED,eAAO,MAAM,gBAAgB,kBAAyB,CAAA"}

package/dist/index.js

@@ -187314,8 +187314,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  collectLoopBoundNames,
-  derivesScopeFromSlot
+  derivesScopeFromSlot,
+  BindingScope
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188315,8 +188315,7 @@ class MinijinjaAdapter extends BaseAdapter {
   _searchParamsLocals = new Set;
   _loweringMatchers = [];
   localConstants = [];
-  staticLoopSourceBoundNames = new Set;
-  loopBoundNames = new Map;
+  scope = BindingScope.EMPTY;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188332,8 +188331,7 @@ class MinijinjaAdapter extends BaseAdapter {
     this.propsParams = ir.metadata.propsParams.map((p) => ({ name: p.name }));
     this.booleanTypedProps = collectBooleanTypedProps(ir);
     this.localConstants = ir.metadata.localConstants ?? [];
-    this.staticLoopSourceBoundNames = collectLoopBoundNames(ir);
-    this.loopBoundNames.clear();
+    this.scope = BindingScope.EMPTY;
     this.nullableOptionalProps = collectNullableOptionalProps(ir);
     this.stringValueNames = collectStringValueNames(ir);
     this.moduleStringConsts = collectModuleStringConsts(ir.metadata.localConstants);
@@ -188627,7 +188625,7 @@ ${whenTrue}
       });
     }
     const staticItems = resolveStaticLoopSource(loop.arrayParsed, this.localConstants, {
-      isNameShadowed: (name) => this.staticLoopSourceBoundNames.has(name)
+      isNameShadowed: this.scope.asShadowPredicate()
     });
     const staticArray = staticItems !== null ? staticValueToMinijinja(staticItems) : null;
     const arrayName = loop.array.trim();
@@ -188681,42 +188679,15 @@ ${whenTrue}
     this.inLoop = true;
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
+    const prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(loop);
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${minijinjaIdent(d.name)} = ${this.convertExpressionToJinja(d.raw, d.valueParsed)} %}`);
-    const loopBound = [];
-    if (loop.objectIteration === "entries") {
-      loopBound.push(loop.index ?? param, param);
-    } else if (loop.objectIteration === "keys") {
-      loopBound.push(param, "__bf_v");
-    } else if (loop.objectIteration === "values") {
-      loopBound.push("__bf_k", 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:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
 ${childrenUnderLoop}` : childrenUnderLoop;
+    this.scope = prevScope;
     const lines = [];
     lines.push(`{{ bf.comment("loop:${loop.markerId}") | safe }}`);
     const forHeader = loop.objectIteration === "entries" ? `{% for ${minijinjaIdent(loop.index ?? param)}, ${minijinjaIdent(param)} in ${array}|items %}` : loop.objectIteration === "keys" ? `{% for ${minijinjaIdent(param)}, __bf_v in ${array}|items %}` : loop.objectIteration === "values" ? `{% for __bf_k, ${minijinjaIdent(param)} in ${array}|items %}` : `{% for ${minijinjaIdent(loopVar)} in ${array} %}`;
@@ -188948,7 +188919,7 @@ ${name}="{{ bf.string(${val}) }}"
       if (ternaryDict !== null) {
         return `{{ bf.spread_attrs(${ternaryDict}) | safe }}`;
       }
-      if (/^[A-Za-z_$][\w$]*$/.test(trimmed) && !this.loopBoundNames.has(trimmed)) {
+      if (/^[A-Za-z_$][\w$]*$/.test(trimmed) && !this.scope.isBound(trimmed)) {
         const localConst = (this.localConstants ?? []).find((c) => c.name === trimmed && !c.isModule);
         if (localConst?.value !== undefined) {
           const initTrimmed = localConst.value.trim();
@@ -189183,7 +189154,7 @@ Options:
     return this.booleanTypedProps.has(bare);
   }
   isLoopBoundName(name) {
-    return this.loopBoundNames.has(name);
+    return this.scope.isBound(name);
   }
   shouldBoolStr(expr, name) {
     if (isExplicitStringCall(expr))
@@ -189191,7 +189162,7 @@ Options:
     return isBooleanResultExpr(expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(expr);
   }
   _resolveLiteralConst(name) {
-    if (this.staticLoopSourceBoundNames.has(name))
+    if (this.scope.isBound(name))
       return null;
     const c = (this.localConstants ?? []).find((lc) => lc.name === name);
     if (c?.value === undefined)
@@ -189205,9 +189176,7 @@ Options:
     return null;
   }
   _resolveStaticRecordLiteral(objectName, key) {
-    if (this.staticLoopSourceBoundNames.has(objectName))
-      return null;
-    const hit = lookupStaticRecordLiteral(objectName, key, this.localConstants);
+    const hit = lookupStaticRecordLiteral(objectName, key, this.localConstants, (name) => this.scope.isBound(name));
     if (!hit)
       return null;
     return hit.kind === "number" ? hit.text : `'${escapeMinijinjaSingleQuoted(hit.text)}'`;