Merge pull request #102 from micromatch/ISSUE-93_incorrect_extglob_expanding

mrmlnc · web-flow · commit 9f241efedc15 · 2022-01-02T19:54:11.000+03:00
ISSUE-93: support stars in negation extglobs with expression after closing parenthesis
diff --git a/lib/parse.js b/lib/parse.js
@@ -250,7 +250,14 @@ const parse = (input, options) => {
       }
 
       if (token.inner.includes('*') && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {
-        output = token.close = `)${rest})${extglobStar})`;
+        // Any non-magical string (`.ts`) or even nested expression (`.{ts,tsx}`) can follow after the closing parenthesis.
+        // In this case, we need to parse the string and use it in the output of the original pattern.
+        // Suitable patterns: `/!(*.d).ts`, `/!(*.d).{ts,tsx}`, `**/!(*-dbg).@(js)`.
+        //
+        // Disabling the `fastpaths` option due to a problem with parsing strings as `.ts` in the pattern like `**/!(*.d).ts`.
+        const expression = parse(rest, { ...options, fastpaths: false }).output;
+
+        output = token.close = `)${expression})${extglobStar})`;
       }
 
       if (token.prev.type === 'bos') {
diff --git a/test/extglobs.js b/test/extglobs.js
@@ -58,15 +58,34 @@ describe('extglobs', () => {
     it('should support stars in negation extglobs', () => {
       assert(!isMatch('/file.d.ts', '/!(*.d).ts'));
       assert(isMatch('/file.ts', '/!(*.d).ts'));
+      assert(isMatch('/file.something.ts', '/!(*.d).ts'));
       assert(isMatch('/file.d.something.ts', '/!(*.d).ts'));
       assert(isMatch('/file.dhello.ts', '/!(*.d).ts'));
 
       assert(!isMatch('/file.d.ts', '**/!(*.d).ts'));
       assert(isMatch('/file.ts', '**/!(*.d).ts'));
+      assert(isMatch('/file.something.ts', '**/!(*.d).ts'));
       assert(isMatch('/file.d.something.ts', '**/!(*.d).ts'));
       assert(isMatch('/file.dhello.ts', '**/!(*.d).ts'));
     });
 
+    // See https://github.com/micromatch/picomatch/issues/93
+    it('should support stars in negation extglobs with expression after closing parenthesis', () => {
+      // Nested expression after closing parenthesis
+      assert(!isMatch('/file.d.ts', '/!(*.d).{ts,tsx}'));
+      assert(isMatch('/file.ts', '/!(*.d).{ts,tsx}'));
+      assert(isMatch('/file.something.ts', '/!(*.d).{ts,tsx}'));
+      assert(isMatch('/file.d.something.ts', '/!(*.d).{ts,tsx}'));
+      assert(isMatch('/file.dhello.ts', '/!(*.d).{ts,tsx}'));
+
+      // Extglob after closing parenthesis
+      assert(!isMatch('/file.d.ts', '/!(*.d).@(ts)'));
+      assert(isMatch('/file.ts', '/!(*.d).@(ts)'));
+      assert(isMatch('/file.something.ts', '/!(*.d).@(ts)'));
+      assert(isMatch('/file.d.something.ts', '/!(*.d).@(ts)'));
+      assert(isMatch('/file.dhello.ts', '/!(*.d).@(ts)'));
+    });
+
     it('should support negation extglobs in patterns with slashes', () => {
       assert(!isMatch('foo/abc', 'foo/!(abc)'));
       assert(isMatch('foo/bar', 'foo/!(abc)'));

Original file line number	Diff line number	Diff line change
`@@ -250,7 +250,14 @@ const parse = (input, options) => {`
`250`	`250`	`}`
`251`	`251`
`252`	`252`	`if (token.inner.includes('*') && (rest = remaining()) && /^\.[^\\/.]+$/.test(rest)) {`
`253`		- output = token.close = `)${rest})${extglobStar})`;
	`253`	+ // Any non-magical string (`.ts`) or even nested expression (`.{ts,tsx}`) can follow after the closing parenthesis.
	`254`	`+ // In this case, we need to parse the string and use it in the output of the original pattern.`
	`255`	+ // Suitable patterns: `/!(.d).ts`, `/!(.d).{ts,tsx}`, `*/!(-dbg).@(js)`.
	`256`	`+ //`
	`257`	+ // Disabling the `fastpaths` option due to a problem with parsing strings as `.ts` in the pattern like `*/!(.d).ts`.
	`258`	`+ const expression = parse(rest, { ...options, fastpaths: false }).output;`
	`259`	`+`
	`260`	+ output = token.close = `)${expression})${extglobStar})`;
`254`	`261`	`}`
`255`	`262`
`256`	`263`	`if (token.prev.type === 'bos') {`