micromatch 3.0.0 → 3.0.4

package/CHANGELOG.md

@@ -13,7 +13,7 @@ Changelog entries are classified using the following labels _(from [keep-a-chang
 
 ### [3.0.0] - 2017-04-11
 
-TODO
+TODO. There should be no breaking changes. Please report any regressions. I will [reformat these release notes](https://github.com/micromatch/micromatch/pull/76) and add them to the changelog as soon as I have a chance. 
 
 ### [1.0.1] - 2016-12-12
 

package/README.md

@@ -1,4 +1,4 @@
-# micromatch [![NPM version](https://img.shields.io/npm/v/micromatch.svg?style=flat)](https://www.npmjs.com/package/micromatch) [![NPM monthly downloads](https://img.shields.io/npm/dm/micromatch.svg?style=flat)](https://npmjs.org/package/micromatch) [![NPM total downloads](https://img.shields.io/npm/dt/micromatch.svg?style=flat)](https://npmjs.org/package/micromatch) [![Linux Build Status](https://img.shields.io/travis/micromatch/micromatch.svg?style=flat&label=Travis)](https://travis-ci.org/micromatch/micromatch) [![Windows Build Status](https://img.shields.io/appveyor/ci/micromatch/micromatch.svg?style=flat&label=AppVeyor)](https://ci.appveyor.com/project/micromatch/micromatch)
+# micromatch [![NPM version](https://img.shields.io/npm/v/micromatch.svg?style=flat)](https://www.npmjs.com/package/micromatch) [![NPM monthly downloads](https://img.shields.io/npm/dm/micromatch.svg?style=flat)](https://npmjs.org/package/micromatch)  [![NPM total downloads](https://img.shields.io/npm/dt/micromatch.svg?style=flat)](https://npmjs.org/package/micromatch) [![Linux Build Status](https://img.shields.io/travis/micromatch/micromatch.svg?style=flat&label=Travis)](https://travis-ci.org/micromatch/micromatch) [![Windows Build Status](https://img.shields.io/appveyor/ci/micromatch/micromatch.svg?style=flat&label=AppVeyor)](https://ci.appveyor.com/project/micromatch/micromatch)
 
 > Glob matching for javascript/node.js. A drop-in replacement and faster alternative to minimatch and multimatch.
 
@@ -87,8 +87,8 @@ console.log(mm.isMatch('foo', 'f*'));
 
 * Supports all of the same matching features as [minimatch](https://github.com/isaacs/minimatch) and [multimatch](https://github.com/sindresorhus/multimatch)
 * Micromatch uses [snapdragon](https://github.com/jonschlinkert/snapdragon) for parsing and compiling globs, which provides granular control over the entire conversion process in a way that is easy to understand, reason about, and maintain.
-* More accurate, with more than 36,000 [test assertions](./test) to prove it.
-* More complete support for the Bash 4.3 specification than minimatch and multimatch. Micromatch passes _all of the spec tests_ from bash, including some that bash still fails.
+* More consistently accurate matching [than minimatch](https://github.com/yarnpkg/yarn/pull/3339), with more than 36,000 [test assertions](./test) to prove it.
+* More complete support for the Bash 4.3 specification than minimatch and multimatch. In fact, micromatch passes _all of the spec tests_ from bash, including some that bash still fails.
 * [Faster matching](#benchmarks), from a combination of optimized glob patterns, faster algorithms, and regex caching.
 * [Micromatch is safer](https://github.com/micromatch/braces#braces-is-safe), and is not subject to DoS with brace patterns, like minimatch and multimatch.
 * More reliable windows support than minimatch and multimatch.
@@ -158,7 +158,7 @@ console.log(mm(['a.js', 'a.txt'], ['*.js']));
 //=> [ 'a.js' ]
 ```
 
-### [.match](index.js#L107)
+### [.match](index.js#L95)
 
 Similar to the main function, but `pattern` must be a string.
 
@@ -179,7 +179,7 @@ console.log(mm.match(['a.a', 'a.aa', 'a.b', 'a.c'], '*.a'));
 //=> ['a.a', 'a.aa']
 ```
 
-### [.isMatch](index.js#L168)
+### [.isMatch](index.js#L156)
 
 Returns true if the specified `string` matches the given glob `pattern`.
 
@@ -202,7 +202,7 @@ console.log(mm.isMatch('a.b', '*.a'));
 //=> false
 ```
 
-### [.some](index.js#L206)
+### [.some](index.js#L194)
 
 Returns true if some of the strings in the given `list` match any of the given glob `patterns`.
 
@@ -225,7 +225,7 @@ console.log(mm.some(['foo.js'], ['*.js', '!foo.js']));
 // false
 ```
 
-### [.every](index.js#L242)
+### [.every](index.js#L230)
 
 Returns true if every string in the given `list` matches any of the given glob `patterns`.
 
@@ -252,7 +252,7 @@ console.log(mm.every(['foo.js'], ['*.js', '!foo.js']));
 // false
 ```
 
-### [.any](index.js#L274)
+### [.any](index.js#L262)
 
 Returns true if **any** of the given glob `patterns` match the specified `string`.
 
@@ -275,7 +275,7 @@ console.log(mm.any('a.a', 'b.*'));
 //=> false
 ```
 
-### [.all](index.js#L322)
+### [.all](index.js#L310)
 
 Returns true if **all** of the given `patterns` match the specified string.
 
@@ -305,7 +305,7 @@ console.log(mm.all('foo.js', ['*.js', 'f*', '*o*', '*o.js']));
 // true
 ```
 
-### [.not](index.js#L354)
+### [.not](index.js#L342)
 
 Returns a list of strings that _**do not match any**_ of the given `patterns`.
 
@@ -326,7 +326,7 @@ console.log(mm.not(['a.a', 'b.b', 'c.c'], '*.a'));
 //=> ['b.b', 'c.c']
 ```
 
-### [.contains](index.js#L389)
+### [.contains](index.js#L378)
 
 Returns true if the given `string` contains the given pattern. Similar to [.isMatch](#isMatch) but the pattern can match any part of the string.
 
@@ -349,7 +349,7 @@ console.log(mm.contains('aa/bb/cc', '*d'));
 //=> false
 ```
 
-### [.matchKeys](index.js#L445)
+### [.matchKeys](index.js#L434)
 
 Filter the keys of the given object with the given `glob` pattern and `options`. Does not attempt to match nested keys. If you need this feature, use [glob-object](https://github.com/jonschlinkert/glob-object) instead.
 
@@ -371,7 +371,7 @@ console.log(mm.matchKeys(obj, '*b'));
 //=> { ab: 'b' }
 ```
 
-### [.matcher](index.js#L474)
+### [.matcher](index.js#L463)
 
 Returns a memoized matcher function from the given glob `pattern` and `options`. The returned function takes a string to match as its only argument and returns true if the string is a match.
 
@@ -394,7 +394,7 @@ console.log(isMatch('a.b'));
 //=> true
 ```
 
-### [.makeRe](index.js#L542)
+### [.makeRe](index.js#L535)
 
 Create a regular expression from the given glob `pattern`.
 
@@ -414,7 +414,7 @@ console.log(mm.makeRe('*.js'));
 //=> /^(?:(\.[\\\/])?(?!\.)(?=.)[^\/]*?\.js)$/
 ```
 
-### [.braces](index.js#L585)
+### [.braces](index.js#L582)
 
 Expand the given brace `pattern`.
 
@@ -832,7 +832,7 @@ Micromatch also supports extended globbing features.
 
 Extended globbing, as described by the bash man page:
 
-| **pattern** | **regex equivalent** | **description** | 
+| **pattern** | **regex equivalent** | **description** |
 | --- | --- | --- |
 | `?(pattern)` | `(pattern)?` | Matches zero or one occurrence of the given patterns |
 | `*(pattern)` | `(pattern)*` | Matches zero or more occurrences of the given patterns |
@@ -953,58 +953,58 @@ npm i -d && npm run benchmark
 
 ### Latest results
 
-As of May 29, 2017 (longer bars are better):
+As of July 11, 2017 (longer bars are better):
 
 ```sh
 # braces-globstar-large-list
-micromatch ██████████████████████████████████████████████████████████████████████ (595 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (595 ops/sec) 
 minimatch  █ (13.95 ops/sec) 
 multimatch █ (14.09 ops/sec) 
 
 # braces-multiple
-micromatch ██████████████████████████████████████████████████████████████████████ (48,362 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (48,362 ops/sec) 
 minimatch   (2.18 ops/sec) 
 multimatch  (2.15 ops/sec) 
 
 # braces-range
-micromatch ██████████████████████████████████████████████████████████████████████ (187,481 ops/sec) 
-minimatch  ████ (12,366 ops/sec) 
-multimatch ████ (11,841 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (187,481 ops/sec) 
+minimatch  ███ (12,366 ops/sec) 
+multimatch ███ (11,841 ops/sec) 
 
 # braces-set
-micromatch ██████████████████████████████████████████████████████████████████████ (24,344 ops/sec) 
-minimatch  ██████ (2,255 ops/sec) 
-multimatch ██████ (2,199 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (24,344 ops/sec) 
+minimatch  ████ (2,255 ops/sec) 
+multimatch ████ (2,199 ops/sec) 
 
 # globstar-large-list
-micromatch ██████████████████████████████████████████████████████████████████████ (561 ops/sec) 
-minimatch  ███ (25.43 ops/sec) 
-multimatch ███ (25.27 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (561 ops/sec) 
+minimatch  ██ (25.43 ops/sec) 
+multimatch ██ (25.27 ops/sec) 
 
 # globstar-long-list
-micromatch ██████████████████████████████████████████████████████████████████████ (3,257 ops/sec) 
-minimatch  ██████████ (485 ops/sec) 
-multimatch ██████████ (485 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (3,257 ops/sec) 
+minimatch  ███████ (485 ops/sec) 
+multimatch ███████ (485 ops/sec) 
 
 # globstar-short-list
-micromatch ██████████████████████████████████████████████████████████████████████ (359,991 ops/sec) 
-minimatch  ████████ (44,763 ops/sec) 
-multimatch ███████ (39,977 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (359,991 ops/sec) 
+minimatch  ██████ (44,763 ops/sec) 
+multimatch █████ (39,977 ops/sec) 
 
 # no-glob
-micromatch ██████████████████████████████████████████████████████████████████████ (443,740 ops/sec) 
-minimatch  ██████ (44,152 ops/sec) 
-multimatch ██████ (41,077 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (443,740 ops/sec) 
+minimatch  ████ (44,152 ops/sec) 
+multimatch ████ (41,077 ops/sec) 
 
 # star-basename
-micromatch ██████████████████████████████████████████████████████████████████████ (10,286 ops/sec) 
-minimatch  ████████████████████ (3,059 ops/sec) 
-multimatch █████████████████████ (3,129 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (10,286 ops/sec) 
+minimatch  ██████████████ (3,059 ops/sec) 
+multimatch ███████████████ (3,129 ops/sec) 
 
 # star
-micromatch ██████████████████████████████████████████████████████████████████████ (9,756 ops/sec) 
-minimatch  █████████████████████ (2,978 ops/sec) 
-multimatch █████████████████████ (2,970 ops/sec) 
+micromatch ██████████████████████████████████████████████████ (9,756 ops/sec) 
+minimatch  ███████████████ (2,978 ops/sec) 
+multimatch ███████████████ (2,970 ops/sec) 
 
 ```
 
@@ -1016,7 +1016,7 @@ multimatch █████████████████████ (2,97
 * [expand-brackets](https://www.npmjs.com/package/expand-brackets): Expand POSIX bracket expressions (character classes) in glob patterns. | [homepage](https://github.com/jonschlinkert/expand-brackets "Expand POSIX bracket expressions (character classes) in glob patterns.")
 * [extglob](https://www.npmjs.com/package/extglob): Extended glob support for JavaScript. Adds (almost) the expressive power of regular expressions to glob… [more](https://github.com/jonschlinkert/extglob) | [homepage](https://github.com/jonschlinkert/extglob "Extended glob support for JavaScript. Adds (almost) the expressive power of regular expressions to glob patterns.")
 * [fill-range](https://www.npmjs.com/package/fill-range): Fill in a range of numbers or letters, optionally passing an increment or `step` to… [more](https://github.com/jonschlinkert/fill-range) | [homepage](https://github.com/jonschlinkert/fill-range "Fill in a range of numbers or letters, optionally passing an increment or `step` to use, or create a regex-compatible range with `options.toRegex`")
-* [nanomatch](https://www.npmjs.com/package/nanomatch): Fast, minimal glob matcher for node.js. Similar to micromatch, minimatch and multimatch, but complete Bash… [more](https://github.com/jonschlinkert/nanomatch) | [homepage](https://github.com/jonschlinkert/nanomatch "Fast, minimal glob matcher for node.js. Similar to micromatch, minimatch and multimatch, but complete Bash 4.3 wildcard support only (no support for exglobs, posix brackets or braces)")
+* [nanomatch](https://www.npmjs.com/package/nanomatch): Fast, minimal glob matcher for node.js. Similar to micromatch, minimatch and multimatch, but complete Bash… [more](https://github.com/micromatch/nanomatch) | [homepage](https://github.com/micromatch/nanomatch "Fast, minimal glob matcher for node.js. Similar to micromatch, minimatch and multimatch, but complete Bash 4.3 wildcard support only (no support for exglobs, posix brackets or braces)")
 
 ### Contributing
 
@@ -1026,19 +1026,19 @@ Please read the [contributing guide](.github/contributing.md) for advice on open
 
 ### Contributors
 
-| **Commits** | **Contributor** | 
-| --- | --- |
-| 346 | [jonschlinkert](https://github.com/jonschlinkert) |
-| 12 | [es128](https://github.com/es128) |
-| 3 | [paulmillr](https://github.com/paulmillr) |
-| 2 | [TrySound](https://github.com/TrySound) |
-| 2 | [doowb](https://github.com/doowb) |
-| 2 | [MartinKolarik](https://github.com/MartinKolarik) |
-| 2 | [tunnckoCore](https://github.com/tunnckoCore) |
-| 1 | [amilajack](https://github.com/amilajack) |
-| 1 | [DianeLooney](https://github.com/DianeLooney) |
-| 1 | [UltCombo](https://github.com/UltCombo) |
-| 1 | [tomByrer](https://github.com/tomByrer) |
+| **Commits** | **Contributor** |  
+| --- | --- |  
+| 429 | [jonschlinkert](https://github.com/jonschlinkert) |  
+| 12  | [es128](https://github.com/es128) |  
+| 4   | [doowb](https://github.com/doowb) |  
+| 3   | [paulmillr](https://github.com/paulmillr) |  
+| 2   | [TrySound](https://github.com/TrySound) |  
+| 2   | [MartinKolarik](https://github.com/MartinKolarik) |  
+| 2   | [tunnckoCore](https://github.com/tunnckoCore) |  
+| 1   | [amilajack](https://github.com/amilajack) |  
+| 1   | [DianeLooney](https://github.com/DianeLooney) |  
+| 1   | [UltCombo](https://github.com/UltCombo) |  
+| 1   | [tomByrer](https://github.com/tomByrer) |  
 
 ### Building docs
 
@@ -1072,4 +1072,4 @@ Released under the [MIT License](LICENSE).
 
 ***
 
-_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.6.0, on May 29, 2017._
+_This file was generated by [verb-generate-readme](https://github.com/verbose/verb-generate-readme), v0.6.0, on July 11, 2017._

package/index.js

@@ -67,18 +67,6 @@ function micromatch(list, patterns, options) {
     }
   }
 
-  // minimatch.match parity
-  if (negated && keep.length === 0) {
-    if (options && options.unixify === false) {
-      keep = list.slice();
-    } else {
-      var unixify = utils.unixify(options);
-      for (var i = 0; i < list.length; i++) {
-        keep.push(unixify(list[i]));
-      }
-    }
-  }
-
   var matches = utils.diff(keep, omit);
   if (!options || options.nodupes !== false) {
     return utils.unique(matches);
@@ -356,7 +344,8 @@ micromatch.not = function(list, patterns, options) {
   var ignore = opts.ignore;
   delete opts.ignore;
 
-  list = utils.arrayify(list);
+  var unixify = utils.unixify(opts);
+  list = utils.arrayify(list).map(unixify);
 
   var matches = utils.diff(list, micromatch(list, patterns, opts));
   if (ignore) {
@@ -519,7 +508,11 @@ micromatch.matcher = function matcher(pattern, options) {
   }
 
   var fn = test(re);
-  fn.result = re.result;
+  Object.defineProperty(fn, 'result', {
+    configurable: true,
+    enumerable: false,
+    value: re.result
+  });
   return fn;
 };
 
@@ -558,7 +551,11 @@ micromatch.makeRe = function(pattern, options) {
     });
 
     var regex = toRegex(output.join('|'), options);
-    regex.result = asts;
+    Object.defineProperty(regex, 'result', {
+      configurable: true,
+      enumerable: false,
+      value: asts
+    });
     return regex;
   }
 
@@ -590,6 +587,9 @@ micromatch.braces = function(pattern, options) {
   function expand() {
     if (options && options.nobrace === true) return [pattern];
     if (!/\{.*\}/.test(pattern)) return [pattern];
+    // if (/[!@*?+]\{/.test(pattern)) {
+    //   options = utils.extend({}, options, {expand: true});
+    // }
     return braces(pattern, options);
   }
 

package/lib/utils.js

@@ -81,7 +81,7 @@ utils.instantiate = function(ast, options) {
  */
 
 utils.createKey = function(pattern, options) {
-  if (typeof options === 'undefined') {
+  if (utils.typeOf(options) !== 'object') {
     return pattern;
   }
   var val = pattern;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "micromatch",
   "description": "Glob matching for javascript/node.js. A drop-in replacement and faster alternative to minimatch and multimatch.",
-  "version": "3.0.0",
+  "version": "3.0.4",
   "homepage": "https://github.com/micromatch/micromatch",
   "author": "Jon Schlinkert (https://github.com/jonschlinkert)",
   "contributors": [
@@ -34,30 +34,30 @@
     "test": "mocha"
   },
   "dependencies": {
-    "arr-diff": "^3.0.0",
+    "arr-diff": "^4.0.0",
     "array-unique": "^0.3.2",
-    "braces": "^2.0.3",
-    "define-property": "^0.2.5",
+    "braces": "^2.2.2",
+    "define-property": "^1.0.0",
     "extend-shallow": "^2.0.1",
     "extglob": "^1.1.0",
     "fragment-cache": "^0.2.1",
-    "kind-of": "^3.1.0",
-    "nanomatch": "^1.1.1",
+    "kind-of": "^4.0.0",
+    "nanomatch": "^1.2.0",
     "object.pick": "^1.2.0",
     "regex-not": "^1.0.0",
     "snapdragon": "^0.8.1",
     "to-regex": "^3.0.1"
   },
   "devDependencies": {
-    "bash-match": "^0.2.0",
-    "extend-shallow": "^2.0.1",
+    "bash-match": "^1.0.2",
     "for-own": "^1.0.0",
     "gulp": "^3.9.1",
+    "gulp-format-md": "^0.1.12",
     "gulp-istanbul": "^1.1.1",
-    "gulp-mocha": "^3.0.0",
+    "gulp-mocha": "^4.3.1",
     "gulp-unused": "^0.2.1",
     "is-windows": "^1.0.1",
-    "minimatch": "^3.0.3",
+    "minimatch": "^3.0.4",
     "minimist": "^1.2.0",
     "mocha": "^3.4.2",
     "multimatch": "^2.1.0"
@@ -93,8 +93,14 @@
   ],
   "lintDeps": {
     "dependencies": {
-      "lock": {
-        "snapdragon": "^0.8.1"
+      "files": [
+        "index.js",
+        "lib/**"
+      ],
+      "options": {
+        "lock": {
+          "snapdragon": "^0.8.1"
+        }
       }
     },
     "devDependencies": {
@@ -135,12 +141,12 @@
       "reflinks": true
     },
     "reflinks": [
+      "expand-brackets",
       "extglob",
       "glob-object",
       "minimatch",
       "multimatch",
-      "snapdragon",
-      "expand-brackets"
+      "snapdragon"
     ]
   }
 }