refactor: iterative wildcard collapsing and add test for consecutive wildcards (#1012)

srpvpn · web-flow · commit 0265fcd786c9 · 2025-08-26T14:03:15.000+02:00
Co-authored-by: srpvpn &lt;srpvpn@users.noreply.github.com&gt;
diff --git a/context.go b/context.go
@@ -133,11 +133,12 @@ func (x *Context) RoutePattern() string {
 	return routePattern
 }
 
-// replaceWildcards takes a route pattern and recursively replaces all
-// occurrences of "/*/" to "/".
+// replaceWildcards takes a route pattern and replaces all occurrences of
+// "/*/" with "/". It iteratively runs until no wildcards remain to
+// correctly handle consecutive wildcards.
 func replaceWildcards(p string) string {
-	if strings.Contains(p, "/*/") {
-		return replaceWildcards(strings.Replace(p, "/*/", "/", -1))
+	for strings.Contains(p, "/*/") {
+		p = strings.ReplaceAll(p, "/*/", "/")
 	}
 	return p
 }
diff --git a/context_test.go b/context_test.go
@@ -91,3 +91,14 @@ func TestRoutePattern(t *testing.T) {
 		t.Fatalf("unexpected non-empty route pattern for nil context: %q", p)
 	}
 }
+
+// TestReplaceWildcardsConsecutive ensures multiple consecutive wildcards are
+// collapsed into a single slash.
+func TestReplaceWildcardsConsecutive(t *testing.T) {
+	if p := replaceWildcards("/foo/*/*/*/bar"); p != "/foo/bar" {
+		t.Fatalf("unexpected wildcard replacement: %s", p)
+	}
+	if p := replaceWildcards("/foo/*/*/*/bar/*"); p != "/foo/bar/*" {
+		t.Fatalf("unexpected trailing wildcard behavior: %s", p)
+	}
+}

Original file line number	Diff line number	Diff line change
`@@ -133,11 +133,12 @@ func (x *Context) RoutePattern() string {`
`133`	`133`	`return routePattern`
`134`	`134`	`}`
`135`	`135`
`136`		`-// replaceWildcards takes a route pattern and recursively replaces all`
`137`		`-// occurrences of "/*/" to "/".`
	`136`	`+// replaceWildcards takes a route pattern and replaces all occurrences of`
	`137`	`+// "/*/" with "/". It iteratively runs until no wildcards remain to`
	`138`	`+// correctly handle consecutive wildcards.`
`138`	`139`	`func replaceWildcards(p string) string {`
`139`		`- if strings.Contains(p, "/*/") {`
`140`		`- return replaceWildcards(strings.Replace(p, "/*/", "/", -1))`
	`140`	`+ for strings.Contains(p, "/*/") {`
	`141`	`+ p = strings.ReplaceAll(p, "/*/", "/")`
`141`	`142`	`}`
`142`	`143`	`return p`
`143`	`144`	`}`