Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions bin/moshcode.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@ const DEFAULT_SCRIPT = `while (alive) {

function readScript(arg) {
if (!arg || arg === "-") return fs.readFileSync(0, "utf8"); // stdin (paste)
return fs.readFileSync(arg, "utf8");
try {
return fs.readFileSync(arg, "utf8");
} catch (e) {
throw new Error(`moshcode run: cannot read script ${JSON.stringify(arg)} (${e.code || e.message})`);
}
}

function parseMax(value) {
Expand Down Expand Up @@ -138,7 +142,13 @@ async function main() {
}
else file = a;
}
const src = file ? readScript(file) : (fs.existsSync(EXAMPLE) ? fs.readFileSync(EXAMPLE, "utf8") : DEFAULT_SCRIPT);
let src;
try {
src = file ? readScript(file) : (fs.existsSync(EXAMPLE) ? fs.readFileSync(EXAMPLE, "utf8") : DEFAULT_SCRIPT);
} catch (e) {
console.error(String(e.message || e));
process.exit(1);
}
let ast;
try { ast = compile(src); }
catch (e) { console.error(String(e.message || e)); process.exit(1); }
Expand Down
9 changes: 9 additions & 0 deletions test/run-options.test.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,12 @@ test("run rejects multiple script files", () => {
assert.equal(result.status, 1);
assert.match(result.stderr, /moshcode run: expected one script file/);
});

test("run reports missing script files without a stack trace", () => {
const missing = join(tmpdir(), "moshcode-missing-script.mosh");
const result = run([missing, "--dry-run"]);

assert.equal(result.status, 1);
assert.match(result.stderr, /moshcode run: cannot read script/);
assert.doesNotMatch(result.stderr, /Error: moshcode run/);
});
Loading