eslint 5.12.0 → 5.14.1

package/lib/linter.js

@@ -70,30 +70,30 @@ const commentParser = new ConfigCommentParser();
  * @returns {void}
  */
 function addDeclaredGlobals(globalScope, configGlobals, commentDirectives) {
-    Object.keys(configGlobals).forEach(name => {
-        let variable = globalScope.set.get(name);
-
-        if (!variable) {
-            variable = new eslintScope.Variable(name, globalScope);
-            variable.eslintExplicitGlobal = false;
-            globalScope.variables.push(variable);
-            globalScope.set.set(name, variable);
-        }
-        variable.writeable = configGlobals[name];
-    });
-
-    Object.keys(commentDirectives.enabledGlobals).forEach(name => {
-        let variable = globalScope.set.get(name);
+    const mergedGlobalsInfo = Object.assign(
+        {},
+        lodash.mapValues(configGlobals, value => ({ sourceComment: null, value: ConfigOps.normalizeConfigGlobal(value) })),
+        lodash.mapValues(commentDirectives.enabledGlobals, ({ comment, value }) => ({ sourceComment: comment, value: ConfigOps.normalizeConfigGlobal(value) }))
+    );
 
-        if (!variable) {
-            variable = new eslintScope.Variable(name, globalScope);
-            variable.eslintExplicitGlobal = true;
-            variable.eslintExplicitGlobalComment = commentDirectives.enabledGlobals[name].comment;
-            globalScope.variables.push(variable);
-            globalScope.set.set(name, variable);
-        }
-        variable.writeable = commentDirectives.enabledGlobals[name].value;
-    });
+    Object.keys(mergedGlobalsInfo)
+        .filter(name => mergedGlobalsInfo[name].value !== "off")
+        .forEach(name => {
+            let variable = globalScope.set.get(name);
+
+            if (!variable) {
+                variable = new eslintScope.Variable(name, globalScope);
+                if (mergedGlobalsInfo[name].sourceComment === null) {
+                    variable.eslintExplicitGlobal = false;
+                } else {
+                    variable.eslintExplicitGlobal = true;
+                    variable.eslintExplicitGlobalComment = mergedGlobalsInfo[name].sourceComment;
+                }
+                globalScope.variables.push(variable);
+                globalScope.set.set(name, variable);
+            }
+            variable.writeable = (mergedGlobalsInfo[name].value === "writeable");
+        });
 
     // mark all exported variables as such
     Object.keys(commentDirectives.exportedVariables).forEach(name => {
@@ -191,12 +191,12 @@ function getDirectiveComments(filename, ast, ruleMapper) {
         } else if (comment.type === "Block") {
             switch (match[1]) {
                 case "exported":
-                    Object.assign(exportedVariables, commentParser.parseBooleanConfig(directiveValue, comment));
+                    Object.assign(exportedVariables, commentParser.parseStringConfig(directiveValue, comment));
                     break;
 
                 case "globals":
                 case "global":
-                    Object.assign(enabledGlobals, commentParser.parseBooleanConfig(directiveValue, comment));
+                    Object.assign(enabledGlobals, commentParser.parseStringConfig(directiveValue, comment));
                     break;
 
                 case "eslint-disable":
@@ -758,6 +758,7 @@ function runRules(sourceCode, configuredRules, ruleMapper, parserOptions, parser
 
 const lastSourceCodes = new WeakMap();
 const loadedParserMaps = new WeakMap();
+const ruleMaps = new WeakMap();
 
 //------------------------------------------------------------------------------
 // Public Interface
@@ -772,9 +773,8 @@ module.exports = class Linter {
     constructor() {
         lastSourceCodes.set(this, null);
         loadedParserMaps.set(this, new Map());
+        ruleMaps.set(this, new Rules());
         this.version = pkg.version;
-
-        this.rules = new Rules();
         this.environments = new Environments();
     }
 
@@ -873,7 +873,7 @@ module.exports = class Linter {
 
         const sourceCode = lastSourceCodes.get(this);
         const commentDirectives = options.allowInlineConfig
-            ? getDirectiveComments(options.filename, sourceCode.ast, ruleId => this.rules.get(ruleId))
+            ? getDirectiveComments(options.filename, sourceCode.ast, ruleId => ruleMaps.get(this).get(ruleId))
             : { configuredRules: {}, enabledGlobals: {}, exportedVariables: {}, problems: [], disableDirectives: [] };
 
         // augment global scope with declared global variables
@@ -891,7 +891,7 @@ module.exports = class Linter {
             lintingProblems = runRules(
                 sourceCode,
                 configuredRules,
-                ruleId => this.rules.get(ruleId),
+                ruleId => ruleMaps.get(this).get(ruleId),
                 parserOptions,
                 parserName,
                 settings,
@@ -957,7 +957,7 @@ module.exports = class Linter {
      * @returns {void}
      */
     defineRule(ruleId, ruleModule) {
-        this.rules.define(ruleId, ruleModule);
+        ruleMaps.get(this).define(ruleId, ruleModule);
     }
 
     /**
@@ -976,7 +976,7 @@ module.exports = class Linter {
      * @returns {Map} All loaded rules
      */
     getRules() {
-        return this.rules.getAllLoadedRules();
+        return ruleMaps.get(this).getAllLoadedRules();
     }
 
     /**

package/lib/load-rules.js

@@ -20,15 +20,12 @@ const rulesDirCache = {};
 
 /**
  * Load all rule modules from specified directory.
- * @param {string} [relativeRulesDir] Path to rules directory, may be relative. Defaults to `lib/rules`.
+ * @param {string} relativeRulesDir Path to rules directory, may be relative.
  * @param {string} cwd Current working directory
  * @returns {Object} Loaded rule modules by rule ids (file names).
  */
 module.exports = function(relativeRulesDir, cwd) {
-
-    const rulesDir = relativeRulesDir
-        ? path.resolve(cwd, relativeRulesDir)
-        : path.join(__dirname, "rules");
+    const rulesDir = path.resolve(cwd, relativeRulesDir);
 
     // cache will help performance as IO operation are expensive
     if (rulesDirCache[rulesDir]) {

package/lib/rules/accessor-pairs.js

@@ -85,10 +85,12 @@ module.exports = {
             type: "object",
             properties: {
                 getWithoutSet: {
-                    type: "boolean"
+                    type: "boolean",
+                    default: false
                 },
                 setWithoutGet: {
-                    type: "boolean"
+                    type: "boolean",
+                    default: true
                 }
             },
             additionalProperties: false

package/lib/rules/array-bracket-newline.js

@@ -34,11 +34,13 @@ module.exports = {
                         type: "object",
                         properties: {
                             multiline: {
-                                type: "boolean"
+                                type: "boolean",
+                                default: true
                             },
                             minItems: {
                                 type: ["integer", "null"],
-                                minimum: 0
+                                minimum: 0,
+                                default: null
                             }
                         },
                         additionalProperties: false

package/lib/rules/array-callback-return.js

@@ -155,7 +155,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     allowImplicit: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false

package/lib/rules/array-element-newline.js

@@ -34,11 +34,13 @@ module.exports = {
                         type: "object",
                         properties: {
                             multiline: {
-                                type: "boolean"
+                                type: "boolean",
+                                default: false
                             },
                             minItems: {
                                 type: ["integer", "null"],
-                                minimum: 0
+                                minimum: 0,
+                                default: null
                             }
                         },
                         additionalProperties: false

package/lib/rules/arrow-body-style.js

@@ -46,7 +46,7 @@ module.exports = {
                         {
                             type: "object",
                             properties: {
-                                requireReturnForObjectLiteral: { type: "boolean" }
+                                requireReturnForObjectLiteral: { type: "boolean", default: false }
                             },
                             additionalProperties: false
                         }

package/lib/rules/arrow-parens.js

@@ -35,7 +35,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     requireForBlockBody: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false

package/lib/rules/arrow-spacing.js

@@ -32,10 +32,12 @@ module.exports = {
                 type: "object",
                 properties: {
                     before: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     },
                     after: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     }
                 },
                 additionalProperties: false
@@ -54,11 +56,10 @@ module.exports = {
     create(context) {
 
         // merge rules with default
-        const rule = { before: true, after: true },
-            option = context.options[0] || {};
+        const rule = Object.assign({}, context.options[0]);
 
-        rule.before = option.before !== false;
-        rule.after = option.after !== false;
+        rule.before = rule.before !== false;
+        rule.after = rule.after !== false;
 
         const sourceCode = context.getSourceCode();
 

package/lib/rules/brace-style.js

@@ -30,7 +30,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     allowSingleLine: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false

package/lib/rules/camelcase.js

@@ -25,7 +25,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     ignoreDestructuring: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     properties: {
                         enum: ["always", "never"]
@@ -54,7 +55,7 @@ module.exports = {
 
         const options = context.options[0] || {};
         let properties = options.properties || "";
-        const ignoreDestructuring = options.ignoreDestructuring || false;
+        const ignoreDestructuring = options.ignoreDestructuring;
         const allow = options.allow || [];
 
         if (properties !== "always" && properties !== "never") {

package/lib/rules/capitalized-comments.js

@@ -17,12 +17,7 @@ const astUtils = require("../util/ast-utils");
 
 const DEFAULT_IGNORE_PATTERN = astUtils.COMMENTS_IGNORE_PATTERN,
     WHITESPACE = /\s/g,
-    MAYBE_URL = /^\s*[^:/?#\s]+:\/\/[^?#]/, // TODO: Combine w/ max-len pattern?
-    DEFAULTS = {
-        ignorePattern: null,
-        ignoreInlineComments: false,
-        ignoreConsecutiveComments: false
-    };
+    MAYBE_URL = /^\s*[^:/?#\s]+:\/\/[^?#]/; // TODO: Combine w/ max-len pattern?
 
 /*
  * Base schema body for defining the basic capitalization rule, ignorePattern,
@@ -33,17 +28,27 @@ const SCHEMA_BODY = {
     type: "object",
     properties: {
         ignorePattern: {
-            type: "string"
+            type: "string",
+            default: ""
         },
         ignoreInlineComments: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         ignoreConsecutiveComments: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         }
     },
     additionalProperties: false
 };
+const DEFAULTS = Object.keys(SCHEMA_BODY.properties).reduce(
+    (obj, current) => {
+        obj[current] = SCHEMA_BODY.properties[current].default;
+        return obj;
+    },
+    {}
+);
 
 /**
  * Get normalized options for either block or line comments from the given
@@ -59,11 +64,7 @@ const SCHEMA_BODY = {
  * @param {string} which Either "line" or "block".
  * @returns {Object} The normalized options.
  */
-function getNormalizedOptions(rawOptions, which) {
-    if (!rawOptions) {
-        return Object.assign({}, DEFAULTS);
-    }
-
+function getNormalizedOptions(rawOptions = {}, which) {
     return Object.assign({}, DEFAULTS, rawOptions[which] || rawOptions);
 }
 

package/lib/rules/class-methods-use-this.js

@@ -38,7 +38,7 @@ module.exports = {
         }
     },
     create(context) {
-        const config = context.options[0] ? Object.assign({}, context.options[0]) : {};
+        const config = Object.assign({}, context.options[0]);
         const exceptMethods = new Set(config.exceptMethods || []);
 
         const stack = [];

package/lib/rules/comma-spacing.js

@@ -28,10 +28,12 @@ module.exports = {
                 type: "object",
                 properties: {
                     before: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     after: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     }
                 },
                 additionalProperties: false
@@ -50,8 +52,8 @@ module.exports = {
         const tokensAndComments = sourceCode.tokensAndComments;
 
         const options = {
-            before: context.options[0] ? !!context.options[0].before : false,
-            after: context.options[0] ? !!context.options[0].after : true
+            before: context.options[0] ? context.options[0].before : false,
+            after: context.options[0] ? context.options[0].after : true
         };
 
         //--------------------------------------------------------------------------
@@ -118,6 +120,10 @@ module.exports = {
                 report(reportItem, "before", tokens.left);
             }
 
+            if (tokens.right && astUtils.isClosingParenToken(tokens.right)) {
+                return;
+            }
+
             if (tokens.right && !options.after && tokens.right.type === "Line") {
                 return;
             }

package/lib/rules/complexity.js

@@ -41,11 +41,13 @@ module.exports = {
                         properties: {
                             maximum: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 20
                             },
                             max: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 20
                             }
                         },
                         additionalProperties: false
@@ -63,13 +65,9 @@ module.exports = {
         const option = context.options[0];
         let THRESHOLD = 20;
 
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "maximum") && typeof option.maximum === "number") {
-            THRESHOLD = option.maximum;
-        }
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "max") && typeof option.max === "number") {
-            THRESHOLD = option.max;
-        }
-        if (typeof option === "number") {
+        if (typeof option === "object") {
+            THRESHOLD = option.maximum || option.max;
+        } else if (typeof option === "number") {
             THRESHOLD = option;
         }
 

package/lib/rules/consistent-return.js

@@ -66,7 +66,8 @@ module.exports = {
             type: "object",
             properties: {
                 treatUndefinedAsUnspecified: {
-                    type: "boolean"
+                    type: "boolean",
+                    default: false
                 }
             },
             additionalProperties: false

package/lib/rules/dot-notation.js

@@ -33,10 +33,12 @@ module.exports = {
                 type: "object",
                 properties: {
                     allowKeywords: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     },
                     allowPattern: {
-                        type: "string"
+                        type: "string",
+                        default: ""
                     }
                 },
                 additionalProperties: false
@@ -53,7 +55,7 @@ module.exports = {
 
     create(context) {
         const options = context.options[0] || {};
-        const allowKeywords = options.allowKeywords === void 0 || !!options.allowKeywords;
+        const allowKeywords = options.allowKeywords === void 0 || options.allowKeywords;
         const sourceCode = context.getSourceCode();
 
         let allowPattern;

package/lib/rules/eqeqeq.js

@@ -38,7 +38,8 @@ module.exports = {
                             type: "object",
                             properties: {
                                 null: {
-                                    enum: ["always", "never", "ignore"]
+                                    enum: ["always", "never", "ignore"],
+                                    default: "always"
                                 }
                             },
                             additionalProperties: false

package/lib/rules/for-direction.js

@@ -42,6 +42,23 @@ module.exports = {
             });
         }
 
+        /**
+         * check the right side of the assignment
+         * @param {ASTNode} update UpdateExpression to check
+         * @param {int} dir expected direction that could either be turned around or invalidated
+         * @returns {int} return dir, the negated dir or zero if it's not clear for identifiers
+         */
+        function getRightDirection(update, dir) {
+            if (update.right.type === "UnaryExpression") {
+                if (update.right.operator === "-") {
+                    return -dir;
+                }
+            } else if (update.right.type === "Identifier") {
+                return 0;
+            }
+            return dir;
+        }
+
         /**
          * check UpdateExpression add/sub the counter
          * @param {ASTNode} update UpdateExpression to check
@@ -69,10 +86,10 @@ module.exports = {
         function getAssignmentDirection(update, counter) {
             if (update.left.name === counter) {
                 if (update.operator === "+=") {
-                    return 1;
+                    return getRightDirection(update, 1);
                 }
                 if (update.operator === "-=") {
-                    return -1;
+                    return getRightDirection(update, -1);
                 }
             }
             return 0;
@@ -85,26 +102,22 @@ module.exports = {
                     const operator = node.test.operator;
                     const update = node.update;
 
-                    if (operator === "<" || operator === "<=") {
-
-                        // report error if update sub the counter (--, -=)
-                        if (update.type === "UpdateExpression" && getUpdateDirection(update, counter) < 0) {
-                            report(node);
-                        }
+                    let wrongDirection;
 
-                        if (update.type === "AssignmentExpression" && getAssignmentDirection(update, counter) < 0) {
-                            report(node);
-                        }
+                    if (operator === "<" || operator === "<=") {
+                        wrongDirection = -1;
                     } else if (operator === ">" || operator === ">=") {
+                        wrongDirection = 1;
+                    } else {
+                        return;
+                    }
 
-                        // report error if update add the counter (++, +=)
-                        if (update.type === "UpdateExpression" && getUpdateDirection(update, counter) > 0) {
-                            report(node);
-                        }
-
-                        if (update.type === "AssignmentExpression" && getAssignmentDirection(update, counter) > 0) {
+                    if (update.type === "UpdateExpression") {
+                        if (getUpdateDirection(update, counter) === wrongDirection) {
                             report(node);
                         }
+                    } else if (update.type === "AssignmentExpression" && getAssignmentDirection(update, counter) === wrongDirection) {
+                        report(node);
                     }
                 }
             }

package/lib/rules/func-call-spacing.js

@@ -50,7 +50,8 @@ module.exports = {
                             type: "object",
                             properties: {
                                 allowNewlines: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: false
                                 }
                             },
                             additionalProperties: false

package/lib/rules/func-style.js

@@ -27,7 +27,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     allowArrowFunctions: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false
@@ -43,7 +44,7 @@ module.exports = {
     create(context) {
 
         const style = context.options[0],
-            allowArrowFunctions = context.options[1] && context.options[1].allowArrowFunctions === true,
+            allowArrowFunctions = context.options[1] && context.options[1].allowArrowFunctions,
             enforceDeclarations = (style === "declaration"),
             stack = [];
 

package/lib/rules/getter-return.js

@@ -60,7 +60,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     allowImplicit: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false

package/lib/rules/global-require.js

@@ -57,7 +57,10 @@ module.exports = {
             url: "https://eslint.org/docs/rules/global-require"
         },
 
-        schema: []
+        schema: [],
+        messages: {
+            unexpected: "Unexpected require()."
+        }
     },
 
     create(context) {
@@ -69,7 +72,7 @@ module.exports = {
                     const isGoodRequire = context.getAncestors().every(parent => ACCEPTABLE_PARENTS.indexOf(parent.type) > -1);
 
                     if (!isGoodRequire) {
-                        context.report({ node, message: "Unexpected require()." });
+                        context.report({ node, messageId: "unexpected" });
                     }
                 }
             }

package/lib/rules/guard-for-in.js

@@ -20,7 +20,10 @@ module.exports = {
             url: "https://eslint.org/docs/rules/guard-for-in"
         },
 
-        schema: []
+        schema: [],
+        messages: {
+            wrap: "The body of a for-in should be wrapped in an if statement to filter unwanted properties from the prototype."
+        }
     },
 
     create(context) {
@@ -65,7 +68,7 @@ module.exports = {
                     }
                 }
 
-                context.report({ node, message: "The body of a for-in should be wrapped in an if statement to filter unwanted properties from the prototype." });
+                context.report({ node, messageId: "wrap" });
             }
         };
 

package/lib/rules/handle-callback-err.js

@@ -24,7 +24,10 @@ module.exports = {
             {
                 type: "string"
             }
-        ]
+        ],
+        messages: {
+            expected: "Expected error to be handled."
+        }
     },
 
     create(context) {
@@ -77,7 +80,7 @@ module.exports = {
 
             if (firstParameter && matchesConfiguredErrorName(firstParameter.name)) {
                 if (firstParameter.references.length === 0) {
-                    context.report({ node, message: "Expected error to be handled." });
+                    context.report({ node, messageId: "expected" });
                 }
             }
         }