Progressing

Author: dantleech

src/Util/FileMatcher.php

@@ -28,8 +28,9 @@
     private const T_SLASH = 'slash';
     private const T_BACKSLASH = 'backslash';
     private const T_CHAR = 'char';
-    private const T_GLOBSTAR = 'globstar';
+    private const T_GREEDY_GLOBSTAR = 'greedy_globstar';
     private const T_QUERY = 'query';
+    private const T_GLOBSTAR = 'globstar';
 
 
     public static function match(string $path, FileMatcherPattern $pattern): bool
@@ -58,18 +59,22 @@ public static function toRegEx($glob, $flags = 0): string
             $type = $token[0];
             $regex .= match ($type) {
                 // literal char
-                self::T_CHAR => $token[1] ?? throw new Exception('Expected char token to have a value'),
+                self::T_CHAR => preg_quote($token[1]),
 
                 // literal directory separator
                 self::T_SLASH => '/',
                 self::T_QUERY => '.',
 
                 // match any segment up until the next directory separator
                 self::T_ASTERIX => '[^/]*',
-                self::T_GLOBSTAR => '.*',
+                self::T_GREEDY_GLOBSTAR => '.*',
+                self::T_GLOBSTAR => '/([^/]+/)*',
                 default => '',
             };
         }
+        $regex .= '(/|$)';
+        dump($tokens);
+        dump($regex);
 
         return '{^'.$regex.'}';
     }
@@ -133,9 +138,33 @@ private static function processTokens(array $tokens): array
                 continue;
             }
 
-            if ($type === self::T_ASTERIX && ($tokens[$offset + 1] ?? null) === self::T_ASTERIX) {
-                $offset++;
+            // normal globstar
+            if (
+                $type === self::T_SLASH &&
+                ($tokens[$offset + 1][0] ?? null) === self::T_ASTERIX && ($tokens[$offset + 2][0] ?? null) === self::T_ASTERIX && ($tokens[$offset + 3][0] ?? null) === self::T_SLASH
+            ) {
                 $resolved[] = [self::T_GLOBSTAR, '**'];
+
+                // we eat the two `*` in addition to the slash
+                $offset += 3;
+                continue;
+            }
+
+            // greedy globstar (trailing?)
+            if (
+                $type === self::T_SLASH &&
+                ($tokens[$offset + 1][0] ?? null) === self::T_ASTERIX && ($tokens[$offset + 2][0] ?? null) === self::T_ASTERIX
+            ) {
+                $resolved[] = [self::T_GREEDY_GLOBSTAR, '**'];
+
+                // we eat the two `*` in addition to the slash
+                $offset += 2;
+                continue;
+            }
+
+            if ($type === self::T_ASTERIX && ($tokens[$offset + 1][0] ?? null) === self::T_ASTERIX) {
+                $resolved[] = [self::T_CHAR, $char];
+                $resolved[] = [self::T_CHAR, $char];
                 continue;
             }