@barefootjs/rust 0.33.1 → 0.33.3

package/dist/adapter/index.js

@@ -187377,7 +187377,7 @@ function isAriaBooleanAttr(name) {
 }
 
 // src/adapter/minijinja-adapter.ts
-import { BF_SLOT, BF_COND, BF_REGION, escapeHtml } from "@barefootjs/shared";
+import { BF_SLOT, BF_COND, BF_REGION, escapeHtml, resolveJsxChildrenProp } from "@barefootjs/shared";
 
 // src/adapter/lib/constants.ts
 var JINJA_TEMPLATE_PRIMITIVES = {
@@ -187439,62 +187439,6 @@ function minijinjaIdent(name) {
   return RESERVED_WORDS.has(name) ? `${name}_` : name;
 }
 
-// src/adapter/lib/ir-scope.ts
-var NON_VAR_TOKENS = new Set([
-  "bf",
-  "if",
-  "else",
-  "is",
-  "not",
-  "and",
-  "or",
-  "in",
-  "none",
-  "true",
-  "false",
-  "defined"
-]);
-function extractTopLevelIdentifiers(jinjaExpr) {
-  const stripped = jinjaExpr.replace(/'(?:\\.|[^'\\])*'/g, " ");
-  const out = [];
-  for (const m of stripped.matchAll(/(?<!\.)\b([A-Za-z_]\w*)\b/g)) {
-    if (!NON_VAR_TOKENS.has(m[1]))
-      out.push(m[1]);
-  }
-  return out;
-}
-function resolveJsxChildrenProp(props) {
-  const prop = props.find((p) => p.name === "children");
-  if (!prop)
-    return [];
-  if (prop.value.kind !== "jsx-children")
-    return [];
-  return prop.value.children;
-}
-function collectRootScopeNodes(node) {
-  const out = new Set;
-  const visit = (n) => {
-    if (!n)
-      return;
-    if (n.type === "element") {
-      out.add(n);
-      return;
-    }
-    if (n.type === "if-statement") {
-      const s = n;
-      visit(s.consequent);
-      visit(s.alternate);
-      return;
-    }
-    if (n.type === "fragment") {
-      for (const c of n.children)
-        visit(c);
-    }
-  };
-  visit(node);
-  return out;
-}
-
 // src/adapter/expr/array-method.ts
 import {
   serializeParsedExpr,
@@ -188230,6 +188174,33 @@ import {
   computeSsrSeedPlan,
   materializeGetterCalls
 } from "@barefootjs/jsx";
+
+// src/adapter/lib/ir-scope.ts
+var NON_VAR_TOKENS = new Set([
+  "bf",
+  "if",
+  "else",
+  "is",
+  "not",
+  "and",
+  "or",
+  "in",
+  "none",
+  "true",
+  "false",
+  "defined"
+]);
+function extractTopLevelIdentifiers(jinjaExpr) {
+  const stripped = jinjaExpr.replace(/'(?:\\.|[^'\\])*'/g, " ");
+  const out = [];
+  for (const m of stripped.matchAll(/(?<!\.)\b([A-Za-z_]\w*)\b/g)) {
+    if (!NON_VAR_TOKENS.has(m[1]))
+      out.push(m[1]);
+  }
+  return out;
+}
+
+// src/adapter/memo/seed.ts
 function contextDefaultJinja(c) {
   const d = c.defaultValue;
   if (d === null || d === undefined)
@@ -188319,11 +188290,9 @@ class MinijinjaAdapter extends BaseAdapter {
   templatesPerComponent = true;
   templatePrimitives = JINJA_PRIMITIVE_EMIT_MAP;
   componentName = "";
-  rootScopeNodes = new Set;
   options;
   errors = [];
   inLoop = false;
-  currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
   booleanTypedProps = new Set;
@@ -188359,7 +188328,6 @@ class MinijinjaAdapter extends BaseAdapter {
     if (!options?.siblingTemplatesRegistered) {
       this.errors.push(...collectImportedLoopChildComponentErrors(ir, this.componentName));
     }
-    this.rootScopeNodes = collectRootScopeNodes(ir.root);
     const templateBody = ir.root.type === "if-statement" ? this.renderIfStatement(ir.root) : this.renderNode(ir.root);
     const scriptReg = options?.skipScriptRegistration ? "" : this.generateScriptRegistrations(ir, options?.scriptBaseName, options?.scriptAssets, options?.preloadAssets);
     const ctxSeed = generateContextConsumerSeed(ir);
@@ -188492,8 +188460,14 @@ class MinijinjaAdapter extends BaseAdapter {
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker("")}`;
     }
-    if (this.rootScopeNodes.has(element) && element.needsScope) {
-      hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`;
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        const lowered = emitAttrValue({ kind: "expression", expr: element.keyAttr.value }, this.elementAttrEmitter, element.keyAttr.name);
+        if (lowered)
+          hydrationAttrs += ` ${lowered}`;
+      } else {
+        hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`;
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
@@ -188695,13 +188669,10 @@ ${whenTrue}
     }
     const prevInLoop = this.inLoop;
     this.inLoop = true;
-    const prevLoopKeyDepth = this.currentLoopKeyDepth;
-    this.currentLoopKeyDepth = loop.depth;
     const prevScope = this.scope;
     this.scope = prevScope.enterLoopRow(loop);
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${minijinjaIdent(d.name)} = ${this.convertExpressionToJinja(d.raw, d.valueParsed)} %}`);
     const childrenUnderLoop = this.renderChildren(loop.children);
-    this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
     const bodyChildren = loop.bodyIsItemConditional && loop.key ? `{{ bf.comment("loop-i:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
 ${childrenUnderLoop}` : childrenUnderLoop;
@@ -188976,14 +188947,9 @@ ${name}="{{ bf.string(${val}) }}"
         continue;
       if (isDangerousInnerHtmlAttr(attr))
         continue;
-      let attrName;
-      if (attr.name === "className")
-        attrName = "class";
-      else if (attr.name === "key") {
-        const depth = this.currentLoopKeyDepth;
-        attrName = depth > 0 ? `data-key-${depth}` : "data-key";
-      } else
-        attrName = attr.name;
+      if (attr.name === "key")
+        continue;
+      const attrName = attr.name === "className" ? "class" : attr.name;
       const lowered = emitAttrValue(attr.value, this.elementAttrEmitter, attrName);
       if (lowered)
         parts.push(lowered);

package/dist/adapter/lib/ir-scope.d.ts

@@ -2,8 +2,16 @@
  * IR traversal helpers for the minijinja template adapter.
  *
  * Ported from `packages/adapter-xslate/src/adapter/lib/ir-scope.ts`.
- * `resolveJsxChildrenProp` and `collectRootScopeNodes` are byte-identical
- * (adapter-agnostic IR walks).
+ * `resolveJsxChildrenProp` used to live here too (byte-identical across
+ * every adapter carrying a copy of this file); it moved to
+ * `@barefootjs/shared` (#2773) so every adapter — DSL and Go template
+ * alike — calls the one implementation instead of each keeping a copy
+ * that can silently re-diverge. `collectRootScopeNodes` — the "which
+ * elements are this component's own render root(s)" walk this file used
+ * to duplicate too — moved into `jsx-to-ir.ts`'s `resolveRootKeyAttr`
+ * (#2753): the decision it fed (a `data-key` relay attribute) is resolved
+ * once, onto `IRElement.keyAttr`, instead of re-derived at emit time by
+ * every adapter.
  *
  * `extractTopLevelIdentifiers` scans the RENDERED template text (rather than
  * re-deriving free vars from the original JS AST) so it stays exactly in
@@ -25,7 +33,6 @@
  * AVAILABILITY itself is now the shared `computeSsrSeedPlan`'s job
  * (packages/jsx/src/ssr-seed-plan.ts), not this module's (#2075).
  */
-import type { IRNode, IRProp } from '@barefootjs/jsx';
 /**
  * Extract the set of "top-level identifier" tokens from a rendered Jinja
  * expression: bare words, excluding quoted-string content, dotted
@@ -33,18 +40,4 @@ import type { IRNode, IRProp } from '@barefootjs/jsx';
  * See the file header for why this replaces a direct `\w+` scan.
  */
 export declare function extractTopLevelIdentifiers(jinjaExpr: string): string[];
-/**
- * Find the `children` prop's `jsx-children` payload. Narrowed via the
- * AttrValue `kind` discriminator so adapter code stays type-safe if the IR
- * shape evolves.
- */
-export declare function resolveJsxChildrenProp(props: readonly IRProp[]): IRNode[];
-/**
- * Collect the component's root scope element node(s) — the elements that
- * become the rendered root and so carry `data-key` for a keyed loop item. A
- * plain element root is itself; an `if-statement` (early-return) root
- * contributes the top element of each branch, since exactly one renders at
- * runtime. (#1297)
- */
-export declare function collectRootScopeNodes(node: IRNode): Set<IRNode>;
 //# sourceMappingURL=ir-scope.d.ts.map

package/dist/adapter/lib/ir-scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ir-scope.d.ts","sourceRoot":"","sources":["../../../src/adapter/lib/ir-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAA6B,MAAM,iBAAiB,CAAA;AAYhF;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAUtE;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,EAAE,CAKzE;AAED;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAiB/D"}
+{"version":3,"file":"ir-scope.d.ts","sourceRoot":"","sources":["../../../src/adapter/lib/ir-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AAYH;;;;;GAKG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAUtE"}

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

@@ -129,22 +129,9 @@ export declare class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitt
      */
     templatePrimitives: TemplatePrimitiveRegistry;
     private componentName;
-    /** Component root scope element(s) — each carries `data-key` for a keyed loop
-     *  item (set by the child renderer from the JSX `key` prop). A plain element
-     *  root is one node; an `if-statement` (early-return) root contributes the
-     *  top element of every branch. */
-    private rootScopeNodes;
     private options;
     private errors;
     private inLoop;
-    /**
-     * `IRLoop.depth` of the loop currently being rendered (save/restore
-     * around `renderChildren(loop.children)`, mirroring `inLoop` above).
-     * `renderAttributes` reads this to derive the `key` → `data-key`/
-     * `data-key-N` suffix — the depth is IR-computed (jsx-to-ir.ts), not
-     * re-derived here (#2168 nested-loop-outer-binding).
-     */
-    private currentLoopKeyDepth;
     /**
      * SolidJS-style props identifier (`function(props: P)`) and the
      * analyzer-extracted prop names. Stashed at `generate()` entry so the

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

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

package/dist/index.js

@@ -187377,7 +187377,7 @@ function isAriaBooleanAttr(name) {
 }
 
 // src/adapter/minijinja-adapter.ts
-import { BF_SLOT, BF_COND, BF_REGION, escapeHtml } from "@barefootjs/shared";
+import { BF_SLOT, BF_COND, BF_REGION, escapeHtml, resolveJsxChildrenProp } from "@barefootjs/shared";
 
 // src/adapter/lib/constants.ts
 var JINJA_TEMPLATE_PRIMITIVES = {
@@ -187439,62 +187439,6 @@ function minijinjaIdent(name) {
   return RESERVED_WORDS.has(name) ? `${name}_` : name;
 }
 
-// src/adapter/lib/ir-scope.ts
-var NON_VAR_TOKENS = new Set([
-  "bf",
-  "if",
-  "else",
-  "is",
-  "not",
-  "and",
-  "or",
-  "in",
-  "none",
-  "true",
-  "false",
-  "defined"
-]);
-function extractTopLevelIdentifiers(jinjaExpr) {
-  const stripped = jinjaExpr.replace(/'(?:\\.|[^'\\])*'/g, " ");
-  const out = [];
-  for (const m of stripped.matchAll(/(?<!\.)\b([A-Za-z_]\w*)\b/g)) {
-    if (!NON_VAR_TOKENS.has(m[1]))
-      out.push(m[1]);
-  }
-  return out;
-}
-function resolveJsxChildrenProp(props) {
-  const prop = props.find((p) => p.name === "children");
-  if (!prop)
-    return [];
-  if (prop.value.kind !== "jsx-children")
-    return [];
-  return prop.value.children;
-}
-function collectRootScopeNodes(node) {
-  const out = new Set;
-  const visit = (n) => {
-    if (!n)
-      return;
-    if (n.type === "element") {
-      out.add(n);
-      return;
-    }
-    if (n.type === "if-statement") {
-      const s = n;
-      visit(s.consequent);
-      visit(s.alternate);
-      return;
-    }
-    if (n.type === "fragment") {
-      for (const c of n.children)
-        visit(c);
-    }
-  };
-  visit(node);
-  return out;
-}
-
 // src/adapter/expr/array-method.ts
 import {
   serializeParsedExpr,
@@ -188230,6 +188174,33 @@ import {
   computeSsrSeedPlan,
   materializeGetterCalls
 } from "@barefootjs/jsx";
+
+// src/adapter/lib/ir-scope.ts
+var NON_VAR_TOKENS = new Set([
+  "bf",
+  "if",
+  "else",
+  "is",
+  "not",
+  "and",
+  "or",
+  "in",
+  "none",
+  "true",
+  "false",
+  "defined"
+]);
+function extractTopLevelIdentifiers(jinjaExpr) {
+  const stripped = jinjaExpr.replace(/'(?:\\.|[^'\\])*'/g, " ");
+  const out = [];
+  for (const m of stripped.matchAll(/(?<!\.)\b([A-Za-z_]\w*)\b/g)) {
+    if (!NON_VAR_TOKENS.has(m[1]))
+      out.push(m[1]);
+  }
+  return out;
+}
+
+// src/adapter/memo/seed.ts
 function contextDefaultJinja(c) {
   const d = c.defaultValue;
   if (d === null || d === undefined)
@@ -188319,11 +188290,9 @@ class MinijinjaAdapter extends BaseAdapter {
   templatesPerComponent = true;
   templatePrimitives = JINJA_PRIMITIVE_EMIT_MAP;
   componentName = "";
-  rootScopeNodes = new Set;
   options;
   errors = [];
   inLoop = false;
-  currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
   booleanTypedProps = new Set;
@@ -188359,7 +188328,6 @@ class MinijinjaAdapter extends BaseAdapter {
     if (!options?.siblingTemplatesRegistered) {
       this.errors.push(...collectImportedLoopChildComponentErrors(ir, this.componentName));
     }
-    this.rootScopeNodes = collectRootScopeNodes(ir.root);
     const templateBody = ir.root.type === "if-statement" ? this.renderIfStatement(ir.root) : this.renderNode(ir.root);
     const scriptReg = options?.skipScriptRegistration ? "" : this.generateScriptRegistrations(ir, options?.scriptBaseName, options?.scriptAssets, options?.preloadAssets);
     const ctxSeed = generateContextConsumerSeed(ir);
@@ -188492,8 +188460,14 @@ class MinijinjaAdapter extends BaseAdapter {
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker("")}`;
     }
-    if (this.rootScopeNodes.has(element) && element.needsScope) {
-      hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`;
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        const lowered = emitAttrValue({ kind: "expression", expr: element.keyAttr.value }, this.elementAttrEmitter, element.keyAttr.name);
+        if (lowered)
+          hydrationAttrs += ` ${lowered}`;
+      } else {
+        hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`;
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
@@ -188695,13 +188669,10 @@ ${whenTrue}
     }
     const prevInLoop = this.inLoop;
     this.inLoop = true;
-    const prevLoopKeyDepth = this.currentLoopKeyDepth;
-    this.currentLoopKeyDepth = loop.depth;
     const prevScope = this.scope;
     this.scope = prevScope.enterLoopRow(loop);
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${minijinjaIdent(d.name)} = ${this.convertExpressionToJinja(d.raw, d.valueParsed)} %}`);
     const childrenUnderLoop = this.renderChildren(loop.children);
-    this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
     const bodyChildren = loop.bodyIsItemConditional && loop.key ? `{{ bf.comment("loop-i:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
 ${childrenUnderLoop}` : childrenUnderLoop;
@@ -188976,14 +188947,9 @@ ${name}="{{ bf.string(${val}) }}"
         continue;
       if (isDangerousInnerHtmlAttr(attr))
         continue;
-      let attrName;
-      if (attr.name === "className")
-        attrName = "class";
-      else if (attr.name === "key") {
-        const depth = this.currentLoopKeyDepth;
-        attrName = depth > 0 ? `data-key-${depth}` : "data-key";
-      } else
-        attrName = attr.name;
+      if (attr.name === "key")
+        continue;
+      const attrName = attr.name === "className" ? "class" : attr.name;
       const lowered = emitAttrValue(attr.value, this.elementAttrEmitter, attrName);
       if (lowered)
         parts.push(lowered);

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 ts24 from "typescript";
+import ts25 from "typescript";
 
 // ../jsx/src/analyzer.ts
 import ts9 from "typescript";
@@ -2134,6 +2134,15 @@ function isBooleanAttr(name) {
 function escapeHtml(text) {
   return text.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }
+// ../shared/src/jsx-children-prop.ts
+function resolveJsxChildrenProp(props) {
+  const prop = props.find((p) => p.name === "children");
+  if (!prop)
+    return [];
+  if (prop.value.kind !== "jsx-children")
+    return [];
+  return prop.value.children ?? [];
+}
 // ../jsx/src/ir-to-client-js/csr-substitute.ts
 import ts4 from "typescript";
 function extractFreeIdentifiersFromText(text) {
@@ -3060,6 +3069,10 @@ var EMPTY_BOUND = new Set;
 var constInitializerCache = new WeakMap;
 var functionInfoExprCache = new WeakMap;
 
+// ../jsx/src/ir-to-client-js/prop-handling.ts
+var _localConstantValuesCache = new WeakMap;
+var _restSpreadNamesCache = new WeakMap;
+
 // ../jsx/src/ir-to-client-js/control-flow/stringify/template-parse.ts
 var SVG_ROOT_TAGS = new Set([
   "svg",
@@ -3181,11 +3194,14 @@ var KEYWORDS_AND_GLOBALS = new Set([
 // ../jsx/src/ir-to-client-js/walk-prop-accesses.ts
 import ts14 from "typescript";
 
+// ../jsx/src/ir-to-client-js/imports.ts
+import ts16 from "typescript";
+
 // ../jsx/src/value-references.ts
 import ts15 from "typescript";
 
 // ../jsx/src/relocate.ts
-import ts16 from "typescript";
+import ts17 from "typescript";
 
 // ../jsx/src/lowering-registry.ts
 var plugins = [];
@@ -3402,10 +3418,10 @@ function matchSearchParamsMethodCall(callee, args, localNames) {
 }
 
 // ../jsx/src/ir-to-client-js/prune-unused-prop-extractions.ts
-import ts17 from "typescript";
+import ts18 from "typescript";
 
 // ../jsx/src/ir-to-client-js/control-flow/plan/lazy-preamble.ts
-import ts18 from "typescript";
+import ts19 from "typescript";
 var NO_PREAMBLE = {
   lazySafe: true,
   facts: { declaredNames: new Set, freeNames: new Set }
@@ -3455,7 +3471,7 @@ var INERT_BINDING_GLOBALS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/emit-reactive.ts
-import ts19 from "typescript";
+import ts20 from "typescript";
 
 // ../jsx/src/ir-to-client-js/control-flow/stringify/event-delegation.ts
 var NON_BUBBLING_EVENTS = new Set([
@@ -3470,7 +3486,7 @@ var NON_BUBBLING_EVENTS = new Set([
 ]);
 
 // ../jsx/src/ir-to-client-js/rewrite-props-object.ts
-import ts20 from "typescript";
+import ts21 from "typescript";
 
 // ../jsx/src/ir-to-client-js/source-map.ts
 var BASE64_CHARS = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
@@ -3561,15 +3577,15 @@ class SourceMapGenerator {
 }
 
 // ../jsx/src/preprocess-inline-jsx-callbacks.ts
-import ts21 from "typescript";
+import ts22 from "typescript";
 
 // ../jsx/src/ssr-defaults.ts
-import ts22 from "typescript";
+import ts23 from "typescript";
 var UNRESOLVED = Symbol("unresolved");
 var NO_RETURN = Symbol("no-return");
 
 // ../jsx/src/augment-inherited-props.ts
-import ts23 from "typescript";
+import ts24 from "typescript";
 function collectContextConsumers(metadata) {
   const constants = metadata.localConstants ?? [];
   const contextDefaults = new Map;
@@ -3601,47 +3617,47 @@ function collectContextConsumers(metadata) {
 }
 function parseUseContextArg(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts23.isCallExpression(expr))
+  if (!expr || !ts24.isCallExpression(expr))
     return null;
-  if (!ts23.isIdentifier(expr.expression) || expr.expression.text !== "useContext")
+  if (!ts24.isIdentifier(expr.expression) || expr.expression.text !== "useContext")
     return null;
   if (expr.arguments.length !== 1)
     return null;
   const arg = expr.arguments[0];
-  return ts23.isIdentifier(arg) ? arg.text : null;
+  return ts24.isIdentifier(arg) ? arg.text : null;
 }
 function parseCreateContextDefault(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts23.isCallExpression(expr))
+  if (!expr || !ts24.isCallExpression(expr))
     return null;
   if (expr.arguments.length === 0)
     return null;
   const arg = expr.arguments[0];
-  if (ts23.isStringLiteral(arg) || ts23.isNoSubstitutionTemplateLiteral(arg))
+  if (ts24.isStringLiteral(arg) || ts24.isNoSubstitutionTemplateLiteral(arg))
     return arg.text;
-  if (ts23.isNumericLiteral(arg))
+  if (ts24.isNumericLiteral(arg))
     return Number(arg.text);
-  if (arg.kind === ts23.SyntaxKind.TrueKeyword)
+  if (arg.kind === ts24.SyntaxKind.TrueKeyword)
     return true;
-  if (arg.kind === ts23.SyntaxKind.FalseKeyword)
+  if (arg.kind === ts24.SyntaxKind.FalseKeyword)
     return false;
   return null;
 }
 function isObjectLiteralCreateContextDefault(source) {
   const expr = parseSingleExpression(source);
-  if (!expr || !ts23.isCallExpression(expr))
+  if (!expr || !ts24.isCallExpression(expr))
     return false;
   if (expr.arguments.length === 0)
     return false;
-  return ts23.isObjectLiteralExpression(expr.arguments[0]);
+  return ts24.isObjectLiteralExpression(expr.arguments[0]);
 }
 function parseSingleExpression(source) {
-  const sf = ts23.createSourceFile("__ctx.ts", `(${source})`, ts23.ScriptTarget.Latest, false);
+  const sf = ts24.createSourceFile("__ctx.ts", `(${source})`, ts24.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts23.isExpressionStatement(stmt))
+  if (!stmt || !ts24.isExpressionStatement(stmt))
     return null;
   let e = stmt.expression;
-  while (ts23.isParenthesizedExpression(e))
+  while (ts24.isParenthesizedExpression(e))
     e = e.expression;
   return e;
 }
@@ -3666,25 +3682,25 @@ function augmentInheritedPropAccesses(ir) {
   const pinCoalesceLiterals = (s) => {
     if (!s || !s.includes(propsObj))
       return;
-    const sf = ts23.createSourceFile("__aug.ts", `(${s})`, ts23.ScriptTarget.Latest, false);
+    const sf = ts24.createSourceFile("__aug.ts", `(${s})`, ts24.ScriptTarget.Latest, false);
     const visit = (n) => {
-      if (ts23.isBinaryExpression(n) && (n.operatorToken.kind === ts23.SyntaxKind.QuestionQuestionToken || n.operatorToken.kind === ts23.SyntaxKind.BarBarToken)) {
+      if (ts24.isBinaryExpression(n) && (n.operatorToken.kind === ts24.SyntaxKind.QuestionQuestionToken || n.operatorToken.kind === ts24.SyntaxKind.BarBarToken)) {
         let left = n.left;
-        while (ts23.isParenthesizedExpression(left))
+        while (ts24.isParenthesizedExpression(left))
           left = left.expression;
-        if (ts23.isPropertyAccessExpression(left) && ts23.isIdentifier(left.expression) && left.expression.text === propsObj) {
+        if (ts24.isPropertyAccessExpression(left) && ts24.isIdentifier(left.expression) && left.expression.text === propsObj) {
           const name = left.name.text;
           let right = n.right;
-          while (ts23.isParenthesizedExpression(right))
+          while (ts24.isParenthesizedExpression(right))
             right = right.expression;
-          if (ts23.isPrefixUnaryExpression(right))
+          if (ts24.isPrefixUnaryExpression(right))
             right = right.operand;
-          const kind = ts23.isNumericLiteral(right) ? "number" : right.kind === ts23.SyntaxKind.TrueKeyword || right.kind === ts23.SyntaxKind.FalseKeyword ? "boolean" : ts23.isStringLiteralLike(right) ? "string" : null;
+          const kind = ts24.isNumericLiteral(right) ? "number" : right.kind === ts24.SyntaxKind.TrueKeyword || right.kind === ts24.SyntaxKind.FalseKeyword ? "boolean" : ts24.isStringLiteralLike(right) ? "string" : null;
           if (kind && !coalesceLiteralTypes.has(name))
             coalesceLiteralTypes.set(name, kind);
         }
       }
-      ts23.forEachChild(n, visit);
+      ts24.forEachChild(n, visit);
     };
     visit(sf);
   };
@@ -3795,33 +3811,33 @@ function augmentInheritedPropAccesses(ir) {
   }
 }
 function parseStaticStringConst(source) {
-  const sf = ts23.createSourceFile("__const.ts", `const __x = (${source});`, ts23.ScriptTarget.Latest, false);
+  const sf = ts24.createSourceFile("__const.ts", `const __x = (${source});`, ts24.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts23.isVariableStatement(stmt))
+  if (!stmt || !ts24.isVariableStatement(stmt))
     return null;
   let init = stmt.declarationList.declarations[0]?.initializer;
-  while (init && ts23.isParenthesizedExpression(init))
+  while (init && ts24.isParenthesizedExpression(init))
     init = init.expression;
   if (!init)
     return null;
-  if (ts23.isStringLiteral(init) || ts23.isNoSubstitutionTemplateLiteral(init)) {
+  if (ts24.isStringLiteral(init) || ts24.isNoSubstitutionTemplateLiteral(init)) {
     return init.text;
   }
   return evalStringArrayJoin(source);
 }
 function evalTemplateOfStringConsts(source, resolved) {
-  const sf = ts23.createSourceFile("__const.ts", `const __x = (${source});`, ts23.ScriptTarget.Latest, false);
+  const sf = ts24.createSourceFile("__const.ts", `const __x = (${source});`, ts24.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts23.isVariableStatement(stmt))
+  if (!stmt || !ts24.isVariableStatement(stmt))
     return null;
   let init = stmt.declarationList.declarations[0]?.initializer;
-  while (init && ts23.isParenthesizedExpression(init))
+  while (init && ts24.isParenthesizedExpression(init))
     init = init.expression;
-  if (!init || !ts23.isTemplateExpression(init))
+  if (!init || !ts24.isTemplateExpression(init))
     return null;
   let out = init.head.text;
   for (const span of init.templateSpans) {
-    if (!ts23.isIdentifier(span.expression))
+    if (!ts24.isIdentifier(span.expression))
       return null;
     const value = resolved.get(span.expression.text);
     if (value === undefined)
@@ -3854,30 +3870,30 @@ function lookupStaticRecordLiteral(objectName, key, constants, isShadowed) {
   const constInfo = (constants ?? []).find((c) => c.name === objectName && c.isModule);
   if (constInfo?.value === undefined)
     return null;
-  const sf = ts23.createSourceFile("__rec.ts", `(${constInfo.value})`, ts23.ScriptTarget.Latest, true);
+  const sf = ts24.createSourceFile("__rec.ts", `(${constInfo.value})`, ts24.ScriptTarget.Latest, true);
   if (sf.statements.length !== 1)
     return null;
   const stmt = sf.statements[0];
-  if (!ts23.isExpressionStatement(stmt))
+  if (!ts24.isExpressionStatement(stmt))
     return null;
   let parsed = stmt.expression;
-  while (ts23.isParenthesizedExpression(parsed))
+  while (ts24.isParenthesizedExpression(parsed))
     parsed = parsed.expression;
-  if (!ts23.isObjectLiteralExpression(parsed))
+  if (!ts24.isObjectLiteralExpression(parsed))
     return null;
   for (const prop of parsed.properties) {
-    if (!ts23.isPropertyAssignment(prop))
+    if (!ts24.isPropertyAssignment(prop))
       continue;
     const name = prop.name;
-    const propKey = ts23.isIdentifier(name) || ts23.isStringLiteral(name) || ts23.isNoSubstitutionTemplateLiteral(name) ? name.text : null;
+    const propKey = ts24.isIdentifier(name) || ts24.isStringLiteral(name) || ts24.isNoSubstitutionTemplateLiteral(name) ? name.text : null;
     if (propKey !== key)
       continue;
     let v = prop.initializer;
-    while (ts23.isParenthesizedExpression(v))
+    while (ts24.isParenthesizedExpression(v))
       v = v.expression;
-    if (ts23.isNumericLiteral(v))
+    if (ts24.isNumericLiteral(v))
       return { kind: "number", text: v.text };
-    if (ts23.isStringLiteral(v) || ts23.isNoSubstitutionTemplateLiteral(v)) {
+    if (ts24.isStringLiteral(v) || ts24.isNoSubstitutionTemplateLiteral(v)) {
       return { kind: "string", text: v.text };
     }
     return null;
@@ -3885,28 +3901,28 @@ function lookupStaticRecordLiteral(objectName, key, constants, isShadowed) {
   return null;
 }
 function evalStringArrayJoin(source) {
-  const sf = ts23.createSourceFile("__join.ts", `const __x = (${source});`, ts23.ScriptTarget.Latest, false);
+  const sf = ts24.createSourceFile("__join.ts", `const __x = (${source});`, ts24.ScriptTarget.Latest, false);
   const stmt = sf.statements[0];
-  if (!stmt || !ts23.isVariableStatement(stmt))
+  if (!stmt || !ts24.isVariableStatement(stmt))
     return null;
   let node = stmt.declarationList.declarations[0]?.initializer;
-  while (node && ts23.isParenthesizedExpression(node))
+  while (node && ts24.isParenthesizedExpression(node))
     node = node.expression;
-  if (!node || !ts23.isCallExpression(node))
+  if (!node || !ts24.isCallExpression(node))
     return null;
   const callee = node.expression;
-  if (!ts23.isPropertyAccessExpression(callee))
+  if (!ts24.isPropertyAccessExpression(callee))
     return null;
   if (callee.name.text !== "join")
     return null;
   let recv = callee.expression;
-  while (ts23.isParenthesizedExpression(recv))
+  while (ts24.isParenthesizedExpression(recv))
     recv = recv.expression;
-  if (!ts23.isArrayLiteralExpression(recv))
+  if (!ts24.isArrayLiteralExpression(recv))
     return null;
   const parts = [];
   for (const el of recv.elements) {
-    if (ts23.isStringLiteral(el) || ts23.isNoSubstitutionTemplateLiteral(el)) {
+    if (ts24.isStringLiteral(el) || ts24.isNoSubstitutionTemplateLiteral(el)) {
       parts.push(el.text);
     } else {
       return null;
@@ -3915,7 +3931,7 @@ function evalStringArrayJoin(source) {
   let sep = ",";
   if (node.arguments.length >= 1) {
     const arg = node.arguments[0];
-    if (ts23.isStringLiteral(arg) || ts23.isNoSubstitutionTemplateLiteral(arg))
+    if (ts24.isStringLiteral(arg) || ts24.isNoSubstitutionTemplateLiteral(arg))
       sep = arg.text;
     else
       return null;
@@ -3923,11 +3939,11 @@ function evalStringArrayJoin(source) {
   return parts.join(sep);
 }
 function parseRecordIndexAccess(val, localConstants, propsParams, resolveKey) {
-  if (!ts23.isElementAccessExpression(val))
+  if (!ts24.isElementAccessExpression(val))
     return null;
   const obj = val.expression;
   const arg = val.argumentExpression;
-  if (!ts23.isIdentifier(obj) || !ts23.isIdentifier(arg))
+  if (!ts24.isIdentifier(obj) || !ts24.isIdentifier(arg))
     return null;
   let indexPropName;
   let defaultKey;
@@ -3943,35 +3959,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 = ts23.createSourceFile("__rec.ts", `(${constInfo.value})`, ts23.ScriptTarget.Latest, true);
+  const sf = ts24.createSourceFile("__rec.ts", `(${constInfo.value})`, ts24.ScriptTarget.Latest, true);
   if (sf.statements.length !== 1)
     return null;
   const stmt = sf.statements[0];
-  if (!ts23.isExpressionStatement(stmt))
+  if (!ts24.isExpressionStatement(stmt))
     return null;
   let parsed = stmt.expression;
-  while (ts23.isParenthesizedExpression(parsed))
+  while (ts24.isParenthesizedExpression(parsed))
     parsed = parsed.expression;
-  if (!ts23.isObjectLiteralExpression(parsed))
+  if (!ts24.isObjectLiteralExpression(parsed))
     return null;
   const entries = [];
   for (const prop of parsed.properties) {
-    if (!ts23.isPropertyAssignment(prop))
+    if (!ts24.isPropertyAssignment(prop))
       return null;
     let key;
-    if (ts23.isIdentifier(prop.name)) {
+    if (ts24.isIdentifier(prop.name)) {
       key = prop.name.text;
-    } else if (ts23.isStringLiteral(prop.name) || ts23.isNoSubstitutionTemplateLiteral(prop.name)) {
+    } else if (ts24.isStringLiteral(prop.name) || ts24.isNoSubstitutionTemplateLiteral(prop.name)) {
       key = prop.name.text;
     } else {
       return null;
     }
     let v = prop.initializer;
-    while (ts23.isParenthesizedExpression(v))
+    while (ts24.isParenthesizedExpression(v))
       v = v.expression;
-    if (ts23.isNumericLiteral(v)) {
+    if (ts24.isNumericLiteral(v)) {
       entries.push({ key, value: { kind: "number", text: v.text } });
-    } else if (ts23.isStringLiteral(v) || ts23.isNoSubstitutionTemplateLiteral(v)) {
+    } else if (ts24.isStringLiteral(v) || ts24.isNoSubstitutionTemplateLiteral(v)) {
       entries.push({ key, value: { kind: "string", text: v.text } });
     } else {
       return null;
@@ -4060,7 +4076,7 @@ function computeSsrSeedPlan(metadata) {
 // ../jsx/src/rich-type-refusal.ts
 var EMPTY_BINDINGS2 = new Map;
 // ../jsx/src/shared-program.ts
-import ts25 from "typescript";
+import ts26 from "typescript";
 // ../jsx/src/adapters/interface.ts
 class BaseAdapter {
   renderChildren(children) {
@@ -4342,7 +4358,7 @@ class JsxAdapter extends BaseAdapter {
 }
 
 // ../jsx/src/adapters/template-imports.ts
-import ts26 from "typescript";
+import ts27 from "typescript";
 var CLIENT_PACKAGE_SOURCES = new Set([
   "@barefootjs/client",
   "@barefootjs/client/runtime"
@@ -5035,7 +5051,7 @@ function dangerousInnerHtmlDiagnostic(expr, loc, reason) {
   };
 }
 // ../jsx/src/combine-client-js.ts
-import ts27 from "typescript";
+import ts28 from "typescript";
 // ../jsx/src/loop-destructure.ts
 function isLowerableLoopDestructure(loop) {
   const bindings = loop.paramBindings;
@@ -5175,9 +5191,9 @@ function escapeRe(s) {
   return s.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
 }
 // ../jsx/src/debug.ts
-import ts28 from "typescript";
-// ../jsx/src/profiler.ts
 import ts29 from "typescript";
+// ../jsx/src/profiler.ts
+import ts30 from "typescript";
 
 // ../jsx/src/index.ts
 registerBuiltinLoweringPlugins();
@@ -5298,62 +5314,6 @@ function minijinjaIdent(name) {
   return RESERVED_WORDS2.has(name) ? `${name}_` : name;
 }
 
-// src/adapter/lib/ir-scope.ts
-var NON_VAR_TOKENS = new Set([
-  "bf",
-  "if",
-  "else",
-  "is",
-  "not",
-  "and",
-  "or",
-  "in",
-  "none",
-  "true",
-  "false",
-  "defined"
-]);
-function extractTopLevelIdentifiers(jinjaExpr) {
-  const stripped = jinjaExpr.replace(/'(?:\\.|[^'\\])*'/g, " ");
-  const out = [];
-  for (const m of stripped.matchAll(/(?<!\.)\b([A-Za-z_]\w*)\b/g)) {
-    if (!NON_VAR_TOKENS.has(m[1]))
-      out.push(m[1]);
-  }
-  return out;
-}
-function resolveJsxChildrenProp(props) {
-  const prop = props.find((p) => p.name === "children");
-  if (!prop)
-    return [];
-  if (prop.value.kind !== "jsx-children")
-    return [];
-  return prop.value.children;
-}
-function collectRootScopeNodes(node) {
-  const out = new Set;
-  const visit = (n) => {
-    if (!n)
-      return;
-    if (n.type === "element") {
-      out.add(n);
-      return;
-    }
-    if (n.type === "if-statement") {
-      const s = n;
-      visit(s.consequent);
-      visit(s.alternate);
-      return;
-    }
-    if (n.type === "fragment") {
-      for (const c of n.children)
-        visit(c);
-    }
-  };
-  visit(node);
-  return out;
-}
-
 // src/adapter/expr/array-method.ts
 function renderArrayMethod(method, object, args, emit) {
   switch (method) {
@@ -6004,7 +5964,7 @@ function collectImportedLoopChildComponentErrors(ir, componentName) {
 }
 
 // src/adapter/spread/spread-codegen.ts
-import ts30 from "typescript";
+import ts31 from "typescript";
 function conditionalSpreadToJinja(ctx, expr) {
   if (!expr || expr.kind !== "conditional")
     return null;
@@ -6061,7 +6021,7 @@ function recordIndexAccessToJinja(ctx, val) {
   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, ctx.localConstants ?? [], ctx.propsParams);
   if (!parsed)
     return null;
@@ -6072,6 +6032,31 @@ function recordIndexAccessToJinja(ctx, val) {
   return `{${entries.join(", ")}}[${minijinjaIdent(parsed.indexPropName)}]`;
 }
 
+// src/adapter/lib/ir-scope.ts
+var NON_VAR_TOKENS = new Set([
+  "bf",
+  "if",
+  "else",
+  "is",
+  "not",
+  "and",
+  "or",
+  "in",
+  "none",
+  "true",
+  "false",
+  "defined"
+]);
+function extractTopLevelIdentifiers(jinjaExpr) {
+  const stripped = jinjaExpr.replace(/'(?:\\.|[^'\\])*'/g, " ");
+  const out = [];
+  for (const m of stripped.matchAll(/(?<!\.)\b([A-Za-z_]\w*)\b/g)) {
+    if (!NON_VAR_TOKENS.has(m[1]))
+      out.push(m[1]);
+  }
+  return out;
+}
+
 // src/adapter/memo/seed.ts
 function contextDefaultJinja(c) {
   const d = c.defaultValue;
@@ -6161,11 +6146,9 @@ class MinijinjaAdapter extends BaseAdapter {
   templatesPerComponent = true;
   templatePrimitives = JINJA_PRIMITIVE_EMIT_MAP;
   componentName = "";
-  rootScopeNodes = new Set;
   options;
   errors = [];
   inLoop = false;
-  currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
   booleanTypedProps = new Set;
@@ -6201,7 +6184,6 @@ class MinijinjaAdapter extends BaseAdapter {
     if (!options?.siblingTemplatesRegistered) {
       this.errors.push(...collectImportedLoopChildComponentErrors(ir, this.componentName));
     }
-    this.rootScopeNodes = collectRootScopeNodes(ir.root);
     const templateBody = ir.root.type === "if-statement" ? this.renderIfStatement(ir.root) : this.renderNode(ir.root);
     const scriptReg = options?.skipScriptRegistration ? "" : this.generateScriptRegistrations(ir, options?.scriptBaseName, options?.scriptAssets, options?.preloadAssets);
     const ctxSeed = generateContextConsumerSeed(ir);
@@ -6334,8 +6316,14 @@ class MinijinjaAdapter extends BaseAdapter {
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker("")}`;
     }
-    if (this.rootScopeNodes.has(element) && element.needsScope) {
-      hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`;
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        const lowered = emitAttrValue({ kind: "expression", expr: element.keyAttr.value }, this.elementAttrEmitter, element.keyAttr.name);
+        if (lowered)
+          hydrationAttrs += ` ${lowered}`;
+      } else {
+        hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`;
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
@@ -6537,13 +6525,10 @@ ${whenTrue}
     }
     const prevInLoop = this.inLoop;
     this.inLoop = true;
-    const prevLoopKeyDepth = this.currentLoopKeyDepth;
-    this.currentLoopKeyDepth = loop.depth;
     const prevScope = this.scope;
     this.scope = prevScope.enterLoopRow(loop);
     const preambleLines = (loop.preamble?.declarations ?? []).map((d) => `{% set ${minijinjaIdent(d.name)} = ${this.convertExpressionToJinja(d.raw, d.valueParsed)} %}`);
     const childrenUnderLoop = this.renderChildren(loop.children);
-    this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
     const bodyChildren = loop.bodyIsItemConditional && loop.key ? `{{ bf.comment("loop-i:" ~ bf.string(${this.convertExpressionToJinja(loop.key)})) | safe }}
 ${childrenUnderLoop}` : childrenUnderLoop;
@@ -6818,14 +6803,9 @@ ${name}="{{ bf.string(${val}) }}"
         continue;
       if (isDangerousInnerHtmlAttr(attr))
         continue;
-      let attrName;
-      if (attr.name === "className")
-        attrName = "class";
-      else if (attr.name === "key") {
-        const depth = this.currentLoopKeyDepth;
-        attrName = depth > 0 ? `data-key-${depth}` : "data-key";
-      } else
-        attrName = attr.name;
+      if (attr.name === "key")
+        continue;
+      const attrName = attr.name === "className" ? "class" : attr.name;
       const lowered = emitAttrValue(attr.value, this.elementAttrEmitter, attrName);
       if (lowered)
         parts.push(lowered);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/rust",
-  "version": "0.33.1",
+  "version": "0.33.3",
   "description": "minijinja (Rust) adapter for BarefootJS — compiles IR to .j2 templates and ships a Rust rendering runtime (packages/adapter-rust/runtime/); runs under any Rust web framework (axum, etc.)",
   "type": "module",
   "main": "./dist/index.js",
@@ -54,7 +54,7 @@
     "directory": "packages/adapter-rust"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.33.1"
+    "@barefootjs/shared": "0.33.3"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -71,9 +71,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.33.1",
-    "@barefootjs/vite": "0.33.1",
-    "@barefootjs/client": "0.33.1",
+    "@barefootjs/jsx": "0.33.3",
+    "@barefootjs/vite": "0.33.3",
+    "@barefootjs/client": "0.33.3",
     "typescript": "^5.0.0",
     "vite": "^6.0.0"
   }

package/src/adapter/lib/ir-scope.ts

@@ -2,8 +2,16 @@
  * IR traversal helpers for the minijinja template adapter.
  *
  * Ported from `packages/adapter-xslate/src/adapter/lib/ir-scope.ts`.
- * `resolveJsxChildrenProp` and `collectRootScopeNodes` are byte-identical
- * (adapter-agnostic IR walks).
+ * `resolveJsxChildrenProp` used to live here too (byte-identical across
+ * every adapter carrying a copy of this file); it moved to
+ * `@barefootjs/shared` (#2773) so every adapter — DSL and Go template
+ * alike — calls the one implementation instead of each keeping a copy
+ * that can silently re-diverge. `collectRootScopeNodes` — the "which
+ * elements are this component's own render root(s)" walk this file used
+ * to duplicate too — moved into `jsx-to-ir.ts`'s `resolveRootKeyAttr`
+ * (#2753): the decision it fed (a `data-key` relay attribute) is resolved
+ * once, onto `IRElement.keyAttr`, instead of re-derived at emit time by
+ * every adapter.
  *
  * `extractTopLevelIdentifiers` scans the RENDERED template text (rather than
  * re-deriving free vars from the original JS AST) so it stays exactly in
@@ -26,8 +34,6 @@
  * (packages/jsx/src/ssr-seed-plan.ts), not this module's (#2075).
  */
 
-import type { IRNode, IRProp, IRIfStatement, IRFragment } from '@barefootjs/jsx'
-
 /** Tokens this adapter's own codegen can emit that are never context vars. */
 const NON_VAR_TOKENS = new Set([
   'bf', 'if', 'else', 'is', 'not', 'and', 'or', 'in', 'none', 'true', 'false',
@@ -55,41 +61,3 @@ export function extractTopLevelIdentifiers(jinjaExpr: string): string[] {
   }
   return out
 }
-
-/**
- * Find the `children` prop's `jsx-children` payload. Narrowed via the
- * AttrValue `kind` discriminator so adapter code stays type-safe if the IR
- * shape evolves.
- */
-export function resolveJsxChildrenProp(props: readonly IRProp[]): IRNode[] {
-  const prop = props.find(p => p.name === 'children')
-  if (!prop) return []
-  if (prop.value.kind !== 'jsx-children') return []
-  return prop.value.children
-}
-
-/**
- * Collect the component's root scope element node(s) — the elements that
- * become the rendered root and so carry `data-key` for a keyed loop item. A
- * plain element root is itself; an `if-statement` (early-return) root
- * contributes the top element of each branch, since exactly one renders at
- * runtime. (#1297)
- */
-export function collectRootScopeNodes(node: IRNode): Set<IRNode> {
-  const out = new Set<IRNode>()
-  const visit = (n: IRNode | null): void => {
-    if (!n) return
-    if (n.type === 'element') { out.add(n); return }
-    if (n.type === 'if-statement') {
-      const s = n as IRIfStatement
-      visit(s.consequent)
-      visit(s.alternate)
-      return
-    }
-    if (n.type === 'fragment') {
-      for (const c of (n as IRFragment).children) visit(c)
-    }
-  }
-  visit(node)
-  return out
-}

package/src/adapter/minijinja-adapter.ts

@@ -176,15 +176,11 @@ import {
 } from '@barefootjs/jsx'
 import { isAriaBooleanAttr, isBooleanResultExpr, isExplicitStringCall } from './boolean-result.ts'
 import type { ParsedExpr, LoweringMatcher, LoopBindingPathSegment } from '@barefootjs/jsx'
-import { BF_SLOT, BF_COND, BF_REGION, escapeHtml } from '@barefootjs/shared'
+import { BF_SLOT, BF_COND, BF_REGION, escapeHtml, resolveJsxChildrenProp } from '@barefootjs/shared'
 
 import type { JinjaRenderCtx } from './lib/types.ts'
 import { JINJA_PRIMITIVE_EMIT_MAP } from './lib/constants.ts'
 import { minijinjaHashKey, minijinjaIdent, escapeMinijinjaSingleQuoted } from './lib/minijinja-naming.ts'
-import {
-  resolveJsxChildrenProp,
-  collectRootScopeNodes,
-} from './lib/ir-scope.ts'
 import { renderSortMethod, renderSortEval } from './expr/array-method.ts'
 import { staticValueToMinijinja } from './lib/static-value.ts'
 import { JinjaFilterEmitter, JinjaTopLevelEmitter, truthyTest } from './expr/emitters.ts'
@@ -252,22 +248,9 @@ export class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitter<Jinja
   templatePrimitives: TemplatePrimitiveRegistry = JINJA_PRIMITIVE_EMIT_MAP
 
   private componentName: string = ''
-  /** Component root scope element(s) — each carries `data-key` for a keyed loop
-   *  item (set by the child renderer from the JSX `key` prop). A plain element
-   *  root is one node; an `if-statement` (early-return) root contributes the
-   *  top element of every branch. */
-  private rootScopeNodes: Set<IRNode> = new Set()
   private options: Required<MinijinjaAdapterOptions>
   private errors: CompilerError[] = []
   private inLoop: boolean = false
-  /**
-   * `IRLoop.depth` of the loop currently being rendered (save/restore
-   * around `renderChildren(loop.children)`, mirroring `inLoop` above).
-   * `renderAttributes` reads this to derive the `key` → `data-key`/
-   * `data-key-N` suffix — the depth is IR-computed (jsx-to-ir.ts), not
-   * re-derived here (#2168 nested-loop-outer-binding).
-   */
-  private currentLoopKeyDepth = 0
   /**
    * SolidJS-style props identifier (`function(props: P)`) and the
    * analyzer-extracted prop names. Stashed at `generate()` entry so the
@@ -391,7 +374,6 @@ export class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitter<Jinja
       this.errors.push(...collectImportedLoopChildComponentErrors(ir, this.componentName))
     }
 
-    this.rootScopeNodes = collectRootScopeNodes(ir.root)
     const templateBody = ir.root.type === 'if-statement'
       ? this.renderIfStatement(ir.root as IRIfStatement)
       : this.renderNode(ir.root)
@@ -630,12 +612,30 @@ export class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitter<Jinja
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker('')}`
     }
-    // A root scope element carries `data-key` for a keyed loop item (set on the
-    // bf instance by the child renderer from the JSX `key` prop); non-keyed
-    // renders add nothing. Mirrors Hono stamping data-key on each loop item's
-    // root, including early-return (if-statement) roots. (#1297)
-    if (this.rootScopeNodes.has(element) && element.needsScope) {
-      hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`
+    // #2753: `element.keyAttr` is the ONE IR-resolved decision for this
+    // element's row-key attribute — replacing both the `carriesDataKey`
+    // boolean and this adapter's own `rootScopeNodes`/`needsScope` check
+    // (mechanism 2: a render-root relay, including the #2732 fragment-root
+    // case) and the separate `currentLoopKeyDepth`-driven rewrite of a
+    // literal `key` attribute this adapter used to do in `renderAttributes`
+    // (mechanism 1: a `.map()` row root compiled inline here).
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        const lowered = emitAttrValue(
+          { kind: 'expression', expr: element.keyAttr.value },
+          this.elementAttrEmitter,
+          element.keyAttr.name,
+        )
+        if (lowered) hydrationAttrs += ` ${lowered}`
+      } else {
+        // Relay: this element is one of THIS component's own render roots,
+        // carrying whatever key its OWN caller supplies at runtime (the `bf`
+        // instance's `data_key` field) when this component is itself
+        // invoked as a caller's keyed loop row. Mirrors Hono stamping
+        // data-key on each loop item's root, including early-return
+        // (if-statement) roots (#1297), and #2732's fragment-root case.
+        hydrationAttrs += ` {{ bf.data_key_attr() | safe }}`
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`
@@ -976,8 +976,6 @@ export class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitter<Jinja
 
     const prevInLoop = this.inLoop
     this.inLoop = true
-    const prevLoopKeyDepth = this.currentLoopKeyDepth
-    this.currentLoopKeyDepth = loop.depth
     // Re-render children now that inLoop is set (so nested components use the
     // loop-child naming convention). renderedChildren above was computed with
     // the previous flag; recompute under the loop flag.
@@ -1019,7 +1017,6 @@ export class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitter<Jinja
       d => `{% set ${minijinjaIdent(d.name)} = ${this.convertExpressionToJinja(d.raw, d.valueParsed)} %}`,
     )
     const childrenUnderLoop = this.renderChildren(loop.children)
-    this.currentLoopKeyDepth = prevLoopKeyDepth
     this.inLoop = prevInLoop
     void renderedChildren
 
@@ -1595,14 +1592,15 @@ export class MinijinjaAdapter extends BaseAdapter implements IRNodeEmitter<Jinja
       // literal never reaches the generic object-literal BF101 refusal
       // (which would double-report alongside the purpose-built one).
       if (isDangerousInnerHtmlAttr(attr)) continue
+      // `key` never renders as a literal HTML attribute — #2753 resolves it
+      // onto `element.keyAttr` (name AND value) at IR-build time, emitted
+      // separately in `renderElement`. A stray `key` that jsx-to-ir.ts did
+      // NOT recognize as a loop row root (so `keyAttr` was never set) has no
+      // defined rendering outside a `.map()` anyway; drop it rather than
+      // leak an invalid `key="..."` HTML attribute.
+      if (attr.name === 'key') continue
       // Rewrite JSX special-prop names to their HTML-attribute counterparts.
-      let attrName: string
-      if (attr.name === 'className') attrName = 'class'
-      else if (attr.name === 'key') {
-        const depth = this.currentLoopKeyDepth
-        attrName = depth > 0 ? `data-key-${depth}` : 'data-key'
-      }
-      else attrName = attr.name
+      const attrName = attr.name === 'className' ? 'class' : attr.name
       const lowered = emitAttrValue(attr.value, this.elementAttrEmitter, attrName)
       if (lowered) parts.push(lowered)
     }