eslint 4.16.0 → 4.18.2

package/lib/rules/eol-last.js

@@ -27,7 +27,11 @@ module.exports = {
             {
                 enum: ["always", "never", "unix", "windows"]
             }
-        ]
+        ],
+        messages: {
+            missing: "Newline required at end of file but not found.",
+            unexpected: "Newline not allowed at end of file."
+        }
     },
     create(context) {
 
@@ -75,7 +79,7 @@ module.exports = {
                     context.report({
                         node,
                         loc: location,
-                        message: "Newline required at end of file but not found.",
+                        messageId: "missing",
                         fix(fixer) {
                             return fixer.insertTextAfterRange([0, src.length], appendCRLF ? CRLF : LF);
                         }
@@ -86,7 +90,7 @@ module.exports = {
                     context.report({
                         node,
                         loc: location,
-                        message: "Newline not allowed at end of file.",
+                        messageId: "unexpected",
                         fix(fixer) {
                             const finalEOLs = /(?:\r?\n)+$/,
                                 match = finalEOLs.exec(sourceCode.text),

package/lib/rules/eqeqeq.js

@@ -56,7 +56,11 @@ module.exports = {
             ]
         },
 
-        fixable: "code"
+        fixable: "code",
+
+        messages: {
+            unexpected: "Expected '{{expectedOperator}}' and instead saw '{{actualOperator}}'."
+        }
     },
 
     create(context) {
@@ -134,7 +138,7 @@ module.exports = {
             context.report({
                 node,
                 loc: getOperatorLocation(node),
-                message: "Expected '{{expectedOperator}}' and instead saw '{{actualOperator}}'.",
+                messageId: "unexpected",
                 data: { expectedOperator, actualOperator: node.operator },
                 fix(fixer) {
 

package/lib/rules/indent.js

@@ -1043,7 +1043,6 @@ module.exports = {
                 offsets.ignoreToken(operator);
                 offsets.ignoreToken(tokenAfterOperator);
                 offsets.setDesiredOffset(tokenAfterOperator, operator, 0);
-                offsets.setDesiredOffsets([tokenAfterOperator.range[1], node.range[1]], tokenAfterOperator, 1);
             },
 
             "BlockStatement, ClassBody"(node) {

package/lib/rules/key-spacing.js

@@ -360,9 +360,10 @@ module.exports = {
          */
         function isKeyValueProperty(property) {
             return !(
-                (property.method ||
+                property.method ||
                 property.shorthand ||
-                property.kind !== "init" || property.type !== "Property") // Could be "ExperimentalSpreadProperty" or "SpreadProperty"
+                property.kind !== "init" ||
+                property.type !== "Property" // Could be "ExperimentalSpreadProperty" or "SpreadElement"
             );
         }
 

package/lib/rules/keyword-spacing.js

@@ -436,7 +436,12 @@ module.exports = {
          * @returns {void}
          */
         function checkSpacingForForOfStatement(node) {
-            checkSpacingAroundFirstToken(node);
+            if (node.await) {
+                checkSpacingBefore(sourceCode.getFirstToken(node, 0));
+                checkSpacingAfter(sourceCode.getFirstToken(node, 1));
+            } else {
+                checkSpacingAroundFirstToken(node);
+            }
             checkSpacingAround(sourceCode.getTokenBefore(node.right, astUtils.isNotOpeningParenToken));
         }
 

package/lib/rules/max-len.js

@@ -213,7 +213,8 @@ module.exports = {
          * @returns {ASTNode[]} An array of string nodes.
          */
         function getAllStrings() {
-            return sourceCode.ast.tokens.filter(token => token.type === "String");
+            return sourceCode.ast.tokens.filter(token => (token.type === "String" ||
+                (token.type === "JSXText" && sourceCode.getNodeByRangeIndex(token.range[0] - 1).type === "JSXAttribute")));
         }
 
         /**

package/lib/rules/no-alert.js

@@ -23,17 +23,6 @@ function isProhibitedIdentifier(name) {
     return /^(alert|confirm|prompt)$/.test(name);
 }
 
-/**
- * Reports the given node and identifier name.
- * @param {RuleContext} context The ESLint rule context.
- * @param {ASTNode} node The node to report on.
- * @param {string} identifierName The name of the identifier.
- * @returns {void}
- */
-function report(context, node, identifierName) {
-    context.report(node, "Unexpected {{name}}.", { name: identifierName });
-}
-
 /**
  * Finds the eslint-scope reference in the given scope.
  * @param {Object} scope The scope to search.
@@ -92,7 +81,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-alert"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Unexpected {{name}}."
+        }
     },
 
     create(context) {
@@ -103,17 +96,25 @@ module.exports = {
 
                 // without window.
                 if (callee.type === "Identifier") {
-                    const identifierName = callee.name;
+                    const name = callee.name;
 
                     if (!isShadowed(currentScope, callee) && isProhibitedIdentifier(callee.name)) {
-                        report(context, node, identifierName);
+                        context.report({
+                            node,
+                            messageId: "unexpected",
+                            data: { name }
+                        });
                     }
 
                 } else if (callee.type === "MemberExpression" && isGlobalThisReferenceOrGlobalWindow(currentScope, callee.object)) {
-                    const identifierName = getPropertyName(callee);
-
-                    if (isProhibitedIdentifier(identifierName)) {
-                        report(context, node, identifierName);
+                    const name = getPropertyName(callee);
+
+                    if (isProhibitedIdentifier(name)) {
+                        context.report({
+                            node,
+                            messageId: "unexpected",
+                            data: { name }
+                        });
                     }
                 }
 

package/lib/rules/no-array-constructor.js

@@ -18,7 +18,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-array-constructor"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            preferLiteral: "The array literal notation [] is preferable."
+        }
     },
 
     create(context) {
@@ -35,7 +39,7 @@ module.exports = {
                 node.callee.type === "Identifier" &&
                 node.callee.name === "Array"
             ) {
-                context.report({ node, message: "The array literal notation [] is preferrable." });
+                context.report({ node, messageId: "preferLiteral" });
             }
         }
 

package/lib/rules/no-await-in-loop.js

@@ -4,24 +4,54 @@
  */
 "use strict";
 
-// Node types which are considered loops.
-const loopTypes = new Set([
-    "ForStatement",
-    "ForOfStatement",
-    "ForInStatement",
-    "WhileStatement",
-    "DoWhileStatement"
-]);
+/**
+ * Check whether it should stop traversing ancestors at the given node.
+ * @param {ASTNode} node A node to check.
+ * @returns {boolean} `true` if it should stop traversing.
+ */
+function isBoundary(node) {
+    const t = node.type;
+
+    return (
+        t === "FunctionDeclaration" ||
+        t === "FunctionExpression" ||
+        t === "ArrowFunctionExpression" ||
+
+        /*
+         * Don't report the await expressions on for-await-of loop since it's
+         * asynchronous iteration intentionally.
+         */
+        (t === "ForOfStatement" && node.await === true)
+    );
+}
 
-/*
- * Node types at which we should stop looking for loops. For example, it is fine to declare an async
- * function within a loop, and use await inside of that.
+/**
+ * Check whether the given node is in loop.
+ * @param {ASTNode} node A node to check.
+ * @param {ASTNode} parent A parent node to check.
+ * @returns {boolean} `true` if the node is in loop.
  */
-const boundaryTypes = new Set([
-    "FunctionDeclaration",
-    "FunctionExpression",
-    "ArrowFunctionExpression"
-]);
+function isLooped(node, parent) {
+    switch (parent.type) {
+        case "ForStatement":
+            return (
+                node === parent.test ||
+                node === parent.update ||
+                node === parent.body
+            );
+
+        case "ForOfStatement":
+        case "ForInStatement":
+            return node === parent.body;
+
+        case "WhileStatement":
+        case "DoWhileStatement":
+            return node === parent.test || node === parent.body;
+
+        default:
+            return false;
+    }
+}
 
 module.exports = {
     meta: {
@@ -31,54 +61,42 @@ module.exports = {
             recommended: false,
             url: "https://eslint.org/docs/rules/no-await-in-loop"
         },
-        schema: []
+        schema: [],
+        messages: {
+            unexpectedAwait: "Unexpected `await` inside a loop."
+        }
     },
     create(context) {
-        return {
-            AwaitExpression(node) {
-                const ancestors = context.getAncestors();
-
-                // Reverse so that we can traverse from the deepest node upwards.
-                ancestors.reverse();
-
-                /*
-                 * Create a set of all the ancestors plus this node so that we can check
-                 * if this use of await appears in the body of the loop as opposed to
-                 * the right-hand side of a for...of, for example.
-                 */
-                const ancestorSet = new Set(ancestors).add(node);
 
-                for (let i = 0; i < ancestors.length; i++) {
-                    const ancestor = ancestors[i];
-
-                    if (boundaryTypes.has(ancestor.type)) {
+        /**
+         * Validate an await expression.
+         * @param {ASTNode} awaitNode An AwaitExpression or ForOfStatement node to validate.
+         * @returns {void}
+         */
+        function validate(awaitNode) {
+            if (awaitNode.type === "ForOfStatement" && !awaitNode.await) {
+                return;
+            }
 
-                        /*
-                         * Short-circuit out if we encounter a boundary type. Loops above
-                         * this do not matter.
-                         */
-                        return;
-                    }
-                    if (loopTypes.has(ancestor.type)) {
+            let node = awaitNode;
+            let parent = node.parent;
 
-                        /*
-                         * Only report if we are actually in the body or another part that gets executed on
-                         * every iteration.
-                         */
-                        if (
-                            ancestorSet.has(ancestor.body) ||
-                            ancestorSet.has(ancestor.test) ||
-                            ancestorSet.has(ancestor.update)
-                        ) {
-                            context.report({
-                                node,
-                                message: "Unexpected `await` inside a loop."
-                            });
-                            return;
-                        }
-                    }
+            while (parent && !isBoundary(parent)) {
+                if (isLooped(node, parent)) {
+                    context.report({
+                        node: awaitNode,
+                        messageId: "unexpectedAwait"
+                    });
+                    return;
                 }
+                node = parent;
+                parent = parent.parent;
             }
+        }
+
+        return {
+            AwaitExpression: validate,
+            ForOfStatement: validate
         };
     }
 };

package/lib/rules/no-bitwise.js

@@ -46,7 +46,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+
+        messages: {
+            unexpected: "Unexpected use of '{{operator}}'."
+        }
     },
 
     create(context) {
@@ -60,7 +64,7 @@ module.exports = {
          * @returns {void}
          */
         function report(node) {
-            context.report({ node, message: "Unexpected use of '{{operator}}'.", data: { operator: node.operator } });
+            context.report({ node, messageId: "unexpected", data: { operator: node.operator } });
         }
 
         /**

package/lib/rules/no-buffer-constructor.js

@@ -16,7 +16,10 @@ module.exports = {
             recommended: false,
             url: "https://eslint.org/docs/rules/no-buffer-constructor"
         },
-        schema: []
+        schema: [],
+        messages: {
+            deprecated: "{{expr}} is deprecated. Use Buffer.from(), Buffer.alloc(), or Buffer.allocUnsafe() instead."
+        }
     },
 
     create(context) {
@@ -29,8 +32,8 @@ module.exports = {
             "CallExpression[callee.name='Buffer'], NewExpression[callee.name='Buffer']"(node) {
                 context.report({
                     node,
-                    message: "{{example}} is deprecated. Use Buffer.from(), Buffer.alloc(), or Buffer.allocUnsafe() instead.",
-                    data: { example: node.type === "CallExpression" ? "Buffer()" : "new Buffer()" }
+                    messageId: "deprecated",
+                    data: { expr: node.type === "CallExpression" ? "Buffer()" : "new Buffer()" }
                 });
             }
         };

package/lib/rules/no-caller.js

@@ -18,7 +18,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-caller"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Avoid arguments.{{prop}}."
+        }
     },
 
     create(context) {
@@ -30,7 +34,7 @@ module.exports = {
                     propertyName = node.property.name;
 
                 if (objectName === "arguments" && !node.computed && propertyName && propertyName.match(/^calle[er]$/)) {
-                    context.report({ node, message: "Avoid arguments.{{property}}.", data: { property: propertyName } });
+                    context.report({ node, messageId: "unexpected", data: { prop: propertyName } });
                 }
 
             }

package/lib/rules/no-case-declarations.js

@@ -17,7 +17,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-case-declarations"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Unexpected lexical declaration in case block."
+        }
     },
 
     create(context) {
@@ -47,7 +51,7 @@ module.exports = {
                     if (isLexicalDeclaration(statement)) {
                         context.report({
                             node,
-                            message: "Unexpected lexical declaration in case block."
+                            messageId: "unexpected"
                         });
                     }
                 }

package/lib/rules/no-catch-shadow.js

@@ -24,7 +24,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-catch-shadow"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            mutable: "Value of '{{name}}' may be overwritten in IE 8 and earlier."
+        }
     },
 
     create(context) {
@@ -61,7 +65,7 @@ module.exports = {
                 }
 
                 if (paramIsShadowing(scope, node.param.name)) {
-                    context.report({ node, message: "Value of '{{name}}' may be overwritten in IE 8 and earlier.", data: { name: node.param.name } });
+                    context.report({ node, messageId: "mutable", data: { name: node.param.name } });
                 }
             }
         };

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

@@ -20,7 +20,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-class-assign"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            class: "'{{name}}' is a class."
+        }
     },
 
     create(context) {
@@ -32,7 +36,7 @@ module.exports = {
          */
         function checkVariable(variable) {
             astUtils.getModifyingReferences(variable.references).forEach(reference => {
-                context.report({ node: reference.identifier, message: "'{{name}}' is a class.", data: { name: reference.identifier.name } });
+                context.report({ node: reference.identifier, messageId: "class", data: { name: reference.identifier.name } });
 
             });
         }

package/lib/rules/no-compare-neg-zero.js

@@ -17,7 +17,10 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-compare-neg-zero"
         },
         fixable: null,
-        schema: []
+        schema: [],
+        messages: {
+            unexpected: "Do not use the '{{operator}}' operator to compare against -0."
+        }
     },
 
     create(context) {
@@ -43,7 +46,7 @@ module.exports = {
                     if (isNegZero(node.left) || isNegZero(node.right)) {
                         context.report({
                             node,
-                            message: "Do not use the '{{operator}}' operator to compare against -0.",
+                            messageId: "unexpected",
                             data: { operator: node.operator }
                         });
                     }

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

@@ -30,7 +30,14 @@ module.exports = {
             {
                 enum: ["except-parens", "always"]
             }
-        ]
+        ],
+
+        messages: {
+            unexpected: "Unexpected assignment within {{type}}.",
+
+            // must match JSHint's error message
+            missing: "Expected a conditional expression and instead saw an assignment."
+        }
     },
 
     create(context) {
@@ -95,11 +102,10 @@ module.exports = {
                 )
             ) {
 
-                // must match JSHint's error message
                 context.report({
                     node,
                     loc: node.test.loc.start,
-                    message: "Expected a conditional expression and instead saw an assignment."
+                    messageId: "missing"
                 });
             }
         }
@@ -115,7 +121,7 @@ module.exports = {
             if (ancestor) {
                 context.report({
                     node: ancestor,
-                    message: "Unexpected assignment within {{type}}.",
+                    messageId: "unexpected",
                     data: {
                         type: NODE_DESCRIPTIONS[ancestor.type] || ancestor.type
                     }

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

@@ -42,7 +42,11 @@ module.exports = {
                 allowParens: { type: "boolean" }
             },
             additionalProperties: false
-        }]
+        }],
+
+        messages: {
+            confusing: "Arrow function used ambiguously with a conditional expression."
+        }
     },
 
     create(context) {
@@ -60,7 +64,7 @@ module.exports = {
             if (isConditional(body) && !(config.allowParens && astUtils.isParenthesised(sourceCode, body))) {
                 context.report({
                     node,
-                    message: "Arrow function used ambiguously with a conditional expression.",
+                    messageId: "confusing",
                     fix(fixer) {
 
                         // if `allowParens` is not set to true dont bother wrapping in parens

package/lib/rules/no-console.js

@@ -39,7 +39,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
-        ]
+        ],
+
+        messages: {
+            unexpected: "Unexpected console statement."
+        }
     },
 
     create(context) {
@@ -102,7 +106,7 @@ module.exports = {
             context.report({
                 node,
                 loc: node.loc,
-                message: "Unexpected console statement."
+                messageId: "unexpected"
             });
         }
 

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

@@ -20,7 +20,11 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-const-assign"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            const: "'{{name}}' is constant."
+        }
     },
 
     create(context) {
@@ -32,7 +36,7 @@ module.exports = {
          */
         function checkVariable(variable) {
             astUtils.getModifyingReferences(variable.references).forEach(reference => {
-                context.report({ node: reference.identifier, message: "'{{name}}' is constant.", data: { name: reference.identifier.name } });
+                context.report({ node: reference.identifier, messageId: "const", data: { name: reference.identifier.name } });
             });
         }
 

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

@@ -28,8 +28,11 @@ module.exports = {
                 },
                 additionalProperties: false
             }
+        ],
 
-        ]
+        messages: {
+            unexpected: "Unexpected constant condition."
+        }
     },
 
     create(context) {
@@ -139,7 +142,7 @@ module.exports = {
         function checkConstantConditionLoopInSet(node) {
             if (loopsInCurrentScope.has(node)) {
                 loopsInCurrentScope.delete(node);
-                context.report({ node: node.test, message: "Unexpected constant condition." });
+                context.report({ node: node.test, messageId: "unexpected" });
             }
         }
 
@@ -151,7 +154,7 @@ module.exports = {
          */
         function reportIfConstant(node) {
             if (node.test && isConstant(node.test, true)) {
-                context.report({ node: node.test, message: "Unexpected constant condition." });
+                context.report({ node: node.test, messageId: "unexpected" });
             }
         }
 

package/lib/rules/no-continue.js

@@ -18,14 +18,18 @@ module.exports = {
             url: "https://eslint.org/docs/rules/no-continue"
         },
 
-        schema: []
+        schema: [],
+
+        messages: {
+            unexpected: "Unexpected use of continue statement."
+        }
     },
 
     create(context) {
 
         return {
             ContinueStatement(node) {
-                context.report({ node, message: "Unexpected use of continue statement." });
+                context.report({ node, messageId: "unexpected" });
             }
         };