@barefootjs/go-template 0.33.2 → 0.33.4

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";
@@ -2157,6 +2157,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) {
@@ -3203,11 +3212,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 = [];
@@ -3403,10 +3415,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 }
@@ -3456,7 +3468,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([
@@ -3471,7 +3483,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+/";
@@ -3562,15 +3574,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;
@@ -3602,47 +3614,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;
 }
@@ -3667,25 +3679,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);
   };
@@ -3796,33 +3808,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)
@@ -3850,28 +3862,28 @@ function collectModuleStringConsts(constants) {
   return map;
 }
 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;
@@ -3880,7 +3892,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;
@@ -3888,11 +3900,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;
@@ -3908,35 +3920,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;
@@ -4025,7 +4037,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) {
@@ -4307,7 +4319,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"
@@ -5080,7 +5092,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;
@@ -5220,9 +5232,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();
@@ -5478,31 +5490,6 @@ function goLiteral(value) {
   return `"${value}"`;
 }
 
-// src/adapter/lib/ir-scope.ts
-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/lib/constants.ts
 var GO_TEMPLATE_PRIMITIVES = {
   "JSON.stringify": { arity: 1, emit: (args) => `bf_json ${wrapGoArg(args[0])}` },
@@ -5544,7 +5531,6 @@ class CompileState {
   textConsumedPropNames = new Set;
   presenceCheckedPropNames = new Set;
   stringValueNames = new Set;
-  rootScopeNodes = new Set;
   memoBackedLoopSlice = new Map;
   usesHtmlTemplate = false;
   usesFmt = false;
@@ -6889,7 +6875,7 @@ function computeObjectMemoInitialValue(ctx, memo) {
 }
 
 // src/adapter/memo/template-interp.ts
-import ts30 from "typescript";
+import ts31 from "typescript";
 function computeTemplateLiteralMemoInitialValue(ctx, memo, propsParams) {
   const localKeyBindings = new Map;
   let templateValue;
@@ -7528,7 +7514,7 @@ function collectPropsReadByCtorInit(body, propsObjectName, propNames) {
 }
 
 // src/adapter/spread/spread-codegen.ts
-import ts31 from "typescript";
+import ts32 from "typescript";
 function collectSpreadSlots(ctx, node) {
   const result = [];
   collectSpreadSlotsRecursive(ctx, node, result);
@@ -7767,7 +7753,7 @@ function recordIndexAccessToGoMap(ctx, val, ir) {
   if (val.kind !== "index-access" || val.object.kind !== "identifier" || val.index.kind !== "identifier") {
     return null;
   }
-  const tsVal = ts31.factory.createElementAccessExpression(ts31.factory.createIdentifier(val.object.name), ts31.factory.createIdentifier(val.index.name));
+  const tsVal = ts32.factory.createElementAccessExpression(ts32.factory.createIdentifier(val.object.name), ts32.factory.createIdentifier(val.index.name));
   const parsed = parseRecordIndexAccess(tsVal, ir.metadata.localConstants ?? [], ir.metadata.propsParams);
   if (!parsed)
     return null;
@@ -8086,7 +8072,6 @@ class GoTemplateAdapter extends BaseAdapter {
   inLoop = false;
   bakedStaticChildLoopCache = new Map;
   scope = BindingScope.EMPTY;
-  loopKeyDepthStack = [];
   loopScalarItemStack = [];
   loopWrapperStack = [];
   loopVarRefCount = new Map;
@@ -8153,7 +8138,6 @@ class GoTemplateAdapter extends BaseAdapter {
     const hasInteractivity = hasClientInteractivity(ir);
     const isRootComponent = ir.root.type === "component";
     const isIfStatement = ir.root.type === "if-statement";
-    this.state.rootScopeNodes = collectRootScopeNodes(ir.root);
     this.state.memoBackedLoopSlice = new Map;
     for (const nested of findNestedComponents(ir.root)) {
       const memoName = this.extractMemoNameFromLoopArray(nested.loopArray);
@@ -9592,13 +9576,6 @@ ${goFields.join(`
     }
     return out;
   }
-  jsxChildrenPropNodes(props) {
-    for (const p of props) {
-      if (p.value.kind === "jsx-children")
-        return p.value.children;
-    }
-    return [];
-  }
   extractHtmlChildren(children) {
     if (children.length === 0)
       return null;
@@ -9642,7 +9619,7 @@ ${goFields.join(`
       }
       if (comp.name !== "Portal" && !inLoop && comp.slotId) {
         const suffix = slotIdToFieldSuffix(comp.slotId);
-        const effectiveChildren = comp.children.length > 0 ? comp.children : this.jsxChildrenPropNodes(comp.props);
+        const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
         result.push({
           name: comp.name,
           slotId: comp.slotId,
@@ -10083,8 +10060,14 @@ ${goFields.join(`
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker(".ScopeID")}`;
     }
-    if (this.state.rootScopeNodes.has(element) && element.needsScope || element.carriesDataKey && !this.bakingStaticChildren) {
-      hydrationAttrs += `{{if .BfDataKey}} data-key="{{.BfDataKey}}"{{end}}`;
+    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 if (!this.bakingStaticChildren) {
+        hydrationAttrs += `{{if .BfDataKey}} data-key="{{.BfDataKey}}"{{end}}`;
+      }
     }
     if (element.slotId) {
       hydrationAttrs += ` ${this.renderSlotMarker(element.slotId)}`;
@@ -11662,10 +11645,8 @@ ${goFields.join(`
     }
     this.loopScalarItemStack.push(this.scalarLiteralLoopGoType(loop.arrayParsed, loop.itemType) !== null);
     this.loopWrapperStack.push(!!loop.childComponent);
-    this.loopKeyDepthStack.push(loop.depth);
     const preambleAssignments = (loop.preamble?.declarations ?? []).map((d) => `{{$${d.name} := ${this.renderParsedExpr(d.valueParsed)}}}`).join("");
     const children = this.renderChildren(loop.children);
-    this.loopKeyDepthStack.pop();
     this.loopWrapperStack.pop();
     this.loopScalarItemStack.pop();
     const itemMarker = this.loopItemMarker(loop);
@@ -11706,7 +11687,6 @@ ${goFields.join(`
     const wasInLoopOuter = this.inLoop;
     this.inLoop = true;
     this.loopWrapperStack.push(false);
-    this.loopKeyDepthStack.push(loop.depth);
     this.loopScalarItemStack.push(this.scalarLiteralLoopGoType(loop.arrayParsed, loop.itemType) !== null);
     const prevScope = this.scope;
     this.scope = prevScope.enterLoopRow(loop);
@@ -11731,21 +11711,20 @@ ${goFields.join(`
     }
     this.scope = prevScope;
     this.loopScalarItemStack.pop();
-    this.loopKeyDepthStack.pop();
     this.loopWrapperStack.pop();
     this.inLoop = wasInLoopOuter;
     return `{{bfComment "loop:${loop.markerId}"}}${body}{{bfComment "/loop:${loop.markerId}"}}`;
   }
   loopItemMarker(loop) {
     if (loop.bodyIsMultiRoot)
-      return `{{bfComment "bf-loop-i"}}`;
+      return `{{bfComment "loop-i"}}`;
     if (loop.bodyIsItemConditional && loop.key) {
       return `{{bfComment (printf "loop-i:%v" ${this.convertExpressionToGo(loop.key)})}}`;
     }
     return "";
   }
   queueDynamicChildrenDefine(comp) {
-    const effectiveChildren = comp.children.length > 0 ? comp.children : this.jsxChildrenPropNodes(comp.props);
+    const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length === 0)
       return null;
     if (this.extractTextChildren(effectiveChildren) !== null)
@@ -11763,8 +11742,42 @@ ${goFields.join(`
     }
     return name;
   }
+  queueDynamicPropDefine(comp) {
+    const args = [];
+    const childShape = this.childComponentShapes.get(comp.name);
+    for (const prop of comp.props) {
+      if (prop.value.kind !== "jsx-children" || prop.name === "children")
+        continue;
+      const children = prop.value.children;
+      if (this.extractTextChildren(children) !== null)
+        continue;
+      if (this.extractHtmlChildren(children) !== null)
+        continue;
+      if (this.extractScopedHtmlChildren(children) !== null)
+        continue;
+      if (childShape?.restBagField && !childShape.paramNames.has(prop.name)) {
+        this.state.errors.push({
+          code: "BF101",
+          severity: "error",
+          message: `JSX-valued prop '${prop.name}' on <${comp.name}> is dynamic and routes into the child's rest-bag prop ('${childShape.restBagField}') rather than a declared field — there is no named Go struct field for 'bf_with_props' to target`,
+          loc: prop.loc
+        });
+        continue;
+      }
+      const name = `${this.state.componentName}__prop_${prop.name}_${comp.slotId}`;
+      if (!this.state.pendingChildrenDefines.some((d) => d.name === name)) {
+        this.state.pendingChildrenDefines.push({
+          name,
+          content: this.renderChildren(children)
+        });
+      }
+      const fieldName = this.childPropFieldNames.get(comp.name)?.get(prop.name) ?? capitalizeFieldName(prop.name);
+      args.push(`${JSON.stringify(fieldName)} (bf_tmpl ${JSON.stringify(name)} .)`);
+    }
+    return args.length > 0 ? args.join(" ") : null;
+  }
   queueLoopBodyChildrenDefine(comp) {
-    const effectiveChildren = comp.children.length > 0 ? comp.children : this.jsxChildrenPropNodes(comp.props);
+    const effectiveChildren = comp.children.length > 0 ? comp.children : resolveJsxChildrenProp(comp.props);
     if (effectiveChildren.length === 0)
       return null;
     if (this.extractTextChildren(effectiveChildren) !== null)
@@ -11810,7 +11823,9 @@ ${goFields.join(`
     } else if (comp.slotId) {
       const suffix = slotIdToFieldSuffix(comp.slotId);
       const childrenDefine = this.queueDynamicChildrenDefine(comp);
-      templateCall = childrenDefine ? `{{template "${comp.name}" (bf_with_children .${comp.name}${suffix} (bf_tmpl "${childrenDefine}" .))}}` : `{{template "${comp.name}" .${comp.name}${suffix}}}`;
+      const propArgs = this.queueDynamicPropDefine(comp);
+      const base = propArgs ? `(bf_with_props .${comp.name}${suffix} ${propArgs})` : `.${comp.name}${suffix}`;
+      templateCall = childrenDefine ? `{{template "${comp.name}" (bf_with_children ${base} (bf_tmpl "${childrenDefine}" .))}}` : `{{template "${comp.name}" ${base}}}`;
     } else {
       templateCall = `{{template "${comp.name}" .${comp.name}}}`;
     }
@@ -11937,14 +11952,9 @@ ${children}`;
         continue;
       if (isDangerousInnerHtmlAttr(attr))
         continue;
-      let attrName;
-      if (attr.name === "className")
-        attrName = "class";
-      else if (attr.name === "key") {
-        const depth = this.loopKeyDepthStack.at(-1) ?? 0;
-        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/go-template",
-  "version": "0.33.2",
+  "version": "0.33.4",
   "description": "Go html/template adapter for BarefootJS - generates Go template files from IR",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "directory": "packages/adapter-go-template"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.33.2"
+    "@barefootjs/shared": "0.33.4"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -67,9 +67,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/client": "0.33.2",
-    "@barefootjs/jsx": "0.33.2",
-    "@barefootjs/vite": "0.33.2",
+    "@barefootjs/client": "0.33.4",
+    "@barefootjs/jsx": "0.33.4",
+    "@barefootjs/vite": "0.33.4",
     "vite": "^6.0.0"
   }
 }

package/src/__tests__/go-template-adapter.test.ts

@@ -118,12 +118,15 @@ runAdapterConformanceTests({
     'todo-app',
     // (#1897) data-table no longer skipped — loop body children + wrapper
     // struct + block-body memo baking render correctly on Go.
-    // Real-render divergence (see `render-divergences.ts` for the full
-    // description): Go's real SSR output drops the `header` prop's
-    // content entirely for this shape, so its rendered template has no
-    // `^s0` marker for the IR's conditional to match against. Paired
-    // with the `renderDivergences` entry, not an independent gap.
-    'jsx-element-prop-fragment-conditional',
+    // `jsx-element-prop-fragment-conditional` (#2703) no longer skipped —
+    // renders correctly since named jsx-children props got the same
+    // `bf_with_props`/`bf_tmpl` dynamic-delivery route reserved `children`
+    // already had.
+    // #2805: this shape refuses with BF101 at compile time (see
+    // `conformance-pins.ts`) — `expectedDiagnostics` covers the diagnostic
+    // contract, and marker comparison can't apply to a fixture that
+    // produces no complete template.
+    'jsx-element-prop-rest-bag-dynamic',
   ]),
   skipDataPoints: new Set<string>([
     // #2743: html/template's URL-context autoescape percent-encodes the