@barefootjs/go-template 0.31.10 → 0.33.0

package/dist/adapter/spread/spread-codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spread-codegen.d.ts","sourceRoot":"","sources":["../../../src/adapter/spread/spread-codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EACV,WAAW,EACX,MAAM,EAQN,UAAU,EACX,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAGrD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAIrF;AAuID;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,WAAW,EACf,MAAM,CAAC,EAAE,UAAU,GAClB,MAAM,GAAG,IAAI,CA6Ef"}
+{"version":3,"file":"spread-codegen.d.ts","sourceRoot":"","sources":["../../../src/adapter/spread/spread-codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAKH,OAAO,KAAK,EACV,WAAW,EACX,MAAM,EAQN,UAAU,EACX,MAAM,iBAAiB,CAAA;AAExB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAGrD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,GAAG,cAAc,EAAE,CAIrF;AA2ID;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,aAAa,EAClB,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,WAAW,EACf,MAAM,CAAC,EAAE,UAAU,GAClB,MAAM,GAAG,IAAI,CA6Ef"}

package/dist/adapter/value/parsed-literal-to-go.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parsed-literal-to-go.d.ts","sourceRoot":"","sources":["../../../src/adapter/value/parsed-literal-to-go.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAkB,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAmDvD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAalE;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,CAAC,EAAE,QAAQ,GAClB,MAAM,GAAG,IAAI,CA8Ef"}
+{"version":3,"file":"parsed-literal-to-go.d.ts","sourceRoot":"","sources":["../../../src/adapter/value/parsed-literal-to-go.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAkB,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE3E,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAsDvD;;;;;;;;;;GAUG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAalE;AAED,wBAAgB,iBAAiB,CAC/B,GAAG,EAAE,aAAa,EAClB,IAAI,EAAE,UAAU,EAChB,QAAQ,CAAC,EAAE,QAAQ,GAClB,MAAM,GAAG,IAAI,CAkFf"}

package/dist/adapter/value/value-lowering.d.ts

@@ -74,20 +74,23 @@ export declare function matchMapJoinChain(expr: ParsedExpr): {
 } | null;
 /**
  * Lower a `.map(cb).join(sep)` chain (matched by {@link matchMapJoinChain})
- * to a `bf.Join(bf.MapEval(<items>, "<projJSON>", "<param>", <envMap>),
- * <sep>)` Go expression — the constructor-source analogue of
- * `matchFilterArmMemo`'s `bf.FilterEval` emit (`memo-compute.ts`), reusing
- * the SAME two runtime evaluator functions (`MapEval`, `eval.go`; `Join`,
- * `bf.go`) the template-position `bf_map_eval`/`bf_join` lowering already
- * calls. Shared by a memo's derived value (`memoInitialFromParsedBody`'s
- * concatenation-chain arm) and a SIGNAL's own initializer
- * (`convertInitialValue`'s `string` branch, #2492).
+ * to a `bf.Join(<chain>, <sep>)` Go expression, where `<chain>` is the
+ * chain's OWN `.map()` step composed by {@link callbackStepToGo} over
+ * whatever {@link resolveMapChainAsGo} resolves its receiver to (a base
+ * shape, or one or more nested `.map()`/`.filter()` layers) — the
+ * constructor-source analogue of `matchFilterArmMemo`'s `bf.FilterEval`
+ * emit (`memo-compute.ts`), reusing the SAME runtime evaluator functions
+ * (`MapEval`/`FilterEval`, `eval.go`; `Join`, `bf.go`) the template-position
+ * `bf_map_eval`/`bf_join` lowering already calls. Shared by a memo's
+ * derived value (`memoInitialFromParsedBody`'s concatenation-chain arm and
+ * bare-chain arm) and a SIGNAL's own initializer (`convertInitialValue`'s
+ * `string` branch, #2492).
  *
  * @returns the Go expression, or null when the receiver doesn't resolve
- *   ({@link resolveMapJoinBaseAsGo}), the projection body isn't
- *   representable to the runtime evaluator (`serializeParsedExpr` refusal),
- *   a captured free variable doesn't resolve, or the separator isn't a
- *   string literal (a dynamic separator — out of scope for this arm).
+ *   ({@link resolveMapChainAsGo}), the projection body isn't representable
+ *   to the runtime evaluator (`serializeParsedExpr` refusal), a captured
+ *   free variable doesn't resolve, or the separator isn't a string literal
+ *   (a dynamic separator — out of scope for this arm).
  */
 export declare function mapJoinChainToGo(ctx: GoEmitContext, chain: {
     object: ParsedExpr;

package/dist/adapter/value/value-lowering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"value-lowering.d.ts","sourceRoot":"","sources":["../../../src/adapter/value/value-lowering.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAQ3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAyDtD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,QAAQ,EACnB,WAAW,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACrD,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CAkHR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,GAAG,IAAI,CAMf;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAWxF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,aAAa,EAClB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACpD,gBAAgB,GAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAA4B,EACjF,UAAU,CAAC,EAAE,QAAQ,GACpB,MAAM,CAqCR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG;IACnD,MAAM,EAAE,UAAU,CAAA;IAClB,KAAK,EAAE,OAAO,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IAC7C,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,GAAG,IAAI,CAKP;AAsED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,EACjG,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,EAAE,EACzF,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACpD,gBAAgB,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,GACrD,MAAM,GAAG,IAAI,CAqCf"}
+{"version":3,"file":"value-lowering.d.ts","sourceRoot":"","sources":["../../../src/adapter/value/value-lowering.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAQ3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAyDtD;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,QAAQ,EACnB,WAAW,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACrD,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CAkHR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,aAAa,CAC3B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,QAAQ,EAClB,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,GAAG,IAAI,CAMf;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,IAAI,CAcxF;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,aAAa,EAClB,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACpD,gBAAgB,GAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAA4B,EACjF,UAAU,CAAC,EAAE,QAAQ,GACpB,MAAM,CAqCR;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,UAAU,GAAG;IACnD,MAAM,EAAE,UAAU,CAAA;IAClB,KAAK,EAAE,OAAO,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,CAAA;IAC7C,MAAM,CAAC,EAAE,UAAU,CAAA;CACpB,GAAG,IAAI,CAKP;AA8JD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,aAAa,EAClB,KAAK,EAAE;IAAE,MAAM,EAAE,UAAU,CAAC;IAAC,KAAK,EAAE,OAAO,CAAC,UAAU,EAAE;QAAE,IAAI,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,EACjG,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,QAAQ,CAAC;IAAC,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,EAAE,EACzF,WAAW,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,EACpD,gBAAgB,EAAE,WAAW,CAAC,MAAM,EAAE,eAAe,CAAC,GACrD,MAAM,GAAG,IAAI,CAiBf"}

package/dist/index.js

@@ -11,6 +11,7 @@ import {
   asCallbackMethodCall as asCallbackMethodCall4,
   sortComparatorFromArrow,
   emitParsedExpr,
+  groupObjectLiteralSegments,
   emitIRNode,
   emitAttrValue,
   augmentInheritedPropAccesses,
@@ -724,7 +725,7 @@ function isSubstituteSafeBody(body, paramNames) {
     if (n.kind === "identifier")
       return paramNames.has(n.name);
     if (n.kind === "object-literal") {
-      return n.properties.some((p) => p.shorthand && paramNames.has(p.key) || referencesParam(p.value));
+      return n.properties.some((p) => p.kind === "spread" ? referencesParam(p.expr) : p.shorthand && paramNames.has(p.key) || referencesParam(p.value));
     }
     let hit = false;
     forEachValueChild(n, (c) => {
@@ -1092,6 +1093,8 @@ function bakeInlineObjectAsGoMap(ctx, expr) {
     return null;
   const entries = [];
   for (const prop of expr.properties) {
+    if (prop.kind === "spread")
+      return null;
     if (prop.shorthand)
       return null;
     const go = prop.value.kind === "object-literal" ? bakeInlineObjectAsGoMap(ctx, prop.value) : parsedLiteralToGo(ctx, prop.value);
@@ -1147,6 +1150,8 @@ function parsedLiteralToGo(ctx, expr, typeInfo) {
       return null;
     const entries = [];
     for (const prop of expr.properties) {
+      if (prop.kind === "spread")
+        return null;
       const goField = structFields.get(prop.key);
       if (!goField)
         return null;
@@ -1268,6 +1273,8 @@ function objectLiteralToGoMap(ctx, expr) {
     return null;
   const entries = [];
   for (const prop of expr.properties) {
+    if (prop.kind === "spread")
+      return null;
     if (prop.shorthand)
       return null;
     const val = parsedLiteralToGo(ctx, prop.value);
@@ -1346,17 +1353,18 @@ function resolveMapJoinBaseAsGo(ctx, object, signals, propsParams) {
   }
   return null;
 }
-function mapJoinChainToGo(ctx, chain, signals, propsParams, propFallbackVars) {
-  const itemsGo = resolveMapJoinBaseAsGo(ctx, chain.object, signals, propsParams);
-  if (itemsGo === null)
+var CALLBACK_EVAL_FUNC = { map: "bf.MapEval", filter: "bf.FilterEval" };
+function callbackStepToGo(ctx, method, itemsGo, arrow, signals, propsParams, propFallbackVars) {
+  const evalFunc = CALLBACK_EVAL_FUNC[method];
+  if (!evalFunc)
     return null;
   const knownGetterNames = new Set(signals.map((s) => s.getter));
-  const materialized = materializeGetterCalls(chain.arrow.body, knownGetterNames);
+  const materialized = materializeGetterCalls(arrow.body, knownGetterNames);
   const projJSON = serializeParsedExpr2(materialized);
   if (projJSON === null)
     return null;
-  const paramName = chain.arrow.params[0] ?? "_";
-  const freeVars = freeVarsInBody2(materialized, new Set(chain.arrow.params));
+  const paramName = arrow.params[0] ?? "_";
+  const freeVars = freeVarsInBody2(materialized, new Set(arrow.params));
   const envEntries = [];
   for (const name of freeVars) {
     const sig = signals.find((s) => s.getter === name);
@@ -1373,6 +1381,25 @@ function mapJoinChainToGo(ctx, chain, signals, propsParams, propFallbackVars) {
     envEntries.push(`${JSON.stringify(name)}: ${goExpr}`);
   }
   const envMap = `map[string]any{${envEntries.join(", ")}}`;
+  return `${evalFunc}(${itemsGo}, "${escapeGoString(projJSON)}", ${JSON.stringify(paramName)}, ${envMap})`;
+}
+function resolveMapChainAsGo(ctx, expr, signals, propsParams, propFallbackVars) {
+  const cb = asCallbackMethodCall(expr);
+  if (cb && cb.method in CALLBACK_EVAL_FUNC) {
+    const innerGo = resolveMapChainAsGo(ctx, cb.object, signals, propsParams, propFallbackVars);
+    if (innerGo === null)
+      return null;
+    return callbackStepToGo(ctx, cb.method, innerGo, cb.arrow, signals, propsParams, propFallbackVars);
+  }
+  return resolveMapJoinBaseAsGo(ctx, expr, signals, propsParams);
+}
+function mapJoinChainToGo(ctx, chain, signals, propsParams, propFallbackVars) {
+  const itemsGo = resolveMapChainAsGo(ctx, chain.object, signals, propsParams, propFallbackVars);
+  if (itemsGo === null)
+    return null;
+  const mapGo = callbackStepToGo(ctx, "map", itemsGo, chain.arrow, signals, propsParams, propFallbackVars);
+  if (mapGo === null)
+    return null;
   let sepGo;
   if (!chain.sepArg) {
     sepGo = JSON.stringify(",");
@@ -1381,7 +1408,7 @@ function mapJoinChainToGo(ctx, chain, signals, propsParams, propFallbackVars) {
   } else {
     return null;
   }
-  return `bf.Join(bf.MapEval(${itemsGo}, "${escapeGoString(projJSON)}", ${JSON.stringify(paramName)}, ${envMap}), ${sepGo})`;
+  return `bf.Join(${mapGo}, ${sepGo})`;
 }
 
 // src/adapter/memo/memo-type.ts
@@ -1670,6 +1697,8 @@ function computeObjectMemoInitialValue(ctx, memo) {
   const env = { searchParamsVars: new Set, params: new Map };
   const entries = [];
   for (const prop of retObj.properties) {
+    if (prop.kind === "spread")
+      return null;
     if (prop.shorthand)
       return null;
     if (prop.keyKind !== undefined && prop.keyKind !== "identifier" && prop.keyKind !== "string") {
@@ -1801,6 +1830,8 @@ function recordIndexInterpolationToGo(ctx, node, propNames, localKeyBindings) {
     return null;
   const entries = [];
   for (const prop of parsedConst.properties) {
+    if (prop.kind === "spread")
+      return null;
     const v = prop.value;
     if (v.kind === "literal" && v.literalType === "number") {
       entries.push({ key: prop.key, value: { kind: "number", text: v.raw ?? String(v.value) } });
@@ -2127,6 +2158,12 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
     if (concatGo !== null)
       return concatGo;
   }
+  const bareChain = matchMapJoinChain(body);
+  if (bareChain) {
+    const chainGo = mapJoinChainToGo(ctx, bareChain, signals, propsParams, propFallbackVars);
+    if (chainGo !== null)
+      return chainGo;
+  }
   return null;
 }
 function resolveStringConcatChainGo(ctx, expr, signals, propsParams, propFallbackVars, propRef) {
@@ -2298,7 +2335,7 @@ function collectPropsReadByCtorInit(body, propsObjectName, propNames) {
         return;
       case "object-literal":
         for (const p of e.properties)
-          visit(p.value, bound);
+          visit(p.kind === "spread" ? p.expr : p.value, bound);
         return;
       case "array-method":
         visit(e.object, bound);
@@ -2410,6 +2447,8 @@ function parsedObjectLiteralToGoMap(parsed) {
     return null;
   const entries = [];
   for (const prop of parsed.properties) {
+    if (prop.kind === "spread")
+      return null;
     if (prop.keyKind === "numeric")
       return null;
     const v = prop.value;
@@ -2534,6 +2573,8 @@ function conditionToGoBool(condition, ir) {
 function objectLiteralToGoSpreadMap(ctx, obj, ir) {
   const entries = [];
   for (const prop of obj.properties) {
+    if (prop.kind === "spread")
+      return null;
     if (prop.shorthand)
       return null;
     if (prop.keyKind === "numeric")
@@ -2677,7 +2718,18 @@ function collectNullishConsumedPropNames(ctx, ir) {
   };
   walk(ir.root);
   for (const signal of ir.metadata.signals) {
-    const match = ctx.extractPropFallback(signal.initialValue, resolveSignalParsedThroughSeedPlan(ctx.state, signal));
+    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;
@@ -2863,6 +2915,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() {
@@ -3338,6 +3391,8 @@ ${goFields.join(`
         return null;
       const seen = new Set;
       for (const prop of el.properties) {
+        if (prop.kind === "spread")
+          return null;
         if (prop.shorthand)
           return null;
         const key = prop.key;
@@ -3641,6 +3696,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,");
@@ -3648,6 +3704,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) {
@@ -3673,7 +3730,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);
@@ -3752,6 +3810,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) {
@@ -4203,6 +4308,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);
@@ -4458,6 +4564,8 @@ ${goFields.join(`
       return null;
     const entries = [];
     for (const prop of parsed.properties) {
+      if (prop.kind === "spread")
+        return null;
       if (prop.shorthand)
         return null;
       const goVal = this.lowerProviderMapMemberValue(prop.value, propsParams);
@@ -4614,7 +4722,19 @@ ${goFields.join(`
     }
     const propTypeOverrides = buildPropTypeOverrides(this.emitCtx, ir);
     for (const signal of ir.metadata.signals) {
-      const match = this.extractPropFallback(signal.initialValue, this.resolvedSignalParsed(signal));
+      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))
@@ -4653,7 +4773,8 @@ ${goFields.join(`
         fieldName,
         goFallback: match.goFallback,
         zeroLiteral,
-        ...nullishLowered ? { assertType: concreteType } : {}
+        ...nullishLowered ? { assertType: concreteType } : {},
+        ...collisionWrap ? { collisionWrap } : {}
       });
     }
     return result;
@@ -4703,6 +4824,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") {
@@ -5191,7 +5332,16 @@ ${goFields.join(`
     });
     return `bf_arr ${parts.join(" ")}`;
   }
-  objectLiteral(_properties, raw, _emit) {
+  objectLiteral(properties, raw, emit) {
+    if (properties.length > 0) {
+      const wrap = (rendered) => rendered.includes(" ") ? `(${rendered})` : rendered;
+      const literalOf = (run) => `bf_map ${run.map((p) => `"${escapeGoString(p.key)}" ${wrap(emit(p.value))}`).join(" ")}`;
+      if (!properties.some((p) => p.kind === "spread")) {
+        return literalOf(properties);
+      }
+      const segments = groupObjectLiteralSegments(properties, literalOf, (e) => wrap(emit(e)));
+      return `bf_merge ${segments.join(" ")}`;
+    }
     this.state.errors.push({
       code: "BF101",
       severity: "error",
@@ -5914,7 +6064,7 @@ ${goFields.join(`
       return null;
     const carried = constInfo.parsed;
     if (carried?.kind === "object-literal") {
-      const hit = carried.properties.find((prop) => prop.key === key);
+      const hit = carried.properties.find((prop) => prop.kind === "prop" && prop.key === key);
       if (hit && hit.value.kind === "literal") {
         if (hit.value.literalType === "string")
           return JSON.stringify(hit.value.value);
@@ -6758,8 +6908,7 @@ var conformancePins = {
 };
 // src/render-divergences.ts
 var renderDivergences = {
-  "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)"
+  "signal-object-spread-init": "PRE-EXISTING, unrelated to the #2696 Step 2 spread work this fixture pins: a `derived`-classified signal/memo whose value is an OBJECT literal has no live-template-expression lowering on Go — unlike the other six template-stash backends (e.g. minijinja emits `{% set merged = dict(base, done=true) %}`), Go always bakes an object-typed signal/memo field into Go SOURCE at `NewXxxProps` constructor time (`convertInitialValue`/`parsedLiteralToGo`), and that baker is STATIC-only (identifier/call/member operands defer, `parsed-literal-to-go.ts`'s own docstring) — it cannot reference a live prop at all. Reproduced identically with the spread REMOVED (`createSignal({ id: base.id, done: true })`), confirming the gap predates and is independent of spread: the signal seeds `nil` and every field read (`.Merged.ID`/`.Merged.Done`) reads the Go zero value regardless of `initialTodos`. Graduate by teaching the baker to emit prop-referencing Go expressions (https://github.com/piconic-ai/barefootjs/issues/2700)."
 };
 export {
   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;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAA;AAExD,eAAO,MAAM,iBAAiB,EAAE,iBAwB/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,iBAG/B,CAAA"}