@barefootjs/jinja 0.30.2 → 0.30.4

package/dist/adapter/index.js

@@ -188322,6 +188322,7 @@ class JinjaAdapter extends BaseAdapter {
   _loweringMatchers = [];
   localConstants = [];
   staticLoopSourceBoundNames = new Set;
+  loopBoundNames = new Map;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188338,6 +188339,7 @@ class JinjaAdapter extends BaseAdapter {
     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);
@@ -188671,7 +188673,35 @@ ${whenTrue}
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${jinjaIdent(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" || 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:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
@@ -188850,7 +188880,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 jinja2 = this.convertExpressionToJinja(value.expr);
         const body = this.shouldBoolStr(value.expr, name) ? `${name}="{{ bf.bool_str(${jinja2}) }}"` : `${name}="{{ bf.string(${jinja2}) }}"`;
         return `
@@ -189137,8 +189167,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);
+  }
   shouldBoolStr(expr, name) {
     if (isExplicitStringCall(expr))
       return false;

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

@@ -178,6 +178,20 @@ export declare class JinjaAdapter extends BaseAdapter implements IRNodeEmitter<J
      * `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 `None` when the caller omits them.
      * Their bare-reference attribute emission is guarded with a Jinja
@@ -390,6 +404,8 @@ export declare class JinjaAdapter extends BaseAdapter implements IRNodeEmitter<J
         consequent: string;
     } | null;
     isBooleanTypedPropRef(expr: string): boolean;
+    /** Position-accurate loop-bound-name check — see `loopBoundNames`'s docstring. */
+    private isLoopBoundName;
     /**
      * Whether an attribute-value expression should route through
      * `bf.bool_str` (vs. plain `bf.string`) at its interpolation site.

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

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

package/dist/build.js

@@ -188322,6 +188322,7 @@ class JinjaAdapter extends BaseAdapter {
   _loweringMatchers = [];
   localConstants = [];
   staticLoopSourceBoundNames = new Set;
+  loopBoundNames = new Map;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188338,6 +188339,7 @@ class JinjaAdapter extends BaseAdapter {
     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);
@@ -188671,7 +188673,35 @@ ${whenTrue}
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${jinjaIdent(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" || 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:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
@@ -188850,7 +188880,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 jinja2 = this.convertExpressionToJinja(value.expr);
         const body = this.shouldBoolStr(value.expr, name) ? `${name}="{{ bf.bool_str(${jinja2}) }}"` : `${name}="{{ bf.string(${jinja2}) }}"`;
         return `
@@ -189137,8 +189167,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);
+  }
   shouldBoolStr(expr, name) {
     if (isExplicitStringCall(expr))
       return false;

package/dist/index.js

@@ -188322,6 +188322,7 @@ class JinjaAdapter extends BaseAdapter {
   _loweringMatchers = [];
   localConstants = [];
   staticLoopSourceBoundNames = new Set;
+  loopBoundNames = new Map;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188338,6 +188339,7 @@ class JinjaAdapter extends BaseAdapter {
     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);
@@ -188671,7 +188673,35 @@ ${whenTrue}
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${jinjaIdent(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" || 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:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
@@ -188850,7 +188880,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 jinja2 = this.convertExpressionToJinja(value.expr);
         const body = this.shouldBoolStr(value.expr, name) ? `${name}="{{ bf.bool_str(${jinja2}) }}"` : `${name}="{{ bf.string(${jinja2}) }}"`;
         return `
@@ -189137,8 +189167,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);
+  }
   shouldBoolStr(expr, name) {
     if (isExplicitStringCall(expr))
       return false;
@@ -189228,7 +189263,6 @@ var conformancePins = {
 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)",
-  "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 `collectLoopBoundNames` 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, so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)"
 };
 export {

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,iBA0B/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/jinja",
-  "version": "0.30.2",
+  "version": "0.30.4",
   "description": "Jinja2 adapter for BarefootJS — compiles IR to .jinja templates and ships the Python BarefootJS rendering runtime; runs under any Python web framework (Flask, etc.)",
   "type": "module",
   "main": "./dist/index.js",
@@ -53,14 +53,14 @@
     "directory": "packages/adapter-jinja"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.30.2"
+    "@barefootjs/shared": "0.30.4"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0"
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.30.2",
+    "@barefootjs/jsx": "0.30.4",
     "typescript": "^5.0.0"
   }
 }

package/src/adapter/jinja-adapter.ts

@@ -285,6 +285,21 @@ export class JinjaAdapter extends BaseAdapter implements IRNodeEmitter<JinjaRend
    */
   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 `None` when the caller omits them.
    * Their bare-reference attribute emission is guarded with a Jinja
@@ -318,6 +333,7 @@ export class JinjaAdapter extends BaseAdapter implements IRNodeEmitter<JinjaRend
     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)
@@ -911,7 +927,39 @@ export class JinjaAdapter extends BaseAdapter implements IRNodeEmitter<JinjaRend
     const preambleLines = (loop.preamble?.declarations ?? []).map(
       d => `{% set ${jinjaIdent(d.name)} = ${this.convertExpressionToJinja(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') {
+      loopBound.push(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 set beneath it (#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
@@ -1303,7 +1351,11 @@ export class JinjaAdapter extends BaseAdapter implements IRNodeEmitter<JinjaRend
         !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 "is defined and is not none" guard (#2488).
+        !this.isLoopBoundName(normalizedBareId)
       ) {
         const jinja = this.convertExpressionToJinja(value.expr)
         const body = this.shouldBoolStr(value.expr, name)
@@ -1806,9 +1858,18 @@ export class JinjaAdapter extends BaseAdapter implements IRNodeEmitter<JinjaRend
       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)
+  }
+
   /**
    * Whether an attribute-value expression should route through
    * `bf.bool_str` (vs. plain `bf.string`) at its interpolation site.

package/src/render-divergences.ts

@@ -36,8 +36,6 @@ export const renderDivergences: RenderDivergences = {
   // #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 `collectLoopBoundNames` 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, so every row spreads the OUTER const instead of the row value (https://github.com/piconic-ai/barefootjs/issues/2489)',
 }