@barefootjs/go-template 0.31.4 → 0.31.5

package/dist/vite.js

@@ -5,7 +5,7 @@ import { barefoot as coreBarefoot } from "@barefootjs/vite";
 import { devModuleUrl, loadManifest, resolveDevOrigin, resolveScriptAssets, toPosixRelative } from "@barefootjs/vite";
 
 // ../jsx/src/compiler.ts
-import ts23 from "typescript";
+import ts24 from "typescript";
 
 // ../jsx/src/analyzer.ts
 import ts9 from "typescript";
@@ -2597,7 +2597,7 @@ var REACTIVE_PRIMITIVES = new Set([
 ]);
 
 // ../jsx/src/jsx-to-ir.ts
-import ts12 from "typescript";
+import ts13 from "typescript";
 
 // ../jsx/src/types.ts
 var SCOPE_FORBIDDEN = {
@@ -2647,6 +2647,7 @@ function preambleAnalysisTemplateText(p) {
 }
 
 // ../jsx/src/module-exports.ts
+import ts10 from "typescript";
 function formatParamWithType(p) {
   const rest = p.isRest ? "..." : "";
   const optional = p.optional ? "?" : "";
@@ -2677,12 +2678,55 @@ function findReachableNames(primaryRefs, declarations) {
   }
   return reachable;
 }
+function findAssignedNames(bodyText, candidates) {
+  const assigned = new Set;
+  if (candidates.size === 0)
+    return assigned;
+  const sf = ts10.createSourceFile("bf-assignment-scan.tsx", bodyText, ts10.ScriptTarget.Latest, false, ts10.ScriptKind.TSX);
+  const record = (target) => {
+    if (ts10.isIdentifier(target) && candidates.has(target.text)) {
+      assigned.add(target.text);
+    }
+  };
+  const visit = (node) => {
+    if (ts10.isBinaryExpression(node) && isAssignmentOperator(node.operatorToken.kind)) {
+      record(node.left);
+    } else if ((ts10.isPrefixUnaryExpression(node) || ts10.isPostfixUnaryExpression(node)) && (node.operator === ts10.SyntaxKind.PlusPlusToken || node.operator === ts10.SyntaxKind.MinusMinusToken)) {
+      record(node.operand);
+    }
+    ts10.forEachChild(node, visit);
+  };
+  ts10.forEachChild(sf, visit);
+  return assigned;
+}
+function closeOverWritersOfMutableBindings(primaryRefs, declarations, mutableNames) {
+  let reachable = findReachableNames(primaryRefs, declarations);
+  if (mutableNames.size === 0)
+    return reachable;
+  let seedText = primaryRefs;
+  for (let round = 0;round <= declarations.length; round++) {
+    const survivingMutables = new Set([...reachable].filter((name) => mutableNames.has(name)));
+    if (survivingMutables.size === 0)
+      return reachable;
+    const added = declarations.filter((d) => !reachable.has(d.name)).filter((d) => findAssignedNames(d.body, survivingMutables).size > 0).map((d) => d.name);
+    if (added.length === 0)
+      return reachable;
+    seedText += `
+` + added.join(`
+`);
+    reachable = findReachableNames(seedText, declarations);
+  }
+  return reachable;
+}
+function isAssignmentOperator(kind) {
+  return kind >= ts10.SyntaxKind.FirstAssignment && kind <= ts10.SyntaxKind.LastAssignment;
+}
 
 // ../jsx/src/reactivity-checker.ts
-import ts10 from "typescript";
+import ts11 from "typescript";
 
 // ../jsx/src/free-refs.ts
-import ts11 from "typescript";
+import ts12 from "typescript";
 var _bindingMapCache = new WeakMap;
 
 // ../jsx/src/to-locale-date-lowering.ts
@@ -3096,13 +3140,13 @@ var KEYWORDS_AND_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/walk-prop-accesses.ts
-import ts13 from "typescript";
+import ts14 from "typescript";
 
 // ../jsx/src/value-references.ts
-import ts14 from "typescript";
+import ts15 from "typescript";
 
 // ../jsx/src/relocate.ts
-import ts15 from "typescript";
+import ts16 from "typescript";
 
 // ../jsx/src/lowering-registry.ts
 var plugins = [];
@@ -3298,10 +3342,10 @@ function formatDateLocalNames(metadata) {
 }
 
 // ../jsx/src/ir-to-client-js/prune-unused-prop-extractions.ts
-import ts16 from "typescript";
+import ts17 from "typescript";
 
 // ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
-import ts17 from "typescript";
+import ts18 from "typescript";
 var NO_PREAMBLE = {
   lazySafe: true,
   facts: { declaredNames: new Set, freeNames: new Set }
@@ -3351,7 +3395,7 @@ var INERT_BINDING_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/emit-reactive.ts
-import ts18 from "typescript";
+import ts19 from "typescript";
 
 // ../jsx/src/ir-to-client-js/control-flow/stringify/event-delegation.ts
 var NON_BUBBLING_EVENTS = new Set([
@@ -3366,7 +3410,7 @@ var NON_BUBBLING_EVENTS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/rewrite-props-object.ts
-import ts19 from "typescript";
+import ts20 from "typescript";
 
 // ../jsx/src/ir-to-client-js/source-map.ts
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -3457,15 +3501,15 @@ class SourceMapGenerator {
 }
 
 // ../jsx/src/preprocess-inline-jsx-callbacks.ts
-import ts20 from "typescript";
+import ts21 from "typescript";
 
 // ../jsx/src/ssr-defaults.ts
-import ts21 from "typescript";
+import ts22 from "typescript";
 var UNRESOLVED = Symbol("unresolved");
 var NO_RETURN = Symbol("no-return");
 
 // ../jsx/src/augment-inherited-props.ts
-import ts22 from "typescript";
+import ts23 from "typescript";
 function collectContextConsumers(metadata) {
   const constants = metadata.localConstants ?? [];
   const contextDefaults = new Map;
@@ -3497,47 +3541,47 @@ function collectContextConsumers(metadata) {
 }
 function parseUseContextArg(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts22.isCallExpression(expr))
+  if (!expr || !ts23.isCallExpression(expr))
     return null;
-  if (!ts22.isIdentifier(expr.expression) || expr.expression.text !== "useContext")
+  if (!ts23.isIdentifier(expr.expression) || expr.expression.text !== "useContext")
     return null;
   if (expr.arguments.length !== 1)
     return null;
   const arg = expr.arguments[0];
-  return ts22.isIdentifier(arg) ? arg.text : null;
+  return ts23.isIdentifier(arg) ? arg.text : null;
 }
 function parseCreateContextDefault(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts22.isCallExpression(expr))
+  if (!expr || !ts23.isCallExpression(expr))
     return null;
   if (expr.arguments.length === 0)
     return null;
   const arg = expr.arguments[0];
-  if (ts22.isStringLiteral(arg) || ts22.isNoSubstitutionTemplateLiteral(arg))
+  if (ts23.isStringLiteral(arg) || ts23.isNoSubstitutionTemplateLiteral(arg))
     return arg.text;
-  if (ts22.isNumericLiteral(arg))
+  if (ts23.isNumericLiteral(arg))
     return Number(arg.text);
-  if (arg.kind === ts22.SyntaxKind.TrueKeyword)
+  if (arg.kind === ts23.SyntaxKind.TrueKeyword)
     return true;
-  if (arg.kind === ts22.SyntaxKind.FalseKeyword)
+  if (arg.kind === ts23.SyntaxKind.FalseKeyword)
     return false;
   return null;
 }
 function isObjectLiteralCreateContextDefault(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts22.isCallExpression(expr))
+  if (!expr || !ts23.isCallExpression(expr))
     return false;
   if (expr.arguments.length === 0)
     return false;
-  return ts22.isObjectLiteralExpression(expr.arguments[0]);
+  return ts23.isObjectLiteralExpression(expr.arguments[0]);
 }
 function parseSingleExpression(source) {
-  const sf = ts22.createSourceFile("__ctx.ts", `(${source})`, ts22.ScriptTarget.Latest, false);
+  const sf = ts23.createSourceFile("__ctx.ts", `(${source})`, ts23.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts22.isExpressionStatement(stmt))
+  if (!stmt || !ts23.isExpressionStatement(stmt))
     return null;
   let e = stmt.expression;
-  while (ts22.isParenthesizedExpression(e))
+  while (ts23.isParenthesizedExpression(e))
     e = e.expression;
   return e;
 }
@@ -3562,25 +3606,25 @@ function augmentInheritedPropAccesses(ir) {
   const pinCoalesceLiterals = (s) => {
     if (!s || !s.includes(propsObj))
       return;
-    const sf = ts22.createSourceFile("__aug.ts", `(${s})`, ts22.ScriptTarget.Latest, false);
+    const sf = ts23.createSourceFile("__aug.ts", `(${s})`, ts23.ScriptTarget.Latest, false);
     const visit = (n) => {
-      if (ts22.isBinaryExpression(n) && (n.operatorToken.kind === ts22.SyntaxKind.QuestionQuestionToken || n.operatorToken.kind === ts22.SyntaxKind.BarBarToken)) {
+      if (ts23.isBinaryExpression(n) && (n.operatorToken.kind === ts23.SyntaxKind.QuestionQuestionToken || n.operatorToken.kind === ts23.SyntaxKind.BarBarToken)) {
         let left = n.left;
-        while (ts22.isParenthesizedExpression(left))
+        while (ts23.isParenthesizedExpression(left))
           left = left.expression;
-        if (ts22.isPropertyAccessExpression(left) && ts22.isIdentifier(left.expression) && left.expression.text === propsObj) {
+        if (ts23.isPropertyAccessExpression(left) && ts23.isIdentifier(left.expression) && left.expression.text === propsObj) {
           const name = left.name.text;
           let right = n.right;
-          while (ts22.isParenthesizedExpression(right))
+          while (ts23.isParenthesizedExpression(right))
             right = right.expression;
-          if (ts22.isPrefixUnaryExpression(right))
+          if (ts23.isPrefixUnaryExpression(right))
             right = right.operand;
-          const kind = ts22.isNumericLiteral(right) ? "number" : right.kind === ts22.SyntaxKind.TrueKeyword || right.kind === ts22.SyntaxKind.FalseKeyword ? "boolean" : ts22.isStringLiteralLike(right) ? "string" : null;
+          const kind = ts23.isNumericLiteral(right) ? "number" : right.kind === ts23.SyntaxKind.TrueKeyword || right.kind === ts23.SyntaxKind.FalseKeyword ? "boolean" : ts23.isStringLiteralLike(right) ? "string" : null;
           if (kind && !coalesceLiteralTypes.has(name))
             coalesceLiteralTypes.set(name, kind);
         }
       }
-      ts22.forEachChild(n, visit);
+      ts23.forEachChild(n, visit);
     };
     visit(sf);
   };
@@ -3691,33 +3735,33 @@ function augmentInheritedPropAccesses(ir) {
   }
 }
 function parseStaticStringConst(source) {
-  const sf = ts22.createSourceFile("__const.ts", `const __x = (${source});`, ts22.ScriptTarget.Latest, false);
+  const sf = ts23.createSourceFile("__const.ts", `const __x = (${source});`, ts23.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts22.isVariableStatement(stmt))
+  if (!stmt || !ts23.isVariableStatement(stmt))
     return null;
   let init = stmt.declarationList.declarations[0]?.initializer;
-  while (init && ts22.isParenthesizedExpression(init))
+  while (init && ts23.isParenthesizedExpression(init))
     init = init.expression;
   if (!init)
     return null;
-  if (ts22.isStringLiteral(init) || ts22.isNoSubstitutionTemplateLiteral(init)) {
+  if (ts23.isStringLiteral(init) || ts23.isNoSubstitutionTemplateLiteral(init)) {
     return init.text;
   }
   return evalStringArrayJoin(source);
 }
 function evalTemplateOfStringConsts(source, resolved) {
-  const sf = ts22.createSourceFile("__const.ts", `const __x = (${source});`, ts22.ScriptTarget.Latest, false);
+  const sf = ts23.createSourceFile("__const.ts", `const __x = (${source});`, ts23.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts22.isVariableStatement(stmt))
+  if (!stmt || !ts23.isVariableStatement(stmt))
     return null;
   let init = stmt.declarationList.declarations[0]?.initializer;
-  while (init && ts22.isParenthesizedExpression(init))
+  while (init && ts23.isParenthesizedExpression(init))
     init = init.expression;
-  if (!init || !ts22.isTemplateExpression(init))
+  if (!init || !ts23.isTemplateExpression(init))
     return null;
   let out = init.head.text;
   for (const span of init.templateSpans) {
-    if (!ts22.isIdentifier(span.expression))
+    if (!ts23.isIdentifier(span.expression))
       return null;
     const value = resolved.get(span.expression.text);
     if (value === undefined)
@@ -3745,28 +3789,28 @@ function collectModuleStringConsts(constants) {
   return map;
 }
 function evalStringArrayJoin(source) {
-  const sf = ts22.createSourceFile("__join.ts", `const __x = (${source});`, ts22.ScriptTarget.Latest, false);
+  const sf = ts23.createSourceFile("__join.ts", `const __x = (${source});`, ts23.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts22.isVariableStatement(stmt))
+  if (!stmt || !ts23.isVariableStatement(stmt))
     return null;
   let node = stmt.declarationList.declarations[0]?.initializer;
-  while (node && ts22.isParenthesizedExpression(node))
+  while (node && ts23.isParenthesizedExpression(node))
     node = node.expression;
-  if (!node || !ts22.isCallExpression(node))
+  if (!node || !ts23.isCallExpression(node))
     return null;
   const callee = node.expression;
-  if (!ts22.isPropertyAccessExpression(callee))
+  if (!ts23.isPropertyAccessExpression(callee))
     return null;
   if (callee.name.text !== "join")
     return null;
   let recv = callee.expression;
-  while (ts22.isParenthesizedExpression(recv))
+  while (ts23.isParenthesizedExpression(recv))
     recv = recv.expression;
-  if (!ts22.isArrayLiteralExpression(recv))
+  if (!ts23.isArrayLiteralExpression(recv))
     return null;
   const parts = [];
   for (const el of recv.elements) {
-    if (ts22.isStringLiteral(el) || ts22.isNoSubstitutionTemplateLiteral(el)) {
+    if (ts23.isStringLiteral(el) || ts23.isNoSubstitutionTemplateLiteral(el)) {
       parts.push(el.text);
     } else {
       return null;
@@ -3775,7 +3819,7 @@ function evalStringArrayJoin(source) {
   let sep = ",";
   if (node.arguments.length >= 1) {
     const arg = node.arguments[0];
-    if (ts22.isStringLiteral(arg) || ts22.isNoSubstitutionTemplateLiteral(arg))
+    if (ts23.isStringLiteral(arg) || ts23.isNoSubstitutionTemplateLiteral(arg))
       sep = arg.text;
     else
       return null;
@@ -3783,11 +3827,11 @@ function evalStringArrayJoin(source) {
   return parts.join(sep);
 }
 function parseRecordIndexAccess(val, localConstants, propsParams, resolveKey) {
-  if (!ts22.isElementAccessExpression(val))
+  if (!ts23.isElementAccessExpression(val))
     return null;
   const obj = val.expression;
   const arg = val.argumentExpression;
-  if (!ts22.isIdentifier(obj) || !ts22.isIdentifier(arg))
+  if (!ts23.isIdentifier(obj) || !ts23.isIdentifier(arg))
     return null;
   let indexPropName;
   let defaultKey;
@@ -3803,35 +3847,35 @@ function parseRecordIndexAccess(val, localConstants, propsParams, resolveKey) {
   const constInfo = localConstants.find((c) => c.name === obj.text && c.isModule);
   if (constInfo?.value === undefined)
     return null;
-  const sf = ts22.createSourceFile("__rec.ts", `(${constInfo.value})`, ts22.ScriptTarget.Latest, true);
+  const sf = ts23.createSourceFile("__rec.ts", `(${constInfo.value})`, ts23.ScriptTarget.Latest, true);
   if (sf.statements.length !== 1)
     return null;
   const stmt = sf.statements[0];
-  if (!ts22.isExpressionStatement(stmt))
+  if (!ts23.isExpressionStatement(stmt))
     return null;
   let parsed = stmt.expression;
-  while (ts22.isParenthesizedExpression(parsed))
+  while (ts23.isParenthesizedExpression(parsed))
     parsed = parsed.expression;
-  if (!ts22.isObjectLiteralExpression(parsed))
+  if (!ts23.isObjectLiteralExpression(parsed))
     return null;
   const entries = [];
   for (const prop of parsed.properties) {
-    if (!ts22.isPropertyAssignment(prop))
+    if (!ts23.isPropertyAssignment(prop))
       return null;
     let key;
-    if (ts22.isIdentifier(prop.name)) {
+    if (ts23.isIdentifier(prop.name)) {
       key = prop.name.text;
-    } else if (ts22.isStringLiteral(prop.name) || ts22.isNoSubstitutionTemplateLiteral(prop.name)) {
+    } else if (ts23.isStringLiteral(prop.name) || ts23.isNoSubstitutionTemplateLiteral(prop.name)) {
       key = prop.name.text;
     } else {
       return null;
     }
     let v = prop.initializer;
-    while (ts22.isParenthesizedExpression(v))
+    while (ts23.isParenthesizedExpression(v))
       v = v.expression;
-    if (ts22.isNumericLiteral(v)) {
+    if (ts23.isNumericLiteral(v)) {
       entries.push({ key, value: { kind: "number", text: v.text } });
-    } else if (ts22.isStringLiteral(v) || ts22.isNoSubstitutionTemplateLiteral(v)) {
+    } else if (ts23.isStringLiteral(v) || ts23.isNoSubstitutionTemplateLiteral(v)) {
       entries.push({ key, value: { kind: "string", text: v.text } });
     } else {
       return null;
@@ -3887,7 +3931,7 @@ function computeSsrSeedPlan(metadata) {
 // ../jsx/src/rich-type-refusal.ts
 var EMPTY_BINDINGS2 = new Map;
 // ../jsx/src/shared-program.ts
-import ts24 from "typescript";
+import ts25 from "typescript";
 // ../jsx/src/adapters/interface.ts
 class BaseAdapter {
   renderChildren(children) {
@@ -3940,7 +3984,7 @@ class JsxAdapter extends BaseAdapter {
       ...localFunctions.map((f) => ({ name: f.name, body: f.body })),
       ...localConstants.map((c) => ({ name: c.name, body: c.value }))
     ];
-    const reachable = findReachableNames(primaryRefText, declarations);
+    const reachable = closeOverWritersOfMutableBindings(primaryRefText, declarations, new Set(ir.metadata.localConstants.filter((c) => (c.declarationKind ?? "const") !== "const").map((c) => c.name)));
     const reachableBodies = [...reachable].map((name) => {
       const func = localFunctions.find((f) => f.name === name);
       if (func)
@@ -3972,7 +4016,8 @@ class JsxAdapter extends BaseAdapter {
       if (signal.setter) {
         const setterUsed = identifierPattern(signal.setter).test(setterRefText);
         if (setterUsed) {
-          lines.push(`  const ${signal.setter} = (..._args: any[]) => {}`);
+          const setterType = preserveTypes && signal.type.kind !== "unknown" ? `(valueOrFn: ${signal.type.raw} | ((prev: ${signal.type.raw}) => ${signal.type.raw})) => void` : null;
+          lines.push(setterType ? `  const ${signal.setter}: ${setterType} = () => {}` : `  const ${signal.setter} = (..._args: any[]) => {}`);
         }
       }
     }
@@ -4168,7 +4213,7 @@ class JsxAdapter extends BaseAdapter {
 }
 
 // ../jsx/src/adapters/template-imports.ts
-import ts25 from "typescript";
+import ts26 from "typescript";
 var CLIENT_PACKAGE_SOURCES = new Set([
   "@barefootjs/client",
   "@barefootjs/client/runtime"
@@ -4307,7 +4352,8 @@ export default ${this.componentName}` : "";
     const noArgDefault = hasRequiredProps ? "" : ` = {} as ${propsTypeExpr}`;
     const lines = [];
     const exportPrefix = ir.metadata.isExported === false ? "" : "export ";
-    lines.push(`${exportPrefix}function ${name}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`);
+    const typeParameters = ir.metadata.typeParameters ?? "";
+    lines.push(`${exportPrefix}function ${name}${typeParameters}(${fullPropsDestructure}${typeAnnotation}${noArgDefault}) {`);
     if (hasClientInteractivity) {
       lines.push(`  const __scopeId = (/_s\\d/.test(__bfScope || '') ? __bfScope : null) || __instanceId || \`${name}_\${Math.random().toString(36).slice(2, 8)}\``);
     } else {
@@ -4905,7 +4951,7 @@ function dangerousInnerHtmlDiagnostic(expr, loc, reason) {
   };
 }
 // ../jsx/src/combine-client-js.ts
-import ts26 from "typescript";
+import ts27 from "typescript";
 // ../jsx/src/loop-destructure.ts
 function isLowerableLoopDestructure(loop) {
   const bindings = loop.paramBindings;
@@ -5045,9 +5091,9 @@ function escapeRe(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 // ../jsx/src/debug.ts
-import ts27 from "typescript";
-// ../jsx/src/profiler.ts
 import ts28 from "typescript";
+// ../jsx/src/profiler.ts
+import ts29 from "typescript";
 
 // ../jsx/src/index.ts
 registerBuiltinLoweringPlugins();
@@ -6678,7 +6724,7 @@ function computeObjectMemoInitialValue(ctx, memo) {
 }
 
 // src/adapter/memo/template-interp.ts
-import ts29 from "typescript";
+import ts30 from "typescript";
 function computeTemplateLiteralMemoInitialValue(ctx, memo, propsParams) {
   const localKeyBindings = new Map;
   let templateValue;
@@ -7309,7 +7355,7 @@ function collectPropsReadByCtorInit(body, propsObjectName, propNames) {
 }
 
 // src/adapter/spread/spread-codegen.ts
-import ts30 from "typescript";
+import ts31 from "typescript";
 function collectSpreadSlots(ctx, node) {
   const result = [];
   collectSpreadSlotsRecursive(ctx, node, result);
@@ -7544,7 +7590,7 @@ function recordIndexAccessToGoMap(ctx, val, ir) {
   if (val.kind !== "index-access" || val.object.kind !== "identifier" || val.index.kind !== "identifier") {
     return null;
   }
-  const tsVal = ts30.factory.createElementAccessExpression(ts30.factory.createIdentifier(val.object.name), ts30.factory.createIdentifier(val.index.name));
+  const tsVal = ts31.factory.createElementAccessExpression(ts31.factory.createIdentifier(val.object.name), ts31.factory.createIdentifier(val.index.name));
   const parsed = parseRecordIndexAccess(tsVal, ir.metadata.localConstants ?? [], ir.metadata.propsParams);
   if (!parsed)
     return null;
@@ -7845,7 +7891,7 @@ class GoTemplateAdapter extends BaseAdapter {
   }
   inLoop = false;
   bakedStaticChildLoopCache = new Map;
-  loopParamStack = [];
+  scope = BindingScope.EMPTY;
   loopKeyDepthStack = [];
   loopScalarItemStack = [];
   loopWrapperStack = [];
@@ -7903,6 +7949,7 @@ class GoTemplateAdapter extends BaseAdapter {
     this.state.referencedDerivedConsts = new Set;
     this.state.templateVarCounter = 0;
     this.state.pendingChildrenDefines = [];
+    this.scope = BindingScope.EMPTY;
     this.primeCompileState(ir);
     this.state.stringValueNames = collectStringValueNames(ir);
     this.recordDerivedFieldDeps(ir, new Set((ir.metadata.propsParams ?? []).map((p) => p.name)));
@@ -9783,8 +9830,7 @@ ${goFields.join(`
     const inlinedNum = this.resolveModuleNumericConst(name);
     if (inlinedNum !== null)
       return inlinedNum;
-    const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-    if (currentLoopParam && name === currentLoopParam)
+    if (this.isCurrentLoopItem(name))
       return ".";
     if (this.isOuterLoopParam(name))
       return `$${name}`;
@@ -9851,16 +9897,16 @@ ${goFields.join(`
     }
     return false;
   }
+  isCurrentLoopItem(name) {
+    const hit = this.scope.lookup(name);
+    return hit !== null && hit.depth === 0 && hit.binding.source === "item";
+  }
   isOuterLoopParam(name) {
-    const top = this.loopParamStack.length - 1;
-    for (let i = 0;i < top; i++) {
-      if (this.loopParamStack[i] === name)
-        return true;
-    }
-    return false;
+    const hit = this.scope.lookup(name);
+    return hit !== null && hit.depth > 0 && hit.binding.source === "item";
   }
   rootFieldRef(name) {
-    const prefix = this.loopParamStack.length > 0 ? "$." : ".";
+    const prefix = this.inLoop ? "$." : ".";
     return `${prefix}${capitalizeFieldName(name)}`;
   }
   searchParamsFieldRef(name) {
@@ -9870,9 +9916,8 @@ ${goFields.join(`
     return collectModuleStringConsts(constants);
   }
   resolveModuleStringConst(name) {
-    if (this.loopParamStack.length > 0 && this.loopParamStack[this.loopParamStack.length - 1] === name) {
+    if (this.isCurrentLoopItem(name))
       return null;
-    }
     if (this.loopVarRefCount.has(name))
       return null;
     if (this.isOuterLoopParam(name))
@@ -9883,9 +9928,8 @@ ${goFields.join(`
     return `"${escapeGoString(value)}"`;
   }
   resolveModuleNumericConst(name) {
-    if (this.loopParamStack.length > 0 && this.loopParamStack[this.loopParamStack.length - 1] === name) {
+    if (this.isCurrentLoopItem(name))
       return null;
-    }
     if (this.loopVarRefCount.has(name))
       return null;
     if (this.isOuterLoopParam(name))
@@ -9940,7 +9984,7 @@ ${goFields.join(`
     if (property === "length" && object.kind === "call" && object.callee.kind === "identifier" && object.args.length === 0) {
       const slice = this.state.memoBackedLoopSlice.get(object.callee.name);
       if (slice) {
-        const prefix = this.loopParamStack.length > 0 ? "$." : ".";
+        const prefix = this.inLoop ? "$." : ".";
         return `len ${prefix}${slice}`;
       }
     }
@@ -9965,8 +10009,7 @@ ${goFields.join(`
       if (staticValue !== null)
         return staticValue;
     }
-    const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-    if (object.kind === "identifier" && currentLoopParam && object.name === currentLoopParam) {
+    if (object.kind === "identifier" && this.isCurrentLoopItem(object.name)) {
       return `.${goFieldNameForKey(property)}`;
     }
     const obj = emit(object);
@@ -10728,7 +10771,7 @@ ${goFields.join(`
     return this.renderParsedExpr(parsed);
   }
   isLoopShadowedName(name) {
-    return this.loopParamStack.length > 0 && this.loopParamStack[this.loopParamStack.length - 1] === name || this.loopVarRefCount.has(name) || this.isOuterLoopParam(name) || this.loopBindingStack.some((bindings) => bindings.has(name));
+    return this.scope.isBound(name) || this.loopVarRefCount.has(name);
   }
   loopRowChildPropOverrides(comp) {
     const childShape = this.childComponentShapes.get(comp.name);
@@ -10943,8 +10986,7 @@ ${goFields.join(`
           const inlined = this.resolveModuleStringConst(expr.name);
           if (inlined !== null)
             return plain(inlined);
-          const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-          if (currentLoopParam && expr.name === currentLoopParam) {
+          if (this.isCurrentLoopItem(expr.name)) {
             return plain(".");
           }
           if (this.isOuterLoopParam(expr.name)) {
@@ -11001,11 +11043,8 @@ ${goFields.join(`
         if (expr.object.kind === "identifier" && this.state.propsObjectName && expr.object.name === this.state.propsObjectName) {
           return plain(this.rootFieldRef(expr.property));
         }
-        {
-          const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-          if (expr.object.kind === "identifier" && currentLoopParam && expr.object.name === currentLoopParam) {
-            return plain(`.${capitalizeFieldName(expr.property)}`);
-          }
+        if (expr.object.kind === "identifier" && this.isCurrentLoopItem(expr.object.name)) {
+          return plain(`.${capitalizeFieldName(expr.property)}`);
         }
         const obj = this.renderConditionExpr(expr.object);
         if (expr.property === "length") {
@@ -11183,12 +11222,12 @@ ${goFields.join(`
       });
     }
     const bakedChildLoop = loop.childComponent ? this.getBakedStaticChildLoop(loop.markerId, loop.childComponent, loop.arrayParsed, loop.param, loop.key ?? undefined) : null;
-    const bakedElementLoop = loop.childComponent ? null : analyzeBakeableStaticElementLoop(loop, this.state.localConstants, { isNameShadowed: (name) => this.state.staticLoopSourceBoundNames.has(name) });
+    const bakedElementLoop = loop.childComponent ? null : analyzeBakeableStaticElementLoop(loop, this.state.localConstants, { isNameShadowed: this.scope.asShadowPredicate() });
     if (bakedElementLoop) {
       return this.renderUnrolledStaticElementLoop(loop, bakedElementLoop.items);
     }
     const arrayName = loop.array.trim();
-    if (bakedChildLoop === null && /^[A-Za-z_$][\w$]*$/.test(arrayName)) {
+    if (bakedChildLoop === null && /^[A-Za-z_$][\w$]*$/.test(arrayName) && !this.scope.isBound(arrayName)) {
       const arrayConst = this.state.localConstants.find((c) => c.name === arrayName);
       if (arrayConst && !arrayConst.isModule && arrayConst.parsed && !this.isStringExpr(arrayConst.parsed, new Set)) {
         this.state.errors.push({
@@ -11216,6 +11255,9 @@ ${goFields.join(`
     }
     const wasInLoopOuter = this.inLoop;
     this.inLoop = true;
+    const scopeLoop = loop.iterationShape === "keys" ? { ...loop, param: "" } : loop;
+    const prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(scopeLoop);
     const addedLoopVars = [];
     for (const d of loop.preamble?.declarations ?? []) {
       this.loopVarRefCount.set(d.name, (this.loopVarRefCount.get(d.name) ?? 0) + 1);
@@ -11227,17 +11269,14 @@ ${goFields.join(`
       this.loopBindingStack.push(built.bindings);
       this.loopRestExcludeStack.push(built.restExcludes);
       pushedBindingMap = true;
-      this.loopParamStack.push("");
       if (rangeIndex !== "_") {
         this.loopVarRefCount.set(rangeIndex, (this.loopVarRefCount.get(rangeIndex) ?? 0) + 1);
         addedLoopVars.push(rangeIndex);
       }
     } else if (loop.iterationShape === "keys") {
-      this.loopParamStack.push("");
       this.loopVarRefCount.set(param, (this.loopVarRefCount.get(param) ?? 0) + 1);
       addedLoopVars.push(param);
     } else {
-      this.loopParamStack.push(param);
       if (rangeIndex !== "_") {
         this.loopVarRefCount.set(rangeIndex, (this.loopVarRefCount.get(rangeIndex) ?? 0) + 1);
         addedLoopVars.push(rangeIndex);
@@ -11259,7 +11298,7 @@ ${goFields.join(`
       else
         this.loopVarRefCount.set(v, rc);
     }
-    this.loopParamStack.pop();
+    this.scope = prevScope;
     if (pushedBindingMap) {
       this.loopBindingStack.pop();
       this.loopRestExcludeStack.pop();
@@ -11291,7 +11330,8 @@ ${goFields.join(`
     this.loopWrapperStack.push(false);
     this.loopKeyDepthStack.push(loop.depth);
     this.loopScalarItemStack.push(this.scalarLiteralLoopGoType(loop.arrayParsed, loop.itemType) !== null);
-    this.loopParamStack.push(loop.param);
+    const prevScope = this.scope;
+    this.scope = prevScope.enterLoopRow(loop);
     let body = "";
     for (const item of items) {
       this.staticLoopItemStack.push({ param: loop.param, item });
@@ -11311,7 +11351,7 @@ ${goFields.join(`
         break;
       }
     }
-    this.loopParamStack.pop();
+    this.scope = prevScope;
     this.loopScalarItemStack.pop();
     this.loopKeyDepthStack.pop();
     this.loopWrapperStack.pop();
@@ -11480,8 +11520,7 @@ ${children}`;
       }
       if (this.inLoop) {
         const trimmed = value.expr.trim();
-        const currentLoopParam = this.loopParamStack[this.loopParamStack.length - 1];
-        if (currentLoopParam && trimmed === currentLoopParam) {
+        if (this.isCurrentLoopItem(trimmed)) {
           return `{{bf_spread_attrs (bf_js_keys .)}}`;
         }
         const restInfo = this.lookupRestExclude(trimmed);