Move empty-string pattern filtering to cli-engine

not-an-aardvark · not-an-aardvark · commit 15d77bd6166a · 2018-03-30T15:29:05.000-04:00
This ensures that `globUtil.resolveGlobFilePatterns` returns an array with the same length as its input, which is important so that the original glob can be retrieved by index.
diff --git a/lib/cli-engine.js b/lib/cli-engine.js
@@ -481,7 +481,7 @@ class CLIEngine {
      * @returns {string[]} The equivalent glob patterns.
      */
     resolveFileGlobPatterns(patterns) {
-        return globUtil.resolveFileGlobPatterns(patterns, this.options);
+        return globUtil.resolveFileGlobPatterns(patterns.filter(Boolean), this.options);
     }
 
     /**
diff --git a/lib/util/glob-util.js b/lib/util/glob-util.js
@@ -111,7 +111,7 @@ function resolveFileGlobPatterns(patterns, options) {
 
     const processPathExtensions = processPath(options);
 
-    return patterns.filter(p => p.length).map(processPathExtensions);
+    return patterns.map(processPathExtensions);
 }
 
 const dotfilesPattern = /(?:(?:^\.)|(?:[/\\]\.))[^/\\.].*/;
diff --git a/tests/lib/cli-engine.js b/tests/lib/cli-engine.js
@@ -2979,17 +2979,18 @@ describe("CLIEngine", () => {
     describe("resolveFileGlobPatterns", () => {
 
         leche.withData([
-            [".", "**/*.js"],
-            ["./", "**/*.js"],
-            ["../", "../**/*.js"]
+            [".", ["**/*.js"]],
+            ["./", ["**/*.js"]],
+            ["../", ["../**/*.js"]],
+            ["", []]
         ], (input, expected) => {
 
             it(`should correctly resolve ${input} to ${expected}`, () => {
                 const engine = new CLIEngine();
 
                 const result = engine.resolveFileGlobPatterns([input]);
 
-                assert.strictEqual(result[0], expected);
+                assert.deepStrictEqual(result, expected);
 
             });
         });
diff --git a/tests/lib/util/glob-util.js b/tests/lib/util/glob-util.js
@@ -143,17 +143,6 @@ describe("globUtil", () => {
 
             assert.deepStrictEqual(result, ["one-js-file/example.js"]);
         });
-
-        it("should ignore empty patterns", () => {
-            const patterns = [""];
-            const opts = {
-                cwd: getFixturePath()
-            };
-            const result = globUtil.resolveFileGlobPatterns(patterns, opts);
-
-            assert.deepStrictEqual(result, []);
-        });
-
     });
 
     describe("listFilesToProcess()", () => {

Original file line number	Diff line number	Diff line change
`@@ -481,7 +481,7 @@ class CLIEngine {`
`481`	`481`	`* @returns {string[]} The equivalent glob patterns.`
`482`	`482`	`*/`
`483`	`483`	`resolveFileGlobPatterns(patterns) {`
`484`		`- return globUtil.resolveFileGlobPatterns(patterns, this.options);`
	`484`	`+ return globUtil.resolveFileGlobPatterns(patterns.filter(Boolean), this.options);`
`485`	`485`	`}`
`486`	`486`
`487`	`487`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ function resolveFileGlobPatterns(patterns, options) {`
`111`	`111`
`112`	`112`	`const processPathExtensions = processPath(options);`
`113`	`113`
`114`		`- return patterns.filter(p => p.length).map(processPathExtensions);`
	`114`	`+ return patterns.map(processPathExtensions);`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`const dotfilesPattern = /(?:(?:^\.)\|(?:[/\\]\.))[^/\\.].*/;`