minimatch 4.2.0 → 5.0.1

package/README.md

@@ -35,6 +35,20 @@ See:
 * `man 3 fnmatch`
 * `man 5 gitignore`
 
+## Windows
+
+**Please only use forward-slashes in glob expressions.**
+
+Though windows uses either `/` or `\` as its path separator, only `/`
+characters are used by this glob implementation.  You must use
+forward-slashes **only** in glob expressions.  Back-slashes in patterns
+will always be interpreted as escape characters, not path separators.
+
+Note that `\` or `/` _will_ be interpreted as path separators in paths on
+Windows, and will match against `/` in glob expressions.
+
+So just always use `/` in patterns.
+
 ## Minimatch Class
 
 Create a minimatch object by instantiating the `minimatch.Minimatch` class.
@@ -187,12 +201,6 @@ minimatch('/a/b', '/**/d', { partial: true })     // true, might be /a/b/.../d
 minimatch('/x/y/z', '/a/**/z', { partial: true }) // false, because x !== a
 ```
 
-### allowWindowsEscape
-
-Windows path separator `\` is by default converted to `/`, which
-prohibits the usage of `\` as a escape character. This flag skips that
-behavior and allows using the escape character.
-
 ## Comparisons to other fnmatch/glob implementations
 
 While strict compliance with the existing standards is a worthwhile
@@ -228,3 +236,9 @@ other interpretation of the glob pattern.  Thus, a pattern like
 `+(a|{b),c)}`, which would not be valid in bash or zsh, is expanded
 **first** into the set of `+(a|b)` and `+(a|c)`, and those patterns are
 checked for validity.  Since those two are valid, matching proceeds.
+
+Note that `fnmatch(3)` in libc is an extremely naive string comparison
+matcher, which does not do anything special for slashes.  This library is
+designed to be used in glob searching and file walkers, and so it does do
+special things with `/`.  Thus, `foo*` will not match `foo/bar` in this
+library, even though it would in `fnmatch(3)`.

package/lib/path.js

@@ -0,0 +1,4 @@
+const isWindows = typeof process === 'object' &&
+  process &&
+  process.platform === 'win32'
+module.exports = isWindows ? { sep: '\\' } : { sep: '/' }

package/minimatch.js

@@ -11,9 +11,7 @@ const minimatch = module.exports = (p, pattern, options = {}) => {
 
 module.exports = minimatch
 
-const path = (() => { try { return require('path') } catch (e) {}})() || {
-  sep: '/'
-}
+const path = require('./lib/path.js')
 minimatch.sep = path.sep
 
 const GLOBSTAR = Symbol('globstar **')
@@ -167,11 +165,6 @@ class Minimatch {
 
     if (!options) options = {}
 
-    // windows support: need to use /, not \
-    if (!options.allowWindowsEscape && path.sep !== '/') {
-      pattern = pattern.split(path.sep).join('/')
-    }
-
     this.options = options
     this.set = []
     this.pattern = pattern
@@ -472,8 +465,16 @@ class Minimatch {
       this.debug('%s\t%s %s %j', pattern, i, re, c)
 
       // skip over any that are escaped.
-      if (escaping && reSpecials[c]) {
-        re += '\\' + c
+      if (escaping) {
+        /* istanbul ignore next - completely not allowed, even escaped. */
+        if (c === '/') {
+          return false
+        }
+
+        if (reSpecials[c]) {
+          re += '\\'
+        }
+        re += c
         escaping = false
         continue
       }
@@ -481,7 +482,6 @@ class Minimatch {
       switch (c) {
         /* istanbul ignore next */
         case '/': {
-          // completely not allowed, even escaped.
           // Should already be path-split by now.
           return false
         }
@@ -564,9 +564,8 @@ class Minimatch {
         continue
 
         case '|':
-          if (inClass || !patternListStack.length || escaping) {
+          if (inClass || !patternListStack.length) {
             re += '\\|'
-            escaping = false
             continue
           }
 
@@ -597,7 +596,6 @@ class Minimatch {
           //  first in the list.  -- POSIX.2 2.8.3.2
           if (i === classStart + 1 || !inClass) {
             re += '\\' + c
-            escaping = false
             continue
           }
 
@@ -632,15 +630,12 @@ class Minimatch {
           // swallow any state char that wasn't consumed
           clearStateChar()
 
-          if (escaping) {
-            // no need
-            escaping = false
-          } else if (reSpecials[c]
-            && !(c === '^' && inClass)) {
+          if (reSpecials[c] && !(c === '^' && inClass)) {
             re += '\\'
           }
 
           re += c
+          break
 
       } // switch
     } // for
@@ -670,6 +665,7 @@ class Minimatch {
       this.debug('setting tail', re, pl)
       // maybe some even number of \, then maybe 1 \, followed by a |
       tail = tail.replace(/((?:\\{2}){0,64})(\\?)\|/g, (_, $1, $2) => {
+        /* istanbul ignore else - should already be done */
         if (!$2) {
           // the | isn't already escaped, so escape it.
           $2 = '\\'

package/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": "4.2.0",
+  "version": "5.0.1",
   "repository": {
     "type": "git",
     "url": "git://github.com/isaacs/minimatch.git"
@@ -19,13 +19,14 @@
     "node": ">=10"
   },
   "dependencies": {
-    "brace-expansion": "^1.1.7"
+    "brace-expansion": "^2.0.1"
   },
   "devDependencies": {
     "tap": "^15.1.6"
   },
   "license": "ISC",
   "files": [
-    "minimatch.js"
+    "minimatch.js",
+    "lib"
   ]
 }