fix: arg detection

denosaurs · May 24, 2020 · eb033b7 · eb033b7
1 parent 4402896
commit eb033b7
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 31 deletions.
diff --git a/src/args.ts b/src/args.ts
@@ -26,32 +26,42 @@ export function parseArgs(args: string[] = Deno.args): Args {
     args = args.slice(1);
   }
 
-  const flags = parseFlags(args, {
-    string: [
-      "config",
-    ],
-    boolean: [
-      "help",
-      "version",
-      "init",
-      "upgrade",
-    ],
-    alias: {
-      help: "h",
-      version: "v",
-      init: "i",
-      config: "c",
-    },
-  });
-
-  return {
-    help: flags.help ?? false,
-    version: flags.version ?? false,
-    init: flags.init ?? false,
-    upgrade: flags.upgrade ?? false,
-
-    config: flags.config,
-
-    cmd: flags._.map((_: any) => _.toString()),
+  const flags: Args = {
+    help: false,
+    version: false,
+    init: false,
+    upgrade: false,
+    cmd: [],
   };
+
+  if (
+    (args.indexOf("--config") === 0 || args.indexOf("-c") === 0) &&
+    args.length > 1
+  ) {
+    flags.config = args[1];
+    args = args.slice(2);
+  }
+
+  if (args.indexOf("--help") === 0 || args.indexOf("-h") === 0) {
+    flags.help = true;
+    args = args.slice(1);
+  }
+
+  if (args.indexOf("--version") === 0 || args.indexOf("-v") === 0) {
+    flags.version = true;
+    args = args.slice(1);
+  }
+
+  if (args.indexOf("--init") === 0 || args.indexOf("-i") === 0) {
+    flags.init = true;
+    args = args.slice(1);
+  }
+
+  if (args.indexOf("--upgrade") === 0 || args.indexOf("-u") === 0) {
+    flags.upgrade = true;
+    args = args.slice(1);
+  }
+
+  flags.cmd = args;
+  return flags;
 }
diff --git a/src/runner.ts b/src/runner.ts
@@ -5,6 +5,7 @@ import { log } from "../deps.ts";
 import { Scripts, ScriptOptions, buildFlags } from "./scripts.ts";
 
 import { merge } from "./merge.ts";
+import { DenonConfig } from "./config.ts";
 
 /**
  * `Runner` configuration.
@@ -29,9 +30,9 @@ const reCliCompact = new RegExp(/^(run|test|fmt) *(.*)$/);
  * object to make available process events.
  */
 export class Runner {
-  #config: RunnerConfig;
+  #config: DenonConfig;
 
-  constructor(config: RunnerConfig) {
+  constructor(config: DenonConfig) {
     this.#config = config;
   }
 
@@ -47,8 +48,8 @@ export class Runner {
 
     const s = this.#config.scripts[script];
 
-    if (!s) {
-      const cmd = Deno.args.join(" ");
+    if (!s && this.#config.args) {
+      const cmd = this.#config.args.cmd.join(" ");
       let out: string[] = [];
       if (reCompact.test(cmd)) {
         out = ["deno", "run"];