chore(cli): Reduce boilerplate

cli/bin/exec.js

@@ -17,7 +17,11 @@ function getGrainc() {
 
 const grainc = getGrainc();
 
-function execGrainc(commandOrFile = "", program, execOpts = { stdio: "pipe" }) {
+function execGrainc(
+  commandOrFile = "",
+  program,
+  execOpts = { stdio: "inherit" }
+) {
   const flags = [];
   const options = program.opts();
   program.options.forEach((option) => {
@@ -47,7 +51,7 @@ const graindoc = getGraindoc();
 function execGraindoc(
   commandOrFile = "",
   program,
-  execOpts = { stdio: "pipe" }
+  execOpts = { stdio: "inherit" }
 ) {
   const flags = [];
   // Inherit compiler flags passed to the parent
@@ -80,7 +84,7 @@ const grainformat = getGrainformat();
 function execGrainformat(
   commandOrFile = "",
   program,
-  execOpts = { stdio: "pipe" }
+  execOpts = { stdio: "inherit" }
 ) {
   const flags = [];
   // Inherit compiler flags passed to the parent

cli/bin/grain.js

@@ -14,11 +14,7 @@ v8.setFlagsFromString("--experimental-wasm-return-call");
 
 const program = require("commander");
 const exec = require("./exec.js");
-const compile = require("./compile.js");
 const run = require("./run.js");
-const lsp = require("./lsp.js");
-const doc = require("./doc.js");
-const format = require("./format.js");
 
 const stdlibPath = require("@grain/stdlib");
 
@@ -31,7 +27,7 @@ function num(val) {
 }
 
 function graincVersion() {
-  return exec.grainc("--version", program).toString().trim();
+  return exec.grainc("--version", program, { stdio: "pipe" }).toString().trim();
 }
 
 class ForwardOption extends program.Option {
@@ -175,7 +171,12 @@ program
   // The root command that compiles & runs
   .arguments("<file>")
   .action(function (file, options, program) {
-    run(compile(file, program), options);
+    exec.grainc(file, program);
+    if (options.o) {
+      run(options.o, program.opts());
+    } else {
+      run(file.replace(/\.gr$/, ".gr.wasm"), program.opts());
+    }
   });
 
 program
@@ -184,7 +185,7 @@ program
   .action(function (file) {
     // The compile subcommand inherits all behaviors/options of the
     // top level grain command
-    compile(file, program);
+    exec.grainc(file, program);
   });
 
 program
@@ -202,7 +203,12 @@ program
   .action(function (file) {
     // The lsp subcommand inherits all options of the
     // top level grain command
-    lsp(file, program);
+
+    // call the compiler, passing stdio through so the compiler gets the source code on stdin
+    // and we get the compiler output in stdout
+    // we still take the file name so we have it available
+
+    exec.grainc(`--lsp ${file}`, program);
   });
 
 program
@@ -213,13 +219,13 @@ program
     "provide a version to use as current when generating markdown for `@since` and `@history` attributes"
   )
   .action(function (file, options, program) {
-    doc(file, program);
+    exec.graindoc(file, program);
   });
 
 program
   .command("format <file|dir>")
   .description("format a grain file")
   .action(function (file, options, program) {
-    format(file, program);
+    exec.grainformat(file, program);
   });
 program.parse(process.argv);

cli/bin/grainc.js

@@ -1,6 +1,3 @@
-// A wrapper around grainc_js.bc.js that prepares the `pkg` env
-const preparePkg = require("./pkg");
-
-preparePkg();
-
+// A wrapper around grainc.bc.js that prepares the `pkg` env
+require("./pkg");
 require("./grainc.bc.js");

cli/bin/graindoc.js

@@ -1,6 +1,3 @@
-// A wrapper around grainc_js.bc.js that prepares the `pkg` env
-const preparePkg = require("./pkg");
-
-preparePkg();
-
+// A wrapper around grainc.bc.js that prepares the `pkg` env
+require("./pkg");
 require("./graindoc.bc.js");

cli/bin/grainformat.js

@@ -1,6 +1,3 @@
-// A wrapper around grainformat_js.bc.js that prepares the `pkg` env
-const preparePkg = require("./pkg");
-
-preparePkg();
-
+// A wrapper around grainformat.bc.js that prepares the `pkg` env
+require("./pkg");
 require("./grainformat.bc.js");

cli/bin/pkg.js

@@ -1,9 +1,5 @@
 // This function paves over some of the weird virtual filesystem stuff inside `pkg`
-function preparePkg() {
-  if (!process.pkg) {
-    return;
-  }
-
+if (process.pkg) {
   const fs = require("fs");
   const path = require("path");
   const stdlibPath = require("@grain/stdlib");
@@ -29,5 +25,3 @@ function preparePkg() {
     }
   );
 }
-
-module.exports = preparePkg;

cli/bin/run.js

@@ -1,10 +1,8 @@
 const path = require("path");
 const runner = require("@grain/js-runner");
-const preparePkg = require("./pkg");
+require("./pkg");
 
 module.exports = async function run(filename, options) {
-  preparePkg();
-
   let basePath = path.dirname(filename);
   let includeDirs = [basePath, ...options.includeDirs, options.stdlib];
   let locator = runner.defaultFileLocator(includeDirs);