eslint 0.24.0 → 0.24.1

package/lib/eslint.js

@@ -240,7 +240,7 @@ function enableReporting(reportingConfig, start, rulesToEnable) {
  * @param {Object} config The existing configuration data.
  * @param {Object[]} reportingConfig The existing reporting configuration data.
  * @param {Object[]} messages The messages queue.
- * @returns {void}
+ * @returns {object} Modified config object
  */
 function modifyConfigsFromComments(filename, ast, config, reportingConfig, messages) {
 
@@ -302,12 +302,12 @@ function modifyConfigsFromComments(filename, ast, config, reportingConfig, messa
     // apply environment configs
     Object.keys(commentConfig.env).forEach(function (name) {
         if (environments[name]) {
-            util.mergeConfigs(commentConfig, environments[name]);
+            commentConfig = util.mergeConfigs(commentConfig, environments[name]);
         }
     });
     assign(commentConfig.rules, commentRules);
 
-    util.mergeConfigs(config, commentConfig);
+    return util.mergeConfigs(config, commentConfig);
 }
 
 /**
@@ -611,7 +611,7 @@ module.exports = (function() {
             currentAST = ast;
 
             // parse global comments and modify config
-            modifyConfigsFromComments(filename, ast, config, reportingConfig, messages);
+            config = modifyConfigsFromComments(filename, ast, config, reportingConfig, messages);
 
             // enable appropriate rules
             Object.keys(config.rules).filter(function(key) {
@@ -908,7 +908,7 @@ module.exports = (function() {
             case "ArrowFunctionExpression":
             case "FunctionExpression":
 
-                if (parent.type !== "CallExpression" || parent.callee !== node) {
+                if (parent.type !== "CallExpression") {
                     while (parent && !parent.leadingComments && !/Function/.test(parent.type)) {
                         parent = parent.parent;
                     }

package/lib/rules/block-scoped-var.js

@@ -1,6 +1,7 @@
 /**
  * @fileoverview Rule to check for "block scoped" variables by binding context
  * @author Matt DuVall <http://www.mattduvall.com>
+ * @copyright 2015 Mathieu M-Gosselin. All rights reserved.
  */
 "use strict";
 
@@ -101,6 +102,22 @@ module.exports = function(context) {
         }
     }
 
+    /**
+     * Declares all relevant identifiers for module exports.
+     * @param {ASTNode} node The AST node representing an export.
+     * @returns {void}
+     * @private
+     */
+    function declareExports(node) {
+        if (node.exported && node.exported.name) {
+            declare([node.exported.name]);
+
+            if (node.local) {
+                declare([node.local.name]);
+            }
+        }
+    }
+
     /**
      * Declares all relevant identifiers for classes.
      * @param {ASTNode} node The AST node representing a class.
@@ -241,6 +258,8 @@ module.exports = function(context) {
         "ImportDefaultSpecifier": declareImports,
         "ImportNamespaceSpecifier": declareImports,
 
+        "ExportSpecifier": declareExports,
+
         "BlockStatement": function(node) {
             var statements = node.body;
             pushScope();

package/lib/rules/comma-dangle.js

@@ -54,7 +54,9 @@ module.exports = function (context) {
 
     return {
         "ObjectExpression": checkForTrailingComma,
-        "ArrayExpression": checkForTrailingComma
+        "ObjectPattern": checkForTrailingComma,
+        "ArrayExpression": checkForTrailingComma,
+        "ArrayPattern": checkForTrailingComma
     };
 };
 

package/lib/rules/lines-around-comment.js

@@ -1,7 +1,9 @@
 /**
  * @fileoverview Enforces empty lines around comments.
  * @author Jamund Ferguson
+ * @copyright 2015 Mathieu M-Gosselin. All rights reserved.
  * @copyright 2015 Jamund Ferguson. All rights reserved.
+ * @copyright 2015 Gyandeep Singh. All rights reserved.
  */
 "use strict";
 
@@ -97,7 +99,8 @@ module.exports = function(context) {
         if (ancestors.length) {
             parent = ancestors.pop();
         }
-        return parent && (parent.type === "BlockStatement" || parent.body.type === "BlockStatement") &&
+
+        return parent && (parent.type === "ClassBody" || parent.type === "BlockStatement" || (parent.body && parent.body.type === "BlockStatement")) &&
                 node.loc.start.line - parent.loc.start.line === 1;
     }
 
@@ -113,7 +116,8 @@ module.exports = function(context) {
         if (ancestors.length) {
             parent = ancestors.pop();
         }
-        return parent && (parent.type === "BlockStatement" || parent.body.type === "BlockStatement") &&
+
+        return parent && (parent.type === "ClassBody" || parent.type === "BlockStatement" || (parent.body && parent.body.type === "BlockStatement")) &&
                 parent.loc.end.line - node.loc.end.line === 1;
     }
 

package/lib/rules/max-len.js

@@ -48,7 +48,7 @@ module.exports = function(context) {
         // Iterate
         lines.forEach(function(line, i) {
             if (line.replace(/\t/g, tabString).length > maxLength) {
-                context.report(node, { line: i + 1, col: 1 }, "Line " + (i + 1) + " exceeds the maximum line length of " + maxLength + ".");
+                context.report(node, { line: i + 1, column: 0 }, "Line " + (i + 1) + " exceeds the maximum line length of " + maxLength + ".");
             }
         });
     }

package/lib/rules/no-implied-eval.js

@@ -12,7 +12,7 @@
 //------------------------------------------------------------------------------
 
 module.exports = function(context) {
-    var IMPLIED_EVAL = /set(?:Timeout|Interval)/;
+    var IMPLIED_EVAL = /set(?:Timeout|Interval)|execScript/;
 
     //--------------------------------------------------------------------------
     // Helpers

package/lib/rules/no-redeclare.js

@@ -44,7 +44,7 @@ module.exports = function(context) {
         findVariablesInScope(scope);
 
         // globalReturn means one extra scope to check
-        if (node.type === "Program" && context.ecmaFeatures.globalReturn) {
+        if (node.type === "Program" && (context.ecmaFeatures.globalReturn || context.ecmaFeatures.modules)) {
             findVariablesInScope(scope.childScopes[0]);
         }
     }

package/lib/rules/object-shorthand.js

@@ -44,7 +44,8 @@ module.exports = function(context) {
                 return;
             }
 
-            if (node.kind === "get" || node.kind === "set") {
+            // getters, setters and computed properties are ignored
+            if (node.kind === "get" || node.kind === "set" || node.computed) {
                 return;
             }
 

package/lib/rules/yoda.js

@@ -197,6 +197,7 @@ module.exports = function (context) {
             // Comparisons must always be yoda-style: if ("blue" === color)
             if (
                 (node.right.type === "Literal" || looksLikeLiteral(node.right)) &&
+                !(node.left.type === "Literal" || looksLikeLiteral(node.left)) &&
                 !(!isEqualityOperator(node.operator) && onlyEquality) &&
                 isComparisonOperator(node.operator) &&
                 !(exceptRange && isRangeTest(context.getAncestors().pop()))
@@ -209,6 +210,7 @@ module.exports = function (context) {
             // Comparisons must never be yoda-style (default)
             if (
                 (node.left.type === "Literal" || looksLikeLiteral(node.left)) &&
+                !(node.right.type === "Literal" || looksLikeLiteral(node.right)) &&
                 !(!isEqualityOperator(node.operator) && onlyEquality) &&
                 isComparisonOperator(node.operator) &&
                 !(exceptRange && isRangeTest(context.getAncestors().pop()))

package/lib/util.js

@@ -16,44 +16,84 @@ var PLUGIN_NAME_PREFIX = "eslint-plugin-",
 
 /**
  * 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.
+ * @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 mergeConfigs(base, custom) {
+exports.mergeConfigs = function deepmerge(target, src, combine) {
+    /*
+     The MIT License (MIT)
 
-    Object.keys(custom).forEach(function (key) {
-        var property = custom[key];
+     Copyright (c) 2012 Nicholas Fisher
 
-        if (key === "plugins") {
-            if (!base[key]) {
-                base[key] = [];
-            }
+     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:
 
-            property.forEach(function (plugin) {
-                // skip duplicates
-                if (base[key].indexOf(plugin) === -1) {
-                    base[key].push(plugin);
-                }
-            });
-            return;
-        }
+     The above copyright notice and this permission notice shall be included in
+     all copies or substantial portions of the Software.
 
-        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;
-        }
+     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 && [] || {};
 
-        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];
+    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 base;
+    return dst;
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "0.24.0",
+  "version": "0.24.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {