summaryrefslogtreecommitdiff
path: root/pathrouter/catchallvariable.go
diff options
context:
space:
mode:
Diffstat (limited to 'pathrouter/catchallvariable.go')
-rw-r--r--pathrouter/catchallvariable.go11
1 files changed, 6 insertions, 5 deletions
diff --git a/pathrouter/catchallvariable.go b/pathrouter/catchallvariable.go
index 1b98672..d1d3e2c 100644
--- a/pathrouter/catchallvariable.go
+++ b/pathrouter/catchallvariable.go
@@ -10,9 +10,10 @@ import (
)
// CatchAllVariable is a [Matcher] that accepts subpaths with an arbitrary number of path elements.
-// The value of any amount of leading path elements will be collected into vars[name],
+// The value of any amount of leading path elements will be collected into the [Context],
// such that the remainder is accepted by the next matcher.
-// At least one element must be collected into vars[name].
+// At least one element must be collected.
+// The full sequence of collected path elements can be retrieved with [Context.Variable].
//
// CatchAllVariable() may appear at any point within the routing tree,
// but it may not contain another CatchAllVariable() anywhere within it.
@@ -32,7 +33,7 @@ func catchAllVariable(name string, matcher realMatcher) Matcher {
panic("matcher within CatchAllVariable() may not accept unlimited path lengths")
}
- accept := func(path []string, vars map[string]string) HandlerFunc {
+ accept := func(path []string, rc Context) HandlerFunc {
for length := innerMinLength; length <= innerMaxLength; length++ {
if length > len(path) {
break
@@ -42,11 +43,11 @@ func catchAllVariable(name string, matcher realMatcher) Matcher {
continue
}
- handlerFunc := matcher.accept(subpath, vars)
+ handlerFunc := matcher.accept(subpath, rc)
if handlerFunc == nil {
continue
}
- vars[name] = pathUnescape(strings.Join(caughtPath, "/"))
+ rc.vars[name] = pathUnescape(strings.Join(caughtPath, "/"))
return handlerFunc
}
return nil