gofront 1.6.0 → 1.6.1

package/src/backend/wasm/types.js

@@ -142,6 +142,7 @@ export function toWasmType(goType, checker = null, mod = null) {
 				return "externref";
 
 			case "any":
+			case "error":
 				return "anyref";
 
 			case "void":
@@ -220,7 +221,7 @@ export function toWasmType(goType, checker = null, mod = null) {
 		return { kind: "ref", nullable: true, heapType: "struct" };
 	}
 
-	if (goType.kind === "struct") {
+	if (goType.kind === "struct" || goType.kind === "StructType") {
 		if (goType.name && mod?.getStructType(goType.name)) {
 			return {
 				kind: "ref",
@@ -228,6 +229,23 @@ export function toWasmType(goType, checker = null, mod = null) {
 				typeIndex: mod.getStructType(goType.name).typeIndex,
 			};
 		}
+		if (mod?.getAnonStructType && goType.fields) {
+			const rawFields = [];
+			if (goType.fields instanceof Map) {
+				for (const [k, v] of goType.fields.entries()) {
+					rawFields.push({ name: k, goType: v });
+				}
+			} else if (Array.isArray(goType.fields)) {
+				for (const f of goType.fields) {
+					const names = f.names ?? (f.name ? [f.name] : []);
+					for (const n of names) rawFields.push({ name: n, goType: f.type });
+				}
+			}
+			if (rawFields.length > 0) {
+				const info = mod.getAnonStructType(rawFields);
+				return { kind: "ref", nullable: true, typeIndex: info.typeIndex };
+			}
+		}
 		return { kind: "ref", nullable: true, heapType: "struct" };
 	}
 
@@ -250,6 +268,96 @@ export function toWasmType(goType, checker = null, mod = null) {
 	return "i32";
 }
 
+export function getInterfaceMethodList(iface) {
+	if (!iface) return [];
+	if (iface.methods instanceof Map) {
+		return Array.from(iface.methods.entries()).map(([name, sig]) => ({
+			name,
+			params: (sig.params ?? []).map((p) => p.type ?? p),
+			returns: (sig.returns ?? []).map((r) => r.type ?? r),
+		}));
+	}
+	if (Array.isArray(iface.methods)) {
+		return iface.methods.map((m) => ({
+			name: m.name?.value ?? m.name ?? m,
+			params: (m.params ?? []).map((p) => p.type ?? p),
+			returns: m.returnType
+				? m.returnType.kind === "TupleType" || m.returnType.kind === "tuple"
+					? m.returnType.types
+					: [m.returnType]
+				: [],
+		}));
+	}
+	return [];
+}
+
+export function goTypeKey(t) {
+	if (!t) return "any";
+	if (typeof t === "string") {
+		if (t === "byte") return "uint8";
+		if (t === "rune") return "int32";
+		return t;
+	}
+	if (t.kind === "basic" || t.kind === "TypeName" || t.kind === "Ident") {
+		const name = t.name ?? "any";
+		if (name === "byte") return "uint8";
+		if (name === "rune") return "int32";
+		return name;
+	}
+	if (t.kind === "untyped") {
+		return t.base ?? "int";
+	}
+	if (t.kind === "pointer" || t.kind === "PointerType") {
+		return `ptr_${goTypeKey(t.base)}`;
+	}
+	if (t.kind === "StarExpr") {
+		return `ptr_${goTypeKey(t.expr ?? t.operand)}`;
+	}
+	if (t.kind === "slice" || t.kind === "SliceType") {
+		return `sl_${goTypeKey(t.elem)}`;
+	}
+	if (t.kind === "array" || t.kind === "ArrayType") {
+		const sz =
+			typeof t.size === "number" ? t.size : (t.size?.value ?? t.len ?? "");
+		return `arr_${sz}_${goTypeKey(t.elem)}`;
+	}
+	if (t.kind === "map" || t.kind === "MapType") {
+		return `map_${goTypeKey(t.key ?? t.keyType)}_${goTypeKey(t.value ?? t.val ?? t.elem ?? t.valueType ?? t.valType)}`;
+	}
+	if (t.kind === "struct" || t.kind === "StructType") {
+		if (t.name) return t.name;
+		const rawFields = [];
+		if (t.fields instanceof Map) {
+			for (const [k, v] of t.fields.entries())
+				rawFields.push(`${k}:${goTypeKey(v)}`);
+		} else if (Array.isArray(t.fields)) {
+			for (const f of t.fields) {
+				const names = f.names ?? (f.name ? [f.name] : []);
+				for (const n of names)
+					rawFields.push(`${n}:${goTypeKey(f.type ?? f.goType)}`);
+			}
+		}
+		return `struct_${rawFields.join("_")}`;
+	}
+	if (t.kind === "named") {
+		return t.name ?? (t.underlying ? goTypeKey(t.underlying) : "any");
+	}
+	if (t.name) return t.name;
+	return t.kind ?? "any";
+}
+
+export function anonIfaceName(iface, _checker = null, _mod = null) {
+	const methods = getInterfaceMethodList(iface);
+	methods.sort((a, b) => a.name.localeCompare(b.name));
+	const parts = methods.map((m) => {
+		const ps = m.params.map((p) => goTypeKey(p)).join("_");
+		const rs = m.returns.map((r) => goTypeKey(r)).join("_");
+		return `${m.name}_${ps}_${rs}`;
+	});
+	const key = parts.join("__").replace(/[^a-zA-Z0-9_]/g, "_");
+	return `anon_iface_${key}`;
+}
+
 export function isStructType(goType, checker = null, mod = null) {
 	if (!goType) return false;
 	if (goType.kind === "TypeName" || goType.kind === "Ident") {
@@ -378,6 +486,11 @@ export function isAnyType(goType, checker = null) {
 
 export function isInterfaceType(goType, checker = null) {
 	if (!goType) return false;
+	if (
+		goType.kind === "basic" &&
+		(goType.name === "any" || goType.name === "interface{}")
+	)
+		return true;
 	if (goType.kind === "interface" || goType.kind === "InterfaceType")
 		return true;
 	if (goType.kind === "TypeName" || goType.kind === "Ident") {
@@ -542,3 +655,42 @@ export function getFuncSignature(goType, checker = null) {
 	}
 	return { params: [], returns: [] };
 }
+
+export function isUnhashableGoType(goType, checker = null, seen = new Set()) {
+	if (!goType) return false;
+	if (seen.has(goType)) return false;
+	seen.add(goType);
+	if (
+		isSliceType(goType, checker) ||
+		isMapType(goType, checker) ||
+		isFuncType(goType, checker)
+	) {
+		return true;
+	}
+	if (isArrayType(goType, checker)) {
+		const elem = goType.elem ?? goType.underlying?.elem;
+		return isUnhashableGoType(elem, checker, seen);
+	}
+	if (goType.kind === "struct" || goType.kind === "StructType") {
+		if (goType.fields instanceof Map) {
+			for (const f of goType.fields.values()) {
+				if (isUnhashableGoType(f, checker, seen)) return true;
+			}
+		} else if (Array.isArray(goType.fields)) {
+			for (const f of goType.fields) {
+				const fType = f.type ?? f.goType;
+				if (isUnhashableGoType(fType, checker, seen)) return true;
+			}
+		}
+	}
+	if (goType.kind === "TypeName" || goType.kind === "Ident") {
+		const resolved = checker?.types?.get(goType.name);
+		if (resolved && resolved !== goType) {
+			return isUnhashableGoType(resolved, checker, seen);
+		}
+	}
+	if (goType.kind === "named" && goType.underlying) {
+		return isUnhashableGoType(goType.underlying, checker, seen);
+	}
+	return false;
+}

package/src/cli-core.js

@@ -33,7 +33,7 @@ import { generatePwa } from "./pwa.js";
 import { runTests } from "./test-runner.js";
 import { bundleVendor } from "./vendor.js";
 
-const GOFRONT_VERSION = JSON.parse(
+export const GOFRONT_VERSION = JSON.parse(
 	readFileSync(new URL("../package.json", import.meta.url), "utf8"),
 ).version;
 

package/src/compiler.js

@@ -38,7 +38,7 @@ import {
 } from "./resolver.js";
 import { TemplLexer } from "./templ-lexer.js";
 import { TemplParser } from "./templ-parser.js";
-import { TypeChecker } from "./typechecker/index.js";
+import { TypeCheckError, TypeChecker } from "./typechecker/index.js";
 import { WASM_SUPPORTED_STDLIB } from "./typechecker/types.js";
 
 // ── Parse cache ──────────────────────────────────────────────
@@ -203,6 +203,7 @@ function finishWasm(options, merged, pkgTarget, outputDir) {
 			inputSourceMap: wasmSourceMap,
 			sourceMapUrl: WASM_MAP_URL,
 			emitWat: Boolean(options.emitWat),
+			converge: Boolean(options.release),
 		});
 		wasm = opt.wasm;
 		if (opt.wat) wat = opt.wat;
@@ -269,7 +270,20 @@ function linkWasmUnits(
 		for (const b of u.bundledPackages) bundledPackages.add(b);
 		programs.push(...u.programs);
 	}
-	const checker = { types };
+	const checker = {
+		types,
+		errors: [],
+		err(msg, node) {
+			const e = new TypeCheckError(
+				msg,
+				node,
+				this._currentFile,
+				this._currentSource,
+			);
+			this.errors.push(e);
+			return e;
+		},
+	};
 	const lowerRes = lower(programs, checker);
 	return compileWasmModule(programs, checker, lowerRes, {
 		boundary: true,
@@ -809,8 +823,8 @@ export function compileFiles(files, options = {}) {
 
 	const mainChunk = {
 		js: mainJs,
-		sourceFiles: files.map((f) => resolve(f)),
-		sourcesContent: files.map((f) => readFileSync(f, "utf8")),
+		sourceFiles: programs.map((p) => p._path),
+		sourcesContent: programs.map((p) => p._source),
 		mappings: emitTarget === "wasm" ? [] : codegen.getMappings(),
 	};
 

package/src/dts-parser.js

@@ -109,10 +109,9 @@ export class DtsParser {
 
 	readIdent() {
 		this.skip();
-		let s = "";
-		while (!this.eof() && /[a-zA-Z0-9_$]/.test(this.ch()))
-			s += this.src[this.pos++];
-		return s;
+		const start = this.pos;
+		while (!this.eof() && /[a-zA-Z0-9_$]/.test(this.ch())) this.pos++;
+		return this.src.slice(start, this.pos);
 	}
 
 	consume(ch) {
@@ -171,14 +170,14 @@ export class DtsParser {
 	}
 
 	_trackBracketDepth(c, depths) {
-		const open = { "<": 0, "(": 1, "[": 2, "{": 3 };
-		const close = { ">": 0, ")": 1, "]": 2, "}": 3 };
-		if (c in open) {
-			depths[open[c]]++;
+		const oi = "<([{".indexOf(c);
+		if (oi >= 0) {
+			depths[oi]++;
 			return true;
 		}
-		if (c in close && depths[close[c]] > 0) {
-			depths[close[c]]--;
+		const ci = ">)]}".indexOf(c);
+		if (ci >= 0 && depths[ci] > 0) {
+			depths[ci]--;
 			return true;
 		}
 		return false;
@@ -392,7 +391,7 @@ export class DtsParser {
 		}
 	}
 
-	_parseMemberFuncDecl(out) {
+	_parseFuncDecl() {
 		const name = this.readIdent();
 		this.skipGenerics();
 		const params = this.parseParams();
@@ -403,12 +402,14 @@ export class DtsParser {
 			ret = this.parseType();
 		}
 		this.consume(";");
-		if (name)
-			out[name] = {
+		return {
+			name,
+			val: {
 				kind: "func",
 				params: params.map((p) => p.type),
 				returns: [ret],
-			};
+			},
+		};
 	}
 
 	_parseMemberNewSig() {
@@ -422,7 +423,7 @@ export class DtsParser {
 		this.consume(";");
 	}
 
-	_parseMemberTypeDecl(out) {
+	_parseTypeDecl() {
 		const name = this.readIdent();
 		this.skipGenerics();
 		this.skip();
@@ -432,10 +433,10 @@ export class DtsParser {
 			type = this.parseType();
 		}
 		this.consume(";");
-		if (name) out[name] = type;
+		return { name, type };
 	}
 
-	_parseMemberClassDecl(out) {
+	_parseClassDecl() {
 		const name = this.readIdent();
 		this.skipGenerics();
 		while (!this.eof() && this.ch() !== "{") this.pos++;
@@ -443,10 +444,20 @@ export class DtsParser {
 		const body = this.parseBody();
 		this.consume("}");
 		this.consume(";");
-		if (name) out[name] = { kind: "namespace", name, members: body };
+		return { name, ns: { kind: "namespace", name, members: body } };
+	}
+
+	_parseNamespaceDecl() {
+		const name = this.readIdent() || this._readStringLit();
+		this.skip();
+		this.consume("{");
+		const body = this.parseBody();
+		this.consume("}");
+		this.consume(";");
+		return { name, ns: { kind: "namespace", name, members: body } };
 	}
 
-	_parseMemberVarDecl(out) {
+	_parseVarDecl() {
 		const name = this.readIdent();
 		this.skip();
 		this.consume("?");
@@ -461,7 +472,7 @@ export class DtsParser {
 			this.skipTypeExpr();
 		}
 		this.consume(";");
-		if (name) out[name] = type;
+		return { name, type };
 	}
 
 	_parseMember(out) {
@@ -477,28 +488,29 @@ export class DtsParser {
 		}
 		this.skip();
 		switch (kw) {
-			case "function":
-				this._parseMemberFuncDecl(out);
+			case "function": {
+				const { name, val } = this._parseFuncDecl();
+				if (name) out[name] = val;
 				break;
+			}
 			case "new":
 				this._parseMemberNewSig();
 				break;
-			case "type":
-				this._parseMemberTypeDecl(out);
+			case "type": {
+				const { name, type } = this._parseTypeDecl();
+				if (name) out[name] = type;
 				break;
+			}
 			case "interface":
-			case "class":
-				this._parseMemberClassDecl(out);
+			case "class": {
+				const { name, ns } = this._parseClassDecl();
+				if (name) out[name] = ns;
 				break;
+			}
 			case "namespace":
 			case "module": {
-				const name = this.readIdent() || this._readStringLit();
-				this.skip();
-				this.consume("{");
-				const body = this.parseBody();
-				this.consume("}");
-				this.consume(";");
-				if (name) out[name] = { kind: "namespace", name, members: body };
+				const { name, ns } = this._parseNamespaceDecl();
+				if (name) out[name] = ns;
 				break;
 			}
 			case "enum": {
@@ -509,9 +521,11 @@ export class DtsParser {
 			}
 			case "const":
 			case "let":
-			case "var":
-				this._parseMemberVarDecl(out);
+			case "var": {
+				const { name, type } = this._parseVarDecl();
+				if (name) out[name] = type;
 				break;
+			}
 			default:
 				this._parseMemberDefault(kw, out);
 				break;
@@ -550,13 +564,15 @@ export class DtsParser {
 			this.consume(";");
 		}
 	}
+
 	_readStringLit() {
 		this.skip();
 		const c = this.ch();
 		if (c !== '"' && c !== "'") return null;
 		this.pos++;
-		let s = "";
-		while (!this.eof() && this.ch() !== c) s += this.src[this.pos++];
+		const start = this.pos;
+		while (!this.eof() && this.ch() !== c) this.pos++;
+		const s = this.src.slice(start, this.pos);
 		this.pos++;
 		return s;
 	}
@@ -612,85 +628,6 @@ export class DtsParser {
 		return { types, values };
 	}
 
-	_parseTopLevelTypeAlias(types) {
-		const name = this.readIdent();
-		this.skipGenerics();
-		this.skip();
-		let type = ANY;
-		if (this.ch() === "=") {
-			this.pos++;
-			type = this.parseType();
-		}
-		this.consume(";");
-		if (name) types.set(name, type);
-	}
-
-	_parseTopLevelClassDecl(kw, types, values) {
-		const name = this.readIdent();
-		this.skipGenerics();
-		while (!this.eof() && this.ch() !== "{") this.pos++;
-		this.consume("{");
-		const body = this.parseBody();
-		this.consume("}");
-		this.consume(";");
-		if (name) {
-			const ns = { kind: "namespace", name, members: body };
-			types.set(name, ns);
-			if (kw === "class") values.set(name, ns);
-		}
-	}
-
-	_parseTopLevelNamespaceDecl(types, values) {
-		const name = this.readIdent() || this._readStringLit();
-		this.skip();
-		this.consume("{");
-		const body = this.parseBody();
-		this.consume("}");
-		this.consume(";");
-		if (name) {
-			const ns = { kind: "namespace", name, members: body };
-			types.set(name, ns);
-			values.set(name, ns);
-		}
-	}
-
-	_parseTopLevelFuncDecl(values) {
-		const name = this.readIdent();
-		this.skipGenerics();
-		const params = this.parseParams();
-		this.skip();
-		let ret = VOID;
-		if (this.ch() === ":") {
-			this.pos++;
-			ret = this.parseType();
-		}
-		this.consume(";");
-		if (name)
-			values.set(name, {
-				kind: "func",
-				params: params.map((p) => p.type),
-				returns: [ret],
-			});
-	}
-
-	_parseTopLevelVarDecl(values) {
-		const name = this.readIdent();
-		this.skip();
-		this.consume("?");
-		let type = ANY;
-		if (this.ch() === ":") {
-			this.pos++;
-			type = this.parseType();
-		}
-		this.skip();
-		if (this.ch() === "=") {
-			this.pos++;
-			this.skipTypeExpr();
-		}
-		this.consume(";");
-		if (name) values.set(name, type);
-	}
-
 	_parseTopLevelDecl(kw, types, values) {
 		switch (kw) {
 			case "import":
@@ -698,17 +635,29 @@ export class DtsParser {
 				this.skipTypeExpr();
 				this.consume(";");
 				break;
-			case "type":
-				this._parseTopLevelTypeAlias(types);
+			case "type": {
+				const { name, type } = this._parseTypeDecl();
+				if (name) types.set(name, type);
 				break;
+			}
 			case "interface":
-			case "class":
-				this._parseTopLevelClassDecl(kw, types, values);
+			case "class": {
+				const { name, ns } = this._parseClassDecl();
+				if (name) {
+					types.set(name, ns);
+					if (kw === "class") values.set(name, ns);
+				}
 				break;
+			}
 			case "namespace":
-			case "module":
-				this._parseTopLevelNamespaceDecl(types, values);
+			case "module": {
+				const { name, ns } = this._parseNamespaceDecl();
+				if (name) {
+					types.set(name, ns);
+					values.set(name, ns);
+				}
 				break;
+			}
 			case "enum": {
 				const name = this.readIdent();
 				this.skipBlock();
@@ -719,14 +668,18 @@ export class DtsParser {
 				}
 				break;
 			}
-			case "function":
-				this._parseTopLevelFuncDecl(values);
+			case "function": {
+				const { name, val } = this._parseFuncDecl();
+				if (name) values.set(name, val);
 				break;
+			}
 			case "const":
 			case "let":
-			case "var":
-				this._parseTopLevelVarDecl(values);
+			case "var": {
+				const { name, type } = this._parseVarDecl();
+				if (name) values.set(name, type);
 				break;
+			}
 			default:
 				this.skipTypeExpr();
 				this.consume(";");

package/src/index.js

@@ -13,11 +13,6 @@
 //   gofront <file.go> --tokens     — dump tokens of first file (debug)
 //   gofront init [dir]             — scaffold a new GoFront project
 
-import { createRequire } from "node:module";
-
-const _require = createRequire(import.meta.url);
-const { version } = _require("../package.json");
-
 import { statSync } from "node:fs";
 import { dirname, relative, resolve } from "node:path";
 import { copyAssets } from "./asset-manager.js";
@@ -25,6 +20,7 @@ import {
 	formatBuildSummary,
 	formatPrepSummary,
 	formatWrittenDesc,
+	GOFRONT_VERSION,
 	handleBuild,
 	handleCheck,
 	handleDev,
@@ -47,7 +43,7 @@ import { colors, formatDiagnostic, log, ms, stamp } from "./colors.js";
 
 const args = process.argv.slice(2);
 if (args[0] === "--version" || args[0] === "-v") {
-	console.log(`gofront ${version}`);
+	console.log(`gofront ${GOFRONT_VERSION}`);
 	process.exit(0);
 }