.eslintrc.json

@@ -4,12 +4,12 @@
   ],
 
   "env": {
-    "es2021": true,
+    "es6": true,
     "node": true
   },
 
   "parserOptions": {
-    "ecmaVersion": 12
+    "ecmaVersion": 2018
   },
 
   "rules": {

.github/workflows/codeql.yml

@@ -0,0 +1,28 @@
+name: "CodeQL"
+
+on:
+  push:
+  pull_request:
+  schedule:
+    - cron: "0 0 * * 0"
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v1
+        with:
+          languages: "javascript"
+
+      - name: Autobuild
+        uses: github/codeql-action/autobuild@v1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v1

CHANGELOG.md

@@ -32,6 +32,16 @@ Changelog entries are classified using the following labels _(from [keep-a-chang
 
 </details>
 
+## 2.3.1 (2022-01-02)
+
+### Fixed
+
+* Fixes bug when a pattern containing an expression after the closing parenthesis (`/!(*.d).{ts,tsx}`) was incorrectly converted to regexp ([9f241ef](https://github.com/micromatch/picomatch/commit/9f241ef)).
+
+### Changed
+
+* Some documentation improvements ([f81d236](https://github.com/micromatch/picomatch/commit/f81d236), [421e0e7](https://github.com/micromatch/picomatch/commit/421e0e7)).
+
 ## 2.3.0 (2021-05-21)
 
 ### Fixed

README.md

@@ -312,12 +312,11 @@ The following options may be used with the main `picomatch()` function or any of
 | `expandRange`         | `function`     | `undefined` | Custom function for expanding ranges in brace patterns, such as `{a..z}`. The function receives the range values as two arguments, and it must return a string to be used in the generated regex. It's recommended that returned strings be wrapped in parentheses. |
 | `failglob`            | `boolean`      | `false`     | Throws an error if no matches are found. Based on the bash option of the same name. |
 | `fastpaths`           | `boolean`      | `true`      | To speed up processing, full parsing is skipped for a handful common glob patterns. Disable this behavior by setting this option to `false`. |
-| `flags`               | `boolean`      | `undefined` | Regex flags to use in the generated regex. If defined, the `nocase` option will be overridden. |
+| `flags`               | `string`      | `undefined` | Regex flags to use in the generated regex. If defined, the `nocase` option will be overridden. |
 | [format](#optionsformat) | `function` | `undefined` | Custom function for formatting the returned string. This is useful for removing leading slashes, converting Windows paths to Posix paths, etc. |
 | `ignore`              | `array\|string` | `undefined` | One or more glob patterns for excluding strings that should not be matched from the result. |
 | `keepQuotes`          | `boolean`      | `false`     | Retain quotes in the generated regex, since quotes may also be used as an alternative to backslashes.  |
 | `literalBrackets`     | `boolean`      | `undefined` | When `true`, brackets in the glob pattern will be escaped so that only literal brackets will be matched. |
-| `lookbehinds`         | `boolean`      | `true`      | Support regex positive and negative lookbehinds. Note that you must be using Node 8.1.10 or higher to enable regex lookbehinds. |
 | `matchBase`           | `boolean`      | `false`     | Alias for `basename` |
 | `maxLength`           | `boolean`      | `65536`     | Limit the max length of the input string. An error is thrown if the input string is longer than this value. |
 | `nobrace`             | `boolean`      | `false`     | Disable brace matching, so that `{a,b}` and `{1..3}` would be treated as literal characters. |
@@ -341,6 +340,8 @@ The following options may be used with the main `picomatch()` function or any of
 | `unescape`            | `boolean`      | `undefined` | Remove backslashes preceding escaped characters in the glob pattern. By default, backslashes are retained. |
 | `unixify`             | `boolean`      | `undefined` | Alias for `posixSlashes`, for backwards compatibility. |
 
+picomatch has automatic detection for regex positive and negative lookbehinds. If the pattern contains a negative lookbehind, you must be using Node.js >= 8.10 or else picomatch will throw an error.
+
 ### Scan Options
 
 In addition to the main [picomatch options](#picomatch-options), the following options may also be used with the [.scan](#scan) method.
@@ -704,4 +705,4 @@ npm install -g verbose/verb#dev verb-generate-readme && verb
 ### License
 
 Copyright © 2017-present, [Jon Schlinkert](https://github.com/jonschlinkert).
-Released under the [MIT License](LICENSE).
+Released under the [MIT License](LICENSE).

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') {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "picomatch",
   "description": "Blazing fast and accurate glob matcher written in JavaScript, with no dependencies and full support for standard and extended Bash glob features, including braces, extglobs, POSIX brackets, and regular expressions.",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "homepage": "https://github.com/micromatch/picomatch",
   "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
   "funding": "https://github.com/sponsors/jonschlinkert",

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)'));