Update: Utilize is-negated-glob module to test for negated globs

phated · phated · commit 63dcc3911e0c · 2017-02-21T16:55:40.000-07:00
diff --git a/index.js b/index.js
@@ -6,6 +6,7 @@ var unique = require('unique-stream');
 
 var glob = require('glob');
 var resolveGlob = require('to-absolute-glob');
+var isNegatedGlob = require('is-negated-glob');
 var globParent = require('glob-parent');
 var path = require('path');
 var extend = require('extend');
@@ -91,16 +92,17 @@ var gs = {
     var positives = [];
     var negatives = [];
 
-    globs.forEach(function(glob, index) {
-      if (typeof glob !== 'string') {
+    globs.forEach(function(globString, index) {
+      if (typeof globString !== 'string') {
         throw new Error('Invalid glob at index ' + index);
       }
 
-      var globArray = isNegative(glob) ? negatives : positives;
+      var glob = isNegatedGlob(globString);
+      var globArray = glob.negated ? negatives : positives;
 
       globArray.push({
         index: index,
-        glob: glob,
+        glob: glob.pattern,
       });
     });
 
@@ -129,20 +131,12 @@ var gs = {
 
     function streamFromPositive(positive) {
       var negativeGlobs = negatives.filter(indexGreaterThan(positive.index))
-        .map(toGlob)
-        .map(stripExclamationMark);
+        .map(toGlob);
       return gs.createStream(positive.glob, negativeGlobs, opt);
     }
   },
 };
 
-
-function isNegative(pattern) {
-  if (typeof pattern === 'string') {
-    return pattern[0] === '!';
-  }
-}
-
 function indexGreaterThan(index) {
   return function(obj) {
     return obj.index > index;
@@ -180,8 +174,4 @@ function getBasePath(ourGlob, opt) {
   return basePath;
 }
 
-function stripExclamationMark(glob) {
-  return glob.slice(1);
-}
-
 module.exports = gs;
diff --git a/package.json b/package.json
@@ -24,6 +24,7 @@
     "extend": "^3.0.0",
     "glob": "^7.0.6",
     "glob-parent": "^3.0.0",
+    "is-negated-glob": "^1.0.0",
     "ordered-read-streams": "^0.3.0",
     "through2": "^0.6.0",
     "to-absolute-glob": "^0.1.1",
