gofront 0.0.4 → 0.0.6

package/src/index.js

@@ -26,12 +26,13 @@ import { createRequire } from "node:module";
 const _require = createRequire(import.meta.url);
 const { version } = _require("../package.json");
 
-import { basename, dirname, join, resolve } from "node:path";
-import { minify } from "terser";
+import { basename, dirname, join, relative, resolve } from "node:path";
 import { CodeGen } from "./codegen.js";
 import { compileDir } from "./compiler.js";
+import { createDevServer, liveReloadClient } from "./dev-server.js";
 import { parseDts } from "./dts-parser.js";
 import { Lexer } from "./lexer.js";
+import { minify } from "./minifier.js";
 import { Parser } from "./parser.js";
 import { isLocalPath, resolveAll, resolveGwDir } from "./resolver.js";
 import { TypeChecker } from "./typechecker.js";
@@ -55,8 +56,11 @@ Usage:
   gofront <input> -o out.js      Compile and write to file
   gofront <input> --check        Type-check only
   gofront <input> --watch        Watch for changes and recompile
+  gofront <input> -o out.js --serve          Watch + serve with live reload (default port 3000)
+  gofront <input> -o out.js --serve --port 8080  Use a custom port
   gofront <input> --source-map   Append inline source map to output
-  gofront <input> --minify       Minify output with terser
+  gofront <input> --minify       Minify output
+  gofront <input> --minify --mangle  Minify and mangle identifiers
   gofront <file.go> --ast        Dump AST (debug)
   gofront <file.go> --tokens     Dump tokens (debug)
   gofront init [dir]             Scaffold a new GoFront project
@@ -119,8 +123,12 @@ const checkOnly = args.includes("--check");
 const dumpAst = args.includes("--ast");
 const dumpTokens = args.includes("--tokens");
 const sourceMap = args.includes("--source-map");
-const watchMode = args.includes("--watch");
+const serveMode = args.includes("--serve");
+const watchMode = args.includes("--watch") || serveMode;
 const minifyOutput = args.includes("--minify");
+const mangleOutput = args.includes("--mangle");
+const portFlag = args.indexOf("--port");
+const servePort = portFlag !== -1 ? parseInt(args[portFlag + 1], 10) : 3000;
 
 // ── Determine input mode ─────────────────────────────────────
 
@@ -137,7 +145,8 @@ try {
 
 function runCompile() {
 	if (isDir) {
-		return compileDir(inputPath);
+		const outputDir = outputFile ? dirname(resolve(outputFile)) : resolve(".");
+		return compileDir(inputPath, { sourceMap, outputDir });
 	}
 
 	// Single-file mode
@@ -221,7 +230,9 @@ function runCompile() {
 	let js = cg.generate(ast);
 
 	if (sourceMap) {
-		const map = cg.getSourceMap(inputArg);
+		const outputDir = outputFile ? dirname(resolve(outputFile)) : resolve(".");
+		const srcPath = relative(outputDir, inputPath);
+		const map = cg.getSourceMap(srcPath);
 		const b64 = Buffer.from(map).toString("base64");
 		js += `\n//# sourceMappingURL=data:application/json;base64,${b64}`;
 	}
@@ -232,14 +243,13 @@ function runCompile() {
 
 // ── Minify helper ────────────────────────────────────────────
 
-async function maybeMinify(js) {
+function maybeMinify(js) {
 	if (!minifyOutput) return js;
-	const result = await minify(js, {
-		module: true,
-		compress: true,
-		mangle: true,
-	});
-	return result.code;
+	if (sourceMap) {
+		console.error("gofront: --source-map and --minify cannot be used together");
+		process.exit(1);
+	}
+	return minify(js, { mangle: mangleOutput });
 }
 
 // ── Single-shot mode ─────────────────────────────────────────
@@ -262,7 +272,7 @@ if (!watchMode) {
 
 	let js;
 	try {
-		js = await maybeMinify(result.js);
+		js = maybeMinify(result.js);
 	} catch (e) {
 		console.error(`gofront: minify failed: ${e.message}`);
 		process.exit(1);
@@ -290,11 +300,31 @@ function timestamp() {
 	return new Date().toLocaleTimeString();
 }
 
-async function buildOnce() {
+// Start dev server before first build so the browser can connect immediately
+let devServer = null;
+if (serveMode) {
+	if (!outputFile) {
+		console.error("gofront: --serve requires -o <output file>");
+		process.exit(1);
+	}
+	const serveDir = dirname(resolve(outputFile));
+	devServer = createDevServer(serveDir, servePort);
+}
+
+function buildOnce() {
 	try {
 		const startMs = performance.now();
 		const result = runCompile();
-		const js = await maybeMinify(result.js);
+		let js = maybeMinify(result.js);
+		if (serveMode) {
+			// Insert live reload client before the source map comment so it stays last
+			const smIdx = js.lastIndexOf("\n//# sourceMappingURL=");
+			if (smIdx !== -1) {
+				js = `${js.slice(0, smIdx)}\n${liveReloadClient}${js.slice(smIdx)}`;
+			} else {
+				js += `\n${liveReloadClient}`;
+			}
+		}
 		const elapsedMs = (performance.now() - startMs).toFixed(0);
 		if (outputFile) {
 			writeFileSync(outputFile, `${js}\n`);
@@ -307,6 +337,7 @@ async function buildOnce() {
 			console.log(js);
 			console.error(`[${timestamp()}] gofront: OK (${elapsedMs}ms)`);
 		}
+		devServer?.notify();
 	} catch (e) {
 		console.error(`[${timestamp()}] gofront: ERROR`);
 		for (const line of e.message.split("\n")) console.error(`  ${line}`);

package/src/lexer.js

@@ -8,6 +8,8 @@ export const T = {
 	STRING: "STRING",
 	IDENT: "IDENT",
 
+	IMAG: "IMAG",
+
 	// Keywords
 	FUNC: "func",
 	VAR: "var",
@@ -72,6 +74,7 @@ export const T = {
 	PIPE: "|",
 	CARET: "^",
 	AND_NOT: "&^",
+	TILDE: "~",
 	LSHIFT: "<<",
 	RSHIFT: ">>",
 	ELLIPSIS: "...",
@@ -97,6 +100,7 @@ const SEMI_TRIGGERS = new Set([
 	T.IDENT,
 	T.INT,
 	T.FLOAT,
+	T.IMAG,
 	T.STRING,
 	T.RPAREN,
 	T.RBRACE,
@@ -297,10 +301,20 @@ export class Lexer {
 	}
 
 	readRawString() {
+		const l = this.line,
+			c = this.col;
 		this.advance(); // opening `
 		let s = "";
 		while (this.pos < this.src.length && this.peek() !== "`")
 			s += this.advance();
+		if (this.pos >= this.src.length)
+			throw new LexError(
+				"Unterminated raw string",
+				l,
+				c,
+				this.filename,
+				this.src,
+			);
 		this.advance(); // closing `
 		return s;
 	}
@@ -501,7 +515,13 @@ export class Lexer {
 			// Numbers
 			if (/[0-9]/.test(ch)) {
 				const { n, isFloat } = this.readNumber();
-				this.push(isFloat ? T.FLOAT : T.INT, n, l, c);
+				if (this.src[this.pos] === "i") {
+					this.pos++;
+					this.col++;
+					this.push(T.IMAG, n, l, c);
+				} else {
+					this.push(isFloat ? T.FLOAT : T.INT, n, l, c);
+				}
 				continue;
 			}
 
@@ -574,6 +594,9 @@ export class Lexer {
 					if (this.match("=")) this.push(T.CARET_ASSIGN, "^=", l, c);
 					else this.push(T.CARET, "^", l, c);
 					break;
+				case "~":
+					this.push(T.TILDE, "~", l, c);
+					break;
 				case ":":
 					if (this.match("=")) this.push(T.DEFINE, ":=", l, c);
 					else this.push(T.COLON, ":", l, c);