fix: Exclude negated not working with '--all' switch

.gitignore

@@ -6,3 +6,5 @@ test/build/
 *.covered.js
 *.swp
 needs-transpile.js
+
+!*test/fixtures/cli/include-exclude/node_modules/

index.js

@@ -2,6 +2,7 @@
 
 /* global __coverage__ */
 
+const arrayUniq = require('array-uniq')
 const arrify = require('arrify')
 const cachingTransform = require('caching-transform')
 const util = require('util')
@@ -242,16 +243,20 @@ NYC.prototype.instrumentAllFiles = function (input, output, cb) {
 }
 
 NYC.prototype.walkAllFiles = function (dir, visitor) {
-  var pattern = null
-  if (this.extensions.length === 1) {
-    pattern = '**/*' + this.extensions[0]
-  } else {
-    pattern = '**/*{' + this.extensions.join() + '}'
-  }
+  const pattern = (this.extensions.length === 1)
+    ? `**/*${this.extensions[0]}`
+    : `**/*{${this.extensions.join()}}`
 
-  glob.sync(pattern, { cwd: dir, nodir: true, ignore: this.exclude.exclude }).forEach(function (filename) {
-    visitor(filename)
+  let filesToWalk = glob.sync(pattern, { cwd: dir, nodir: true, ignore: this.exclude.exclude })
+
+  // package node-glob no longer observes negated excludes, so we need to restore these files ourselves
+  const excludeNegatedPaths = this.exclude.excludeNegated
+  excludeNegatedPaths.forEach(pattern => {
+    filesToWalk = filesToWalk.concat(glob.sync(pattern, { cwd: dir, nodir: true }))
   })
+  filesToWalk = arrayUniq(filesToWalk)
+
+  filesToWalk.forEach(visitor)
 }
 
 NYC.prototype._maybeInstrumentSource = function (code, filename, relFile) {

package.json

@@ -74,6 +74,7 @@
   "license": "ISC",
   "dependencies": {
     "archy": "^1.0.0",
+    "array-uniq": "^2.0.0",
     "arrify": "^1.0.1",
     "caching-transform": "^3.0.1",
     "convert-source-map": "^1.6.0",

test/fixtures/cli/include-exclude/exclude-negated.js

@@ -0,0 +1,2 @@
+'use strict';
+console.log('Hello, World!')

test/fixtures/cli/include-exclude/excluded.js

@@ -0,0 +1,2 @@
+'use strict';
+console.log('Hello, World!')

test/nyc-bin.js

@@ -101,6 +101,48 @@ describe('the nyc cli', function () {
         done()
       })
     })
+
+    it('should allow negated exclude patterns', function (done) {
+      const args = [bin, '--all', '--exclude', '**/include-exclude/**', '--exclude', '!**/exclude-negated.js', process.execPath, './half-covered.js']
+
+      const proc = spawn(process.execPath, args, {
+        cwd: fixturesCLI,
+        env: env
+      })
+
+      let stdout = ''
+      proc.stdout.on('data', chunk => {
+        stdout += chunk
+      })
+
+      proc.on('close', code => {
+        code.should.equal(0)
+        stdout.should.not.match(/excluded\.js/)
+        stdout.should.match(/exclude-negated\.js/)
+        done()
+      })
+    })
+
+    it('should include \'node_modules\' using exclude patterns', function (done) {
+      const args = [bin, '--all', '--exclude', '!**/node_modules/**', process.execPath, './half-covered.js']
+
+      const proc = spawn(process.execPath, args, {
+        cwd: fixturesCLI,
+        env: env
+      })
+
+      let stdout = ''
+      proc.stdout.on('data', chunk => {
+        stdout += chunk
+      })
+
+      proc.on('close', code => {
+        code.should.equal(0)
+        stdout.should.match(/include-exclude\/node_modules/)
+        stdout.should.match(/cover-me\.js/)
+        done()
+      })
+    })
   })
 
   describe('--ignore-class-method', function () {