eslint 4.18.1 → 4.18.2

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+v4.18.2 - March 2, 2018
+
+* 6b71fd0 Fix: table@4.0.2, because 4.0.3 needs "ajv": "^6.0.1" (#10022) (Mathieu Seiler)
+* 3c697de Chore: fix incorrect comment about linter.verify return value (#10030) (Teddy Katz)
+* 9df8653 Chore: refactor parser-loading out of linter.verify (#10028) (Teddy Katz)
+* f6901d0 Fix: remove catastrophic backtracking vulnerability (fixes #10002) (#10019) (Jamie Davis)
+* e4f52ce Chore: Simplify dataflow in linter.verify (#10020) (Teddy Katz)
+* 33177cd Chore: make library files non-executable (#10021) (Teddy Katz)
+* 558ccba Chore: refactor directive comment processing (#10007) (Teddy Katz)
+* 18e15d9 Chore: avoid useless catch clauses that just rethrow errors (#10010) (Teddy Katz)
+* a1c3759 Chore: refactor populating configs with defaults in linter (#10006) (Teddy Katz)
+* aea07dc Fix: Make max-len ignoreStrings ignore JSXText (fixes #9954) (#9985) (Rachael Sim)
+
 v4.18.1 - February 20, 2018
 
 * f417506 Fix: ensure no-await-in-loop reports the correct node (fixes #9992) (#9993) (Teddy Katz)

package/conf/environments.js

@@ -15,7 +15,9 @@ const globals = require("globals");
 //------------------------------------------------------------------------------
 
 module.exports = {
-    builtin: globals.es5,
+    builtin: {
+        globals: globals.es5
+    },
     browser: {
 
         /*

package/lib/linter.js

@@ -14,7 +14,6 @@ const eslintScope = require("eslint-scope"),
     levn = require("levn"),
     lodash = require("lodash"),
     blankScriptAST = require("../conf/blank-script.json"),
-    defaultConfig = require("../conf/default-config-options.js"),
     CodePathAnalyzer = require("./code-path-analysis/code-path-analyzer"),
     ConfigOps = require("./config/config-ops"),
     validator = require("./config/config-validator"),
@@ -33,6 +32,7 @@ const eslintScope = require("eslint-scope"),
 
 const debug = require("debug")("eslint:linter");
 const MAX_AUTOFIX_PASSES = 10;
+const DEFAULT_PARSER_NAME = "espree";
 
 //------------------------------------------------------------------------------
 // Typedefs
@@ -178,32 +178,12 @@ function parseListConfig(string) {
  * and any globals declared by special block comments, are present in the global
  * scope.
  * @param {Scope} globalScope The global scope.
- * @param {Object} config The existing configuration data.
- * @param {Environments} envContext Env context
+ * @param {Object} configGlobals The globals declared in configuration
+ * @param {{exportedVariables: Object, enabledGlobals: Object}} commentDirectives Directives from comment configuration
  * @returns {void}
  */
-function addDeclaredGlobals(globalScope, config, envContext) {
-    const declaredGlobals = {},
-        exportedGlobals = {},
-        explicitGlobals = {},
-        builtin = envContext.get("builtin");
-
-    Object.assign(declaredGlobals, builtin);
-
-    Object.keys(config.env).filter(name => config.env[name]).forEach(name => {
-        const env = envContext.get(name),
-            environmentGlobals = env && env.globals;
-
-        if (environmentGlobals) {
-            Object.assign(declaredGlobals, environmentGlobals);
-        }
-    });
-
-    Object.assign(exportedGlobals, config.exported);
-    Object.assign(declaredGlobals, config.globals);
-    Object.assign(explicitGlobals, config.astGlobals);
-
-    Object.keys(declaredGlobals).forEach(name => {
+function addDeclaredGlobals(globalScope, configGlobals, commentDirectives) {
+    Object.keys(configGlobals).forEach(name => {
         let variable = globalScope.set.get(name);
 
         if (!variable) {
@@ -212,24 +192,24 @@ function addDeclaredGlobals(globalScope, config, envContext) {
             globalScope.variables.push(variable);
             globalScope.set.set(name, variable);
         }
-        variable.writeable = declaredGlobals[name];
+        variable.writeable = configGlobals[name];
     });
 
-    Object.keys(explicitGlobals).forEach(name => {
+    Object.keys(commentDirectives.enabledGlobals).forEach(name => {
         let variable = globalScope.set.get(name);
 
         if (!variable) {
             variable = new eslintScope.Variable(name, globalScope);
             variable.eslintExplicitGlobal = true;
-            variable.eslintExplicitGlobalComment = explicitGlobals[name].comment;
+            variable.eslintExplicitGlobalComment = commentDirectives.enabledGlobals[name].comment;
             globalScope.variables.push(variable);
             globalScope.set.set(name, variable);
         }
-        variable.writeable = explicitGlobals[name].value;
+        variable.writeable = commentDirectives.enabledGlobals[name].value;
     });
 
     // mark all exported variables as such
-    Object.keys(exportedGlobals).forEach(name => {
+    Object.keys(commentDirectives.exportedVariables).forEach(name => {
         const variable = globalScope.set.get(name);
 
         if (variable) {
@@ -283,108 +263,90 @@ function createDisableDirectives(type, loc, value) {
  * where reporting is disabled or enabled and merges them with reporting config.
  * @param {string} filename The file being checked.
  * @param {ASTNode} ast The top node of the AST.
- * @param {Object} config The existing configuration data.
  * @param {function(string): {create: Function}} ruleMapper A map from rule IDs to defined rules
- * @returns {{config: Object, problems: Problem[], disableDirectives: DisableDirective[]}}
- * Modified config object, along with any problems encountered while parsing config comments
+ * @returns {{configuredRules: Object, enabledGlobals: Object, exportedVariables: Object, problems: Problem[], disableDirectives: DisableDirective[]}}
+ * A collection of the directive comments that were found, along with any problems that occurred when parsing
  */
-function modifyConfigsFromComments(filename, ast, config, ruleMapper) {
-
-    const commentConfig = {
-        exported: {},
-        astGlobals: {},
-        rules: {},
-        env: {}
-    };
-    const commentRules = {};
+function getDirectiveComments(filename, ast, ruleMapper) {
+    const configuredRules = {};
+    const enabledGlobals = {};
+    const exportedVariables = {};
     const problems = [];
     const disableDirectives = [];
 
     ast.comments.filter(token => token.type !== "Shebang").forEach(comment => {
+        const trimmedCommentText = comment.value.trim();
+        const match = /^(eslint(-\w+){0,3}|exported|globals?)(\s|$)/.exec(trimmedCommentText);
 
-        let value = comment.value.trim();
-        const match = /^(eslint(-\w+){0,3}|exported|globals?)(\s|$)/.exec(value);
-
-        if (match) {
-            value = value.slice(match.index + match[1].length);
-            if (comment.type === "Block") {
-                switch (match[1]) {
-                    case "exported":
-                        Object.assign(commentConfig.exported, parseBooleanConfig(value, comment));
-                        break;
-
-                    case "globals":
-                    case "global":
-                        Object.assign(commentConfig.astGlobals, parseBooleanConfig(value, comment));
-                        break;
-
-                    case "eslint-disable":
-                        [].push.apply(disableDirectives, createDisableDirectives("disable", comment.loc.start, value));
-                        break;
-
-                    case "eslint-disable-line":
-                        if (comment.loc.start.line === comment.loc.end.line) {
-                            [].push.apply(disableDirectives, createDisableDirectives("disable-line", comment.loc.start, value));
-                        }
-                        break;
-
-                    case "eslint-disable-next-line":
-                        if (comment.loc.start.line === comment.loc.end.line) {
-                            [].push.apply(disableDirectives, createDisableDirectives("disable-next-line", comment.loc.start, value));
-                        }
-                        break;
-
-                    case "eslint-enable":
-                        [].push.apply(disableDirectives, createDisableDirectives("enable", comment.loc.start, value));
-                        break;
-
-                    case "eslint": {
-                        const parseResult = parseJsonConfig(value, comment.loc);
-
-                        if (parseResult.success) {
-                            Object.keys(parseResult.config).forEach(name => {
-                                const ruleValue = parseResult.config[name];
-
-                                try {
-                                    validator.validateRuleOptions(ruleMapper(name), name, ruleValue);
-                                } catch (err) {
-                                    problems.push({
-                                        ruleId: name,
-                                        severity: 2,
-                                        source: null,
-                                        message: err.message,
-                                        line: comment.loc.start.line,
-                                        column: comment.loc.start.column + 1,
-                                        endLine: comment.loc.end.line,
-                                        endColumn: comment.loc.end.column + 1,
-                                        nodeType: null
-                                    });
-                                }
-                                commentRules[name] = ruleValue;
-                            });
-                        } else {
-                            problems.push(parseResult.error);
-                        }
+        if (!match) {
+            return;
+        }
 
-                        break;
+        const directiveValue = trimmedCommentText.slice(match.index + match[1].length);
+
+        if (/^eslint-disable-(next-)?line$/.test(match[1]) && comment.loc.start.line === comment.loc.end.line) {
+            const directiveType = match[1].slice("eslint-".length);
+
+            [].push.apply(disableDirectives, createDisableDirectives(directiveType, comment.loc.start, directiveValue));
+        } else if (comment.type === "Block") {
+            switch (match[1]) {
+                case "exported":
+                    Object.assign(exportedVariables, parseBooleanConfig(directiveValue, comment));
+                    break;
+
+                case "globals":
+                case "global":
+                    Object.assign(enabledGlobals, parseBooleanConfig(directiveValue, comment));
+                    break;
+
+                case "eslint-disable":
+                    [].push.apply(disableDirectives, createDisableDirectives("disable", comment.loc.start, directiveValue));
+                    break;
+
+                case "eslint-enable":
+                    [].push.apply(disableDirectives, createDisableDirectives("enable", comment.loc.start, directiveValue));
+                    break;
+
+                case "eslint": {
+                    const parseResult = parseJsonConfig(directiveValue, comment.loc);
+
+                    if (parseResult.success) {
+                        Object.keys(parseResult.config).forEach(name => {
+                            const ruleValue = parseResult.config[name];
+
+                            try {
+                                validator.validateRuleOptions(ruleMapper(name), name, ruleValue);
+                            } catch (err) {
+                                problems.push({
+                                    ruleId: name,
+                                    severity: 2,
+                                    source: null,
+                                    message: err.message,
+                                    line: comment.loc.start.line,
+                                    column: comment.loc.start.column + 1,
+                                    endLine: comment.loc.end.line,
+                                    endColumn: comment.loc.end.column + 1,
+                                    nodeType: null
+                                });
+                            }
+                            configuredRules[name] = ruleValue;
+                        });
+                    } else {
+                        problems.push(parseResult.error);
                     }
 
-                    // no default
-                }
-            } else { // comment.type === "Line"
-                if (match[1] === "eslint-disable-line") {
-                    [].push.apply(disableDirectives, createDisableDirectives("disable-line", comment.loc.start, value));
-                } else if (match[1] === "eslint-disable-next-line") {
-                    [].push.apply(disableDirectives, createDisableDirectives("disable-next-line", comment.loc.start, value));
+                    break;
                 }
+
+                // no default
             }
         }
     });
 
-    Object.assign(commentConfig.rules, commentRules);
-
     return {
-        config: ConfigOps.merge(config, commentConfig),
+        configuredRules,
+        enabledGlobals,
+        exportedVariables,
         problems,
         disableDirectives
     };
@@ -414,81 +376,81 @@ function normalizeEcmaVersion(ecmaVersion, isModule) {
     return ecmaVersion;
 }
 
+const eslintEnvPattern = /\/\*\s*eslint-env\s(.+?)\*\//g;
+
 /**
- * Process initial config to make it safe to extend by file comment config
- * @param  {Object} config Initial config
- * @param  {Environments} envContext Env context
- * @returns {Object}        Processed config
+ * Checks whether or not there is a comment which has "eslint-env *" in a given text.
+ * @param {string} text - A source code text to check.
+ * @returns {Object|null} A result of parseListConfig() with "eslint-env *" comment.
  */
-function prepareConfig(config, envContext) {
-    config.globals = config.globals || {};
-    const copiedRules = {};
-    let parserOptions = {};
+function findEslintEnv(text) {
+    let match, retv;
 
-    if (typeof config.rules === "object") {
-        Object.keys(config.rules).forEach(k => {
-            const rule = config.rules[k];
+    eslintEnvPattern.lastIndex = 0;
 
-            if (rule === null) {
-                throw new Error(`Invalid config for rule '${k}'.`);
-            }
-            if (Array.isArray(rule)) {
-                copiedRules[k] = rule.slice();
-            } else {
-                copiedRules[k] = rule;
-            }
-        });
+    while ((match = eslintEnvPattern.exec(text))) {
+        retv = Object.assign(retv || {}, parseListConfig(match[1]));
     }
 
-    // merge in environment parserOptions
-    if (typeof config.env === "object") {
-        Object.keys(config.env).forEach(envName => {
-            const env = envContext.get(envName);
+    return retv;
+}
 
-            if (config.env[envName] && env && env.parserOptions) {
-                parserOptions = ConfigOps.merge(parserOptions, env.parserOptions);
-            }
-        });
-    }
+/**
+ * Normalizes the possible options for `linter.verify` and `linter.verifyAndFix` to a
+ * consistent shape.
+ * @param {(string|{reportUnusedDisableDirectives: boolean, filename: string, allowInlineConfig: boolean})} providedOptions Options
+ * @returns {{reportUnusedDisableDirectives: boolean, filename: string, allowInlineConfig: boolean}} Normalized options
+ */
+function normalizeVerifyOptions(providedOptions) {
+    const isObjectOptions = typeof providedOptions === "object";
+    const providedFilename = isObjectOptions ? providedOptions.filename : providedOptions;
 
-    const preparedConfig = {
-        rules: copiedRules,
-        parser: config.parser || defaultConfig.parser,
-        globals: ConfigOps.merge(defaultConfig.globals, config.globals),
-        env: ConfigOps.merge(defaultConfig.env, config.env || {}),
-        settings: ConfigOps.merge(defaultConfig.settings, config.settings || {}),
-        parserOptions: ConfigOps.merge(parserOptions, config.parserOptions || {})
+    return {
+        filename: typeof providedFilename === "string" ? providedFilename : "<input>",
+        allowInlineConfig: !isObjectOptions || providedOptions.allowInlineConfig !== false,
+        reportUnusedDisableDirectives: isObjectOptions && !!providedOptions.reportUnusedDisableDirectives
     };
-    const isModule = preparedConfig.parserOptions.sourceType === "module";
+}
+
+/**
+ * Combines the provided parserOptions with the options from environments
+ * @param {Object} providedOptions The provided 'parserOptions' key in a config
+ * @param {Environment[]} enabledEnvironments The environments enabled in configuration and with inline comments
+ * @returns {Object} Resulting parser options after merge
+ */
+function resolveParserOptions(providedOptions, enabledEnvironments) {
+    const parserOptionsFromEnv = enabledEnvironments
+        .filter(env => env.parserOptions)
+        .reduce((parserOptions, env) => ConfigOps.merge(parserOptions, env.parserOptions), {});
+
+    const mergedParserOptions = ConfigOps.merge(parserOptionsFromEnv, providedOptions || {});
+
+    const isModule = mergedParserOptions.sourceType === "module";
 
     if (isModule) {
 
         // can't have global return inside of modules
-        preparedConfig.parserOptions.ecmaFeatures = Object.assign({}, preparedConfig.parserOptions.ecmaFeatures, { globalReturn: false });
+        mergedParserOptions.ecmaFeatures = Object.assign({}, mergedParserOptions.ecmaFeatures, { globalReturn: false });
     }
 
-    preparedConfig.parserOptions.ecmaVersion = normalizeEcmaVersion(preparedConfig.parserOptions.ecmaVersion, isModule);
+    mergedParserOptions.ecmaVersion = normalizeEcmaVersion(mergedParserOptions.ecmaVersion, isModule);
 
-    return preparedConfig;
+    return mergedParserOptions;
 }
 
-const eslintEnvPattern = /\/\*\s*eslint-env\s(.+?)\*\//g;
-
 /**
- * Checks whether or not there is a comment which has "eslint-env *" in a given text.
- * @param {string} text - A source code text to check.
- * @returns {Object|null} A result of parseListConfig() with "eslint-env *" comment.
+ * Combines the provided globals object with the globals from environments
+ * @param {Object} providedGlobals The 'globals' key in a config
+ * @param {Environments[]} enabledEnvironments The environments enabled in configuration and with inline comments
+ * @returns {Object} The resolved globals object
  */
-function findEslintEnv(text) {
-    let match, retv;
-
-    eslintEnvPattern.lastIndex = 0;
-
-    while ((match = eslintEnvPattern.exec(text))) {
-        retv = Object.assign(retv || {}, parseListConfig(match[1]));
-    }
-
-    return retv;
+function resolveGlobals(providedGlobals, enabledEnvironments) {
+    return Object.assign.apply(
+        null,
+        [{}]
+            .concat(enabledEnvironments.filter(env => env.globals).map(env => env.globals))
+            .concat(providedGlobals)
+    );
 }
 
 /**
@@ -551,13 +513,16 @@ function analyzeScope(ast, parserOptions, visitorKeys) {
  * as possible
  * @param {string} text The text to parse.
  * @param {Object} providedParserOptions Options to pass to the parser
- * @param {Object} parser The parser module
+ * @param {string} parserName The name of the parser
+ * @param {Map<string, Object>} parserMap A map from names to loaded parsers
  * @param {string} filePath The path to the file being parsed.
  * @returns {{success: false, error: Problem}|{success: true, sourceCode: SourceCode}}
  * An object containing the AST and parser services if parsing was successful, or the error if parsing failed
  * @private
  */
-function parse(text, providedParserOptions, parser, filePath) {
+function parse(text, providedParserOptions, parserName, parserMap, filePath) {
+
+
     const textToParse = stripUnicodeBOM(text).replace(astUtils.SHEBANG_MATCHER, (match, captured) => `//${captured}`);
     const parserOptions = Object.assign({}, providedParserOptions, {
         loc: true,
@@ -570,6 +535,25 @@ function parse(text, providedParserOptions, parser, filePath) {
         filePath
     });
 
+    let parser;
+
+    try {
+        parser = parserMap.get(parserName) || require(parserName);
+    } catch (ex) {
+        return {
+            success: false,
+            error: {
+                ruleId: null,
+                fatal: true,
+                severity: 2,
+                source: null,
+                message: ex.message,
+                line: 0,
+                column: 0
+            }
+        };
+    }
+
     /*
      * Check for parsing errors first. If there's a parsing error, nothing
      * else can happen. However, a parsing error does not throw an error
@@ -688,6 +672,21 @@ function markVariableAsUsed(scopeManager, currentNode, parserOptions, name) {
     return false;
 }
 
+/**
+ * Runs a rule, and gets its listeners
+ * @param {Rule} rule A normalized rule with a `create` method
+ * @param {Context} ruleContext The context that should be passed to the rule
+ * @returns {Object} A map of selector listeners provided by the rule
+ */
+function createRuleListeners(rule, ruleContext) {
+    try {
+        return rule.create(ruleContext);
+    } catch (ex) {
+        ex.message = `Error while loading rule '${ruleContext.id}': ${ex.message}`;
+        throw ex;
+    }
+}
+
 // methods that exist on SourceCode object
 const DEPRECATED_SOURCECODE_PASSTHROUGHS = {
     getSource: "getText",
@@ -726,7 +725,157 @@ const BASE_TRAVERSAL_CONTEXT = Object.freeze(
     )
 );
 
+/**
+ * Runs the given rules on the given SourceCode object
+ * @param {SourceCode} sourceCode A SourceCode object for the given text
+ * @param {Object} configuredRules The rules configuration
+ * @param {function(string): Rule} ruleMapper A mapper function from rule names to rules
+ * @param {Object} parserOptions The options that were passed to the parser
+ * @param {string} parserName The name of the parser in the config
+ * @param {Object} settings The settings that were enabled in the config
+ * @param {string} filename The reported filename of the code
+ * @returns {Problem[]} An array of reported problems
+ */
+function runRules(sourceCode, configuredRules, ruleMapper, parserOptions, parserName, settings, filename) {
+    const emitter = createEmitter();
+    const traverser = new Traverser();
+
+    /*
+     * Create a frozen object with the ruleContext properties and methods that are shared by all rules.
+     * All rule contexts will inherit from this object. This avoids the performance penalty of copying all the
+     * properties once for each rule.
+     */
+    const sharedTraversalContext = Object.freeze(
+        Object.assign(
+            Object.create(BASE_TRAVERSAL_CONTEXT),
+            {
+                getAncestors: () => traverser.parents(),
+                getDeclaredVariables: sourceCode.scopeManager.getDeclaredVariables.bind(sourceCode.scopeManager),
+                getFilename: () => filename,
+                getScope: () => getScope(sourceCode.scopeManager, traverser.current(), parserOptions.ecmaVersion),
+                getSourceCode: () => sourceCode,
+                markVariableAsUsed: name => markVariableAsUsed(sourceCode.scopeManager, traverser.current(), parserOptions, name),
+                parserOptions,
+                parserPath: parserName,
+                parserServices: sourceCode.parserServices,
+                settings,
+
+                /**
+                 * This is used to avoid breaking rules that used to monkeypatch the `Linter#report` method
+                 * by using the `_linter` property on rule contexts.
+                 *
+                 * This should be removed in a major release after we create a better way to
+                 * lint for unused disable comments.
+                 * https://github.com/eslint/eslint/issues/9193
+                 */
+                _linter: {
+                    report() {},
+                    on: emitter.on
+                }
+            }
+        )
+    );
+
+
+    const lintingProblems = [];
+
+    Object.keys(configuredRules).forEach(ruleId => {
+        const severity = ConfigOps.getRuleSeverity(configuredRules[ruleId]);
+
+        if (severity === 0) {
+            return;
+        }
+
+        const rule = ruleMapper(ruleId);
+        const messageIds = rule.meta && rule.meta.messages;
+        let reportTranslator = null;
+        const ruleContext = Object.freeze(
+            Object.assign(
+                Object.create(sharedTraversalContext),
+                {
+                    id: ruleId,
+                    options: getRuleOptions(configuredRules[ruleId]),
+                    report() {
+
+                        /*
+                         * Create a report translator lazily.
+                         * In a vast majority of cases, any given rule reports zero errors on a given
+                         * piece of code. Creating a translator lazily avoids the performance cost of
+                         * creating a new translator function for each rule that usually doesn't get
+                         * called.
+                         *
+                         * Using lazy report translators improves end-to-end performance by about 3%
+                         * with Node 8.4.0.
+                         */
+                        if (reportTranslator === null) {
+                            reportTranslator = createReportTranslator({ ruleId, severity, sourceCode, messageIds });
+                        }
+                        const problem = reportTranslator.apply(null, arguments);
+
+                        if (problem.fix && rule.meta && !rule.meta.fixable) {
+                            throw new Error("Fixable rules should export a `meta.fixable` property.");
+                        }
+                        lintingProblems.push(problem);
+
+                        /*
+                         * This is used to avoid breaking rules that used monkeypatch Linter, and relied on
+                         * `linter.report` getting called with report info every time a rule reports a problem.
+                         * To continue to support this, make sure that `context._linter.report` is called every
+                         * time a problem is reported by a rule, even though `context._linter` is no longer a
+                         * `Linter` instance.
+                         *
+                         * This should be removed in a major release after we create a better way to
+                         * lint for unused disable comments.
+                         * https://github.com/eslint/eslint/issues/9193
+                         */
+                        sharedTraversalContext._linter.report( // eslint-disable-line no-underscore-dangle
+                            problem.ruleId,
+                            problem.severity,
+                            { loc: { start: { line: problem.line, column: problem.column - 1 } } },
+                            problem.message
+                        );
+                    }
+                }
+            )
+        );
+
+        const ruleListeners = createRuleListeners(rule, ruleContext);
+
+        // add all the selectors from the rule as listeners
+        Object.keys(ruleListeners).forEach(selector => {
+            emitter.on(
+                selector,
+                timing.enabled
+                    ? timing.time(ruleId, ruleListeners[selector])
+                    : ruleListeners[selector]
+            );
+        });
+    });
+
+    const eventGenerator = new CodePathAnalyzer(new NodeEventGenerator(emitter));
+
+    /*
+     * Each node has a type property. Whenever a particular type of
+     * node is found, an event is fired. This allows any listeners to
+     * automatically be informed that this type of node has been found
+     * and react accordingly.
+     */
+    traverser.traverse(sourceCode.ast, {
+        enter(node, parent) {
+            node.parent = parent;
+            eventGenerator.enterNode(node);
+        },
+        leave(node) {
+            eventGenerator.leaveNode(node);
+        },
+        visitorKeys: sourceCode.visitorKeys
+    });
+
+    return lintingProblems;
+}
+
 const lastSourceCodes = new WeakMap();
+const loadedParserMaps = new WeakMap();
 
 //------------------------------------------------------------------------------
 // Public Interface
@@ -740,10 +889,10 @@ module.exports = class Linter {
 
     constructor() {
         lastSourceCodes.set(this, null);
+        loadedParserMaps.set(this, new Map());
         this.version = pkg.version;
 
         this.rules = new Rules();
-        this._parsers = new Map();
         this.environments = new Environments();
     }
 
@@ -761,7 +910,7 @@ module.exports = class Linter {
     /**
      * Same as linter.verify, except without support for processors.
      * @param {string|SourceCode} textOrSourceCode The text to parse or a SourceCode object.
-     * @param {ESLintConfig} config An ESLintConfig instance to configure everything.
+     * @param {ESLintConfig} providedConfig An ESLintConfig instance to configure everything.
      * @param {(string|Object)} [filenameOrOptions] The optional filename of the file being checked.
      *      If this is not set, the filename will default to '<input>' in the rule context. If
      *      an object, then it has "filename", "saveState", and "allowInlineConfig" properties.
@@ -769,23 +918,14 @@ module.exports = class Linter {
      *      Useful if you want to validate JS without comments overriding rules.
      * @param {boolean} [filenameOrOptions.reportUnusedDisableDirectives=false] Adds reported errors for unused
      *      eslint-disable directives
-     * @returns {Object[]} The results as an array of messages or null if no messages.
+     * @returns {Object[]} The results as an array of messages or an empty array if no messages.
      */
-    _verifyWithoutProcessors(textOrSourceCode, config, filenameOrOptions) {
-        let text,
-            allowInlineConfig,
-            providedFilename,
-            reportUnusedDisableDirectives;
+    _verifyWithoutProcessors(textOrSourceCode, providedConfig, filenameOrOptions) {
+        const config = providedConfig || {};
+        const options = normalizeVerifyOptions(filenameOrOptions);
+        let text;
 
         // evaluate arguments
-        if (typeof filenameOrOptions === "object") {
-            providedFilename = filenameOrOptions.filename;
-            allowInlineConfig = filenameOrOptions.allowInlineConfig;
-            reportUnusedDisableDirectives = filenameOrOptions.reportUnusedDisableDirectives;
-        } else {
-            providedFilename = filenameOrOptions;
-        }
-
         if (typeof textOrSourceCode === "string") {
             lastSourceCodes.set(this, null);
             text = textOrSourceCode;
@@ -794,23 +934,18 @@ module.exports = class Linter {
             text = textOrSourceCode.text;
         }
 
-        const filename = typeof providedFilename === "string" ? providedFilename : "<input>";
-
         // search and apply "eslint-env *".
         const envInFile = findEslintEnv(text);
+        const resolvedEnvConfig = Object.assign({ builtin: true }, config.env, envInFile);
+        const enabledEnvs = Object.keys(resolvedEnvConfig)
+            .filter(envName => resolvedEnvConfig[envName])
+            .map(envName => this.environments.get(envName))
+            .filter(env => env);
 
-        config = Object.assign({}, config);
-
-        if (envInFile) {
-            if (config.env) {
-                config.env = Object.assign({}, config.env, envInFile);
-            } else {
-                config.env = envInFile;
-            }
-        }
-
-        // process initial config to make it safe to extend
-        config = prepareConfig(config, this.environments);
+        const parserOptions = resolveParserOptions(config.parserOptions || {}, enabledEnvs);
+        const configuredGlobals = resolveGlobals(config.globals || {}, enabledEnvs);
+        const parserName = config.parser || DEFAULT_PARSER_NAME;
+        const settings = config.settings || {};
 
         if (!lastSourceCodes.get(this)) {
 
@@ -820,26 +955,12 @@ module.exports = class Linter {
                 return [];
             }
 
-            let parser;
-
-            try {
-                parser = this._parsers.get(config.parser) || require(config.parser);
-            } catch (ex) {
-                return [{
-                    ruleId: null,
-                    fatal: true,
-                    severity: 2,
-                    source: null,
-                    message: ex.message,
-                    line: 0,
-                    column: 0
-                }];
-            }
             const parseResult = parse(
                 text,
-                config.parserOptions,
-                parser,
-                filename
+                parserOptions,
+                parserName,
+                loadedParserMaps.get(this),
+                options.filename
             );
 
             if (!parseResult.success) {
@@ -861,171 +982,41 @@ module.exports = class Linter {
                     ast: lastSourceCode.ast,
                     parserServices: lastSourceCode.parserServices,
                     visitorKeys: lastSourceCode.visitorKeys,
-                    scopeManager: analyzeScope(lastSourceCode.ast, config.parserOptions)
+                    scopeManager: analyzeScope(lastSourceCode.ast, parserOptions)
                 }));
             }
         }
 
-        const problems = [];
         const sourceCode = lastSourceCodes.get(this);
-        let disableDirectives;
-
-        // parse global comments and modify config
-        if (allowInlineConfig !== false) {
-            const modifyConfigResult = modifyConfigsFromComments(filename, sourceCode.ast, config, ruleId => this.rules.get(ruleId));
-
-            config = modifyConfigResult.config;
-            modifyConfigResult.problems.forEach(problem => problems.push(problem));
-            disableDirectives = modifyConfigResult.disableDirectives;
-        } else {
-            disableDirectives = [];
-        }
-
-        const emitter = createEmitter();
-        const traverser = new Traverser();
-        const scopeManager = sourceCode.scopeManager;
-
-        /*
-         * Create a frozen object with the ruleContext properties and methods that are shared by all rules.
-         * All rule contexts will inherit from this object. This avoids the performance penalty of copying all the
-         * properties once for each rule.
-         */
-        const sharedTraversalContext = Object.freeze(
-            Object.assign(
-                Object.create(BASE_TRAVERSAL_CONTEXT),
-                {
-                    getAncestors: () => traverser.parents(),
-                    getDeclaredVariables: scopeManager.getDeclaredVariables.bind(scopeManager),
-                    getFilename: () => filename,
-                    getScope: () => getScope(scopeManager, traverser.current(), config.parserOptions.ecmaVersion),
-                    getSourceCode: () => sourceCode,
-                    markVariableAsUsed: name => markVariableAsUsed(scopeManager, traverser.current(), config.parserOptions, name),
-                    parserOptions: config.parserOptions,
-                    parserPath: config.parser,
-                    parserServices: sourceCode.parserServices,
-                    settings: config.settings,
-
-                    /**
-                     * This is used to avoid breaking rules that used to monkeypatch the `Linter#report` method
-                     * by using the `_linter` property on rule contexts.
-                     *
-                     * This should be removed in a major release after we create a better way to
-                     * lint for unused disable comments.
-                     * https://github.com/eslint/eslint/issues/9193
-                     */
-                    _linter: {
-                        report() {},
-                        on: emitter.on
-                    }
-                }
-            )
-        );
-
-        // enable appropriate rules
-        Object.keys(config.rules).forEach(ruleId => {
-            const severity = ConfigOps.getRuleSeverity(config.rules[ruleId]);
-
-            if (severity === 0) {
-                return;
-            }
-
-            const rule = this.rules.get(ruleId);
-            const messageIds = rule && rule.meta && rule.meta.messages;
-            let reportTranslator = null;
-            const ruleContext = Object.freeze(
-                Object.assign(
-                    Object.create(sharedTraversalContext),
-                    {
-                        id: ruleId,
-                        options: getRuleOptions(config.rules[ruleId]),
-                        report() {
-
-                            /*
-                             * Create a report translator lazily.
-                             * In a vast majority of cases, any given rule reports zero errors on a given
-                             * piece of code. Creating a translator lazily avoids the performance cost of
-                             * creating a new translator function for each rule that usually doesn't get
-                             * called.
-                             *
-                             * Using lazy report translators improves end-to-end performance by about 3%
-                             * with Node 8.4.0.
-                             */
-                            if (reportTranslator === null) {
-                                reportTranslator = createReportTranslator({ ruleId, severity, sourceCode, messageIds });
-                            }
-                            const problem = reportTranslator.apply(null, arguments);
-
-                            if (problem.fix && rule.meta && !rule.meta.fixable) {
-                                throw new Error("Fixable rules should export a `meta.fixable` property.");
-                            }
-                            problems.push(problem);
-
-                            /*
-                             * This is used to avoid breaking rules that used monkeypatch Linter, and relied on
-                             * `linter.report` getting called with report info every time a rule reports a problem.
-                             * To continue to support this, make sure that `context._linter.report` is called every
-                             * time a problem is reported by a rule, even though `context._linter` is no longer a
-                             * `Linter` instance.
-                             *
-                             * This should be removed in a major release after we create a better way to
-                             * lint for unused disable comments.
-                             * https://github.com/eslint/eslint/issues/9193
-                             */
-                            sharedTraversalContext._linter.report( // eslint-disable-line no-underscore-dangle
-                                problem.ruleId,
-                                problem.severity,
-                                { loc: { start: { line: problem.line, column: problem.column - 1 } } },
-                                problem.message
-                            );
-                        }
-                    }
-                )
-            );
-
-            try {
-                const ruleListeners = rule.create(ruleContext);
-
-                // add all the selectors from the rule as listeners
-                Object.keys(ruleListeners).forEach(selector => {
-                    emitter.on(
-                        selector,
-                        timing.enabled
-                            ? timing.time(ruleId, ruleListeners[selector])
-                            : ruleListeners[selector]
-                    );
-                });
-            } catch (ex) {
-                ex.message = `Error while loading rule '${ruleId}': ${ex.message}`;
-                throw ex;
-            }
-        });
+        const commentDirectives = options.allowInlineConfig
+            ? getDirectiveComments(options.filename, sourceCode.ast, ruleId => this.rules.get(ruleId))
+            : { configuredRules: {}, enabledGlobals: {}, exportedVariables: {}, problems: [], disableDirectives: [] };
 
         // augment global scope with declared global variables
-        addDeclaredGlobals(scopeManager.scopes[0], config, this.environments);
+        addDeclaredGlobals(
+            sourceCode.scopeManager.scopes[0],
+            configuredGlobals,
+            { exportedVariables: commentDirectives.exportedVariables, enabledGlobals: commentDirectives.enabledGlobals }
+        );
 
-        const eventGenerator = new CodePathAnalyzer(new NodeEventGenerator(emitter));
+        const configuredRules = Object.assign({}, config.rules, commentDirectives.configuredRules);
 
-        /*
-         * Each node has a type property. Whenever a particular type of
-         * node is found, an event is fired. This allows any listeners to
-         * automatically be informed that this type of node has been found
-         * and react accordingly.
-         */
-        traverser.traverse(sourceCode.ast, {
-            enter(node, parent) {
-                node.parent = parent;
-                eventGenerator.enterNode(node);
-            },
-            leave(node) {
-                eventGenerator.leaveNode(node);
-            },
-            visitorKeys: sourceCode.visitorKeys
-        });
+        const lintingProblems = runRules(
+            sourceCode,
+            configuredRules,
+            ruleId => this.rules.get(ruleId),
+            parserOptions,
+            parserName,
+            settings,
+            options.filename
+        );
 
         return applyDisableDirectives({
-            directives: disableDirectives,
-            problems: problems.sort((problemA, problemB) => problemA.line - problemB.line || problemA.column - problemB.column),
-            reportUnusedDisableDirectives
+            directives: commentDirectives.disableDirectives,
+            problems: lintingProblems
+                .concat(commentDirectives.problems)
+                .sort((problemA, problemB) => problemA.line - problemB.line || problemA.column - problemB.column),
+            reportUnusedDisableDirectives: options.reportUnusedDisableDirectives
         });
     }
 
@@ -1045,7 +1036,7 @@ module.exports = class Linter {
      * @param {function(Array<Object[]>): Object[]} [filenameOrOptions.postprocess] postprocessor for report messages. If provided,
      *      this should accept an array of the message lists for each code block returned from the preprocessor,
      *      apply a mapping to the messages as appropriate, and return a one-dimensional array of messages
-     * @returns {Object[]} The results as an array of messages or null if no messages.
+     * @returns {Object[]} The results as an array of messages or an empty array if no messages.
      */
     verify(textOrSourceCode, config, filenameOrOptions) {
         const preprocess = filenameOrOptions && filenameOrOptions.preprocess || (rawText => [rawText]);
@@ -1102,7 +1093,7 @@ module.exports = class Linter {
      * @returns {void}
      */
     defineParser(parserId, parserModule) {
-        this._parsers.set(parserId, parserModule);
+        loadedParserMaps.get(this).set(parserId, parserModule);
     }
 
     /**

package/lib/rules/max-len.js

@@ -213,7 +213,8 @@ module.exports = {
          * @returns {ASTNode[]} An array of string nodes.
          */
         function getAllStrings() {
-            return sourceCode.ast.tokens.filter(token => token.type === "String");
+            return sourceCode.ast.tokens.filter(token => (token.type === "String" ||
+                (token.type === "JSXText" && sourceCode.getNodeByRangeIndex(token.range[0] - 1).type === "JSXAttribute")));
         }
 
         /**

package/lib/util/interpolate.js

@@ -13,7 +13,11 @@ module.exports = (text, data) => {
     if (!data) {
         return text;
     }
-    return text.replace(/\{\{\s*([^{}]+?)\s*\}\}/g, (fullMatch, term) => {
+
+    // Substitution content for any {{ }} markers.
+    return text.replace(/\{\{([^{}]+?)\}\}/g, (fullMatch, termWithWhitespace) => {
+        const term = termWithWhitespace.trim();
+
         if (term in data) {
             return data[term];
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "4.18.1",
+  "version": "4.18.2",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -69,7 +69,7 @@
     "semver": "^5.3.0",
     "strip-ansi": "^4.0.0",
     "strip-json-comments": "~2.0.1",
-    "table": "^4.0.1",
+    "table": "4.0.2",
     "text-table": "~0.2.0"
   },
   "devDependencies": {

package/conf/default-config-options.js

@@ -1,29 +0,0 @@
-/**
- * @fileoverview Default config options
- * @author Teddy Katz
- */
-
-"use strict";
-
-/**
- * Freezes an object and all its nested properties
- * @param {Object} obj The object to deeply freeze
- * @returns {Object} `obj` after freezing it
- */
-function deepFreeze(obj) {
-    if (obj === null || typeof obj !== "object") {
-        return obj;
-    }
-
-    Object.keys(obj).map(key => obj[key]).forEach(deepFreeze);
-    return Object.freeze(obj);
-}
-
-module.exports = deepFreeze({
-    env: {},
-    globals: {},
-    rules: {},
-    settings: {},
-    parser: "espree",
-    parserOptions: {}
-});