feat: Node.js 4.4.5+ compatibility

Make Caporal compatible with node.js 4.4.5+
mattallty · Feb 26, 2017 · fd0fbdc · fd0fbdc
1 parent cf8e4d0
commit fd0fbdc
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/lib/autocomplete.js b/lib/autocomplete.js
@@ -47,9 +47,9 @@ class Autocomplete {
     while(!cmd && args.length) {
       commandArr.push(args.shift());
       const cmdStr = commandArr.join(' ');
-      [cmd] = commands.filter(c => {
+      cmd = commands.filter(c => {
         return (c.name() === cmdStr || c.getAlias() === cmdStr)
-      });
+      })[0];
     }
 
     if (!cmd && this._program._getDefaultCommand()) {
@@ -123,8 +123,8 @@ class Autocomplete {
         if ((o.getShortName() && o.getShortName() != lastPartial && o.getShortName().startsWith(lastPartial)) ||
           (o.getLongName() && o.getLongName() != lastPartial && o.getLongName().startsWith(lastPartial)) ) {
           return o.getLongOrShortName() + ':' + o.description();
-        } else if(!lastPartialIsOption && !optionsAlreadyUsed.includes(o.getShortName()) &&
-          !optionsAlreadyUsed.includes(o.getLongName())) {
+        } else if(!lastPartialIsOption && optionsAlreadyUsed.indexOf(o.getShortName()) === -1 &&
+          optionsAlreadyUsed.indexOf(o.getLongName()) === -1) {
           return o.getLongOrShortName() + ':' + o.description();
         }
       }).filter(o => typeof o != 'undefined') : [];
@@ -196,8 +196,6 @@ class Autocomplete {
         const completions = []
           .concat.apply([], results)
           .filter(e => typeof e != 'undefined');
-        console.log("results", results);
-        console.log("completions", completions);
         done(null, completions);
         return completions;
       })

diff --git a/lib/command.js b/lib/command.js
@@ -267,7 +267,7 @@ class Command extends GetterSetter {
    */
   _validateOptions(options) {
     return Object.keys(options).reduce((acc, key) => {
-      if (Command.NATIVE_OPTIONS.includes(key)) {
+      if (Command.NATIVE_OPTIONS.indexOf(key) !== -1) {
         return acc;
       }
       const value = acc[key];

diff --git a/lib/program.js b/lib/program.js
@@ -30,7 +30,7 @@ class Program extends GetterSetter {
    * @private
    */
   help(cmdStr) {
-    const [cmd] = this._commands.filter(c => (c.name() === cmdStr || c.getAlias() === cmdStr));
+    const cmd = this._commands.filter(c => (c.name() === cmdStr || c.getAlias() === cmdStr))[0];
     this._help.display(cmd);
   }
 
@@ -98,7 +98,7 @@ class Program extends GetterSetter {
     while(!cmd && argsCopy.length) {
       commandArr.push(argsCopy.shift());
       const cmdStr = commandArr.join(' ');
-      [cmd] = this._commands.filter(c => (c.name() === cmdStr || c.getAlias() === cmdStr));
+      cmd = this._commands.filter(c => (c.name() === cmdStr || c.getAlias() === cmdStr))[0];
     }
 
     if (options.V || options.version) {

diff --git a/lib/validator.js b/lib/validator.js
@@ -147,7 +147,7 @@ class Validator {
    * @private
    */
   _validateWithArray(value) {
-    if (!this._validator.map(String).includes(value)) {
+    if (this._validator.map(String).indexOf(value) === -1) {
       throw new ValidationError(
         "Array validation failed",
         {validator: this._validator, value},

diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "postinstall": "(test -f ./node_modules/husky/bin/install.js && node ./node_modules/husky/bin/install.js) || exit 0"
   },
   "engines": {
-    "node": ">= 6.0.0"
+    "node": ">= 4.4.5"
   },
   "keywords": [
     "cli",

diff --git a/tests/verbosity-quiet.js b/tests/verbosity-quiet.js
@@ -19,7 +19,10 @@ describe('Passing --quiet', () => {
   it(`should only output warnings & errors`, (done) => {
     let output = 0;
 
-    const listener = (out, level, txt) => output++;
+    const listener = function(out, level, txt) {
+      output++
+    };
+
     logger.on('logging', listener);
 
     program.parse(makeArgv(['foo', '--quiet']));