gofront 0.0.9 → 1.0.0

package/src/compiler.js

@@ -17,14 +17,14 @@
 
 import { readdirSync, readFileSync, statSync } from "node:fs";
 import { basename, dirname, join, relative, resolve } from "node:path";
-import { CodeGen } from "./codegen.js";
+import { CodeGen } from "./codegen/index.js";
 import { parseDts } from "./dts-parser.js";
 import { Lexer } from "./lexer.js";
-import { Parser } from "./parser.js";
+import { Parser } from "./parser/index.js";
 import { isLocalPath, resolveAll, resolveGwDir } from "./resolver.js";
 import { TemplLexer } from "./templ-lexer.js";
 import { TemplParser } from "./templ-parser.js";
-import { TypeChecker } from "./typechecker.js";
+import { TypeChecker } from "./typechecker/index.js";
 
 // ── Parse cache ──────────────────────────────────────────────
 
@@ -41,29 +41,20 @@ export function parseCacheSize() {
 
 // ── Helpers ──────────────────────────────────────────────────
 
-function parseFile(filePath) {
+function parseGoFrontFile(filePath) {
 	const mtime = statSync(filePath).mtimeMs;
 	const cached = _parseCache.get(filePath);
 	if (cached && cached.mtime === mtime) return cached.ast;
 
 	const source = readFileSync(filePath, "utf8");
 	const filename = basename(filePath);
-	const tokens = new Lexer(source, filename).tokenize();
-	const ast = new Parser(tokens, filename, source).parse();
-	ast._source = source;
-	_parseCache.set(filePath, { mtime, ast });
-	return ast;
-}
-
-function parseTemplFile(filePath) {
-	const mtime = statSync(filePath).mtimeMs;
-	const cached = _parseCache.get(filePath);
-	if (cached && cached.mtime === mtime) return cached.ast;
-
-	const source = readFileSync(filePath, "utf8");
-	const filename = basename(filePath);
-	const tokens = new TemplLexer(source, filename).tokenize();
-	const ast = new TemplParser(tokens, filename, source).parse();
+	const isTempl = filePath.endsWith(".templ");
+	const tokens = isTempl
+		? new TemplLexer(source, filename).tokenize()
+		: new Lexer(source, filename).tokenize();
+	const ast = isTempl
+		? new TemplParser(tokens, filename, source).parse()
+		: new Parser(tokens, filename, source).parse();
 	ast._source = source;
 	_parseCache.set(filePath, { mtime, ast });
 	return ast;
@@ -76,53 +67,27 @@ function gwFilesIn(dir) {
 		.map((f) => join(dir, f));
 }
 
-// ── Main entry points ─────────────────────────────────────────
-
-export function compileDir(dir, options = {}) {
-	const files = gwFilesIn(dir);
-	if (files.length === 0) throw new Error(`No .go files found in ${dir}`);
-	return compileFiles(files, { ...options, fromDir: dir });
-}
-
-export function compileFiles(files, options = {}) {
-	const fromDir = options.fromDir ?? dirname(resolve(files[0]));
-
-	// ── 1. Parse ─────────────────────────────────────────────────
-	const parseErrors = [];
-	const programs = [];
-	for (const f of files) {
-		try {
-			programs.push(f.endsWith(".templ") ? parseTemplFile(f) : parseFile(f));
-		} catch (e) {
-			parseErrors.push(e.message);
-		}
-	}
-	if (parseErrors.length > 0) {
-		throw new Error(parseErrors.join("\n"));
-	}
-
-	// Validate consistent package name
-	const pkgNames = [...new Set(programs.map((p) => p.pkg.name))];
-	if (pkgNames.length > 1)
-		throw new Error(
-			`Mixed package names in ${fromDir}: ${pkgNames.join(", ")}`,
-		);
-	const pkgName = pkgNames[0];
-
-	// ── 2. Resolve imports ────────────────────────────────────────
-	const checker = new TypeChecker();
-	const jsImports = new Map(); // npm imports → exported names (for ESM emit)
-	const bundledPackages = new Set(); // package names whose code is inlined
-	const preambles = []; // JS code from compiled sub-packages
-
+// ── Import resolution ─────────────────────────────────────────
+//
+// Shared by compileFiles (multi-file) and the single-file path in index.js.
+// Mutates checker, jsImports, bundledPackages, and preambles in place.
+
+export function resolveImports(
+	programs,
+	fromFile,
+	checker,
+	jsImports,
+	bundledPackages,
+	preambles,
+) {
+	const fromDir = dirname(resolve(fromFile));
 	const allImports = programs.flatMap((p) => p.imports);
-	const dummyFromFile = join(fromDir, "_dummy.go");
 
 	// js: prefix — local .d.ts files
 	for (const imp of allImports) {
 		for (const { path, alias } of imp.imports) {
 			if (!path.startsWith("js:")) continue;
-			if (alias === "_") continue; // side-effect import — no type definitions
+			if (alias === "_") continue;
 			const dtsPath = join(fromDir, path.slice(3));
 			try {
 				const { types, values } = parseDts(readFileSync(dtsPath, "utf8"));
@@ -133,12 +98,12 @@ export function compileFiles(files, options = {}) {
 		}
 	}
 
-	// npm packages — exclude side-effect imports (alias "_") from type resolution
+	// npm packages — exclude side-effect imports from type resolution
 	const allImportsNoSideEffect = allImports.map((imp) => ({
 		...imp,
 		imports: imp.imports.filter(({ alias }) => alias !== "_"),
 	}));
-	const resolved = resolveAll(allImportsNoSideEffect, dummyFromFile, parseDts);
+	const resolved = resolveAll(allImportsNoSideEffect, fromFile, parseDts);
 	for (const [path, info] of resolved) {
 		if (!info) continue;
 		checker.addDefinitions(info.types, info.values);
@@ -152,29 +117,20 @@ export function compileFiles(files, options = {}) {
 			for (const { path, alias, _line } of imp.imports) {
 				if (!isLocalPath(path) || seenLocalPaths.has(path)) continue;
 				seenLocalPaths.add(path);
-
-				const depDir = resolveGwDir(path, dummyFromFile);
+				const depDir = resolveGwDir(path, fromFile);
 				if (!depDir) {
 					console.error(
 						`gofront: warning: cannot find local package '${path}' relative to ${fromDir}`,
 					);
 					continue;
 				}
-
-				// Recursively compile dependency
 				const dep = compileDir(depDir);
 				preambles.push(dep.js);
-				if (alias === "_") continue; // side-effect import — bundle code but don't expose namespace
-
-				// Dot import: flatten all exported symbols into global scope
+				if (alias === "_") continue;
 				if (alias === ".") {
 					checker.addDefinitions(dep.exportedTypes, dep.exportedSymbols);
-					// All dep symbols must be treated as bundled so codegen
-					// can emit them without a qualifier.  We DON'T add a
-					// namespace, so SelectorExpr never appears for these.
 					continue;
 				}
-
 				const nameUsed = alias ?? dep.pkgName;
 				bundledPackages.add(nameUsed);
 				checker.addPackageNamespace(
@@ -186,6 +142,56 @@ export function compileFiles(files, options = {}) {
 			}
 		}
 	}
+}
+
+// ── Main entry points ─────────────────────────────────────────
+
+export function compileDir(dir, options = {}) {
+	const files = gwFilesIn(dir);
+	if (files.length === 0) throw new Error(`No .go files found in ${dir}`);
+	return compileFiles(files, { ...options, fromDir: dir });
+}
+
+export function compileFiles(files, options = {}) {
+	const fromDir = options.fromDir ?? dirname(resolve(files[0]));
+
+	// ── 1. Parse ─────────────────────────────────────────────────
+	const parseErrors = [];
+	const programs = [];
+	for (const f of files) {
+		try {
+			programs.push(parseGoFrontFile(f));
+		} catch (e) {
+			parseErrors.push(e.message);
+		}
+	}
+	if (parseErrors.length > 0) {
+		throw new Error(parseErrors.join("\n"));
+	}
+
+	// Validate consistent package name
+	const pkgNames = [...new Set(programs.map((p) => p.pkg.name))];
+	if (pkgNames.length > 1)
+		throw new Error(
+			`Mixed package names in ${fromDir}: ${pkgNames.join(", ")}`,
+		);
+	const pkgName = pkgNames[0];
+
+	// ── 2. Resolve imports ────────────────────────────────────────
+	const checker = new TypeChecker();
+	const jsImports = new Map(); // npm imports → exported names (for ESM emit)
+	const bundledPackages = new Set(); // package names whose code is inlined
+	const preambles = []; // JS code from compiled sub-packages
+
+	const dummyFromFile = join(fromDir, "_dummy.go");
+	resolveImports(
+		programs,
+		dummyFromFile,
+		checker,
+		jsImports,
+		bundledPackages,
+		preambles,
+	);
 
 	// ── 3. Type-check ─────────────────────────────────────────────
 	const errors = checker.checkAll(programs);