Revert "fix: Exclude negated not working with '--all' switch (#977)"

This reverts commit 91de23c.

.gitignore

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

index.js

@@ -2,7 +2,6 @@
 
 /* global __coverage__ */
 
-const arrayUniq = require('array-uniq')
 const arrify = require('arrify')
 const cachingTransform = require('caching-transform')
 const util = require('util')
@@ -248,20 +247,16 @@ NYC.prototype.instrumentAllFiles = function (input, output, cb) {
 }
 
 NYC.prototype.walkAllFiles = function (dir, visitor) {
-  const pattern = (this.extensions.length === 1)
-    ? `**/*${this.extensions[0]}`
-    : `**/*{${this.extensions.join()}}`
-
-  let filesToWalk = glob.sync(pattern, { cwd: dir, nodir: true, ignore: this.exclude.exclude })
+  var pattern = null
+  if (this.extensions.length === 1) {
+    pattern = '**/*' + this.extensions[0]
+  } else {
+    pattern = '**/*{' + this.extensions.join() + '}'
+  }
 
-  // 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 }))
+  glob.sync(pattern, { cwd: dir, nodir: true, ignore: this.exclude.exclude }).forEach(function (filename) {
+    visitor(filename)
   })
-  filesToWalk = arrayUniq(filesToWalk)
-
-  filesToWalk.forEach(visitor)
 }
 
 NYC.prototype._maybeInstrumentSource = function (code, filename, relFile) {

package.json

@@ -74,7 +74,6 @@
   "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/nyc-bin.js

@@ -101,48 +101,6 @@ 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 () {