feat: axum v0.8 compatible

tamasfe · Jan 6, 2025 · 90cadd1 · 90cadd1
1 parent 507f4a8
commit 90cadd1
Show file tree

Hide file tree

Showing 16 changed files with 51 additions and 56 deletions.
diff --git a/crates/aide-axum-sqlx-tx/Cargo.toml b/crates/aide-axum-sqlx-tx/Cargo.toml
@@ -13,7 +13,7 @@ readme = "README.md"
 [dependencies]
 sqlx-06 = { package = "axum-sqlx-tx", version = "0.5.0", optional = true }
 sqlx-07 = { package = "axum-sqlx-tx", version = "0.8.0", optional = true }
-aide = { version = "0.13", path = "../aide" }
+aide = { version = "0.14", path = "../aide" }
 
 [dev-dependencies]
 sqlx = { version = "^0.7", features = ["postgres"] }

diff --git a/crates/aide-axum-typed-multipart/Cargo.toml b/crates/aide-axum-typed-multipart/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aide-axum-typed-multipart"
-version = "0.13.0"
+version = "0.14.0"
 edition = "2021"
 authors = ["emonadeo"]
 keywords = ["web", "axum", "multipart"]
@@ -10,11 +10,12 @@ description = "Type safe multipart/form-data handling for axum and aide"
 readme = "README.md"
 
 [dependencies]
-aide = { version = "0.13", path = "../aide" }
-axum = "0.7.4"
-axum_typed_multipart = { version = "0.11.0" }
+aide = { version = "0.14", path = "../aide" }
+axum = "0.8.1"
+axum_typed_multipart = { version = "0.15.1" }
 indexmap = "2.2.2"
 schemars = "0.8.16"
+async-trait = "0.1.85"
 
 [dev-dependencies]
 bytes = "1.5.0"

diff --git a/crates/aide-axum-typed-multipart/src/lib.rs b/crates/aide-axum-typed-multipart/src/lib.rs
@@ -8,11 +8,8 @@ use aide::{
     operation::set_body,
     OperationInput,
 };
-use axum::{
-    async_trait,
-    extract::{multipart::Field, FromRequest, Request},
-};
-use axum_typed_multipart::{TryFromField, TryFromMultipart};
+use axum::extract::{multipart::Field, FromRequest, Request};
+use axum_typed_multipart::{async_trait, TryFromField, TryFromMultipart};
 use indexmap::IndexMap;
 use schemars::JsonSchema;
 
@@ -29,7 +26,6 @@ impl<T> Deref for TypedMultipart<T> {
     }
 }
 
-#[async_trait]
 impl<T, S> FromRequest<S> for TypedMultipart<T>
 where
     T: TryFromMultipart,
@@ -39,7 +35,7 @@ where
 
     async fn from_request(req: Request, state: &S) -> Result<Self, Self::Rejection> {
         let a = axum_typed_multipart::TypedMultipart::from_request(req, state).await?;
-        return Ok(Self(a));
+        Ok(Self(a))
     }
 }
 

diff --git a/crates/aide/Cargo.toml b/crates/aide/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "aide"
-version = "0.13.5"
+version = "0.14.0"
 authors = ["tamasfe"]
 edition = "2021"
 keywords = ["generate", "api", "openapi", "documentation", "specification"]
@@ -21,8 +21,8 @@ aide-macros = { version = "0.7.0", path = "../aide-macros", optional = true }
 bytes = { version = "1", optional = true }
 http = { version = "1.0.0", optional = true }
 
-axum = { version = "0.7.1", optional = true, default-features = false }
-axum-extra = { version = "0.9.0", optional = true }
+axum = { version = "0.8.1", optional = true, default-features = false }
+axum-extra = { version = "0.10.0", optional = true }
 tower-layer = { version = "0.3", optional = true }
 tower-service = { version = "0.3", optional = true }
 cfg-if = "1.0.0"

diff --git a/crates/aide/src/axum/inputs.rs b/crates/aide/src/axum/inputs.rs
@@ -8,9 +8,7 @@ use crate::{
 };
 use axum::{
     body::Body,
-    extract::{
-        Extension, Form, Host, Json, MatchedPath, OriginalUri, Path, Query, RawQuery, State,
-    },
+    extract::{Extension, Form, Json, MatchedPath, OriginalUri, Path, Query, RawQuery, State},
 };
 
 #[cfg(not(feature = "axum-wasm"))]
@@ -37,7 +35,6 @@ impl OperationInput for MatchedPath {}
 impl OperationInput for OriginalUri {}
 impl OperationInput for Body {}
 impl OperationInput for RawQuery {}
-impl OperationInput for Host {}
 
 #[cfg(feature = "axum-headers")]
 impl<T> OperationInput for axum_extra::typed_header::TypedHeader<T>

diff --git a/crates/aide/src/axum/mod.rs b/crates/aide/src/axum/mod.rs
@@ -512,7 +512,7 @@ where
     #[tracing::instrument(skip_all)]
     pub fn route_service<T>(mut self, path: &str, service: T) -> Self
     where
-        T: Service<Request<Body>, Error = Infallible> + Clone + Send + 'static,
+        T: Service<Request<Body>, Error = Infallible> + Clone + Send + 'static + std::marker::Sync,
         T::Response: IntoResponse,
         T::Future: Send + 'static,
     {
@@ -525,7 +525,11 @@ where
     #[tracing::instrument(skip_all)]
     pub fn route_service_with_tsr<T>(mut self, path: &str, service: T) -> Self
     where
-        T: Service<axum::extract::Request, Error = Infallible> + Clone + Send + 'static,
+        T: Service<axum::extract::Request, Error = Infallible>
+            + Clone
+            + Send
+            + 'static
+            + std::marker::Sync,
         T::Response: IntoResponse,
         T::Future: Send + 'static,
         Self: Sized,
@@ -580,7 +584,7 @@ where
     /// to pass on the API documentation from the nested service as well.
     pub fn nest_service<T>(mut self, path: &str, svc: T) -> Self
     where
-        T: Service<Request<Body>, Error = Infallible> + Clone + Send + 'static,
+        T: Service<Request<Body>, Error = Infallible> + Clone + Send + 'static + std::marker::Sync,
         T::Response: IntoResponse,
         T::Future: Send + 'static,
     {
@@ -616,8 +620,8 @@ where
     /// See [`axum::Router::layer`] for details.
     pub fn layer<L>(self, layer: L) -> ApiRouter<S>
     where
-        L: Layer<Route> + Clone + Send + 'static,
-        L::Service: Service<Request<Body>> + Clone + Send + 'static,
+        L: Layer<Route> + Clone + Send + 'static + std::marker::Sync,
+        L::Service: Service<Request<Body>> + Clone + Send + 'static + std::marker::Sync,
         <L::Service as Service<Request<Body>>>::Response: IntoResponse + 'static,
         <L::Service as Service<Request<Body>>>::Error: Into<Infallible> + 'static,
         <L::Service as Service<Request<Body>>>::Future: Send + 'static,
@@ -631,8 +635,8 @@ where
     /// See [`axum::Router::route_layer`] for details.
     pub fn route_layer<L>(mut self, layer: L) -> Self
     where
-        L: Layer<Route> + Clone + Send + 'static,
-        L::Service: Service<Request<Body>> + Clone + Send + 'static,
+        L: Layer<Route> + Clone + Send + 'static + std::marker::Sync,
+        L::Service: Service<Request<Body>> + Clone + Send + 'static + std::marker::Sync,
         <L::Service as Service<Request<Body>>>::Response: IntoResponse + 'static,
         <L::Service as Service<Request<Body>>>::Error: Into<Infallible> + 'static,
         <L::Service as Service<Request<Body>>>::Future: Send + 'static,
@@ -654,7 +658,7 @@ where
     /// See [`axum::Router::fallback_service`] for details.
     pub fn fallback_service<T>(mut self, svc: T) -> Self
     where
-        T: Service<Request<Body>, Error = Infallible> + Clone + Send + 'static,
+        T: Service<Request<Body>, Error = Infallible> + Clone + Send + 'static + std::marker::Sync,
         T::Response: IntoResponse,
         T::Future: Send + 'static,
     {
@@ -863,7 +867,7 @@ mod tests {
     #[test]
     fn test_nesting_with_nondefault_state() {
         let _app: ApiRouter = ApiRouter::new()
-            .nest_api_service("/", ApiRouter::new().with_state(1_isize))
+            .nest_api_service("/home", ApiRouter::new().with_state(1_isize))
             .with_state(1_usize);
     }
 

diff --git a/crates/aide/src/axum/routing.rs b/crates/aide/src/axum/routing.rs
@@ -270,14 +270,14 @@ where
     /// See [`axum::routing::method_routing::MethodRouter::layer`].
     pub fn layer<L, NewError>(self, layer: L) -> ApiMethodRouter<S, NewError>
     where
-        L: Layer<Route<E>> + Clone + Send + 'static,
-        L::Service: Service<Request<Body>> + Clone + Send + 'static,
+        L: Layer<Route<E>> + Clone + Send + 'static + std::marker::Sync,
+        L::Service: Service<Request<Body>> + Clone + Send + 'static + std::marker::Sync,
         <L::Service as Service<Request<Body>>>::Response: IntoResponse + 'static,
         <L::Service as Service<Request<Body>>>::Error: Into<NewError> + 'static,
         <L::Service as Service<Request<Body>>>::Future: Send + 'static,
         E: 'static,
         S: 'static,
-        NewError: 'static,
+        NewError: 'static + std::marker::Sync,
     {
         ApiMethodRouter {
             router: self.router.layer(layer),
@@ -296,7 +296,7 @@ where
     /// See [`axum::routing::method_routing::MethodRouter::on_service`].
     pub fn on_service<T>(mut self, filter: MethodFilter, svc: T) -> Self
     where
-        T: Service<Request<Body>, Error = E> + Clone + Send + 'static,
+        T: Service<Request<Body>, Error = E> + Clone + Send + 'static + std::marker::Sync,
         T::Response: IntoResponse + 'static,
         T::Future: Send + 'static,
     {
@@ -307,7 +307,7 @@ where
     /// See [`axum::routing::method_routing::MethodRouter::fallback_service`].
     pub fn fallback_service<T>(mut self, svc: T) -> Self
     where
-        T: Service<Request<Body>, Error = E> + Clone + Send + 'static,
+        T: Service<Request<Body>, Error = E> + Clone + Send + 'static + std::marker::Sync,
         T::Response: IntoResponse + 'static,
         T::Future: Send + 'static,
     {
@@ -318,8 +318,8 @@ where
     /// See [`axum::routing::method_routing::MethodRouter::route_layer`].
     pub fn route_layer<L>(self, layer: L) -> ApiMethodRouter<S, E>
     where
-        L: Layer<Route<E>> + Clone + Send + 'static,
-        L::Service: Service<Request<Body>, Error = E> + Clone + Send + 'static,
+        L: Layer<Route<E>> + Clone + Send + 'static + std::marker::Sync,
+        L::Service: Service<Request<Body>, Error = E> + Clone + Send + 'static + std::marker::Sync,
         <L::Service as Service<Request<Body>>>::Response: IntoResponse + 'static,
         <L::Service as Service<Request<Body>>>::Future: Send + 'static,
         E: 'static,

diff --git a/crates/aide/src/helpers/no_api.rs b/crates/aide/src/helpers/no_api.rs
@@ -63,9 +63,9 @@ impl<T> OperationOutput for NoApi<T> {
 
 #[cfg(feature = "axum")]
 mod axum {
+    use axum::body::Body;
     use axum::extract::{FromRequest, FromRequestParts};
     use axum::response::{IntoResponse, IntoResponseParts, Response, ResponseParts};
-    use axum::{async_trait, body::Body};
     use http::request::Parts;
     use http::Request;
 
@@ -91,7 +91,6 @@ mod axum {
         }
     }
 
-    #[async_trait]
     impl<T, S> FromRequestParts<S> for NoApi<T>
     where
         T: FromRequestParts<S>,
@@ -104,7 +103,6 @@ mod axum {
         }
     }
 
-    #[async_trait]
     impl<T, S> FromRequest<S> for NoApi<T>
     where
         T: FromRequest<S>,

diff --git a/crates/aide/src/helpers/use_api.rs b/crates/aide/src/helpers/use_api.rs
@@ -107,9 +107,9 @@ where
 
 #[cfg(feature = "axum")]
 mod axum {
+    use axum::body::Body;
     use axum::extract::{FromRequest, FromRequestParts};
     use axum::response::{IntoResponse, IntoResponseParts, Response, ResponseParts};
-    use axum::{async_trait, body::Body};
     use http::request::Parts;
     use http::Request;
 
@@ -135,7 +135,6 @@ mod axum {
         }
     }
 
-    #[async_trait]
     impl<T, A, S> FromRequestParts<S> for UseApi<T, A>
     where
         T: FromRequestParts<S>,
@@ -151,7 +150,6 @@ mod axum {
         }
     }
 
-    #[async_trait]
     impl<T, A, S> FromRequest<S> for UseApi<T, A>
     where
         T: FromRequest<S>,

diff --git a/crates/aide/src/helpers/with_api.rs b/crates/aide/src/helpers/with_api.rs
@@ -159,9 +159,9 @@ where
 #[cfg(feature = "axum")]
 mod axum {
     use crate::helpers::with_api::ApiOverride;
+    use axum::body::Body;
     use axum::extract::{FromRequest, FromRequestParts};
     use axum::response::{IntoResponse, IntoResponseParts, Response, ResponseParts};
-    use axum::{async_trait, body::Body};
     use http::request::Parts;
     use http::Request;
 
@@ -189,7 +189,6 @@ mod axum {
         }
     }
 
-    #[async_trait]
     impl<T, S> FromRequestParts<S> for WithApi<T>
     where
         T: ApiOverride,
@@ -206,7 +205,6 @@ mod axum {
         }
     }
 
-    #[async_trait]
     impl<T, S> FromRequest<S> for WithApi<T>
     where
         T: ApiOverride,

diff --git a/crates/axum-jsonschema/Cargo.toml b/crates/axum-jsonschema/Cargo.toml
@@ -11,8 +11,7 @@ readme = "README.md"
 
 [dependencies]
 aide = { version = "0.13", path = "../aide", optional = true, features = ["axum"] }
-async-trait = "0.1.57"
-axum = { version = "0.7.1", default-features = false, features = ["json"] }
+axum = { version = "0.8.1", default-features = false, features = ["json"] }
 http = "1.0.0"
 itertools = "0.12.0"
 jsonschema = { version = "0.17.0", default-features = false }

diff --git a/crates/axum-jsonschema/src/lib.rs b/crates/axum-jsonschema/src/lib.rs
@@ -21,7 +21,6 @@ use std::{
     collections::{HashMap, VecDeque},
 };
 
-use async_trait::async_trait;
 use axum::{
     body::Body,
     extract::{rejection::JsonRejection, FromRequest},
@@ -46,7 +45,6 @@ use serde_path_to_error::Segment;
 /// message.
 pub struct Json<T>(pub T);
 
-#[async_trait]
 impl<S, T> FromRequest<S> for Json<T>
 where
     S: Send + Sync,

diff --git a/examples/example-axum-worker/Cargo.toml b/examples/example-axum-worker/Cargo.toml
@@ -19,9 +19,9 @@ aide = { path = "../../crates/aide", features = [
 tower-service = "0.3.2"
 worker = { version = "0.5.0", features = ["http", "axum"] }
 console_error_panic_hook = "0.1.7"
-axum = { version = "0.7.1", default-features = false, features = ["macros", "form", "matched-path", "query", "original-uri"] }
+axum = { version = "0.8.1", default-features = false, features = ["macros", "form", "matched-path", "query", "original-uri"] }
 axum-jsonschema = { path = "../../crates/axum-jsonschema", features = ["aide"] }
-axum-macros = "0.4.0"
+axum-macros = "0.5.0"
 schemars = { version = "0.8.10", features = ["uuid1"] }
 serde = { version = "1.0.144", features = ["derive", "rc"] }
 serde_json = "1.0.85"

diff --git a/examples/example-axum-worker/src/todos/routes.rs b/examples/example-axum-worker/src/todos/routes.rs
@@ -25,10 +25,13 @@ pub fn todo_routes(state: AppState) -> ApiRouter {
             post_with(create_todo, create_todo_docs).get_with(list_todos, list_todos_docs),
         )
         .api_route(
-            "/:id",
+            "/{id}",
             get_with(get_todo, get_todo_docs).delete_with(delete_todo, delete_todo_docs),
         )
-        .api_route("/:id/complete", put_with(complete_todo, complete_todo_docs))
+        .api_route(
+            "/{id}/complete",
+            put_with(complete_todo, complete_todo_docs),
+        )
         .with_state(state)
 }
 

diff --git a/examples/example-axum/Cargo.toml b/examples/example-axum/Cargo.toml
@@ -12,9 +12,9 @@ aide = { path = "../../crates/aide", features = [
     "axum-extra",
     "macros",
 ] }
-axum = { version = "0.7.1", features = ["macros"] }
+axum = { version = "0.8.1", features = ["macros"] }
 axum-jsonschema = { path = "../../crates/axum-jsonschema", features = ["aide"] }
-axum-macros = "0.4.0"
+axum-macros = "0.5.0"
 schemars = { version = "0.8.10", features = ["uuid1"] }
 serde = { version = "1.0.144", features = ["derive", "rc"] }
 serde_json = "1.0.85"

diff --git a/examples/example-axum/src/todos/routes.rs b/examples/example-axum/src/todos/routes.rs
@@ -25,10 +25,13 @@ pub fn todo_routes(state: AppState) -> ApiRouter {
             post_with(create_todo, create_todo_docs).get_with(list_todos, list_todos_docs),
         )
         .api_route(
-            "/:id",
+            "/{id}",
             get_with(get_todo, get_todo_docs).delete_with(delete_todo, delete_todo_docs),
         )
-        .api_route("/:id/complete", put_with(complete_todo, complete_todo_docs))
+        .api_route(
+            "/{id}/complete",
+            put_with(complete_todo, complete_todo_docs),
+        )
         .with_state(state)
 }