gofront 1.3.8 → 1.3.10

package/README.md

@@ -401,7 +401,23 @@ gofront init [dir]                         scaffold a new project
 gofront --version / -v                     print version
 gofront --help / -h                        print this help
 ```
+### Project configuration
 
+`gofront dev`, `build`, `prep`, `check` and `test` read optional settings from a `gofront.json`
+file or a `"gofront": { … }` object in `package.json`:
+
+| Key | Default | Description |
+|---|---|---|
+| `src` | `app/src`, `src` or `main.go` | Package directory (or single file) to compile |
+| `serveDir` | `app`, `.` or `public` (first with `index.html`) | Directory served by `dev` and mirrored into the build |
+| `outDir` | `public` | Release output directory for `build` |
+| `output` | `app/app.js` | Dev-mode compiled bundle path |
+| `port` | `3000` | Dev server port |
+| `assetExtensions` | `[]` | Extra file extensions (e.g. `[".bmesh", ".mat"]`) copied from `serveDir` into `outDir` on `build`, in addition to the built-in web asset list (html, css, js, json, images, fonts, audio, video, wasm) |
+| `vendor` | `app/vendor.js` | Vendor bundle written by `prep`/`build` from `package.json` `dependencies`. Either a destination path string or `{ "dest": string \| string[], "packages": string[], "minify": boolean, "globals": { "<pkg>": string \| string[] } }` |
+| `assetCopy` | `[]` | Static files copied by `prep`/`build`: `[{ "source": "node_modules/x/font.woff2", "dest": "app/fonts/font.woff2" }]` |
+
+All settings live in this one place — top-level `"vendor"` / `"assetCopy"` keys in `package.json` are not read.
 ---
 
 ## Multi-file packages

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "gofront",
-	"version": "1.3.8",
+	"version": "1.3.10",
 	"author": "Luuk van Venrooij",
 	"license": "MIT",
 	"repository": {

package/src/asset-manager.js

@@ -1,14 +1,7 @@
 // Native static asset manager for GoFront projects.
 // Zero-dependency file and directory copier using node:fs.
 
-import {
-	copyFileSync,
-	cpSync,
-	existsSync,
-	mkdirSync,
-	readFileSync,
-	statSync,
-} from "node:fs";
+import { copyFileSync, cpSync, existsSync, mkdirSync, statSync } from "node:fs";
 import {
 	basename,
 	dirname,
@@ -18,25 +11,11 @@ import {
 	resolve,
 	sep,
 } from "node:path";
+import { loadProjectConfig } from "./project-config.js";
 
 export function loadAssetConfig(projectDir) {
-	const gofrontJsonPath = join(projectDir, "gofront.json");
-	if (existsSync(gofrontJsonPath)) {
-		try {
-			const parsed = JSON.parse(readFileSync(gofrontJsonPath, "utf8"));
-			if (Array.isArray(parsed.assetCopy)) return parsed.assetCopy;
-		} catch {}
-	}
-
-	const pkgJsonPath = join(projectDir, "package.json");
-	if (existsSync(pkgJsonPath)) {
-		try {
-			const parsed = JSON.parse(readFileSync(pkgJsonPath, "utf8"));
-			if (Array.isArray(parsed.assetCopy)) return parsed.assetCopy;
-		} catch {}
-	}
-
-	return [];
+	const entries = loadProjectConfig(projectDir).assetCopy;
+	return Array.isArray(entries) ? entries : [];
 }
 
 function copyFileAsset(srcPath, destPath, dest) {

package/src/cli-core.js

@@ -26,6 +26,7 @@ import { copyAssets } from "./asset-manager.js";
 import { compileDir, compileSingleFile } from "./compiler.js";
 import { createDevServer } from "./dev-server.js";
 import { minify } from "./minifier.js";
+import { loadProjectConfig } from "./project-config.js";
 import { generatePwa } from "./pwa.js";
 import { runTests } from "./test-runner.js";
 import { bundleVendor } from "./vendor.js";
@@ -314,25 +315,6 @@ export function findPackageDirs(root) {
 
 // ── Project detection ─────────────────────────────────────────
 
-function loadProjectConfig(projectRoot) {
-	const gofrontJson = join(projectRoot, "gofront.json");
-	if (existsSync(gofrontJson)) {
-		try {
-			return JSON.parse(readFileSync(gofrontJson, "utf8"));
-		} catch {}
-	}
-	const pkgJson = join(projectRoot, "package.json");
-	if (existsSync(pkgJson)) {
-		try {
-			const pkg = JSON.parse(readFileSync(pkgJson, "utf8"));
-			if (pkg.gofront && typeof pkg.gofront === "object") {
-				return pkg.gofront;
-			}
-		} catch {}
-	}
-	return {};
-}
-
 function resolveSrcDir(projectRoot, config) {
 	const src = config.src || config.input;
 	if (src) return isAbsolute(src) ? src : resolve(projectRoot, src);
@@ -562,10 +544,23 @@ const STATIC_ASSET_EXTS = new Set([
 
 const ROOT_CONFIG_EXTS = new Set([".js", ".mjs", ".json"]);
 
+// Builds the asset extension whitelist: defaults plus any `assetExtensions` from project config.
+export function resolveAssetExtensions(config = {}) {
+	const exts = new Set(STATIC_ASSET_EXTS);
+	const extra = config.assetExtensions;
+	if (!Array.isArray(extra)) return exts;
+	for (const raw of extra) {
+		if (typeof raw !== "string" || raw.trim() === "") continue;
+		const ext = raw.trim().toLowerCase();
+		exts.add(ext.startsWith(".") ? ext : `.${ext}`);
+	}
+	return exts;
+}
+
 // Whether a file in the served directory is a web asset worth copying to the build output.
-function isStaticAsset(name, atProjectRoot) {
+function isStaticAsset(name, atProjectRoot, exts = STATIC_ASSET_EXTS) {
 	const ext = extname(name).toLowerCase();
-	if (!STATIC_ASSET_EXTS.has(ext)) return false;
+	if (!exts.has(ext)) return false;
 	// At the project root, .js/.json files are tooling config, not web assets.
 	if (atProjectRoot && ROOT_CONFIG_EXTS.has(ext))
 		return name === "manifest.json";
@@ -578,6 +573,7 @@ function copyServeDirAssets(project, outDir, srcDir) {
 	const out = resolve(outDir);
 	if (!existsSync(serveDir) || serveDir === out) return 0;
 	const isRoot = serveDir === resolve(project.projectRoot);
+	const exts = resolveAssetExtensions(project.config);
 	const skipDirs = [out, resolve(srcDir)];
 	const devOutput = resolve(project.devOutputFile);
 	const skipFiles = new Set([devOutput, `${devOutput}.map`]);
@@ -600,7 +596,7 @@ function copyServeDirAssets(project, outDir, srcDir) {
 			} else if (
 				entry.isFile() &&
 				!skipFiles.has(full) &&
-				isStaticAsset(entry.name, isRoot)
+				isStaticAsset(entry.name, isRoot, exts)
 			) {
 				copyFile(full);
 			}

package/src/codegen/templ.js

@@ -92,21 +92,36 @@ export const templGenMethods = {
 	_genTemplElement(node, p) {
 		const { tag, attrs, children } = node;
 		const elVar = this._freshVar("e");
-		this.line(
-			`const ${elVar} = document.createElement(${JSON.stringify(tag)});`,
-		);
+		// <svg> and its descendants must be created in the SVG namespace.
+		const isSvg = tag === "svg" || this._templSvgDepth > 0;
+		if (isSvg) {
+			this.line(
+				`const ${elVar} = document.createElementNS("http://www.w3.org/2000/svg", ${JSON.stringify(tag)});`,
+			);
+		} else {
+			this.line(
+				`const ${elVar} = document.createElement(${JSON.stringify(tag)});`,
+			);
+		}
+		this._templSvgDepth = (this._templSvgDepth || 0) + (isSvg ? 1 : 0);
 		for (const attr of attrs) {
-			this._genTemplAttr(attr, elVar);
+			this._genTemplAttr(attr, elVar, isSvg);
 		}
 		this._genTemplNodes(children, elVar);
+		if (isSvg) this._templSvgDepth--;
 		this.line(`${p}.appendChild(${elVar});`);
 	},
 
-	_genTemplAttr(attr, el) {
+	_genTemplAttr(attr, el, isSvg) {
 		const { name } = attr;
+		// SVGElement.className is a read-only SVGAnimatedString.
+		const setClass = (js) =>
+			isSvg
+				? `${el}.setAttribute("class", ${js});`
+				: `${el}.className = ${js};`;
 		if (attr.kind === "static") {
 			if (name === "class") {
-				this.line(`${el}.className = ${JSON.stringify(attr.value)};`);
+				this.line(setClass(JSON.stringify(attr.value)));
 			} else {
 				this.line(
 					`${el}.setAttribute(${JSON.stringify(name)}, ${JSON.stringify(attr.value)});`,
@@ -115,7 +130,7 @@ export const templGenMethods = {
 		} else if (attr.kind === "expr") {
 			const exprJs = this._genTemplTokenExpr(attr.tokens);
 			if (name === "class") {
-				this.line(`${el}.className = ${exprJs};`);
+				this.line(setClass(exprJs));
 			} else {
 				this.line(
 					`${el}.setAttribute(${JSON.stringify(name)}, String(${exprJs}));`,

package/src/minifier.js

@@ -117,10 +117,14 @@ const REGEX_CONTEXT_VALUES = new Set([
 	"||",
 ]);
 
+// Ops after which `/` is division, not a regex start
+const DIVISION_AFTER_OPS = new Set([")", "]", "++", "--"]);
+
 function _isRegexContext(tokens) {
 	const prev = lastNonWhitespaceToken(tokens);
 	if (!prev) return true;
-	return prev.type === "op" || REGEX_CONTEXT_VALUES.has(prev.value);
+	if (prev.type === "op") return !DIVISION_AFTER_OPS.has(prev.value);
+	return REGEX_CONTEXT_VALUES.has(prev.value);
 }
 
 function _scanRegexLiteral(code, i, len) {
@@ -129,6 +133,7 @@ function _scanRegexLiteral(code, i, len) {
 	let inCharClass = false;
 	while (j < len) {
 		const rc = code[j];
+		if (rc === "\n") break;
 		if (escaped) {
 			escaped = false;
 		} else if (rc === "\\") {
@@ -457,12 +462,29 @@ function _collectVarLocalDecls(tokens, i, declaredLocals) {
 		collectDestructured(tokens, next.idx, declaredLocals);
 }
 
+function _matchingParen(tokens, openIdx) {
+	let depth = 1;
+	for (let i = openIdx + 1; i < tokens.length; i++) {
+		const v = tokens[i].value;
+		if (v === "(") depth++;
+		else if (v === ")" && --depth === 0) return i;
+	}
+	return -1;
+}
+
+// A `(` opens a parameter list only when its `)` is followed by a body `{` or `=>`;
+// otherwise `name(...)` is a call and its arguments may be free globals.
 function _collectParamDecls(tokens, i, declaredLocals) {
 	const prev = findPrevNonWsToken(tokens, i);
 	if (
-		prev &&
-		(prev.value === "function" || prev.type === "ident" || prev.value === ")")
+		!prev ||
+		(prev.value !== "function" && prev.type !== "ident" && prev.value !== ")")
 	)
+		return;
+	const close = _matchingParen(tokens, i);
+	if (close < 0) return;
+	const after = nextNonWs(tokens, close);
+	if (after && (after.tok.value === "{" || after.tok.value === "=>"))
 		collectParams(tokens, i, declaredLocals);
 }
 
@@ -514,6 +536,33 @@ const MANGLE_GLOBALS = new Set([
 	"Infinity",
 	"TextEncoder",
 	"TextDecoder",
+	"globalThis",
+	"Reflect",
+	"Proxy",
+	"WeakMap",
+	"WeakSet",
+	"ArrayBuffer",
+	"DataView",
+	"Int8Array",
+	"Uint8Array",
+	"Uint8ClampedArray",
+	"Int16Array",
+	"Uint16Array",
+	"Int32Array",
+	"Uint32Array",
+	"Float32Array",
+	"Float64Array",
+	"BigInt64Array",
+	"BigUint64Array",
+	"Image",
+	"URL",
+	"Event",
+	"fetch",
+	"navigator",
+	"performance",
+	"localStorage",
+	"requestAnimationFrame",
+	"cancelAnimationFrame",
 	"setTimeout",
 	"setInterval",
 	"clearTimeout",

package/src/project-config.js

@@ -0,0 +1,23 @@
+// Project configuration loader shared by the CLI, asset manager and vendor bundler.
+// Settings live in `gofront.json` at the project root, or under `"gofront"` in `package.json`.
+
+import { existsSync, readFileSync } from "node:fs";
+import { join } from "node:path";
+
+export function loadProjectConfig(projectRoot) {
+	const gofrontJson = join(projectRoot, "gofront.json");
+	if (existsSync(gofrontJson)) {
+		try {
+			const parsed = JSON.parse(readFileSync(gofrontJson, "utf8"));
+			if (parsed && typeof parsed === "object") return parsed;
+		} catch {}
+	}
+	const pkgJson = join(projectRoot, "package.json");
+	if (existsSync(pkgJson)) {
+		try {
+			const pkg = JSON.parse(readFileSync(pkgJson, "utf8"));
+			if (pkg.gofront && typeof pkg.gofront === "object") return pkg.gofront;
+		} catch {}
+	}
+	return {};
+}

package/src/vendor.js

@@ -12,6 +12,7 @@ import {
 import { createRequire } from "node:module";
 import { dirname, isAbsolute, join, relative, resolve } from "node:path";
 import { pathToFileURL } from "node:url";
+import { loadProjectConfig } from "./project-config.js";
 
 export function getExportNames(pkgName, globals = {}) {
 	const base = pkgName.replace(/^@[^/]+\//, "");
@@ -111,15 +112,7 @@ export function loadVendorConfig(projectDir) {
 		} catch {}
 	}
 
-	const gfjPath = join(projectDir, "gofront.json");
-	let gfj = {};
-	if (existsSync(gfjPath)) {
-		try {
-			gfj = JSON.parse(readFileSync(gfjPath, "utf8"));
-		} catch {}
-	}
-
-	const vendorConfig = gfj.vendor ?? pkg.vendor ?? null;
+	const vendorConfig = loadProjectConfig(projectDir).vendor ?? null;
 	const dependencies = Object.keys(pkg.dependencies ?? {});
 
 	let dest = null;