nomen-lang 0.0.9 → 0.0.10

package/dist/index.mjs

@@ -16308,14 +16308,22 @@ function describe(token) {
 }
 //#endregion
 //#region ../src/join.ts
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const DEFAULT_LIB_PATH = path.resolve(__dirname, "../../core/src");
+const DEFAULT_LIB_REL = "../../core/src";
+let default_lib_path;
+function fallback_lib_path() {
+	if (default_lib_path === void 0) try {
+		default_lib_path = path.resolve(path.dirname(fileURLToPath(import.meta.url)), DEFAULT_LIB_REL);
+	} catch {
+		default_lib_path = "";
+	}
+	return default_lib_path;
+}
 let test_src_dir;
 function join$1(entry_file_path, lib_path, options) {
 	const folder_path = path.dirname(entry_file_path);
 	const file_path = path.basename(entry_file_path);
 	const inputs = /* @__PURE__ */ new Map();
-	const resolved_lib_path = lib_path ? path.resolve(lib_path, "src") : DEFAULT_LIB_PATH;
+	const resolved_lib_path = lib_path ? path.resolve(lib_path, "src") : fallback_lib_path();
 	const for_test = options?.for_test ?? file_path.endsWith(".test.nm");
 	const prev_test_src_dir = test_src_dir;
 	test_src_dir = for_test ? resolve_src_module(folder_path) : void 0;
@@ -25223,7 +25231,7 @@ const MAIN_NM = `import System
 pub func add = (int a, int b) => a + b
 
 pub func main = (Init init) {
-	Console.write("Hello world, 2 + 2 is \\{add(a + b)}!\\n")
+	Console.write("Hello world, 2 + 2 is \\{add(2, 2)}!\\n")
 }
 `;
 const TEST_NM = `import System
@@ -25307,6 +25315,30 @@ function run_init(name) {
 	console.log(`\nNext: cd ${name} && nomen run`);
 }
 //#endregion
+//#region src/paths.ts
+/**
+* The project root for `input_path`: the nearest ancestor folder (or the input
+* folder itself) containing a `package.jsonc`. Falls back to the input's own
+* folder for standalone files, so builds stay next to their source.
+*/
+function project_root_for(input_path) {
+	let dir = fs.lstatSync(input_path).isDirectory() ? input_path : path.dirname(input_path);
+	for (let i = 0; i < 20; i++) {
+		if (fs.existsSync(path.join(dir, "package.jsonc"))) return dir;
+		const parent = path.dirname(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+	return path.dirname(input_path);
+}
+/**
+* The folder that receives compiler output for `input_path`: the project's
+* `build/`, or `build/test` for `*.test.nm` files.
+*/
+function build_dir_for(input_path, is_test) {
+	return is_test ? path.join(project_root_for(input_path), "build", "test") : path.join(project_root_for(input_path), "build");
+}
+//#endregion
 //#region src/test.ts
 const RECORD_PREFIX = "\\nomen|";
 /** Recursively collect `*.test.nm` files under `root`, skipping build output. */
@@ -25487,7 +25519,7 @@ function run_test_file(entry_path, lib_path, arch) {
 		result.ms = performance.now() - start;
 		return result;
 	}
-	const buildDir = path.join(path.dirname(resolved), "build");
+	const buildDir = build_dir_for(resolved, true);
 	if (!fs.existsSync(buildDir)) fs.mkdirSync(buildDir, { recursive: true });
 	const ext = arch === "aarch64" ? ".s" : ".c";
 	const codefile = path.join(buildDir, path.basename(entry_path, ".nm") + ext);
@@ -25573,8 +25605,8 @@ function report_file(result) {
 	const mark = result.ok ? C.green("✓") : C.red("✗");
 	console.log(` ${mark} ${rel} ${C.dim(`(${totalTests} tests)`)} ${C.dim(format_duration(result.ms))}`);
 	if (result.crashed) console.log(C.red(`   ${result.crashed}`));
-	for (const f of result.fails) console.log(`   ${C.red("✗")} ${C.bold(f.test)} ${C.dim(">")} ${f.message}`);
-	for (const b of result.benches) console.log(`   ${C.cyan("⏱")} ${C.bold(b.label)} ${C.dim(`(n=${b.n})`)} ${C.dim("min")} ${fmt_ns(b.min)} ${C.dim("median")} ${fmt_ns(b.median)} ${C.dim("mean")} ${fmt_ns(Math.round(b.mean))} ${C.dim("max")} ${fmt_ns(b.max)} ${C.dim("±")} ${fmt_ns(Math.round(b.stddev))}`);
+	for (const f of result.fails) console.log(`   ${C.red("✗")} ${f.test} ${C.dim(">")} ${f.message}`);
+	for (const b of result.benches) console.log(`   ${C.cyan("⏱")} ${b.label} ${C.dim(`(n=${b.n})`)} ${C.dim("min")} ${fmt_ns(b.min)} ${C.dim("median")} ${fmt_ns(b.median)} ${C.dim("mean")} ${fmt_ns(Math.round(b.mean))} ${C.dim("max")} ${fmt_ns(b.max)} ${C.dim("±")} ${fmt_ns(Math.round(b.stddev))}`);
 	if (result.other.length) {
 		console.log(C.dim("   --- test stdout ---"));
 		for (const line of result.other) console.log(C.dim(`   ${line}`));
@@ -25595,7 +25627,7 @@ function runTests(root, options = {}) {
 	}
 	const elapsed = performance.now() - startTime;
 	const totalFiles = results.length;
-	const totalFilesFailed = results.reduce((a, r) => a + (r.fails ? 1 : 0), 0);
+	const totalFilesFailed = results.reduce((a, r) => a + (r.ok ? 0 : 1), 0);
 	const totalFilesPassed = totalFiles - totalFilesFailed;
 	const totalTests = results.reduce((a, r) => a + r.tests.length, 0);
 	const totalFailed = results.reduce((a, r) => a + r.tests.reduce((x, t) => x + t.failed, 0), 0);
@@ -25667,7 +25699,6 @@ function collect_nm_files(folder) {
 	}
 	return out;
 }
-let build_root;
 console.error("\n~ NOMEN ~\n");
 const args = parse_args();
 const command = args.command;
@@ -25728,7 +25759,6 @@ try {
 	}
 	args.in = args.in ?? resolve_input();
 	if (!args.in) process.exit(0);
-	if (!build_root) build_root = fs.lstatSync(args.in).isDirectory() ? args.in : path.dirname(args.in);
 	if (fs.existsSync(args.in)) {
 		let config = {
 			arch: "aarch64",
@@ -25758,19 +25788,13 @@ function resolve_input() {
 	if (fs.existsSync(config_path)) try {
 		const json = fs.readFileSync(config_path, "utf8").replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
 		const parsed = JSON.parse(json);
-		if (parsed.entry) {
-			build_root = cwd;
-			return path.resolve(cwd, parsed.entry);
-		}
+		if (parsed.entry) return path.resolve(cwd, parsed.entry);
 	} catch {}
 	let nm_files = [];
 	try {
 		nm_files = fs.readdirSync(cwd).filter((f) => f.endsWith(".nm"));
 	} catch {}
-	if (nm_files.length === 1) {
-		build_root = cwd;
-		return path.resolve(cwd, nm_files[0]);
-	}
+	if (nm_files.length === 1) return path.resolve(cwd, nm_files[0]);
 	if (nm_files.length > 1) {
 		console.log(`Found ${nm_files.length} .nm files in ${cwd}. Specify which to run with --in:\n  ` + nm_files.join("\n  "));
 		return;
@@ -25863,7 +25887,7 @@ function processFile(filename, config, mode) {
 		return;
 	}
 	const basename = path.basename(filename, ".nm");
-	const buildDir = path.join(build_root ?? path.dirname(filename), "build");
+	const buildDir = build_dir_for(resolved_path, 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");

package/package.json

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

package/src/index.ts

@@ -14,6 +14,7 @@ import { parse_args, print_help, type Args } from "./args.ts";
 import { run_docs } from "./docs.ts";
 import render_errors, { render_warnings } from "./format_errors.ts";
 import { find_bundled, run_init } from "./init.ts";
+import { build_dir_for } from "./paths.ts";
 import { runTests } from "./test.ts";
 import type Config from "./types/Config.ts";
 
@@ -66,11 +67,6 @@ function collect_nm_files(folder: string): string[] {
 	return out;
 }
 
-// The folder whose `build/` subdirectory receives compiler output. Set during
-// input resolution: the --in folder, the .nm file's folder, or — for
-// package.jsonc discovery — the package folder (cwd), not the entry's folder.
-let build_root: string | undefined;
-
 console.error("\n~ NOMEN ~\n");
 
 const args: Args = parse_args();
@@ -154,11 +150,6 @@ try {
 	if (!args.in) {
 		process.exit(0);
 	}
-	// For an explicit --in, build next to whatever was passed (the folder
-	// itself, or the file's folder). Discovery cases set build_root themselves.
-	if (!build_root) {
-		build_root = fs.lstatSync(args.in).isDirectory() ? args.in : path.dirname(args.in);
-	}
 
 	if (fs.existsSync(args.in)) {
 		let config: Config = { arch: "aarch64", platform: default_platform() };
@@ -213,7 +204,6 @@ function resolve_input(): string | undefined {
 			const json = raw.replace(/\/\/.*$/gm, "").replace(/\/\*[\s\S]*?\*\//g, "");
 			const parsed = JSON.parse(json);
 			if (parsed.entry) {
-				build_root = cwd;
 				return path.resolve(cwd, parsed.entry);
 			}
 		} catch {
@@ -229,7 +219,6 @@ function resolve_input(): string | undefined {
 		// unreadable working folder
 	}
 	if (nm_files.length === 1) {
-		build_root = cwd;
 		return path.resolve(cwd, nm_files[0]);
 	}
 	if (nm_files.length > 1) {
@@ -368,7 +357,8 @@ function processFile(filename: string, config: Config, mode: Mode) {
 	}
 
 	const basename = path.basename(filename, ".nm");
-	const buildDir = path.join(build_root ?? path.dirname(filename), "build");
+	// Output lives in the project's `build/` — `build/test` for *.test.nm.
+	const buildDir = build_dir_for(resolved_path, filename.endsWith(".test.nm"));
 	if (!fs.existsSync(buildDir)) {
 		fs.mkdirSync(buildDir, { recursive: true });
 	}

package/src/init.ts

@@ -26,7 +26,7 @@ const MAIN_NM = `import System
 pub func add = (int a, int b) => a + b
 
 pub func main = (Init init) {
-	Console.write("Hello world, 2 + 2 is \\{add(a + b)}!\\n")
+	Console.write("Hello world, 2 + 2 is \\{add(2, 2)}!\\n")
 }
 `;
 

package/src/paths.ts

@@ -0,0 +1,28 @@
+import fs from "node:fs";
+import path from "node:path";
+
+/**
+ * The project root for `input_path`: the nearest ancestor folder (or the input
+ * folder itself) containing a `package.jsonc`. Falls back to the input's own
+ * folder for standalone files, so builds stay next to their source.
+ */
+export function project_root_for(input_path: string): string {
+	let dir = fs.lstatSync(input_path).isDirectory() ? input_path : path.dirname(input_path);
+	for (let i = 0; i < 20; i++) {
+		if (fs.existsSync(path.join(dir, "package.jsonc"))) return dir;
+		const parent = path.dirname(dir);
+		if (parent === dir) break;
+		dir = parent;
+	}
+	return path.dirname(input_path);
+}
+
+/**
+ * The folder that receives compiler output for `input_path`: the project's
+ * `build/`, or `build/test` for `*.test.nm` files.
+ */
+export function build_dir_for(input_path: string, is_test: boolean): string {
+	return is_test
+		? path.join(project_root_for(input_path), "build", "test")
+		: path.join(project_root_for(input_path), "build");
+}

package/src/test.ts

@@ -8,6 +8,7 @@ import join from "../../src/join.ts";
 import { get_library } from "../../src/lib.ts";
 import parse from "../../src/parse.ts";
 import { find_bundled } from "./init.ts";
+import { build_dir_for } from "./paths.ts";
 
 const RECORD_PREFIX = "\\nomen|";
 
@@ -303,7 +304,7 @@ export function run_test_file(
 		return result;
 	}
 
-	const buildDir = path.join(path.dirname(resolved), "build");
+	const buildDir = build_dir_for(resolved, true);
 	if (!fs.existsSync(buildDir)) fs.mkdirSync(buildDir, { recursive: true });
 	const ext = arch === "aarch64" ? ".s" : ".c";
 	const codefile = path.join(buildDir, path.basename(entry_path, ".nm") + ext);
@@ -407,11 +408,11 @@ export function report_file(result: TestFileResult): void {
 	// short-circuiting a test has at most one failure, so the fail lines are
 	// the per-test detail and a separate count line would just repeat names.
 	for (const f of result.fails) {
-		console.log(`   ${C.red("✗")} ${C.bold(f.test)} ${C.dim(">")} ${f.message}`);
+		console.log(`   ${C.red("✗")} ${f.test} ${C.dim(">")} ${f.message}`);
 	}
 	for (const b of result.benches) {
 		console.log(
-			`   ${C.cyan("⏱")} ${C.bold(b.label)} ${C.dim(`(n=${b.n})`)} ` +
+			`   ${C.cyan("⏱")} ${b.label} ${C.dim(`(n=${b.n})`)} ` +
 				`${C.dim("min")} ${fmt_ns(b.min)} ${C.dim("median")} ${fmt_ns(b.median)} ` +
 				`${C.dim("mean")} ${fmt_ns(Math.round(b.mean))} ${C.dim("max")} ${fmt_ns(b.max)} ` +
 				`${C.dim("±")} ${fmt_ns(Math.round(b.stddev))}`,
@@ -447,7 +448,7 @@ export function runTests(root: string, options: RunTestsOptions = {}): boolean {
 
 	const elapsed = performance.now() - startTime;
 	const totalFiles = results.length;
-	const totalFilesFailed = results.reduce((a, r) => a + (r.fails ? 1 : 0), 0);
+	const totalFilesFailed = results.reduce((a, r) => a + (r.ok ? 0 : 1), 0);
 	const totalFilesPassed = totalFiles - totalFilesFailed;
 	// `tests[].failed` (from each test's `done` record) is the authoritative
 	// failure count; `result.fails` holds the same failures' messages for