Fix #510. Remove jake dev dependency and embed arg parser.

bin/cli.js

@@ -17,13 +17,8 @@
  *
 */
 
-
-let program = require('jake').program;
-delete global.jake; // NO NOT WANT
-program.setTaskNames = function (n) { this.taskNames = n; };
-
 let ejs = require('../lib/ejs');
-let { hyphenToCamel } = require('../lib/utils');
+let { hyphenToCamel, parseArgs } = require('../lib/utils');
 let fs = require('fs');
 let args = process.argv.slice(2);
 let usage = fs.readFileSync(`${__dirname}/../usage.txt`).toString();
@@ -99,13 +94,22 @@ const CLI_OPTS = [
   },
 ];
 
+function die(msg) {
+  console.log(msg);
+  process.stdout.write('', function () {
+    process.stderr.write('', function () {
+      process.exit();
+    });
+  });
+}
+
 let preempts = {
   version: function () {
-    program.die(ejs.VERSION);
+    die(ejs.VERSION);
   },
   help: function () {
-    program.die(usage);
-  }
+    die(usage);
+  },
 };
 
 let stdin = '';
@@ -118,10 +122,7 @@ process.stdin.on('readable', () => {
 });
 
 function run() {
-
-  program.availableOpts = CLI_OPTS;
-  program.parseArgs(args);
-
+  let program = parseArgs(CLI_OPTS, args);
   let templatePath = program.taskNames[0];
   let pVals = program.envVars;
   let pOpts = {};

lib/utils.js

@@ -208,4 +208,105 @@ exports.createNullProtoObjWherePossible = (function () {
   };
 })();
 
+// Embedded argument parser from https://github.com/jakejs/jake/blob/master/lib/parseargs.js
+// See original source for doc.
+// Fixes #510 and allows removing `jake` as a prod dependency.
+exports.parseArgs = function parseArgs(programOpts, programArgs) {
+  let isOpt = function (arg) {
+    return arg.indexOf('-') === 0;
+  };
+  let removeOptPrefix = function (opt) {
+    return opt.replace(/^--/, '').replace(/^-/, '');
+  };
+
+  const Parser = function (opts) {
+    this.opts = {};
+    this.taskNames = null;
+    this.envVars = null;
+    this.reg = opts;
+    this.shortOpts = {};
+    this.longOpts = {};
+
+    let self = this;
+    [].forEach.call(opts, function (item) {
+      self.shortOpts[item.abbr] = item;
+      self.longOpts[item.full] = item;
+    });
+  };
+
+  Parser.prototype = new (function () {
+    let _trueOrNextVal = function (argParts, args) {
+      if (argParts[1]) {
+        return argParts[1];
+      } else {
+        return !args[0] || isOpt(args[0]) ? true : args.shift();
+      }
+    };
+
+    this.parse = function (args) {
+      let cmds = [];
+      let cmd;
+      let envVars = {};
+      let opts = {};
+      let arg;
+      let argItem;
+      let argParts;
+      let cmdItems;
+      let taskNames = [];
+      let preempt;
 
+      while (args.length) {
+        arg = args.shift();
+
+        if (isOpt(arg)) {
+          arg = removeOptPrefix(arg);
+          argParts = arg.split('=');
+          argItem = this.longOpts[argParts[0]] || this.shortOpts[argParts[0]];
+          if (argItem) {
+            // First-encountered preemptive opt takes precedence -- no further opts
+            // or possibility of ambiguity, so just look for a value, or set to
+            // true and then bail
+            if (argItem.preempts) {
+              opts[argItem.full] = _trueOrNextVal(argParts, args);
+              preempt = true;
+              break;
+            }
+            // If the opt requires a value, see if we can get a value from the
+            // next arg, or infer true from no-arg -- if it's followed by another
+            // opt, throw an error
+            if (argItem.expectValue || argItem.allowValue) {
+              opts[argItem.full] = _trueOrNextVal(argParts, args);
+              if (argItem.expectValue && !opts[argItem.full]) {
+                throw new Error(argItem.full + ' option expects a value.');
+              }
+            } else {
+              opts[argItem.full] = true;
+            }
+          }
+        } else {
+          cmds.unshift(arg);
+        }
+      }
+
+      if (!preempt) {
+        // Parse out any env-vars and task-name
+        while ((cmd = cmds.pop())) {
+          cmdItems = cmd.split('=');
+          if (cmdItems.length > 1) {
+            envVars[cmdItems[0]] = cmdItems[1];
+          } else {
+            taskNames.push(cmd);
+          }
+        }
+      }
+
+      return {
+        opts: opts,
+        envVars: envVars,
+        taskNames: taskNames,
+      };
+    };
+  })();
+
+  return new Parser(programOpts).parse(programArgs);
+};

package.json

@@ -21,13 +21,12 @@
   },
   "bugs": "https://github.com/mde/ejs/issues",
   "homepage": "https://github.com/mde/ejs",
-  "dependencies": {
-    "jake": "^10.6.1"
-  },
+  "dependencies": {},
   "devDependencies": {
     "browserify": "^16.5.1",
     "eslint": "^6.8.0",
     "git-directory-deploy": "^1.5.1",
+    "jake": "^10.6.1",
     "jsdoc": "^3.6.7",
     "lru-cache": "^4.0.1",
     "mocha": "^7.1.1",