eslint 4.15.0 → 4.18.1

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

@@ -34,7 +34,12 @@ module.exports = {
             },
             additionalProperties: false
         }],
-        fixable: "code"
+
+        fixable: "code",
+
+        messages: {
+            unexpected: "Unnecessary 'else' after 'return'."
+        }
     },
 
     create(context) {
@@ -52,7 +57,7 @@ module.exports = {
         function displayReport(node) {
             context.report({
                 node,
-                message: "Unnecessary 'else' after 'return'.",
+                messageId: "unexpected",
                 fix: fixer => {
                     const sourceCode = context.getSourceCode();
                     const startToken = sourceCode.getFirstToken(node);

package/lib/rules/no-empty-character-class.js

@@ -36,7 +36,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-empty-character-class"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Empty class."
+        }
     },
 
     create(context) {
@@ -48,7 +52,7 @@ module.exports = {
                 const token = sourceCode.getFirstToken(node);
 
                 if (token.type === "RegularExpression" && !regex.test(token.value)) {
-                    context.report({ node, message: "Empty class." });
+                    context.report({ node, messageId: "unexpected" });
                 }
             }
 

package/lib/rules/no-empty-function.js

@@ -109,7 +109,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+
+        messages: {
+            unexpected: "Unexpected empty {{name}}."
+        }
     },
 
     create(context) {
@@ -146,7 +150,7 @@ module.exports = {
                 context.report({
                     node,
                     loc: node.body.loc.start,
-                    message: "Unexpected empty {{name}}.",
+                    messageId: "unexpected",
                     data: { name }
                 });
             }

package/lib/rules/no-empty-pattern.js

@@ -17,19 +17,23 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-empty-pattern"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Unexpected empty {{type}} pattern."
+        }
     },
 
     create(context) {
         return {
             ObjectPattern(node) {
                 if (node.properties.length === 0) {
-                    context.report({ node, message: "Unexpected empty object pattern." });
+                    context.report({ node, messageId: "unexpected", data: { type: "object" } });
                 }
             },
             ArrayPattern(node) {
                 if (node.elements.length === 0) {
-                    context.report({ node, message: "Unexpected empty array pattern." });
+                    context.report({ node, messageId: "unexpected", data: { type: "array" } });
                 }
             }
         };

package/lib/rules/no-empty.js

@@ -33,7 +33,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+
+        messages: {
+            unexpected: "Empty {{type}} statement."
+        }
     },
 
     create(context) {
@@ -64,13 +68,13 @@ module.exports = {
                     return;
                 }
 
-                context.report({ node, message: "Empty block statement." });
+                context.report({ node, messageId: "unexpected", data: { type: "block" } });
             },
 
             SwitchStatement(node) {
 
                 if (typeof node.cases === "undefined" || node.cases.length === 0) {
-                    context.report({ node, message: "Empty switch statement." });
+                    context.report({ node, messageId: "unexpected", data: { type: "switch" } });
                 }
             }
         };

package/lib/rules/no-eq-null.js

@@ -19,7 +19,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-eq-null"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Use '===' to compare with null."
+        }
     },
 
     create(context) {
@@ -31,7 +35,7 @@ module.exports = {
 
                 if (node.right.type === "Literal" && node.right.raw === "null" && badOperator ||
                         node.left.type === "Literal" && node.left.raw === "null" && badOperator) {
-                    context.report({ node, message: "Use ‘===’ to compare with ‘null’." });
+                    context.report({ node, messageId: "unexpected" });
                 }
             }
         };

package/lib/rules/no-eval.js

@@ -91,7 +91,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+
+        messages: {
+            unexpected: "eval can be harmful."
+        }
     },
 
     create(context) {
@@ -160,7 +164,7 @@ module.exports = {
             context.report({
                 node,
                 loc: locationNode.loc.start,
-                message: "eval can be harmful."
+                messageId: "unexpected"
             });
         }
 

package/lib/rules/no-ex-assign.js

@@ -20,7 +20,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-ex-assign"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Do not assign to the exception parameter."
+        }
     },
 
     create(context) {
@@ -32,7 +36,7 @@ module.exports = {
          */
         function checkVariable(variable) {
             astUtils.getModifyingReferences(variable.references).forEach(reference => {
-                context.report({ node: reference.identifier, message: "Do not assign to the exception parameter." });
+                context.report({ node: reference.identifier, messageId: "unexpected" });
             });
         }
 

package/lib/rules/no-extend-native.js

@@ -45,7 +45,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+
+        messages: {
+            unexpected: "{{builtin}} prototype is read only, properties should not be added."
+        }
     },
 
     create(context) {
@@ -67,7 +71,7 @@ module.exports = {
         function reportNode(node, builtin) {
             context.report({
                 node,
-                message: "{{builtin}} prototype is read only, properties should not be added.",
+                messageId: "unexpected",
                 data: {
                     builtin
                 }

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

@@ -25,7 +25,11 @@ module.exports = {
 
         schema: [],
 
-        fixable: "code"
+        fixable: "code",
+
+        messages: {
+            unexpected: "The function binding is unnecessary."
+        }
     },
 
     create(context) {
@@ -41,7 +45,7 @@ module.exports = {
         function report(node) {
             context.report({
                 node: node.parent.parent,
-                message: "The function binding is unnecessary.",
+                messageId: "unexpected",
                 loc: node.parent.property.loc.start,
                 fix(fixer) {
                     const firstTokenToRemove = context.getSourceCode()

package/lib/rules/no-extra-boolean-cast.js

@@ -26,7 +26,12 @@ module.exports = {
 
         schema: [],
 
-        fixable: "code"
+        fixable: "code",
+
+        messages: {
+            unexpectedCall: "Redundant Boolean call.",
+            unexpectedNegation: "Redundant double negation."
+        }
     },
 
     create(context) {
@@ -82,7 +87,7 @@ module.exports = {
                 ) {
                     context.report({
                         node,
-                        message: "Redundant double negation.",
+                        messageId: "unexpectedNegation",
                         fix: fixer => fixer.replaceText(parent, sourceCode.getText(node.argument))
                     });
                 }
@@ -97,7 +102,7 @@ module.exports = {
                 if (isInBooleanContext(node, parent)) {
                     context.report({
                         node,
-                        message: "Redundant Boolean call.",
+                        messageId: "unexpectedCall",
                         fix: fixer => {
                             if (!node.arguments.length) {
                                 return fixer.replaceText(parent, "true");

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

@@ -26,7 +26,11 @@ module.exports = {
 
         schema: [],
 
-        fixable: "code"
+        fixable: "code",
+
+        messages: {
+            unexpected: "This label '{{name}}' is unnecessary."
+        }
     },
 
     create(context) {
@@ -109,7 +113,7 @@ module.exports = {
                     if (info.breakable && info.label && info.label.name === labelNode.name) {
                         context.report({
                             node: labelNode,
-                            message: "This label '{{name}}' is unnecessary.",
+                            messageId: "unexpected",
                             data: labelNode,
                             fix: fixer => fixer.removeRange([sourceCode.getFirstToken(node).range[1], labelNode.range[1]])
                         });

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

@@ -55,6 +55,10 @@ module.exports = {
                     maxItems: 2
                 }
             ]
+        },
+
+        messages: {
+            unexpected: "Gratuitous parentheses around expression."
         }
     },
 
@@ -312,7 +316,7 @@ module.exports = {
             context.report({
                 node,
                 loc: leftParenToken.loc.start,
-                message: "Gratuitous parentheses around expression.",
+                messageId: "unexpected",
                 fix(fixer) {
                     const parenthesizedSource = sourceCode.text.slice(leftParenToken.range[1], rightParenToken.range[0]);
 

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

@@ -26,7 +26,11 @@ module.exports = {
         },
 
         fixable: "code",
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Unnecessary semicolon."
+        }
     },
 
     create(context) {
@@ -40,7 +44,7 @@ module.exports = {
         function report(nodeOrToken) {
             context.report({
                 node: nodeOrToken,
-                message: "Unnecessary semicolon.",
+                messageId: "unexpected",
                 fix(fixer) {
 
                     /*

package/lib/rules/no-self-assign.js

@@ -121,7 +121,9 @@ function eachSelfAssignment(left, right, props, report) {
         let startJ = 0;
 
         for (let i = right.properties.length - 1; i >= 0; --i) {
-            if (right.properties[i].type === "ExperimentalSpreadProperty") {
+            const propType = right.properties[i].type;
+
+            if (propType === "SpreadElement" || propType === "ExperimentalSpreadProperty") {
                 startJ = i + 1;
                 break;
             }

package/lib/rules/no-unused-vars.js

@@ -65,7 +65,7 @@ module.exports = {
     create(context) {
         const sourceCode = context.getSourceCode();
 
-        const REST_PROPERTY_TYPE = /^(?:Experimental)?RestProperty$/;
+        const REST_PROPERTY_TYPE = /^(?:RestElement|(?:Experimental)?RestProperty)$/;
 
         const config = {
             vars: "all",

package/lib/rules/object-curly-newline.js

@@ -10,6 +10,7 @@
 //------------------------------------------------------------------------------
 
 const astUtils = require("../ast-utils");
+const lodash = require("lodash");
 
 //------------------------------------------------------------------------------
 // Helpers
@@ -73,19 +74,57 @@ function normalizeOptionValue(value) {
  * Normalizes a given option value.
  *
  * @param {string|Object|undefined} options - An option value to parse.
- * @returns {{ObjectExpression: {multiline: boolean, minProperties: number}, ObjectPattern: {multiline: boolean, minProperties: number}}} Normalized option object.
+ * @returns {{
+ *   ObjectExpression: {multiline: boolean, minProperties: number, consistent: boolean},
+ *   ObjectPattern: {multiline: boolean, minProperties: number, consistent: boolean},
+ *   ImportDeclaration: {multiline: boolean, minProperties: number, consistent: boolean},
+ *   ExportNamedDeclaration : {multiline: boolean, minProperties: number, consistent: boolean}
+ * }} Normalized option object.
  */
 function normalizeOptions(options) {
-    if (options && (options.ObjectExpression || options.ObjectPattern)) {
+    const isNodeSpecificOption = lodash.overSome([lodash.isPlainObject, lodash.isString]);
+
+    if (lodash.isPlainObject(options) && lodash.some(options, isNodeSpecificOption)) {
         return {
             ObjectExpression: normalizeOptionValue(options.ObjectExpression),
-            ObjectPattern: normalizeOptionValue(options.ObjectPattern)
+            ObjectPattern: normalizeOptionValue(options.ObjectPattern),
+            ImportDeclaration: normalizeOptionValue(options.ImportDeclaration),
+            ExportNamedDeclaration: normalizeOptionValue(options.ExportDeclaration)
         };
     }
 
     const value = normalizeOptionValue(options);
 
-    return { ObjectExpression: value, ObjectPattern: value };
+    return { ObjectExpression: value, ObjectPattern: value, ImportDeclaration: value, ExportNamedDeclaration: value };
+}
+
+/**
+ * Determines if ObjectExpression, ObjectPattern, ImportDeclaration or ExportNamedDeclaration
+ * node needs to be checked for missing line breaks
+ *
+ * @param {ASTNode} node - Node under inspection
+ * @param {Object} options - option specific to node type
+ * @param {Token} first - First object property
+ * @param {Token} last - Last object property
+ * @returns {boolean} `true` if node needs to be checked for missing line breaks
+ */
+function areLineBreaksRequired(node, options, first, last) {
+    let objectProperties;
+
+    if (node.type === "ObjectExpression" || node.type === "ObjectPattern") {
+        objectProperties = node.properties;
+    } else {
+
+        // is ImportDeclaration or ExportNamedDeclaration
+        objectProperties = node.specifiers;
+    }
+
+    return objectProperties.length >= options.minProperties ||
+        (
+            options.multiline &&
+            objectProperties.length > 0 &&
+            first.loc.start.line !== last.loc.end.line
+        );
 }
 
 //------------------------------------------------------------------------------
@@ -109,7 +148,9 @@ module.exports = {
                         type: "object",
                         properties: {
                             ObjectExpression: OPTION_VALUE,
-                            ObjectPattern: OPTION_VALUE
+                            ObjectPattern: OPTION_VALUE,
+                            ImportDeclaration: OPTION_VALUE,
+                            ExportDeclaration: OPTION_VALUE
                         },
                         additionalProperties: false,
                         minProperties: 1
@@ -125,32 +166,37 @@ module.exports = {
 
         /**
          * Reports a given node if it violated this rule.
-         *
-         * @param {ASTNode} node - A node to check. This is an ObjectExpression node or an ObjectPattern node.
-         * @param {{multiline: boolean, minProperties: number}} options - An option object.
+         * @param {ASTNode} node - A node to check. This is an ObjectExpression, ObjectPattern, ImportDeclaration or ExportNamedDeclaration node.
+         * @param {{multiline: boolean, minProperties: number, consistent: boolean}} options - An option object.
          * @returns {void}
          */
         function check(node) {
             const options = normalizedOptions[node.type];
+
+            if (
+                (node.type === "ImportDeclaration" &&
+                    !node.specifiers.some(specifier => specifier.type === "ImportSpecifier")) ||
+                (node.type === "ExportNamedDeclaration" &&
+                    !node.specifiers.some(specifier => specifier.type === "ExportSpecifier"))
+            ) {
+                return;
+            }
+
             const openBrace = sourceCode.getFirstToken(node, token => token.value === "{");
+
             let closeBrace;
 
             if (node.typeAnnotation) {
                 closeBrace = sourceCode.getTokenBefore(node.typeAnnotation);
             } else {
-                closeBrace = sourceCode.getLastToken(node);
+                closeBrace = sourceCode.getLastToken(node, token => token.value === "}");
             }
 
             let first = sourceCode.getTokenAfter(openBrace, { includeComments: true });
             let last = sourceCode.getTokenBefore(closeBrace, { includeComments: true });
-            const needsLinebreaks = (
-                node.properties.length >= options.minProperties ||
-                (
-                    options.multiline &&
-                    node.properties.length > 0 &&
-                    first.loc.start.line !== last.loc.end.line
-                )
-            );
+
+            const needsLineBreaks = areLineBreaksRequired(node, options, first, last);
+
             const hasCommentsFirstToken = astUtils.isCommentToken(first);
             const hasCommentsLastToken = astUtils.isCommentToken(last);
 
@@ -165,7 +211,7 @@ module.exports = {
             first = sourceCode.getTokenAfter(openBrace);
             last = sourceCode.getTokenBefore(closeBrace);
 
-            if (needsLinebreaks) {
+            if (needsLineBreaks) {
                 if (astUtils.isTokenOnSameLine(openBrace, first)) {
                     context.report({
                         message: "Expected a line break after this opening brace.",
@@ -244,7 +290,9 @@ module.exports = {
 
         return {
             ObjectExpression: check,
-            ObjectPattern: check
+            ObjectPattern: check,
+            ImportDeclaration: check,
+            ExportNamedDeclaration: check
         };
     }
 };

package/lib/rules/object-property-newline.js

@@ -22,7 +22,10 @@ module.exports = {
             {
                 type: "object",
                 properties: {
-                    allowMultiplePropertiesPerLine: {
+                    allowAllPropertiesOnSameLine: {
+                        type: "boolean"
+                    },
+                    allowMultiplePropertiesPerLine: { // Deprecated
                         type: "boolean"
                     }
                 },
@@ -34,7 +37,10 @@ module.exports = {
     },
 
     create(context) {
-        const allowSameLine = context.options[0] && Boolean(context.options[0].allowMultiplePropertiesPerLine);
+        const allowSameLine = context.options[0] && (
+            Boolean(context.options[0].allowAllPropertiesOnSameLine) ||
+            Boolean(context.options[0].allowMultiplePropertiesPerLine) // Deprecated
+        );
         const errorMessage = allowSameLine
             ? "Object properties must go on a new line if they aren't all on the same line."
             : "Object properties must go on a new line.";

package/lib/rules/object-shorthand.js

@@ -131,7 +131,7 @@ module.exports = {
          *
          */
         function canHaveShorthand(property) {
-            return (property.kind !== "set" && property.kind !== "get" && property.type !== "SpreadProperty" && property.type !== "ExperimentalSpreadProperty");
+            return (property.kind !== "set" && property.kind !== "get" && property.type !== "SpreadElement" && property.type !== "SpreadProperty" && property.type !== "ExperimentalSpreadProperty");
         }
 
         /**
@@ -233,10 +233,11 @@ module.exports = {
             const keyText = sourceCode.text.slice(firstKeyToken.range[0], lastKeyToken.range[1]);
             let keyPrefix = "";
 
+            if (node.value.async) {
+                keyPrefix += "async ";
+            }
             if (node.value.generator) {
-                keyPrefix = "*";
-            } else if (node.value.async) {
-                keyPrefix = "async ";
+                keyPrefix += "*";
             }
 
             if (node.value.type === "FunctionExpression") {
@@ -273,10 +274,11 @@ module.exports = {
             const keyText = sourceCode.text.slice(firstKeyToken.range[0], lastKeyToken.range[1]);
             let functionHeader = "function";
 
+            if (node.value.async) {
+                functionHeader = `async ${functionHeader}`;
+            }
             if (node.value.generator) {
-                functionHeader = "function*";
-            } else if (node.value.async) {
-                functionHeader = "async function";
+                functionHeader = `${functionHeader}*`;
             }
 
             return fixer.replaceTextRange([node.range[0], lastKeyToken.range[1]], `${keyText}: ${functionHeader}`);

package/lib/rules/padding-line-between-statements.js

@@ -358,6 +358,12 @@ const StatementTypes = {
             node.loc.start.line !== node.loc.end.line &&
             isBlockLikeStatement(sourceCode, node)
     },
+    "multiline-expression": {
+        test: (node, sourceCode) =>
+            node.loc.start.line !== node.loc.end.line &&
+            node.type === "ExpressionStatement" &&
+            !isDirectivePrologue(node, sourceCode)
+    },
 
     block: newNodeTypeTester("BlockStatement"),
     empty: newNodeTypeTester("EmptyStatement"),

package/lib/rules/prefer-destructuring.js

@@ -165,8 +165,10 @@ module.exports = {
             if (shouldCheck(reportNode.type, "object")) {
                 const property = rightNode.property;
 
-                if ((property.type === "Literal" && leftNode.name === property.value) || (property.type === "Identifier" &&
-                    leftNode.name === property.name)) {
+                if (
+                    (property.type === "Literal" && leftNode.name === property.value) ||
+                    (property.type === "Identifier" && leftNode.name === property.name && !rightNode.computed)
+                ) {
                     report(reportNode, "object");
                 }
             }

package/lib/rules/require-await.js

@@ -90,6 +90,11 @@ module.exports = {
 
             AwaitExpression() {
                 scopeInfo.hasAwait = true;
+            },
+            ForOfStatement(node) {
+                if (node.await) {
+                    scopeInfo.hasAwait = true;
+                }
             }
         };
     }

package/lib/rules/rest-spread-spacing.js

@@ -47,9 +47,15 @@ module.exports = {
             switch (node.type) {
                 case "SpreadElement":
                     type = "spread";
+                    if (node.parent.type === "ObjectExpression") {
+                        type += " property";
+                    }
                     break;
                 case "RestElement":
                     type = "rest";
+                    if (node.parent.type === "ObjectPattern") {
+                        type += " property";
+                    }
                     break;
                 case "ExperimentalSpreadProperty":
                     type = "spread property";

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

@@ -66,15 +66,6 @@ module.exports = {
                 node.argument && node.argument.type === "UnaryExpression" && node.argument.operator === "!";
         }
 
-        /**
-         * Check if the node's child argument is an "ObjectExpression"
-         * @param {ASTnode} node AST node
-         * @returns {boolean} Whether or not the argument's type is "ObjectExpression"
-         */
-        function isArgumentObjectExpression(node) {
-            return node.argument && node.argument.type && node.argument.type === "ObjectExpression";
-        }
-
         /**
          * Checks if an override exists for a given operator.
          * @param {string} operator Operator
@@ -125,7 +116,7 @@ module.exports = {
          * @returns {void}
          */
         function verifyWordDoesntHaveSpaces(node, firstToken, secondToken, word) {
-            if (isArgumentObjectExpression(node)) {
+            if (astUtils.canTokensBeAdjacent(firstToken, secondToken)) {
                 if (secondToken.range[0] > firstToken.range[1]) {
                     context.report({
                         node,