eslint 5.12.0 → 5.14.1

package/lib/rules/max-statements.js

@@ -40,11 +40,13 @@ module.exports = {
                         properties: {
                             maximum: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 10
                             },
                             max: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 10
                             }
                         },
                         additionalProperties: false
@@ -60,7 +62,10 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            exceed: "{{name}} has too many statements ({{count}}). Maximum allowed is {{max}}."
+        }
     },
 
     create(context) {
@@ -75,13 +80,9 @@ module.exports = {
             topLevelFunctions = [];
         let maxStatements = 10;
 
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "maximum") && typeof option.maximum === "number") {
-            maxStatements = option.maximum;
-        }
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "max") && typeof option.max === "number") {
-            maxStatements = option.max;
-        }
-        if (typeof option === "number") {
+        if (typeof option === "object") {
+            maxStatements = option.maximum || option.max;
+        } else if (typeof option === "number") {
             maxStatements = option;
         }
 
@@ -99,7 +100,7 @@ module.exports = {
 
                 context.report({
                     node,
-                    message: "{{name}} has too many statements ({{count}}). Maximum allowed is {{max}}.",
+                    messageId: "exceed",
                     data: { name, count, max }
                 });
             }

package/lib/rules/multiline-comment-style.js

@@ -22,20 +22,21 @@ module.exports = {
         },
 
         fixable: "whitespace",
-        schema: [{ enum: ["starred-block", "separate-lines", "bare-block"] }]
+        schema: [{ enum: ["starred-block", "separate-lines", "bare-block"] }],
+        messages: {
+            expectedBlock: "Expected a block comment instead of consecutive line comments.",
+            startNewline: "Expected a linebreak after '/*'.",
+            endNewline: "Expected a linebreak before '*/'.",
+            missingStar: "Expected a '*' at the start of this line.",
+            alignment: "Expected this line to be aligned with the start of the comment.",
+            expectedLines: "Expected multiple line comments instead of a block comment."
+        }
     },
 
     create(context) {
         const sourceCode = context.getSourceCode();
         const option = context.options[0] || "starred-block";
 
-        const EXPECTED_BLOCK_ERROR = "Expected a block comment instead of consecutive line comments.";
-        const START_NEWLINE_ERROR = "Expected a linebreak after '/*'.";
-        const END_NEWLINE_ERROR = "Expected a linebreak before '*/'.";
-        const MISSING_STAR_ERROR = "Expected a '*' at the start of this line.";
-        const ALIGNMENT_ERROR = "Expected this line to be aligned with the start of the comment.";
-        const EXPECTED_LINES_ERROR = "Expected multiple line comments instead of a block comment.";
-
         //----------------------------------------------------------------------
         // Helpers
         //----------------------------------------------------------------------
@@ -127,7 +128,7 @@ module.exports = {
                             start: commentGroup[0].loc.start,
                             end: commentGroup[commentGroup.length - 1].loc.end
                         },
-                        message: EXPECTED_BLOCK_ERROR,
+                        messageId: "expectedBlock",
                         fix(fixer) {
                             const range = [commentGroup[0].range[0], commentGroup[commentGroup.length - 1].range[1]];
                             const starredBlock = `/*${convertToStarredBlock(commentGroup[0], commentLines)}*/`;
@@ -150,7 +151,7 @@ module.exports = {
                                 start: block.loc.start,
                                 end: { line: block.loc.start.line, column: block.loc.start.column + 2 }
                             },
-                            message: START_NEWLINE_ERROR,
+                            messageId: "startNewline",
                             fix: fixer => fixer.insertTextAfterRange([start, start + 2], `\n${expectedLinePrefix}`)
                         });
                     }
@@ -161,7 +162,7 @@ module.exports = {
                                 start: { line: block.loc.end.line, column: block.loc.end.column - 2 },
                                 end: block.loc.end
                             },
-                            message: END_NEWLINE_ERROR,
+                            messageId: "endNewline",
                             fix: fixer => fixer.replaceTextRange([block.range[1] - 2, block.range[1]], `\n${expectedLinePrefix}/`)
                         });
                     }
@@ -175,9 +176,9 @@ module.exports = {
                                     start: { line: lineNumber, column: 0 },
                                     end: { line: lineNumber, column: sourceCode.lines[lineNumber - 1].length }
                                 },
-                                message: /^\s*\*/.test(lineText)
-                                    ? ALIGNMENT_ERROR
-                                    : MISSING_STAR_ERROR,
+                                messageId: /^\s*\*/.test(lineText)
+                                    ? "alignment"
+                                    : "missingStar",
                                 fix(fixer) {
                                     const lineStartIndex = sourceCode.getIndexFromLoc({ line: lineNumber, column: 0 });
                                     const linePrefixLength = lineText.match(/^\s*\*? ?/)[0].length;
@@ -209,7 +210,7 @@ module.exports = {
                             start: block.loc.start,
                             end: { line: block.loc.start.line, column: block.loc.start.column + 2 }
                         },
-                        message: EXPECTED_LINES_ERROR,
+                        messageId: "expectedLines",
                         fix(fixer) {
                             return fixer.replaceText(block, convertToSeparateLines(block, commentLines.filter(line => line)));
                         }
@@ -228,7 +229,7 @@ module.exports = {
                                 start: commentGroup[0].loc.start,
                                 end: commentGroup[commentGroup.length - 1].loc.end
                             },
-                            message: EXPECTED_BLOCK_ERROR,
+                            messageId: "expectedBlock",
                             fix(fixer) {
                                 const range = [commentGroup[0].range[0], commentGroup[commentGroup.length - 1].range[1]];
                                 const block = convertToBlock(commentGroup[0], commentLines.filter(line => line));
@@ -249,7 +250,7 @@ module.exports = {
                                     start: block.loc.start,
                                     end: { line: block.loc.start.line, column: block.loc.start.column + 2 }
                                 },
-                                message: EXPECTED_BLOCK_ERROR,
+                                messageId: "expectedBlock",
                                 fix(fixer) {
                                     return fixer.replaceText(block, convertToBlock(block, commentLines.filter(line => line)));
                                 }

package/lib/rules/multiline-ternary.js

@@ -26,7 +26,13 @@ module.exports = {
             {
                 enum: ["always", "always-multiline", "never"]
             }
-        ]
+        ],
+        messages: {
+            expectedTestCons: "Expected newline between test and consequent of ternary expression.",
+            expectedConsAlt: "Expected newline between consequent and alternate of ternary expression.",
+            unexpectedTestCons: "Unexpected newline between test and consequent of ternary expression.",
+            unexpectedConsAlt: "Unexpected newline between consequent and alternate of ternary expression."
+        }
     },
 
     create(context) {
@@ -49,11 +55,7 @@ module.exports = {
         function reportError(node, parentNode, expected) {
             context.report({
                 node,
-                message: "{{expected}} newline between {{typeOfError}} of ternary expression.",
-                data: {
-                    expected: expected ? "Expected" : "Unexpected",
-                    typeOfError: node === parentNode.test ? "test and consequent" : "consequent and alternate"
-                }
+                messageId: `${expected ? "expected" : "unexpected"}${node === parentNode.test ? "TestCons" : "ConsAlt"}`
             });
         }
 

package/lib/rules/new-cap.js

@@ -88,10 +88,12 @@ module.exports = {
                 type: "object",
                 properties: {
                     newIsCap: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     },
                     capIsNew: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     },
                     newIsCapExceptions: {
                         type: "array",
@@ -112,17 +114,22 @@ module.exports = {
                         type: "string"
                     },
                     properties: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     }
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            upper: "A function with a name starting with an uppercase letter should only be used as a constructor.",
+            lower: "A constructor name should not start with a lowercase letter."
+        }
     },
 
     create(context) {
 
-        const config = context.options[0] ? Object.assign({}, context.options[0]) : {};
+        const config = Object.assign({}, context.options[0]);
 
         config.newIsCap = config.newIsCap !== false;
         config.capIsNew = config.capIsNew !== false;
@@ -219,19 +226,19 @@ module.exports = {
         }
 
         /**
-         * Reports the given message for the given node. The location will be the start of the property or the callee.
+         * Reports the given messageId for the given node. The location will be the start of the property or the callee.
          * @param {ASTNode} node CallExpression or NewExpression node.
-         * @param {string} message The message to report.
+         * @param {string} messageId The messageId to report.
          * @returns {void}
          */
-        function report(node, message) {
+        function report(node, messageId) {
             let callee = node.callee;
 
             if (callee.type === "MemberExpression") {
                 callee = callee.property;
             }
 
-            context.report({ node, loc: callee.loc.start, message });
+            context.report({ node, loc: callee.loc.start, messageId });
         }
 
         //--------------------------------------------------------------------------
@@ -248,7 +255,7 @@ module.exports = {
                     const isAllowed = capitalization !== "lower" || isCapAllowed(newIsCapExceptions, node, constructorName, newIsCapExceptionPattern);
 
                     if (!isAllowed) {
-                        report(node, "A constructor name should not start with a lowercase letter.");
+                        report(node, "lower");
                     }
                 }
             };
@@ -264,7 +271,7 @@ module.exports = {
                     const isAllowed = capitalization !== "upper" || isCapAllowed(capIsNewExceptions, node, calleeName, capIsNewExceptionPattern);
 
                     if (!isAllowed) {
-                        report(node, "A function with a name starting with an uppercase letter should only be used as a constructor.");
+                        report(node, "upper");
                     }
                 }
             };

package/lib/rules/new-parens.js

@@ -30,8 +30,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/new-parens"
         },
 
+        fixable: "code",
         schema: [],
-        fixable: "code"
+        messages: {
+            missing: "Missing '()' invoking a constructor."
+        }
     },
 
     create(context) {
@@ -50,7 +53,7 @@ module.exports = {
                 if (!hasParens) {
                     context.report({
                         node,
-                        message: "Missing '()' invoking a constructor.",
+                        messageId: "missing",
                         fix: fixer => fixer.insertTextAfter(node, "()")
                     });
                 }

package/lib/rules/newline-after-var.js

@@ -26,14 +26,16 @@ module.exports = {
             recommended: false,
             url: "https://eslint.org/docs/rules/newline-after-var"
         },
-
         schema: [
             {
                 enum: ["never", "always"]
             }
         ],
-
         fixable: "whitespace",
+        messages: {
+            expected: "Expected blank line after variable declarations.",
+            unexpected: "Unexpected blank line after variable declarations."
+        },
 
         deprecated: true,
 
@@ -41,10 +43,6 @@ module.exports = {
     },
 
     create(context) {
-
-        const ALWAYS_MESSAGE = "Expected blank line after variable declarations.",
-            NEVER_MESSAGE = "Unexpected blank line after variable declarations.";
-
         const sourceCode = context.getSourceCode();
 
         // Default `mode` to "always".
@@ -214,7 +212,7 @@ module.exports = {
             if (mode === "never" && noNextLineToken && !hasNextLineComment) {
                 context.report({
                     node,
-                    message: NEVER_MESSAGE,
+                    messageId: "unexpected",
                     data: { identifier: node.name },
                     fix(fixer) {
                         const linesBetween = sourceCode.getText().slice(lastToken.range[1], nextToken.range[0]).split(astUtils.LINEBREAK_MATCHER);
@@ -233,7 +231,7 @@ module.exports = {
             ) {
                 context.report({
                     node,
-                    message: ALWAYS_MESSAGE,
+                    messageId: "expected",
                     data: { identifier: node.name },
                     fix(fixer) {
                         if ((noNextLineToken ? getLastCommentLineOfBlock(nextLineNum) : lastToken.loc.end.line) === nextToken.loc.start.line) {

package/lib/rules/newline-before-return.js

@@ -22,6 +22,10 @@ module.exports = {
 
         fixable: "whitespace",
         schema: [],
+        messages: {
+            expected: "Expected newline before return statement."
+        },
+
         deprecated: true,
         replacedBy: ["padding-line-between-statements"]
     },
@@ -196,7 +200,7 @@ module.exports = {
                 if (!isFirstNode(node) && !hasNewlineBefore(node)) {
                     context.report({
                         node,
-                        message: "Expected newline before return statement.",
+                        messageId: "expected",
                         fix(fixer) {
                             if (canFix(node)) {
                                 const tokenBefore = sourceCode.getTokenBefore(node);

package/lib/rules/newline-per-chained-call.js

@@ -31,11 +31,15 @@ module.exports = {
                 ignoreChainWithDepth: {
                     type: "integer",
                     minimum: 1,
-                    maximum: 10
+                    maximum: 10,
+                    default: 2
                 }
             },
             additionalProperties: false
-        }]
+        }],
+        messages: {
+            expected: "Expected line break before `{{callee}}`."
+        }
     },
 
     create(context) {
@@ -91,7 +95,7 @@ module.exports = {
                     context.report({
                         node: callee.property,
                         loc: callee.property.loc.start,
-                        message: "Expected line break before `{{callee}}`.",
+                        messageId: "expected",
                         data: {
                             callee: getPropertyText(callee)
                         },

package/lib/rules/no-async-promise-executor.js

@@ -20,7 +20,10 @@ module.exports = {
         },
 
         fixable: null,
-        schema: []
+        schema: [],
+        messages: {
+            async: "Promise executor functions should not be async."
+        }
     },
 
     create(context) {
@@ -28,7 +31,7 @@ module.exports = {
             "NewExpression[callee.name='Promise'][arguments.0.async=true]"(node) {
                 context.report({
                     node: context.getSourceCode().getFirstToken(node.arguments[0], token => token.value === "async"),
-                    message: "Promise executor functions should not be async."
+                    messageId: "async"
                 });
             }
         };

package/lib/rules/no-bitwise.js

@@ -43,7 +43,8 @@ module.exports = {
                         uniqueItems: true
                     },
                     int32Hint: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false

package/lib/rules/no-confusing-arrow.js

@@ -41,7 +41,7 @@ module.exports = {
         schema: [{
             type: "object",
             properties: {
-                allowParens: { type: "boolean" }
+                allowParens: { type: "boolean", default: false }
             },
             additionalProperties: false
         }],

package/lib/rules/no-constant-condition.js

@@ -5,6 +5,13 @@
 
 "use strict";
 
+//------------------------------------------------------------------------------
+// Helpers
+//------------------------------------------------------------------------------
+
+const EQUALITY_OPERATORS = ["===", "!==", "==", "!="];
+const RELATIONAL_OPERATORS = [">", "<", ">=", "<=", "in", "instanceof"];
+
 //------------------------------------------------------------------------------
 // Rule Definition
 //------------------------------------------------------------------------------
@@ -25,7 +32,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     checkLoops: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     }
                 },
                 additionalProperties: false
@@ -109,7 +117,21 @@ module.exports = {
                     const isLeftShortCircuit = (isLeftConstant && isLogicalIdentity(node.left, node.operator));
                     const isRightShortCircuit = (isRightConstant && isLogicalIdentity(node.right, node.operator));
 
-                    return (isLeftConstant && isRightConstant) || isLeftShortCircuit || isRightShortCircuit;
+                    return (isLeftConstant && isRightConstant) ||
+                        (
+
+                            // in the case of an "OR", we need to know if the right constant value is truthy
+                            node.operator === "||" &&
+                            isRightConstant &&
+                            node.right.value &&
+                            (
+                                !node.parent ||
+                                node.parent.type !== "BinaryExpression" ||
+                                !(EQUALITY_OPERATORS.includes(node.parent.operator) || RELATIONAL_OPERATORS.includes(node.parent.operator))
+                            )
+                        ) ||
+                        isLeftShortCircuit ||
+                        isRightShortCircuit;
                 }
 
                 case "AssignmentExpression":

package/lib/rules/no-duplicate-imports.js

@@ -29,18 +29,17 @@ function getValue(node) {
  * @param {ASTNode} node - A node to get.
  * @param {string} value - The name of the imported or exported module.
  * @param {string[]} array - The array containing other imports or exports in the file.
- * @param {string} message - A message to be reported after the name of the module
+ * @param {string} messageId - A messageId to be reported after the name of the module
  *
  * @returns {void} No return value
  */
-function checkAndReport(context, node, value, array, message) {
+function checkAndReport(context, node, value, array, messageId) {
     if (array.indexOf(value) !== -1) {
         context.report({
             node,
-            message: "'{{module}}' {{message}}",
+            messageId,
             data: {
-                module: value,
-                message
+                module: value
             }
         });
     }
@@ -66,10 +65,10 @@ function handleImports(context, includeExports, importsInFile, exportsInFile) {
         const value = getValue(node);
 
         if (value) {
-            checkAndReport(context, node, value, importsInFile, "import is duplicated.");
+            checkAndReport(context, node, value, importsInFile, "import");
 
             if (includeExports) {
-                checkAndReport(context, node, value, exportsInFile, "import is duplicated as export.");
+                checkAndReport(context, node, value, exportsInFile, "importAs");
             }
 
             importsInFile.push(value);
@@ -91,8 +90,8 @@ function handleExports(context, importsInFile, exportsInFile) {
         const value = getValue(node);
 
         if (value) {
-            checkAndReport(context, node, value, exportsInFile, "export is duplicated.");
-            checkAndReport(context, node, value, importsInFile, "export is duplicated as import.");
+            checkAndReport(context, node, value, exportsInFile, "export");
+            checkAndReport(context, node, value, importsInFile, "exportAs");
 
             exportsInFile.push(value);
         }
@@ -114,11 +113,18 @@ module.exports = {
             type: "object",
             properties: {
                 includeExports: {
-                    type: "boolean"
+                    type: "boolean",
+                    default: false
                 }
             },
             additionalProperties: false
-        }]
+        }],
+        messages: {
+            import: "'{{module}}' import is duplicated.",
+            importAs: "'{{module}}' import is duplicated as export.",
+            export: "'{{module}}' export is duplicated.",
+            exportAs: "'{{module}}' export is duplicated as import."
+        }
     },
 
     create(context) {

package/lib/rules/no-else-return.js

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

package/lib/rules/no-empty.js

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

package/lib/rules/no-eval.js

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

package/lib/rules/no-extra-parens.js

@@ -44,11 +44,11 @@ module.exports = {
                         {
                             type: "object",
                             properties: {
-                                conditionalAssign: { type: "boolean" },
-                                nestedBinaryExpressions: { type: "boolean" },
-                                returnAssign: { type: "boolean" },
+                                conditionalAssign: { type: "boolean", default: true },
+                                nestedBinaryExpressions: { type: "boolean", default: true },
+                                returnAssign: { type: "boolean", default: true },
                                 ignoreJSX: { enum: ["none", "all", "single-line", "multi-line"] },
-                                enforceForArrowConditionals: { type: "boolean" }
+                                enforceForArrowConditionals: { type: "boolean", default: true }
                             },
                             additionalProperties: false
                         }

package/lib/rules/no-fallthrough.js

@@ -69,12 +69,17 @@ module.exports = {
                 type: "object",
                 properties: {
                     commentPattern: {
-                        type: "string"
+                        type: "string",
+                        default: ""
                     }
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            case: "Expected a 'break' statement before 'case'.",
+            default: "Expected a 'break' statement before 'default'."
+        }
     },
 
     create(context) {
@@ -111,8 +116,7 @@ module.exports = {
                  */
                 if (fallthroughCase && !hasFallthroughComment(node, context, fallthroughCommentPattern)) {
                     context.report({
-                        message: "Expected a 'break' statement before '{{type}}'.",
-                        data: { type: node.test ? "case" : "default" },
+                        messageId: node.test ? "case" : "default",
                         node
                     });
                 }

package/lib/rules/no-floating-decimal.js

@@ -27,7 +27,11 @@ module.exports = {
         },
 
         schema: [],
-        fixable: "code"
+        fixable: "code",
+        messages: {
+            leading: "A leading decimal point can be confused with a dot.",
+            trailing: "A trailing decimal point can be confused with a dot."
+        }
     },
 
     create(context) {
@@ -40,7 +44,7 @@ module.exports = {
                     if (node.raw.startsWith(".")) {
                         context.report({
                             node,
-                            message: "A leading decimal point can be confused with a dot.",
+                            messageId: "leading",
                             fix(fixer) {
                                 const tokenBefore = sourceCode.getTokenBefore(node);
                                 const needsSpaceBefore = tokenBefore &&
@@ -54,7 +58,7 @@ module.exports = {
                     if (node.raw.indexOf(".") === node.raw.length - 1) {
                         context.report({
                             node,
-                            message: "A trailing decimal point can be confused with a dot.",
+                            messageId: "trailing",
                             fix: fixer => fixer.insertTextAfter(node, "0")
                         });
                     }