@barefootjs/erb 0.31.4 → 0.31.6

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

@@ -128,17 +128,23 @@ export declare class ErbAdapter extends BaseAdapter implements IRNodeEmitter<Erb
      */
     private localConstants;
     /**
-     * Names currently bound by an enclosing loop body — the block-param
-     * locals `renderLoop` introduces (item, index, per-binding destructure
-     * fields) — ref-counted so nested loops compose. This is load-bearing
-     * for TWO things in the ERB adapter (more than the Mojo original, which
-     * only used it to guard const-inlining): it also decides the
-     * fundamental `v[:name]` vs bare-Ruby-local rendering choice in
-     * `ErbTopLevelEmitter.identifier` — see `emit-context.ts`'s
-     * `isLoopBoundName` docstring for why ERB's two-locals model needs this
-     * where Perl's uniform `$name` sigil does not.
-     */
-    private loopBoundNames;
+     * The one canonical, position-accurate "names bound by an enclosing loop
+     * callback" service (#2482 Stage 2) — replaces the ref-counted
+     * `Map<string, number>` this adapter used to push/pop around
+     * `renderLoop`'s body. Load-bearing for TWO things in the ERB adapter
+     * (more than the Mojo original, which only used it to guard
+     * const-inlining): it also decides the fundamental `v[:name]` vs
+     * bare-Ruby-local rendering choice in `ErbTopLevelEmitter.identifier` —
+     * see `emit-context.ts`'s `isLoopBoundName` docstring for why ERB's
+     * two-locals model needs this where Perl's uniform `$name` sigil does
+     * not. Threaded via save/restore-by-reference around
+     * `renderChildren(loop.children)` in `renderLoop` (immutable — no
+     * ref-count bookkeeping), 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;
     /**
      * Prop names whose value is `nil` in the template body when the caller
      * omits them — so a bare-reference attribute should be dropped rather
@@ -379,6 +385,15 @@ export declare class ErbAdapter extends BaseAdapter implements IRNodeEmitter<Erb
     /** Whether `name` (a signal getter or prop) holds a string value — gates
      *  index-access Hash-vs-Array lowering (see `expr/operand.ts`). */
     private _isStringValueName;
+    /**
+     * `escape` is the structured claim (#2613) — populate it only with kinds
+     * a conformance twin actually demonstrates for this shape, since
+     * `escape-coverage.test.ts` checks claims against the twins. The prose
+     * in `reason` may legitimately offer more than the structured field
+     * (ERB's numbered list opens with an inline-rewrite option that no twin
+     * proves); prose stays authoritative for humans, this field for
+     * machines.
+     */
     private _recordExprBF101;
     /** Internal hook for higher-order: predicate body re-uses the filter emitter. */
     private _renderRubyFilterExprPublic;

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

@@ -187314,7 +187314,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  derivesScopeFromSlot
+  derivesScopeFromSlot,
+  BindingScope
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188372,7 +188373,7 @@ class ErbAdapter extends BaseAdapter {
   _loweringMatchers = [];
   moduleStringConsts = new Map;
   localConstants = [];
-  loopBoundNames = new Map;
+  scope = BindingScope.EMPTY;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188394,7 +188395,7 @@ class ErbAdapter extends BaseAdapter {
     this._searchParamsLocals = searchParamsLocalNames(ir.metadata);
     this._loweringMatchers = prepareLoweringMatchers(ir.metadata);
     this.localConstants = ir.metadata.localConstants ?? [];
-    this.loopBoundNames.clear();
+    this.scope = BindingScope.EMPTY;
     this.errors = [];
     this.childrenCaptureCounter = 0;
     if (!options?.siblingTemplatesRegistered) {
@@ -188452,7 +188453,7 @@ class ErbAdapter extends BaseAdapter {
     };
   }
   resolveLiteralConst(name) {
-    if (this.loopBoundNames?.has?.(name))
+    if (this.scope.isBound(name))
       return null;
     const c = (this.localConstants ?? []).find((lc) => lc.name === name);
     if (c?.value === undefined)
@@ -188466,15 +188467,13 @@ class ErbAdapter extends BaseAdapter {
     return null;
   }
   resolveStaticRecordLiteral(objectName, key) {
-    if (this.loopBoundNames?.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 : rubyStringLiteral(hit.text);
   }
   resolveModuleStringConst(name) {
-    if (this.loopBoundNames.has(name))
+    if (this.scope.isBound(name))
       return null;
     const value = this.moduleStringConsts.get(name);
     if (value === undefined)
@@ -188482,7 +188481,7 @@ class ErbAdapter extends BaseAdapter {
     return rubyStringLiteral(value);
   }
   isLoopBoundName(name) {
-    return this.loopBoundNames.has(name);
+    return this.scope.isBound(name);
   }
   generateScriptRegistrations(ir, scriptBaseName, scriptAssets, preloadAssets) {
     if (scriptAssets) {
@@ -188759,17 +188758,17 @@ ${whenTrue}
       });
     }
     const staticItems = resolveStaticLoopSource(loop.arrayParsed, this.localConstants, {
-      isNameShadowed: (name) => this.loopBoundNames.has(name)
+      isNameShadowed: this.scope.asShadowPredicate()
     });
     const staticArray = staticItems !== null ? staticValueToRuby(staticItems) : null;
     if (staticArray === null && loop.arrayParsed?.kind === "identifier") {
       const arrayName = loop.arrayParsed.name;
-      const isUnresolvableLocalConst = !this.loopBoundNames.has(arrayName) && this.resolveModuleStringConst(arrayName) === null && this.resolveLiteralConst(arrayName) === null && this.localConstants.some((c) => c.name === arrayName && !c.isModule);
+      const isUnresolvableLocalConst = !this.scope.isBound(arrayName) && this.resolveModuleStringConst(arrayName) === null && this.resolveLiteralConst(arrayName) === null && this.localConstants.some((c) => c.name === arrayName && !c.isModule);
       if (isUnresolvableLocalConst) {
         this._recordExprBF101(`Loop array \`${arrayName}\` is a component-scope const computed from a runtime expression the ERB adapter cannot evaluate at SSR render time.`, `Options:
 1. Inline the array expression directly in the .map() call instead of a preceding const.
 2. Mark the loop position as @client-only so the array materialises on the client.
-3. Precompute the value server-side and pass it in as a prop.`);
+3. Precompute the value server-side and pass it in as a prop.`, [{ kind: "prop-precompute" }, { kind: "client-directive" }]);
       }
     }
     const rawArray = staticArray ?? this.convertExpressionToRuby(loop.array);
@@ -188781,13 +188780,9 @@ ${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 prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(loop);
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const renderedChildren = this.renderChildren(loop.children);
@@ -188797,13 +188792,7 @@ ${renderedChildren}` : renderedChildren;
     const lines = [];
     lines.push(`<%= bf.comment("loop:${loop.markerId}") %>`);
     if (sortedHoist && loop.sortComparator) {
-      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.scope = prevScope;
       const sortEmit = (e) => this.convertExpressionToRuby("", e);
       const sortArrow = loop.sortComparator.arrow;
       let sorted = null;
@@ -188819,9 +188808,7 @@ ${renderedChildren}` : renderedChildren;
         this._recordExprBF101(`.sort(...) loop comparator is not lowerable to a template sort`, `Pre-sort the array in the route handler, or mark the loop @client-only.`);
         sorted = rawArray;
       }
-      for (const n of loopBound) {
-        this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
-      }
+      this.scope = prevScope.enterLoopRow(loop);
       lines.push(`<%- ${sortedHoist} = ${sorted} -%>`);
     }
     if (loop.objectIteration) {
@@ -188867,13 +188854,7 @@ ${renderedChildren}` : renderedChildren;
       lines.push(...preambleLines);
       lines.push(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.scope = prevScope;
     lines.push(`<%- end -%>`);
     lines.push(`<%= bf.comment("/loop:${loop.markerId}") %>`);
     return lines.join(`
@@ -189035,7 +189016,7 @@ ${children}`;
       if (ternaryHash !== null) {
         return `<%= bf.spread_attrs(${ternaryHash}) %>`;
       }
-      if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(trimmed) && !this.loopBoundNames.has(trimmed)) {
+      if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.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();
@@ -189236,7 +189217,7 @@ Options:
   _isStringValueName(name) {
     return this.stringValueNames.has(name);
   }
-  _recordExprBF101(message, reason) {
+  _recordExprBF101(message, reason, escape) {
     this.errors.push({
       code: "BF101",
       severity: "error",
@@ -189249,7 +189230,8 @@ Options:
 1. Use /* @client */ for client-side evaluation
 2. Pre-compute the value in Ruby` : `Options:
 1. Use /* @client */ for client-side evaluation
-2. Pre-compute the value in Ruby`
+2. Pre-compute the value in Ruby`,
+        ...escape ? { escape } : {}
       }
     });
   }

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,eAyI7B,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,eAkJ7B,CAAA"}

package/dist/index.js

@@ -187314,7 +187314,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  derivesScopeFromSlot
+  derivesScopeFromSlot,
+  BindingScope
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -188372,7 +188373,7 @@ class ErbAdapter extends BaseAdapter {
   _loweringMatchers = [];
   moduleStringConsts = new Map;
   localConstants = [];
-  loopBoundNames = new Map;
+  scope = BindingScope.EMPTY;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -188394,7 +188395,7 @@ class ErbAdapter extends BaseAdapter {
     this._searchParamsLocals = searchParamsLocalNames(ir.metadata);
     this._loweringMatchers = prepareLoweringMatchers(ir.metadata);
     this.localConstants = ir.metadata.localConstants ?? [];
-    this.loopBoundNames.clear();
+    this.scope = BindingScope.EMPTY;
     this.errors = [];
     this.childrenCaptureCounter = 0;
     if (!options?.siblingTemplatesRegistered) {
@@ -188452,7 +188453,7 @@ class ErbAdapter extends BaseAdapter {
     };
   }
   resolveLiteralConst(name) {
-    if (this.loopBoundNames?.has?.(name))
+    if (this.scope.isBound(name))
       return null;
     const c = (this.localConstants ?? []).find((lc) => lc.name === name);
     if (c?.value === undefined)
@@ -188466,15 +188467,13 @@ class ErbAdapter extends BaseAdapter {
     return null;
   }
   resolveStaticRecordLiteral(objectName, key) {
-    if (this.loopBoundNames?.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 : rubyStringLiteral(hit.text);
   }
   resolveModuleStringConst(name) {
-    if (this.loopBoundNames.has(name))
+    if (this.scope.isBound(name))
       return null;
     const value = this.moduleStringConsts.get(name);
     if (value === undefined)
@@ -188482,7 +188481,7 @@ class ErbAdapter extends BaseAdapter {
     return rubyStringLiteral(value);
   }
   isLoopBoundName(name) {
-    return this.loopBoundNames.has(name);
+    return this.scope.isBound(name);
   }
   generateScriptRegistrations(ir, scriptBaseName, scriptAssets, preloadAssets) {
     if (scriptAssets) {
@@ -188759,17 +188758,17 @@ ${whenTrue}
       });
     }
     const staticItems = resolveStaticLoopSource(loop.arrayParsed, this.localConstants, {
-      isNameShadowed: (name) => this.loopBoundNames.has(name)
+      isNameShadowed: this.scope.asShadowPredicate()
     });
     const staticArray = staticItems !== null ? staticValueToRuby(staticItems) : null;
     if (staticArray === null && loop.arrayParsed?.kind === "identifier") {
       const arrayName = loop.arrayParsed.name;
-      const isUnresolvableLocalConst = !this.loopBoundNames.has(arrayName) && this.resolveModuleStringConst(arrayName) === null && this.resolveLiteralConst(arrayName) === null && this.localConstants.some((c) => c.name === arrayName && !c.isModule);
+      const isUnresolvableLocalConst = !this.scope.isBound(arrayName) && this.resolveModuleStringConst(arrayName) === null && this.resolveLiteralConst(arrayName) === null && this.localConstants.some((c) => c.name === arrayName && !c.isModule);
       if (isUnresolvableLocalConst) {
         this._recordExprBF101(`Loop array \`${arrayName}\` is a component-scope const computed from a runtime expression the ERB adapter cannot evaluate at SSR render time.`, `Options:
 1. Inline the array expression directly in the .map() call instead of a preceding const.
 2. Mark the loop position as @client-only so the array materialises on the client.
-3. Precompute the value server-side and pass it in as a prop.`);
+3. Precompute the value server-side and pass it in as a prop.`, [{ kind: "prop-precompute" }, { kind: "client-directive" }]);
       }
     }
     const rawArray = staticArray ?? this.convertExpressionToRuby(loop.array);
@@ -188781,13 +188780,9 @@ ${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 prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(loop);
     const prevLoopKeyDepth = this.currentLoopKeyDepth;
     this.currentLoopKeyDepth = loop.depth;
     const renderedChildren = this.renderChildren(loop.children);
@@ -188797,13 +188792,7 @@ ${renderedChildren}` : renderedChildren;
     const lines = [];
     lines.push(`<%= bf.comment("loop:${loop.markerId}") %>`);
     if (sortedHoist && loop.sortComparator) {
-      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.scope = prevScope;
       const sortEmit = (e) => this.convertExpressionToRuby("", e);
       const sortArrow = loop.sortComparator.arrow;
       let sorted = null;
@@ -188819,9 +188808,7 @@ ${renderedChildren}` : renderedChildren;
         this._recordExprBF101(`.sort(...) loop comparator is not lowerable to a template sort`, `Pre-sort the array in the route handler, or mark the loop @client-only.`);
         sorted = rawArray;
       }
-      for (const n of loopBound) {
-        this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
-      }
+      this.scope = prevScope.enterLoopRow(loop);
       lines.push(`<%- ${sortedHoist} = ${sorted} -%>`);
     }
     if (loop.objectIteration) {
@@ -188867,13 +188854,7 @@ ${renderedChildren}` : renderedChildren;
       lines.push(...preambleLines);
       lines.push(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.scope = prevScope;
     lines.push(`<%- end -%>`);
     lines.push(`<%= bf.comment("/loop:${loop.markerId}") %>`);
     return lines.join(`
@@ -189035,7 +189016,7 @@ ${children}`;
       if (ternaryHash !== null) {
         return `<%= bf.spread_attrs(${ternaryHash}) %>`;
       }
-      if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(trimmed) && !this.loopBoundNames.has(trimmed)) {
+      if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.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();
@@ -189236,7 +189217,7 @@ Options:
   _isStringValueName(name) {
     return this.stringValueNames.has(name);
   }
-  _recordExprBF101(message, reason) {
+  _recordExprBF101(message, reason, escape) {
     this.errors.push({
       code: "BF101",
       severity: "error",
@@ -189249,7 +189230,8 @@ Options:
 1. Use /* @client */ for client-side evaluation
 2. Pre-compute the value in Ruby` : `Options:
 1. Use /* @client */ for client-side evaluation
-2. Pre-compute the value in Ruby`
+2. Pre-compute the value in Ruby`,
+        ...escape ? { escape } : {}
       }
     });
   }
@@ -189273,14 +189255,20 @@ var conformancePins = {
   "tag-cloud": [{ code: "BF021", severity: "error" }],
   "preamble-cells": [{ code: "BF021", severity: "error" }],
   "static-array-from-props": [
-    { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2321" }
+    {
+      code: "BF101",
+      severity: "error",
+      issue: "https://github.com/piconic-ai/barefootjs/issues/2321"
+    }
   ],
   "static-array-from-props-with-component": [
-    { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2321" }
-  ],
-  "filter-nested-find-predicate": [
-    { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2320" }
+    {
+      code: "BF101",
+      severity: "error",
+      issue: "https://github.com/piconic-ai/barefootjs/issues/2321"
+    }
   ],
+  "filter-nested-find-predicate": [{ code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2320" }],
   "date-method-uncatalogued": [{ code: "BF021", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2356" }]
 };
 // src/render-divergences.ts