gofront 1.7.0 → 1.8.0

package/src/typechecker/resolve.js

@@ -2,11 +2,14 @@
 // Installed as a mixin on TypeChecker.prototype.
 
 import { parseJsonTag } from "../parser/struct-tag.js";
+import { foldConstExpr } from "./const-fold.js";
+import { EXCLUDED_STDLIB_MEMBERS } from "./stdlib/excluded.js";
 import {
 	ANY,
 	BASIC_TYPES,
 	COMPARABLE,
 	defaultType,
+	displayTypeName,
 	isAny,
 	isTypedArraySlice,
 	Scope,
@@ -20,6 +23,73 @@ import {
 /** @typedef {import('./index.js').TypeChecker} TypeChecker */
 
 // Dispatch table for substituteType — keyed by type.kind.
+// Nesting depth of in-progress instances of one generic type before the
+// instantiation is reported as a cycle.
+const MAX_INSTANTIATION_DEPTH = 32;
+
+// Two imported packages may both declare `Pt`, so the cache key of an
+// instance tells declarations apart by identity instead of by display name.
+const declIds = new WeakMap();
+let nextDeclId = 0;
+function declId(t) {
+	if (!declIds.has(t)) declIds.set(t, ++nextDeclId);
+	return declIds.get(t);
+}
+
+// Go infers T from the "largest" untyped constant kind (int < rune < float <
+// complex), and a typed argument beats any untyped one.
+const UNTYPED_RANK = { int: 0, int32: 1, float64: 2, complex128: 3 };
+function untypedWins(prev, next) {
+	if (prev.kind !== "untyped") return false;
+	if (next.kind !== "untyped") return true;
+	return (UNTYPED_RANK[next.base] ?? 0) > (UNTYPED_RANK[prev.base] ?? 0);
+}
+
+// Node count of a type, so a request that keeps growing can be told from one
+// that merely repeats.
+function typeSize(t) {
+	switch (t?.kind) {
+		case "named":
+			return 1 + (t.typeArgs ?? []).reduce((n, a) => n + typeSize(a), 0);
+		case "pointer":
+			return 1 + typeSize(t.base);
+		case "slice":
+		case "array":
+			return 1 + typeSize(t.elem);
+		case "map":
+			return 1 + typeSize(t.key) + typeSize(t.value);
+		case "func":
+			return (
+				1 +
+				[...(t.params ?? []), ...(t.returns ?? [])].reduce(
+					(n, a) => n + typeSize(a),
+					0,
+				)
+			);
+		default:
+			return 1;
+	}
+}
+
+function instanceKey(t) {
+	switch (t?.kind) {
+		case "named":
+			return t.typeArgs?.length
+				? `${typeStr(t)}`
+				: `${typeStr(t)}#${declId(t)}`;
+		case "pointer":
+			return `*${instanceKey(t.base)}`;
+		case "slice":
+			return `[]${instanceKey(t.elem)}`;
+		case "array":
+			return `[${t.size ?? "..."}]${instanceKey(t.elem)}`;
+		case "map":
+			return `map[${instanceKey(t.key)}]${instanceKey(t.value)}`;
+		default:
+			return typeStr(t);
+	}
+}
+
 const SUBSTITUTE_DISPATCH = {
 	basic: (_s, type) => type,
 	untyped: (_s, type) => type,
@@ -63,6 +133,7 @@ const SUBSTITUTE_DISPATCH = {
 			fields,
 			methods,
 			_embeds: type._embeds,
+			_structFields: type._structFields,
 		};
 	},
 	interface: (s, type, map) => {
@@ -70,11 +141,24 @@ const SUBSTITUTE_DISPATCH = {
 		for (const [k, v] of type.methods) methods.set(k, s.substituteType(v, map));
 		return { kind: "interface", name: type.name, methods };
 	},
-	named: (s, type, map) => ({
-		kind: "named",
-		name: type.name,
-		underlying: s.substituteType(type.underlying, map),
-	}),
+	named: (s, type, map) => {
+		// An instance of a generic type: re-instantiate with the substituted
+		// arguments (through the instance cache) rather than copying its
+		// possibly cyclic underlying type.
+		if (type._genericOf)
+			return s.instantiateGenericWithArgs(
+				type._genericOf,
+				type.typeArgs.map((t) => s.substituteType(t, map)),
+			);
+		return {
+			kind: "named",
+			name: type.name,
+			...(type.typeArgs && {
+				typeArgs: type.typeArgs.map((t) => s.substituteType(t, map)),
+			}),
+			underlying: s.substituteType(type.underlying, map),
+		};
+	},
 };
 
 /** @type {ThisType<TypeChecker>} */
@@ -88,40 +172,27 @@ export const resolveMethods = {
 				if (scope) {
 					const fromScope = scope.lookup(node.name);
 					if (fromScope?.kind === "typeParam") return fromScope;
+					if (fromScope?.kind === "aliasArg") return fromScope.type;
 				}
 				const named = this.types.get(node.name);
 				if (named) {
-					// `pkg.T` in a type position counts as using the import.
-					const dot = node.name.indexOf(".");
-					if (dot > 0) this.globals.lookup(node.name.slice(0, dot));
+					const wasmErr = this._checkWasmStdlibTypeMember(node);
+					if (wasmErr) return wasmErr;
+					this._useQualifiedTypeName(node, named);
 					return named;
 				}
+				if (EXCLUDED_STDLIB_MEMBERS.has(node.name)) {
+					return this.err(
+						`${node.name} is not available: ${EXCLUDED_STDLIB_MEMBERS.get(node.name)}`,
+						node,
+					);
+				}
 				return this.err(`Unknown type '${node.name}'`, node);
 			}
 			case "GenericTypeName":
 			case "InstantiationExpr":
-			case "IndexExpr": {
-				const name =
-					node.name ?? (node.expr?.kind === "Ident" ? node.expr.name : null);
-				const typeArgs = node.typeArgs ?? (node.index ? [node.index] : []);
-				const base = name
-					? this.types.get(name)
-					: node.expr
-						? this.resolveTypeNode(node.expr, scope)
-						: null;
-				if (!base) return this.err(`Unknown type '${name ?? "?"}'`, node);
-				if (base.kind === "named" && base._generic) {
-					const res = this.instantiateGenericType(
-						base._generic,
-						typeArgs,
-						scope,
-					);
-					node._typeArgs = res.typeArgs;
-					node._genericType = base;
-					return res;
-				}
-				return this.err(`Type '${name ?? "?"}' is not generic`, node);
-			}
+			case "IndexExpr":
+				return this._resolveGenericTypeName(node, scope);
 			case "TypeParam": {
 				const constraint = node.constraint
 					? this.resolveTypeNode(node.constraint, scope)
@@ -157,11 +228,14 @@ export const resolveMethods = {
 				// SelectorExpr; resolve it like a qualified TypeName.
 				if (node.expr?.kind === "Ident" && typeof node.field === "string") {
 					const qualified = `${node.expr.name}.${node.field}`;
-					if (this.types.has(qualified))
-						return this.resolveTypeNode(
+					if (this.types.has(qualified)) {
+						const resolved = this.resolveTypeNode(
 							{ kind: "TypeName", name: qualified },
 							scope,
 						);
+						this._useQualifiedTypeName(node, resolved);
+						return resolved;
+					}
 				}
 				return ANY;
 			case "ArrayType":
@@ -178,24 +252,116 @@ export const resolveMethods = {
 		}
 	},
 
+	_checkWasmStdlibTypeMember(node) {
+		if (this.target !== "wasm" && this.target !== "both") return null;
+		const dot = node.name.indexOf(".");
+		if (dot === -1) return null;
+		const pkg = node.name.slice(0, dot);
+		if (pkg !== "time") return null;
+		const field = node.name.slice(dot + 1);
+		const allowed = WASM_STDLIB_MEMBERS.get(pkg);
+		if (allowed && !allowed.has(field)) {
+			this.recordBlocker("unsupported stdlib member", node.name);
+			return this.err(
+				`'${node.name}' is not yet available in wasm packages`,
+				node,
+				"move this call to a JS package, or use a supported alternative",
+			);
+		}
+		return null;
+	},
+
+	// `pkg.T` in a type position counts as using the import; a Go-source
+	// stdlib type is emitted under its mangled name.
+	_useQualifiedTypeName(node, named) {
+		const name =
+			node.name ?? (node.expr ? `${node.expr.name}.${node.field}` : "");
+		const dot = name.indexOf(".");
+		if (dot <= 0) return;
+		this.globals.lookup(name.slice(0, dot));
+		if (named.name?.includes("$$")) node._stdName = named.name;
+	},
+
+	// `[N]T` with a named constant (or constant expression) length folds to a number.
+	_foldArrayLen(size, scope) {
+		const resolve = (name, depth = 0) => {
+			const e = depth < 16 ? scope.lookupConstExpr(name) : null;
+			return e ? foldConstExpr(e, (n) => resolve(n, depth + 1)) : undefined;
+		};
+		try {
+			const lit = foldConstExpr(size, resolve);
+			const n = lit ? Number(lit.value) : Number.NaN;
+			return Number.isInteger(n) && n >= 0 ? n : size;
+		} catch {
+			return size;
+		}
+	},
+
 	_resolveArrayTypeNode(node, scope) {
+		// Fold in place so backends that read the type node see a literal length.
+		if (!node.inferLen && node.size?.value === undefined) {
+			const n = this._foldArrayLen(node.size, scope);
+			if (typeof n === "number")
+				node.size = {
+					kind: "BasicLit",
+					litKind: "INT",
+					value: String(n),
+					_line: node.size._line,
+					_col: node.size._col,
+				};
+		}
 		return {
 			kind: "array",
 			size: node.inferLen
 				? null
 				: node.size?.value !== undefined
 					? Number(node.size.value)
-					: node.size,
+					: this._foldArrayLen(node.size, scope),
 			elem: this.resolveTypeNode(node.elem, scope),
 		};
 	},
 
+	// `G[X]`: instantiate a generic named type, or expand a generic alias.
+	_resolveGenericTypeName(node, scope) {
+		const sel = node.expr?.kind === "SelectorExpr" ? node.expr : null;
+		const qualified =
+			sel?.expr?.kind === "Ident" ? `${sel.expr.name}.${sel.field}` : null;
+		const name =
+			node.name ??
+			(node.expr?.kind === "Ident" ? node.expr.name : null) ??
+			qualified;
+		const typeArgs = node.typeArgs ?? (node.index ? [node.index] : []);
+		const base = name
+			? this.types.get(name)
+			: node.expr
+				? this.resolveTypeNode(node.expr, scope)
+				: null;
+		if (!base) return this.err(`Unknown type '${name ?? "?"}'`, node);
+		if (qualified) this.globals.lookup(sel.expr.name);
+		else if (name)
+			this._useQualifiedTypeName(node.name ? node : node.expr, base);
+		if (base.kind === "named" && base._generic?.isAlias) {
+			const aliasArgs = typeArgs.map((n) => this.resolveTypeNode(n, scope));
+			node._typeArgs = aliasArgs;
+			return this._instantiateGenericAlias(base._generic, aliasArgs);
+		}
+		if (base.kind === "named" && base._generic) {
+			const res = this.instantiateGenericType(base._generic, typeArgs, scope);
+			node._typeArgs = res.typeArgs;
+			node._genericType = base;
+			return res;
+		}
+		return this.err(`Type '${name ?? "?"}' is not generic`, node);
+	},
+
 	_resolveFuncTypeNode(node, scope) {
 		const params = node.params.map((p) => this.resolveTypeNode(p.type, scope));
 		const returns = node.returnType
 			? [this.resolveTypeNode(node.returnType, scope)]
 			: [VOID];
-		return { kind: "func", params, returns };
+		const fn = { kind: "func", params, returns };
+		if (node.params.at(-1)?.variadic) fn.variadic = true;
+		return fn;
 	},
 
 	resolveTypeNodeName(node, scope) {
@@ -223,6 +389,7 @@ export const resolveMethods = {
 			if (f.embedded) {
 				const inner = ft.kind === "pointer" ? ft.base : ft;
 				const embedName = (
+					f.embeddedName ??
 					f.astType?.name ??
 					f.type?.name ??
 					f.type?.base?.name ??
@@ -262,6 +429,9 @@ export const resolveMethods = {
 			if (isVariadic) mType.variadic = true;
 			methods.set(m.name, mType);
 		}
+		// Embedded interfaces that carry a type set (`interface{ Integer }`):
+		// kept so type-parameter operator checks can follow them.
+		const typeSetEmbeds = [];
 		if (node.embeds) {
 			for (const embed of node.embeds) {
 				const resolved = this.resolveTypeNode(embed, scope);
@@ -271,6 +441,8 @@ export const resolveMethods = {
 					for (const [mName, mType] of base.methods) {
 						if (!methods.has(mName)) methods.set(mName, mType);
 					}
+					if (base.unionConstraint || base._typeSetEmbeds)
+						typeSetEmbeds.push(base);
 				} else if (!isAny(resolved)) {
 					this.err(
 						`cannot embed non-interface type ${typeStr(resolved)}`,
@@ -281,6 +453,7 @@ export const resolveMethods = {
 		}
 		const result = { kind: "interface", methods };
 		if (node.unionConstraint) result.unionConstraint = node.unionConstraint;
+		if (typeSetEmbeds.length > 0) result._typeSetEmbeds = typeSetEmbeds;
 		return result;
 	},
 
@@ -301,36 +474,127 @@ export const resolveMethods = {
 	},
 
 	instantiateGenericType(generic, typeArgNodes, scope) {
-		const map = new Map();
 		const typeArgs = typeArgNodes.map((n) => this.resolveTypeNode(n, scope));
+		return this.instantiateGenericWithArgs(generic, typeArgs);
+	},
+
+	// One instance per type-argument list.  The instance is cached before its
+	// fields are resolved, so a field that names the instance again (`Next
+	// *List[T]`, `Children []Tree[T]`, or a cycle through another generic type)
+	// reaches the same object instead of recursing forever.
+	instantiateGenericWithArgs(generic, typeArgs) {
+		const key = typeArgs.map(instanceKey).join(",");
+		generic._instances ??= new Map();
+		const cached = generic._instances.get(key);
+		if (cached) {
+			this._syncInstanceMethods(generic, cached);
+			return cached;
+		}
+		// `type T[X any] struct{ n *T[[]X] }` asks for T[[]X], then T[[][]X], and
+		// so on: an instance still being built that keeps asking for a larger
+		// one never settles.
+		generic._building ??= [];
+		generic._buildSizes ??= [];
+		const building = generic._building;
+		const size = typeArgs.reduce((n, a) => n + typeSize(a), 0);
+		// A request for a larger instance while one is being built never
+		// settles (`T[X]` containing `T[[]X]`), and doubling forms such as
+		// `T[Pair[X, X]]` blow up long before a depth limit is reached.
+		const top = generic._buildSizes[generic._buildSizes.length - 1];
+		if (
+			building.length >= MAX_INSTANTIATION_DEPTH ||
+			(top !== undefined && size > top)
+		) {
+			if (!generic._cycleReported) {
+				generic._cycleReported = true;
+				this.err(
+					`instantiation cycle: ${generic.declNode.name} instantiates itself with ever larger type arguments`,
+					generic.declNode,
+				);
+			}
+			return ANY;
+		}
+		const map = new Map();
 		for (let i = 0; i < generic.typeParams.length; i++)
 			map.set(generic.typeParams[i].name, typeArgs[i] ?? ANY);
+		const named = {
+			kind: "named",
+			name: generic.declNode.name,
+			typeArgs,
+			underlying: null,
+			_genericOf: generic,
+		};
+		generic._instances.set(key, named);
 		// Resolve the declaration with its type params in scope (as typeParams,
 		// never as value symbols), then substitute the concrete arguments.
 		const typeScope = new Scope(this.globals);
 		for (const tp of generic.typeParams) typeScope.define(tp.name, tp);
-		const underlying = this.resolveTypeNode(generic.declNode.type, typeScope);
-		const instantiated = this.substituteType(underlying, map);
+		building.push(key);
+		generic._buildSizes.push(size);
+		let instantiated;
+		try {
+			const underlying = this.resolveTypeNode(generic.declNode.type, typeScope);
+			instantiated = this.substituteType(underlying, map);
+		} finally {
+			building.pop();
+			generic._buildSizes.pop();
+		}
 		if (instantiated.kind === "struct") {
 			instantiated.name = generic.declNode.name;
 			instantiated.typeArgs = typeArgs;
 			if (!instantiated.methods) instantiated.methods = new Map();
-			if (generic.methods) {
-				for (const [mName, mType] of generic.methods)
-					instantiated.methods.set(mName, this.substituteType(mType, map));
+		}
+		named.underlying = instantiated;
+		named.methods = instantiated.methods;
+		named._instMap = map;
+		this._syncInstanceMethods(generic, named);
+		return named;
+	},
+
+	// Methods are collected after types, so an instance created earlier picks
+	// up the methods declared since.
+	_syncInstanceMethods(generic, named) {
+		const methods = named.methods;
+		if (!methods || !named._instMap || named._syncing) return;
+		// A method signature that names the instance reaches this again.
+		named._syncing = true;
+		for (const [mName, mType] of generic.methods ?? [])
+			if (!methods.has(mName))
+				methods.set(mName, this.substituteType(mType, named._instMap));
+		// Methods promoted from embedded structs (`Outer[T]` embedding `Base`).
+		this._promoteEmbeddedInto(named.underlying);
+		named._syncing = false;
+	},
+
+	// A[X] for `type A[P any] = T`: resolve T with each P bound to the
+	// concrete X, so A[int] is exactly T[int] (generic named types inside T
+	// are instantiated normally and keep their identity).
+	_instantiateGenericAlias(generic, typeArgs) {
+		const { typeParams, declNode } = generic;
+		if (typeArgs.length !== typeParams.length) {
+			return this.err(
+				`got ${typeArgs.length} type arguments but ${declNode.name} has ${typeParams.length} type parameters`,
+				declNode,
+			);
+		}
+		const aliasScope = new Scope(this.globals);
+		for (let i = 0; i < typeParams.length; i++) {
+			const tp = typeParams[i];
+			if (tp.constraint) {
+				const constraint = this.resolveTypeNode(tp.constraint, this.globals);
+				this.checkConstraint(typeArgs[i], constraint, declNode);
 			}
+			aliasScope.define(tp.name, { kind: "aliasArg", type: typeArgs[i] });
 		}
-		return {
-			kind: "named",
-			name: generic.declNode.name,
-			typeArgs,
-			underlying: instantiated,
-			methods: instantiated.methods,
-		};
+		return this.resolveTypeNode(declNode.type, aliasScope);
 	},
 
-	inferTypeArgs(genericType, argTypes) {
+	// `explicit` seeds the leading type arguments of a partial instantiation
+	// (`F[int](x)`); the rest are inferred from the call arguments.
+	inferTypeArgs(genericType, argTypes, explicit = []) {
 		const map = new Map();
+		for (let i = 0; i < explicit.length; i++)
+			map.set(genericType.typeParams[i].name, explicit[i]);
 		const params = genericType.underlying.params;
 		for (let i = 0; i < params.length && i < argTypes.length; i++)
 			this._inferFromPair(params[i], argTypes[i], map);
@@ -364,14 +628,36 @@ export const resolveMethods = {
 		}
 		if (paramType.kind === "func" && argType.kind === "func")
 			this._inferFromFuncPair(paramType, argType, map);
+		if (paramType.kind === "tuple" && argType.kind === "tuple") {
+			for (
+				let i = 0;
+				i < paramType.types.length && i < argType.types.length;
+				i++
+			)
+				this._inferFromPair(paramType.types[i], argType.types[i], map);
+		}
 	},
 
 	_inferFromPair(paramType, argType, map) {
 		if (!paramType || !argType) return;
 		if (paramType.kind === "typeParam") {
-			if (!map.has(paramType.name)) map.set(paramType.name, argType);
+			const prev = map.get(paramType.name);
+			if (!prev || untypedWins(prev, argType)) map.set(paramType.name, argType);
 			return;
 		}
+		if (paramType.kind === "named" && paramType.typeArgs) {
+			// `iter.Seq[E]` against `iter.Seq[int]`: unify the type arguments;
+			// against any other type, its underlying type.
+			if (argType.kind === "named" && argType.name === paramType.name) {
+				const args = argType.typeArgs ?? [];
+				for (let i = 0; i < paramType.typeArgs.length; i++)
+					this._inferFromPair(paramType.typeArgs[i], args[i], map);
+				return;
+			}
+			paramType = paramType.underlying;
+		}
+		if (argType.kind === "named" && argType.underlying)
+			argType = argType.underlying;
 		this._inferFromStructuredPair(paramType, argType, map);
 	},
 
@@ -422,11 +708,37 @@ export const resolveMethods = {
 			(!t.underlying || !t.methods)
 		) {
 			const found = this.types.get(t.name);
-			if (found) return found;
+			// Two imported packages can both declare `Pt`; the bare name only
+			// reaches the last one registered, so a declaration that came from
+			// an import's own type table stays itself.
+			if (found && !(t.underlying && this._ambiguousImported?.has(t)))
+				return found;
 		}
+		if (t.kind === "named" && t.typeArgs?.length)
+			return this._withGenericMethods(t);
 		return t;
 	},
 
+	// A substituted generic instance (e.g. Stack[int] from an inferred call)
+	// drops the methods map; re-derive it from the generic declaration.
+	_withGenericMethods(t) {
+		const decl = this.types.get(t.name);
+		const generic = decl?._generic;
+		// Struct generics only: codegen has no receiver support for generic
+		// slice/map/func named types, so those keep the baseline diagnostics.
+		if (this.resolveType(decl?.underlying)?.kind !== "struct") return t;
+		if (!generic?.methods || generic.methods.size === 0) return t;
+		if (t.methods && generic.methods.size <= t.methods.size) return t;
+		const map = new Map();
+		for (let i = 0; i < generic.typeParams.length; i++)
+			map.set(generic.typeParams[i].name, t.typeArgs[i] ?? ANY);
+		const methods = new Map(t.methods);
+		for (const [name, mType] of generic.methods)
+			if (!methods.has(name))
+				methods.set(name, this.substituteType(mType, map));
+		return { ...t, methods };
+	},
+
 	// ── Field type lookup ─────────────────────────────────────────────
 
 	fieldType(baseType, field, node) {
@@ -490,12 +802,54 @@ export const resolveMethods = {
 			return base.fields.get(field);
 		}
 		if (base.methods?.has(field)) return base.methods.get(field);
+		const typeName = baseType?.name || base.name;
+		if (typeName) {
+			const dName = displayTypeName(typeName);
+			const shortName = typeName.includes("$$")
+				? typeName.split("$$")[0]
+				: typeName.includes(".")
+					? typeName.split(".").pop()
+					: typeName;
+			for (const key of [
+				`${dName}.${field}`,
+				`${typeName}.${field}`,
+				`${shortName}.${field}`,
+			]) {
+				if (EXCLUDED_STDLIB_MEMBERS.has(key)) {
+					return this.err(
+						`${dName}.${field} is not available: ${EXCLUDED_STDLIB_MEMBERS.get(key)}`,
+						node,
+					);
+				}
+			}
+		}
 		return this.err(`No field '${field}' on ${typeStr(baseType)}`, node);
 	},
 
 	_fieldTypeInterface(base, baseType, field, node) {
 		if (base.methods?.has(field)) return base.methods.get(field);
 		if (base.fields?.has(field)) return base.fields.get(field);
+		const typeName = baseType?.name || base.name;
+		if (typeName) {
+			const dName = displayTypeName(typeName);
+			const shortName = typeName.includes("$$")
+				? typeName.split("$$")[0]
+				: typeName.includes(".")
+					? typeName.split(".").pop()
+					: typeName;
+			for (const key of [
+				`${dName}.${field}`,
+				`${typeName}.${field}`,
+				`${shortName}.${field}`,
+			]) {
+				if (EXCLUDED_STDLIB_MEMBERS.has(key)) {
+					return this.err(
+						`${dName}.${field} is not available: ${EXCLUDED_STDLIB_MEMBERS.get(key)}`,
+						node,
+					);
+				}
+			}
+		}
 		if (base._excluded?.has(field))
 			return this.err(`No member '${field}' on ${typeStr(baseType)}`, node);
 		if (base._isOpen) return ANY;
@@ -543,6 +897,12 @@ export const resolveMethods = {
 				`cannot refer to unexported name ${base.name}.${field}`,
 				node,
 			);
+		// Go-source stdlib member: backends emit the mangled top-level name.
+		const mangled = base._mangle?.get(field);
+		if (mangled) {
+			node._stdName = mangled;
+			return base.members[field];
+		}
 		if (field in base.members) {
 			if (
 				(this.target === "wasm" || this.target === "both") &&
@@ -561,6 +921,12 @@ export const resolveMethods = {
 			}
 			return base.members[field];
 		}
+		const excluded = EXCLUDED_STDLIB_MEMBERS.get(`${base.name}.${field}`);
+		if (excluded)
+			return this.err(
+				`${base.name}.${field} is not available: ${excluded}`,
+				node,
+			);
 		return this.err(`No member '${field}' in namespace ${base.name}`, node);
 	},
 
@@ -575,7 +941,16 @@ function isExported(name) {
 	return code >= 65 && code <= 90;
 }
 
-function _processJsonField(f, depth, path, visited, queue, candidates) {
+function _processJsonField(
+	f,
+	depth,
+	path,
+	visited,
+	queue,
+	candidates,
+	index,
+	pos,
+) {
 	const tagInfo = parseJsonTag(f.tag);
 	if (tagInfo.ignored) return;
 
@@ -602,6 +977,7 @@ function _processJsonField(f, depth, path, visited, queue, candidates) {
 					depth,
 					tagged: true,
 					isEmbedded: true,
+					index: [...index, pos],
 					path: [...path, { name: embedName, isPtr, typeName: embedName }],
 				});
 			}
@@ -612,6 +988,7 @@ function _processJsonField(f, depth, path, visited, queue, candidates) {
 				queue.push({
 					struct: embedStruct,
 					depth: depth + 1,
+					index: [...index, pos],
 					path: [...path, { name: embedName, isPtr, typeName: embedName }],
 					visited: nextVisited,
 				});
@@ -620,9 +997,10 @@ function _processJsonField(f, depth, path, visited, queue, candidates) {
 		return;
 	}
 
-	for (const name of f.names) {
+	for (const [i, name] of f.names.entries()) {
 		if (!isExported(name)) continue;
 		candidates.push({
+			index: [...index, pos + i],
 			jsonKey: tagInfo.name !== null ? tagInfo.name : name,
 			goName: name,
 			type: f.type,
@@ -658,10 +1036,18 @@ function _resolveCandidateCollisions(candidates) {
 		}
 	}
 
-	winningFields.sort((a, b) => candidates.indexOf(a) - candidates.indexOf(b));
+	// Go orders the fields of a struct by their index sequence, so a promoted
+	// field sits where its embedded struct is declared.
+	winningFields.sort((a, b) => compareIndex(a.index, b.index));
 	return winningFields;
 }
 
+function compareIndex(a, b) {
+	for (let i = 0; i < a.length && i < b.length; i++)
+		if (a[i] !== b[i]) return a[i] - b[i];
+	return a.length - b.length;
+}
+
 export function resolveJsonFields(structType) {
 	if (!structType) return [];
 	const underlying =
@@ -670,16 +1056,25 @@ export function resolveJsonFields(structType) {
 	if (underlying._jsonFields) return underlying._jsonFields;
 
 	const queue = [
-		{ struct: underlying, depth: 0, path: [], visited: new Set([underlying]) },
+		{
+			struct: underlying,
+			depth: 0,
+			path: [],
+			index: [],
+			visited: new Set([underlying]),
+		},
 	];
 	const candidates = [];
 
 	while (queue.length > 0) {
-		const { struct: curr, depth, path, visited } = queue.shift();
+		const { struct: curr, depth, path, index, visited } = queue.shift();
 		if (curr?.kind !== "struct") continue;
 
+		// Each name of a `A, B int` field is its own field, as in Go.
+		let pos = 0;
 		for (const f of curr._structFields || []) {
-			_processJsonField(f, depth, path, visited, queue, candidates);
+			_processJsonField(f, depth, path, visited, queue, candidates, index, pos);
+			pos += f.embedded ? 1 : (f.names?.length ?? 1);
 		}
 	}