nomen-lang 0.0.3 → 0.0.5

package/dist/index.mjs

@@ -21430,6 +21430,7 @@ function render_errors(source, errors) {
 //#endregion
 //#region src/index.ts
 const SUPPORTED_EXTENSION = ".nm";
+let build_root;
 console.log("\n~ NOMEN ~\n");
 const options = yargs(hideBin(process.argv)).usage("Usage: nomen --in [file/folder]").option("in", {
 	alias: "i",
@@ -21466,12 +21467,11 @@ const options = yargs(hideBin(process.argv)).usage("Usage: nomen --in [file/fold
 }).option("audit-runtime", {
 	describe: "Path to audit_runtime.c, linked in when --audit is set",
 	type: "string"
-}).help(true).check((argv) => {
-	if (!argv._.length && !argv.in) throw new Error("Missing required argument: in");
-	return true;
-}).parseSync();
+}).help(true).parseSync();
 try {
+	options.in = options.in ?? resolve_input();
 	if (!options.in) process.exit(0);
+	if (!build_root) build_root = fs.lstatSync(options.in).isDirectory() ? options.in : path.dirname(options.in);
 	if (fs.existsSync(options.in)) {
 		let config = {
 			arch: "aarch64",
@@ -21495,6 +21495,31 @@ try {
 } catch (err) {
 	console.log("UH", err);
 }
+function resolve_input() {
+	const cwd = process.cwd();
+	const config_path = path.join(cwd, "package.jsonc");
+	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);
+		}
+	} 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) {
+		console.log(`Found ${nm_files.length} .nm files in ${cwd}. Specify which to run with --in:\n  ` + nm_files.join("\n  "));
+		return;
+	}
+	console.log("Nothing to compile. Pass --in <file/folder>, or run inside a folder with a package.jsonc or a .nm file.");
+}
 function resolve_lib(file_path) {
 	let dir = path.dirname(path.resolve(file_path));
 	for (let i = 0; i < 20; i++) {
@@ -21572,9 +21597,8 @@ function processFile(filename, config) {
 		console.log(render_errors(input, result.errors));
 		return;
 	}
-	const dir = path.dirname(filename);
 	const basename = path.basename(filename, ".nm");
-	const buildDir = path.join(dir, "build");
+	const buildDir = path.join(build_root ?? path.dirname(filename), "build");
 	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.3",
+	"version": "0.0.5",
 	"description": "The CLI for the Nomen programming language.",
 	"keywords": [],
 	"license": "ISC",

package/src/index.ts

@@ -16,6 +16,11 @@ import type Config from "./types/Config.ts";
 
 const SUPPORTED_EXTENSION = ".nm";
 
+// 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.log("\n~ NOMEN ~\n");
 
 const options = yargs(hideBin(process.argv))
@@ -74,6 +79,11 @@ try {
 	if (!options.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(options.in).isDirectory() ? options.in : path.dirname(options.in);
+	}
 
 	if (fs.existsSync(options.in)) {
 		let config: Config = { arch: "aarch64", platform: default_platform() };
@@ -131,6 +141,7 @@ 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 {
@@ -146,6 +157,7 @@ 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) {
@@ -276,9 +288,8 @@ function processFile(filename: string, config: Config) {
 		return;
 	}
 
-	const dir = path.dirname(filename);
 	const basename = path.basename(filename, ".nm");
-	const buildDir = path.join(dir, "build");
+	const buildDir = path.join(build_root ?? path.dirname(filename), "build");
 	if (!fs.existsSync(buildDir)) {
 		fs.mkdirSync(buildDir, { recursive: true });
 	}