eslint 3.9.0 → 3.10.2

package/lib/config/config-rule.js

@@ -23,7 +23,7 @@ const rules = require("../rules"),
  * @returns {Array[]}    An array of arrays.
  */
 function explodeArray(xs) {
-    return xs.reduce(function(accumulator, x) {
+    return xs.reduce((accumulator, x) => {
         accumulator.push([x]);
         return accumulator;
     }, []);
@@ -49,8 +49,8 @@ function combineArrays(arr1, arr2) {
     if (arr2.length === 0) {
         return explodeArray(arr1);
     }
-    arr1.forEach(function(x1) {
-        arr2.forEach(function(x2) {
+    arr1.forEach(x1 => {
+        arr2.forEach(x2 => {
             res.push([].concat(x1, x2));
         });
     });
@@ -78,16 +78,14 @@ function combineArrays(arr1, arr2) {
  * @returns {Array[]}          Array of arrays of objects grouped by property
  */
 function groupByProperty(objects) {
-    const groupedObj = objects.reduce(function(accumulator, obj) {
+    const groupedObj = objects.reduce((accumulator, obj) => {
         const prop = Object.keys(obj)[0];
 
         accumulator[prop] = accumulator[prop] ? accumulator[prop].concat(obj) : [obj];
         return accumulator;
     }, {});
 
-    return Object.keys(groupedObj).map(function(prop) {
-        return groupedObj[prop];
-    });
+    return Object.keys(groupedObj).map(prop => groupedObj[prop]);
 }
 
 
@@ -152,16 +150,16 @@ function combinePropertyObjects(objArr1, objArr2) {
     if (objArr2.length === 0) {
         return objArr1;
     }
-    objArr1.forEach(function(obj1) {
-        objArr2.forEach(function(obj2) {
+    objArr1.forEach(obj1 => {
+        objArr2.forEach(obj2 => {
             const combinedObj = {};
             const obj1Props = Object.keys(obj1);
             const obj2Props = Object.keys(obj2);
 
-            obj1Props.forEach(function(prop1) {
+            obj1Props.forEach(prop1 => {
                 combinedObj[prop1] = obj1[prop1];
             });
-            obj2Props.forEach(function(prop2) {
+            obj2Props.forEach(prop2 => {
                 combinedObj[prop2] = obj2[prop2];
             });
             res.push(combinedObj);
@@ -205,7 +203,7 @@ RuleConfigSet.prototype = {
     addErrorSeverity(severity) {
         severity = severity || 2;
 
-        this.ruleConfigs = this.ruleConfigs.map(function(config) {
+        this.ruleConfigs = this.ruleConfigs.map(config => {
             config.unshift(severity);
             return config;
         });
@@ -241,9 +239,7 @@ RuleConfigSet.prototype = {
             },
 
             combine() {
-                this.objectConfigs = groupByProperty(this.objectConfigs).reduce(function(accumulator, objArr) {
-                    return combinePropertyObjects(accumulator, objArr);
-                }, []);
+                this.objectConfigs = groupByProperty(this.objectConfigs).reduce((accumulator, objArr) => combinePropertyObjects(accumulator, objArr), []);
             }
         };
 
@@ -251,7 +247,7 @@ RuleConfigSet.prototype = {
          * The object schema could have multiple independent properties.
          * If any contain enums or booleans, they can be added and then combined
          */
-        Object.keys(obj.properties).forEach(function(prop) {
+        Object.keys(obj.properties).forEach(prop => {
             if (obj.properties[prop].enum) {
                 objectConfigSet.add(prop, obj.properties[prop].enum);
             }
@@ -276,7 +272,7 @@ function generateConfigsFromSchema(schema) {
     const configSet = new RuleConfigSet();
 
     if (Array.isArray(schema)) {
-        schema.forEach(function(opt) {
+        schema.forEach(opt => {
             if (opt.enum) {
                 configSet.addEnums(opt.enum);
             }
@@ -302,7 +298,7 @@ function generateConfigsFromSchema(schema) {
 function createCoreRuleConfigs() {
     const ruleList = loadRules();
 
-    return Object.keys(ruleList).reduce(function(accumulator, id) {
+    return Object.keys(ruleList).reduce((accumulator, id) => {
         const rule = rules.get(id);
         const schema = (typeof rule === "function") ? rule.schema : rule.meta.schema;
 

package/lib/config/config-validator.js

@@ -105,7 +105,7 @@ function validateRuleOptions(id, options, source) {
         }
 
         if (validateRule && validateRule.errors) {
-            validateRule.errors.forEach(function(error) {
+            validateRule.errors.forEach(error => {
                 message.push(
                     "\tValue \"", error.value, "\" ", error.message, ".\n"
                 );
@@ -134,7 +134,7 @@ function validateEnvironment(environment, source) {
     }
 
     if (typeof environment === "object") {
-        Object.keys(environment).forEach(function(env) {
+        Object.keys(environment).forEach(env => {
             if (!Environments.get(env)) {
                 const message = [
                     source, ":\n",
@@ -158,7 +158,7 @@ function validateEnvironment(environment, source) {
 function validate(config, source) {
 
     if (typeof config.rules === "object") {
-        Object.keys(config.rules).forEach(function(id) {
+        Object.keys(config.rules).forEach(id => {
             validateRuleOptions(id, config.rules[id], source);
         });
     }

package/lib/config/environments.js

@@ -22,7 +22,7 @@ let environments = new Map();
  * @private
  */
 function load() {
-    Object.keys(envs).forEach(function(envName) {
+    Object.keys(envs).forEach(envName => {
         environments.set(envName, envs[envName]);
     });
 }

package/lib/config.js

@@ -197,7 +197,7 @@ function Config(options) {
 
     this.useEslintrc = (options.useEslintrc !== false);
 
-    this.env = (options.envs || []).reduce(function(envs, name) {
+    this.env = (options.envs || []).reduce((envs, name) => {
         envs[name] = true;
         return envs;
     }, {});
@@ -208,7 +208,7 @@ function Config(options) {
      * whether global is writable.
      * If user declares "foo", convert to "foo:false".
      */
-    this.globals = (options.globals || []).reduce(function(globals, def) {
+    this.globals = (options.globals || []).reduce((globals, def) => {
         const parts = def.split(":");
 
         globals[parts[0]] = (parts.length > 1 && parts[1] === "true");

package/lib/eslint.js

@@ -57,7 +57,7 @@ function parseBooleanConfig(string, comment) {
     // Collapse whitespace around `:` and `,` to make parsing easier
     string = string.replace(/\s*([:,])\s*/g, "$1");
 
-    string.split(/\s|,+/).forEach(function(name) {
+    string.split(/\s|,+/).forEach(name => {
         if (!name) {
             return;
         }
@@ -138,7 +138,7 @@ function parseListConfig(string) {
     // Collapse whitespace around ,
     string = string.replace(/\s*,\s*/g, ",");
 
-    string.split(/,+/).forEach(function(name) {
+    string.split(/,+/).forEach(name => {
         name = name.trim();
         if (!name) {
             return;
@@ -165,7 +165,7 @@ function addDeclaredGlobals(program, globalScope, config) {
 
     Object.assign(declaredGlobals, builtin);
 
-    Object.keys(config.env).forEach(function(name) {
+    Object.keys(config.env).forEach(name => {
         if (config.env[name]) {
             const env = Environments.get(name),
                 environmentGlobals = env && env.globals;
@@ -180,7 +180,7 @@ function addDeclaredGlobals(program, globalScope, config) {
     Object.assign(declaredGlobals, config.globals);
     Object.assign(explicitGlobals, config.astGlobals);
 
-    Object.keys(declaredGlobals).forEach(function(name) {
+    Object.keys(declaredGlobals).forEach(name => {
         let variable = globalScope.set.get(name);
 
         if (!variable) {
@@ -192,7 +192,7 @@ function addDeclaredGlobals(program, globalScope, config) {
         variable.writeable = declaredGlobals[name];
     });
 
-    Object.keys(explicitGlobals).forEach(function(name) {
+    Object.keys(explicitGlobals).forEach(name => {
         let variable = globalScope.set.get(name);
 
         if (!variable) {
@@ -206,7 +206,7 @@ function addDeclaredGlobals(program, globalScope, config) {
     });
 
     // mark all exported variables as such
-    Object.keys(exportedGlobals).forEach(function(name) {
+    Object.keys(exportedGlobals).forEach(name => {
         const variable = globalScope.set.get(name);
 
         if (variable) {
@@ -219,7 +219,7 @@ function addDeclaredGlobals(program, globalScope, config) {
      * Since we augment the global scope using configuration, we need to update
      * references and remove the ones that were added by configuration.
      */
-    globalScope.through = globalScope.through.filter(function(reference) {
+    globalScope.through = globalScope.through.filter(reference => {
         const name = reference.identifier.name;
         const variable = globalScope.set.get(name);
 
@@ -250,7 +250,7 @@ function addDeclaredGlobals(program, globalScope, config) {
 function disableReporting(reportingConfig, start, rulesToDisable) {
 
     if (rulesToDisable.length) {
-        rulesToDisable.forEach(function(rule) {
+        rulesToDisable.forEach(rule => {
             reportingConfig.push({
                 start,
                 end: null,
@@ -278,7 +278,7 @@ function enableReporting(reportingConfig, start, rulesToEnable) {
     let i;
 
     if (rulesToEnable.length) {
-        rulesToEnable.forEach(function(rule) {
+        rulesToEnable.forEach(rule => {
             for (i = reportingConfig.length - 1; i >= 0; i--) {
                 if (!reportingConfig[i].end && reportingConfig[i].rule === rule) {
                     reportingConfig[i].end = start;
@@ -325,7 +325,7 @@ function modifyConfigsFromComments(filename, ast, config, reportingConfig, messa
     };
     const commentRules = {};
 
-    ast.comments.forEach(function(comment) {
+    ast.comments.forEach(comment => {
 
         let value = comment.value.trim();
         const match = /^(eslint(-\w+){0,3}|exported|globals?)(\s|$)/.exec(value);
@@ -359,7 +359,7 @@ function modifyConfigsFromComments(filename, ast, config, reportingConfig, messa
                     case "eslint": {
                         const items = parseJsonConfig(value, comment.loc, messages);
 
-                        Object.keys(items).forEach(function(name) {
+                        Object.keys(items).forEach(name => {
                             const ruleValue = items[name];
 
                             validator.validateRuleOptions(name, ruleValue, `${filename} line ${comment.loc.start.line}`);
@@ -383,7 +383,7 @@ function modifyConfigsFromComments(filename, ast, config, reportingConfig, messa
     });
 
     // apply environment configs
-    Object.keys(commentConfig.env).forEach(function(name) {
+    Object.keys(commentConfig.env).forEach(name => {
         const env = Environments.get(name);
 
         if (env) {
@@ -454,7 +454,7 @@ function prepareConfig(config) {
     let parserOptions = {};
 
     if (typeof config.rules === "object") {
-        Object.keys(config.rules).forEach(function(k) {
+        Object.keys(config.rules).forEach(k => {
             const rule = config.rules[k];
 
             if (rule === null) {
@@ -470,7 +470,7 @@ function prepareConfig(config) {
 
     // merge in environment parserOptions
     if (typeof config.env === "object") {
-        Object.keys(config.env).forEach(function(envName) {
+        Object.keys(config.env).forEach(envName => {
             const env = Environments.get(envName);
 
             if (config.env[envName] && env && env.parserOptions) {
@@ -797,7 +797,7 @@ module.exports = (function() {
             }
 
             parseResult = parse(
-                stripUnicodeBOM(text).replace(/^#!([^\r\n]+)/, function(match, captured) {
+                stripUnicodeBOM(text).replace(/^#!([^\r\n]+)/, (match, captured) => {
                     shebang = captured;
                     return `//${captured}`;
                 }),
@@ -834,9 +834,7 @@ module.exports = (function() {
             ConfigOps.normalize(config);
 
             // enable appropriate rules
-            Object.keys(config.rules).filter(function(key) {
-                return getRuleSeverity(config.rules[key]) > 0;
-            }).forEach(function(key) {
+            Object.keys(config.rules).filter(key => getRuleSeverity(config.rules[key]) > 0).forEach(key => {
                 let ruleCreator;
 
                 ruleCreator = rules.get(key);
@@ -867,7 +865,7 @@ module.exports = (function() {
                         ruleCreator(ruleContext);
 
                     // add all the node types as listeners
-                    Object.keys(rule).forEach(function(nodeType) {
+                    Object.keys(rule).forEach(nodeType => {
                         api.on(nodeType, timing.enabled
                             ? timing.time(key, rule[nodeType])
                             : rule[nodeType]
@@ -933,7 +931,7 @@ module.exports = (function() {
         }
 
         // sort by line and column
-        messages.sort(function(a, b) {
+        messages.sort((a, b) => {
             const lineDiff = a.line - b.line;
 
             if (lineDiff === 0) {
@@ -986,7 +984,7 @@ module.exports = (function() {
         }
 
         if (opts) {
-            message = message.replace(/\{\{\s*([^{}]+?)\s*\}\}/g, function(fullMatch, term) {
+            message = message.replace(/\{\{\s*([^{}]+?)\s*\}\}/g, (fullMatch, term) => {
                 if (term in opts) {
                     return opts[term];
                 }
@@ -1056,7 +1054,7 @@ module.exports = (function() {
     };
 
     // copy over methods
-    Object.keys(externalMethods).forEach(function(methodName) {
+    Object.keys(externalMethods).forEach(methodName => {
         const exMethodName = externalMethods[methodName];
 
         // All functions expected to have less arguments than 5.
@@ -1181,7 +1179,7 @@ module.exports = (function() {
      * @returns {void}
      */
     api.defineRules = function(rulesToDefine) {
-        Object.getOwnPropertyNames(rulesToDefine).forEach(function(ruleId) {
+        Object.getOwnPropertyNames(rulesToDefine).forEach(ruleId => {
             defineRule(ruleId, rulesToDefine[ruleId]);
         });
     };

package/lib/file-finder.js

@@ -57,7 +57,7 @@ function FileFinder(files, cwd) {
 function normalizeDirectoryEntries(entries, directory, supportedConfigs) {
     const fileHash = {};
 
-    entries.forEach(function(entry) {
+    entries.forEach(entry => {
         if (supportedConfigs.indexOf(entry) >= 0) {
             const resolvedEntry = path.resolve(directory, entry);
 

package/lib/formatters/checkstyle.js

@@ -35,12 +35,12 @@ module.exports = function(results) {
     output += "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
     output += "<checkstyle version=\"4.3\">";
 
-    results.forEach(function(result) {
+    results.forEach(result => {
         const messages = result.messages;
 
         output += `<file name="${xmlEscape(result.filePath)}">`;
 
-        messages.forEach(function(message) {
+        messages.forEach(message => {
             output += [
                 `<error line="${xmlEscape(message.line)}"`,
                 `column="${xmlEscape(message.column)}"`,

package/lib/formatters/compact.js

@@ -32,13 +32,13 @@ module.exports = function(results) {
     let output = "",
         total = 0;
 
-    results.forEach(function(result) {
+    results.forEach(result => {
 
         const messages = result.messages;
 
         total += messages.length;
 
-        messages.forEach(function(message) {
+        messages.forEach(message => {
 
             output += `${result.filePath}: `;
             output += `line ${message.line || 0}`;

package/lib/formatters/html.js

@@ -70,7 +70,7 @@ function renderMessages(messages, parentIndex) {
      * @param {Object} message Message.
      * @returns {string} HTML (table row) describing a message.
      */
-    return lodash.map(messages, function(message) {
+    return lodash.map(messages, message => {
         const lineNumber = message.line || 0;
         const columnNumber = message.column || 0;
 
@@ -91,15 +91,13 @@ function renderMessages(messages, parentIndex) {
  * @returns {string} HTML string describing the results.
  */
 function renderResults(results) {
-    return lodash.map(results, function(result, index) {
-        return resultTemplate({
-            index,
-            color: renderColor(result.errorCount, result.warningCount),
-            filePath: result.filePath,
-            summary: renderSummary(result.errorCount, result.warningCount)
-
-        }) + renderMessages(result.messages, index);
-    }).join("\n");
+    return lodash.map(results, (result, index) => resultTemplate({
+        index,
+        color: renderColor(result.errorCount, result.warningCount),
+        filePath: result.filePath,
+        summary: renderSummary(result.errorCount, result.warningCount)
+
+    }) + renderMessages(result.messages, index)).join("\n");
 }
 
 //------------------------------------------------------------------------------
@@ -114,7 +112,7 @@ module.exports = function(results) {
     totalWarnings = 0;
 
     // Iterate over results to get totals
-    results.forEach(function(result) {
+    results.forEach(result => {
         totalErrors += result.errorCount;
         totalWarnings += result.warningCount;
     });

package/lib/formatters/jslint-xml.js

@@ -17,12 +17,12 @@ module.exports = function(results) {
     output += "<?xml version=\"1.0\" encoding=\"utf-8\"?>";
     output += "<jslint>";
 
-    results.forEach(function(result) {
+    results.forEach(result => {
         const messages = result.messages;
 
         output += `<file name="${result.filePath}">`;
 
-        messages.forEach(function(message) {
+        messages.forEach(message => {
             output += [
                 `<issue line="${message.line}"`,
                 `char="${message.column}"`,

package/lib/formatters/junit.js

@@ -35,7 +35,7 @@ module.exports = function(results) {
     output += "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n";
     output += "<testsuites>\n";
 
-    results.forEach(function(result) {
+    results.forEach(result => {
 
         const messages = result.messages;
 
@@ -43,7 +43,7 @@ module.exports = function(results) {
             output += `<testsuite package="org.eslint" time="0" tests="${messages.length}" errors="${messages.length}" name="${result.filePath}">\n`;
         }
 
-        messages.forEach(function(message) {
+        messages.forEach(message => {
             const type = message.fatal ? "error" : "failure";
 
             output += `<testcase time="0" name="org.eslint.${message.ruleId || "unknown"}">`;

package/lib/formatters/stylish.js

@@ -33,7 +33,7 @@ module.exports = function(results) {
         warnings = 0,
         summaryColor = "yellow";
 
-    results.forEach(function(result) {
+    results.forEach(result => {
         const messages = result.messages;
 
         if (messages.length === 0) {
@@ -44,7 +44,7 @@ module.exports = function(results) {
         output += `${chalk.underline(result.filePath)}\n`;
 
         output += `${table(
-            messages.map(function(message) {
+            messages.map(message => {
                 let messageType;
 
                 if (message.fatal || message.severity === 2) {
@@ -71,11 +71,7 @@ module.exports = function(results) {
                     return chalk.stripColor(str).length;
                 }
             }
-        ).split("\n").map(function(el) {
-            return el.replace(/(\d+)\s+(\d+)/, function(m, p1, p2) {
-                return chalk.dim(`${p1}:${p2}`);
-            });
-        }).join("\n")}\n\n`;
+        ).split("\n").map(el => el.replace(/(\d+)\s+(\d+)/, (m, p1, p2) => chalk.dim(`${p1}:${p2}`))).join("\n")}\n\n`;
     });
 
     if (total > 0) {

package/lib/formatters/table.js

@@ -36,7 +36,7 @@ function drawTable(messages) {
         chalk.bold("Rule ID")
     ]);
 
-    messages.forEach(function(message) {
+    messages.forEach(message => {
         let messageType;
 
         if (message.fatal || message.severity === 2) {
@@ -92,7 +92,7 @@ function drawTable(messages) {
 function drawReport(results) {
     let files;
 
-    files = results.map(function(result) {
+    files = results.map(result => {
         if (!result.messages.length) {
             return "";
         }
@@ -100,9 +100,7 @@ function drawReport(results) {
         return `\n${result.filePath}\n\n${drawTable(result.messages)}`;
     });
 
-    files = files.filter(function(content) {
-        return content.trim();
-    });
+    files = files.filter(content => content.trim());
 
     return files.join("");
 }
@@ -120,7 +118,7 @@ module.exports = function(report) {
     errorCount = 0;
     warningCount = 0;
 
-    report.forEach(function(fileReport) {
+    report.forEach(fileReport => {
         errorCount += fileReport.errorCount;
         warningCount += fileReport.warningCount;
     });

package/lib/formatters/tap.js

@@ -44,7 +44,7 @@ function outputDiagnostics(diagnostic) {
 module.exports = function(results) {
     let output = `TAP version 13\n1..${results.length}\n`;
 
-    results.forEach(function(result, id) {
+    results.forEach((result, id) => {
         const messages = result.messages;
         let testResult = "ok";
         let diagnostics = {};
@@ -52,7 +52,7 @@ module.exports = function(results) {
         if (messages.length > 0) {
             testResult = "not ok";
 
-            messages.forEach(function(message) {
+            messages.forEach(message => {
                 const diagnostic = {
                     message: message.message,
                     severity: getMessageType(message),

package/lib/formatters/unix.js

@@ -31,13 +31,13 @@ module.exports = function(results) {
     let output = "",
         total = 0;
 
-    results.forEach(function(result) {
+    results.forEach(result => {
 
         const messages = result.messages;
 
         total += messages.length;
 
-        messages.forEach(function(message) {
+        messages.forEach(message => {
 
             output += `${result.filePath}:`;
             output += `${message.line || 0}:`;

package/lib/formatters/visualstudio.js

@@ -33,13 +33,13 @@ module.exports = function(results) {
     let output = "",
         total = 0;
 
-    results.forEach(function(result) {
+    results.forEach(result => {
 
         const messages = result.messages;
 
         total += messages.length;
 
-        messages.forEach(function(message) {
+        messages.forEach(message => {
 
             output += result.filePath;
             output += `(${message.line || 0}`;

package/lib/load-rules.js

@@ -31,7 +31,7 @@ module.exports = function(rulesDir, cwd) {
 
     const rules = Object.create(null);
 
-    fs.readdirSync(rulesDir).forEach(function(file) {
+    fs.readdirSync(rulesDir).forEach(file => {
         if (path.extname(file) !== ".js") {
             return;
         }

package/lib/rules/arrow-body-style.js

@@ -124,7 +124,7 @@ module.exports = {
                              */
                             return fixer.replaceText(
                                 arrowBody,
-                                (textBeforeReturn + textBetweenReturnAndValue).replace(/^ *$/, "") + returnValueText + (textAfterValue + textAfterReturnStatement).replace(/^ *$/, "")
+                                (textBeforeReturn + textBetweenReturnAndValue).replace(/^\s*$/, "") + returnValueText + (textAfterValue + textAfterReturnStatement).replace(/^\s*$/, "")
                             );
                         }
                     });

package/lib/rules/arrow-parens.js

@@ -58,7 +58,9 @@ module.exports = {
                 requireForBlockBody &&
                 node.params.length === 1 &&
                 node.params[0].type === "Identifier" &&
-                node.body.type !== "BlockStatement"
+                !node.params[0].typeAnnotation &&
+                node.body.type !== "BlockStatement" &&
+                !node.returnType
             ) {
                 if (token.type === "Punctuator" && token.value === "(") {
                     context.report({
@@ -95,7 +97,12 @@ module.exports = {
             }
 
             // "as-needed": x => x
-            if (asNeeded && node.params.length === 1 && node.params[0].type === "Identifier") {
+            if (asNeeded &&
+                node.params.length === 1 &&
+                node.params[0].type === "Identifier" &&
+                !node.params[0].typeAnnotation &&
+                !node.returnType
+            ) {
                 if (token.type === "Punctuator" && token.value === "(") {
                     context.report({
                         node,

package/lib/rules/brace-style.js

@@ -105,7 +105,7 @@ module.exports = {
             const blockProperties = arguments;
 
             return function(node) {
-                Array.prototype.forEach.call(blockProperties, function(blockProp) {
+                Array.prototype.forEach.call(blockProperties, blockProp => {
                     const block = node[blockProp];
 
                     if (!isBlock(block)) {
@@ -143,7 +143,7 @@ module.exports = {
                         });
                     }
 
-                    if (curlyTokenEnd.loc.start.line === block.body[block.body.length - 1].loc.start.line) {
+                    if (curlyTokenEnd.loc.start.line === block.body[block.body.length - 1].loc.end.line) {
                         context.report({
                             node: block.body[block.body.length - 1],
                             message: CLOSE_MESSAGE_SINGLE,