@barefootjs/go-template 0.31.9 → 0.32.0

package/dist/index.js

@@ -361,6 +361,10 @@ class CompileState {
   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) {
@@ -2673,7 +2677,18 @@ function collectNullishConsumedPropNames(ctx, ir) {
   };
   walk(ir.root);
   for (const signal of ir.metadata.signals) {
-    const match = ctx.extractPropFallback(signal.initialValue, signal.parsed);
+    const resolvedParsed = resolveSignalParsedThroughSeedPlan(ctx.state, signal);
+    let match = ctx.extractPropFallback(signal.initialValue, resolvedParsed);
+    if (!match) {
+      const collision = ctx.extractCollisionDerivation(resolvedParsed);
+      if (collision) {
+        const collisionParam = ir.metadata.propsParams.find((p) => p.name === collision.propName);
+        const collisionField = collisionParam ? capitalizeFieldName(collisionParam.sourceName ?? collision.propName) : null;
+        if (collisionField && capitalizeFieldName(signal.getter) === collisionField) {
+          match = { propName: collision.propName, goFallback: collision.goFallback };
+        }
+      }
+    }
     if (!match || !optionalParams.has(match.propName))
       continue;
     const f = match.goFallback;
@@ -2859,6 +2874,7 @@ class GoTemplateAdapter extends BaseAdapter {
     convertConditionToGo: (jsCondition, preParsed) => this.convertConditionToGo(jsCondition, preParsed),
     extractPropNameFromInitialValue: (initialValue, preParsed) => this.extractPropNameFromInitialValue(initialValue, preParsed),
     extractPropFallback: (initialValue, preParsed) => this.extractPropFallback(initialValue, preParsed),
+    extractCollisionDerivation: (parsed) => this.extractCollisionDerivation(parsed),
     resolveModuleStringConst: (name) => this.resolveModuleStringConst(name)
   };
   get errors() {
@@ -3637,6 +3653,7 @@ ${goFields.join(`
       }
       lines.push("");
     }
+    this.emitCallerPropsInit(lines, ir, nestedComponents, staticWithoutBody, staticWithBody, dynamicWithBody, emittedWrapperVars, propTypeOverrides);
     lines.push(`	return ${propsTypeName}{`);
     lines.push("\t\tScopeID: scopeID,");
     lines.push("\t\tBfParent: in.BfParent,");
@@ -3644,6 +3661,7 @@ ${goFields.join(`
     if (this.usesSearchParams(ir)) {
       lines.push("\t\tSearchParams: in.SearchParams,");
     }
+    lines.push("\t\tBfCallerProps: bfCallerProps,");
     const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
     const memoFallbacks = new Map;
     for (const memo of ir.metadata.memos) {
@@ -3669,7 +3687,8 @@ ${goFields.join(`
         continue;
       const hoisted = propFallbackVars.get(param.name);
       if (hoisted) {
-        lines.push(`		${fieldName}: ${hoisted.varName},`);
+        const value = hoisted.collisionWrap ? `${hoisted.varName} ${hoisted.collisionWrap.operator} ${hoisted.collisionWrap.operand}` : hoisted.varName;
+        lines.push(`		${fieldName}: ${value},`);
       } else {
         const paramDefault = goPropDefault(param.defaultValue);
         const memoFold = memoFallbacks.get(fieldName);
@@ -3691,7 +3710,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},`);
@@ -3748,6 +3767,53 @@ ${goFields.join(`
     lines.push("\t}");
     lines.push("}");
   }
+  emitCallerPropsInit(lines, ir, nestedComponents, staticWithoutBody, staticWithBody, dynamicWithBody, emittedWrapperVars, propTypeOverrides) {
+    lines.push("\tbfCallerProps := map[string]interface{}{}");
+    const bfCallerPropsTakenTags = new Set;
+    const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
+    for (const param of ir.metadata.propsParams) {
+      if (param.name === "children")
+        continue;
+      if (this.isNestedArrayShadowed(param, nestedArrayFields))
+        continue;
+      const callerKey = this.claimJsonTag(this.toJsonTag(param.sourceName ?? param.name), bfCallerPropsTakenTags);
+      if (callerKey === "-")
+        continue;
+      const inputField = `in.${capitalizeFieldName(param.sourceName ?? param.name)}`;
+      const goType = resolvePropGoType(this.emitCtx, param, propTypeOverrides);
+      const isNillable = goType === "interface{}" || goType === "map[string]interface{}" || goType.startsWith("[]");
+      if (param.optional && isNillable) {
+        lines.push(`	if ${inputField} != nil {`);
+        lines.push(`		bfCallerProps["${callerKey}"] = ${inputField}`);
+        lines.push(`	}`);
+      } else {
+        lines.push(`	bfCallerProps["${callerKey}"] = ${inputField}`);
+      }
+    }
+    for (const nested of [...staticWithoutBody, ...staticWithBody, ...dynamicWithBody]) {
+      if (!nested.isPropDerived)
+        continue;
+      const varName = `${nested.name.charAt(0).toLowerCase()}${nested.name.slice(1)}s`;
+      const isBuilt = staticWithoutBody.includes(nested) || emittedWrapperVars.has(varName);
+      if (!isBuilt)
+        continue;
+      const arrayFieldName = capitalizeFieldName(`${nested.name}s`);
+      const param = ir.metadata.propsParams.find((p) => capitalizeFieldName(p.name) === arrayFieldName || capitalizeFieldName(p.sourceName ?? p.name) === arrayFieldName);
+      if (!param || !this.isNestedArrayShadowed(param, nestedArrayFields))
+        continue;
+      const callerKey = this.claimJsonTag(this.toJsonTag(param.sourceName ?? param.name), bfCallerPropsTakenTags);
+      if (callerKey === "-")
+        continue;
+      if (param.optional) {
+        lines.push(`	if in.${nested.name}s != nil {`);
+        lines.push(`		bfCallerProps["${callerKey}"] = ${varName}`);
+        lines.push(`	}`);
+      } else {
+        lines.push(`	bfCallerProps["${callerKey}"] = ${varName}`);
+      }
+    }
+    lines.push("");
+  }
   emitStaticChildInstances(lines, ir) {
     const staticChildren = this.collectStaticChildInstances(ir.root, ir.metadata.propsParams);
     for (const child of staticChildren) {
@@ -4199,6 +4265,7 @@ ${goFields.join(`
     if (this.usesSearchParams(ir)) {
       lines.push('\tSearchParams bf.SearchParams `json:"-"`');
     }
+    lines.push('\tBfCallerProps map[string]interface{} `json:"-"`');
   }
   emitPropsDataFields(lines, ir, nestedComponents, propTypeOverrides, takenJsonTags) {
     const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
@@ -4219,7 +4286,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}"\``);
@@ -4251,7 +4318,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}"\``);
     }
@@ -4271,15 +4338,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}"\``);
@@ -4290,7 +4364,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}"\``);
     }
   }
@@ -4603,7 +4677,19 @@ ${goFields.join(`
     }
     const propTypeOverrides = buildPropTypeOverrides(this.emitCtx, ir);
     for (const signal of ir.metadata.signals) {
-      const match = this.extractPropFallback(signal.initialValue, signal.parsed);
+      let match = this.extractPropFallback(signal.initialValue, this.resolvedSignalParsed(signal));
+      let collisionWrap;
+      if (!match) {
+        const collision = this.extractCollisionDerivation(this.resolvedSignalParsed(signal));
+        if (collision) {
+          const collisionParam = ir.metadata.propsParams.find((p) => p.name === collision.propName);
+          const collisionField = collisionParam ? capitalizeFieldName(collisionParam.sourceName ?? collision.propName) : null;
+          if (collisionField && capitalizeFieldName(signal.getter) === collisionField) {
+            match = { propName: collision.propName, goFallback: collision.goFallback };
+            collisionWrap = { operator: collision.operator, operand: collision.operand };
+          }
+        }
+      }
       if (!match)
         continue;
       if (result.has(match.propName))
@@ -4642,11 +4728,15 @@ ${goFields.join(`
         fieldName,
         goFallback: match.goFallback,
         zeroLiteral,
-        ...nullishLowered ? { assertType: concreteType } : {}
+        ...nullishLowered ? { assertType: concreteType } : {},
+        ...collisionWrap ? { collisionWrap } : {}
       });
     }
     return result;
   }
+  resolvedSignalParsed(signal) {
+    return resolveSignalParsedThroughSeedPlan(this.state, signal);
+  }
   extractPropFallback(initialValue, preParsed) {
     const structural = preParsed ? this.extractPropFallbackFromParsed(preParsed) : null;
     if (structural)
@@ -4689,6 +4779,26 @@ ${goFields.join(`
       return null;
     return { propName, goFallback };
   }
+  extractCollisionDerivation(parsed) {
+    if (!parsed || parsed.kind !== "binary")
+      return null;
+    if (!["*", "+", "-", "/"].includes(parsed.op))
+      return null;
+    const { right } = parsed;
+    if (right.kind !== "literal" || right.literalType !== "number" || typeof right.value !== "number" || !Number.isInteger(right.value) || right.value < 0) {
+      return null;
+    }
+    if (parsed.op === "/" && right.value === 0)
+      return null;
+    const coalesce = parsed.left;
+    if (coalesce.kind !== "logical" || coalesce.op !== "??" || coalesce.right.kind !== "literal" || coalesce.right.literalType !== "number") {
+      return null;
+    }
+    const inner = this.extractPropFallbackFromParsed(parsed.left);
+    if (!inner)
+      return null;
+    return { ...inner, operator: parsed.op, operand: String(right.value) };
+  }
   extractPropNameFromInitialValue(initialValue, preParsed) {
     if (!this.state.propsObjectName) {
       if (preParsed?.kind === "logical" && (preParsed.op === "??" || preParsed.op === "||") && preParsed.left.kind === "identifier") {

package/dist/render-divergences.d.ts

@@ -6,13 +6,13 @@
  * file even when the set is empty — the next divergence lands here, not in
  * a re-created file.
  *
- * Empty — #2630's `static-array-from-props-with-component-precomputed`
- * divergence graduated once the harness (`test-render.ts`'s
+ * (#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.
+ * stand-in was missing the prop-derived case.)
  */
 import type { RenderDivergences } from '@barefootjs/jsx';
 export declare const renderDivergences: RenderDivergences;

package/dist/vite.js

@@ -3929,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)
@@ -3937,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) {
@@ -3948,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 };
@@ -5458,6 +5491,10 @@ class CompileState {
   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) {
@@ -7740,7 +7777,18 @@ function collectNullishConsumedPropNames(ctx, ir) {
   };
   walk(ir.root);
   for (const signal of ir.metadata.signals) {
-    const match = ctx.extractPropFallback(signal.initialValue, signal.parsed);
+    const resolvedParsed = resolveSignalParsedThroughSeedPlan(ctx.state, signal);
+    let match = ctx.extractPropFallback(signal.initialValue, resolvedParsed);
+    if (!match) {
+      const collision = ctx.extractCollisionDerivation(resolvedParsed);
+      if (collision) {
+        const collisionParam = ir.metadata.propsParams.find((p) => p.name === collision.propName);
+        const collisionField = collisionParam ? capitalizeFieldName(collisionParam.sourceName ?? collision.propName) : null;
+        if (collisionField && capitalizeFieldName(signal.getter) === collisionField) {
+          match = { propName: collision.propName, goFallback: collision.goFallback };
+        }
+      }
+    }
     if (!match || !optionalParams.has(match.propName))
       continue;
     const f = match.goFallback;
@@ -7925,6 +7973,7 @@ class GoTemplateAdapter extends BaseAdapter {
     convertConditionToGo: (jsCondition, preParsed) => this.convertConditionToGo(jsCondition, preParsed),
     extractPropNameFromInitialValue: (initialValue, preParsed) => this.extractPropNameFromInitialValue(initialValue, preParsed),
     extractPropFallback: (initialValue, preParsed) => this.extractPropFallback(initialValue, preParsed),
+    extractCollisionDerivation: (parsed) => this.extractCollisionDerivation(parsed),
     resolveModuleStringConst: (name) => this.resolveModuleStringConst(name)
   };
   get errors() {
@@ -8703,6 +8752,7 @@ ${goFields.join(`
       }
       lines.push("");
     }
+    this.emitCallerPropsInit(lines, ir, nestedComponents, staticWithoutBody, staticWithBody, dynamicWithBody, emittedWrapperVars, propTypeOverrides);
     lines.push(`	return ${propsTypeName}{`);
     lines.push("\t\tScopeID: scopeID,");
     lines.push("\t\tBfParent: in.BfParent,");
@@ -8710,6 +8760,7 @@ ${goFields.join(`
     if (this.usesSearchParams(ir)) {
       lines.push("\t\tSearchParams: in.SearchParams,");
     }
+    lines.push("\t\tBfCallerProps: bfCallerProps,");
     const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
     const memoFallbacks = new Map;
     for (const memo of ir.metadata.memos) {
@@ -8735,7 +8786,8 @@ ${goFields.join(`
         continue;
       const hoisted = propFallbackVars.get(param.name);
       if (hoisted) {
-        lines.push(`		${fieldName}: ${hoisted.varName},`);
+        const value = hoisted.collisionWrap ? `${hoisted.varName} ${hoisted.collisionWrap.operator} ${hoisted.collisionWrap.operand}` : hoisted.varName;
+        lines.push(`		${fieldName}: ${value},`);
       } else {
         const paramDefault = goPropDefault(param.defaultValue);
         const memoFold = memoFallbacks.get(fieldName);
@@ -8757,7 +8809,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},`);
@@ -8814,6 +8866,53 @@ ${goFields.join(`
     lines.push("\t}");
     lines.push("}");
   }
+  emitCallerPropsInit(lines, ir, nestedComponents, staticWithoutBody, staticWithBody, dynamicWithBody, emittedWrapperVars, propTypeOverrides) {
+    lines.push("\tbfCallerProps := map[string]interface{}{}");
+    const bfCallerPropsTakenTags = new Set;
+    const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
+    for (const param of ir.metadata.propsParams) {
+      if (param.name === "children")
+        continue;
+      if (this.isNestedArrayShadowed(param, nestedArrayFields))
+        continue;
+      const callerKey = this.claimJsonTag(this.toJsonTag(param.sourceName ?? param.name), bfCallerPropsTakenTags);
+      if (callerKey === "-")
+        continue;
+      const inputField = `in.${capitalizeFieldName(param.sourceName ?? param.name)}`;
+      const goType = resolvePropGoType(this.emitCtx, param, propTypeOverrides);
+      const isNillable = goType === "interface{}" || goType === "map[string]interface{}" || goType.startsWith("[]");
+      if (param.optional && isNillable) {
+        lines.push(`	if ${inputField} != nil {`);
+        lines.push(`		bfCallerProps["${callerKey}"] = ${inputField}`);
+        lines.push(`	}`);
+      } else {
+        lines.push(`	bfCallerProps["${callerKey}"] = ${inputField}`);
+      }
+    }
+    for (const nested of [...staticWithoutBody, ...staticWithBody, ...dynamicWithBody]) {
+      if (!nested.isPropDerived)
+        continue;
+      const varName = `${nested.name.charAt(0).toLowerCase()}${nested.name.slice(1)}s`;
+      const isBuilt = staticWithoutBody.includes(nested) || emittedWrapperVars.has(varName);
+      if (!isBuilt)
+        continue;
+      const arrayFieldName = capitalizeFieldName(`${nested.name}s`);
+      const param = ir.metadata.propsParams.find((p) => capitalizeFieldName(p.name) === arrayFieldName || capitalizeFieldName(p.sourceName ?? p.name) === arrayFieldName);
+      if (!param || !this.isNestedArrayShadowed(param, nestedArrayFields))
+        continue;
+      const callerKey = this.claimJsonTag(this.toJsonTag(param.sourceName ?? param.name), bfCallerPropsTakenTags);
+      if (callerKey === "-")
+        continue;
+      if (param.optional) {
+        lines.push(`	if in.${nested.name}s != nil {`);
+        lines.push(`		bfCallerProps["${callerKey}"] = ${varName}`);
+        lines.push(`	}`);
+      } else {
+        lines.push(`	bfCallerProps["${callerKey}"] = ${varName}`);
+      }
+    }
+    lines.push("");
+  }
   emitStaticChildInstances(lines, ir) {
     const staticChildren = this.collectStaticChildInstances(ir.root, ir.metadata.propsParams);
     for (const child of staticChildren) {
@@ -9265,6 +9364,7 @@ ${goFields.join(`
     if (this.usesSearchParams(ir)) {
       lines.push('\tSearchParams bf.SearchParams `json:"-"`');
     }
+    lines.push('\tBfCallerProps map[string]interface{} `json:"-"`');
   }
   emitPropsDataFields(lines, ir, nestedComponents, propTypeOverrides, takenJsonTags) {
     const nestedArrayFields = this.propDerivedNestedArrayFields(nestedComponents);
@@ -9285,7 +9385,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}"\``);
@@ -9317,7 +9417,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}"\``);
     }
@@ -9337,15 +9437,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}"\``);
@@ -9356,7 +9463,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}"\``);
     }
   }
@@ -9669,7 +9776,19 @@ ${goFields.join(`
     }
     const propTypeOverrides = buildPropTypeOverrides(this.emitCtx, ir);
     for (const signal of ir.metadata.signals) {
-      const match = this.extractPropFallback(signal.initialValue, signal.parsed);
+      let match = this.extractPropFallback(signal.initialValue, this.resolvedSignalParsed(signal));
+      let collisionWrap;
+      if (!match) {
+        const collision = this.extractCollisionDerivation(this.resolvedSignalParsed(signal));
+        if (collision) {
+          const collisionParam = ir.metadata.propsParams.find((p) => p.name === collision.propName);
+          const collisionField = collisionParam ? capitalizeFieldName(collisionParam.sourceName ?? collision.propName) : null;
+          if (collisionField && capitalizeFieldName(signal.getter) === collisionField) {
+            match = { propName: collision.propName, goFallback: collision.goFallback };
+            collisionWrap = { operator: collision.operator, operand: collision.operand };
+          }
+        }
+      }
       if (!match)
         continue;
       if (result.has(match.propName))
@@ -9708,11 +9827,15 @@ ${goFields.join(`
         fieldName,
         goFallback: match.goFallback,
         zeroLiteral,
-        ...nullishLowered ? { assertType: concreteType } : {}
+        ...nullishLowered ? { assertType: concreteType } : {},
+        ...collisionWrap ? { collisionWrap } : {}
       });
     }
     return result;
   }
+  resolvedSignalParsed(signal) {
+    return resolveSignalParsedThroughSeedPlan(this.state, signal);
+  }
   extractPropFallback(initialValue, preParsed) {
     const structural = preParsed ? this.extractPropFallbackFromParsed(preParsed) : null;
     if (structural)
@@ -9755,6 +9878,26 @@ ${goFields.join(`
       return null;
     return { propName, goFallback };
   }
+  extractCollisionDerivation(parsed) {
+    if (!parsed || parsed.kind !== "binary")
+      return null;
+    if (!["*", "+", "-", "/"].includes(parsed.op))
+      return null;
+    const { right } = parsed;
+    if (right.kind !== "literal" || right.literalType !== "number" || typeof right.value !== "number" || !Number.isInteger(right.value) || right.value < 0) {
+      return null;
+    }
+    if (parsed.op === "/" && right.value === 0)
+      return null;
+    const coalesce = parsed.left;
+    if (coalesce.kind !== "logical" || coalesce.op !== "??" || coalesce.right.kind !== "literal" || coalesce.right.literalType !== "number") {
+      return null;
+    }
+    const inner = this.extractPropFallbackFromParsed(parsed.left);
+    if (!inner)
+      return null;
+    return { ...inner, operator: parsed.op, operand: String(right.value) };
+  }
   extractPropNameFromInitialValue(initialValue, preParsed) {
     if (!this.state.propsObjectName) {
       if (preParsed?.kind === "logical" && (preParsed.op === "??" || preParsed.op === "||") && preParsed.left.kind === "identifier") {

package/package.json

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