nomen-lang 0.2.2 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nomen-lang",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "The CLI for the Nomen programming language.",
   "keywords": [],
   "license": "ISC",

package/src/index.ts

@@ -310,7 +310,9 @@ function processFolder(folder: string, config: Config, mode: Mode, program_args:
 	let dirent;
 	while ((dirent = dir.readSync()) !== null) {
 		if (shouldProcessFile(dirent.name)) {
-			processFile(path.join(folder, dirent.name), config, mode, program_args);
+			// Folder mode checks each file in its own context — anchoring
+			// here would recompile the whole project once per file.
+			processFile(path.join(folder, dirent.name), config, mode, program_args, false);
 			// @ts-ignore
 			let _ = fs.watch;
 		}
@@ -322,7 +324,46 @@ function shouldProcessFile(filename: string) {
 	return path.extname(filename) === SUPPORTED_EXTENSION;
 }
 
-function processFile(filename: string, config: Config, mode: Mode, program_args: string[]) {
+/**
+ * The project's entry file for `file_path`: walk up to the nearest
+ * `package.jsonc` and resolve its `entry` field, so any file inside a project
+ * is checked with the entry's import context (`import types` resolves
+ * against the project's `src/`, not the file's own folder). Returns
+ * undefined when the file is standalone, IS the entry, sits in an
+ * entry-less project (e.g. a library checkout), or the config is malformed.
+ */
+function project_entry_for(file_path: string): string | undefined {
+	let dir = path.dirname(file_path);
+	for (let i = 0; i < 20; i++) {
+		const config_path = path.join(dir, "package.jsonc");
+		if (fs.existsSync(config_path)) {
+			try {
+				const raw = fs.readFileSync(config_path, "utf8");
+				const json = raw.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
+				const parsed = JSON.parse(json);
+				if (parsed.entry) {
+					const entry = path.resolve(dir, parsed.entry);
+					if (entry !== file_path && fs.existsSync(entry)) return entry;
+				}
+			} catch {
+				// malformed config — keep the file's own context
+			}
+			return undefined;
+		}
+		const parent = path.dirname(dir);
+		if (parent === dir) return undefined;
+		dir = parent;
+	}
+	return undefined;
+}
+
+function processFile(
+	filename: string,
+	config: Config,
+	mode: Mode,
+	program_args: string[],
+	anchor_to_project = true,
+) {
 	console.log("Processing", filename);
 
 	const arch = config.arch || "aarch64";
@@ -333,12 +374,22 @@ function processFile(filename: string, config: Config, mode: Mode, program_args:
 		config.lib = resolve_lib(resolved);
 	}
 
+	// A `*.test.nm` file keeps its own join context: the test harness
+	// anchors at the test's folder and pulls the program's `src/` module in
+	// with `main` stripped, which the entry's context would not do.
+	const anchor =
+		anchor_to_project && !resolved.endsWith(".test.nm")
+			? (project_entry_for(resolved) ?? resolved)
+			: resolved;
+	if (anchor !== resolved) {
+		console.log("Anchored to project entry", anchor);
+	}
+
 	let startTime = performance.now();
 
-	const resolved_path = path.resolve(filename);
-	const input = join(resolved_path, config.lib);
+	const input = join(anchor, config.lib);
 	const library = config.lib ? get_library(config.lib) : undefined;
-	const parsed = parse(input, library, resolved_path);
+	const parsed = parse(input, library, anchor);
 
 	let errors = parsed.errors;
 
@@ -373,14 +424,14 @@ function processFile(filename: string, config: Config, mode: Mode, program_args:
 	const basename = path.basename(filename, ".nm");
 	// Output lives in the project's `build/` — `build/test` for *.test.nm —
 	// unless an explicit --out names the linked binary.
-	const buildDir = build_dir_for(resolved_path, filename.endsWith(".test.nm"));
+	const buildDir = build_dir_for(resolved, filename.endsWith(".test.nm"));
 	if (!fs.existsSync(buildDir)) {
 		fs.mkdirSync(buildDir, { recursive: true });
 	}
 	const ext = arch === "aarch64" ? ".s" : platform === "macos" || platform === "ios" ? ".m" : ".c";
 	const headerfile = path.join(buildDir, "main.h");
 	const codefile = path.join(buildDir, basename + ext);
-	const outfile = outfile_for(resolved_path, filename.endsWith(".test.nm"), config.out);
+	const outfile = outfile_for(resolved, filename.endsWith(".test.nm"), config.out);
 	if (!fs.existsSync(path.dirname(outfile))) {
 		fs.mkdirSync(path.dirname(outfile), { recursive: true });
 	}