gofront 1.6.0 → 1.7.0

package/src/typechecker/types.js

@@ -83,6 +83,23 @@ export const BROWSER_GLOBALS = new Set([
 	"prompt",
 	"localStorage",
 	"sessionStorage",
+	"WebSocket",
+	"Worker",
+	"HTMLElement",
+	"Element",
+	"Event",
+	"CustomEvent",
+	"URL",
+	"URLSearchParams",
+	"FormData",
+	"Headers",
+	"Request",
+	"Response",
+	"Blob",
+	"File",
+	"FileReader",
+	"TextEncoder",
+	"TextDecoder",
 ]);
 
 // Stdlib packages the WASM backend can emit. Extend as src/backend/wasm/emit-stdlib.js
@@ -91,22 +108,46 @@ export const BROWSER_GLOBALS = new Set([
 export const WASM_SUPPORTED_STDLIB = new Set([
 	"math",
 	"math/bits",
+	"math/rand",
 	"errors",
 	"fmt",
 	"strings",
+	"bytes",
 	"strconv",
+	"unicode",
 	"unicode/utf8",
 	"slices",
 	"maps",
 	"sort",
+	"path",
+	"path/filepath",
+	"html",
+	"io",
+	"time",
 	"testing",
 	"gofront/shared",
+	"gofront/simd",
+	"sync",
+	"crypto/rand",
+	"crypto/sha256",
+	"encoding/binary",
+	"encoding/hex",
+	"encoding/base64",
+]);
+
+export const STDLIB_PACKAGES = new Set([
+	...WASM_SUPPORTED_STDLIB,
+	"os",
+	"gom",
+	"regexp",
+	"encoding/json",
 ]);
 
 // Per-namespace member subset the WASM backend implements. `null` means every
 // member the checker knows about. Members outside the set are rejected in
 // wasm/both packages with "'strings.Split' is not yet available in wasm packages".
 export const WASM_STDLIB_MEMBERS = new Map([
+	["json", new Set()],
 	[
 		"math",
 		new Set([
@@ -141,6 +182,14 @@ export const WASM_STDLIB_MEMBERS = new Map([
 			"Log2",
 			"Log10",
 			"Round",
+			"Remainder",
+			"Float64bits",
+			"Float64frombits",
+			"Float32bits",
+			"Float32frombits",
+			"Sinh",
+			"Cosh",
+			"Tanh",
 			// constants
 			"E",
 			"Pi",
@@ -185,9 +234,16 @@ export const WASM_STDLIB_MEMBERS = new Map([
 			"OnesCount64",
 			"RotateLeft32",
 			"RotateLeft64",
+			"ReverseBytes16",
+			"ReverseBytes32",
+			"ReverseBytes64",
+			"Len32",
+			"Len64",
+			"Reverse32",
+			"Reverse64",
 		]),
 	],
-	["errors", new Set(["New", "Is", "Unwrap"])],
+	["errors", new Set(["New", "Is", "Unwrap", "As", "Join"])],
 	[
 		"utf8",
 		new Set([
@@ -218,7 +274,22 @@ export const WASM_STDLIB_MEMBERS = new Map([
 			"StringsAreSorted",
 		]),
 	],
-	["fmt", new Set(["Sprintf", "Errorf", "Printf", "Println", "Print"])],
+	[
+		"fmt",
+		new Set([
+			"Sprintf",
+			"Errorf",
+			"Printf",
+			"Println",
+			"Print",
+			"Fprintf",
+			"Fprintln",
+			"Fprint",
+			"Sscan",
+			"Sscanln",
+			"Sscanf",
+		]),
+	],
 	[
 		"strings",
 		new Set([
@@ -251,6 +322,24 @@ export const WASM_STDLIB_MEMBERS = new Map([
 			"Split",
 			"Fields",
 			"Join",
+			"Cut",
+			"CutPrefix",
+			"CutSuffix",
+			"SplitN",
+			"SplitAfter",
+			"SplitAfterN",
+			"LastIndexAny",
+			"Map",
+			"IndexFunc",
+			"LastIndexFunc",
+			"TrimFunc",
+			"TrimLeftFunc",
+			"TrimRightFunc",
+			"FieldsFunc",
+			"NewReplacer",
+			"Builder",
+			"NewReader",
+			"Reader",
 		]),
 	],
 	[
@@ -259,17 +348,55 @@ export const WASM_STDLIB_MEMBERS = new Map([
 			"Itoa",
 			"Atoi",
 			"FormatInt",
+			"FormatUint",
 			"FormatFloat",
 			"FormatBool",
 			"ParseInt",
+			"ParseUint",
 			"ParseFloat",
 			"ParseBool",
 			"Quote",
+			"Unquote",
+			"AppendInt",
+			"AppendUint",
+			"AppendFloat",
+			"AppendBool",
+			"ErrSyntax",
+			"ErrRange",
 		]),
 	],
 	[
 		"slices",
-		new Set(["Sort", "Reverse", "Contains", "Index", "Equal", "Clone"]),
+		new Set([
+			"Sort",
+			"Reverse",
+			"Contains",
+			"Index",
+			"IndexFunc",
+			"ContainsFunc",
+			"BinarySearch",
+			"BinarySearchFunc",
+			"Equal",
+			"Clone",
+			"Compare",
+			"SortFunc",
+			"SortStableFunc",
+			"IsSorted",
+			"IsSortedFunc",
+			"Min",
+			"Max",
+			"MinFunc",
+			"MaxFunc",
+			"Compact",
+			"CompactFunc",
+			"Concat",
+			"Delete",
+			"DeleteFunc",
+			"Insert",
+			"Replace",
+			"Grow",
+			"Clip",
+		]),
 	],
 	[
 		"maps",
@@ -284,6 +411,216 @@ export const WASM_STDLIB_MEMBERS = new Map([
 			"DeleteFunc",
 		]),
 	],
+	[
+		"unicode",
+		new Set([
+			"IsLetter",
+			"IsDigit",
+			"IsSpace",
+			"IsUpper",
+			"IsLower",
+			"IsPunct",
+			"IsControl",
+			"IsPrint",
+			"IsGraphic",
+			"ToUpper",
+			"ToLower",
+		]),
+	],
+	[
+		"rand",
+		new Set([
+			"Intn",
+			"Float64",
+			"Float32",
+			"Int",
+			"Int63",
+			"Int63n",
+			"Int31",
+			"Int31n",
+			"Seed",
+			"Shuffle",
+			"Perm",
+			"Read",
+			"Reader",
+		]),
+	],
+	[
+		"bytes",
+		new Set([
+			"Contains",
+			"HasPrefix",
+			"HasSuffix",
+			"Index",
+			"Count",
+			"Repeat",
+			"Replace",
+			"ReplaceAll",
+			"ToUpper",
+			"ToLower",
+			"TrimSpace",
+			"Trim",
+			"Equal",
+			"Split",
+			"Join",
+			"TrimPrefix",
+			"TrimSuffix",
+			"TrimLeft",
+			"TrimRight",
+			"TrimFunc",
+			"IndexByte",
+			"LastIndex",
+			"LastIndexByte",
+			"Fields",
+			"FieldsFunc",
+			"Clone",
+			"Cut",
+			"ToTitle",
+			"ContainsAny",
+			"ContainsRune",
+			"Map",
+			"SplitN",
+			"Buffer",
+			"NewReader",
+			"Reader",
+		]),
+	],
+	[
+		"path",
+		new Set([
+			"Base",
+			"Dir",
+			"Ext",
+			"Join",
+			"Clean",
+			"IsAbs",
+			"Split",
+			"Match",
+			"ErrBadPattern",
+		]),
+	],
+	[
+		"filepath",
+		new Set([
+			"Base",
+			"Dir",
+			"Ext",
+			"Join",
+			"Clean",
+			"IsAbs",
+			"Split",
+			"Match",
+			"ErrBadPattern",
+		]),
+	],
+	["html", new Set(["EscapeString", "UnescapeString"])],
+	[
+		"io",
+		new Set([
+			"Writer",
+			"Reader",
+			"ReadWriter",
+			"Closer",
+			"EOF",
+			"ErrUnexpectedEOF",
+			"ErrShortWrite",
+			"ReadFull",
+			"ReadAll",
+			"Discard",
+			"WriteString",
+			"LimitReader",
+			"Copy",
+			"CopyN",
+		]),
+	],
+	[
+		"time",
+		new Set([
+			"Now",
+			"Since",
+			"Parse",
+			"Unix",
+			"UnixMicro",
+			"UnixMilli",
+			"Date",
+			"Duration",
+			"Nanosecond",
+			"Microsecond",
+			"Millisecond",
+			"Second",
+			"Minute",
+			"Hour",
+			"RFC3339",
+			"RFC3339Nano",
+			"DateOnly",
+			"TimeOnly",
+			"DateTime",
+			"UTC",
+			"Local",
+			"January",
+			"February",
+			"March",
+			"April",
+			"May",
+			"June",
+			"July",
+			"August",
+			"September",
+			"October",
+			"November",
+			"December",
+			"Sunday",
+			"Monday",
+			"Tuesday",
+			"Wednesday",
+			"Thursday",
+			"Friday",
+			"Saturday",
+			"Time",
+		]),
+	],
+	["testing", new Set(["T"])],
+	["sync", new Set(["Mutex", "RWMutex", "Once", "WaitGroup", "Locker"])],
+	["sha256", new Set(["Sum256", "New", "Size", "BlockSize"])],
+	[
+		"binary",
+		new Set([
+			"LittleEndian",
+			"BigEndian",
+			"ByteOrder",
+			"Read",
+			"Write",
+			"Size",
+			"AppendUint16",
+			"AppendUint32",
+			"AppendUint64",
+		]),
+	],
+	[
+		"hex",
+		new Set([
+			"EncodeToString",
+			"DecodeString",
+			"Encode",
+			"Decode",
+			"EncodedLen",
+			"DecodedLen",
+			"ErrLength",
+		]),
+	],
+	[
+		"base64",
+		new Set([
+			"StdEncoding",
+			"URLEncoding",
+			"RawStdEncoding",
+			"RawURLEncoding",
+			"Encoding",
+			"NewEncoding",
+			"StdPadding",
+			"NoPadding",
+		]),
+	],
 ]);
 
 export const VALID_TARGETS = new Set(["js", "wasm", "both"]);
@@ -298,7 +635,7 @@ export const INT = { kind: "basic", name: "int" };
 export const INT8 = { kind: "basic", name: "int8" };
 export const INT16 = { kind: "basic", name: "int16" };
 export const INT32 = { kind: "basic", name: "int32" };
-const INT64 = { kind: "basic", name: "int64" };
+export const INT64 = { kind: "basic", name: "int64" };
 export const UINT = { kind: "basic", name: "uint" };
 export const UINT8 = { kind: "basic", name: "uint8" };
 export const BYTE = UINT8;
@@ -498,17 +835,26 @@ export function typeStr(t) {
 		case "map":
 			return `map[${typeStr(t.key)}]${typeStr(t.value)}`;
 		case "struct":
-			return t.name || "struct{...}";
+			return t.typeArgs && t.typeArgs.length > 0
+				? `${t.name || "struct"}[${t.typeArgs.map(typeStr).join(", ")}]`
+				: t.name || "struct{...}";
 		case "interface":
 			return t.name || "interface{...}";
 		case "namespace":
 			return t.name || "namespace{...}";
-		case "func":
-			return `func(${t.params.map(typeStr).join(", ")}) ${typeStr(t.returns[0] ?? VOID)}`;
+		case "func": {
+			const retStr =
+				t.returns.length > 1
+					? `(${t.returns.map(typeStr).join(", ")})`
+					: typeStr(t.returns[0] ?? VOID);
+			return `func(${t.params.map(typeStr).join(", ")}) ${retStr}`;
+		}
 		case "tuple":
 			return `(${t.types.map(typeStr).join(", ")})`;
 		case "named":
-			return t.name;
+			return t.typeArgs && t.typeArgs.length > 0
+				? `${t.name}[${t.typeArgs.map(typeStr).join(", ")}]`
+				: t.name;
 		case "pointer":
 			return `*${typeStr(t.base)}`;
 		case "typeParam":
@@ -549,6 +895,7 @@ export class Scope {
 		this.parent = parent;
 		this.symbols = new Map();
 		this._consts = new Set(); // names declared as const in this scope
+		this._constExprs = new Map(); // name -> AST initializer expr
 		this._locals = new Set(); // names declared as local variables (var / :=)
 		this._used = new Set(); // names referenced in this scope
 	}
@@ -559,9 +906,15 @@ export class Scope {
 		this.symbols.set(name, type);
 		if (name !== "_") this._locals.add(name);
 	}
-	defineConst(name, type) {
+	defineConst(name, type, expr = null) {
 		this.symbols.set(name, type);
 		this._consts.add(name);
+		if (expr) this._constExprs.set(name, expr);
+	}
+	lookupConstExpr(name) {
+		if (this._constExprs.has(name)) return this._constExprs.get(name);
+		if (this.parent) return this.parent.lookupConstExpr(name);
+		return null;
 	}
 	isConst(name) {
 		if (this._consts.has(name)) return true;

package/src/vendor.js

@@ -19,12 +19,17 @@ export function getExportNames(pkgName, globals = {}) {
 	const clean = base.replace(/[^a-zA-Z0-9_]/g, "_");
 	const names = new Set([pkgName, base, clean]);
 	const extra = globals[pkgName];
-	for (const name of Array.isArray(extra) ? extra : extra ? [extra] : [])
-		names.add(name);
+	for (const name of Array.isArray(extra)
+		? extra
+		: typeof extra === "string"
+			? [extra]
+			: []) {
+		if (typeof name === "string") names.add(name);
+	}
 	return [...names];
 }
 
-export function generateVendorEntry(packages, globals = {}) {
+export function generateVendorEntry(packages, globals = {}, namedExports = {}) {
 	const imports = [];
 	const assignments = [];
 	const exports = [];
@@ -40,6 +45,46 @@ export function generateVendorEntry(packages, globals = {}) {
 			);
 		}
 
+		// Named export global assignments (e.g. window.h = preact.h)
+		const pkgNamed = Object.create(null);
+		const rawNamed = namedExports[pkg];
+		const isSafeKey = (k) =>
+			typeof k === "string" &&
+			k !== "__proto__" &&
+			k !== "prototype" &&
+			k !== "constructor";
+
+		if (Array.isArray(rawNamed)) {
+			for (const name of rawNamed) {
+				if (isSafeKey(name)) pkgNamed[name] = name;
+			}
+		} else if (rawNamed && typeof rawNamed === "object") {
+			for (const [k, v] of Object.entries(rawNamed)) {
+				if (isSafeKey(k) && isSafeKey(v)) pkgNamed[k] = v;
+			}
+		}
+
+		if (typeof globals[pkg] === "object" && !Array.isArray(globals[pkg])) {
+			for (const [k, v] of Object.entries(globals[pkg])) {
+				if (isSafeKey(k) && isSafeKey(v)) pkgNamed[k] = v;
+			}
+		} else if (Array.isArray(globals[pkg])) {
+			for (const item of globals[pkg]) {
+				if (typeof item === "object" && item !== null) {
+					for (const [k, v] of Object.entries(item)) {
+						if (isSafeKey(k) && isSafeKey(v)) pkgNamed[k] = v;
+					}
+				}
+			}
+		}
+
+		for (const [globalName, exportName] of Object.entries(pkgNamed)) {
+			if (!isSafeKey(globalName) || !isSafeKey(exportName)) continue;
+			assignments.push(
+				`    window[${JSON.stringify(globalName)}] = ${id}[${JSON.stringify(exportName)}] !== undefined ? ${id}[${JSON.stringify(exportName)}] : (${id}.default ? ${id}.default[${JSON.stringify(exportName)}] : undefined);`,
+			);
+		}
+
 		const cleanId = pkg
 			.replace(/^@[^/]+\//, "")
 			.replace(/[^a-zA-Z0-9_$]/g, "_");
@@ -82,8 +127,26 @@ function findBundler(projectDir) {
 	return null;
 }
 
-// Normalises `vendor.globals` ({ pkg: string | string[] }) to { pkg: string[] }.
-function normalizeGlobals(raw) {
+export function normalizeNamedExports(raw) {
+	if (raw === undefined || raw === null) return {};
+	if (typeof raw !== "object" || Array.isArray(raw)) return {};
+	const out = {};
+	for (const [pkg, value] of Object.entries(raw)) {
+		if (Array.isArray(value)) {
+			const map = {};
+			for (const name of value) {
+				if (typeof name === "string") map[name] = name;
+			}
+			out[pkg] = map;
+		} else if (typeof value === "object" && value !== null) {
+			out[pkg] = { ...value };
+		}
+	}
+	return out;
+}
+
+// Normalises `vendor.globals` ({ pkg: string | string[] | object })
+export function normalizeGlobals(raw) {
 	if (raw === undefined || raw === null) return {};
 	if (typeof raw !== "object" || Array.isArray(raw)) {
 		throw new Error(
@@ -92,13 +155,17 @@ function normalizeGlobals(raw) {
 	}
 	const out = {};
 	for (const [pkg, value] of Object.entries(raw)) {
-		const list = Array.isArray(value) ? value : [value];
-		if (list.some((v) => typeof v !== "string")) {
+		if (typeof value === "string") {
+			out[pkg] = [value];
+		} else if (Array.isArray(value)) {
+			out[pkg] = value;
+		} else if (typeof value === "object" && value !== null) {
+			out[pkg] = value;
+		} else {
 			throw new Error(
-				`gofront: vendor.globals[${JSON.stringify(pkg)}] must be a string or array of strings`,
+				`gofront: vendor.globals[${JSON.stringify(pkg)}] must be a string, array, or object`,
 			);
 		}
-		out[pkg] = list;
 	}
 	return out;
 }
@@ -119,6 +186,7 @@ export function loadVendorConfig(projectDir) {
 	let packages = dependencies;
 	let minify = false;
 	let globals = {};
+	let namedExports = {};
 
 	if (typeof vendorConfig === "string") {
 		dest = vendorConfig;
@@ -127,13 +195,16 @@ export function loadVendorConfig(projectDir) {
 		if (Array.isArray(vendorConfig.packages)) packages = vendorConfig.packages;
 		if (typeof vendorConfig.minify === "boolean") minify = vendorConfig.minify;
 		globals = normalizeGlobals(vendorConfig.globals);
+		namedExports = normalizeNamedExports(
+			vendorConfig.namedExports ?? vendorConfig.exports,
+		);
 	}
 
 	if (!dest) {
 		dest = existsSync(join(projectDir, "app")) ? "app/vendor.js" : "vendor.js";
 	}
 
-	return { dest, packages, minify, globals };
+	return { dest, packages, minify, globals, namedExports };
 }
 
 function resolveDestinationPaths(projectRoot, dest) {
@@ -299,6 +370,10 @@ export async function bundleVendor(projectDir = ".", options = {}) {
 	const dest = options.dest ?? config.dest;
 	const minify = options.minify ?? config.minify ?? false;
 	const globals = { ...config.globals, ...normalizeGlobals(options.globals) };
+	const namedExports = {
+		...config.namedExports,
+		...normalizeNamedExports(options.namedExports ?? options.exports),
+	};
 
 	if (!packages || packages.length === 0) {
 		return {
@@ -366,7 +441,7 @@ export async function bundleVendor(projectDir = ".", options = {}) {
 		};
 	}
 
-	const entryCode = generateVendorEntry(packages, globals);
+	const entryCode = generateVendorEntry(packages, globals, namedExports);
 	const entryFile = join(
 		projectRoot,
 		`.gofront-vendor-entry-${Date.now()}.mjs`,