optimize out .. pattern parts where they're redundant

isaacs · Feb 13, 2023 · 8c42d42 · 8c42d42
1 parent ee4861b
commit 8c42d42
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 2 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -382,6 +382,8 @@ export class Minimatch {
       // ** is * anyway
       this.globParts = rawGlobParts
     } else {
+      // do this swap BEFORE the reduce, so that we can turn a string
+      // of **/*/**/* into */*/**/** and then reduce the **'s into one
       for (const parts of rawGlobParts) {
         let swapped: boolean
         do {
@@ -397,9 +399,17 @@ export class Minimatch {
       }
       this.globParts = rawGlobParts.map(parts =>
         parts.reduce((set: string[], part) => {
-          if (part !== '**' || set[set.length - 1] !== '**') {
-            set.push(part)
+          const prev = set[set.length - 1]
+          if (part === '**' && prev === '**') {
+            return set
           }
+          if (part === '..') {
+            if (prev && prev !== '..' && prev !== '.' && prev !== '**') {
+              set.pop()
+              return set
+            }
+          }
+          set.push(part)
           return set
         }, [])
       )

diff --git a/tap-snapshots/test/basic.js.test.cjs b/tap-snapshots/test/basic.js.test.cjs
@@ -597,6 +597,18 @@ exports[`test/basic.js TAP basic tests > makeRe s/\\..*// 1`] = `
 /^(?:s\\/(?=.)\\.\\.[^/]*?\\/)$/
 `
 
+exports[`test/basic.js TAP basic tests > makeRe x/*/../../a/b/c 1`] = `
+/^(?:a\\/b\\/c)$/
+`
+
+exports[`test/basic.js TAP basic tests > makeRe x/*/../a/b/c 1`] = `
+/^(?:x\\/a\\/b\\/c)$/
+`
+
+exports[`test/basic.js TAP basic tests > makeRe x/z/../*/a/b/c 1`] = `
+/^(?:x\\/(?!\\.)(?=.)[^/]*?\\/a\\/b\\/c)$/
+`
+
 exports[`test/basic.js TAP basic tests > makeRe {/*,*} 1`] = `
 /^(?:\\/(?!\\.)(?=.)[^/]*?|(?!\\.)(?=.)[^/]*?)$/
 `

diff --git a/test/patterns.js b/test/patterns.js
@@ -408,6 +408,17 @@ module.exports = [
     ['.a', '.a.js', '.js', 'a', 'a.js', 'js', 'a.JS', '.a.JS', '.JS', 'JS'],
     { dot: true },
   ],
+
+  () => (files = [
+    'x/y/z/a/b/c',
+    'x/y/a/b/c',
+    'x/z/a/b/c',
+    'x/a/b/c',
+    'a/b/c',
+  ]),
+  ['x/*/../a/b/c', ['x/a/b/c']],
+  ['x/z/../*/a/b/c', ['x/y/a/b/c', 'x/z/a/b/c']],
+  ['x/*/../../a/b/c', ['a/b/c']],
 ]
 
 Object.defineProperty(module.exports, 'files', {