feat: Use https://github.com/Azuyamat/globber for glob pattern of watcher

Author: Azuyamat

go.mod

@@ -6,6 +6,7 @@ toolchain go1.24.10
 
 require (
 	github.com/azuyamat/gear v0.0.0-20251118045405-f2133a4d3c3a
+	github.com/azuyamat/globber v0.0.0-20251126020500-7fa19a3402a2
 	github.com/fsnotify/fsnotify v1.9.0
 )
 

go.sum

@@ -1,5 +1,7 @@
 github.com/azuyamat/gear v0.0.0-20251118045405-f2133a4d3c3a h1:lsdZXJX9/D6xsvmDhBsmt0O4JndCvbwyAnURauI35TA=
 github.com/azuyamat/gear v0.0.0-20251118045405-f2133a4d3c3a/go.mod h1:r+5DrbDCyAmVC3AOtSxvZivpSoIxwV6/KsaA0IUExB8=
+github.com/azuyamat/globber v0.0.0-20251126020500-7fa19a3402a2 h1:uPR9bpHS0tmHde8FD0200Swu9qdjZcN+zOGypEl27Hw=
+github.com/azuyamat/globber v0.0.0-20251126020500-7fa19a3402a2/go.mod h1:p4AYsIvRO0SFjr0MH2hyEgO3085qZkIa3ymrrj/bxvw=
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=

internal/runner/glob.go

@@ -1,48 +1,18 @@
 package runner
 
 import (
-	"fmt"
-	"os"
+	"io/fs"
 	"path/filepath"
-	"strings"
+
+	"github.com/azuyamat/globber/glob"
 )
 
 func expandGlobPattern(pattern string) ([]string, error) {
-	if !containsDoublestar(pattern) {
-		return filepath.Glob(pattern)
-	}
-
-	return expandDoublestar(pattern)
-}
-
-func containsDoublestar(pattern string) bool {
-	return len(pattern) >= 2 && (pattern[:2] == "**" ||
-		(len(pattern) >= 3 && pattern[len(pattern)-3:] == "/**") ||
-		strings.Contains(pattern, "/**/") || strings.Contains(pattern, "\\**\\"))
-}
-
-func expandDoublestar(pattern string) ([]string, error) {
 	var matches []string
 
-	parts := splitPattern(pattern)
-	if len(parts) == 0 {
-		return nil, fmt.Errorf("invalid pattern")
-	}
-
-	baseDir := "."
-	filePattern := parts[len(parts)-1]
-
-	err := filepath.Walk(baseDir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return nil
-		}
-
-		if !info.IsDir() {
-			if matched, _ := filepath.Match(filePattern, info.Name()); matched {
-				matches = append(matches, path)
-			}
-		}
-
+	fsMatcher := glob.FSMatcher(pattern)
+	err := fsMatcher.WalkDirFS(".", func(path string, entry fs.DirEntry) error {
+		matches = append(matches, path)
 		return nil
 	})
 
@@ -53,24 +23,9 @@ func expandDoublestar(pattern string) ([]string, error) {
 	return matches, nil
 }
 
-func splitPattern(pattern string) []string {
-	var parts []string
-	var current strings.Builder
-
-	for i := 0; i < len(pattern); i++ {
-		if pattern[i] == '/' || pattern[i] == '\\' {
-			if current.Len() > 0 {
-				parts = append(parts, current.String())
-				current.Reset()
-			}
-		} else {
-			current.WriteByte(pattern[i])
-		}
-	}
-
-	if current.Len() > 0 {
-		parts = append(parts, current.String())
-	}
-
-	return parts
+func matchesGlobPattern(pattern, filePath string) bool {
+	matcher := glob.Matcher(pattern)
+	normalizedPath := filepath.ToSlash(filePath)
+	matches, _ := matcher.Matches(normalizedPath)
+	return matches
 }

internal/runner/watcher.go

@@ -55,7 +55,7 @@ func (w *Watcher) setupWatchPaths(watcher *fsnotify.Watcher) error {
 	dirs := make(map[string]bool)
 
 	for _, pattern := range w.patterns {
-		matches, err := w.expandPattern(pattern)
+		matches, err := expandGlobPattern(pattern)
 		if err != nil {
 			w.log.Warning("invalid pattern %q: %v", pattern, err)
 			continue
@@ -86,10 +86,6 @@ func (w *Watcher) setupWatchPaths(watcher *fsnotify.Watcher) error {
 	return nil
 }
 
-func (w *Watcher) expandPattern(pattern string) ([]string, error) {
-	return expandGlobPattern(pattern)
-}
-
 func (w *Watcher) eventLoop(watcher *fsnotify.Watcher) error {
 	sigChan := make(chan os.Signal, 1)
 	signal.Notify(sigChan, syscall.SIGINT, syscall.SIGTERM)
@@ -150,31 +146,9 @@ func (w *Watcher) isRelevantEvent(event fsnotify.Event) bool {
 
 func (w *Watcher) matchesPattern(filePath string) bool {
 	for _, pattern := range w.patterns {
-		if containsDoublestar(pattern) {
-			filePattern := filepath.Base(pattern)
-			if matched, err := filepath.Match(filePattern, filepath.Base(filePath)); err == nil && matched {
-				return true
-			}
-			continue
-		}
-
-		matched, err := filepath.Match(pattern, filePath)
-		if err == nil && matched {
+		if matchesGlobPattern(pattern, filePath) {
 			return true
 		}
-
-		normalizedPattern := filepath.FromSlash(pattern)
-		if matched, err := filepath.Match(normalizedPattern, filePath); err == nil && matched {
-			return true
-		}
-
-		if matched, err := filepath.Match(filepath.Base(pattern), filepath.Base(filePath)); err == nil && matched {
-			patternDir := filepath.Dir(pattern)
-			fileDir := filepath.Dir(filePath)
-			if patternDir == fileDir || patternDir == "." {
-				return true
-			}
-		}
 	}
 	return false
 }