nomen-lang 0.0.8 → 0.0.9

package/NOMEN_AGENTS.md

@@ -68,11 +68,11 @@ func safe = (string[] s, int i: i >= 0 && i < s.length, out string) {
 
 ### Memory modifiers
 
-| Modifier | Meaning |
-|----------|---------|
-| `ref T`  | mutable borrow; caller must also write `ref` |
-| `view T` | read-only borrow |
-| `mov T`  | transfer ownership; caller writes `mov` |
+| Modifier | Meaning                                        |
+| -------- | ---------------------------------------------- |
+| `ref T`  | mutable borrow; caller must also write `ref`   |
+| `view T` | read-only borrow                               |
+| `mov T`  | transfer ownership; caller writes `mov`        |
 | `out T`  | output parameter, assigned inside the function |
 
 `const` values cannot be passed to `ref` — rebind the caller as `var` first.

package/dist/index.mjs

@@ -16310,14 +16310,23 @@ function describe(token) {
 //#region ../src/join.ts
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const DEFAULT_LIB_PATH = path.resolve(__dirname, "../../core/src");
-function join$1(entry_file_path, 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;
-	add_source(folder_path, `./${file_path}`, inputs, resolved_lib_path);
-	gather_module_siblings(folder_path, file_path, inputs, resolved_lib_path);
-	gather_module_parent(folder_path, file_path, inputs, resolved_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;
+	try {
+		add_source(folder_path, `./${file_path}`, inputs, resolved_lib_path);
+		gather_module_siblings(folder_path, file_path, inputs, resolved_lib_path);
+		gather_module_parent(folder_path, file_path, inputs, resolved_lib_path);
+		if (test_src_dir) gather_src_module(test_src_dir, inputs, resolved_lib_path);
+	} finally {
+		test_src_dir = prev_test_src_dir;
+	}
 	return Array.from(inputs.values()).join("\n\n") + "\n";
 }
 function gather_module_siblings(folder_path, entry_file, inputs, lib_path) {
@@ -16361,6 +16370,26 @@ function gather_module_parent(folder_path, entry_file, inputs, lib_path) {
 		add_source(parent_path, `./${name}`, inputs, lib_path);
 	}
 }
+/** The program's `src/` module dir for a file in `entry_dir`, if one exists. */
+function resolve_src_module(entry_dir) {
+	for (const dir of [path.join(entry_dir, "src"), path.join(path.dirname(entry_dir), "src")]) try {
+		if (fs.statSync(dir).isDirectory()) return dir;
+	} catch {}
+}
+function gather_src_module(src_dir, inputs, lib_path) {
+	let names;
+	try {
+		names = fs.readdirSync(src_dir);
+	} catch {
+		return;
+	}
+	for (const name of names.sort()) {
+		if (!name.endsWith(".nm")) continue;
+		const import_file_path = `./${name}`;
+		if (inputs.has(import_file_path)) continue;
+		add_source(src_dir, import_file_path, inputs, lib_path);
+	}
+}
 function has_main(source) {
 	return /\bfunc\s+main\b/.test(source);
 }
@@ -16370,8 +16399,9 @@ function add_source(folder_path, file_path, inputs, lib_path) {
 		const lib_source_path = path.resolve(lib_path, file_path);
 		if (fs.existsSync(lib_source_path)) source_path = lib_source_path;
 	}
-	let source = `// file://${source_path}\n`;
-	source += fs.readFileSync(source_path, "utf8");
+	let source = fs.readFileSync(source_path, "utf8");
+	if (test_src_dir && is_within$1(source_path, test_src_dir)) source = strip_main_functions(source);
+	source = `// file://${source_path}\n` + source;
 	source = source.replaceAll(/^import(.*)$/gm, (match, name) => {
 		const trimmed = name.trim();
 		if (trimmed === "System" || trimmed.startsWith("System/")) return match;
@@ -16381,6 +16411,105 @@ function add_source(folder_path, file_path, inputs, lib_path) {
 	});
 	inputs.set(file_path, source);
 }
+function is_within$1(child, parent) {
+	const rel = path.relative(parent, child);
+	return rel === "" || !rel.startsWith("..") && !path.isAbsolute(rel);
+}
+/**
+* Remove every top-level `func main` (optionally `pub`) declaration, body and
+* all. Used when compiling a test: the generated harness provides `main`, so
+* the program's own `main` would collide as a duplicate declaration.
+*/
+function strip_main_functions(source) {
+	let result = "";
+	let i = 0;
+	const n = source.length;
+	let depth = 0;
+	while (i < n) {
+		if (depth === 0 && is_main_declaration(source, i)) {
+			i = skip_main_function(source, i);
+			continue;
+		}
+		const ch = source[i];
+		result += ch;
+		if (ch === "\"" || ch === "'") {
+			i++;
+			let escaped = false;
+			while (i < n) {
+				const c = source[i];
+				result += c;
+				i++;
+				if (escaped) escaped = false;
+				else if (c === "\\") escaped = true;
+				else if (c === ch) break;
+			}
+			continue;
+		}
+		if (ch === "{") depth++;
+		if (ch === "}") depth--;
+		i++;
+	}
+	return result;
+}
+function is_main_declaration(source, i) {
+	if (i > 0 && source[i - 1] !== "\n") return false;
+	const line_end = source.indexOf("\n", i);
+	const line = line_end === -1 ? source.slice(i) : source.slice(i, line_end);
+	return /^\s*(pub\s+)?func\s+main\b/.test(line);
+}
+function skip_main_function(source, i) {
+	const n = source.length;
+	let line_end = i;
+	while (line_end < n && source[line_end] !== "\n") line_end++;
+	const decl_line = source.slice(i, line_end);
+	const brace = decl_line.indexOf("{");
+	if (brace === -1) {
+		if (decl_line.includes("=>")) return line_end < n ? line_end + 1 : n;
+		let j = line_end;
+		while (j < n && source[j] !== "{") {
+			if (source[j] === "\"" || source[j] === "'") {
+				const quote = source[j];
+				j++;
+				while (j < n && source[j] !== quote) j++;
+			}
+			j++;
+		}
+		if (j >= n) return n;
+		return skip_balanced_block(source, j);
+	}
+	return skip_balanced_block(source, i + brace);
+}
+function skip_balanced_block(source, brace) {
+	const n = source.length;
+	let depth = 0;
+	let j = brace;
+	while (j < n) {
+		const ch = source[j];
+		if (ch === "\"" || ch === "'") {
+			const quote = ch;
+			j++;
+			let escaped = false;
+			while (j < n) {
+				const c = source[j++];
+				if (escaped) escaped = false;
+				else if (c === "\\") escaped = true;
+				else if (c === quote) break;
+			}
+			continue;
+		}
+		if (ch === "{") depth++;
+		if (ch === "}") {
+			depth--;
+			if (depth === 0) {
+				j++;
+				while (j < n && (source[j] === "\r" || source[j] === "\n")) j++;
+				return j;
+			}
+		}
+		j++;
+	}
+	return n;
+}
 //#endregion
 //#region ../src/lib.ts
 function read_library_config(lib_dir) {
@@ -22513,6 +22642,7 @@ function dedupe_warnings(warnings) {
 function warn_unused_function(func, referenced, status, struct) {
 	if (func.is_library || struct && struct.is_library) return;
 	if (func.name === "main" || is_discard(func.name) || func.name.startsWith("#")) return;
+	if (func.visibility === "pub") return;
 	if (func.is_generic) return;
 	if (struct && struct.traits.length > 0) return;
 	if (referenced.has(func.name)) return;
@@ -25084,22 +25214,22 @@ function package_jsonc(name) {
 	"entry": "src/main.nm"
 	// The System library is resolved automatically from your nomen-lang
 	// install. To pin a local checkout instead, uncomment:
-	// "imports": { "System": "../core" }
+	// "imports": { "System": "~/Source/nomen/core" }
 }
 `;
 }
 const MAIN_NM = `import System
 
+pub func add = (int a, int b) => a + b
+
 pub func main = (Init init) {
-	Console.write("Hello world!\\n")
+	Console.write("Hello world, 2 + 2 is \\{add(a + b)}!\\n")
 }
 `;
 const TEST_NM = `import System
 import System/Test
 
-func add = (int a, int b, out int) => a + b
-
-pub func test_smoke = (ref Tester t) {
+pub func test_add = (ref Tester t) {
 	t.expect(add(2, 2) == 4, "2 + 2 should equal 4")
 }
 `;
@@ -25164,14 +25294,14 @@ function run_init(name) {
 	fs.writeFileSync(path.join(target, ".gitignore"), GITIGNORE);
 	fs.writeFileSync(path.join(target, "package.jsonc"), package_jsonc(name));
 	fs.writeFileSync(path.join(src, "main.nm"), MAIN_NM);
-	fs.writeFileSync(path.join(test, "smoke.test.nm"), TEST_NM);
+	fs.writeFileSync(path.join(test, "main.test.nm"), TEST_NM);
 	fs.writeFileSync(path.join(target, "README.md"), readme(name));
 	fs.writeFileSync(path.join(target, "AGENTS.md"), fs.readFileSync(agents_template));
 	console.log(`Created ${name}/`);
 	console.log(`  ${name}/.gitignore`);
 	console.log(`  ${name}/package.jsonc`);
 	console.log(`  ${name}/src/main.nm`);
-	console.log(`  ${name}/test/smoke.test.nm`);
+	console.log(`  ${name}/test/main.test.nm`);
 	console.log(`  ${name}/README.md`);
 	console.log(`  ${name}/AGENTS.md`);
 	console.log(`\nNext: cd ${name} && nomen run`);
@@ -25455,7 +25585,7 @@ function runTests(root, options = {}) {
 	const arch = options.arch ?? "aarch64";
 	const lib = resolve_lib_for(root);
 	const files = collect_test_files(root).filter((f) => !options.filter || options.filter.test(f));
-	console.log(`\n~ NOMEN TEST ~ ${files.length} file(s)\n`);
+	console.log(`Found ${files.length} test file(s)\n`);
 	const startTime = performance.now();
 	const results = [];
 	for (const file of files) {
@@ -25465,14 +25595,16 @@ 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 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);
 	const totalPassed = totalTests - totalFailed;
 	const anyFailed = results.some((r) => !r.ok);
 	console.log("");
-	console.log(` ${C.bold("Files ")} ${totalFiles} ${anyFailed ? C.red("failed") : C.green("passed")} (${totalFiles})`);
-	console.log(` ${C.bold("Tests ")} ${totalPassed} ${C.green("passed")}` + (totalFailed ? ` | ${C.red(`${totalFailed} failed`)}` : "") + ` (${totalTests})`);
-	console.log(` ${C.bold("Time  ")} ${format_duration(elapsed)}`);
+	console.log(` ${C.dim("Files ")} ${C.green(`${totalFilesPassed} passed`)}` + (totalFilesFailed ? ` ${C.dim("|")} ${C.red(`${totalFilesFailed} failed`)}` : "") + C.dim(` (${totalFiles})`));
+	console.log(` ${C.dim("Tests ")} ${C.green(`${totalPassed} passed`)}` + (totalFailed ? ` ${C.dim("|")} ${C.red(`${totalFailed} failed`)}` : "") + C.dim(` (${totalTests})`));
+	console.log(` ${C.dim(" Time ")} ${format_duration(elapsed)}`);
 	console.log("");
 	return !anyFailed;
 }
@@ -25536,7 +25668,7 @@ function collect_nm_files(folder) {
 	return out;
 }
 let build_root;
-console.log("\n~ NOMEN ~\n");
+console.error("\n~ NOMEN ~\n");
 const args = parse_args();
 const command = args.command;
 try {

package/package.json

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

package/src/index.ts

@@ -71,7 +71,7 @@ function collect_nm_files(folder: string): string[] {
 // package.jsonc discovery — the package folder (cwd), not the entry's folder.
 let build_root: string | undefined;
 
-console.log("\n~ NOMEN ~\n");
+console.error("\n~ NOMEN ~\n");
 
 const args: Args = parse_args();
 const command = args.command;

package/src/init.ts

@@ -16,24 +16,24 @@ function package_jsonc(name: string): string {
 	"entry": "src/main.nm"
 	// The System library is resolved automatically from your nomen-lang
 	// install. To pin a local checkout instead, uncomment:
-	// "imports": { "System": "../core" }
+	// "imports": { "System": "~/Source/nomen/core" }
 }
 `;
 }
 
 const MAIN_NM = `import System
 
+pub func add = (int a, int b) => a + b
+
 pub func main = (Init init) {
-	Console.write("Hello world!\\n")
+	Console.write("Hello world, 2 + 2 is \\{add(a + b)}!\\n")
 }
 `;
 
 const TEST_NM = `import System
 import System/Test
 
-func add = (int a, int b, out int) => a + b
-
-pub func test_smoke = (ref Tester t) {
+pub func test_add = (ref Tester t) {
 	t.expect(add(2, 2) == 4, "2 + 2 should equal 4")
 }
 `;
@@ -113,7 +113,7 @@ export function run_init(name: string | undefined): void {
 	fs.writeFileSync(path.join(target, ".gitignore"), GITIGNORE);
 	fs.writeFileSync(path.join(target, "package.jsonc"), package_jsonc(name));
 	fs.writeFileSync(path.join(src, "main.nm"), MAIN_NM);
-	fs.writeFileSync(path.join(test, "smoke.test.nm"), TEST_NM);
+	fs.writeFileSync(path.join(test, "main.test.nm"), TEST_NM);
 	fs.writeFileSync(path.join(target, "README.md"), readme(name));
 	fs.writeFileSync(path.join(target, "AGENTS.md"), fs.readFileSync(agents_template));
 
@@ -121,7 +121,7 @@ export function run_init(name: string | undefined): void {
 	console.log(`  ${name}/.gitignore`);
 	console.log(`  ${name}/package.jsonc`);
 	console.log(`  ${name}/src/main.nm`);
-	console.log(`  ${name}/test/smoke.test.nm`);
+	console.log(`  ${name}/test/main.test.nm`);
 	console.log(`  ${name}/README.md`);
 	console.log(`  ${name}/AGENTS.md`);
 	console.log(`\nNext: cd ${name} && nomen run`);

package/src/test.ts

@@ -434,7 +434,8 @@ export function runTests(root: string, options: RunTestsOptions = {}): boolean {
 	const lib = resolve_lib_for(root);
 	const files = collect_test_files(root).filter((f) => !options.filter || options.filter.test(f));
 
-	console.log(`\n~ NOMEN TEST ~ ${files.length} file(s)\n`);
+	console.log(`Found ${files.length} test file(s)\n`);
+
 	const startTime = performance.now();
 
 	const results: TestFileResult[] = [];
@@ -446,6 +447,8 @@ 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 totalFilesPassed = totalFiles - totalFilesFailed;
 	// `tests[].failed` (from each test's `done` record) is the authoritative
 	// failure count; `result.fails` holds the same failures' messages for
 	// display, so don't sum both or failures are double-counted.
@@ -455,15 +458,20 @@ export function runTests(root: string, options: RunTestsOptions = {}): boolean {
 	const anyFailed = results.some((r) => !r.ok);
 
 	console.log("");
+	//console.log(
+	//	` ${C.dim("Files ")} ${totalFiles} ${anyFailed ? C.red("failed") : C.green("passed")} (${totalFiles})`,
+	//);
 	console.log(
-		` ${C.bold("Files ")} ${totalFiles} ${anyFailed ? C.red("failed") : C.green("passed")} (${totalFiles})`,
+		` ${C.dim("Files ")} ${C.green(`${totalFilesPassed} passed`)}` +
+			(totalFilesFailed ? ` ${C.dim("|")} ${C.red(`${totalFilesFailed} failed`)}` : "") +
+			C.dim(` (${totalFiles})`),
 	);
 	console.log(
-		` ${C.bold("Tests ")} ${totalPassed} ${C.green("passed")}` +
-			(totalFailed ? ` | ${C.red(`${totalFailed} failed`)}` : "") +
-			` (${totalTests})`,
+		` ${C.dim("Tests ")} ${C.green(`${totalPassed} passed`)}` +
+			(totalFailed ? ` ${C.dim("|")} ${C.red(`${totalFailed} failed`)}` : "") +
+			C.dim(` (${totalTests})`),
 	);
-	console.log(` ${C.bold("Time  ")} ${format_duration(elapsed)}`);
+	console.log(` ${C.dim(" Time ")} ${format_duration(elapsed)}`);
 	console.log("");
 
 	return !anyFailed;