eslint 5.12.0 → 5.14.1

package/lib/rules/line-comment-position.js

@@ -31,23 +31,30 @@ module.exports = {
                         type: "object",
                         properties: {
                             position: {
-                                enum: ["above", "beside"]
+                                enum: ["above", "beside"],
+                                default: "above"
                             },
                             ignorePattern: {
                                 type: "string"
                             },
                             applyDefaultPatterns: {
-                                type: "boolean"
+                                type: "boolean",
+                                default: true
                             },
                             applyDefaultIgnorePatterns: {
-                                type: "boolean"
+                                type: "boolean",
+                                default: true
                             }
                         },
                         additionalProperties: false
                     }
                 ]
             }
-        ]
+        ],
+        messages: {
+            above: "Expected comment to be above code.",
+            beside: "Expected comment to be beside code."
+        }
     },
 
     create(context) {
@@ -65,9 +72,9 @@ module.exports = {
             ignorePattern = options.ignorePattern;
 
             if (Object.prototype.hasOwnProperty.call(options, "applyDefaultIgnorePatterns")) {
-                applyDefaultIgnorePatterns = options.applyDefaultIgnorePatterns !== false;
+                applyDefaultIgnorePatterns = options.applyDefaultIgnorePatterns;
             } else {
-                applyDefaultIgnorePatterns = options.applyDefaultPatterns !== false;
+                applyDefaultIgnorePatterns = options.applyDefaultPatterns;
             }
         }
 
@@ -100,14 +107,14 @@ module.exports = {
                         if (isOnSameLine) {
                             context.report({
                                 node,
-                                message: "Expected comment to be above code."
+                                messageId: "above"
                             });
                         }
                     } else {
                         if (!isOnSameLine) {
                             context.report({
                                 node,
-                                message: "Expected comment to be beside code."
+                                messageId: "beside"
                             });
                         }
                     }

package/lib/rules/linebreak-style.js

@@ -32,14 +32,14 @@ module.exports = {
             {
                 enum: ["unix", "windows"]
             }
-        ]
+        ],
+        messages: {
+            expectedLF: "Expected linebreaks to be 'LF' but found 'CRLF'.",
+            expectedCRLF: "Expected linebreaks to be 'CRLF' but found 'LF'."
+        }
     },
 
     create(context) {
-
-        const EXPECTED_LF_MSG = "Expected linebreaks to be 'LF' but found 'CRLF'.",
-            EXPECTED_CRLF_MSG = "Expected linebreaks to be 'CRLF' but found 'LF'.";
-
         const sourceCode = context.getSourceCode();
 
         //--------------------------------------------------------------------------
@@ -89,7 +89,7 @@ module.exports = {
                             line: i,
                             column: sourceCode.lines[i - 1].length
                         },
-                        message: expectedLF ? EXPECTED_LF_MSG : EXPECTED_CRLF_MSG,
+                        messageId: expectedLF ? "expectedLF" : "expectedCRLF",
                         fix: createFix(range, expectedLFChars)
                     });
                 }

package/lib/rules/lines-around-comment.js

@@ -68,22 +68,28 @@ module.exports = {
                 type: "object",
                 properties: {
                     beforeBlockComment: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     },
                     afterBlockComment: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     beforeLineComment: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     afterLineComment: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     allowBlockStart: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     allowBlockEnd: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     allowClassStart: {
                         type: "boolean"
@@ -112,24 +118,22 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            after: "Expected line after comment.",
+            before: "Expected line before comment."
+        }
     },
 
     create(context) {
 
-        const options = context.options[0] ? Object.assign({}, context.options[0]) : {};
+        const options = Object.assign({}, context.options[0]);
         const ignorePattern = options.ignorePattern;
         const defaultIgnoreRegExp = astUtils.COMMENTS_IGNORE_PATTERN;
         const customIgnoreRegExp = new RegExp(ignorePattern);
         const applyDefaultIgnorePatterns = options.applyDefaultIgnorePatterns !== false;
 
-
-        options.beforeLineComment = options.beforeLineComment || false;
-        options.afterLineComment = options.afterLineComment || false;
         options.beforeBlockComment = typeof options.beforeBlockComment !== "undefined" ? options.beforeBlockComment : true;
-        options.afterBlockComment = options.afterBlockComment || false;
-        options.allowBlockStart = options.allowBlockStart || false;
-        options.allowBlockEnd = options.allowBlockEnd || false;
 
         const sourceCode = context.getSourceCode();
 
@@ -350,7 +354,7 @@ module.exports = {
 
                 context.report({
                     node: token,
-                    message: "Expected line before comment.",
+                    messageId: "before",
                     fix(fixer) {
                         return fixer.insertTextBeforeRange(range, "\n");
                     }
@@ -362,7 +366,7 @@ module.exports = {
                     !(astUtils.isCommentToken(nextTokenOrComment) && astUtils.isTokenOnSameLine(token, nextTokenOrComment))) {
                 context.report({
                     node: token,
-                    message: "Expected line after comment.",
+                    messageId: "after",
                     fix(fixer) {
                         return fixer.insertTextAfter(token, "\n");
                     }

package/lib/rules/lines-around-directive.js

@@ -45,6 +45,10 @@ module.exports = {
         }],
 
         fixable: "whitespace",
+        messages: {
+            expected: "Expected newline {{location}} \"{{value}}\" directive.",
+            unexpected: "Unexpected newline {{location}} \"{{value}}\" directive."
+        },
         deprecated: true,
         replacedBy: ["padding-line-between-statements"]
     },
@@ -109,9 +113,8 @@ module.exports = {
         function reportError(node, location, expected) {
             context.report({
                 node,
-                message: "{{expected}} newline {{location}} \"{{value}}\" directive.",
+                messageId: expected ? "expected" : "unexpected",
                 data: {
-                    expected: expected ? "Expected" : "Unexpected",
                     value: node.expression.value,
                     location
                 },

package/lib/rules/lines-between-class-members.js

@@ -31,12 +31,17 @@ module.exports = {
                 type: "object",
                 properties: {
                     exceptAfterSingleLine: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            never: "Unexpected blank line between class members.",
+            always: "Expected blank line between class members."
+        }
     },
 
     create(context) {
@@ -46,9 +51,6 @@ module.exports = {
         options[0] = context.options[0] || "always";
         options[1] = context.options[1] || { exceptAfterSingleLine: false };
 
-        const ALWAYS_MESSAGE = "Expected blank line between class members.";
-        const NEVER_MESSAGE = "Unexpected blank line between class members.";
-
         const sourceCode = context.getSourceCode();
 
         /**
@@ -127,7 +129,7 @@ module.exports = {
                         (options[0] === "never" && isPadded)) {
                         context.report({
                             node: body[i + 1],
-                            message: isPadded ? NEVER_MESSAGE : ALWAYS_MESSAGE,
+                            messageId: isPadded ? "never" : "always",
                             fix(fixer) {
                                 return isPadded
                                     ? fixer.replaceTextRange([curLast.range[1], nextFirst.range[0]], "\n")

package/lib/rules/max-depth.js

@@ -32,18 +32,23 @@ module.exports = {
                         properties: {
                             maximum: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 4
                             },
                             max: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 4
                             }
                         },
                         additionalProperties: false
                     }
                 ]
             }
-        ]
+        ],
+        messages: {
+            tooDeeply: "Blocks are nested too deeply ({{depth}})."
+        }
     },
 
     create(context) {
@@ -56,11 +61,8 @@ module.exports = {
             option = context.options[0];
         let maxDepth = 4;
 
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "maximum") && typeof option.maximum === "number") {
-            maxDepth = option.maximum;
-        }
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "max") && typeof option.max === "number") {
-            maxDepth = option.max;
+        if (typeof option === "object") {
+            maxDepth = option.maximum || option.max;
         }
         if (typeof option === "number") {
             maxDepth = option;
@@ -94,7 +96,7 @@ module.exports = {
             const len = ++functionStack[functionStack.length - 1];
 
             if (len > maxDepth) {
-                context.report({ node, message: "Blocks are nested too deeply ({{depth}}).", data: { depth: len } });
+                context.report({ node, messageId: "tooDeeply", data: { depth: len } });
             }
         }
 

package/lib/rules/max-len.js

@@ -14,7 +14,8 @@ const OPTIONS_SCHEMA = {
     properties: {
         code: {
             type: "integer",
-            minimum: 0
+            minimum: 0,
+            default: 80
         },
         comments: {
             type: "integer",
@@ -22,28 +23,35 @@ const OPTIONS_SCHEMA = {
         },
         tabWidth: {
             type: "integer",
-            minimum: 0
+            minimum: 0,
+            default: 4
         },
         ignorePattern: {
             type: "string"
         },
         ignoreComments: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         ignoreStrings: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         ignoreUrls: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         ignoreTemplateLiterals: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         ignoreRegExpLiterals: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         ignoreTrailingComments: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         }
     },
     additionalProperties: false
@@ -78,7 +86,11 @@ module.exports = {
             OPTIONS_OR_INTEGER_SCHEMA,
             OPTIONS_OR_INTEGER_SCHEMA,
             OPTIONS_SCHEMA
-        ]
+        ],
+        messages: {
+            max: "Line {{lineNumber}} exceeds the maximum line length of {{maxLength}}.",
+            maxComment: "Line {{lineNumber}} exceeds the maximum comment line length of {{maxCommentLength}}."
+        }
     },
 
     create(context) {
@@ -117,8 +129,7 @@ module.exports = {
         }
 
         // The options object must be the last option specified…
-        const lastOption = context.options[context.options.length - 1];
-        const options = typeof lastOption === "object" ? Object.create(lastOption) : {};
+        const options = Object.assign({}, context.options[context.options.length - 1]);
 
         // …but max code length…
         if (typeof context.options[0] === "number") {
@@ -341,7 +352,7 @@ module.exports = {
                         context.report({
                             node,
                             loc: { line: lineNumber, column: 0 },
-                            message: "Line {{lineNumber}} exceeds the maximum comment line length of {{maxCommentLength}}.",
+                            messageId: "maxComment",
                             data: {
                                 lineNumber: i + 1,
                                 maxCommentLength
@@ -352,7 +363,7 @@ module.exports = {
                     context.report({
                         node,
                         loc: { line: lineNumber, column: 0 },
-                        message: "Line {{lineNumber}} exceeds the maximum line length of {{maxLength}}.",
+                        messageId: "max",
                         data: {
                             lineNumber: i + 1,
                             maxLength

package/lib/rules/max-lines-per-function.js

@@ -19,16 +19,20 @@ const OPTIONS_SCHEMA = {
     properties: {
         max: {
             type: "integer",
-            minimum: 0
+            minimum: 0,
+            default: 50
         },
         skipComments: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         skipBlankLines: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         },
         IIFEs: {
-            type: "boolean"
+            type: "boolean",
+            default: false
         }
     },
     additionalProperties: false
@@ -80,7 +84,10 @@ module.exports = {
 
         schema: [
             OPTIONS_OR_INTEGER_SCHEMA
-        ]
+        ],
+        messages: {
+            exceed: "{{name}} has too many lines ({{lineCount}}). Maximum allowed is {{maxLines}}."
+        }
     },
 
     create(context) {
@@ -94,18 +101,10 @@ module.exports = {
         let IIFEs = false;
 
         if (typeof option === "object") {
-            if (typeof option.max === "number") {
-                maxLines = option.max;
-            }
-            if (typeof option.skipComments === "boolean") {
-                skipComments = option.skipComments;
-            }
-            if (typeof option.skipBlankLines === "boolean") {
-                skipBlankLines = option.skipBlankLines;
-            }
-            if (typeof option.IIFEs === "boolean") {
-                IIFEs = option.IIFEs;
-            }
+            maxLines = option.max;
+            skipComments = option.skipComments;
+            skipBlankLines = option.skipBlankLines;
+            IIFEs = option.IIFEs;
         } else if (typeof option === "number") {
             maxLines = option;
         }
@@ -201,7 +200,7 @@ module.exports = {
 
                 context.report({
                     node,
-                    message: "{{name}} has too many lines ({{lineCount}}). Maximum allowed is {{maxLines}}.",
+                    messageId: "exceed",
                     data: { name, lineCount, maxLines }
                 });
             }

package/lib/rules/max-lines.js

@@ -38,31 +38,35 @@ module.exports = {
                         properties: {
                             max: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 300
                             },
                             skipComments: {
-                                type: "boolean"
+                                type: "boolean",
+                                default: false
                             },
                             skipBlankLines: {
-                                type: "boolean"
+                                type: "boolean",
+                                default: false
                             }
                         },
                         additionalProperties: false
                     }
                 ]
             }
-        ]
+        ],
+        messages: {
+            exceed: "File must be at most {{max}} lines long. It's {{actual}} lines long."
+        }
     },
 
     create(context) {
         const option = context.options[0];
         let max = 300;
 
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "max") && typeof option.max === "number") {
+        if (typeof option === "object") {
             max = option.max;
-        }
-
-        if (typeof option === "number") {
+        } else if (typeof option === "number") {
             max = option;
         }
 
@@ -83,7 +87,7 @@ module.exports = {
         /**
          * Returns the line numbers of a comment that don't have any code on the same line
          * @param {Node} comment The comment node to check
-         * @returns {int[]} The line numbers
+         * @returns {number[]} The line numbers
          */
         function getLinesWithoutCode(comment) {
             let start = comment.loc.start.line;
@@ -134,7 +138,7 @@ module.exports = {
                 if (lines.length > max) {
                     context.report({
                         loc: { line: 1, column: 0 },
-                        message: "File must be at most {{max}} lines long. It's {{actual}} lines long.",
+                        messageId: "exceed",
                         data: {
                             max,
                             actual: lines.length

package/lib/rules/max-nested-callbacks.js

@@ -32,18 +32,23 @@ module.exports = {
                         properties: {
                             maximum: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 10
                             },
                             max: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 10
                             }
                         },
                         additionalProperties: false
                     }
                 ]
             }
-        ]
+        ],
+        messages: {
+            exceed: "Too many nested callbacks ({{num}}). Maximum allowed is {{max}}."
+        }
     },
 
     create(context) {
@@ -54,13 +59,9 @@ module.exports = {
         const option = context.options[0];
         let THRESHOLD = 10;
 
-        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;
         }
 
@@ -86,7 +87,7 @@ module.exports = {
             if (callbackStack.length > THRESHOLD) {
                 const opts = { num: callbackStack.length, max: THRESHOLD };
 
-                context.report({ node, message: "Too many nested callbacks ({{num}}). Maximum allowed is {{max}}.", data: opts });
+                context.report({ node, messageId: "exceed", data: opts });
             }
         }
 

package/lib/rules/max-params.js

@@ -40,18 +40,23 @@ module.exports = {
                         properties: {
                             maximum: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 3
                             },
                             max: {
                                 type: "integer",
-                                minimum: 0
+                                minimum: 0,
+                                default: 3
                             }
                         },
                         additionalProperties: false
                     }
                 ]
             }
-        ]
+        ],
+        messages: {
+            exceed: "{{name}} has too many parameters ({{count}}). Maximum allowed is {{max}}."
+        }
     },
 
     create(context) {
@@ -59,11 +64,8 @@ module.exports = {
         const option = context.options[0];
         let numParams = 3;
 
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "maximum") && typeof option.maximum === "number") {
-            numParams = option.maximum;
-        }
-        if (typeof option === "object" && Object.prototype.hasOwnProperty.call(option, "max") && typeof option.max === "number") {
-            numParams = option.max;
+        if (typeof option === "object") {
+            numParams = option.maximum || option.max;
         }
         if (typeof option === "number") {
             numParams = option;
@@ -80,7 +82,7 @@ module.exports = {
                 context.report({
                     loc: astUtils.getFunctionHeadLoc(node, sourceCode),
                     node,
-                    message: "{{name}} has too many parameters ({{count}}). Maximum allowed is {{max}}.",
+                    messageId: "exceed",
                     data: {
                         name: lodash.upperFirst(astUtils.getFunctionNameWithKind(node)),
                         count: node.params.length,

package/lib/rules/max-statements-per-line.js

@@ -31,20 +31,23 @@ module.exports = {
                 properties: {
                     max: {
                         type: "integer",
-                        minimum: 1
+                        minimum: 1,
+                        default: 1
                     }
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            exceed: "This line has {{numberOfStatementsOnThisLine}} {{statements}}. Maximum allowed is {{maxStatementsPerLine}}."
+        }
     },
 
     create(context) {
 
         const sourceCode = context.getSourceCode(),
             options = context.options[0] || {},
-            maxStatementsPerLine = typeof options.max !== "undefined" ? options.max : 1,
-            message = "This line has {{numberOfStatementsOnThisLine}} {{statements}}. Maximum allowed is {{maxStatementsPerLine}}.";
+            maxStatementsPerLine = typeof options.max !== "undefined" ? options.max : 1;
 
         let lastStatementLine = 0,
             numberOfStatementsOnThisLine = 0,
@@ -65,7 +68,7 @@ module.exports = {
             if (firstExtraStatement) {
                 context.report({
                     node: firstExtraStatement,
-                    message,
+                    messageId: "exceed",
                     data: {
                         numberOfStatementsOnThisLine,
                         maxStatementsPerLine,