Merge pull request #154 from CosmWasm/multi-init

Support multiple init files

packages/cli/package.json

@@ -41,18 +41,18 @@
     "@iov/crypto": "^2.1.0",
     "@iov/encoding": "^2.1.0",
     "@iov/utils": "^2.0.2",
-    "argparse": "^1.0.10",
     "axios": "^0.19.2",
     "babylon": "^6.18.0",
     "colors": "^1.3.3",
     "diff": "^4",
     "recast": "^0.18.0",
     "ts-node": "^8",
-    "typescript": "~3.7"
+    "typescript": "~3.7",
+    "yargs": "^15.3.1"
   },
   "devDependencies": {
-    "@types/argparse": "^1.0.34",
     "@types/babylon": "^6.16.3",
-    "@types/diff": "^4"
+    "@types/diff": "^4",
+    "@types/yargs": "^15.0.4"
   }
 }

packages/cli/src/cli.ts

@@ -1,41 +1,32 @@
-import { ArgumentParser } from "argparse";
 import * as fs from "fs";
 import { join } from "path";
+import yargs from "yargs";
 
 import { TsRepl } from "./tsrepl";
 
 import colors = require("colors/safe");
 
 export function main(originalArgs: readonly string[]): void {
-  const parser = new ArgumentParser({ description: "The CosmWasm REPL" });
-  parser.addArgument("--version", {
-    action: "storeTrue",
-    help: "Print version and exit",
-  });
-  parser.addArgument("--init", {
-    metavar: "FILEPATH",
-    help: "Read initial TypeScript code from file",
-  });
-
-  const maintainerGroup = parser.addArgumentGroup({
-    title: "Maintainer options",
-    description: "Don't use those unless a maintainer tells you to.",
-  });
-  maintainerGroup.addArgument("--selftest", {
-    action: "storeTrue",
-    help: "Run a selftext and exit",
-  });
-  maintainerGroup.addArgument("--debug", {
-    action: "storeTrue",
-    help: "Enable debugging",
-  });
-  const args = parser.parseArgs([...originalArgs]);
-
-  if (args.version) {
-    const version = require(join(__dirname, "..", "package.json")).version;
-    console.info(version);
-    return;
-  }
+  const args = yargs
+    .options({
+      // User options (we get --help and --version for free)
+      init: {
+        describe: "Read initial TypeScript code from files",
+        type: "array",
+      },
+      // Maintainer options
+      debug: {
+        describe: "Enable debugging",
+        type: "boolean",
+      },
+      selftest: {
+        describe: "Run a selftext and exit",
+        type: "boolean",
+      },
+    })
+    .group(["init", "help", "version"], "User options")
+    .group(["debug", "selftest"], "Maintainer options")
+    .parse(originalArgs);
 
   const imports = new Map<string, readonly string[]>([
     [
@@ -170,7 +161,10 @@ export function main(originalArgs: readonly string[]): void {
   }
 
   if (args.init) {
-    init += fs.readFileSync(args.init, "utf8") + "\n";
+    for (const path of args.init.map(arg => arg.toString())) {
+      if (args.debug) console.info(`Adding file: '${path}' ...`);
+      init += fs.readFileSync(path, "utf8") + "\n";
+    }
   }
 
   const tsconfigPath = join(__dirname, "..", "tsconfig_repl.json");