@barefootjs/go-template 0.31.8 → 0.31.10

package/dist/index.js

@@ -358,8 +358,13 @@ class CompileState {
   localTypeAliases = new Map;
   localStructFields = new Map;
   synthStructTypes = new Map;
+  synthObjectStructNames = new Map;
   needsStringsImport = false;
 }
+function resolveSignalParsedThroughSeedPlan(state, signal) {
+  const step = state.ssrSeedPlan.steps.find((s) => s.kind === "derived" && s.origin === "signal" && s.name === signal.getter);
+  return step?.kind === "derived" ? step.parsed : signal.parsed;
+}
 
 // src/adapter/analysis/component-tree.ts
 function hasClientInteractivity(ir) {
@@ -1024,8 +1029,10 @@ function typeInfoToGo(ctx, _typeInfo, defaultValue, preParsed) {
         return `[]${typeInfoToGo(ctx, typeInfo.elementType)}`;
       }
       return "[]interface{}";
-    case "object":
-      return "map[string]interface{}";
+    case "object": {
+      const synthName = ctx.state.synthObjectStructNames.get(typeInfo);
+      return synthName ?? "map[string]interface{}";
+    }
     case "interface":
       if (typeInfo.raw && (ctx.state.localStructFields.has(typeInfo.raw) || ctx.state.localTypeAliases.has(typeInfo.raw))) {
         return typeInfo.raw;
@@ -2583,11 +2590,11 @@ function buildPropTypeOverrides(ctx, ir) {
       if (!param)
         continue;
       const propGoType = typeInfoToGo(ctx, param.type, param.defaultValue, param.parsed);
-      if (propGoType.includes("interface{}")) {
-        const signalGoType = typeInfoToGo(ctx, signal.type, signal.initialValue, signal.parsed);
-        if (!signalGoType.includes("interface{}")) {
-          overrides.set(propName, signalGoType);
-        }
+      const signalGoType = typeInfoToGo(ctx, signal.type, signal.initialValue, signal.parsed);
+      if (signalGoType.includes("interface{}"))
+        continue;
+      if (propGoType.includes("interface{}") || signalGoType !== propGoType) {
+        overrides.set(propName, signalGoType);
       }
     }
   }
@@ -2670,7 +2677,7 @@ function collectNullishConsumedPropNames(ctx, ir) {
   };
   walk(ir.root);
   for (const signal of ir.metadata.signals) {
-    const match = ctx.extractPropFallback(signal.initialValue, signal.parsed);
+    const match = ctx.extractPropFallback(signal.initialValue, resolveSignalParsedThroughSeedPlan(ctx.state, signal));
     if (!match || !optionalParams.has(match.propName))
       continue;
     const f = match.goFallback;
@@ -2818,6 +2825,11 @@ function collectStringValueNames(ir) {
 }
 
 // src/adapter/go-template-adapter.ts
+var SYNTH_TYPE_LOC = {
+  file: "<synthesized>",
+  start: { line: 0, column: 0 },
+  end: { line: 0, column: 0 }
+};
 var STRING_METHODS = new Set([
   "replace",
   "trim",
@@ -3179,6 +3191,7 @@ ${scriptRegistrations}${templateBody}
     const lines = [];
     const componentName = ir.metadata.componentName;
     this.buildLocalTypeTables(ir, componentName);
+    this.emitSynthPropStructs(lines, ir, componentName);
     this.emitLocalTypeStructs(lines, ir, componentName);
     this.emitSynthStructs(lines, ir, componentName);
     const nestedComponents = findNestedComponents(ir.root);
@@ -3682,7 +3695,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(signal.getter);
       if (propFieldNames.has(fieldName))
         continue;
-      const fallbackMatch = this.extractPropFallback(signal.initialValue, signal.parsed);
+      const fallbackMatch = this.extractPropFallback(signal.initialValue, this.resolvedSignalParsed(signal));
       const hoisted = fallbackMatch ? propFallbackVars.get(fallbackMatch.propName) : undefined;
       if (hoisted) {
         lines.push(`		${fieldName}: ${hoisted.varName},`);
@@ -4038,6 +4051,65 @@ ${goFields.join(`
       }
     }
   }
+  emitSynthPropStructs(lines, ir, componentName) {
+    this.state.synthObjectStructNames = new Map;
+    this.state.currentTypeDefinitions = [...this.state.currentTypeDefinitions];
+    const visitObject = (typeInfo, desiredName) => {
+      if (this.state.synthObjectStructNames.has(typeInfo))
+        return;
+      if (this.state.localTypeNames.has(desiredName))
+        return;
+      this.state.localTypeNames.add(desiredName);
+      this.state.synthObjectStructNames.set(typeInfo, desiredName);
+      for (const prop of typeInfo.properties ?? []) {
+        visit(prop.type, desiredName, prop.name);
+      }
+      const fields = this.structFieldsFor(typeInfo);
+      this.state.localStructFields.set(desiredName, new Map(fields.map((f) => [f.tsName, f.goName])));
+      this.state.currentTypeDefinitions.push({
+        kind: "type",
+        name: desiredName,
+        definition: "",
+        properties: typeInfo.properties ?? [],
+        loc: SYNTH_TYPE_LOC
+      });
+      const goFields = fields.map((f) => `	${f.goName} ${f.goType} \`json:"${this.toJsonTag(f.tsName)}"\``);
+      lines.push(`// ${desiredName} is a synthesised type for an anonymous object type (#2674).`);
+      lines.push(`type ${desiredName} struct {
+${goFields.join(`
+`)}
+}`);
+      lines.push("");
+    };
+    const visitArrayElem = (elemType, parentName, propName) => {
+      if (!elemType)
+        return;
+      if (elemType.kind === "array") {
+        visitArrayElem(elemType.elementType, parentName, propName);
+      } else if (elemType.kind === "object") {
+        visitObject(elemType, `${parentName}${goFieldNameForKey(propName)}Item`);
+      }
+    };
+    const visit = (typeInfo, parentName, propName) => {
+      if (typeInfo.kind === "array") {
+        visitArrayElem(typeInfo.elementType, parentName, propName);
+      } else if (typeInfo.kind === "object") {
+        visitObject(typeInfo, `${parentName}${goFieldNameForKey(propName)}`);
+      }
+    };
+    for (const td of ir.metadata.typeDefinitions) {
+      if (td.name === "Props" || td.name === `${componentName}Props`)
+        continue;
+      if (td.name.endsWith("Props"))
+        continue;
+      for (const prop of td.properties ?? []) {
+        visit(prop.type, td.name, prop.name);
+      }
+    }
+    for (const param of ir.metadata.propsParams) {
+      visit(param.type, componentName, param.name);
+    }
+  }
   emitLocalTypeStructs(lines, ir, componentName) {
     for (const td of ir.metadata.typeDefinitions) {
       if (td.name === "Props" || td.name === `${componentName}Props`)
@@ -4121,7 +4193,7 @@ ${goFields.join(`
   emitPropsStructHeader(lines, ir, propsTypeName, componentName) {
     lines.push(`// ${propsTypeName} is the props type for the ${componentName} component.`);
     lines.push(`type ${propsTypeName} struct {`);
-    lines.push('\tScopeID string `json:"scopeID"`');
+    lines.push('\tScopeID string `json:"-"`');
     lines.push('\tBfIsRoot bool `json:"-"`');
     lines.push('\tBfIsChild bool `json:"-"`');
     lines.push('\tBfParent string `json:"-"`');
@@ -4151,7 +4223,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(signal.getter);
       if (propFieldNames.has(fieldName))
         continue;
-      const jsonTag = this.claimJsonTag(this.toJsonTag(signal.getter), takenJsonTags);
+      const jsonTag = "-";
       const synthType = this.state.synthStructTypes.get(signal.getter);
       if (synthType) {
         lines.push(`	${fieldName} ${typeInfoToGo(this.emitCtx, synthType)} \`json:"${jsonTag}"\``);
@@ -4183,7 +4255,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(memo.name);
       if (propFieldNames.has(fieldName))
         continue;
-      const jsonTag = this.claimJsonTag(this.toJsonTag(memo.name), takenJsonTags);
+      const jsonTag = "-";
       const goType = this.inferMemoType(memo, ir.metadata.signals, propsParamMap);
       lines.push(`	${fieldName} ${goType} \`json:"${jsonTag}"\``);
     }
@@ -4203,15 +4275,22 @@ ${goFields.join(`
       ...ir.metadata.memos.map((m) => capitalizeFieldName(m.name))
     ]);
     for (const c of this.nonCollidingContextConsumers(takenProps)) {
-      const jsonTag = this.claimJsonTag(this.toJsonTag(c.localName), takenJsonTags);
+      const jsonTag = "-";
       lines.push(`	${this.contextFieldName(c)} ${this.contextConsumerGoType(c)} \`json:"${jsonTag}"\``);
     }
+    const propDrivingFieldNames = new Set;
+    for (const p of ir.metadata.propsParams) {
+      propDrivingFieldNames.add(capitalizeFieldName(p.name));
+      propDrivingFieldNames.add(capitalizeFieldName(p.sourceName ?? p.name));
+    }
     for (const nested of nestedComponents) {
       if (this.isOrphanedClientOnlyNested(nested))
         continue;
       const elemType = nested.bodyChildren?.length ? this.loopBodyWrapperName(componentName, nested) : `${nested.name}Props`;
       if (nested.isDynamic && !nested.isPropDerived) {
         lines.push(`	${nested.name}s []${elemType} \`json:"-"\``);
+      } else if (nested.isDynamic && nested.isPropDerived && !propDrivingFieldNames.has(`${nested.name}s`)) {
+        lines.push(`	${nested.name}s []${elemType} \`json:"-"\``);
       } else {
         const jsonTag = this.claimJsonTag(this.toJsonTag(`${nested.name.charAt(0).toLowerCase()}${nested.name.slice(1)}s`), takenJsonTags);
         lines.push(`	${nested.name}s []${elemType} \`json:"${jsonTag}"\``);
@@ -4222,7 +4301,7 @@ ${goFields.join(`
       lines.push(`	${child.fieldName} ${child.name}Props \`json:"-"\``);
     }
     for (const slot of spreadSlots) {
-      const jsonTag = this.claimJsonTag(this.toJsonTag(slot.slotId), takenJsonTags);
+      const jsonTag = "-";
       lines.push(`	${slot.slotId} map[string]any \`json:"${jsonTag}"\``);
     }
   }
@@ -4535,7 +4614,7 @@ ${goFields.join(`
     }
     const propTypeOverrides = buildPropTypeOverrides(this.emitCtx, ir);
     for (const signal of ir.metadata.signals) {
-      const match = this.extractPropFallback(signal.initialValue, signal.parsed);
+      const match = this.extractPropFallback(signal.initialValue, this.resolvedSignalParsed(signal));
       if (!match)
         continue;
       if (result.has(match.propName))
@@ -4579,6 +4658,9 @@ ${goFields.join(`
     }
     return result;
   }
+  resolvedSignalParsed(signal) {
+    return resolveSignalParsedThroughSeedPlan(this.state, signal);
+  }
   extractPropFallback(initialValue, preParsed) {
     const structural = preParsed ? this.extractPropFallbackFromParsed(preParsed) : null;
     if (structural)
@@ -6676,7 +6758,8 @@ var conformancePins = {
 };
 // src/render-divergences.ts
 var renderDivergences = {
-  "static-array-from-props-with-component-precomputed": "prop-backed child-component loop renders the loop host empty at SSR (https://github.com/piconic-ai/barefootjs/issues/2630)"
+  "signal-prop-same-name-derived": "self-derived signal collides with its prop field name in the generated Go props struct — the non-idempotent `* 2` derivation is dropped and the signal renders the raw prop value instead (https://github.com/piconic-ai/barefootjs/issues/2683)",
+  "signal-prop-same-name-via-const-derived": "self-derived signal (reached through a component-scope const) collides with its prop field name in the generated Go props struct — the non-idempotent `* 2` derivation is dropped and the signal renders the raw prop value instead (https://github.com/piconic-ai/barefootjs/issues/2683)"
 };
 export {
   renderDivergences,

package/dist/render-divergences.d.ts

@@ -5,6 +5,14 @@
  * one object, so the skip list and the declaration can't drift. Keep the
  * file even when the set is empty — the next divergence lands here, not in
  * a re-created file.
+ *
+ * (#2630's `static-array-from-props-with-component-precomputed` divergence
+ * graduated once the harness (`test-render.ts`'s
+ * `buildDynamicChildLoopSeeding`, despite the name — see its doc comment)
+ * learned to seed a prop-backed static child-component loop's Props slice
+ * the same way it already seeded a signal-backed dynamic one: the adapter's
+ * own `emission` was never the bug, only this harness's route-handler
+ * stand-in was missing the prop-derived case.)
  */
 import type { RenderDivergences } from '@barefootjs/jsx';
 export declare const renderDivergences: RenderDivergences;

package/dist/render-divergences.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"render-divergences.d.ts","sourceRoot":"","sources":["../src/render-divergences.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBAM/B,CAAA"}
+{"version":3,"file":"render-divergences.d.ts","sourceRoot":"","sources":["../src/render-divergences.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBAwB/B,CAAA"}

package/dist/test-render.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAA2B,MAAM,iBAAiB,CAAA;AAY/E,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAgCD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAqWvF"}
+{"version":3,"file":"test-render.d.ts","sourceRoot":"","sources":["../src/test-render.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAGH,OAAO,KAAK,EAAE,eAAe,EAA2B,MAAM,iBAAiB,CAAA;AAY/E,qBAAa,mBAAoB,SAAQ,KAAK;IAC5C,YAAY,OAAO,EAAE,MAAM,EAG1B;CACF;AAgCD,MAAM,WAAW,aAAa;IAC5B,sBAAsB;IACtB,MAAM,EAAE,MAAM,CAAA;IACd,8BAA8B;IAC9B,OAAO,EAAE,eAAe,CAAA;IACxB,iCAAiC;IACjC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC/B,qDAAqD;IACrD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACnC;;;;;;OAMG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACzC;;;;;OAKG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB;AAED,wBAAsB,yBAAyB,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CA2WvF"}

package/dist/vite.js

@@ -3095,6 +3095,34 @@ var SVG_ROOT_TAGS = new Set([
   "animateTransform",
   "animateMotion"
 ]);
+var MATHML_ROOT_TAGS = new Set([
+  "math",
+  "mrow",
+  "mfrac",
+  "msup",
+  "msub",
+  "msubsup",
+  "mn",
+  "mi",
+  "mo",
+  "mtext",
+  "munder",
+  "mover",
+  "munderover",
+  "mtable",
+  "mtr",
+  "mtd",
+  "msqrt",
+  "mroot",
+  "mstyle",
+  "merror",
+  "mpadded",
+  "mphantom",
+  "menclose",
+  "semantics",
+  "annotation",
+  "annotation-xml"
+]);
 
 // ../jsx/src/ir-to-client-js/collect-elements.ts
 var EMPTY_RENDER_EXPRS = new Set(["null", "undefined", "false", "''", '""', "``"]);
@@ -3901,6 +3929,38 @@ function classify(name, origin, expr, parsed, available) {
   }
   return { kind: "derived", name, origin, expr, parsed, frees: [...frees] };
 }
+function localConstExprsByName(metadata) {
+  const out = new Map;
+  for (const c of metadata.localConstants ?? []) {
+    if (c.isModule || c.declarationKind !== "const" || c.value === undefined)
+      continue;
+    out.set(c.name, c.parsed ?? parseExpression(c.value.trim()));
+  }
+  return out;
+}
+function resolveThroughLocalConsts(parsed, localConsts) {
+  let current = parsed;
+  const maxIter = localConsts.size + 1;
+  for (let i = 0;i < maxIter; i++) {
+    const frees = freeIdentifiers(current);
+    if (frees === null)
+      break;
+    let changed = false;
+    for (const name of frees) {
+      const value = localConsts.get(name);
+      if (!value)
+        continue;
+      const inlined = inlineBinding(current, name, value);
+      if (inlined === null)
+        continue;
+      current = inlined;
+      changed = true;
+    }
+    if (!changed)
+      break;
+  }
+  return current;
+}
 function computeSsrSeedPlan(metadata) {
   const baseScope = metadata.propsParams.map((p) => p.name);
   if (metadata.propsObjectName)
@@ -3909,6 +3969,7 @@ function computeSsrSeedPlan(metadata) {
     baseScope.push(name);
   }
   const available = new Set(baseScope);
+  const localConsts = localConstExprsByName(metadata);
   const steps = [];
   for (const signal of metadata.signals) {
     if (signal.envReader) {
@@ -3920,13 +3981,13 @@ function computeSsrSeedPlan(metadata) {
       }
     }
     const expr = signal.initialValue.trim();
-    steps.push(expr === "" ? { kind: "opaque", name: signal.getter, origin: "signal" } : classify(signal.getter, "signal", expr, parseExpression(expr), available));
+    steps.push(expr === "" ? { kind: "opaque", name: signal.getter, origin: "signal" } : classify(signal.getter, "signal", expr, resolveThroughLocalConsts(parseExpression(expr), localConsts), available));
     available.add(signal.getter);
   }
   for (const memo of metadata.memos) {
     const body = extractArrowBodyExpression(memo.computation);
     const expr = body?.trim() ?? "";
-    steps.push(expr === "" ? { kind: "opaque", name: memo.name, origin: "memo" } : classify(memo.name, "memo", expr, memo.parsed ?? parseExpression(expr), available));
+    steps.push(expr === "" ? { kind: "opaque", name: memo.name, origin: "memo" } : classify(memo.name, "memo", expr, resolveThroughLocalConsts(memo.parsed ?? parseExpression(expr), localConsts), available));
     available.add(memo.name);
   }
   return { baseScope, steps };
@@ -5427,8 +5488,13 @@ class CompileState {
   localTypeAliases = new Map;
   localStructFields = new Map;
   synthStructTypes = new Map;
+  synthObjectStructNames = new Map;
   needsStringsImport = false;
 }
+function resolveSignalParsedThroughSeedPlan(state, signal) {
+  const step = state.ssrSeedPlan.steps.find((s) => s.kind === "derived" && s.origin === "signal" && s.name === signal.getter);
+  return step?.kind === "derived" ? step.parsed : signal.parsed;
+}
 
 // src/adapter/analysis/component-tree.ts
 function hasClientInteractivity(ir) {
@@ -6075,8 +6141,10 @@ function typeInfoToGo(ctx, _typeInfo, defaultValue, preParsed) {
         return `[]${typeInfoToGo(ctx, typeInfo.elementType)}`;
       }
       return "[]interface{}";
-    case "object":
-      return "map[string]interface{}";
+    case "object": {
+      const synthName = ctx.state.synthObjectStructNames.get(typeInfo);
+      return synthName ?? "map[string]interface{}";
+    }
     case "interface":
       if (typeInfo.raw && (ctx.state.localStructFields.has(typeInfo.raw) || ctx.state.localTypeAliases.has(typeInfo.raw))) {
         return typeInfo.raw;
@@ -7622,11 +7690,11 @@ function buildPropTypeOverrides(ctx, ir) {
       if (!param)
         continue;
       const propGoType = typeInfoToGo(ctx, param.type, param.defaultValue, param.parsed);
-      if (propGoType.includes("interface{}")) {
-        const signalGoType = typeInfoToGo(ctx, signal.type, signal.initialValue, signal.parsed);
-        if (!signalGoType.includes("interface{}")) {
-          overrides.set(propName, signalGoType);
-        }
+      const signalGoType = typeInfoToGo(ctx, signal.type, signal.initialValue, signal.parsed);
+      if (signalGoType.includes("interface{}"))
+        continue;
+      if (propGoType.includes("interface{}") || signalGoType !== propGoType) {
+        overrides.set(propName, signalGoType);
       }
     }
   }
@@ -7709,7 +7777,7 @@ function collectNullishConsumedPropNames(ctx, ir) {
   };
   walk(ir.root);
   for (const signal of ir.metadata.signals) {
-    const match = ctx.extractPropFallback(signal.initialValue, signal.parsed);
+    const match = ctx.extractPropFallback(signal.initialValue, resolveSignalParsedThroughSeedPlan(ctx.state, signal));
     if (!match || !optionalParams.has(match.propName))
       continue;
     const f = match.goFallback;
@@ -7856,6 +7924,11 @@ function collectStringValueNames(ir) {
 }
 
 // src/adapter/go-template-adapter.ts
+var SYNTH_TYPE_LOC = {
+  file: "<synthesized>",
+  start: { line: 0, column: 0 },
+  end: { line: 0, column: 0 }
+};
 var STRING_METHODS = new Set([
   "replace",
   "trim",
@@ -8217,6 +8290,7 @@ ${scriptRegistrations}${templateBody}
     const lines = [];
     const componentName = ir.metadata.componentName;
     this.buildLocalTypeTables(ir, componentName);
+    this.emitSynthPropStructs(lines, ir, componentName);
     this.emitLocalTypeStructs(lines, ir, componentName);
     this.emitSynthStructs(lines, ir, componentName);
     const nestedComponents = findNestedComponents(ir.root);
@@ -8720,7 +8794,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(signal.getter);
       if (propFieldNames.has(fieldName))
         continue;
-      const fallbackMatch = this.extractPropFallback(signal.initialValue, signal.parsed);
+      const fallbackMatch = this.extractPropFallback(signal.initialValue, this.resolvedSignalParsed(signal));
       const hoisted = fallbackMatch ? propFallbackVars.get(fallbackMatch.propName) : undefined;
       if (hoisted) {
         lines.push(`		${fieldName}: ${hoisted.varName},`);
@@ -9076,6 +9150,65 @@ ${goFields.join(`
       }
     }
   }
+  emitSynthPropStructs(lines, ir, componentName) {
+    this.state.synthObjectStructNames = new Map;
+    this.state.currentTypeDefinitions = [...this.state.currentTypeDefinitions];
+    const visitObject = (typeInfo, desiredName) => {
+      if (this.state.synthObjectStructNames.has(typeInfo))
+        return;
+      if (this.state.localTypeNames.has(desiredName))
+        return;
+      this.state.localTypeNames.add(desiredName);
+      this.state.synthObjectStructNames.set(typeInfo, desiredName);
+      for (const prop of typeInfo.properties ?? []) {
+        visit(prop.type, desiredName, prop.name);
+      }
+      const fields = this.structFieldsFor(typeInfo);
+      this.state.localStructFields.set(desiredName, new Map(fields.map((f) => [f.tsName, f.goName])));
+      this.state.currentTypeDefinitions.push({
+        kind: "type",
+        name: desiredName,
+        definition: "",
+        properties: typeInfo.properties ?? [],
+        loc: SYNTH_TYPE_LOC
+      });
+      const goFields = fields.map((f) => `	${f.goName} ${f.goType} \`json:"${this.toJsonTag(f.tsName)}"\``);
+      lines.push(`// ${desiredName} is a synthesised type for an anonymous object type (#2674).`);
+      lines.push(`type ${desiredName} struct {
+${goFields.join(`
+`)}
+}`);
+      lines.push("");
+    };
+    const visitArrayElem = (elemType, parentName, propName) => {
+      if (!elemType)
+        return;
+      if (elemType.kind === "array") {
+        visitArrayElem(elemType.elementType, parentName, propName);
+      } else if (elemType.kind === "object") {
+        visitObject(elemType, `${parentName}${goFieldNameForKey(propName)}Item`);
+      }
+    };
+    const visit = (typeInfo, parentName, propName) => {
+      if (typeInfo.kind === "array") {
+        visitArrayElem(typeInfo.elementType, parentName, propName);
+      } else if (typeInfo.kind === "object") {
+        visitObject(typeInfo, `${parentName}${goFieldNameForKey(propName)}`);
+      }
+    };
+    for (const td of ir.metadata.typeDefinitions) {
+      if (td.name === "Props" || td.name === `${componentName}Props`)
+        continue;
+      if (td.name.endsWith("Props"))
+        continue;
+      for (const prop of td.properties ?? []) {
+        visit(prop.type, td.name, prop.name);
+      }
+    }
+    for (const param of ir.metadata.propsParams) {
+      visit(param.type, componentName, param.name);
+    }
+  }
   emitLocalTypeStructs(lines, ir, componentName) {
     for (const td of ir.metadata.typeDefinitions) {
       if (td.name === "Props" || td.name === `${componentName}Props`)
@@ -9159,7 +9292,7 @@ ${goFields.join(`
   emitPropsStructHeader(lines, ir, propsTypeName, componentName) {
     lines.push(`// ${propsTypeName} is the props type for the ${componentName} component.`);
     lines.push(`type ${propsTypeName} struct {`);
-    lines.push('\tScopeID string `json:"scopeID"`');
+    lines.push('\tScopeID string `json:"-"`');
     lines.push('\tBfIsRoot bool `json:"-"`');
     lines.push('\tBfIsChild bool `json:"-"`');
     lines.push('\tBfParent string `json:"-"`');
@@ -9189,7 +9322,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(signal.getter);
       if (propFieldNames.has(fieldName))
         continue;
-      const jsonTag = this.claimJsonTag(this.toJsonTag(signal.getter), takenJsonTags);
+      const jsonTag = "-";
       const synthType = this.state.synthStructTypes.get(signal.getter);
       if (synthType) {
         lines.push(`	${fieldName} ${typeInfoToGo(this.emitCtx, synthType)} \`json:"${jsonTag}"\``);
@@ -9221,7 +9354,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(memo.name);
       if (propFieldNames.has(fieldName))
         continue;
-      const jsonTag = this.claimJsonTag(this.toJsonTag(memo.name), takenJsonTags);
+      const jsonTag = "-";
       const goType = this.inferMemoType(memo, ir.metadata.signals, propsParamMap);
       lines.push(`	${fieldName} ${goType} \`json:"${jsonTag}"\``);
     }
@@ -9241,15 +9374,22 @@ ${goFields.join(`
       ...ir.metadata.memos.map((m) => capitalizeFieldName(m.name))
     ]);
     for (const c of this.nonCollidingContextConsumers(takenProps)) {
-      const jsonTag = this.claimJsonTag(this.toJsonTag(c.localName), takenJsonTags);
+      const jsonTag = "-";
       lines.push(`	${this.contextFieldName(c)} ${this.contextConsumerGoType(c)} \`json:"${jsonTag}"\``);
     }
+    const propDrivingFieldNames = new Set;
+    for (const p of ir.metadata.propsParams) {
+      propDrivingFieldNames.add(capitalizeFieldName(p.name));
+      propDrivingFieldNames.add(capitalizeFieldName(p.sourceName ?? p.name));
+    }
     for (const nested of nestedComponents) {
       if (this.isOrphanedClientOnlyNested(nested))
         continue;
       const elemType = nested.bodyChildren?.length ? this.loopBodyWrapperName(componentName, nested) : `${nested.name}Props`;
       if (nested.isDynamic && !nested.isPropDerived) {
         lines.push(`	${nested.name}s []${elemType} \`json:"-"\``);
+      } else if (nested.isDynamic && nested.isPropDerived && !propDrivingFieldNames.has(`${nested.name}s`)) {
+        lines.push(`	${nested.name}s []${elemType} \`json:"-"\``);
       } else {
         const jsonTag = this.claimJsonTag(this.toJsonTag(`${nested.name.charAt(0).toLowerCase()}${nested.name.slice(1)}s`), takenJsonTags);
         lines.push(`	${nested.name}s []${elemType} \`json:"${jsonTag}"\``);
@@ -9260,7 +9400,7 @@ ${goFields.join(`
       lines.push(`	${child.fieldName} ${child.name}Props \`json:"-"\``);
     }
     for (const slot of spreadSlots) {
-      const jsonTag = this.claimJsonTag(this.toJsonTag(slot.slotId), takenJsonTags);
+      const jsonTag = "-";
       lines.push(`	${slot.slotId} map[string]any \`json:"${jsonTag}"\``);
     }
   }
@@ -9573,7 +9713,7 @@ ${goFields.join(`
     }
     const propTypeOverrides = buildPropTypeOverrides(this.emitCtx, ir);
     for (const signal of ir.metadata.signals) {
-      const match = this.extractPropFallback(signal.initialValue, signal.parsed);
+      const match = this.extractPropFallback(signal.initialValue, this.resolvedSignalParsed(signal));
       if (!match)
         continue;
       if (result.has(match.propName))
@@ -9617,6 +9757,9 @@ ${goFields.join(`
     }
     return result;
   }
+  resolvedSignalParsed(signal) {
+    return resolveSignalParsedThroughSeedPlan(this.state, signal);
+  }
   extractPropFallback(initialValue, preParsed) {
     const structural = preParsed ? this.extractPropFallbackFromParsed(preParsed) : null;
     if (structural)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/go-template",
-  "version": "0.31.8",
+  "version": "0.31.10",
   "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.31.8"
+    "@barefootjs/shared": "0.31.10"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -67,9 +67,9 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/client": "0.31.8",
-    "@barefootjs/jsx": "0.31.8",
-    "@barefootjs/vite": "0.31.8",
+    "@barefootjs/client": "0.31.10",
+    "@barefootjs/jsx": "0.31.10",
+    "@barefootjs/vite": "0.31.10",
     "vite": "^6.0.0"
   }
 }