package.json

@@ -2,7 +2,7 @@
   "author": "Isaac Z. Schlueter <i@izs.me> (http://blog.izs.me)",
   "name": "minimatch",
   "description": "a glob matcher in javascript",
-  "version": "6.1.0",
+  "version": "6.1.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/minimatch.git"

src/index.ts

@@ -907,7 +907,8 @@ export class Minimatch {
       // Handle nested stuff like *(*.js|!(*.json)), where open parens
       // mean that we should *not* include the ) in the bit that is considered
       // "after" the negated section.
-      const openParensBefore = nlBefore.split('(').length - 1
+      const closeParensBefore = nlBefore.split(')').length
+      const openParensBefore = nlBefore.split('(').length - closeParensBefore
       let cleanAfter = nlAfter
       for (let i = 0; i < openParensBefore; i++) {
         cleanAfter = cleanAfter.replace(/\)[+*?]?/, '')

tap-snapshots/test/basic.js.test.cjs

@@ -109,6 +109,10 @@ exports[`test/basic.js TAP basic tests > makeRe *c*?** 1`] = `
 /^(?:(?!\\.)(?=.)[^/]*?c[^/]*?[^/][^/]*?[^/]*?)$/
 `
 
+exports[`test/basic.js TAP basic tests > makeRe +(a)!(b)+(c) 1`] = `
+/^(?:(?!\\.)(?=.)(?:a)+(?:(?!(?:b)(?:c)+)[^/]*?)(?:c)+)$/
+`
+
 exports[`test/basic.js TAP basic tests > makeRe +(a|*\\|c\\\\|d\\\\\\|e\\\\\\\\|f\\\\\\\\\\|g 1`] = `
 /^(?:(?=.)\\+\\(a\\|[^/]*?\\|c\\\\\\\\\\|d\\\\\\\\\\|e\\\\\\\\\\\\\\\\\\|f\\\\\\\\\\\\\\\\\\|g)$/
 `

test/patterns.js

@@ -311,6 +311,22 @@ module.exports = [
   ['[z\\-a]', []],
   ['[\\-\\]]', []],
   ['[a-b-c]', []],
+
+  // https://github.com/isaacs/node-glob/issues/415
+  () => {
+    files = [
+      'ac',
+      'abc',
+      'acd',
+      'acc',
+      'acd',
+      'adc',
+      'bbc',
+      'bac',
+      'bcc',
+    ]
+  },
+  ['+(a)!(b)+(c)', ['ac', 'acc', 'adc']],
 ]
 
 Object.defineProperty(module.exports, 'files', {