eslint 5.12.0 → 5.14.1

package/lib/rules/id-blacklist.js

@@ -27,6 +27,9 @@ module.exports = {
                 type: "string"
             },
             uniqueItems: true
+        },
+        messages: {
+            blacklisted: "Identifier '{{name}}' is blacklisted."
         }
     },
 
@@ -72,7 +75,7 @@ module.exports = {
         function report(node) {
             context.report({
                 node,
-                message: "Identifier '{{name}}' is blacklisted.",
+                messageId: "blacklisted",
                 data: {
                     name: node.name
                 }

package/lib/rules/id-length.js

@@ -26,10 +26,11 @@ module.exports = {
                 type: "object",
                 properties: {
                     min: {
-                        type: "number"
+                        type: "integer",
+                        default: 2
                     },
                     max: {
-                        type: "number"
+                        type: "integer"
                     },
                     exceptions: {
                         type: "array",
@@ -44,7 +45,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            tooShort: "Identifier name '{{name}}' is too short (< {{min}}).",
+            tooLong: "Identifier name '{{name}}' is too long (> {{max}})."
+        }
     },
 
     create(context) {
@@ -107,9 +112,7 @@ module.exports = {
                 if (isValidExpression && (isValidExpression === true || isValidExpression(parent, node))) {
                     context.report({
                         node,
-                        message: isShort
-                            ? "Identifier name '{{name}}' is too short (< {{min}})."
-                            : "Identifier name '{{name}}' is too long (> {{max}}).",
+                        messageId: isShort ? "tooShort" : "tooLong",
                         data: { name, min: minLength, max: maxLength }
                     });
                 }

package/lib/rules/id-match.js

@@ -28,17 +28,23 @@ module.exports = {
                 type: "object",
                 properties: {
                     properties: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     onlyDeclarations: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     ignoreDestructuring: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 }
             }
-        ]
+        ],
+        messages: {
+            notMatch: "Identifier '{{name}}' does not match the pattern '{{pattern}}'."
+        }
     },
 
     create(context) {
@@ -116,7 +122,7 @@ module.exports = {
             if (!reported.has(node)) {
                 context.report({
                     node,
-                    message: "Identifier '{{name}}' does not match the pattern '{{pattern}}'.",
+                    messageId: "notMatch",
                     data: {
                         name: node.name,
                         pattern

package/lib/rules/implicit-arrow-linebreak.js

@@ -30,7 +30,11 @@ module.exports = {
             {
                 enum: ["beside", "below"]
             }
-        ]
+        ],
+        messages: {
+            expected: "Expected a linebreak before this expression.",
+            unexpected: "Expected no linebreak before this expression."
+        }
     },
 
     create(context) {
@@ -210,13 +214,13 @@ module.exports = {
             if (tokenBefore.loc.end.line === fixerTarget.loc.start.line && option === "below") {
                 context.report({
                     node: fixerTarget,
-                    message: "Expected a linebreak before this expression.",
+                    messageId: "expected",
                     fix: fixer => fixer.insertTextBefore(fixerTarget, "\n")
                 });
             } else if (tokenBefore.loc.end.line !== fixerTarget.loc.start.line && option === "beside") {
                 context.report({
                     node: fixerTarget,
-                    message: "Expected no linebreak before this expression.",
+                    messageId: "unexpected",
                     fix: autoFixBesides(tokenBefore, fixerTarget, node)
                 });
             }

package/lib/rules/indent-legacy.js

@@ -169,7 +169,10 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            expected: "Expected indentation of {{expected}} but found {{actual}}."
+        }
     },
 
     create(context) {
@@ -268,7 +271,7 @@ module.exports = {
          * @param {int} actualTabs The actual number of indentation tabs that were found on this line
          * @returns {string} An error message for this line
          */
-        function createErrorMessage(expectedAmount, actualSpaces, actualTabs) {
+        function createErrorMessageData(expectedAmount, actualSpaces, actualTabs) {
             const expectedStatement = `${expectedAmount} ${indentType}${expectedAmount === 1 ? "" : "s"}`; // e.g. "2 tabs"
             const foundSpacesWord = `space${actualSpaces === 1 ? "" : "s"}`; // e.g. "space"
             const foundTabsWord = `tab${actualTabs === 1 ? "" : "s"}`; // e.g. "tabs"
@@ -288,8 +291,10 @@ module.exports = {
             } else {
                 foundStatement = "0";
             }
-
-            return `Expected indentation of ${expectedStatement} but found ${foundStatement}.`;
+            return {
+                expected: expectedStatement,
+                actual: foundStatement
+            };
         }
 
         /**
@@ -318,7 +323,8 @@ module.exports = {
             context.report({
                 node,
                 loc,
-                message: createErrorMessage(needed, gottenSpaces, gottenTabs),
+                messageId: "expected",
+                data: createErrorMessageData(needed, gottenSpaces, gottenTabs),
                 fix: fixer => fixer.replaceTextRange(textRange, desiredIndent)
             });
         }

package/lib/rules/indent.js

@@ -518,7 +518,8 @@ module.exports = {
                 properties: {
                     SwitchCase: {
                         type: "integer",
-                        minimum: 0
+                        minimum: 0,
+                        default: 0
                     },
                     VariableDeclarator: {
                         oneOf: [
@@ -582,7 +583,8 @@ module.exports = {
                     ObjectExpression: ELEMENT_LIST_SCHEMA,
                     ImportDeclaration: ELEMENT_LIST_SCHEMA,
                     flatTernaryExpressions: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     ignoredNodes: {
                         type: "array",
@@ -594,12 +596,16 @@ module.exports = {
                         }
                     },
                     ignoreComments: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            wrongIndentation: "Expected indentation of {{expected}} but found {{actual}}."
+        }
     },
 
     create(context) {
@@ -647,7 +653,7 @@ module.exports = {
             }
 
             if (context.options[1]) {
-                lodash.merge(options, context.options[1]);
+                Object.assign(options, context.options[1]);
 
                 if (typeof options.VariableDeclarator === "number" || options.VariableDeclarator === "first") {
                     options.VariableDeclarator = {
@@ -671,7 +677,7 @@ module.exports = {
          * @param {int} actualTabs The actual number of indentation tabs that were found on this line
          * @returns {string} An error message for this line
          */
-        function createErrorMessage(expectedAmount, actualSpaces, actualTabs) {
+        function createErrorMessageData(expectedAmount, actualSpaces, actualTabs) {
             const expectedStatement = `${expectedAmount} ${indentType}${expectedAmount === 1 ? "" : "s"}`; // e.g. "2 tabs"
             const foundSpacesWord = `space${actualSpaces === 1 ? "" : "s"}`; // e.g. "space"
             const foundTabsWord = `tab${actualTabs === 1 ? "" : "s"}`; // e.g. "tabs"
@@ -689,8 +695,10 @@ module.exports = {
             } else {
                 foundStatement = "0";
             }
-
-            return `Expected indentation of ${expectedStatement} but found ${foundStatement}.`;
+            return {
+                expected: expectedStatement,
+                actual: foundStatement
+            };
         }
 
         /**
@@ -706,7 +714,8 @@ module.exports = {
 
             context.report({
                 node: token,
-                message: createErrorMessage(neededIndent.length, numSpaces, numTabs),
+                messageId: "wrongIndentation",
+                data: createErrorMessageData(neededIndent.length, numSpaces, numTabs),
                 loc: {
                     start: { line: token.loc.start.line, column: 0 },
                     end: { line: token.loc.start.line, column: token.loc.start.column }

package/lib/rules/init-declarations.js

@@ -75,7 +75,8 @@ module.exports = {
                             type: "object",
                             properties: {
                                 ignoreForLoopInit: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: false
                                 }
                             },
                             additionalProperties: false
@@ -85,6 +86,10 @@ module.exports = {
                     maxItems: 2
                 }
             ]
+        },
+        messages: {
+            initialized: "Variable '{{idName}}' should be initialized on declaration.",
+            notInitialized: "Variable '{{idName}}' should not be initialized on declaration."
         }
     },
 
@@ -111,23 +116,18 @@ module.exports = {
                         id = declaration.id,
                         initialized = isInitialized(declaration),
                         isIgnoredForLoop = params.ignoreForLoopInit && isForLoop(node.parent);
-
-                    if (id.type !== "Identifier") {
-                        continue;
-                    }
+                    let messageId = "";
 
                     if (mode === MODE_ALWAYS && !initialized) {
-                        context.report({
-                            node: declaration,
-                            message: "Variable '{{idName}}' should be initialized on declaration.",
-                            data: {
-                                idName: id.name
-                            }
-                        });
+                        messageId = "initialized";
                     } else if (mode === MODE_NEVER && kind !== "const" && initialized && !isIgnoredForLoop) {
+                        messageId = "notInitialized";
+                    }
+
+                    if (id.type === "Identifier" && messageId) {
                         context.report({
                             node: declaration,
-                            message: "Variable '{{idName}}' should not be initialized on declaration.",
+                            messageId,
                             data: {
                                 idName: id.name
                             }

package/lib/rules/jsx-quotes.js

@@ -53,7 +53,10 @@ module.exports = {
             {
                 enum: ["prefer-single", "prefer-double"]
             }
-        ]
+        ],
+        messages: {
+            unexpected: "Unexpected usage of {{description}}."
+        }
     },
 
     create(context) {
@@ -77,7 +80,7 @@ module.exports = {
                 if (attributeValue && astUtils.isStringLiteral(attributeValue) && !usesExpectedQuotes(attributeValue)) {
                     context.report({
                         node: attributeValue,
-                        message: "Unexpected usage of {{description}}.",
+                        messageId: "unexpected",
                         data: {
                             description: setting.description
                         },

package/lib/rules/key-spacing.js

@@ -121,11 +121,6 @@ function initOptions(toOptions, fromOptions) {
 // Rule Definition
 //------------------------------------------------------------------------------
 
-const messages = {
-    key: "{{error}} space after {{computed}}key '{{key}}'.",
-    value: "{{error}} space before value for {{computed}}key '{{key}}'."
-};
-
 module.exports = {
     meta: {
         type: "layout",
@@ -153,16 +148,20 @@ module.exports = {
                                     type: "object",
                                     properties: {
                                         mode: {
-                                            enum: ["strict", "minimum"]
+                                            enum: ["strict", "minimum"],
+                                            default: "strict"
                                         },
                                         on: {
-                                            enum: ["colon", "value"]
+                                            enum: ["colon", "value"],
+                                            default: "colon"
                                         },
                                         beforeColon: {
-                                            type: "boolean"
+                                            type: "boolean",
+                                            default: false
                                         },
                                         afterColon: {
-                                            type: "boolean"
+                                            type: "boolean",
+                                            default: true
                                         }
                                     },
                                     additionalProperties: false
@@ -170,13 +169,16 @@ module.exports = {
                             ]
                         },
                         mode: {
-                            enum: ["strict", "minimum"]
+                            enum: ["strict", "minimum"],
+                            default: "strict"
                         },
                         beforeColon: {
-                            type: "boolean"
+                            type: "boolean",
+                            default: false
                         },
                         afterColon: {
-                            type: "boolean"
+                            type: "boolean",
+                            default: true
                         }
                     },
                     additionalProperties: false
@@ -188,13 +190,16 @@ module.exports = {
                             type: "object",
                             properties: {
                                 mode: {
-                                    enum: ["strict", "minimum"]
+                                    enum: ["strict", "minimum"],
+                                    default: "strict"
                                 },
                                 beforeColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: false
                                 },
                                 afterColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: true
                                 }
                             },
                             additionalProperties: false
@@ -211,16 +216,20 @@ module.exports = {
                                             type: "object",
                                             properties: {
                                                 mode: {
-                                                    enum: ["strict", "minimum"]
+                                                    enum: ["strict", "minimum"],
+                                                    default: "strict"
                                                 },
                                                 on: {
-                                                    enum: ["colon", "value"]
+                                                    enum: ["colon", "value"],
+                                                    default: "colon"
                                                 },
                                                 beforeColon: {
-                                                    type: "boolean"
+                                                    type: "boolean",
+                                                    default: false
                                                 },
                                                 afterColon: {
-                                                    type: "boolean"
+                                                    type: "boolean",
+                                                    default: true
                                                 }
                                             },
                                             additionalProperties: false
@@ -228,13 +237,16 @@ module.exports = {
                                     ]
                                 },
                                 mode: {
-                                    enum: ["strict", "minimum"]
+                                    enum: ["strict", "minimum"],
+                                    default: "strict"
                                 },
                                 beforeColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: false
                                 },
                                 afterColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: true
                                 }
                             },
                             additionalProperties: false
@@ -249,13 +261,16 @@ module.exports = {
                             type: "object",
                             properties: {
                                 mode: {
-                                    enum: ["strict", "minimum"]
+                                    enum: ["strict", "minimum"],
+                                    default: "strict"
                                 },
                                 beforeColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: false
                                 },
                                 afterColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: true
                                 }
                             },
                             additionalProperties: false
@@ -264,13 +279,16 @@ module.exports = {
                             type: "object",
                             properties: {
                                 mode: {
-                                    enum: ["strict", "minimum"]
+                                    enum: ["strict", "minimum"],
+                                    default: "strict"
                                 },
                                 beforeColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: false
                                 },
                                 afterColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: true
                                 }
                             },
                             additionalProperties: false
@@ -279,16 +297,20 @@ module.exports = {
                             type: "object",
                             properties: {
                                 mode: {
-                                    enum: ["strict", "minimum"]
+                                    enum: ["strict", "minimum"],
+                                    default: "strict"
                                 },
                                 on: {
-                                    enum: ["colon", "value"]
+                                    enum: ["colon", "value"],
+                                    default: "colon"
                                 },
                                 beforeColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: false
                                 },
                                 afterColon: {
-                                    type: "boolean"
+                                    type: "boolean",
+                                    default: true
                                 }
                             },
                             additionalProperties: false
@@ -297,7 +319,13 @@ module.exports = {
                     additionalProperties: false
                 }
             ]
-        }]
+        }],
+        messages: {
+            extraKey: "Extra space after {{computed}}key '{{key}}'.",
+            extraValue: "Extra space before value for {{computed}}key '{{key}}'.",
+            missingKey: "Missing space after {{computed}}key '{{key}}'.",
+            missingValue: "Missing space before value for {{computed}}key '{{key}}'."
+        }
     },
 
     create(context) {
@@ -460,12 +488,19 @@ module.exports = {
                     }
                 }
 
+                let messageId = "";
+
+                if (isExtra) {
+                    messageId = side === "key" ? "extraKey" : "extraValue";
+                } else {
+                    messageId = side === "key" ? "missingKey" : "missingValue";
+                }
+
                 context.report({
                     node: property[side],
                     loc: locStart,
-                    message: messages[side],
+                    messageId,
                     data: {
-                        error: isExtra ? "Extra" : "Missing",
                         computed: property.computed ? "computed " : "",
                         key: getKey(property)
                     },

package/lib/rules/keyword-spacing.js

@@ -80,16 +80,16 @@ module.exports = {
             {
                 type: "object",
                 properties: {
-                    before: { type: "boolean" },
-                    after: { type: "boolean" },
+                    before: { type: "boolean", default: true },
+                    after: { type: "boolean", default: true },
                     overrides: {
                         type: "object",
                         properties: KEYS.reduce((retv, key) => {
                             retv[key] = {
                                 type: "object",
                                 properties: {
-                                    before: { type: "boolean" },
-                                    after: { type: "boolean" }
+                                    before: { type: "boolean", default: true },
+                                    after: { type: "boolean", default: true }
                                 },
                                 additionalProperties: false
                             };
@@ -100,7 +100,13 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            expectedBefore: "Expected space(s) before \"{{value}}\".",
+            expectedAfter: "Expected space(s) after \"{{value}}\".",
+            unexpectedBefore: "Unexpected space(s) before \"{{value}}\".",
+            unexpectedAfter: "Unexpected space(s) after \"{{value}}\"."
+        }
     },
 
     create(context) {
@@ -124,7 +130,7 @@ module.exports = {
             ) {
                 context.report({
                     loc: token.loc.start,
-                    message: "Expected space(s) before \"{{value}}\".",
+                    messageId: "expectedBefore",
                     data: token,
                     fix(fixer) {
                         return fixer.insertTextBefore(token, " ");
@@ -151,7 +157,7 @@ module.exports = {
             ) {
                 context.report({
                     loc: token.loc.start,
-                    message: "Unexpected space(s) before \"{{value}}\".",
+                    messageId: "unexpectedBefore",
                     data: token,
                     fix(fixer) {
                         return fixer.removeRange([prevToken.range[1], token.range[0]]);
@@ -178,7 +184,7 @@ module.exports = {
             ) {
                 context.report({
                     loc: token.loc.start,
-                    message: "Expected space(s) after \"{{value}}\".",
+                    messageId: "expectedAfter",
                     data: token,
                     fix(fixer) {
                         return fixer.insertTextAfter(token, " ");
@@ -205,7 +211,7 @@ module.exports = {
             ) {
                 context.report({
                     loc: token.loc.start,
-                    message: "Unexpected space(s) after \"{{value}}\".",
+                    messageId: "unexpectedAfter",
                     data: token,
                     fix(fixer) {
                         return fixer.removeRange([token.range[1], nextToken.range[0]]);
@@ -222,9 +228,9 @@ module.exports = {
          *      Keys are keywords (there are for every keyword).
          *      Values are instances of `{"before": function, "after": function}`.
          */
-        function parseOptions(options) {
-            const before = !options || options.before !== false;
-            const after = !options || options.after !== false;
+        function parseOptions(options = {}) {
+            const before = options.before !== false;
+            const after = options.after !== false;
             const defaultValue = {
                 before: before ? expectSpaceBefore : unexpectSpaceBefore,
                 after: after ? expectSpaceAfter : unexpectSpaceAfter