Upgrade: update dependencies after dropping support for Node <8 (#53)

* Upgrade: Update dependencies

* Downgrade to eslint@5

* Update to eslint@^6.0.1

* Add assertion for added reference

.eslintignore

@@ -0,0 +1 @@
+!.eslintrc.js

.eslintrc.js

@@ -0,0 +1,16 @@
+"use strict";
+
+module.exports = {
+    root: true,
+    extends: [
+        "eslint"
+    ],
+    overrides: [
+        {
+            files: ["tests/**/*"],
+            env: {
+                mocha: true
+            }
+        }
+    ]
+};

Makefile.js

@@ -84,8 +84,6 @@ target.test = function() {
     let errors = 0;
     const lastReturn = exec(`${ISTANBUL} cover ${MOCHA} -- -R progress -c ${TEST_FILES}`);
 
-
-
     if (lastReturn.code !== 0) {
         errors++;
     }
@@ -131,8 +129,7 @@ target.checkLicenses = function() {
             impermissible.forEach(dependency => {
                 console.error("%s license for %s is impermissible.",
                     dependency.licenses,
-                    dependency.name
-                );
+                    dependency.name);
             });
             exit(1);
         }

lib/index.js

@@ -68,7 +68,7 @@ function defaultOptions() {
         directive: false,
         nodejsScope: false,
         impliedStrict: false,
-        sourceType: "script",  // one of ['script', 'module']
+        sourceType: "script", // one of ['script', 'module']
         ecmaVersion: 5,
         childVisitorKeys: null,
         fallback: "iteration"
@@ -93,7 +93,7 @@ function updateDeeply(target, override) {
     }
 
     for (const key in override) {
-        if (override.hasOwnProperty(key)) {
+        if (Object.prototype.hasOwnProperty.call(override, key)) {
             const val = override[key];
 
             if (isHashObject(val)) {

lib/referencer.js

@@ -81,7 +81,7 @@ class Importer extends esrecurse.Visitor {
                     this.declaration,
                     null,
                     null
-                    ));
+                ));
         });
     }
 
@@ -151,20 +151,26 @@ class Referencer extends esrecurse.Visitor {
                 assignment.right,
                 maybeImplicitGlobal,
                 pattern !== assignment.left,
-                init);
+                init
+            );
         });
     }
 
     visitPattern(node, options, callback) {
+        let visitPatternOptions = options;
+        let visitPatternCallback = callback;
+
         if (typeof options === "function") {
-            callback = options;
-            options = { processRightHandNodes: false };
+            visitPatternCallback = options;
+            visitPatternOptions = { processRightHandNodes: false };
         }
+
         traverseIdentifierInPattern(
             this.options,
             node,
-            options.processRightHandNodes ? this : null,
-            callback);
+            visitPatternOptions.processRightHandNodes ? this : null,
+            visitPatternCallback
+        );
     }
 
     visitFunction(node) {
@@ -180,14 +186,14 @@ class Referencer extends esrecurse.Visitor {
 
             // id is defined in upper scope
             this.currentScope().__define(node.id,
-                    new Definition(
-                        Variable.FunctionName,
-                        node.id,
-                        node,
-                        null,
-                        null,
-                        null
-                    ));
+                new Definition(
+                    Variable.FunctionName,
+                    node.id,
+                    node,
+                    null,
+                    null,
+                    null
+                ));
         }
 
         // FunctionExpression with name creates its special scope;
@@ -258,14 +264,14 @@ class Referencer extends esrecurse.Visitor {
     visitClass(node) {
         if (node.type === Syntax.ClassDeclaration) {
             this.currentScope().__define(node.id,
-                    new Definition(
-                        Variable.ClassName,
-                        node.id,
-                        node,
-                        null,
-                        null,
-                        null
-                    ));
+                new Definition(
+                    Variable.ClassName,
+                    node.id,
+                    node,
+                    null,
+                    null,
+                    null
+                ));
         }
 
         this.visit(node.superClass);
@@ -274,11 +280,11 @@ class Referencer extends esrecurse.Visitor {
 
         if (node.id) {
             this.currentScope().__define(node.id,
-                    new Definition(
-                        Variable.ClassName,
-                        node.id,
-                        node
-                    ));
+                new Definition(
+                    Variable.ClassName,
+                    node.id,
+                    node
+                ));
         }
         this.visit(node.body);
 

lib/scope.js

@@ -161,7 +161,7 @@ class Scope {
          */
         this.type = type;
 
-         /**
+        /**
          * The scoped {@link Variable}s of this scope, as <code>{ Variable.name
          * : Variable }</code>.
          * @member {Map} Scope#set
@@ -192,21 +192,21 @@ class Scope {
          */
         this.block = block;
 
-         /**
+        /**
          * The {@link Reference|references} that are not resolved with this scope.
          * @member {Reference[]} Scope#through
          */
         this.through = [];
 
-         /**
+        /**
          * The scoped {@link Variable}s of this scope. In the case of a
          * 'function' scope this includes the automatic argument <em>arguments</em> as
          * its first element, as well as all further formal arguments.
          * @member {Variable[]} Scope#variables
          */
         this.variables = [];
 
-         /**
+        /**
          * Any variable {@link Reference|reference} found in this scope. This
          * includes occurrences of local variables as well as variables from
          * parent scopes (including the global scope). For local variables
@@ -217,7 +217,7 @@ class Scope {
          */
         this.references = [];
 
-         /**
+        /**
          * For 'global' and 'function' scopes, this is a self-reference. For
          * other scope types this is the <em>variableScope</em> value of the
          * parent scope.
@@ -226,38 +226,38 @@ class Scope {
         this.variableScope =
             (this.type === "global" || this.type === "function" || this.type === "module") ? this : upperScope.variableScope;
 
-         /**
+        /**
          * Whether this scope is created by a FunctionExpression.
          * @member {boolean} Scope#functionExpressionScope
          */
         this.functionExpressionScope = false;
 
-         /**
+        /**
          * Whether this is a scope that contains an 'eval()' invocation.
          * @member {boolean} Scope#directCallToEvalScope
          */
         this.directCallToEvalScope = false;
 
-         /**
+        /**
          * @member {boolean} Scope#thisFound
          */
         this.thisFound = false;
 
         this.__left = [];
 
-         /**
+        /**
          * Reference to the parent {@link Scope|scope}.
          * @member {Scope} Scope#upper
          */
         this.upper = upperScope;
 
-         /**
+        /**
          * Whether 'use strict' is in effect in this scope.
          * @member {boolean} Scope#isStrict
          */
         this.isStrict = isStrictScope(this, block, isMethodDefinition, scopeManager.__useDirective());
 
-         /**
+        /**
          * List of nested {@link Scope}s.
          * @member {Scope[]} Scope#childScopes
          */
@@ -414,11 +414,12 @@ class Scope {
     __define(node, def) {
         if (node && node.type === Syntax.Identifier) {
             this.__defineGeneric(
-                    node.name,
-                    this.set,
-                    this.variables,
-                    node,
-                    def);
+                node.name,
+                this.set,
+                this.variables,
+                node,
+                def
+            );
         }
     }
 
@@ -550,14 +551,14 @@ class GlobalScope extends Scope {
             const info = implicit[i];
 
             this.__defineImplicit(info.pattern,
-                    new Definition(
-                        Variable.ImplicitGlobalVariable,
-                        info.pattern,
-                        info.node,
-                        null,
-                        null,
-                        null
-                    ));
+                new Definition(
+                    Variable.ImplicitGlobalVariable,
+                    info.pattern,
+                    info.node,
+                    null,
+                    null,
+                    null
+                ));
 
         }
 
@@ -569,11 +570,12 @@ class GlobalScope extends Scope {
     __defineImplicit(node, def) {
         if (node && node.type === Syntax.Identifier) {
             this.__defineGeneric(
-                    node.name,
-                    this.implicit.set,
-                    this.implicit.variables,
-                    node,
-                    def);
+                node.name,
+                this.implicit.set,
+                this.implicit.variables,
+                node,
+                def
+            );
         }
     }
 }
@@ -588,14 +590,14 @@ class FunctionExpressionNameScope extends Scope {
     constructor(scopeManager, upperScope, block) {
         super(scopeManager, "function-expression-name", upperScope, block, false);
         this.__define(block.id,
-                new Definition(
-                    Variable.FunctionName,
-                    block.id,
-                    block,
-                    null,
-                    null,
-                    null
-                ));
+            new Definition(
+                Variable.FunctionName,
+                block.id,
+                block,
+                null,
+                null,
+                null
+            ));
         this.functionExpressionScope = true;
     }
 }
@@ -684,11 +686,12 @@ class FunctionScope extends Scope {
 
     __defineArguments() {
         this.__defineGeneric(
-                "arguments",
-                this.set,
-                this.variables,
-                null,
-                null);
+            "arguments",
+            this.set,
+            this.variables,
+            null,
+            null
+        );
         this.taints.set("arguments", true);
     }
 
@@ -710,7 +713,7 @@ class FunctionScope extends Scope {
         // It's invalid resolution in the following case:
         return !(
             variable.scope === this &&
-            ref.identifier.range[0] < bodyStart &&                 // the reference is in the parameter part.
+            ref.identifier.range[0] < bodyStart && // the reference is in the parameter part.
             variable.defs.every(d => d.name.range[0] >= bodyStart) // the variable is in the body.
         );
     }

package.json

@@ -31,16 +31,17 @@
     "estraverse": "^4.1.1"
   },
   "devDependencies": {
-    "chai": "^3.4.1",
-    "eslint": "^3.15.0",
-    "eslint-config-eslint": "^4.0.0",
+    "@typescript-eslint/parser": "^1.11.0",
+    "chai": "^4.2.0",
+    "eslint": "^6.0.1",
+    "eslint-config-eslint": "^5.0.1",
+    "eslint-plugin-node": "^9.1.0",
     "eslint-release": "^1.0.0",
-    "espree": "^3.1.1",
+    "espree": "^6.0.0",
     "istanbul": "^0.4.5",
-    "mocha": "^3.2.0",
+    "mocha": "^6.1.4",
     "npm-license": "^0.3.3",
-    "shelljs": "^0.7.6",
-    "typescript": "~2.0.10",
-    "typescript-eslint-parser": "^1.0.0"
+    "shelljs": "^0.8.3",
+    "typescript": "^3.5.2"
   }
 }