.github/workflows/test.yml

@@ -1,7 +1,6 @@
 name: Tests
+
 on: [push, pull_request]
-env:
-  CI: true
 
 jobs:
   run:
@@ -11,21 +10,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [8.6, 10, 12, 13]
+        node: [8.6, 10, 12, 14]
         os: [ubuntu-latest, windows-latest, macOS-latest]
 
     steps:
       - name: Clone repository
         uses: actions/checkout@v2
 
       - name: Set Node.js version
-        uses: actions/setup-node@v1
+        uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
 
-      - run: node --version
-      - run: npm --version
-
       - name: Install npm dependencies
         run: npm install
 
@@ -35,6 +31,6 @@ jobs:
       - name: Run Coveralls
         # `master` should be a tag but they don't have one
         uses: coverallsapp/github-action@master
-        if: startsWith(matrix.os, 'ubuntu') && matrix.node == 12
+        if: startsWith(matrix.os, 'ubuntu') && matrix.node == 14
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"

CHANGELOG.md

@@ -32,6 +32,13 @@ Changelog entries are classified using the following labels _(from [keep-a-chang
 
 </details>
 
+## 2.2.3 (2021-04-10)
+
+### Fixed
+
+* Do not skip pattern seperator for square brackets ([fb08a30](https://github.com/micromatch/picomatch/commit/fb08a30)).
+* Set negatedExtGlob also if it does not span the whole pattern ([032e3f5](https://github.com/micromatch/picomatch/commit/032e3f5)).
+
 ## 2.2.2 (2020-03-21)
 
 ### Fixed

README.md

@@ -562,7 +562,7 @@ If you wish to match the following special characters in a filepath, and you wan
 
 Some characters that are used for matching in regular expressions are also regarded as valid file path characters on some platforms.
 
-To match any of the following characters as literals: `$^*+?()[]
+To match any of the following characters as literals: `$^*+?()[]`
 
 Examples:
 

lib/parse.js

@@ -247,7 +247,7 @@ const parse = (input, options) => {
         output = token.close = `)$))${extglobStar}`;
       }
 
-      if (token.prev.type === 'bos' && eos()) {
+      if (token.prev.type === 'bos') {
         state.negatedExtglob = true;
       }
     }

lib/scan.js

@@ -231,13 +231,15 @@ const scan = (input, options) => {
           isBracket = token.isBracket = true;
           isGlob = token.isGlob = true;
           finished = true;
-
-          if (scanToEnd === true) {
-            continue;
-          }
           break;
         }
       }
+
+      if (scanToEnd === true) {
+        continue;
+      }
+
+      break;
     }
 
     if (opts.nonegate !== true && code === CHAR_EXCLAMATION_MARK && index === start) {

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.2.2",
+  "version": "2.2.3",
   "homepage": "https://github.com/micromatch/picomatch",
   "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
   "funding": "https://github.com/sponsors/jonschlinkert",

test/api.picomatch.js

@@ -149,7 +149,7 @@ describe('picomatch', () => {
       assert(!isMatch('a-b.c-d', '*-bc-*'));
     });
 
-    it('should match with copmon glob patterns', () => {
+    it('should match with common glob patterns', () => {
       assert(!isMatch('/ab', './*/'));
       assert(!isMatch('/ef', '*'));
       assert(!isMatch('ab', './*/'));
@@ -347,4 +347,19 @@ describe('picomatch', () => {
       });
     });
   });
+
+  describe('state', () => {
+    describe('negatedExtglob', () => {
+      it('should return true', () => {
+        assert(picomatch('!(abc)', {}, true).state.negatedExtglob);
+        assert(picomatch('!(abc)**', {}, true).state.negatedExtglob);
+        assert(picomatch('!(abc)/**', {}, true).state.negatedExtglob);
+      });
+
+      it('should return false', () => {
+        assert(!picomatch('(!(abc))', {}, true).state.negatedExtglob);
+        assert(!picomatch('**!(abc)', {}, true).state.negatedExtglob);
+      });
+    });
+  });
 });

test/api.scan.js

@@ -311,6 +311,10 @@ describe('picomatch', () => {
 
       assertParts('XXX/*/*/12/*/*/m/*/*', ['XXX', '*', '*', '12', '*', '*', 'm', '*', '*']);
       assertParts('foo/\\"**\\"/bar', ['foo', '\\"**\\"', 'bar']);
+
+      assertParts('[0-9]/[0-9]', ['[0-9]', '[0-9]']);
+      assertParts('foo/[0-9]/[0-9]', ['foo', '[0-9]', '[0-9]']);
+      assertParts('foo[0-9]/bar[0-9]', ['foo[0-9]', 'bar[0-9]']);
     });
   });