gofront 1.5.1 → 1.6.1

package/src/parser/declarations.js

@@ -261,8 +261,7 @@ export const declarationParseMethods = {
 	},
 
 	parseVarSpec() {
-		const names = [this.expect(T.IDENT).value];
-		while (this.match(T.COMMA)) names.push(this.expect(T.IDENT).value);
+		const names = this.parseIdentList();
 		let type = null;
 		let value = null;
 		if (
@@ -284,8 +283,7 @@ export const declarationParseMethods = {
 			let prevRawExprs = null; // raw AST (with iota Idents) from the previous spec
 			let prevType = null;
 			while (!this.check(T.RPAREN) && !this.check(T.EOF)) {
-				const names = [this.expect(T.IDENT).value];
-				while (this.match(T.COMMA)) names.push(this.expect(T.IDENT).value);
+				const names = this.parseIdentList();
 				let type = null;
 				let rawExprs; // before iota substitution
 				if (this.check(T.ASSIGN)) {
@@ -315,8 +313,7 @@ export const declarationParseMethods = {
 			}
 			this.expect(T.RPAREN);
 		} else {
-			const names = [this.expect(T.IDENT).value];
-			while (this.match(T.COMMA)) names.push(this.expect(T.IDENT).value);
+			const names = this.parseIdentList();
 			let type = null;
 			if (!this.check(T.ASSIGN)) type = this.parseType();
 			this.expect(T.ASSIGN);

package/src/parser/expressions.js

@@ -25,6 +25,8 @@ const PREC = {
 	[T.AND_NOT]: 5,
 };
 
+const UNARY_OPS = new Set([T.NOT, T.MINUS, T.PLUS, T.CARET, T.AMP, T.STAR]);
+
 const TYPE_KEYWORDS = new Set([
 	"int",
 	"int8",
@@ -128,14 +130,7 @@ export const expressionParserMethods = {
 
 	parseUnary(noCompLit = false) {
 		const t = this.peek();
-		if (
-			t.type === T.NOT ||
-			t.type === T.MINUS ||
-			t.type === T.PLUS ||
-			t.type === T.CARET ||
-			t.type === T.AMP ||
-			t.type === T.STAR
-		) {
+		if (UNARY_OPS.has(t.type)) {
 			const op = this.advance().value;
 			return { kind: "UnaryExpr", op, operand: this.parseUnary(noCompLit) };
 		}

package/src/parser/index.js

@@ -73,9 +73,18 @@ export class Parser {
 		return this.peek2().type === type;
 	}
 
-	match(...types) {
-		for (const type of types) {
-			if (this.check(type)) {
+	match(t1, t2, t3, ...rest) {
+		const cur = this.peek().type;
+		if (
+			cur === t1 ||
+			(t2 !== undefined && cur === t2) ||
+			(t3 !== undefined && cur === t3)
+		) {
+			this.advance();
+			return true;
+		}
+		for (let i = 0; i < rest.length; i++) {
+			if (cur === rest[i]) {
 				this.advance();
 				return true;
 			}
@@ -83,6 +92,12 @@ export class Parser {
 		return false;
 	}
 
+	parseIdentList() {
+		const names = [this.expect(T.IDENT).value];
+		while (this.match(T.COMMA)) names.push(this.expect(T.IDENT).value);
+		return names;
+	}
+
 	expect(type) {
 		if (!this.check(type))
 			throw new ParseError(`expected '${type}'`, this.peek());

package/src/parser/statements.js

@@ -15,6 +15,20 @@ const PARSE_STMT_DELEGATE = {
 	[T.LBRACE]: "parseBlock",
 };
 
+const ASSIGN_OPS = new Set([
+	T.ASSIGN,
+	T.PLUS_ASSIGN,
+	T.MINUS_ASSIGN,
+	T.STAR_ASSIGN,
+	T.SLASH_ASSIGN,
+	T.PERCENT_ASSIGN,
+	T.AMP_ASSIGN,
+	T.PIPE_ASSIGN,
+	T.CARET_ASSIGN,
+	T.LSHIFT_ASSIGN,
+	T.RSHIFT_ASSIGN,
+]);
+
 export const statementParserMethods = {
 	parseBlock() {
 		this.expect(T.LBRACE);
@@ -206,22 +220,13 @@ export const statementParserMethods = {
 		this.expect(T.LBRACE);
 		const cases = [];
 		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			if (this.check(T.CASE)) {
-				this.advance();
-				const list = this.parseExprList();
-				this.expect(T.COLON);
-				cases.push({ kind: "CaseClause", list, stmts: this._parseCaseBody() });
-			} else if (this.check(T.DEFAULT)) {
-				this.advance();
-				this.expect(T.COLON);
-				cases.push({
-					kind: "CaseClause",
-					list: null,
-					stmts: this._parseCaseBody(),
-				});
-			} else {
+			const isCase = this.match(T.CASE);
+			if (!isCase && !this.match(T.DEFAULT)) {
 				this.err("Expected case or default");
 			}
+			const list = isCase ? this.parseExprList() : null;
+			this.expect(T.COLON);
+			cases.push({ kind: "CaseClause", list, stmts: this._parseCaseBody() });
 		}
 		this.expect(T.RBRACE);
 		return { kind: "SwitchStmt", init, tag, cases };
@@ -244,18 +249,13 @@ export const statementParserMethods = {
 		this.expect(T.LBRACE);
 		const cases = [];
 		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			if (this.check(T.CASE)) {
-				this.advance();
-				const types = this._parseTypeSwitchTypeList();
-				this.expect(T.COLON);
-				cases.push({ types, stmts: this._parseCaseBody() });
-			} else if (this.check(T.DEFAULT)) {
-				this.advance();
-				this.expect(T.COLON);
-				cases.push({ types: null, stmts: this._parseCaseBody() });
-			} else {
+			const isCase = this.match(T.CASE);
+			if (!isCase && !this.match(T.DEFAULT)) {
 				this.err("Expected case or default");
 			}
+			const types = isCase ? this._parseTypeSwitchTypeList() : null;
+			this.expect(T.COLON);
+			cases.push({ types, stmts: this._parseCaseBody() });
 		}
 		this.expect(T.RBRACE);
 		return { kind: "TypeSwitchStmt", assign, expr, cases };
@@ -305,20 +305,7 @@ export const statementParserMethods = {
 		}
 
 		// x = expr  or  x += expr  etc.
-		const assignOps = [
-			T.ASSIGN,
-			T.PLUS_ASSIGN,
-			T.MINUS_ASSIGN,
-			T.STAR_ASSIGN,
-			T.SLASH_ASSIGN,
-			T.PERCENT_ASSIGN,
-			T.AMP_ASSIGN,
-			T.PIPE_ASSIGN,
-			T.CARET_ASSIGN,
-			T.LSHIFT_ASSIGN,
-			T.RSHIFT_ASSIGN,
-		];
-		if (assignOps.includes(t.type)) {
+		if (ASSIGN_OPS.has(t.type)) {
 			const op = this.advance().value;
 			const rhs = this.parseExprList();
 			return { kind: "AssignStmt", lhs: [first], op, rhs };

package/src/parser/types.js

@@ -175,8 +175,7 @@ export const typeParserMethods = {
 		this.expect(T.LBRACE);
 		const fields = [];
 		while (!this.check(T.RBRACE) && !this.check(T.EOF)) {
-			const names = [this.expect(T.IDENT).value];
-			while (this.match(T.COMMA)) names.push(this.expect(T.IDENT).value);
+			const names = this.parseIdentList();
 			// Check if this is an embedded field (just a type name)
 			// e.g., type T struct { Base }
 			if (this.check(T.SEMICOLON) || this.check(T.RBRACE)) {

package/src/resolver.js

@@ -25,31 +25,7 @@ function findNodeModules(startDir) {
 	}
 }
 
-// Built-in stdlib package paths that are always available as globals — no resolution needed.
-const BUILTIN_PACKAGES = new Set([
-	"fmt",
-	"strings",
-	"bytes",
-	"strconv",
-	"sort",
-	"math",
-	"math/bits",
-	"math/rand",
-	"errors",
-	"time",
-	"unicode",
-	"unicode/utf8",
-	"os",
-	"slices",
-	"html",
-	"io",
-	"gom",
-	"maps",
-	"regexp",
-	"path",
-	"path/filepath",
-	"testing",
-]);
+import { STDLIB_PACKAGES } from "./typechecker/types.js";
 
 // Returns true for local relative paths (start with ./ or ../)
 export function isLocalPath(importPath) {
@@ -57,7 +33,7 @@ export function isLocalPath(importPath) {
 }
 
 export function isBuiltinPackage(importPath) {
-	return BUILTIN_PACKAGES.has(importPath);
+	return STDLIB_PACKAGES.has(importPath);
 }
 
 // Resolve a local relative import path to an absolute directory of .go files.
@@ -72,7 +48,7 @@ export function resolveGwDir(importPath, fromFile) {
 	return gwFiles.length > 0 ? dir : null;
 }
 
-export function resolveImport(importPath, fromFile) {
+function resolveImport(importPath, fromFile) {
 	const fromDir = dirname(resolve(fromFile));
 	const nodeModules = findNodeModules(fromDir);
 

package/src/templ-lexer.js

@@ -118,17 +118,15 @@ export class TemplLexer {
 				continue;
 			}
 
-			// Detect `templ` keyword at identifier boundaries
+			// Detect `templ` or `css` keyword at identifier boundaries
 			if (this._matchKeyword("templ")) {
 				this.tokens.push(new Token(TT.TEMPL_KW, "templ", this.line, this.col));
-				this._lexTemplDecl();
+				this._lexBlockDecl("templ");
 				continue;
 			}
-
-			// Detect `css` keyword at identifier boundaries
 			if (this._matchKeyword("css")) {
 				this.tokens.push(new Token(TT.CSS_KW, "css", this.line, this.col));
-				this._lexCssDecl();
+				this._lexBlockDecl("css");
 				continue;
 			}
 
@@ -201,24 +199,25 @@ export class TemplLexer {
 		for (const t of this._goTokens(chunk)) this.tokens.push(t);
 	}
 
-	// ── Templ declaration lexing ─────────────────────────────────
+	// ── Templ / CSS declaration lexing ───────────────────────────
 
-	// Called right after consuming `templ` keyword.
-	// Lexes: Name(params) { <HTML body> }
-	_lexTemplDecl() {
+	// Called right after consuming `templ` or `css` keyword.
+	// Lexes: Name(params) { <body> }
+	_lexBlockDecl(kw) {
 		this.skipWhitespace();
 
-		// Name
-		const nameStart = this.pos;
-		while (!this.eof() && /\w/.test(this.peek())) this.advance();
-		const name = this.src.slice(nameStart, this.pos);
-		if (!name) this.err("expected component name after 'templ'");
+		const name = this._readWord();
+		if (!name) {
+			this.err(
+				`expected ${kw === "templ" ? "component name" : "name"} after '${kw}'`,
+			);
+		}
 		this.tokens.push(new Token(T.IDENT, name, this.line, this.col));
 
 		this.skipWhitespace();
 
 		// Parameter list ( ... ) — lex as Go
-		if (this.peek() !== "(") this.err("expected '(' after templ name");
+		if (this.peek() !== "(") this.err(`expected '(' after ${kw} name`);
 		const paramStart = this.pos;
 		this._skipBalanced("(", ")");
 		const paramSrc = this.src.slice(paramStart, this.pos);
@@ -227,43 +226,12 @@ export class TemplLexer {
 		this.skipWhitespace();
 
 		// Opening { of body
-		if (this.peek() !== "{") this.err("expected '{' after templ params");
+		if (this.peek() !== "{") this.err(`expected '{' after ${kw} params`);
 		this.advance(); // consume {
 		this.tokens.push(new Token(T.LBRACE, "{", this.line, this.col));
 
-		// HTML body
-		this._lexHtmlBody(1);
-	}
-
-	// ── CSS declaration lexing ───────────────────────────────────
-
-	_lexCssDecl() {
-		this.skipWhitespace();
-
-		// Name (identifier)
-		const nameStart = this.pos;
-		while (!this.eof() && /\w/.test(this.peek())) this.advance();
-		const name = this.src.slice(nameStart, this.pos);
-		if (!name) this.err("expected name after 'css'");
-		this.tokens.push(new Token(T.IDENT, name, this.line, this.col));
-
-		this.skipWhitespace();
-
-		// Parameter list (balanced parens)
-		if (this.peek() !== "(") this.err("expected '(' after css name");
-		const paramStart = this.pos;
-		this._skipBalanced("(", ")");
-		const paramSrc = this.src.slice(paramStart, this.pos);
-		for (const t of this._goTokens(paramSrc)) this.tokens.push(t);
-
-		this.skipWhitespace();
-
-		// Opening { of body
-		if (this.peek() !== "{") this.err("expected '{' after css params");
-		this.advance(); // consume {
-		this.tokens.push(new Token(T.LBRACE, "{", this.line, this.col));
-
-		this._lexCssBody();
+		if (kw === "templ") this._lexHtmlBody(1);
+		else this._lexCssBody();
 	}
 
 	_skipCssString(quote) {
@@ -660,7 +628,7 @@ export class TemplLexer {
 	// ── HTML text content ─────────────────────────────────────────
 
 	_lexHtmlText() {
-		let text = "";
+		const start = this.pos;
 		const line = this.line;
 		while (!this.eof()) {
 			const c = this.peek();
@@ -674,9 +642,9 @@ export class TemplLexer {
 				(c === "d" && this._peekKeyword("default"))
 			)
 				break;
-			text += this.advance();
+			this.advance();
 		}
-		const trimmed = text.trim();
+		const trimmed = this.src.slice(start, this.pos).trim();
 		if (trimmed)
 			this.tokens.push(new Token(TT.HTML_TEXT, trimmed, line, this.col));
 	}
@@ -729,17 +697,15 @@ export class TemplLexer {
 	}
 
 	_readHtmlName() {
-		let name = "";
-		while (!this.eof() && /[a-zA-Z0-9_-]/.test(this.peek()))
-			name += this.advance();
-		return name;
+		const start = this.pos;
+		while (!this.eof() && /[a-zA-Z0-9_-]/.test(this.peek())) this.advance();
+		return this.src.slice(start, this.pos);
 	}
 
 	_readHtmlAttrName() {
-		let name = "";
-		while (!this.eof() && /[a-zA-Z0-9_:.-]/.test(this.peek()))
-			name += this.advance();
-		return name;
+		const start = this.pos;
+		while (!this.eof() && /[a-zA-Z0-9_:.-]/.test(this.peek())) this.advance();
+		return this.src.slice(start, this.pos);
 	}
 
 	_readQuotedString() {
@@ -756,9 +722,9 @@ export class TemplLexer {
 	}
 
 	_readWord() {
-		let w = "";
-		while (!this.eof() && /\w/.test(this.peek())) w += this.advance();
-		return w;
+		const start = this.pos;
+		while (!this.eof() && /\w/.test(this.peek())) this.advance();
+		return this.src.slice(start, this.pos);
 	}
 
 	_skipToOpenBrace() {

package/src/templ-parser.js

@@ -48,55 +48,31 @@ export class TemplParser extends Parser {
 
 	// ── CssDecl ───────────────────────────────────────────────────
 
-	parseCssDecl() {
+	_parseDecl(kind, bodyFn) {
 		const _line = this.peek().line;
-		this.advance(); // consume CSS_KW
-
+		this.advance();
 		const name = this.expect(T.IDENT).value;
-
-		// Parse parameter list (standard Go params: LPAREN...RPAREN)
 		const params = this.parseParamList();
-
-		// Optional semicolon between ) and {
 		this.semi();
-
-		// Consume opening {
 		this.expect(T.LBRACE);
-
-		// Consume CSS_BODY
-		const bodyToken = this.expect(TT.CSS_BODY);
-		const cssText = bodyToken.value;
-
-		// Consume closing }
-		this.expect(T.RBRACE);
+		const extra = bodyFn();
 		this.semi();
-
-		return { kind: "CssDecl", name, params, cssText, _line };
+		return { kind, name, params, ...extra, _line };
 	}
 
-	// ── TemplDecl ─────────────────────────────────────────────────
+	parseCssDecl() {
+		return this._parseDecl("CssDecl", () => {
+			const bodyToken = this.expect(TT.CSS_BODY);
+			const cssText = bodyToken.value;
+			this.expect(T.RBRACE);
+			return { cssText };
+		});
+	}
 
 	parseTemplDecl() {
-		const _line = this.peek().line;
-		this.advance(); // consume TEMPL_KW
-
-		const name = this.expect(T.IDENT).value;
-
-		// Parse parameter list (standard Go params: LPAREN...RPAREN)
-		const params = this.parseParamList();
-
-		// Optional semicolon between ) and {
-		this.semi();
-
-		// Consume the opening { of the HTML body
-		this.expect(T.LBRACE);
-
-		// Parse the HTML body; parseHtmlChildren consumes the closing RBRACE
-		const body = this.parseHtmlChildren();
-
-		this.semi();
-
-		return { kind: "TemplDecl", name, params, body, _line };
+		return this._parseDecl("TemplDecl", () => ({
+			body: this.parseHtmlChildren(),
+		}));
 	}
 
 	// ── HTML node parsing ─────────────────────────────────────────
@@ -229,14 +205,15 @@ export class TemplParser extends Parser {
 			!this.check(T.RBRACE) &&
 			!this.check(T.EOF)
 		) {
-			if (this.check(TT.TEMPL_CASE)) {
+			if (this.check(TT.TEMPL_CASE) || this.check(TT.TEMPL_DEFAULT)) {
+				const isDefault = this.check(TT.TEMPL_DEFAULT);
 				const caseTok = this.advance();
 				const body = this.parseTemplCaseBody();
-				cases.push({ kind: "TemplCase", caseTokens: caseTok.value, body });
-			} else if (this.check(TT.TEMPL_DEFAULT)) {
-				this.advance();
-				const body = this.parseTemplCaseBody();
-				cases.push({ kind: "TemplCase", caseTokens: null, body });
+				cases.push({
+					kind: "TemplCase",
+					caseTokens: isDefault ? null : caseTok.value,
+					body,
+				});
 			} else {
 				this.advance(); // skip unexpected
 			}

package/src/test-runner.js

@@ -14,6 +14,19 @@ import {
 	gwFilesIn,
 } from "./compiler.js";
 
+// WasmGC + exception handling (what the wasm backend emits) ship enabled by
+// default from Node 22 (V8 11.9+). Older runtimes fail at instantiate time
+// with an opaque CompileError, so check up front and explain.
+export const MIN_WASM_NODE_MAJOR = 22;
+
+export function checkWasmRuntime(version = process.version) {
+	const major = Number.parseInt(version.replace(/^v/, ""), 10);
+	if (Number.isNaN(major) || major >= MIN_WASM_NODE_MAJOR) return;
+	throw new Error(
+		`running wasm packages requires Node ${MIN_WASM_NODE_MAJOR}+ (WasmGC); found ${version}\n  hint: upgrade Node, or compile with --js-only to run the JS backend instead`,
+	);
+}
+
 export function isTestFunc(decl) {
 	if (decl.kind !== "FuncDecl") return false;
 	if (!decl.name.startsWith("Test")) return false;
@@ -382,6 +395,13 @@ export async function runTests(targetDir, options = {}) {
 
 	// `wasm` packages run inside the linked app.wasm; `js` packages that import
 	// wasm packages need the linked module too (hybrid packages).
+	if (compiled.target === "both" || compiled.wasm) {
+		try {
+			checkWasmRuntime();
+		} catch (err) {
+			return reportBuildFailure(err, resolvedDir, options);
+		}
+	}
 	if (compiled.target === "both") {
 		return runDualTarget(compiled, resolvedDir, runHarness, options);
 	}