nomen-lang 0.0.11 → 0.0.13

package/package.json

@@ -1,34 +1,35 @@
 {
-  "name": "nomen-lang",
-  "version": "0.0.11",
-  "description": "The CLI for the Nomen programming language.",
-  "keywords": [],
-  "license": "ISC",
-  "author": "",
-  "bin": {
-    "nomen": "dist/index.mjs"
-  },
-  "files": [
-    "dist",
-    "src",
-    "core",
-    "NOMEN_AGENTS.md"
-  ],
-  "type": "module",
-  "devDependencies": {
-    "@types/node": "^26.1.2",
-    "chokidar": "^5.0.0",
-    "tsx": "^4.23.1",
-    "typescript": "^7.0.2",
-    "vite-plus": "0.2.7"
-  },
-  "scripts": {
-    "build": "node scripts/bundle-assets.mjs && vp pack",
-    "dev": "node scripts/bundle-assets.mjs && vp pack --watch",
-    "test": "vp test",
-    "check": "vp check",
-    "format": "vp check --fix",
-    "go": "tsx src/index.ts",
-    "register": "pnpm build && pnpm add -g ."
-  }
-}
+	"name": "nomen-lang",
+	"version": "0.0.13",
+	"description": "The CLI for the Nomen programming language.",
+	"keywords": [],
+	"license": "ISC",
+	"author": "",
+	"bin": {
+		"nomen": "dist/index.mjs"
+	},
+	"files": [
+		"dist",
+		"src",
+		"core",
+		"NOMEN_AGENTS.md"
+	],
+	"type": "module",
+	"scripts": {
+		"build": "node scripts/bundle-assets.mjs && vp pack",
+		"dev": "node scripts/bundle-assets.mjs && vp pack --watch",
+		"test": "vp test",
+		"check": "vp check",
+		"format": "vp check --fix",
+		"prepare": "vp config",
+		"go": "tsx src/index.ts",
+		"register": "pnpm build && pnpm add -g ."
+	},
+	"devDependencies": {
+		"@types/node": "^26.2.0",
+		"chokidar": "^5.0.0",
+		"tsx": "^4.23.12",
+		"typescript": "^7.0.2",
+		"vite-plus": "catalog:"
+	}
+}

package/src/args.ts

@@ -12,6 +12,10 @@ export interface Args {
 	audit: boolean;
 	audit_runtime?: string;
 	check: boolean;
+	// Everything after a bare `--` on the command line — forwarded verbatim to
+	// the compiled program by `nomen run`. Lets a program receive its own argv
+	// (`nomen run --in app/main.nm -- arg1 arg2`).
+	program_args: string[];
 }
 
 // Canonical option name for each accepted long/short spelling.
@@ -53,9 +57,8 @@ function set(args: Args, key: string, value: string | boolean): void {
 
 /** Parse `argv` (excluding the node binary and script path) into an `Args` object. */
 export function parse_args(argv: string[] = process.argv.slice(2)): Args {
-	const args: Args = { command: undefined, ...DEFAULTS } as Args;
+	const args: Args = { command: undefined, ...DEFAULTS, program_args: [] } as Args;
 	const positional: string[] = [];
-	let only_positional = false;
 
 	const next_value = (i: number, spelling: string): string => {
 		if (i + 1 >= argv.length) throw new Error(`Option ${spelling} requires a value`);
@@ -65,14 +68,12 @@ export function parse_args(argv: string[] = process.argv.slice(2)): Args {
 	for (let i = 0; i < argv.length; i++) {
 		const arg = argv[i];
 
-		if (only_positional) {
-			positional.push(arg);
-			continue;
-		}
-
+		// A bare `--` ends nomen's own option parsing; everything that follows
+		// is captured verbatim as the compiled program's argv (forwarded by
+		// `nomen run`). This matches the conventional `--` passthrough.
 		if (arg === "--") {
-			only_positional = true;
-			continue;
+			args.program_args = argv.slice(i + 1);
+			break;
 		}
 
 		if (arg === "-h" || arg === "--help") {
@@ -145,6 +146,7 @@ export function print_help(): void {
 		[
 			"Usage:",
 			"  nomen run --in [file/folder]     Parse, check, build and run a program",
+			"                                    (args after a bare -- are forwarded to the program)",
 			"  nomen build --in [file/folder]    Parse, check and build (no run)",
 			"  nomen check --in [file/folder]    Parse and check only",
 			"  nomen format [--in folder]        Reformat every .nm file",

package/src/index.ts

@@ -1,5 +1,5 @@
 #! /usr/bin/env node
-import { execSync } from "node:child_process";
+import { execFileSync, execSync } from "node:child_process";
 import fs from "node:fs";
 import path from "node:path";
 
@@ -167,9 +167,9 @@ try {
 		// Is the --in path a folder
 		if (fs.lstatSync(args.in).isDirectory()) {
 			if (args.watch) {
-				watchPath(args.in, config, mode);
+				watchPath(args.in, config, mode, args.program_args);
 			} else {
-				processFolder(args.in, config, mode);
+				processFolder(args.in, config, mode, args.program_args);
 			}
 		} else {
 			// Process the supplied file
@@ -178,9 +178,9 @@ try {
 				// NOTE: We get add notifications for all watched files immediately
 				// TODO: Is this the case on Windows etc too?
 				if (args.watch) {
-					watchPath(args.in, config, mode);
+					watchPath(args.in, config, mode, args.program_args);
 				} else {
-					processFile(args.in, config, mode);
+					processFile(args.in, config, mode, args.program_args);
 				}
 			} else {
 				console.log("Unsupported file type: " + extname);
@@ -289,20 +289,20 @@ function compile_audit_runtime(config: Config, input_path: string, buildDir: str
 	return audit_obj;
 }
 
-function watchPath(p: string, config: Config, mode: Mode) {
+function watchPath(p: string, config: Config, mode: Mode, program_args: string[]) {
 	chokidar.watch(p).on("all", (event, filePath) => {
 		if (shouldProcessFile(filePath)) {
-			processFile(filePath, config, mode);
+			processFile(filePath, config, mode, program_args);
 		}
 	});
 }
 
-function processFolder(folder: string, config: Config, mode: Mode) {
+function processFolder(folder: string, config: Config, mode: Mode, program_args: string[]) {
 	const dir = fs.opendirSync(folder);
 	let dirent;
 	while ((dirent = dir.readSync()) !== null) {
 		if (shouldProcessFile(dirent.name)) {
-			processFile(path.join(folder, dirent.name), config, mode);
+			processFile(path.join(folder, dirent.name), config, mode, program_args);
 			// @ts-ignore
 			let _ = fs.watch;
 		}
@@ -314,7 +314,7 @@ function shouldProcessFile(filename: string) {
 	return path.extname(filename) === SUPPORTED_EXTENSION;
 }
 
-function processFile(filename: string, config: Config, mode: Mode) {
+function processFile(filename: string, config: Config, mode: Mode, program_args: string[]) {
 	console.log("Processing", filename);
 
 	const arch = config.arch || "aarch64";
@@ -399,10 +399,16 @@ function processFile(filename: string, config: Config, mode: Mode) {
 		return;
 	}
 
-	execSync(outfile, { stdio: "inherit" });
-
-	const runTime = performance.now();
-	console.log("");
-	console.log("");
-	console.log(`Completed in ${(runTime - startTime).toFixed(2)}ms`);
+	// `run` executes the linked binary, forwarding any program args that
+	// followed a bare `--` on the nomen command line. execFileSync runs the
+	// binary directly (no shell), so the args are passed as real argv without
+	// shell-escaping concerns.
+	if (mode === "run") {
+		execFileSync(outfile, program_args, { stdio: "inherit" });
+
+		const runTime = performance.now();
+		console.log("");
+		console.log("");
+		console.log(`Completed in ${(runTime - startTime).toFixed(2)}ms`);
+	}
 }