@barefootjs/go-template 0.31.0 → 0.31.2

package/dist/adapter/index.js

@@ -975,15 +975,43 @@ function collapseLiteralUnion(typeInfo) {
   }
   return { kind: "primitive", raw: typeInfo.raw, primitive: first };
 }
-function typeInfoToGo(ctx, _typeInfo, defaultValue) {
+function literalNumberValue(expr) {
+  if (expr.kind === "literal" && expr.literalType === "number" && typeof expr.value === "number") {
+    return expr.value;
+  }
+  if (expr.kind === "unary" && expr.op === "-" && expr.argument.kind === "literal" && expr.argument.literalType === "number" && typeof expr.argument.value === "number") {
+    return -expr.argument.value;
+  }
+  return null;
+}
+function inferGoTypeFromParsed(expr) {
+  const n = literalNumberValue(expr);
+  if (n !== null)
+    return Number.isInteger(n) ? "int" : "float64";
+  if (expr.kind === "literal") {
+    if (expr.literalType === "boolean")
+      return "bool";
+    if (expr.literalType === "string")
+      return "string";
+    return null;
+  }
+  if (expr.kind === "array-literal")
+    return "[]interface{}";
+  return null;
+}
+function typeInfoToGo(ctx, _typeInfo, defaultValue, preParsed) {
   const typeInfo = collapseLiteralUnion(_typeInfo);
   switch (typeInfo.kind) {
     case "primitive":
       switch (typeInfo.primitive) {
         case "string":
           return "string";
-        case "number":
+        case "number": {
+          const n = preParsed ? literalNumberValue(preParsed) : null;
+          if (n !== null)
+            return Number.isInteger(n) ? "int" : "float64";
           return defaultValue !== undefined ? numberPrimitiveGoType(defaultValue) : "int";
+        }
         case "boolean":
           return "bool";
         default:
@@ -1006,30 +1034,21 @@ function typeInfoToGo(ctx, _typeInfo, defaultValue) {
           return resolved;
       }
       return "interface{}";
-    case "unknown":
+    case "unknown": {
+      const inferred = preParsed ? inferGoTypeFromParsed(preParsed) : null;
+      if (inferred)
+        return inferred;
       if (defaultValue !== undefined) {
         return inferTypeFromValue(defaultValue);
       }
       return "interface{}";
+    }
     default:
       return "interface{}";
   }
 }
 function tsTypeStringToGo(ctx, tsType) {
   const t = tsType.trim();
-  if (t === "number")
-    return "int";
-  if (t === "string")
-    return "string";
-  if (t === "boolean" || t === "bool")
-    return "bool";
-  if (t.endsWith("[]")) {
-    const elem = t.slice(0, -2);
-    return `[]${tsTypeStringToGo(ctx, elem)}`;
-  }
-  const arrayMatch = t.match(/^Array<(.+)>$/);
-  if (arrayMatch)
-    return `[]${tsTypeStringToGo(ctx, arrayMatch[1])}`;
   if (ctx.state.localStructFields.has(t) || ctx.state.localTypeAliases.has(t))
     return t;
   return "interface{}";
@@ -1073,16 +1092,25 @@ function bakeInlineObjectAsGoMap(ctx, expr) {
   }
   return `map[string]interface{}{${entries.join(", ")}}`;
 }
-function parsedLiteralToGo(ctx, expr, typeInfo) {
+function numberLiteralRawGo(expr) {
   if (expr.kind === "unary" && expr.op === "-" && expr.argument.kind === "literal" && expr.argument.literalType === "number") {
     return expr.argument.raw !== undefined ? `-${expr.argument.raw}` : null;
   }
+  if (expr.kind === "literal" && expr.literalType === "number") {
+    return expr.raw ?? null;
+  }
+  return null;
+}
+function parsedLiteralToGo(ctx, expr, typeInfo) {
+  const numberGo = numberLiteralRawGo(expr);
+  if (numberGo !== null)
+    return numberGo;
   if (expr.kind === "literal") {
     switch (expr.literalType) {
       case "string":
         return JSON.stringify(expr.value);
       case "number":
-        return expr.raw ?? null;
+        return null;
       case "boolean":
         return expr.value ? "true" : "false";
       case "null":
@@ -1134,10 +1162,10 @@ function parsedLiteralToGo(ctx, expr, typeInfo) {
 
 // src/adapter/value/value-lowering.ts
 var EMPTY_PROP_FALLBACK_VARS = new Map;
-function nillableAwarePropRef(ctx, propName, expectedType) {
-  const fieldRef = `in.${capitalizeFieldName(propName)}`;
+function nillableAwarePropRef(ctx, param, expectedType) {
+  const fieldRef = `in.${capitalizeFieldName(param.sourceName ?? param.name)}`;
   const scalar = expectedType.kind === "primitive" ? expectedType : expectedType.kind === "union" && expectedType.unionTypes?.length === 2 ? expectedType.unionTypes.find((t) => t.primitive !== "undefined" && t.primitive !== "null") : undefined;
-  if (ctx.state.nillablePropNames.has(propName) && scalar?.kind === "primitive") {
+  if (ctx.state.nillablePropNames.has(param.name) && scalar?.kind === "primitive") {
     const goType = scalar.primitive === "boolean" ? "bool" : scalar.primitive === "number" ? "float64" : scalar.primitive === "string" ? "string" : null;
     if (goType) {
       const zero = goType === "bool" ? "false" : goType === "string" ? '""' : "0";
@@ -1148,21 +1176,29 @@ function nillableAwarePropRef(ctx, propName, expectedType) {
 }
 function convertInitialValue(ctx, value, _typeInfo, propsParams, preParsed) {
   const typeInfo = collapseLiteralUnion(_typeInfo);
-  const propRef = (propName2) => nillableAwarePropRef(ctx, propName2, typeInfo);
+  const propRef = (param2) => nillableAwarePropRef(ctx, param2, typeInfo);
   if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(value)) {
-    if (propsParams?.some((p) => p.name === value)) {
-      return propRef(value);
+    const param2 = propsParams?.find((p) => p.name === value);
+    if (param2) {
+      return propRef(param2);
     }
   }
   const propName = ctx.extractPropNameFromInitialValue(value, preParsed);
-  if (propName && propsParams?.some((p) => p.name === propName)) {
-    return propRef(propName);
+  const param = propName ? propsParams?.find((p) => p.name === propName) : undefined;
+  if (param) {
+    return propRef(param);
   }
   if (typeInfo.kind === "primitive") {
     if (typeInfo.primitive === "boolean") {
+      if (preParsed?.kind === "literal" && preParsed.literalType === "boolean" && typeof preParsed.value === "boolean") {
+        return preParsed.value ? "true" : "false";
+      }
       return value === "true" ? "true" : "false";
     }
     if (typeInfo.primitive === "number") {
+      const numGo = preParsed ? numberLiteralRawGo(preParsed) : null;
+      if (numGo !== null)
+        return numGo;
       if (/^-?\d+$/.test(value))
         return value;
       if (/^-?\d+\.\d+$/.test(value))
@@ -1170,7 +1206,10 @@ function convertInitialValue(ctx, value, _typeInfo, propsParams, preParsed) {
       return "0";
     }
     if (typeInfo.primitive === "string") {
-      if (value.startsWith("'") || value.endsWith("'")) {
+      if (preParsed?.kind === "literal" && preParsed.literalType === "string" && typeof preParsed.value === "string") {
+        return JSON.stringify(preParsed.value);
+      }
+      if (value.startsWith("'") && value.endsWith("'")) {
         return value.replace(/'/g, '"');
       }
       if (value.startsWith('"') && value.endsWith('"')) {
@@ -1232,19 +1271,21 @@ function objectLiteralToGoMap(ctx, expr) {
   return `map[string]interface{}{${entries.join(", ")}}`;
 }
 function getSignalInitialValueAsGo(ctx, initialValue, propsParams, propFallbackVars = EMPTY_PROP_FALLBACK_VARS, signalType) {
-  const propRef = (propName2) => signalType ? nillableAwarePropRef(ctx, propName2, signalType) : `in.${capitalizeFieldName(propName2)}`;
-  if (propsParams.some((p) => p.name === initialValue)) {
+  const propRef = (param2) => signalType ? nillableAwarePropRef(ctx, param2, signalType) : `in.${capitalizeFieldName(param2.sourceName ?? param2.name)}`;
+  const directParam = propsParams.find((p) => p.name === initialValue);
+  if (directParam) {
     const hoisted = propFallbackVars.get(initialValue);
     if (hoisted)
       return hoisted.varName;
-    return propRef(initialValue);
+    return propRef(directParam);
   }
   const propName = ctx.extractPropNameFromInitialValue(initialValue);
-  if (propName && propsParams.some((p) => p.name === propName)) {
+  const param = propName ? propsParams.find((p) => p.name === propName) : undefined;
+  if (param) {
     const hoisted = propFallbackVars.get(propName);
     if (hoisted)
       return hoisted.varName;
-    return propRef(propName);
+    return propRef(param);
   }
   if (/^-?\d+$/.test(initialValue)) {
     return initialValue;
@@ -1278,8 +1319,9 @@ function resolveMapJoinBaseAsGo(ctx, object, signals, propsParams) {
     }
   }
   const propName = object.kind === "member" && !object.computed && object.object.kind === "identifier" && object.object.name === "props" ? object.property : object.kind === "identifier" ? object.name : null;
-  if (propName && propsParams.some((p) => p.name === propName)) {
-    return `in.${capitalizeFieldName(propName)}`;
+  const param = propName ? propsParams.find((p) => p.name === propName) : undefined;
+  if (param) {
+    return `in.${capitalizeFieldName(param.sourceName ?? param.name)}`;
   }
   if (object.kind === "array-literal") {
     if (object.elements.length === 0)
@@ -1310,11 +1352,12 @@ function mapJoinChainToGo(ctx, chain, signals, propsParams, propFallbackVars) {
   for (const name of freeVars) {
     const sig = signals.find((s) => s.getter === name);
     let goExpr = null;
+    const freeVarParam = propsParams.find((p) => p.name === name);
     if (sig) {
       goExpr = getSignalInitialValueAsGo(ctx, sig.initialValue, propsParams, propFallbackVars, sig.type);
-    } else if (propsParams.some((p) => p.name === name)) {
+    } else if (freeVarParam) {
       const hoisted = propFallbackVars.get(name);
-      goExpr = hoisted ? hoisted.varName : `in.${capitalizeFieldName(name)}`;
+      goExpr = hoisted ? hoisted.varName : `in.${capitalizeFieldName(freeVarParam.sourceName ?? name)}`;
     }
     if (goExpr === null)
       return null;
@@ -1357,14 +1400,14 @@ function isBooleanMemo(ctx, memo, signals, propsParamMap) {
         return true;
       if (/\?\?\s*(true|false)\b/.test(sig.initialValue))
         return true;
-      const propName = ctx.extractPropNameFromInitialValue(sig.initialValue) ?? sig.initialValue;
+      const propName = ctx.extractPropNameFromInitialValue(sig.initialValue, sig.parsed) ?? sig.initialValue;
       const prop2 = propsParamMap.get(propName);
-      if (prop2 && typeInfoToGo(ctx, prop2.type, prop2.defaultValue) === "bool")
+      if (prop2 && typeInfoToGo(ctx, prop2.type, prop2.defaultValue, prop2.parsed) === "bool")
         return true;
       return false;
     }
     const prop = propsParamMap.get(name);
-    return !!prop && typeInfoToGo(ctx, prop.type, prop.defaultValue) === "bool";
+    return !!prop && typeInfoToGo(ctx, prop.type, prop.defaultValue, prop.parsed) === "bool";
   };
   const ternary = c.match(/=>\s*\w+\(\)\s*\?\s*(\w+)\(\)\s*:\s*(\w+)\(\)/);
   if (ternary) {
@@ -1866,7 +1909,8 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
     const hoisted = propFallbackVars.get(propName);
     if (hoisted)
       return hoisted.varName;
-    return `in.${capitalizeFieldName(propName)}`;
+    const param = propsParams.find((p) => p.name === propName);
+    return `in.${capitalizeFieldName(param?.sourceName ?? propName)}`;
   };
   const envGetKey = (e) => {
     if (e.kind !== "call" || e.callee.kind !== "member" || e.callee.computed)
@@ -1958,7 +2002,7 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
       const param = propsParams.find((p) => p.name === propName);
       if (param && ctx.state.nillablePropNames.has(propName)) {
         const isNe = body.op === "!==" || body.op === "!=";
-        return `in.${capitalizeFieldName(propName)} ${isNe ? "!=" : "=="} nil`;
+        return `in.${capitalizeFieldName(param.sourceName ?? propName)} ${isNe ? "!=" : "=="} nil`;
       }
     }
   }
@@ -2030,7 +2074,7 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
           return `${hoisted.varName} ${operator} ${operand}`;
         const fieldName = capitalizeFieldName(propName);
         if (param.type) {
-          const goType = typeInfoToGo(ctx, param.type, param.defaultValue);
+          const goType = typeInfoToGo(ctx, param.type, param.defaultValue, param.parsed);
           if (goType === "interface{}")
             return `in.${fieldName}.(int) ${operator} ${operand}`;
         }
@@ -2041,9 +2085,9 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
       const varName = body.left.name;
       const param = propsParams.find((p) => p.name === varName);
       if (param) {
-        const fieldName = capitalizeFieldName(varName);
+        const fieldName = capitalizeFieldName(param.sourceName ?? varName);
         if (param.type) {
-          const goType = typeInfoToGo(ctx, param.type, param.defaultValue);
+          const goType = typeInfoToGo(ctx, param.type, param.defaultValue, param.parsed);
           if (goType === "interface{}")
             return `in.${fieldName}.(int) ${operator} ${operand}`;
         }
@@ -2067,7 +2111,7 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
   if (body.kind === "identifier") {
     const param = propsParams.find((p) => p.name === body.name);
     if (param)
-      return `in.${capitalizeFieldName(body.name)}`;
+      return `in.${capitalizeFieldName(param.sourceName ?? body.name)}`;
   }
   if (body.kind === "binary" && body.op === "+") {
     const concatGo = resolveStringConcatChainGo(ctx, body, signals, propsParams, propFallbackVars, propRef);
@@ -2129,7 +2173,8 @@ function resolveGetterValueAsGo(ctx, name, signals, propsParams, propFallbackVar
     const stripped = memo.computation.replace(/^\(\)\s*=>\s*/, "");
     const fb = ctx.extractPropFallback(stripped);
     if (fb && capitalizeFieldName(fb.propName) === capitalizeFieldName(memo.name)) {
-      const field = `in.${capitalizeFieldName(fb.propName)}`;
+      const fbParam = propsParams.find((p) => p.name === fb.propName);
+      const field = `in.${capitalizeFieldName(fbParam?.sourceName ?? fb.propName)}`;
       return `func() interface{} { v := interface{}(${field}); if v == nil || v == "" { return ${fb.goFallback} }; return v }()`;
     }
     return computeMemoInitialValueOrNull(ctx, memo, signals, propsParams, propFallbackVars, new Set([...resolving, memo.name]));
@@ -2137,7 +2182,7 @@ function resolveGetterValueAsGo(ctx, name, signals, propsParams, propFallbackVar
   const param = propsParams.find((p) => p.name === name);
   if (param) {
     const hoisted = propFallbackVars.get(name);
-    return hoisted ? hoisted.varName : `in.${capitalizeFieldName(name)}`;
+    return hoisted ? hoisted.varName : `in.${capitalizeFieldName(param.sourceName ?? name)}`;
   }
   return null;
 }
@@ -2398,10 +2443,10 @@ function buildSpreadInitializer(ctx, spreadExpr, ir, parsed) {
   if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(trimmed)) {
     const param = ir.metadata.propsParams.find((p) => p.name === trimmed);
     if (param) {
-      return `in.${capitalizeFieldName(param.name)}`;
+      return `in.${capitalizeFieldName(param.sourceName ?? param.name)}`;
     }
     if (ir.metadata.propsObjectName === trimmed) {
-      const entries = ir.metadata.propsParams.map((p) => `${JSON.stringify(p.name)}: in.${capitalizeFieldName(p.name)}`);
+      const entries = ir.metadata.propsParams.map((p) => `${JSON.stringify(p.sourceName ?? p.name)}: in.${capitalizeFieldName(p.sourceName ?? p.name)}`);
       return `map[string]any{${entries.join(", ")}}`;
     }
     if (ir.metadata.restPropsName === trimmed) {
@@ -2455,7 +2500,7 @@ function conditionToGoBool(condition, ir) {
   const param = ir.metadata.propsParams.find((p) => p.name === node.name);
   if (!param)
     return null;
-  const field = `in.${capitalizeFieldName(param.name)}`;
+  const field = `in.${capitalizeFieldName(param.sourceName ?? param.name)}`;
   const prim = param.type.kind === "primitive" ? param.type.primitive : undefined;
   let truthy;
   if (prim === "boolean") {
@@ -2493,7 +2538,7 @@ function objectLiteralToGoSpreadMap(ctx, obj, ir) {
       const param = ir.metadata.propsParams.find((p) => p.name === val.name);
       if (!param)
         return null;
-      goVal = `in.${capitalizeFieldName(param.name)}`;
+      goVal = `in.${capitalizeFieldName(param.sourceName ?? param.name)}`;
     } else {
       const indexed = recordIndexAccessToGoMap(ctx, val, ir);
       if (indexed === null)
@@ -2517,7 +2562,8 @@ function recordIndexAccessToGoMap(ctx, val, ir) {
     return `${JSON.stringify(e.key)}: ${mapVal}`;
   });
   ctx.state.usesFmt = true;
-  const field = `in.${capitalizeFieldName(parsed.indexPropName)}`;
+  const indexParam = ir.metadata.propsParams.find((p) => p.name === parsed.indexPropName);
+  const field = `in.${capitalizeFieldName(indexParam?.sourceName ?? parsed.indexPropName)}`;
   return `map[string]any{${entries.join(", ")}}[fmt.Sprint(${field})]`;
 }
 
@@ -2534,9 +2580,9 @@ function buildPropTypeOverrides(ctx, ir) {
       const param = ir.metadata.propsParams.find((p) => p.name === propName);
       if (!param)
         continue;
-      const propGoType = typeInfoToGo(ctx, param.type, param.defaultValue);
+      const propGoType = typeInfoToGo(ctx, param.type, param.defaultValue, param.parsed);
       if (propGoType.includes("interface{}")) {
-        const signalGoType = typeInfoToGo(ctx, signal.type, signal.initialValue);
+        const signalGoType = typeInfoToGo(ctx, signal.type, signal.initialValue, signal.parsed);
         if (!signalGoType.includes("interface{}")) {
           overrides.set(propName, signalGoType);
         }
@@ -2547,7 +2593,7 @@ function buildPropTypeOverrides(ctx, ir) {
     const param = ir.metadata.propsParams.find((p) => p.name === propName);
     if (!param)
       continue;
-    const resolved = overrides.get(propName) ?? typeInfoToGo(ctx, param.type, param.defaultValue);
+    const resolved = overrides.get(propName) ?? typeInfoToGo(ctx, param.type, param.defaultValue, param.parsed);
     if (resolved === "int") {
       overrides.set(propName, "float64");
     }
@@ -2717,7 +2763,7 @@ function collectPresenceCheckedPropNames(ctx, ir) {
   return names;
 }
 function resolvePropGoType(ctx, param, propTypeOverrides) {
-  const base = propTypeOverrides.get(param.name) ?? typeInfoToGo(ctx, param.type, param.defaultValue);
+  const base = propTypeOverrides.get(param.name) ?? typeInfoToGo(ctx, param.type, param.defaultValue, param.parsed);
   if (param.optional && ctx.state.localStructFields.has(base)) {
     return "map[string]interface{}";
   }
@@ -3105,6 +3151,18 @@ ${scriptRegistrations}${templateBody}
   nonCollidingContextConsumers(taken) {
     return this.state.contextConsumers.filter((c) => !taken.has(this.contextFieldName(c)));
   }
+  isNestedArrayShadowed(param, nestedArrayFields) {
+    return nestedArrayFields.has(capitalizeFieldName(param.name)) || nestedArrayFields.has(capitalizeFieldName(param.sourceName ?? param.name));
+  }
+  propParamFieldNamesUnion(params) {
+    return params.flatMap((p) => [capitalizeFieldName(p.name), capitalizeFieldName(p.sourceName ?? p.name)]);
+  }
+  claimJsonTag(desired, taken) {
+    if (taken.has(desired))
+      return "-";
+    taken.add(desired);
+    return desired;
+  }
   generateTypes(ir) {
     this.state.usesHtmlTemplate = false;
     this.state.usesFmt = false;
@@ -3135,13 +3193,16 @@ ${scriptRegistrations}${templateBody}
     if (!this.childDerivedFieldDeps.has(componentName))
       return;
     const nestedArrayFields = new Set(nestedComponents.map((n) => `${n.name}s`));
-    const params = (ir.metadata.propsParams ?? []).filter((p) => !nestedArrayFields.has(capitalizeFieldName(p.name)));
-    const takenInput = new Set((ir.metadata.propsParams ?? []).map((p) => capitalizeFieldName(p.name)));
+    const params = (ir.metadata.propsParams ?? []).filter((p) => !this.isNestedArrayShadowed(p, nestedArrayFields));
+    const takenInput = new Set(this.propParamFieldNamesUnion(ir.metadata.propsParams ?? []));
     const eligible = nestedComponents.every((n) => n.isDynamic && !n.isPropDerived) && spreadSlots.length === 0 && !ir.metadata.restPropsName && this.nonCollidingContextConsumers(takenInput).length === 0;
     if (!eligible)
       return;
     this.childRepropsReady.set(componentName, {
-      params: params.map((p) => capitalizeFieldName(p.name)),
+      params: params.map((p) => ({
+        propsField: capitalizeFieldName(p.name),
+        inputField: capitalizeFieldName(p.sourceName ?? p.name)
+      })),
       usesSearchParams: this.usesSearchParams(ir)
     });
   }
@@ -3177,17 +3238,17 @@ ${scriptRegistrations}${templateBody}
     lines.push("\t\t\tBfMount: b.BfMount,");
     if (usesSearchParams)
       lines.push("\t\t\tSearchParams: b.SearchParams,");
-    for (const field of params) {
-      lines.push(`			${field}: b.${field},`);
+    for (const { propsField, inputField } of params) {
+      lines.push(`			${inputField}: b.${propsField},`);
     }
     lines.push("\t\t}");
     lines.push("\t\tfor i := 0; i < len(kv); i += 2 {");
     lines.push("\t\t\tname, _ := kv[i].(string)");
     lines.push("\t\t\tvar err error");
     lines.push("\t\t\tswitch name {");
-    for (const field of params) {
-      lines.push(`			case ${JSON.stringify(field)}:`);
-      lines.push(`				err = bf.RepropsAssign(${q}, ${JSON.stringify(field)}, &in.${field}, kv[i+1])`);
+    for (const { propsField, inputField } of params) {
+      lines.push(`			case ${JSON.stringify(propsField)}:`);
+      lines.push(`				err = bf.RepropsAssign(${q}, ${JSON.stringify(propsField)}, &in.${inputField}, kv[i+1])`);
     }
     lines.push("\t\t\tdefault:");
     lines.push(`				err = bf.RepropsUnknownFieldError(${q}, name)`);
@@ -3325,6 +3386,7 @@ ${goFields.join(`
       return false;
     const taken = new Set([
       ...ir.metadata.propsParams.map((p) => capitalizeFieldName(p.name)),
+      ...ir.metadata.propsParams.map((p) => capitalizeFieldName(p.sourceName ?? p.name)),
       ...ir.metadata.signals.filter((s) => !s.envReader).map((s) => capitalizeFieldName(s.getter)),
       ...ir.metadata.memos.map((m) => capitalizeFieldName(m.name)),
       ...this.state.contextConsumers.map((c) => this.contextFieldName(c))
@@ -3347,8 +3409,8 @@ ${goFields.join(`
     const inputNested = nestedComponents.filter((n) => !n.isDynamic || n.isPropDerived);
     const nestedArrayFields = new Set(nestedComponents.map((n) => `${n.name}s`));
     for (const param of ir.metadata.propsParams) {
-      const fieldName = capitalizeFieldName(param.name);
-      if (nestedArrayFields.has(fieldName))
+      const fieldName = capitalizeFieldName(param.sourceName ?? param.name);
+      if (this.isNestedArrayShadowed(param, nestedArrayFields))
         continue;
       const goType = resolvePropGoType(this.emitCtx, param, propTypeOverrides);
       lines.push(`	${fieldName} ${goType}`);
@@ -3358,7 +3420,7 @@ ${goFields.join(`
         continue;
       lines.push(`	${nested.name}s []${nested.name}Input`);
     }
-    const takenInput = new Set(ir.metadata.propsParams.map((p) => capitalizeFieldName(p.name)));
+    const takenInput = new Set(this.propParamFieldNamesUnion(ir.metadata.propsParams));
     for (const c of this.nonCollidingContextConsumers(takenInput)) {
       lines.push(`	${this.contextFieldName(c)} ${this.contextConsumerGoType(c)}`);
     }
@@ -3382,8 +3444,9 @@ ${goFields.join(`
   generatePropsStruct(lines, ir, componentName, nestedComponents, propTypeOverrides, spreadSlots) {
     const propsTypeName = `${componentName}Props`;
     this.emitPropsStructHeader(lines, ir, propsTypeName, componentName);
-    this.emitPropsDataFields(lines, ir, nestedComponents, propTypeOverrides);
-    this.emitPropsAuxFields(lines, ir, componentName, nestedComponents, spreadSlots);
+    const takenJsonTags = new Set;
+    this.emitPropsDataFields(lines, ir, nestedComponents, propTypeOverrides, takenJsonTags);
+    this.emitPropsAuxFields(lines, ir, componentName, nestedComponents, spreadSlots, takenJsonTags);
     lines.push("}");
     lines.push("");
   }
@@ -3420,7 +3483,7 @@ ${goFields.join(`
   resolveLoopDatumFields(itemType) {
     if (!itemType)
       return [];
-    const typeName = itemType.raw?.replace(/\[\]$/, "") ?? itemType.raw;
+    const typeName = itemType.kind === "array" ? itemType.elementType?.raw ?? itemType.raw : itemType.raw;
     if (!typeName)
       return [];
     for (const td of this.state.currentTypeDefinitions) {
@@ -3583,7 +3646,8 @@ ${goFields.join(`
     const propFieldNames = new Set;
     for (const param of ir.metadata.propsParams) {
       const fieldName = capitalizeFieldName(param.name);
-      if (nestedArrayFields.has(fieldName))
+      const inputField = capitalizeFieldName(param.sourceName ?? param.name);
+      if (this.isNestedArrayShadowed(param, nestedArrayFields))
         continue;
       const hoisted = propFallbackVars.get(param.name);
       if (hoisted) {
@@ -3592,13 +3656,13 @@ ${goFields.join(`
         const paramDefault = goPropDefault(param.defaultValue);
         const memoFold = memoFallbacks.get(fieldName);
         if (paramDefault !== null) {
-          lines.push(`		${fieldName}: ${applyGoFallback(`in.${fieldName}`, paramDefault)},`);
+          lines.push(`		${fieldName}: ${applyGoFallback(`in.${inputField}`, paramDefault)},`);
         } else if (memoFold !== undefined && memoFold.goType === "string") {
-          lines.push(`		${fieldName}: ${applyGoFallback(`in.${fieldName}`, memoFold.goFallback)},`);
+          lines.push(`		${fieldName}: ${applyGoFallback(`in.${inputField}`, memoFold.goFallback)},`);
         } else if (memoFold !== undefined) {
-          lines.push(`		${fieldName}: func() interface{} { v := interface{}(in.${fieldName}); if v == nil || v == "" { return ${memoFold.goFallback} }; return v }(),`);
+          lines.push(`		${fieldName}: func() interface{} { v := interface{}(in.${inputField}); if v == nil || v == "" { return ${memoFold.goFallback} }; return v }(),`);
         } else {
-          lines.push(`		${fieldName}: in.${fieldName},`);
+          lines.push(`		${fieldName}: in.${inputField},`);
         }
       }
       propFieldNames.add(fieldName);
@@ -3651,7 +3715,7 @@ ${goFields.join(`
       lines.push(`		${f.name}: ${f.init},`);
     }
     const takenInit = new Set([
-      ...ir.metadata.propsParams.map((p) => capitalizeFieldName(p.name)),
+      ...this.propParamFieldNamesUnion(ir.metadata.propsParams),
       ...ir.metadata.signals.map((s) => capitalizeFieldName(s.getter)),
       ...ir.metadata.memos.map((m) => capitalizeFieldName(m.name))
     ]);
@@ -3690,7 +3754,7 @@ ${goFields.join(`
         }
         if (jsxName.includes("-"))
           return;
-        const fieldName = this.childPropFieldNames.get(child.name)?.get(jsxName) ?? capitalizeFieldName(jsxName);
+        const fieldName = capitalizeFieldName(jsxName);
         lines.push(`			${fieldName}: ${goValue},`);
       };
       for (const prop of child.props) {
@@ -4059,15 +4123,15 @@ ${goFields.join(`
       lines.push('\tSearchParams bf.SearchParams `json:"-"`');
     }
   }
-  emitPropsDataFields(lines, ir, nestedComponents, propTypeOverrides) {
+  emitPropsDataFields(lines, ir, nestedComponents, propTypeOverrides, takenJsonTags) {
     const nestedArrayFields = new Set(nestedComponents.map((n) => `${n.name}s`));
     const propFieldNames = new Set;
     for (const param of ir.metadata.propsParams) {
       const fieldName = capitalizeFieldName(param.name);
-      if (nestedArrayFields.has(fieldName))
+      if (this.isNestedArrayShadowed(param, nestedArrayFields))
         continue;
       const goType = resolvePropGoType(this.emitCtx, param, propTypeOverrides);
-      const jsonTag = param.name === "children" ? "-" : this.toJsonTag(param.name);
+      const jsonTag = param.name === "children" ? "-" : this.claimJsonTag(this.toJsonTag(param.sourceName ?? param.name), takenJsonTags);
       lines.push(`	${fieldName} ${goType} \`json:"${jsonTag}"\``);
       propFieldNames.add(fieldName);
     }
@@ -4078,7 +4142,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(signal.getter);
       if (propFieldNames.has(fieldName))
         continue;
-      const jsonTag = this.toJsonTag(signal.getter);
+      const jsonTag = this.claimJsonTag(this.toJsonTag(signal.getter), takenJsonTags);
       const synthType = this.state.synthStructTypes.get(signal.getter);
       if (synthType) {
         lines.push(`	${fieldName} ${typeInfoToGo(this.emitCtx, synthType)} \`json:"${jsonTag}"\``);
@@ -4087,13 +4151,13 @@ ${goFields.join(`
       let goType;
       let referencedProp = propsParamMap.get(signal.initialValue);
       if (!referencedProp) {
-        const propName = this.extractPropNameFromInitialValue(signal.initialValue);
+        const propName = this.extractPropNameFromInitialValue(signal.initialValue, signal.parsed);
         if (propName)
           referencedProp = propsParamMap.get(propName);
       }
       if (referencedProp) {
-        const propGoType = typeInfoToGo(this.emitCtx, referencedProp.type, referencedProp.defaultValue);
-        const signalGoType = typeInfoToGo(this.emitCtx, signal.type, signal.initialValue);
+        const propGoType = typeInfoToGo(this.emitCtx, referencedProp.type, referencedProp.defaultValue, referencedProp.parsed);
+        const signalGoType = typeInfoToGo(this.emitCtx, signal.type, signal.initialValue, signal.parsed);
         if (propGoType.includes("interface{}")) {
           goType = signalGoType;
         } else if (!signalGoType.includes("interface{}") && signalGoType !== propGoType) {
@@ -4102,7 +4166,7 @@ ${goFields.join(`
           goType = propGoType;
         }
       } else {
-        goType = typeInfoToGo(this.emitCtx, signal.type, signal.initialValue);
+        goType = typeInfoToGo(this.emitCtx, signal.type, signal.initialValue, signal.parsed);
       }
       lines.push(`	${fieldName} ${goType} \`json:"${jsonTag}"\``);
     }
@@ -4110,12 +4174,12 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(memo.name);
       if (propFieldNames.has(fieldName))
         continue;
-      const jsonTag = this.toJsonTag(memo.name);
+      const jsonTag = this.claimJsonTag(this.toJsonTag(memo.name), takenJsonTags);
       const goType = this.inferMemoType(memo, ir.metadata.signals, propsParamMap);
       lines.push(`	${fieldName} ${goType} \`json:"${jsonTag}"\``);
     }
   }
-  emitPropsAuxFields(lines, ir, componentName, nestedComponents, spreadSlots) {
+  emitPropsAuxFields(lines, ir, componentName, nestedComponents, spreadSlots, takenJsonTags) {
     const takenForDerivedConsts = new Set([
       ...ir.metadata.propsParams.map((p) => capitalizeFieldName(p.name)),
       ...ir.metadata.signals.map((s) => capitalizeFieldName(s.getter)),
@@ -4125,12 +4189,12 @@ ${goFields.join(`
       lines.push(`	${f.name} string \`json:"-"\``);
     }
     const takenProps = new Set([
-      ...ir.metadata.propsParams.map((p) => capitalizeFieldName(p.name)),
+      ...this.propParamFieldNamesUnion(ir.metadata.propsParams),
       ...ir.metadata.signals.map((s) => capitalizeFieldName(s.getter)),
       ...ir.metadata.memos.map((m) => capitalizeFieldName(m.name))
     ]);
     for (const c of this.nonCollidingContextConsumers(takenProps)) {
-      const jsonTag = this.toJsonTag(c.localName);
+      const jsonTag = this.claimJsonTag(this.toJsonTag(c.localName), takenJsonTags);
       lines.push(`	${this.contextFieldName(c)} ${this.contextConsumerGoType(c)} \`json:"${jsonTag}"\``);
     }
     for (const nested of nestedComponents) {
@@ -4138,7 +4202,7 @@ ${goFields.join(`
       if (nested.isDynamic && !nested.isPropDerived) {
         lines.push(`	${nested.name}s []${elemType} \`json:"-"\``);
       } else {
-        const jsonTag = this.toJsonTag(`${nested.name.charAt(0).toLowerCase()}${nested.name.slice(1)}s`);
+        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}"\``);
       }
     }
@@ -4147,7 +4211,7 @@ ${goFields.join(`
       lines.push(`	${child.fieldName} ${child.name}Props \`json:"-"\``);
     }
     for (const slot of spreadSlots) {
-      const jsonTag = this.toJsonTag(slot.slotId);
+      const jsonTag = this.claimJsonTag(this.toJsonTag(slot.slotId), takenJsonTags);
       lines.push(`	${slot.slotId} map[string]any \`json:"${jsonTag}"\``);
     }
   }
@@ -4323,8 +4387,9 @@ ${goFields.join(`
       return literal;
     if (node.kind === "logical" && node.op === "??" && node.right.kind === "object-literal" && node.right.properties.length === 0 && node.left.kind === "member" && !node.left.computed && node.left.object.kind === "identifier" && node.left.object.name === this.state.propsObjectName) {
       const propName = node.left.property;
-      if (propsParams.some((param) => param.name === propName)) {
-        const fieldRef = `in.${capitalizeFieldName(propName)}`;
+      const matchedParam = propsParams.find((param) => param.name === propName);
+      if (matchedParam) {
+        const fieldRef = `in.${capitalizeFieldName(matchedParam.sourceName ?? matchedParam.name)}`;
         return `func() map[string]interface{} { ` + `if m := bf.AsMap(${fieldRef}); m != nil { return m }; ` + `return map[string]interface{}{} }()`;
       }
     }
@@ -4342,7 +4407,7 @@ ${goFields.join(`
         const param = propsParams.find((p) => p.name === keyExpr);
         if (!param)
           return null;
-        const fieldName = capitalizeFieldName(keyExpr);
+        const fieldName = capitalizeFieldName(param.sourceName ?? keyExpr);
         const caseEntries = Object.entries(part.cases);
         if (caseEntries.length === 0) {
           segments.push('""');
@@ -4405,8 +4470,9 @@ ${goFields.join(`
     const localConst = this.state.localConstants.find((c) => c.name === passthroughName);
     const isPropsDestructureAlias = localConst !== undefined && propsObjectName !== null && localConst.value === `${propsObjectName}.${passthroughName}`;
     const shadowedByLocal = passthroughName !== null && (localConst !== undefined && !isPropsDestructureAlias || this.state.localHelperNames.has(passthroughName));
-    if (passthroughName && !shadowedByLocal && propsParams.some((p) => p.name === passthroughName)) {
-      return `in.${capitalizeFieldName(passthroughName)}`;
+    const passthroughParam = passthroughName && !shadowedByLocal ? propsParams.find((p) => p.name === passthroughName) : undefined;
+    if (passthroughParam) {
+      return `in.${capitalizeFieldName(passthroughParam.sourceName ?? passthroughParam.name)}`;
     }
     return null;
   }
@@ -4421,17 +4487,17 @@ ${goFields.join(`
         if (signal) {
           let referencedProp = propsParamMap.get(signal.initialValue);
           if (!referencedProp) {
-            const propName = this.extractPropNameFromInitialValue(signal.initialValue);
+            const propName = this.extractPropNameFromInitialValue(signal.initialValue, signal.parsed);
             if (propName)
               referencedProp = propsParamMap.get(propName);
           }
           if (referencedProp) {
-            const propType = typeInfoToGo(this.emitCtx, referencedProp.type, referencedProp.defaultValue);
+            const propType = typeInfoToGo(this.emitCtx, referencedProp.type, referencedProp.defaultValue, referencedProp.parsed);
             if (propType === "int" || propType === "float64") {
               return "int";
             }
           }
-          const signalType = typeInfoToGo(this.emitCtx, signal.type, signal.initialValue);
+          const signalType = typeInfoToGo(this.emitCtx, signal.type, signal.initialValue, signal.parsed);
           if (signalType === "int" || signalType === "float64") {
             return "int";
           }
@@ -4468,8 +4534,8 @@ ${goFields.join(`
         continue;
       if (goPropDefault(param.defaultValue) !== null)
         continue;
-      const fieldName = capitalizeFieldName(match.propName);
-      const concreteType = propTypeOverrides.get(param.name) ?? typeInfoToGo(this.emitCtx, param.type, param.defaultValue);
+      const fieldName = capitalizeFieldName(param.sourceName ?? match.propName);
+      const concreteType = propTypeOverrides.get(param.name) ?? typeInfoToGo(this.emitCtx, param.type, param.defaultValue, param.parsed);
       const nullishLowered = NULLISH_SCALAR_GO_TYPES.has(concreteType) && resolvePropGoType(this.emitCtx, param, propTypeOverrides) === "interface{}";
       let zeroLiteral;
       if (match.goFallback === "true" || match.goFallback === "false") {