gofront 1.6.1 → 1.7.0

package/src/backend/js/statements.js

@@ -184,8 +184,7 @@ export const statementGenMethods = {
 			this.line(`const ${tmp} = ${rhs[0]};`);
 			for (let i = 0; i < lhs.length; i++) {
 				if (lhs[i] === "_") continue;
-				const prefix = redecls[i] ? "" : "let ";
-				this.line(`${prefix}${lhs[i]} = ${tmp}[${i}];`);
+				this._genDefineSingleVar([lhs[i]], [`${tmp}[${i}]`], [redecls[i]]);
 			}
 		} else {
 			for (let i = 0; i < lhs.length; i++) {
@@ -193,12 +192,20 @@ export const statementGenMethods = {
 					this.line(`${rhs[i]};`);
 					continue;
 				}
-				const prefix = redecls[i] ? "" : "let ";
-				this.line(`${prefix}${lhs[i]} = ${rhs[i]};`);
+				this._genDefineSingleVar([lhs[i]], [rhs[i]], [redecls[i]]);
 			}
 		}
 	},
 
+	// Address-taken variables introduced by a destructuring declaration are
+	// re-bound to their { value } box.
+	_boxDeclaredNames(names) {
+		for (const n of names) {
+			if (n && n !== "_" && this._boxedVars.has(n))
+				this.line(`${n} = { value: ${n} };`);
+		}
+	},
+
 	_genDefineStmt(stmt) {
 		const rhsNode = stmt.rhs[0];
 		if (this._isCommaOkMapExpr(stmt, rhsNode)) {
@@ -221,6 +228,7 @@ export const statementGenMethods = {
 			const rhsStr = rhs.length === 1 ? rhs[0] : `[${rhs.join(", ")}]`;
 			const names = lhs.map((n) => (n === "_" ? "" : n));
 			this.line(`let [${names.join(", ")}] = ${rhsStr};`);
+			this._boxDeclaredNames(names);
 		} else {
 			this._genDefineMixedRedecl(lhs, rhs, redecls);
 		}
@@ -863,14 +871,29 @@ export const statementGenMethods = {
 		}
 	},
 
+	// Interface-typed tags may hold boxed named values; cases compare with __ifeq.
+	_switchTagAndCases(stmt) {
+		const tag = stmt.tag ? this.genExpr(stmt.tag) : "true";
+		if (!stmt.tag || !this._isIfaceType(stmt.tag._type))
+			return { tag, caseExpr: (e) => this.genExpr(e) };
+		this.useHelper("ifeq");
+		this._swCounter = (this._swCounter ?? 0) + 1;
+		const tmp = `__sw${this._swCounter}`;
+		this.line(`const ${tmp} = ${tag};`);
+		return {
+			tag: "true",
+			caseExpr: (e) => `__ifeq(${tmp}, ${this._genIfaceOperand(e)})`,
+		};
+	},
+
 	genSwitch(stmt) {
 		const genBody = () => {
-			const tag = stmt.tag ? this.genExpr(stmt.tag) : "true";
+			const { tag, caseExpr } = this._switchTagAndCases(stmt);
 			this.line(`switch (${tag}) {`);
 			this.indented(() => {
 				for (const c of stmt.cases) {
 					if (c.list) {
-						for (const e of c.list) this.line(`case ${this.genExpr(e)}:`);
+						for (const e of c.list) this.line(`case ${caseExpr(e)}:`);
 					} else {
 						this.line("default:");
 					}
@@ -926,6 +949,13 @@ export const statementGenMethods = {
 					.join(" || ");
 				this.line(`${first ? "if" : "else if"} (${cond}) {`);
 				this.indented(() => {
+					// A single named non-struct case binds the unboxed value.
+					if (
+						stmt.assign &&
+						c.types.length === 1 &&
+						this._isNamedBoxTypeNode(c.types[0])
+					)
+						this.line(`const ${stmt.assign} = __tsw.__gfUnbox();`);
 					for (const s of c.stmts) this.genStmt(s);
 				});
 				this.line("}");

package/src/backend/js/stdlib/errors.js

@@ -24,6 +24,11 @@ export const errorsMethods = {
 			if (concreteGoType?.kind === "interface" || typeName === "error") {
 				return `__errorAs(${args[0]}, ${args[1]}, (x) => x !== null && (typeof x === "object" ? typeof x.Error === "function" : true))`;
 			}
+			// Named non-struct error types sit in interfaces as boxes; store the raw value.
+			const namedBox = this._namedBoxInfo(concreteGoType);
+			if (namedBox) {
+				return `__errorAs(${args[0]}, ${args[1]}, (x) => x instanceof ${namedBox.cls}, (x) => x.__gfUnbox())`;
+			}
 			if (typeName) {
 				return `__errorAs(${args[0]}, ${args[1]}, (x) => (typeof ${typeName} === "function" && x instanceof ${typeName}) || x?.constructor?.name === "${typeName}" || x?.__struct === "${typeName}")`;
 			}

package/src/backend/js/stdlib/index.js

@@ -12,6 +12,7 @@ import { gomMethods } from "./gom.js";
 import { hexMethods } from "./hex.js";
 import { htmlMethods } from "./html.js";
 import { ioMethods } from "./io.js";
+import { jsonMethods } from "./json.js";
 import { mapsMethods } from "./maps.js";
 import { mathMethods } from "./math.js";
 import { osMethods } from "./os.js";
@@ -20,6 +21,7 @@ import { randMethods } from "./rand.js";
 import { regexpMethods } from "./regexp.js";
 import { sha256Methods } from "./sha256.js";
 import { sharedMethods } from "./shared.js";
+import { simdMethods } from "./simd.js";
 import { slicesMethods } from "./slices.js";
 import { sortMethods } from "./sort.js";
 import { strconvMethods } from "./strconv.js";
@@ -62,6 +64,8 @@ const STDLIB_METHOD_MAP = {
 	binary: "_genBinary",
 	hex: "_genHex",
 	base64: "_genBase64",
+	json: "_genJson",
+	simd: "_genSimd",
 };
 
 const dispatchMethods = {
@@ -82,6 +86,12 @@ const dispatchMethods = {
 	// Dispatch table for stdlib namespace calls (pkg.Func → inline JS).
 	// Returns the generated JS string, or undefined if not handled.
 	_genStdlibCall(ns, fn, expr) {
+		// Stdlib shims take raw values; only fmt and errors use the interface box
+		// of a named value (Error() dispatch, error comparisons).
+		const isNamespace = expr.func?.expr?._type?.kind === "namespace";
+		if (isNamespace && ns !== "fmt" && ns !== "errors") {
+			for (const e of expr.args) if (e) e._noNamedBox = true;
+		}
 		const a = () => expr.args.map((e) => this.genExpr(e));
 		if (ns === "gom") return this._genGom(fn, expr);
 		const method = STDLIB_METHOD_MAP[ns];
@@ -106,6 +116,7 @@ export const stdlibGenMethods = {
 	...randMethods,
 	...regexpMethods,
 	...sharedMethods,
+	...simdMethods,
 	...slicesMethods,
 	...sortMethods,
 	...strconvMethods,
@@ -119,5 +130,6 @@ export const stdlibGenMethods = {
 	...binaryMethods,
 	...hexMethods,
 	...base64Methods,
+	...jsonMethods,
 	...dispatchMethods,
 };