@barefootjs/xslate 0.33.2 → 0.33.3

package/dist/adapter/index.js

@@ -187373,7 +187373,7 @@ function isAriaBooleanAttr(name) {
 }
 
 // src/adapter/xslate-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 XSLATE_TEMPLATE_PRIMITIVES = {
@@ -187397,39 +187397,6 @@ function kolonHashKey(name) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? name : `'${escapeKolonSingleQuoted(name)}'`;
 }
 
-// src/adapter/lib/ir-scope.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;
-}
-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,
@@ -188282,11 +188249,9 @@ class XslateAdapter extends BaseAdapter {
   templatesPerComponent = true;
   templatePrimitives = XSLATE_PRIMITIVE_EMIT_MAP;
   componentName = "";
-  rootScopeNodes = new Set;
   options;
   errors = [];
   inLoop = false;
-  currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
   booleanTypedProps = new Set;
@@ -188322,7 +188287,6 @@ class XslateAdapter 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);
@@ -188443,8 +188407,14 @@ class XslateAdapter extends BaseAdapter {
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker("")}`;
     }
-    if (this.rootScopeNodes.has(element) && element.needsScope || element.carriesDataKey) {
-      hydrationAttrs += ` <: $bf.data_key_attr() | mark_raw :>`;
+    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() | mark_raw :>`;
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
@@ -188650,13 +188620,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) => `: my $${d.name} = ${this.convertExpressionToKolon(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:" ~ ${this.convertExpressionToKolon(loop.key)}) | mark_raw :>
 ${childrenUnderLoop}` : childrenUnderLoop;
@@ -188929,14 +188896,9 @@ ${name}="<: ${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/xslate-adapter.d.ts

@@ -36,22 +36,9 @@ export declare class XslateAdapter extends BaseAdapter implements IRNodeEmitter<
      */
     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/xslate-adapter.d.ts.map

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

package/dist/index.js

@@ -187373,7 +187373,7 @@ function isAriaBooleanAttr(name) {
 }
 
 // src/adapter/xslate-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 XSLATE_TEMPLATE_PRIMITIVES = {
@@ -187397,39 +187397,6 @@ function kolonHashKey(name) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? name : `'${escapeKolonSingleQuoted(name)}'`;
 }
 
-// src/adapter/lib/ir-scope.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;
-}
-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,
@@ -188282,11 +188249,9 @@ class XslateAdapter extends BaseAdapter {
   templatesPerComponent = true;
   templatePrimitives = XSLATE_PRIMITIVE_EMIT_MAP;
   componentName = "";
-  rootScopeNodes = new Set;
   options;
   errors = [];
   inLoop = false;
-  currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
   booleanTypedProps = new Set;
@@ -188322,7 +188287,6 @@ class XslateAdapter 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);
@@ -188443,8 +188407,14 @@ class XslateAdapter extends BaseAdapter {
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker("")}`;
     }
-    if (this.rootScopeNodes.has(element) && element.needsScope || element.carriesDataKey) {
-      hydrationAttrs += ` <: $bf.data_key_attr() | mark_raw :>`;
+    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() | mark_raw :>`;
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
@@ -188650,13 +188620,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) => `: my $${d.name} = ${this.convertExpressionToKolon(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:" ~ ${this.convertExpressionToKolon(loop.key)}) | mark_raw :>
 ${childrenUnderLoop}` : childrenUnderLoop;
@@ -188929,14 +188896,9 @@ ${name}="<: ${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";
@@ -2082,6 +2082,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) {
@@ -3133,11 +3142,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 = [];
@@ -3354,10 +3366,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 }
@@ -3407,7 +3419,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([
@@ -3422,7 +3434,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+/";
@@ -3513,15 +3525,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;
@@ -3553,47 +3565,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;
 }
@@ -3618,25 +3630,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);
   };
@@ -3747,33 +3759,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)
@@ -3806,30 +3818,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;
@@ -3837,28 +3849,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;
@@ -3867,7 +3879,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;
@@ -3875,11 +3887,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;
@@ -3895,35 +3907,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;
@@ -4012,7 +4024,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) {
@@ -4294,7 +4306,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"
@@ -5094,7 +5106,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;
@@ -5234,9 +5246,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();
@@ -5315,39 +5327,6 @@ function kolonHashKey(name) {
   return /^[A-Za-z_][A-Za-z0-9_]*$/.test(name) ? name : `'${escapeKolonSingleQuoted(name)}'`;
 }
 
-// src/adapter/lib/ir-scope.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;
-}
-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) {
@@ -6014,7 +5993,7 @@ function collectImportedLoopChildComponentErrors(ir, componentName) {
 }
 
 // src/adapter/spread/spread-codegen.ts
-import ts30 from "typescript";
+import ts31 from "typescript";
 function conditionalSpreadToKolon(ctx, expr) {
   if (!expr || expr.kind !== "conditional")
     return null;
@@ -6071,7 +6050,7 @@ function recordIndexAccessToKolon(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;
@@ -6179,11 +6158,9 @@ class XslateAdapter extends BaseAdapter {
   templatesPerComponent = true;
   templatePrimitives = XSLATE_PRIMITIVE_EMIT_MAP;
   componentName = "";
-  rootScopeNodes = new Set;
   options;
   errors = [];
   inLoop = false;
-  currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
   booleanTypedProps = new Set;
@@ -6219,7 +6196,6 @@ class XslateAdapter 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);
@@ -6340,8 +6316,14 @@ class XslateAdapter extends BaseAdapter {
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker("")}`;
     }
-    if (this.rootScopeNodes.has(element) && element.needsScope || element.carriesDataKey) {
-      hydrationAttrs += ` <: $bf.data_key_attr() | mark_raw :>`;
+    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() | mark_raw :>`;
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
@@ -6547,13 +6529,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) => `: my $${d.name} = ${this.convertExpressionToKolon(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:" ~ ${this.convertExpressionToKolon(loop.key)}) | mark_raw :>
 ${childrenUnderLoop}` : childrenUnderLoop;
@@ -6826,14 +6805,9 @@ ${name}="<: ${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/lib/BarefootJS/Backend/Xslate.pm

@@ -1,5 +1,5 @@
 package BarefootJS::Backend::Xslate;
-our $VERSION = "0.33.1";
+our $VERSION = "0.33.2";
 use strict;
 use warnings;
 use utf8;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/xslate",
-  "version": "0.33.2",
+  "version": "0.33.3",
   "description": "Text::Xslate (Kolon) adapter for BarefootJS — compiles IR to .tx templates and ships the Xslate rendering backend; runs under any PSGI/Plack app",
   "type": "module",
   "main": "./dist/index.js",
@@ -55,7 +55,7 @@
     "directory": "packages/adapter-xslate"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.33.2"
+    "@barefootjs/shared": "0.33.3"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -72,9 +72,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.33.2",
-    "@barefootjs/vite": "0.33.2",
-    "@barefootjs/client": "0.33.2",
+    "@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/xslate-adapter.ts

@@ -85,15 +85,11 @@ import {
 import { isAriaBooleanAttr, isBooleanResultExpr } from './boolean-result.ts'
 import ts from 'typescript'
 import type { ParsedExpr, LoweringMatcher } 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 { XslateRenderCtx } from './lib/types.ts'
 import { XSLATE_PRIMITIVE_EMIT_MAP } from './lib/constants.ts'
 import { kolonHashKey, escapeKolonSingleQuoted } from './lib/kolon-naming.ts'
-import {
-  resolveJsxChildrenProp,
-  collectRootScopeNodes,
-} from './lib/ir-scope.ts'
 import { renderSortMethod, renderSortEval } from './expr/array-method.ts'
 import { staticValueToKolon } from './lib/static-value.ts'
 import { XslateFilterEmitter, XslateTopLevelEmitter } from './expr/emitters.ts'
@@ -174,22 +170,9 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
   templatePrimitives: TemplatePrimitiveRegistry = XSLATE_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<XslateAdapterOptions>
   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
@@ -317,7 +300,6 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
       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)
@@ -559,18 +541,30 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
     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)
-    // `carriesDataKey` is an INDEPENDENT reason to emit, not a refinement of
-    // the root-scope test above (#2732): a fragment root clears `needsScope` on
-    // its wrapped child and moves the other hydration markers onto the
-    // `<!--bf-scope:-->` comment, but `data-key` must stay a real attribute —
-    // the client's `mapArray` adopt loop reads `primaryEl.dataset.key`, never
-    // the comment. Mirrors the same branch in hono-adapter.ts.
-    if ((this.rootScopeNodes.has(element) && element.needsScope) || element.carriesDataKey) {
-      hydrationAttrs += ` <: $bf.data_key_attr() | mark_raw :>`
+    // #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() | mark_raw :>`
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`
@@ -922,8 +916,6 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
 
     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.
@@ -965,7 +957,6 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
       d => `: my $${d.name} = ${this.convertExpressionToKolon(d.raw, d.valueParsed)};`,
     )
     const childrenUnderLoop = this.renderChildren(loop.children)
-    this.currentLoopKeyDepth = prevLoopKeyDepth
     this.inLoop = prevInLoop
     void renderedChildren
 
@@ -1518,14 +1509,15 @@ export class XslateAdapter extends BaseAdapter implements IRNodeEmitter<XslateRe
       // 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)
     }

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

@@ -1,29 +0,0 @@
-/**
- * IR traversal helpers for the Text::Xslate (Kolon) template adapter.
- *
- * Extracted from `xslate-adapter.ts` (domain-module refactor, issue #2018
- * track D). Pure functions over the IR tree — no adapter instance state.
- *
- * SHARED CANDIDATE: the bodies here are byte-identical to the Mojo
- * adapter's `lib/ir-scope.ts`. They are adapter-agnostic (no Perl/Kolon
- * specifics), so they are the obvious first extraction into a shared
- * Perl-family codegen module once one exists — the groundwork for the
- * future Perl evaluator integration (issue #2018 track D). Kept per-adapter
- * for now, matching the repo convention (the Go adapter keeps its own copy).
- */
-import type { IRNode, IRProp } from '@barefootjs/jsx';
-/**
- * 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 +0,0 @@
-{"version":3,"file":"ir-scope.d.ts","sourceRoot":"","sources":["../../../src/adapter/lib/ir-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAA6B,MAAM,iBAAiB,CAAA;AAEhF;;;;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"}

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

@@ -1,53 +0,0 @@
-/**
- * IR traversal helpers for the Text::Xslate (Kolon) template adapter.
- *
- * Extracted from `xslate-adapter.ts` (domain-module refactor, issue #2018
- * track D). Pure functions over the IR tree — no adapter instance state.
- *
- * SHARED CANDIDATE: the bodies here are byte-identical to the Mojo
- * adapter's `lib/ir-scope.ts`. They are adapter-agnostic (no Perl/Kolon
- * specifics), so they are the obvious first extraction into a shared
- * Perl-family codegen module once one exists — the groundwork for the
- * future Perl evaluator integration (issue #2018 track D). Kept per-adapter
- * for now, matching the repo convention (the Go adapter keeps its own copy).
- */
-
-import type { IRNode, IRProp, IRIfStatement, IRFragment } from '@barefootjs/jsx'
-
-/**
- * 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
-}