eslint 3.9.0 → 3.10.2

package/lib/testers/rule-tester.js

@@ -307,9 +307,7 @@ RuleTester.prototype = {
                 if (validateSchema.errors) {
                     throw new Error([
                         `Schema for rule ${ruleName} is invalid:`
-                    ].concat(validateSchema.errors.map(function(error) {
-                        return `\t${error.field}: ${error.message}`;
-                    })).join("\n"));
+                    ].concat(validateSchema.errors.map(error => `\t${error.field}: ${error.message}`)).join("\n"));
                 }
             }
 
@@ -321,10 +319,10 @@ RuleTester.prototype = {
              * running the rule under test.
              */
             eslint.reset();
-            eslint.on("Program", function(node) {
+            eslint.on("Program", node => {
                 beforeAST = cloneDeeplyExcludesParent(node);
 
-                eslint.on("Program:exit", function(node) {
+                eslint.on("Program:exit", node => {
                     afterAST = cloneDeeplyExcludesParent(node);
                 });
             });
@@ -448,7 +446,7 @@ RuleTester.prototype = {
                         }
 
                         if (item.errors[i].type) {
-                            assert.equal(messages[i].nodeType, item.errors[i].type, `Error type should be ${item.errors[i].type}`);
+                            assert.equal(messages[i].nodeType, item.errors[i].type, `Error type should be ${item.errors[i].type}, found ${messages[i].nodeType}`);
                         }
 
                         if (item.errors[i].hasOwnProperty("line")) {
@@ -488,18 +486,18 @@ RuleTester.prototype = {
          * This creates a mocha test suite and pipes all supplied info through
          * one of the templates above.
          */
-        RuleTester.describe(ruleName, function() {
-            RuleTester.describe("valid", function() {
-                test.valid.forEach(function(valid) {
-                    RuleTester.it(valid.code || valid, function() {
+        RuleTester.describe(ruleName, () => {
+            RuleTester.describe("valid", () => {
+                test.valid.forEach(valid => {
+                    RuleTester.it(valid.code || valid, () => {
                         testValidTemplate(ruleName, valid);
                     });
                 });
             });
 
-            RuleTester.describe("invalid", function() {
-                test.invalid.forEach(function(invalid) {
-                    RuleTester.it(invalid.code, function() {
+            RuleTester.describe("invalid", () => {
+                test.invalid.forEach(invalid => {
+                    RuleTester.it(invalid.code, () => {
                         testInvalidTemplate(ruleName, invalid);
                     });
                 });

package/lib/timing.js

@@ -54,18 +54,16 @@ const ALIGN = [alignLeft, alignRight, alignRight];
 function display(data) {
     let total = 0;
     const rows = Object.keys(data)
-        .map(function(key) {
+        .map(key => {
             const time = data[key];
 
             total += time;
             return [key, time];
         })
-        .sort(function(a, b) {
-            return b[1] - a[1];
-        })
+        .sort((a, b) => b[1] - a[1])
         .slice(0, 10);
 
-    rows.forEach(function(row) {
+    rows.forEach(row => {
         row.push(`${(row[1] * 100 / total).toFixed(1)}%`);
         row[1] = row[1].toFixed(3);
     });
@@ -74,7 +72,7 @@ function display(data) {
 
     const widths = [];
 
-    rows.forEach(function(row) {
+    rows.forEach(row => {
         const len = row.length;
 
         for (let i = 0; i < len; i++) {
@@ -86,13 +84,13 @@ function display(data) {
         }
     });
 
-    const table = rows.map(function(row) {
-        return row.map(function(cell, index) {
-            return ALIGN[index](cell, widths[index]);
-        }).join(" | ");
-    });
+    const table = rows.map(row =>
+        row
+            .map((cell, index) => ALIGN[index](cell, widths[index]))
+            .join(" | ")
+    );
 
-    table.splice(1, 0, widths.map(function(w, index) {
+    table.splice(1, 0, widths.map((w, index) => {
         if (index !== 0 && index !== widths.length - 1) {
             w++;
         }
@@ -130,7 +128,7 @@ module.exports = (function() {
     }
 
     if (enabled) {
-        process.on("exit", function() {
+        process.on("exit", () => {
             display(data);
         });
     }

package/lib/util/comment-event-generator.js

@@ -20,7 +20,7 @@
  */
 function emitComments(comments, emitter, locs, eventName) {
     if (comments.length > 0) {
-        comments.forEach(function(node) {
+        comments.forEach(node => {
             const index = locs.indexOf(node.loc);
 
             if (index >= 0) {

package/lib/util/glob-util.js

@@ -43,9 +43,7 @@ function processPath(options) {
     const cwd = (options && options.cwd) || process.cwd();
     let extensions = (options && options.extensions) || [".js"];
 
-    extensions = extensions.map(function(ext) {
-        return ext.charAt(0) === "." ? ext.substr(1) : ext;
-    });
+    extensions = extensions.map(ext => ext.replace(/^\./, ""));
 
     let suffix = "/**";
 
@@ -150,7 +148,7 @@ function listFilesToProcess(globPatterns, options) {
     }
 
     debug("Creating list of files to process.");
-    globPatterns.forEach(function(pattern) {
+    globPatterns.forEach(pattern => {
         const file = path.resolve(cwd, pattern);
 
         if (shell.test("-f", file)) {
@@ -170,7 +168,7 @@ function listFilesToProcess(globPatterns, options) {
                 cwd,
             };
 
-            new GlobSync(pattern, globOptions, shouldIgnore).found.forEach(function(globMatch) {
+            new GlobSync(pattern, globOptions, shouldIgnore).found.forEach(globMatch => {
                 addFile(path.resolve(cwd, globMatch), false, ignoredPaths);
             });
         }

package/lib/util/npm-util.js

@@ -89,7 +89,7 @@ function check(packages, opt) {
     if (opt.dependencies && typeof fileJson.dependencies === "object") {
         deps = deps.concat(Object.keys(fileJson.dependencies));
     }
-    return packages.reduce(function(status, pkg) {
+    return packages.reduce((status, pkg) => {
         status[pkg] = deps.indexOf(pkg) !== -1;
         return status;
     }, {});

package/lib/util/source-code-fixer.js

@@ -72,7 +72,7 @@ SourceCodeFixer.applyFixes = function(sourceCode, messages) {
     let lastFixPos = text.length + 1,
         prefix = (sourceCode.hasBOM ? BOM : "");
 
-    messages.forEach(function(problem) {
+    messages.forEach(problem => {
         if (problem.hasOwnProperty("fix")) {
             fixes.push(problem);
         } else {
@@ -84,14 +84,12 @@ SourceCodeFixer.applyFixes = function(sourceCode, messages) {
         debug("Found fixes to apply");
 
         // sort in reverse order of occurrence
-        fixes.sort(function(a, b) {
-            return b.fix.range[1] - a.fix.range[1] || b.fix.range[0] - a.fix.range[0];
-        });
+        fixes.sort((a, b) => b.fix.range[1] - a.fix.range[1] || b.fix.range[0] - a.fix.range[0]);
 
         // split into array of characters for easier manipulation
         const chars = text.split("");
 
-        fixes.forEach(function(problem) {
+        fixes.forEach(problem => {
             const fix = problem.fix;
             let start = fix.range[0];
             const end = fix.range[1];

package/lib/util/source-code-util.js

@@ -84,14 +84,14 @@ function getSourceCodeOfFiles(patterns, options, cb) {
     debug("constructed options:", opts);
     patterns = globUtil.resolveFileGlobPatterns(patterns, opts);
 
-    const filenames = globUtil.listFilesToProcess(patterns, opts).reduce(function(files, fileInfo) {
-        return !fileInfo.ignored ? files.concat(fileInfo.filename) : files;
-    }, []);
+    const filenames = globUtil.listFilesToProcess(patterns, opts)
+        .filter(fileInfo => !fileInfo.ignored)
+        .reduce((files, fileInfo) => files.concat(fileInfo.filename), []);
 
     if (filenames.length === 0) {
         debug(`Did not find any files matching pattern(s): ${patterns}`);
     }
-    filenames.forEach(function(filename) {
+    filenames.forEach(filename => {
         const sourceCode = getSourceCodeOfFile(filename, opts);
 
         if (sourceCode) {

package/lib/util/source-code.js

@@ -117,9 +117,9 @@ function SourceCode(text, ast) {
      */
     this.lines = SourceCode.splitLines(this.text);
 
-    this.tokensAndComments = ast.tokens.concat(ast.comments).sort(function(left, right) {
-        return left.range[0] - right.range[0];
-    });
+    this.tokensAndComments = ast.tokens
+        .concat(ast.comments)
+        .sort((left, right) => left.range[0] - right.range[0]);
 
     // create token store methods
     const tokenStore = createTokenStore(ast.tokens);

package/lib/util/traverser.js

@@ -46,9 +46,7 @@ function Traverser() {
  * @private
  */
 Traverser.getKeys = function(node) {
-    return Object.keys(node).filter(function(key) {
-        return KEY_BLACKLIST.indexOf(key) === -1;
-    });
+    return Object.keys(node).filter(key => KEY_BLACKLIST.indexOf(key) === -1);
 };
 
 module.exports = Traverser;

package/lib/util/xml-escape.js

@@ -15,7 +15,7 @@
  * @private
  */
 module.exports = function(s) {
-    return (`${s}`).replace(/[<>&"'\x00-\x1F\x7F\u0080-\uFFFF]/g, function(c) { // eslint-disable-line no-control-regex
+    return (`${s}`).replace(/[<>&"'\x00-\x1F\x7F\u0080-\uFFFF]/g, c => { // eslint-disable-line no-control-regex
         switch (c) {
             case "<":
                 return "&lt;";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "3.9.0",
+  "version": "3.10.2",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -46,7 +46,7 @@
     "file-entry-cache": "^2.0.0",
     "glob": "^7.0.3",
     "globals": "^9.2.0",
-    "ignore": "^3.1.5",
+    "ignore": "^3.2.0",
     "imurmurhash": "^0.1.4",
     "inquirer": "^0.12.0",
     "is-my-json-valid": "^2.10.0",
@@ -98,7 +98,7 @@
     "load-perf": "^0.2.0",
     "markdownlint": "^0.2.0",
     "mocha": "^2.4.5",
-    "mock-fs": "3.11.0",
+    "mock-fs": "^3.12.1",
     "npm-license": "^0.3.2",
     "phantomjs-prebuilt": "^2.1.7",
     "proxyquire": "^1.7.10",