eslint 1.9.0 → 1.10.3

package/lib/rules/vars-on-top.js

@@ -100,8 +100,8 @@ module.exports = function(context) {
             var parent = ancestors.pop();
             var grandParent = ancestors.pop();
 
-            if (node.kind === "var") {// check variable is `var` type and not `let` or `const`
-                if (parent.type === "Program") {// That means its a global variable
+            if (node.kind === "var") { // check variable is `var` type and not `let` or `const`
+                if (parent.type === "Program") { // That means its a global variable
                     globalVarCheck(node, parent);
                 } else {
                     blockScopeVarCheck(node, parent, grandParent);

package/lib/testers/rule-tester.js

@@ -53,9 +53,10 @@ var assert = require("assert"),
     merge = require("lodash.merge"),
     omit = require("lodash.omit"),
     clone = require("lodash.clonedeep"),
-    validator = require("../config-validator"),
+    validator = require("../config/config-validator"),
     validate = require("is-my-json-valid"),
     eslint = require("../eslint"),
+    rules = require("../rules"),
     metaSchema = require("../../conf/json-schema-schema.json"),
     SourceCodeFixer = require("../util/source-code-fixer");
 
@@ -106,6 +107,27 @@ function cloneDeeplyExcludesParent(x) {
     return x;
 }
 
+/**
+ * Freezes a given value deeply.
+ *
+ * @param {any} x - A value to freeze.
+ * @returns {void}
+ */
+function freezeDeeply(x) {
+    if (typeof x === "object" && x !== null) {
+        if (Array.isArray(x)) {
+            x.forEach(freezeDeeply);
+        } else {
+            for (var key in x) {
+                if (key !== "parent" && hasOwnProperty(x, key)) {
+                    freezeDeeply(x[key]);
+                }
+            }
+        }
+        Object.freeze(x);
+    }
+}
+
 //------------------------------------------------------------------------------
 // Public Interface
 //------------------------------------------------------------------------------
@@ -251,7 +273,8 @@ RuleTester.prototype = {
 
             validator.validate(config, "rule-tester");
 
-            // To cache AST.
+            // Setup AST getters.
+            // To check whether or not AST was not modified in verify.
             eslint.reset();
             eslint.on("Program", function(node) {
                 beforeAST = cloneDeeplyExcludesParent(node);
@@ -261,11 +284,29 @@ RuleTester.prototype = {
                 });
             });
 
-            return {
-                messages: eslint.verify(code, config, filename, true),
-                beforeAST: beforeAST,
-                afterAST: afterAST
-            };
+            // Freezes rule-context properties.
+            var originalGet = rules.get;
+            try {
+                rules.get = function(ruleId) {
+                    var rule = originalGet(ruleId);
+                    return function(context) {
+                        Object.freeze(context);
+                        freezeDeeply(context.options);
+                        freezeDeeply(context.settings);
+                        freezeDeeply(context.ecmaFeatures);
+
+                        return rule(context);
+                    };
+                };
+
+                return {
+                    messages: eslint.verify(code, config, filename, true),
+                    beforeAST: beforeAST,
+                    afterAST: afterAST
+                };
+            } finally {
+                rules.get = originalGet;
+            }
         }
 
         /**

package/lib/util/source-code.js

@@ -125,6 +125,10 @@ function SourceCode(text, ast) {
         this[methodName] = tokenStore[methodName];
     }, this);
 
+    var tokensAndCommentsStore = createTokenStore(this.tokensAndComments);
+    this.getTokenOrCommentBefore = tokensAndCommentsStore.getTokenBefore;
+    this.getTokenOrCommentAfter = tokensAndCommentsStore.getTokenAfter;
+
     // don't allow modification of this object
     Object.freeze(this);
     Object.freeze(this.lines);

package/lib/util.js

@@ -14,97 +14,6 @@ var PLUGIN_NAME_PREFIX = "eslint-plugin-",
 // 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
- * @param {boolean} [isRule] Whether its a rule
- * @returns {Object} merged config object.
- */
-function deepmerge(target, src, combine, isRule) {
-    /*
-     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;
-    isRule = !!isRule;
-    if (array) {
-        target = target || [];
-        if (isRule && src.length > 1) {
-            dst = dst.concat(src);
-        } else {
-            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") {
-                if (isRule) {
-                    dst[i] = e;
-                } else {
-                    dst[i] = deepmerge(target[i], e, combine, isRule);
-                }
-            } 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", isRule);
-            } 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], combine, key === "rules");
-                }
-            }
-        });
-    }
-
-    return dst;
-}
 
 /**
  * Removes the prefix `eslint-plugin-` from a plugin name.
@@ -133,7 +42,6 @@ function removeNameSpace(pluginName) {
 }
 
 module.exports = {
-    mergeConfigs: deepmerge,
     removePluginPrefix: removePluginPrefix,
     getNamespace: getNamespace,
     removeNameSpace: removeNameSpace,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "1.9.0",
+  "version": "1.10.3",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -38,9 +38,9 @@
     "chalk": "^1.0.0",
     "concat-stream": "^1.4.6",
     "debug": "^2.1.1",
-    "doctrine": "^0.7.0",
+    "doctrine": "^0.7.1",
     "escape-string-regexp": "^1.0.2",
-    "escope": "^3.2.0",
+    "escope": "^3.3.0",
     "espree": "^2.2.4",
     "estraverse": "^4.1.1",
     "estraverse-fb": "^1.3.1",
@@ -52,7 +52,7 @@
     "inquirer": "^0.11.0",
     "is-my-json-valid": "^2.10.0",
     "is-resolvable": "^1.0.0",
-    "js-yaml": "^3.2.5",
+    "js-yaml": "3.4.5",
     "json-stable-stringify": "^1.0.0",
     "lodash.clonedeep": "^3.0.1",
     "lodash.merge": "^3.3.2",
@@ -66,8 +66,6 @@
     "shelljs": "^0.5.3",
     "strip-json-comments": "~1.0.1",
     "text-table": "~0.2.0",
-    "to-double-quotes": "^2.0.0",
-    "to-single-quotes": "^2.0.0",
     "user-home": "^2.0.0",
     "xml-escape": "~1.0.0"
   },

package/lib/config-initializer.js

@@ -1,146 +0,0 @@
-/**
- * @fileoverview Config initialization wizard.
- * @author Ilya Volodin
- * @copyright 2015 Ilya Volodin. All rights reserved.
- */
-
-"use strict";
-
-var exec = require("child_process").exec,
-    fs = require("fs"),
-    inquirer = require("inquirer"),
-    yaml = require("js-yaml");
-
-/* istanbul ignore next: hard to test fs function */
-/**
- * Create .eslintrc file in the current working directory
- * @param {object} config object that contains user's answers
- * @param {bool} isJson should config file be json or yaml
- * @param {function} callback function to call once the file is written.
- * @returns {void}
- */
-function writeFile(config, isJson, callback) {
-    try {
-        fs.writeFileSync("./.eslintrc", isJson ? JSON.stringify(config, null, 4) : yaml.safeDump(config));
-    } catch (e) {
-        callback(e);
-        return;
-    }
-    if (config.plugins && config.plugins.indexOf("react") >= 0) {
-        exec("npm i eslint-plugin-react --save-dev", callback);
-        return;
-    }
-    callback();
-}
-
-/**
- * process user's answers and create config object
- * @param {object} answers answers received from inquirer
- * @returns {object} config object
- */
-function processAnswers(answers) {
-    var config = {rules: {}, env: {}, extends: "eslint:recommended"};
-    config.rules.indent = [2, answers.indent];
-    config.rules.quotes = [2, answers.quotes];
-    config.rules["linebreak-style"] = [2, answers.linebreak];
-    config.rules.semi = [2, answers.semi ? "always" : "never"];
-    if (answers.es6) {
-        config.env.es6 = true;
-    }
-    answers.env.forEach(function(env) {
-        config.env[env] = true;
-    });
-    if (answers.jsx) {
-        config.ecmaFeatures = {jsx: true};
-        if (answers.react) {
-            config.plugins = ["react"];
-            config.ecmaFeatures.experimentalObjectRestSpread = true;
-        }
-    }
-    return config;
-}
-
-/* istanbul ignore next: no need to test inquirer*/
-/**
- * Ask use a few questions on command prompt
- * @param {function} callback callback function when file has been written
- * @returns {void}
- */
-function promptUser(callback) {
-    inquirer.prompt([
-        {
-            type: "list",
-            name: "indent",
-            message: "What style of indentation do you use?",
-            default: "tabs",
-            choices: [{name: "Tabs", value: "tab"}, {name: "Spaces", value: 4}]
-        },
-        {
-            type: "list",
-            name: "quotes",
-            message: "What quotes do you use for strings?",
-            default: "double",
-            choices: [{name: "Double", value: "double"}, {name: "Single", value: "single"}]
-        },
-        {
-            type: "list",
-            name: "linebreak",
-            message: "What line endings do you use?",
-            default: "unix",
-            choices: [{name: "Unix", value: "unix"}, {name: "Windows", value: "windows"}]
-        },
-        {
-            type: "confirm",
-            name: "semi",
-            message: "Do you require semicolons?",
-            default: true
-        },
-        {
-            type: "confirm",
-            name: "es6",
-            message: "Are you using ECMAScript 6 features?",
-            default: false
-        },
-        {
-            type: "checkbox",
-            name: "env",
-            message: "Where will your code run?",
-            default: ["browser"],
-            choices: [{name: "Node", value: "node"}, {name: "Browser", value: "browser"}]
-        },
-        {
-            type: "confirm",
-            name: "jsx",
-            message: "Do you use JSX?",
-            default: false
-        },
-        {
-            type: "confirm",
-            name: "react",
-            message: "Do you use React",
-            default: false,
-            when: function(answers) {
-                return answers.jsx;
-            }
-        },
-        {
-            type: "list",
-            name: "format",
-            message: "What format do you want your config file to be in?",
-            default: "JSON",
-            choices: ["JSON", "YAML"]
-        }
-    ], function(answers) {
-        var config = processAnswers(answers);
-        writeFile(config, answers.format === "JSON", callback);
-    });
-}
-
-var init = {
-    processAnswers: processAnswers,
-    initializeConfig: /* istanbul ignore next */ function(callback) {
-        promptUser(callback);
-    }
-};
-
-module.exports = init;