@barefootjs/hono 0.33.2 → 0.33.3

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

@@ -57,8 +57,6 @@ export declare class HonoAdapter extends JsxAdapter implements IRNodeEmitter<Hon
      * components.
      */
     private rewriteRelativeImport?;
-    /** Stack of loop keys for generating data-key / data-key-1 attributes on loop items */
-    private loopKeyStack;
     /**
      * Per-call `AdapterGenerateOptions.scriptAssets`, stashed for the
      * duration of one `generate()` call (same lifecycle as

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

@@ -1 +1 @@
-{"version":3,"file":"hono-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/hono-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hono-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/hono-adapter.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EACL,KAAK,WAAW,EAChB,KAAK,MAAM,EACX,KAAK,SAAS,EACd,KAAK,MAAM,EACX,KAAK,YAAY,EACjB,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,OAAO,EACZ,KAAK,MAAM,EAIX,KAAK,sBAAsB,EAC3B,KAAK,aAAa,EAElB,KAAK,gBAAgB,EACrB,KAAK,aAAa,EAClB,KAAK,UAAU,EAEf,UAAU,EAQX,MAAM,iBAAiB,CAAA;AAExB;;;;;GAKG;AACH,KAAK,aAAa,GAAG;IACnB,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAGD,MAAM,WAAW,kBAAkB;IACjC;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;IAEvB;;;;OAIG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAEzB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAuBD,qBAAa,WAAY,SAAQ,UAAW,YAAW,aAAa,CAAC,aAAa,CAAC;IACjF,IAAI,SAAS;IACb,SAAS,SAAS;IAClB,gBAAgB,SAAiC;IAmBjD,mBAAmB,QAAO,OAAO,CAAQ;IAEzC,SAAS,CAAC,SAAS,EAAE,gBAAgB,CAA0B;IAE/D,OAAO,CAAC,OAAO,CAAoB;IACnC,OAAO,CAAC,iBAAiB,CAAiB;IAC1C,OAAO,CAAC,sBAAsB,CAAiB;IAC/C,OAAO,CAAC,wBAAwB,CAAiB;IACjD;;;;;;;OAOG;IACH,OAAO,CAAC,qBAAqB,CAAC,CAAgC;IAC9D;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,YAAY,CAAC,CAAU;IAC/B;;;;;;OAMG;IACH,OAAO,CAAC,aAAa,CAAC,CAAU;IAEhC,YAAY,OAAO,GAAE,kBAAuB,EAQ3C;IAED,QAAQ,CAAC,EAAE,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE,sBAAsB,GAAG,aAAa,CAiEzE;IAED;;;;;;OAMG;IACH,OAAO,CAAC,eAAe;IAIvB;;;;;;;OAOG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,eAAe;IA6EvB;;;;;;;;;OASG;IACH,aAAa,CAAC,EAAE,EAAE,WAAW,GAAG,MAAM,GAAG,IAAI,CAmB5C;IAED,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,iBAAiB;IA+QzB;;;;OAIG;IACH,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,aAAa,GAAG,MAAM,CAEpD;IAMD,WAAW,CAAC,IAAI,EAAE,SAAS,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEzF;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7B;IAED,cAAc,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CAEzC;IAED,eAAe,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEjG;IAED,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEpF;IAED,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE7F;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAE5F;IAED,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAE9B;IAED,eAAe,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAKnG;IAED,YAAY,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAwB5F;IAED,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE,UAAU,CAAC,aAAa,CAAC,GAAG,MAAM,CAEtF;IAED,aAAa,CAAC,OAAO,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE;QAAE,cAAc,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CA4D5E;IAED,OAAO,CAAC,UAAU;IAUlB,gBAAgB,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,CA2B3C;IAED,iBAAiB,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,CAAC,EAAE,aAAa,GAAG,MAAM,CAOlE;IAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;OA4BG;IACH,OAAO,CAAC,qBAAqB;IAiC7B;;;;;OAKG;IACH,OAAO,CAAC,gBAAgB;IAQxB;;;;;;;;;;;;OAYG;IACH,OAAO,CAAC,gBAAgB;IAWxB,OAAO,CAAC,kBAAkB;IAsC1B,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAgH/B;IAED,OAAO,CAAC,oBAAoB;IAI5B;;;OAGG;IACH,iBAAiB,CAAC,MAAM,EAAE,aAAa,EAAE,GAAG,CAAC,EAAE;QAAE,uBAAuB,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CAkE5F;IAEQ,WAAW,CAAC,IAAI,EAAE,OAAO,GAAG,MAAM,CAgB1C;IAED,eAAe,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,CAAC,EAAE;QAAE,uBAAuB,CAAC,EAAE,OAAO,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,MAAM,CAkDhH;IAED,OAAO,CAAC,cAAc;IAQtB;;;;;;;;;OASG;IACH,OAAO,CAAC,oBAAoB;IAY5B;;;;;OAKG;IACH,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAuBlC;IAED;;;;;;OAMG;IACH,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAiBpC;IAED,OAAO,CAAC,gBAAgB;IAiCxB,OAAO,CAAC,oBAAoB;IAyB5B,OAAO,CAAC,iBAAiB;IAYzB;;;;;;;;;;;OAWG;IACH,OAAO,CAAC,0BAA0B;CAInC;AAGD,eAAO,MAAM,WAAW,aAAoB,CAAA"}

package/dist/adapter/index.js

@@ -30,7 +30,6 @@ class HonoAdapter extends JsxAdapter {
   hasClientInteractivity = false;
   currentComponentHasProps = false;
   rewriteRelativeImport;
-  loopKeyStack = [];
   scriptAssets;
   preloadAssets;
   constructor(options = {}) {
@@ -354,15 +353,12 @@ export default ${this.componentName}` : "";
       if (this.currentComponentHasProps) {
         hydrationAttrs += ` {...(!__bfChild && __bfPropsJson ? { "${BF_PROPS}": __bfPropsJson } : {})}`;
       }
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}';
-    } else if (element.carriesDataKey) {
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}';
-    }
-    if (ctx?.isLoopItemRoot && this.loopKeyStack.length > 0) {
-      const loop = this.loopKeyStack[this.loopKeyStack.length - 1];
-      if (loop.key) {
-        const keyAttrName = this.loopKeyStack.length === 1 ? "data-key" : `data-key-${this.loopKeyStack.length - 1}`;
-        hydrationAttrs += ` ${keyAttrName}={String(${loop.key})}`;
+    }
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        hydrationAttrs += ` ${element.keyAttr.name}={String(${element.keyAttr.value})}`;
+      } else {
+        hydrationAttrs += ` {...(__dataKey !== undefined ? { "${element.keyAttr.name}": __dataKey } : {})}`;
       }
     }
     if (element.slotId) {
@@ -462,9 +458,7 @@ export default ${this.componentName}` : "";
     const paramAnnotation = loop.paramType ? `: ${loop.paramType}` : "";
     const indexAnnotation = loop.indexType ? `: ${loop.indexType}` : "";
     const indexParam = loop.index ? `, ${loop.index}${indexAnnotation}` : "";
-    this.loopKeyStack.push({ key: loop.key, param: loop.param });
     const children = this.renderChildrenInLoop(loop.children);
-    this.loopKeyStack.pop();
     let mapExpr;
     const preamble = loop.preamble?.ssrText;
     let safeChildren = children.startsWith("{") ? `<>${children}</>` : children;

package/dist/index.js

@@ -30,7 +30,6 @@ class HonoAdapter extends JsxAdapter {
   hasClientInteractivity = false;
   currentComponentHasProps = false;
   rewriteRelativeImport;
-  loopKeyStack = [];
   scriptAssets;
   preloadAssets;
   constructor(options = {}) {
@@ -354,15 +353,12 @@ export default ${this.componentName}` : "";
       if (this.currentComponentHasProps) {
         hydrationAttrs += ` {...(!__bfChild && __bfPropsJson ? { "${BF_PROPS}": __bfPropsJson } : {})}`;
       }
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}';
-    } else if (element.carriesDataKey) {
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}';
-    }
-    if (ctx?.isLoopItemRoot && this.loopKeyStack.length > 0) {
-      const loop = this.loopKeyStack[this.loopKeyStack.length - 1];
-      if (loop.key) {
-        const keyAttrName = this.loopKeyStack.length === 1 ? "data-key" : `data-key-${this.loopKeyStack.length - 1}`;
-        hydrationAttrs += ` ${keyAttrName}={String(${loop.key})}`;
+    }
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        hydrationAttrs += ` ${element.keyAttr.name}={String(${element.keyAttr.value})}`;
+      } else {
+        hydrationAttrs += ` {...(__dataKey !== undefined ? { "${element.keyAttr.name}": __dataKey } : {})}`;
       }
     }
     if (element.slotId) {
@@ -462,9 +458,7 @@ export default ${this.componentName}` : "";
     const paramAnnotation = loop.paramType ? `: ${loop.paramType}` : "";
     const indexAnnotation = loop.indexType ? `: ${loop.indexType}` : "";
     const indexParam = loop.index ? `, ${loop.index}${indexAnnotation}` : "";
-    this.loopKeyStack.push({ key: loop.key, param: loop.param });
     const children = this.renderChildrenInLoop(loop.children);
-    this.loopKeyStack.pop();
     let mapExpr;
     const preamble = loop.preamble?.ssrText;
     let safeChildren = children.startsWith("{") ? `<>${children}</>` : children;

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";
@@ -1273,11 +1273,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 = [];
@@ -1456,10 +1459,10 @@ function formatDateLocalNames(metadata) {
 }
 
 // ../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 }
@@ -1509,7 +1512,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([
@@ -1524,7 +1527,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+/";
@@ -1615,20 +1618,20 @@ 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";
 
 // ../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) {
@@ -1910,7 +1913,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"
@@ -1960,18 +1963,18 @@ function specKey(s) {
 function rewriteDynamicImportsInSource(sourceText, rewriteRelative) {
   if (!sourceText.includes("import"))
     return sourceText;
-  const sf = ts26.createSourceFile("bf-template-fragment.tsx", sourceText, ts26.ScriptTarget.Latest, false, ts26.ScriptKind.TSX);
+  const sf = ts27.createSourceFile("bf-template-fragment.tsx", sourceText, ts27.ScriptTarget.Latest, false, ts27.ScriptKind.TSX);
   const edits = [];
   const visit = (node) => {
-    if (ts26.isCallExpression(node) && node.expression.kind === ts26.SyntaxKind.ImportKeyword && node.arguments.length > 0 && ts26.isStringLiteralLike(node.arguments[0])) {
+    if (ts27.isCallExpression(node) && node.expression.kind === ts27.SyntaxKind.ImportKeyword && node.arguments.length > 0 && ts27.isStringLiteralLike(node.arguments[0])) {
       collect(node.arguments[0]);
     }
-    if (ts26.isImportTypeNode(node) && ts26.isLiteralTypeNode(node.argument)) {
+    if (ts27.isImportTypeNode(node) && ts27.isLiteralTypeNode(node.argument)) {
       const literal = node.argument.literal;
-      if (ts26.isStringLiteralLike(literal))
+      if (ts27.isStringLiteralLike(literal))
         collect(literal);
     }
-    ts26.forEachChild(node, visit);
+    ts27.forEachChild(node, visit);
   };
   const collect = (literal) => {
     const specifier = literal.text;
@@ -1986,7 +1989,7 @@ function rewriteDynamicImportsInSource(sourceText, rewriteRelative) {
       text: `'${next}'`
     });
   };
-  ts26.forEachChild(sf, visit);
+  ts27.forEachChild(sf, visit);
   if (edits.length === 0)
     return sourceText;
   let out = sourceText;
@@ -2396,11 +2399,11 @@ function emitAttrValue(value, emitter, name) {
   }
 }
 // ../jsx/src/combine-client-js.ts
-import ts27 from "typescript";
-// ../jsx/src/debug.ts
 import ts28 from "typescript";
-// ../jsx/src/profiler.ts
+// ../jsx/src/debug.ts
 import ts29 from "typescript";
+// ../jsx/src/profiler.ts
+import ts30 from "typescript";
 
 // ../jsx/src/index.ts
 registerBuiltinLoweringPlugins();
@@ -2426,7 +2429,6 @@ class HonoAdapter extends JsxAdapter {
   hasClientInteractivity = false;
   currentComponentHasProps = false;
   rewriteRelativeImport;
-  loopKeyStack = [];
   scriptAssets;
   preloadAssets;
   constructor(options = {}) {
@@ -2750,15 +2752,12 @@ export default ${this.componentName}` : "";
       if (this.currentComponentHasProps) {
         hydrationAttrs += ` {...(!__bfChild && __bfPropsJson ? { "${BF_PROPS}": __bfPropsJson } : {})}`;
       }
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}';
-    } else if (element.carriesDataKey) {
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}';
-    }
-    if (ctx?.isLoopItemRoot && this.loopKeyStack.length > 0) {
-      const loop = this.loopKeyStack[this.loopKeyStack.length - 1];
-      if (loop.key) {
-        const keyAttrName2 = this.loopKeyStack.length === 1 ? "data-key" : `data-key-${this.loopKeyStack.length - 1}`;
-        hydrationAttrs += ` ${keyAttrName2}={String(${loop.key})}`;
+    }
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        hydrationAttrs += ` ${element.keyAttr.name}={String(${element.keyAttr.value})}`;
+      } else {
+        hydrationAttrs += ` {...(__dataKey !== undefined ? { "${element.keyAttr.name}": __dataKey } : {})}`;
       }
     }
     if (element.slotId) {
@@ -2858,9 +2857,7 @@ export default ${this.componentName}` : "";
     const paramAnnotation = loop.paramType ? `: ${loop.paramType}` : "";
     const indexAnnotation = loop.indexType ? `: ${loop.indexType}` : "";
     const indexParam = loop.index ? `, ${loop.index}${indexAnnotation}` : "";
-    this.loopKeyStack.push({ key: loop.key, param: loop.param });
     const children = this.renderChildrenInLoop(loop.children);
-    this.loopKeyStack.pop();
     let mapExpr;
     const preamble = loop.preamble?.ssrText;
     let safeChildren = children.startsWith("{") ? `<>${children}</>` : children;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/hono",
-  "version": "0.33.2",
+  "version": "0.33.3",
   "description": "Hono integration for BarefootJS",
   "type": "module",
   "main": "./dist/index.js",
@@ -122,7 +122,7 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/vite": "0.33.2",
+    "@barefootjs/vite": "0.33.3",
     "@types/jsdom": "^27.0.0",
     "hono": "^4.6.0",
     "jsdom": "^27.3.0",

package/src/adapter/hono-adapter.ts

@@ -138,8 +138,6 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
    * components.
    */
   private rewriteRelativeImport?: (importPath: string) => string
-  /** Stack of loop keys for generating data-key / data-key-1 attributes on loop items */
-  private loopKeyStack: Array<{ key: string | null; param: string }> = []
   /**
    * Per-call `AdapterGenerateOptions.scriptAssets`, stashed for the
    * duration of one `generate()` call (same lifecycle as
@@ -759,25 +757,32 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
       if (this.currentComponentHasProps) {
         hydrationAttrs += ` {...(!__bfChild && __bfPropsJson ? { "${BF_PROPS}": __bfPropsJson } : {})}`
       }
-      // Add data-key for list reconciliation (only on root elements with scope)
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}'
-    } else if (element.carriesDataKey) {
-      // Fragment-root scope (#2732): the other four hydration markers live
-      // on the wrapping `<!--bf-scope:...-->` comment (`wrapWithScopeComment`
-      // below) since `needsScope` is false for every child of a fragment
-      // root — but `data-key` still needs to land on an element, because
-      // the client runtime's `mapArray` adopt loop reads it as a DOM
-      // attribute (`primaryEl.dataset.key`, map-array.ts), not out of the
-      // comment. `carriesDataKey` (jsx-to-ir.ts) marks the one child this
-      // belongs on.
-      hydrationAttrs += ' {...(__dataKey !== undefined ? { "data-key": __dataKey } : {})}'
     }
-    // Add data-key-N for loop items so event delegation can identify inner items
-    if (ctx?.isLoopItemRoot && this.loopKeyStack.length > 0) {
-      const loop = this.loopKeyStack[this.loopKeyStack.length - 1]
-      if (loop.key) {
-        const keyAttrName = this.loopKeyStack.length === 1 ? 'data-key' : `data-key-${this.loopKeyStack.length - 1}`
-        hydrationAttrs += ` ${keyAttrName}={String(${loop.key})}`
+    // #2753: `element.keyAttr` is the ONE IR-resolved decision for this
+    // row's key attribute — name AND value already worked out once in
+    // `jsx-to-ir.ts`, replacing this adapter's own `loopKeyStack` (a mutated
+    // stack of "how deep am I" the client runtime had no matching concept
+    // of at all) and the separate `carriesDataKey` boolean.
+    if (element.keyAttr) {
+      if (element.keyAttr.value !== undefined) {
+        // Mechanism 1: this element is directly a `.map()` row root compiled
+        // inline here — the key is a concrete expression, spliced verbatim
+        // exactly like `loopKeyStack`'s old `${loop.key}` did (it is already
+        // valid TS source text, lifted straight from the JSX `key={}` attr).
+        hydrationAttrs += ` ${element.keyAttr.name}={String(${element.keyAttr.value})}`
+      } else {
+        // Mechanism 2: this element is one of THIS component's own render
+        // roots, relaying a key its OWN caller supplies at runtime (when
+        // this component is itself invoked as a caller's keyed loop row) —
+        // `__dataKey` is destructured from `__allProps` at the top of every
+        // component for exactly this. Fragment-root scope (#2732): the other
+        // four hydration markers live on the wrapping `<!--bf-scope:...-->`
+        // comment (`wrapWithScopeComment` below) since `needsScope` is false
+        // for every child of a fragment root — but `data-key` still needs to
+        // land on an element, because the client runtime's `mapArray` adopt
+        // loop reads it as a DOM attribute (`primaryEl.dataset.key`,
+        // map-array.ts), not out of the comment.
+        hydrationAttrs += ` {...(__dataKey !== undefined ? { "${element.keyAttr.name}": __dataKey } : {})}`
       }
     }
     if (element.slotId) {
@@ -996,14 +1001,13 @@ export class HonoAdapter extends JsxAdapter implements IRNodeEmitter<HonoRenderC
     const paramAnnotation = loop.paramType ? `: ${loop.paramType}` : ''
     const indexAnnotation = loop.indexType ? `: ${loop.indexType}` : ''
     const indexParam = loop.index ? `, ${loop.index}${indexAnnotation}` : ''
-    // Push loop key info for data-key attribute generation on loop items
-    this.loopKeyStack.push({ key: loop.key, param: loop.param })
     // Render children with isLoopItemRoot so a DIRECT component member gets
     // its own randomized scope id (matching `IRComponent.loopItemRoot`,
     // #2444) rather than deriving from parent scope + slot like an
-    // ordinarily-slotted child.
+    // ordinarily-slotted child. The row's own `data-key`/`data-key-N`
+    // attribute is no longer tracked here at all — `jsx-to-ir.ts` already
+    // resolved it onto the row-root element's `keyAttr` (#2753).
     const children = this.renderChildrenInLoop(loop.children)
-    this.loopKeyStack.pop()
 
     let mapExpr: string
     // Raw TSX preamble text (types + JSX intact) for the JSX-runtime output