@barefootjs/mojolicious 0.31.4 → 0.31.6

package/dist/adapter/index.js

@@ -25,7 +25,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  derivesScopeFromSlot
+  derivesScopeFromSlot,
+  BindingScope
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -1054,7 +1055,7 @@ class MojoAdapter extends BaseAdapter {
   _loweringMatchers = [];
   moduleStringConsts = new Map;
   localConstants = [];
-  loopBoundNames = new Map;
+  scope = BindingScope.EMPTY;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -1076,7 +1077,7 @@ class MojoAdapter 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) {
@@ -1111,7 +1112,7 @@ class MojoAdapter extends BaseAdapter {
     }
     if (!/^[A-Za-z_$][\w$]*$/.test(bare))
       return false;
-    if (this.loopBoundNames.has(bare))
+    if (this.scope.isBound(bare))
       return false;
     return this.booleanTypedProps.has(bare);
   }
@@ -1129,7 +1130,7 @@ class MojoAdapter 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)
@@ -1143,15 +1144,13 @@ class MojoAdapter 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 : `'${hit.text.replace(/[\\']/g, (m) => `\\${m}`)}'`;
   }
   resolveModuleStringConst(name) {
-    if (this.loopBoundNames.has(name))
+    if (this.scope.isBound(name))
       return null;
     const value = this.moduleStringConsts.get(name);
     if (value === undefined)
@@ -1416,7 +1415,7 @@ ${whenTrue}
       });
     }
     const staticItems = resolveStaticLoopSource(loop.arrayParsed, this.localConstants, {
-      isNameShadowed: (name) => this.loopBoundNames.has(name)
+      isNameShadowed: this.scope.asShadowPredicate()
     });
     const staticArray = staticItems !== null ? staticValueToPerl(staticItems) : null;
     const arrayName = loop.array.trim();
@@ -1429,7 +1428,8 @@ ${whenTrue}
           message: `Loop array \`${arrayName}\` is a local computed value (\`${arrayConst.value}\`) that the Mojo adapter cannot bind as a template variable — only numeric/string-literal locals inline at their use site.`,
           loc: loop.loc ?? { file: this.componentName + ".tsx", start: { line: 1, column: 0 }, end: { line: 1, column: 0 } },
           suggestion: {
-            message: "Pre-compute the array server-side and pass it as a prop, or mark the loop position as @client-only so it runs in JS on the client."
+            message: "Pre-compute the array server-side and pass it as a prop, or mark the loop position as @client-only so it runs in JS on the client.",
+            escape: [{ kind: "prop-precompute" }, { kind: "client-directive" }]
           }
         });
       }
@@ -1443,13 +1443,9 @@ ${whenTrue}
     }
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${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);
@@ -1459,13 +1455,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.convertExpressionToPerl("", e);
       const sortArrow = loop.sortComparator.arrow;
       let sorted = null;
@@ -1481,9 +1471,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(`% my $${sortedHoist} = ${sorted};`);
     }
     if (loop.objectIteration) {
@@ -1532,13 +1520,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(`% }`);
     lines.push(`<%== bf->comment("/loop:${loop.markerId}") %>`);
     return lines.join(`
@@ -1651,7 +1633,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) && !this.loopBoundNames.has(normalizedBareId)) {
+      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId) && !this.scope.isBound(normalizedBareId)) {
         const perl2 = this.convertExpressionToPerl(value.expr);
         const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr) ? `${name}="<%= bf->bool_str(${perl2}) %>"` : `${name}="<%= ${perl2} %>"`;
         return `<% if (defined ${perl2}) { %>${body}<% } %>`;
@@ -1694,7 +1676,7 @@ ${children}`;
       if (ternaryHashref !== null) {
         return `<%== bf->spread_attrs(${ternaryHashref}) %>`;
       }
-      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();

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

@@ -103,14 +103,22 @@ export declare class MojoAdapter extends BaseAdapter implements IRNodeEmitter<Mo
      */
     private localConstants;
     /**
-     * Names currently bound by an enclosing loop body — the `my $<param>` and
-     * `my $<index>` bindings `renderLoop` introduces — ref-counted so nested
-     * loops compose. `resolveModuleStringConst` consults this so a loop
+     * 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 (the `my $<param>` / `my $<index>` bindings it
+     * introduces). `resolveModuleStringConst` consults this so a loop
      * variable whose name happens to match a module string const is NOT
      * inlined as the const literal (mirrors the Go adapter's loop-param /
-     * loop-var shadowing guards). (#1749 review)
+     * loop-var shadowing guards). (#1749 review) 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 loopBoundNames;
+    private scope;
     /**
      * Prop names whose value is `undef` in the template body when the caller
      * omits them — so a bare-reference attribute should be dropped rather
@@ -164,13 +172,12 @@ export declare class MojoAdapter extends BaseAdapter implements IRNodeEmitter<Mo
      * function-scope consts never reach the per-render stash, so a bare
      * `$totalPages` faults under strict mode.
      *
-     * The `loopBoundNames` guard also covers the #2221 hazard (a loop
-     * callback's own param shadowing this outer const's name): unlike the
-     * Twig-family adapters' coarse, whole-component `collectLoopBoundNames(ir)`
-     * static set, this adapter's `loopBoundNames` is a LIVE ref-counted map
-     * `renderLoop` populates/depopulates as it descends/ascends into each
-     * loop body (#1749) — so it's already scope-precise for this call site;
-     * no separate `staticLoopSourceBoundNames`-style field is needed here.
+     * The threaded scope's shadow guard also covers the #2221 hazard (a loop
+     * callback's own param shadowing this outer const's name): `this.scope`
+     * is position-accurate (#2482 Stage 2) — pushed/popped by reference as
+     * `renderLoop` descends/ascends into each loop body — so it's already
+     * scope-precise for this call site; no separate coarse whole-component
+     * field is needed here.
      */
     private resolveLiteralConst;
     private resolveStaticRecordLiteral;

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

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

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;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eAmL7B,CAAA"}
+{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eA4L7B,CAAA"}

package/dist/index.js

@@ -25,7 +25,8 @@ import {
   dangerousInnerHtmlMetacharViolation,
   dangerousInnerHtmlDiagnostic,
   resolveStaticLoopSource,
-  derivesScopeFromSlot
+  derivesScopeFromSlot,
+  BindingScope
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -1054,7 +1055,7 @@ class MojoAdapter extends BaseAdapter {
   _loweringMatchers = [];
   moduleStringConsts = new Map;
   localConstants = [];
-  loopBoundNames = new Map;
+  scope = BindingScope.EMPTY;
   nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
@@ -1076,7 +1077,7 @@ class MojoAdapter 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) {
@@ -1111,7 +1112,7 @@ class MojoAdapter extends BaseAdapter {
     }
     if (!/^[A-Za-z_$][\w$]*$/.test(bare))
       return false;
-    if (this.loopBoundNames.has(bare))
+    if (this.scope.isBound(bare))
       return false;
     return this.booleanTypedProps.has(bare);
   }
@@ -1129,7 +1130,7 @@ class MojoAdapter 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)
@@ -1143,15 +1144,13 @@ class MojoAdapter 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 : `'${hit.text.replace(/[\\']/g, (m) => `\\${m}`)}'`;
   }
   resolveModuleStringConst(name) {
-    if (this.loopBoundNames.has(name))
+    if (this.scope.isBound(name))
       return null;
     const value = this.moduleStringConsts.get(name);
     if (value === undefined)
@@ -1416,7 +1415,7 @@ ${whenTrue}
       });
     }
     const staticItems = resolveStaticLoopSource(loop.arrayParsed, this.localConstants, {
-      isNameShadowed: (name) => this.loopBoundNames.has(name)
+      isNameShadowed: this.scope.asShadowPredicate()
     });
     const staticArray = staticItems !== null ? staticValueToPerl(staticItems) : null;
     const arrayName = loop.array.trim();
@@ -1429,7 +1428,8 @@ ${whenTrue}
           message: `Loop array \`${arrayName}\` is a local computed value (\`${arrayConst.value}\`) that the Mojo adapter cannot bind as a template variable — only numeric/string-literal locals inline at their use site.`,
           loc: loop.loc ?? { file: this.componentName + ".tsx", start: { line: 1, column: 0 }, end: { line: 1, column: 0 } },
           suggestion: {
-            message: "Pre-compute the array server-side and pass it as a prop, or mark the loop position as @client-only so it runs in JS on the client."
+            message: "Pre-compute the array server-side and pass it as a prop, or mark the loop position as @client-only so it runs in JS on the client.",
+            escape: [{ kind: "prop-precompute" }, { kind: "client-directive" }]
           }
         });
       }
@@ -1443,13 +1443,9 @@ ${whenTrue}
     }
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${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);
@@ -1459,13 +1455,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.convertExpressionToPerl("", e);
       const sortArrow = loop.sortComparator.arrow;
       let sorted = null;
@@ -1481,9 +1471,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(`% my $${sortedHoist} = ${sorted};`);
     }
     if (loop.objectIteration) {
@@ -1532,13 +1520,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(`% }`);
     lines.push(`<%== bf->comment("/loop:${loop.markerId}") %>`);
     return lines.join(`
@@ -1651,7 +1633,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) && !this.loopBoundNames.has(normalizedBareId)) {
+      if (!isBooleanAttr(name) && !value.presenceOrUndefined && /^[A-Za-z_$][\w$]*$/.test(normalizedBareId) && this.nullableOptionalProps.has(normalizedBareId) && !this.scope.isBound(normalizedBareId)) {
         const perl2 = this.convertExpressionToPerl(value.expr);
         const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) || this.isBooleanTypedPropRef(value.expr) ? `${name}="<%= bf->bool_str(${perl2}) %>"` : `${name}="<%= ${perl2} %>"`;
         return `<% if (defined ${perl2}) { %>${body}<% } %>`;
@@ -1694,7 +1676,7 @@ ${children}`;
       if (ternaryHashref !== null) {
         return `<%== bf->spread_attrs(${ternaryHashref}) %>`;
       }
-      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();
@@ -1930,14 +1912,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