eslint 0.22.0 → 0.24.1

package/lib/util/traverse.js

@@ -1,105 +1,105 @@
-/**
- * @fileoverview Simple directory traversal logic.
- * @author Nicholas C. Zakas
- */
-
-"use strict";
-
-//------------------------------------------------------------------------------
-// Requirements
-//------------------------------------------------------------------------------
-
-var fs = require("fs"),
-    path = require("path"),
-    debug = require("debug");
-
-//------------------------------------------------------------------------------
-// Helpers
-//------------------------------------------------------------------------------
-
-debug = debug("eslint:traverse");
-
-/**
- * Walks a path recursively calling the callback on each file.
- * @param {string} name The file or directory path.
- * @param {string[]} extensions The file extensions that should cause the callback
- *      to be called.
- * @param {Function} exclude The function to check if file/path should be excluded.
- * @param {Function} callback The function to call on each file.
- * @returns {void}
- * @private
- */
-function walk(name, extensions, exclude, callback) {
-
-    var stat, basename;
-
-    stat = fs.statSync(name);
-
-    function traverse(dir, stack) {
-        stack.push(dir);
-
-        fs.readdirSync(path.join.apply(path, stack)).forEach(function(file) {
-            var filePath, fileStat;
-
-            // skip all hidded things (dirs, files, links)
-            if (file[0] === ".") {
-                return;
-            }
-
-            filePath = path.join.apply(path, stack.concat([file]));
-            fileStat = fs.statSync(filePath);
-
-            // if this file or directory is excluded from linting, skip over it.
-            if (exclude && exclude(filePath)) {
-                // console.log("Ignoring " + filePath);
-                debug("Ignoring " + filePath);
-                return;
-            }
-
-            // only call callback for files with correct extensions
-            if (fileStat.isFile() && extensions.indexOf(path.extname(filePath)) > -1) {
-                callback(filePath);
-            } else if (fileStat.isDirectory()) {
-                traverse(file, stack);
-            }
-        });
-        stack.pop();
-    }
-
-    basename = path.basename(name);
-
-    // don't ignore cases like 'eslint ./'
-    if ((basename !== "." && basename !== ".." && basename[0] === ".") ||
-        (exclude && exclude(name))) {
-
-        debug("Ignoring " + name);
-        return;
-    }
-
-    // always call callback for any files that are passed on the command line
-    if (stat.isFile()) {
-        callback(name);
-    } else {
-        traverse(name, []);
-    }
-}
-
-/**
- * Traverses multiple directories and calls a callback on each file.
- * @param {Object} options The option for the traversal.
- * param {string[]} options.files An array of file and directory paths to traverse.
- * param {Function} options.exclude The function to check if file/path should be excluded.
- * @param {Function} callback A function to call for each file.
- * @returns {void}
- */
-module.exports = function traverse(options, callback) {
-
-    var files = options.files,
-        exclude = options.exclude,
-        extensions = options.extensions;
-
-    files.forEach(function(file) {
-        walk(file, extensions, exclude, callback);
-    });
-
-};
+/**
+ * @fileoverview Simple directory traversal logic.
+ * @author Nicholas C. Zakas
+ */
+
+"use strict";
+
+//------------------------------------------------------------------------------
+// Requirements
+//------------------------------------------------------------------------------
+
+var fs = require("fs"),
+    path = require("path"),
+    debug = require("debug");
+
+//------------------------------------------------------------------------------
+// Helpers
+//------------------------------------------------------------------------------
+
+debug = debug("eslint:traverse");
+
+/**
+ * Walks a path recursively calling the callback on each file.
+ * @param {string} name The file or directory path.
+ * @param {string[]} extensions The file extensions that should cause the callback
+ *      to be called.
+ * @param {Function} exclude The function to check if file/path should be excluded.
+ * @param {Function} callback The function to call on each file.
+ * @returns {void}
+ * @private
+ */
+function walk(name, extensions, exclude, callback) {
+
+    var stat, basename;
+
+    stat = fs.statSync(name);
+
+    function traverse(dir, stack) {
+        stack.push(dir);
+
+        fs.readdirSync(path.join.apply(path, stack)).forEach(function(file) {
+            var filePath, fileStat;
+
+            // skip all hidded things (dirs, files, links)
+            if (file[0] === ".") {
+                return;
+            }
+
+            filePath = path.join.apply(path, stack.concat([file]));
+            fileStat = fs.statSync(filePath);
+
+            // if this file or directory is excluded from linting, skip over it.
+            if (exclude && exclude(filePath)) {
+                // console.log("Ignoring " + filePath);
+                debug("Ignoring " + filePath);
+                return;
+            }
+
+            // only call callback for files with correct extensions
+            if (fileStat.isFile() && extensions.indexOf(path.extname(filePath)) > -1) {
+                callback(filePath);
+            } else if (fileStat.isDirectory()) {
+                traverse(file, stack);
+            }
+        });
+        stack.pop();
+    }
+
+    basename = path.basename(name);
+
+    // don't ignore cases like 'eslint ./'
+    if ((basename !== "." && basename !== ".." && basename[0] === ".") ||
+        (exclude && exclude(name))) {
+
+        debug("Ignoring " + name);
+        return;
+    }
+
+    // always call callback for any files that are passed on the command line
+    if (stat.isFile()) {
+        callback(name);
+    } else {
+        traverse(name, []);
+    }
+}
+
+/**
+ * Traverses multiple directories and calls a callback on each file.
+ * @param {Object} options The option for the traversal.
+ * param {string[]} options.files An array of file and directory paths to traverse.
+ * param {Function} options.exclude The function to check if file/path should be excluded.
+ * @param {Function} callback A function to call for each file.
+ * @returns {void}
+ */
+module.exports = function traverse(options, callback) {
+
+    var files = options.files,
+        exclude = options.exclude,
+        extensions = options.extensions;
+
+    files.forEach(function(file) {
+        walk(file, extensions, exclude, callback);
+    });
+
+};

package/lib/util.js

@@ -1,85 +1,125 @@
-/**
- * @fileoverview Common utilities.
- */
-"use strict";
-
-//------------------------------------------------------------------------------
-// Constants
-//------------------------------------------------------------------------------
-
-var PLUGIN_NAME_PREFIX = "eslint-plugin-",
-    NAMESPACE_REGEX = /^@.*\//i;
-
-//------------------------------------------------------------------------------
-// Public Interface
-//------------------------------------------------------------------------------
-
-/**
- * Merges two config objects. This will not only add missing keys, but will also modify values to match.
- * @param {Object} base config object
- * @param {Object} custom config object. Overrides in this config object will take priority over base.
- * @returns {Object} merged config object.
- */
-exports.mergeConfigs = function mergeConfigs(base, custom) {
-
-    Object.keys(custom).forEach(function (key) {
-        var property = custom[key];
-
-        if (key === "plugins") {
-            if (!base[key]) {
-                base[key] = [];
-            }
-
-            property.forEach(function (plugin) {
-                // skip duplicates
-                if (base[key].indexOf(plugin) === -1) {
-                    base[key].push(plugin);
-                }
-            });
-            return;
-        }
-
-        if (Array.isArray(base[key]) && !Array.isArray(property) && typeof property === "number") {
-            // assume that we are just overriding first attribute
-            base[key][0] = custom[key];
-            return;
-        }
-
-        if (typeof property === "object" && !Array.isArray(property) && property !== null) {
-            // base[key] might not exist, so be careful with recursion here
-            base[key] = mergeConfigs(base[key] || {}, custom[key]);
-        } else {
-            base[key] = custom[key];
-        }
-    });
-
-    return base;
-};
-
-/**
- * Removes the prefix `eslint-plugin-` from a plugin name.
- * @param {string} pluginName The name of the plugin which may have the prefix.
- * @returns {string} The name of the plugin without prefix.
- */
-exports.removePluginPrefix = function removePluginPrefix(pluginName) {
-    return pluginName.indexOf(PLUGIN_NAME_PREFIX) === 0 ? pluginName.substring(PLUGIN_NAME_PREFIX.length) : pluginName;
-};
-
-/**
- * @param {string} pluginName The name of the plugin which may have the prefix.
- * @returns {string} The name of the plugins namepace if it has one.
- */
-exports.getNamespace = function getNamespace(pluginName) {
-    return pluginName.match(NAMESPACE_REGEX) ? pluginName.match(NAMESPACE_REGEX)[0] : "";
-};
-
-/**
- * Removes the namespace from a plugin name.
- * @param {string} pluginName The name of the plugin which may have the prefix.
- * @returns {string} The name of the plugin without the namespace.
- */
-exports.removeNameSpace = function removeNameSpace(pluginName) {
-    return pluginName.replace(NAMESPACE_REGEX, "");
-};
-
-exports.PLUGIN_NAME_PREFIX = PLUGIN_NAME_PREFIX;
+/**
+ * @fileoverview Common utilities.
+ */
+"use strict";
+
+//------------------------------------------------------------------------------
+// Constants
+//------------------------------------------------------------------------------
+
+var PLUGIN_NAME_PREFIX = "eslint-plugin-",
+    NAMESPACE_REGEX = /^@.*\//i;
+
+//------------------------------------------------------------------------------
+// Public Interface
+//------------------------------------------------------------------------------
+
+/**
+ * Merges two config objects. This will not only add missing keys, but will also modify values to match.
+ * @param {Object} target config object
+ * @param {Object} src config object. Overrides in this config object will take priority over base.
+ * @param {boolean} [combine] Whether to combine arrays or not
+ * @returns {Object} merged config object.
+ */
+exports.mergeConfigs = function deepmerge(target, src, combine) {
+    /*
+     The MIT License (MIT)
+
+     Copyright (c) 2012 Nicholas Fisher
+
+     Permission is hereby granted, free of charge, to any person obtaining a copy
+     of this software and associated documentation files (the "Software"), to deal
+     in the Software without restriction, including without limitation the rights
+     to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+     copies of the Software, and to permit persons to whom the Software is
+     furnished to do so, subject to the following conditions:
+
+     The above copyright notice and this permission notice shall be included in
+     all copies or substantial portions of the Software.
+
+     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+     IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+     FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+     AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+     LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+     OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+     THE SOFTWARE.
+     */
+    // This code is taken from deepmerge repo (https://github.com/KyleAMathews/deepmerge) and modified to meet our needs.
+    var array = Array.isArray(src) || Array.isArray(target);
+    var dst = array && [] || {};
+
+    combine = !!combine;
+    if (array) {
+        target = target || [];
+        dst = dst.concat(target);
+        if (typeof src !== "object" && !Array.isArray(src)) {
+            src = [src];
+        }
+        Object.keys(src).forEach(function(e, i) {
+            e = src[i];
+            if (typeof dst[i] === "undefined") {
+                dst[i] = e;
+            } else if (typeof e === "object") {
+                dst[i] = deepmerge(target[i], e);
+            } else {
+                if (!combine) {
+                    dst[i] = e;
+                } else {
+                    if (dst.indexOf(e) === -1) {
+                        dst.push(e);
+                    }
+                }
+            }
+        });
+    } else {
+        if (target && typeof target === "object") {
+            Object.keys(target).forEach(function (key) {
+                dst[key] = target[key];
+            });
+        }
+        Object.keys(src).forEach(function (key) {
+            if (Array.isArray(src[key]) || Array.isArray(target[key])) {
+                dst[key] = deepmerge(target[key], src[key], key === "plugins");
+            } else if (typeof src[key] !== "object" || !src[key]) {
+                dst[key] = src[key];
+            } else {
+                if (!target[key]) {
+                    dst[key] = src[key];
+                } else {
+                    dst[key] = deepmerge(target[key], src[key]);
+                }
+            }
+        });
+    }
+
+    return dst;
+};
+
+/**
+ * Removes the prefix `eslint-plugin-` from a plugin name.
+ * @param {string} pluginName The name of the plugin which may have the prefix.
+ * @returns {string} The name of the plugin without prefix.
+ */
+exports.removePluginPrefix = function removePluginPrefix(pluginName) {
+    return pluginName.indexOf(PLUGIN_NAME_PREFIX) === 0 ? pluginName.substring(PLUGIN_NAME_PREFIX.length) : pluginName;
+};
+
+/**
+ * @param {string} pluginName The name of the plugin which may have the prefix.
+ * @returns {string} The name of the plugins namepace if it has one.
+ */
+exports.getNamespace = function getNamespace(pluginName) {
+    return pluginName.match(NAMESPACE_REGEX) ? pluginName.match(NAMESPACE_REGEX)[0] : "";
+};
+
+/**
+ * Removes the namespace from a plugin name.
+ * @param {string} pluginName The name of the plugin which may have the prefix.
+ * @returns {string} The name of the plugin without the namespace.
+ */
+exports.removeNameSpace = function removeNameSpace(pluginName) {
+    return pluginName.replace(NAMESPACE_REGEX, "");
+};
+
+exports.PLUGIN_NAME_PREFIX = PLUGIN_NAME_PREFIX;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "0.22.0",
+  "version": "0.24.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -41,9 +41,9 @@
     "escape-string-regexp": "^1.0.2",
     "escope": "^3.1.0",
     "espree": "^2.0.1",
-    "estraverse": "^2.0.0",
+    "estraverse": "^4.1.0",
     "estraverse-fb": "^1.3.1",
-    "globals": "^6.1.0",
+    "globals": "^8.0.0",
     "inquirer": "^0.8.2",
     "is-my-json-valid": "^2.10.0",
     "js-yaml": "^3.2.5",
@@ -64,13 +64,13 @@
     "chai": "^1.9.1",
     "coveralls": "2.11.2",
     "dateformat": "^1.0.8",
-    "eslint-tester": "^0.7.0",
+    "eslint-tester": "^0.8.1",
     "esprima-fb": "^10001.1.0-dev-harmony-fb",
     "gh-got": "^1.0.3",
     "istanbul": "^0.3.5",
     "jsdoc": "^3.3.0-beta1",
     "jsonlint": "^1.6.2",
-    "markdownlint": "^0.0.5",
+    "markdownlint": "^0.0.6",
     "mocha": "^2.1.0",
     "mocha-phantomjs": "^3.5.0",
     "npm-license": "^0.2.3",
@@ -79,7 +79,7 @@
     "semver": "^4.1.0",
     "shelljs": "^0.3.0",
     "shelljs-nodecli": "~0.1.0",
-    "sinon": "^1.12.2",
+    "sinon": "1.14.1",
     "through": "^2.3.6"
   },
   "keywords": [