Support wildcards in typed paths (#1003)

* Support wildcards in typed paths * changelog
tokio-rs · May 6, 2022 · b5183af · b5183af
1 parent 4ff78e5
commit b5183af
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/axum-extra/CHANGELOG.md b/axum-extra/CHANGELOG.md
@@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning].
 # Unreleased
 
 - **fixed:** `Option` and `Result` are now supported in typed path route handler parameters ([#1001])
+- **fixed:** Support wildcards in typed paths ([#1003])
 
 [#1001]: https://github.com/tokio-rs/axum/pull/1001
+[#1003]: https://github.com/tokio-rs/axum/pull/1003
 
 # 0.3.0 (27. April, 2022)
 

diff --git a/axum-macros/CHANGELOG.md b/axum-macros/CHANGELOG.md
@@ -8,8 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 # Unreleased
 
 - **fixed:** `Option` and `Result` are now supported in typed path route handler parameters ([#1001])
+- **fixed:** Support wildcards in typed paths ([#1003])
 
 [#1001]: https://github.com/tokio-rs/axum/pull/1001
+[#1003]: https://github.com/tokio-rs/axum/pull/1003
 
 # 0.2.0 (31. March, 2022)
 

diff --git a/axum-macros/src/typed_path.rs b/axum-macros/src/typed_path.rs
@@ -297,14 +297,10 @@ fn parse_path(path: &LitStr) -> syn::Result<Vec<Segment>> {
     path.value()
         .split('/')
         .map(|segment| {
-            if segment.contains('*') {
-                return Err(syn::Error::new_spanned(
-                    path,
-                    "`typed_path` cannot contain wildcards",
-                ));
-            }
-
-            if let Some(capture) = segment.strip_prefix(':') {
+            if let Some(capture) = segment
+                .strip_prefix(':')
+                .or_else(|| segment.strip_prefix('*'))
+            {
                 Ok(Segment::Capture(capture.to_owned(), path.span()))
             } else {
                 Ok(Segment::Static(segment.to_owned()))

diff --git a/axum-macros/tests/typed_path/fail/wildcard.rs b/axum-macros/tests/typed_path/fail/wildcard.rs
diff --git a/axum-macros/tests/typed_path/fail/wildcard.stderr b/axum-macros/tests/typed_path/fail/wildcard.stderr
diff --git a/axum-macros/tests/typed_path/pass/wildcards.rs b/axum-macros/tests/typed_path/pass/wildcards.rs
@@ -0,0 +1,12 @@
+use axum_extra::routing::{RouterExt, TypedPath};
+use serde::Deserialize;
+
+#[derive(TypedPath, Deserialize)]
+#[typed_path("/*rest")]
+struct MyPath {
+    rest: String,
+}
+
+fn main() {
+    axum::Router::<axum::body::Body>::new().typed_get(|_: MyPath| async {});
+}