eslint 5.12.0 → 5.14.1

package/lib/rules/sort-imports.js

@@ -25,7 +25,8 @@ module.exports = {
                 type: "object",
                 properties: {
                     ignoreCase: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     memberSyntaxSortOrder: {
                         type: "array",
@@ -37,10 +38,12 @@ module.exports = {
                         maxItems: 4
                     },
                     ignoreDeclarationSort: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     ignoreMemberSort: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false

package/lib/rules/sort-keys.js

@@ -90,10 +90,12 @@ module.exports = {
                 type: "object",
                 properties: {
                     caseSensitive: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     },
                     natural: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     }
                 },
                 additionalProperties: false
@@ -106,8 +108,8 @@ module.exports = {
         // Parse options.
         const order = context.options[0] || "asc";
         const options = context.options[1];
-        const insensitive = (options && options.caseSensitive) === false;
-        const natual = Boolean(options && options.natural);
+        const insensitive = options && options.caseSensitive === false;
+        const natual = options && options.natural;
         const isValidOrder = isValidOrders[
             order + (insensitive ? "I" : "") + (natual ? "N" : "")
         ];
@@ -127,8 +129,14 @@ module.exports = {
                 stack = stack.upper;
             },
 
+            SpreadElement(node) {
+                if (node.parent.type === "ObjectExpression") {
+                    stack.prevName = null;
+                }
+            },
+
             Property(node) {
-                if (node.parent.type === "ObjectPattern" || node.parent.properties.some(n => n.type === "SpreadElement")) {
+                if (node.parent.type === "ObjectPattern") {
                     return;
                 }
 

package/lib/rules/sort-vars.js

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

package/lib/rules/space-before-function-paren.js

@@ -37,13 +37,16 @@ module.exports = {
                         type: "object",
                         properties: {
                             anonymous: {
-                                enum: ["always", "never", "ignore"]
+                                enum: ["always", "never", "ignore"],
+                                default: "always"
                             },
                             named: {
-                                enum: ["always", "never", "ignore"]
+                                enum: ["always", "never", "ignore"],
+                                default: "always"
                             },
                             asyncArrow: {
-                                enum: ["always", "never", "ignore"]
+                                enum: ["always", "never", "ignore"],
+                                default: "always"
                             }
                         },
                         additionalProperties: false

package/lib/rules/space-infix-ops.js

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

package/lib/rules/space-unary-ops.js

@@ -32,10 +32,12 @@ module.exports = {
                 type: "object",
                 properties: {
                     words: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: true
                     },
                     nonwords: {
-                        type: "boolean"
+                        type: "boolean",
+                        default: false
                     },
                     overrides: {
                         type: "object",
@@ -46,11 +48,19 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+        messages: {
+            unexpectedBefore: "Unexpected space before unary operator '{{operator}}'.",
+            unexpectedAfter: "Unexpected space after unary operator '{{operator}}'.",
+            unexpectedAfterWord: "Unexpected space after unary word operator '{{word}}'.",
+            wordOperator: "Unary word operator '{{word}}' must be followed by whitespace.",
+            operator: "Unary operator '{{operator}}' must be followed by whitespace.",
+            beforeUnaryExpressions: "Space is required before unary expressions '{{token}}'."
+        }
     },
 
     create(context) {
-        const options = context.options && Array.isArray(context.options) && context.options[0] || { words: true, nonwords: false };
+        const options = context.options[0] || { words: true, nonwords: false };
 
         const sourceCode = context.getSourceCode();
 
@@ -98,7 +108,7 @@ module.exports = {
             if (secondToken.range[0] === firstToken.range[1]) {
                 context.report({
                     node,
-                    message: "Unary word operator '{{word}}' must be followed by whitespace.",
+                    messageId: "wordOperator",
                     data: {
                         word
                     },
@@ -122,7 +132,7 @@ module.exports = {
                 if (secondToken.range[0] > firstToken.range[1]) {
                     context.report({
                         node,
-                        message: "Unexpected space after unary word operator '{{word}}'.",
+                        messageId: "unexpectedAfterWord",
                         data: {
                             word
                         },
@@ -198,7 +208,7 @@ module.exports = {
                 if (firstToken.range[1] === secondToken.range[0]) {
                     context.report({
                         node,
-                        message: "Unary operator '{{operator}}' must be followed by whitespace.",
+                        messageId: "operator",
                         data: {
                             operator: firstToken.value
                         },
@@ -211,7 +221,7 @@ module.exports = {
                 if (firstToken.range[1] === secondToken.range[0]) {
                     context.report({
                         node,
-                        message: "Space is required before unary expressions '{{token}}'.",
+                        messageId: "beforeUnaryExpressions",
                         data: {
                             token: secondToken.value
                         },
@@ -235,7 +245,7 @@ module.exports = {
                 if (secondToken.range[0] > firstToken.range[1]) {
                     context.report({
                         node,
-                        message: "Unexpected space after unary operator '{{operator}}'.",
+                        messageId: "unexpectedAfter",
                         data: {
                             operator: firstToken.value
                         },
@@ -251,7 +261,7 @@ module.exports = {
                 if (secondToken.range[0] > firstToken.range[1]) {
                     context.report({
                         node,
-                        message: "Unexpected space before unary operator '{{operator}}'.",
+                        messageId: "unexpectedBefore",
                         data: {
                             operator: secondToken.value
                         },

package/lib/rules/spaced-comment.js

@@ -215,7 +215,8 @@ module.exports = {
                                 }
                             },
                             balanced: {
-                                type: "boolean"
+                                type: "boolean",
+                                default: false
                             }
                         },
                         additionalProperties: false

package/lib/rules/strict.js

@@ -15,19 +15,6 @@ const astUtils = require("../util/ast-utils");
 // Helpers
 //------------------------------------------------------------------------------
 
-const messages = {
-    function: "Use the function form of 'use strict'.",
-    global: "Use the global form of 'use strict'.",
-    multiple: "Multiple 'use strict' directives.",
-    never: "Strict mode is not permitted.",
-    unnecessary: "Unnecessary 'use strict' directive.",
-    module: "'use strict' is unnecessary inside of modules.",
-    implied: "'use strict' is unnecessary when implied strict mode is enabled.",
-    unnecessaryInClasses: "'use strict' is unnecessary inside of classes.",
-    nonSimpleParameterList: "'use strict' directive inside a function with non-simple parameter list throws a syntax error since ES2016.",
-    wrap: "Wrap {{name}} in a function with 'use strict' directive."
-};
-
 /**
  * Gets all of the Use Strict Directives in the Directive Prologue of a group of
  * statements.
@@ -95,7 +82,19 @@ module.exports = {
             }
         ],
 
-        fixable: "code"
+        fixable: "code",
+        messages: {
+            function: "Use the function form of 'use strict'.",
+            global: "Use the global form of 'use strict'.",
+            multiple: "Multiple 'use strict' directives.",
+            never: "Strict mode is not permitted.",
+            unnecessary: "Unnecessary 'use strict' directive.",
+            module: "'use strict' is unnecessary inside of modules.",
+            implied: "'use strict' is unnecessary when implied strict mode is enabled.",
+            unnecessaryInClasses: "'use strict' is unnecessary inside of classes.",
+            nonSimpleParameterList: "'use strict' directive inside a function with non-simple parameter list throws a syntax error since ES2016.",
+            wrap: "Wrap {{name}} in a function with 'use strict' directive."
+        }
     },
 
     create(context) {
@@ -134,36 +133,36 @@ module.exports = {
          * @param {ASTNode[]} nodes Nodes.
          * @param {string} start Index to start from.
          * @param {string} end Index to end before.
-         * @param {string} message Message to display.
+         * @param {string} messageId Message to display.
          * @param {boolean} fix `true` if the directive should be fixed (i.e. removed)
          * @returns {void}
          */
-        function reportSlice(nodes, start, end, message, fix) {
+        function reportSlice(nodes, start, end, messageId, fix) {
             nodes.slice(start, end).forEach(node => {
-                context.report({ node, message, fix: fix ? getFixFunction(node) : null });
+                context.report({ node, messageId, fix: fix ? getFixFunction(node) : null });
             });
         }
 
         /**
          * Report all nodes in an array with a given message.
          * @param {ASTNode[]} nodes Nodes.
-         * @param {string} message Message to display.
+         * @param {string} messageId Message id to display.
          * @param {boolean} fix `true` if the directive should be fixed (i.e. removed)
          * @returns {void}
          */
-        function reportAll(nodes, message, fix) {
-            reportSlice(nodes, 0, nodes.length, message, fix);
+        function reportAll(nodes, messageId, fix) {
+            reportSlice(nodes, 0, nodes.length, messageId, fix);
         }
 
         /**
          * Report all nodes in an array, except the first, with a given message.
          * @param {ASTNode[]} nodes Nodes.
-         * @param {string} message Message to display.
+         * @param {string} messageId Message id to display.
          * @param {boolean} fix `true` if the directive should be fixed (i.e. removed)
          * @returns {void}
          */
-        function reportAllExceptFirst(nodes, message, fix) {
-            reportSlice(nodes, 1, nodes.length, message, fix);
+        function reportAllExceptFirst(nodes, messageId, fix) {
+            reportSlice(nodes, 1, nodes.length, messageId, fix);
         }
 
         /**
@@ -181,21 +180,21 @@ module.exports = {
 
             if (isStrict) {
                 if (!isSimpleParameterList(node.params)) {
-                    context.report({ node: useStrictDirectives[0], message: messages.nonSimpleParameterList });
+                    context.report({ node: useStrictDirectives[0], messageId: "nonSimpleParameterList" });
                 } else if (isParentStrict) {
-                    context.report({ node: useStrictDirectives[0], message: messages.unnecessary, fix: getFixFunction(useStrictDirectives[0]) });
+                    context.report({ node: useStrictDirectives[0], messageId: "unnecessary", fix: getFixFunction(useStrictDirectives[0]) });
                 } else if (isInClass) {
-                    context.report({ node: useStrictDirectives[0], message: messages.unnecessaryInClasses, fix: getFixFunction(useStrictDirectives[0]) });
+                    context.report({ node: useStrictDirectives[0], messageId: "unnecessaryInClasses", fix: getFixFunction(useStrictDirectives[0]) });
                 }
 
-                reportAllExceptFirst(useStrictDirectives, messages.multiple, true);
+                reportAllExceptFirst(useStrictDirectives, "multiple", true);
             } else if (isParentGlobal) {
                 if (isSimpleParameterList(node.params)) {
-                    context.report({ node, message: messages.function });
+                    context.report({ node, messageId: "function" });
                 } else {
                     context.report({
                         node,
-                        message: messages.wrap,
+                        messageId: "wrap",
                         data: { name: astUtils.getFunctionNameWithKind(node) }
                     });
                 }
@@ -228,10 +227,10 @@ module.exports = {
                 enterFunctionInFunctionMode(node, useStrictDirectives);
             } else if (useStrictDirectives.length > 0) {
                 if (isSimpleParameterList(node.params)) {
-                    reportAll(useStrictDirectives, messages[mode], shouldFix(mode));
+                    reportAll(useStrictDirectives, mode, shouldFix(mode));
                 } else {
-                    context.report({ node: useStrictDirectives[0], message: messages.nonSimpleParameterList });
-                    reportAllExceptFirst(useStrictDirectives, messages.multiple, true);
+                    context.report({ node: useStrictDirectives[0], messageId: "nonSimpleParameterList" });
+                    reportAllExceptFirst(useStrictDirectives, "multiple", true);
                 }
             }
         }
@@ -246,11 +245,11 @@ module.exports = {
 
                 if (mode === "global") {
                     if (node.body.length > 0 && useStrictDirectives.length === 0) {
-                        context.report({ node, message: messages.global });
+                        context.report({ node, messageId: "global" });
                     }
-                    reportAllExceptFirst(useStrictDirectives, messages.multiple, true);
+                    reportAllExceptFirst(useStrictDirectives, "multiple", true);
                 } else {
-                    reportAll(useStrictDirectives, messages[mode], shouldFix(mode));
+                    reportAll(useStrictDirectives, mode, shouldFix(mode));
                 }
             },
             FunctionDeclaration: enterFunction,

package/lib/rules/switch-colon-spacing.js

@@ -30,14 +30,19 @@ module.exports = {
             {
                 type: "object",
                 properties: {
-                    before: { type: "boolean" },
-                    after: { type: "boolean" }
+                    before: { type: "boolean", default: false },
+                    after: { type: "boolean", default: true }
                 },
                 additionalProperties: false
             }
         ],
-
-        fixable: "whitespace"
+        fixable: "whitespace",
+        messages: {
+            expectedBefore: "Expected space(s) before this colon.",
+            expectedAfter: "Expected space(s) after this colon.",
+            unexpectedBefore: "Unexpected space(s) before this colon.",
+            unexpectedAfter: "Unexpected space(s) after this colon."
+        }
     },
 
     create(context) {
@@ -118,8 +123,7 @@ module.exports = {
                     context.report({
                         node,
                         loc: colonToken.loc,
-                        message: "{{verb}} space(s) before this colon.",
-                        data: { verb: beforeSpacing ? "Expected" : "Unexpected" },
+                        messageId: beforeSpacing ? "expectedBefore" : "unexpectedBefore",
                         fix: fixer => fix(fixer, beforeToken, colonToken, beforeSpacing)
                     });
                 }
@@ -127,8 +131,7 @@ module.exports = {
                     context.report({
                         node,
                         loc: colonToken.loc,
-                        message: "{{verb}} space(s) after this colon.",
-                        data: { verb: afterSpacing ? "Expected" : "Unexpected" },
+                        messageId: afterSpacing ? "expectedAfter" : "unexpectedAfter",
                         fix: fixer => fix(fixer, colonToken, afterToken, afterSpacing)
                     });
                 }

package/lib/rules/symbol-description.js

@@ -26,8 +26,11 @@ module.exports = {
             recommended: false,
             url: "https://eslint.org/docs/rules/symbol-description"
         },
-
-        schema: []
+        fixable: null,
+        schema: [],
+        messages: {
+            expected: "Expected Symbol to have a description."
+        }
     },
 
     create(context) {
@@ -43,7 +46,7 @@ module.exports = {
             if (node.arguments.length === 0) {
                 context.report({
                     node,
-                    message: "Expected Symbol to have a description."
+                    messageId: "expected"
                 });
             }
         }

package/lib/rules/template-curly-spacing.js

@@ -37,13 +37,19 @@ module.exports = {
 
         schema: [
             { enum: ["always", "never"] }
-        ]
+        ],
+        messages: {
+            expectedBefore: "Expected space(s) before '}'.",
+            expectedAfter: "Expected space(s) after '${'.",
+            unexpectedBefore: "Unexpected space(s) before '}'.",
+            unexpectedAfter: "Unexpected space(s) after '${'."
+        }
     },
 
     create(context) {
         const sourceCode = context.getSourceCode();
         const always = context.options[0] === "always";
-        const prefix = always ? "Expected" : "Unexpected";
+        const prefix = always ? "expected" : "unexpected";
 
         /**
          * Checks spacing before `}` of a given token.
@@ -60,10 +66,7 @@ module.exports = {
             ) {
                 context.report({
                     loc: token.loc.start,
-                    message: "{{prefix}} space(s) before '}'.",
-                    data: {
-                        prefix
-                    },
+                    messageId: `${prefix}Before`,
                     fix(fixer) {
                         if (always) {
                             return fixer.insertTextBefore(token, " ");
@@ -95,10 +98,7 @@ module.exports = {
                         line: token.loc.end.line,
                         column: token.loc.end.column - 2
                     },
-                    message: "{{prefix}} space(s) after '${'.",
-                    data: {
-                        prefix
-                    },
+                    messageId: `${prefix}After`,
                     fix(fixer) {
                         if (always) {
                             return fixer.insertTextAfter(token, " ");

package/lib/rules/template-tag-spacing.js

@@ -24,7 +24,11 @@ module.exports = {
 
         schema: [
             { enum: ["always", "never"] }
-        ]
+        ],
+        messages: {
+            unexpected: "Unexpected space between template tag and template literal.",
+            missing: "Missing space between template tag and template literal."
+        }
     },
 
     create(context) {
@@ -46,7 +50,7 @@ module.exports = {
                 context.report({
                     node,
                     loc: tagToken.loc.start,
-                    message: "Unexpected space between template tag and template literal.",
+                    messageId: "unexpected",
                     fix(fixer) {
                         const comments = sourceCode.getCommentsBefore(node.quasi);
 
@@ -65,7 +69,7 @@ module.exports = {
                 context.report({
                     node,
                     loc: tagToken.loc.start,
-                    message: "Missing space between template tag and template literal.",
+                    messageId: "missing",
                     fix(fixer) {
                         return fixer.insertTextAfter(tagToken, " ");
                     }

package/lib/rules/unicode-bom.js

@@ -25,7 +25,11 @@ module.exports = {
             {
                 enum: ["always", "never"]
             }
-        ]
+        ],
+        messages: {
+            expected: "Expected Unicode BOM (Byte Order Mark).",
+            unexpected: "Unexpected Unicode BOM (Byte Order Mark)."
+        }
     },
 
     create(context) {
@@ -46,7 +50,7 @@ module.exports = {
                     context.report({
                         node,
                         loc: location,
-                        message: "Expected Unicode BOM (Byte Order Mark).",
+                        messageId: "expected",
                         fix(fixer) {
                             return fixer.insertTextBeforeRange([0, 1], "\uFEFF");
                         }
@@ -55,7 +59,7 @@ module.exports = {
                     context.report({
                         node,
                         loc: location,
-                        message: "Unexpected Unicode BOM (Byte Order Mark).",
+                        messageId: "unexpected",
                         fix(fixer) {
                             return fixer.removeRange([-1, 0]);
                         }

package/lib/rules/use-isnan.js

@@ -20,7 +20,10 @@ module.exports = {
             url: "https://eslint.org/docs/rules/use-isnan"
         },
 
-        schema: []
+        schema: [],
+        messages: {
+            useIsNaN: "Use the isNaN function to compare with NaN."
+        }
     },
 
     create(context) {
@@ -28,7 +31,7 @@ module.exports = {
         return {
             BinaryExpression(node) {
                 if (/^(?:[<>]|[!=]=)=?$/.test(node.operator) && (node.left.name === "NaN" || node.right.name === "NaN")) {
-                    context.report({ node, message: "Use the isNaN function to compare with NaN." });
+                    context.report({ node, messageId: "useIsNaN" });
                 }
             }
         };