eslint 4.18.0 → 4.19.1

package/lib/util/path-util.js

@@ -48,20 +48,18 @@ function convertPathToPosix(filepath) {
  * @returns {string} Relative filepath
  */
 function getRelativePath(filepath, baseDir) {
-    let relativePath;
+    const absolutePath = path.isAbsolute(filepath)
+        ? filepath
+        : path.resolve(filepath);
 
-    if (!path.isAbsolute(filepath)) {
-        filepath = path.resolve(filepath);
-    }
     if (baseDir) {
         if (!path.isAbsolute(baseDir)) {
             throw new Error("baseDir should be an absolute path");
         }
-        relativePath = path.relative(baseDir, filepath);
-    } else {
-        relativePath = filepath.replace(/^\//, "");
+        return path.relative(baseDir, absolutePath);
     }
-    return relativePath;
+    return absolutePath.replace(/^\//, "");
+
 }
 
 //------------------------------------------------------------------------------

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

@@ -55,50 +55,47 @@ function getSourceCodeOfFile(filename, options) {
 
 /**
  * Gets the SourceCode of a single file, or set of files.
- * @param   {string[]|string}  patterns   A filename, directory name, or glob,
- *                                        or an array of them
- * @param   {Object}           [options]  A CLIEngine options object. If not provided,
- *                                        the default cli options will be used.
- * @param   {progressCallback} [cb]       Callback for reporting execution status
- * @returns {Object}                      The SourceCode of all processed files.
+ * @param {string[]|string} patterns A filename, directory name, or glob, or an array of them
+ * @param {Object} [providedOptions] A CLIEngine options object. If not provided, the default cli options will be used.
+ * @param {progressCallback} [providedCallback] Callback for reporting execution status
+ * @returns {Object} The SourceCode of all processed files.
  */
-function getSourceCodeOfFiles(patterns, options, cb) {
+function getSourceCodeOfFiles(patterns, providedOptions, providedCallback) {
     const sourceCodes = {};
-    let opts;
-
-    if (typeof patterns === "string") {
-        patterns = [patterns];
-    }
+    const globPatternsList = typeof patterns === "string" ? [patterns] : patterns;
+    let options, callback;
 
     const defaultOptions = Object.assign({}, baseDefaultOptions, { cwd: process.cwd() });
 
-    if (typeof options === "undefined") {
-        opts = defaultOptions;
-    } else if (typeof options === "function") {
-        cb = options;
-        opts = defaultOptions;
-    } else if (typeof options === "object") {
-        opts = Object.assign({}, defaultOptions, options);
+    if (typeof providedOptions === "undefined") {
+        options = defaultOptions;
+        callback = null;
+    } else if (typeof providedOptions === "function") {
+        callback = providedOptions;
+        options = defaultOptions;
+    } else if (typeof providedOptions === "object") {
+        options = Object.assign({}, defaultOptions, providedOptions);
+        callback = providedCallback;
     }
-    debug("constructed options:", opts);
-    patterns = globUtil.resolveFileGlobPatterns(patterns, opts);
+    debug("constructed options:", options);
+    const resolvedPatterns = globUtil.resolveFileGlobPatterns(globPatternsList, options);
 
-    const filenames = globUtil.listFilesToProcess(patterns, opts)
+    const filenames = globUtil.listFilesToProcess(resolvedPatterns, options)
         .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}`);
+        debug(`Did not find any files matching pattern(s): ${resolvedPatterns}`);
     }
     filenames.forEach(filename => {
-        const sourceCode = getSourceCodeOfFile(filename, opts);
+        const sourceCode = getSourceCodeOfFile(filename, options);
 
         if (sourceCode) {
             debug("got sourceCode of", filename);
             sourceCodes[filename] = sourceCode;
         }
-        if (cb) {
-            cb(filenames.length); // eslint-disable-line callback-return
+        if (callback) {
+            callback(filenames.length); // eslint-disable-line callback-return
         }
     });
     return sourceCodes;

package/lib/util/source-code.js

@@ -90,15 +90,16 @@ class SourceCode extends TokenStore {
      * @param {Object|null} textOrConfig.parserServices - The parser srevices.
      * @param {ScopeManager|null} textOrConfig.scopeManager - The scope of this source code.
      * @param {Object|null} textOrConfig.visitorKeys - The visitor keys to traverse AST.
-     * @param {ASTNode} [ast] - The Program node of the AST representing the code. This AST should be created from the text that BOM was stripped.
+     * @param {ASTNode} [astIfNoConfig] - The Program node of the AST representing the code. This AST should be created from the text that BOM was stripped.
      * @constructor
      */
-    constructor(textOrConfig, ast) {
-        let text, parserServices, scopeManager, visitorKeys;
+    constructor(textOrConfig, astIfNoConfig) {
+        let text, ast, parserServices, scopeManager, visitorKeys;
 
         // Process overloading.
         if (typeof textOrConfig === "string") {
             text = textOrConfig;
+            ast = astIfNoConfig;
         } else if (typeof textOrConfig === "object" && textOrConfig !== null) {
             text = textOrConfig.text;
             ast = textOrConfig.ast;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "4.18.0",
+  "version": "4.19.1",
   "author": "Nicholas C. Zakas <nicholas+npm@nczconsulting.com>",
   "description": "An AST-based pattern checker for JavaScript.",
   "bin": {
@@ -43,7 +43,7 @@
     "doctrine": "^2.1.0",
     "eslint-scope": "^3.7.1",
     "eslint-visitor-keys": "^1.0.0",
-    "espree": "^3.5.2",
+    "espree": "^3.5.4",
     "esquery": "^1.0.0",
     "esutils": "^2.0.2",
     "file-entry-cache": "^2.0.0",
@@ -65,11 +65,12 @@
     "path-is-inside": "^1.0.2",
     "pluralize": "^7.0.0",
     "progress": "^2.0.0",
+    "regexpp": "^1.0.1",
     "require-uncached": "^1.0.3",
     "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: {}
-});