feat: relax handler bounds, add more utility impls

Author: matteopolak

README.md

@@ -29,7 +29,7 @@ Here's a quick example that can do the following:
 ```rust
 use axum::{Router, response::IntoResponse};
 use axum_codec::{
-  handler::IntoCodecResponse,
+  response::IntoCodecResponse,
   routing::{get, post},
   Codec,
   extract::Accept,

examples/aide-validator/src/main.rs

@@ -1,11 +1,10 @@
 use std::sync::Arc;
 
 use aide::axum::ApiRouter;
-use axum::{extract::State, response::IntoResponse, Extension};
+use axum::{extract::State, Extension};
 use axum_codec::{
-	handler::IntoCodecResponse,
 	routing::{get, post},
-	Codec,
+	Codec, IntoCodecResponse,
 };
 
 #[axum_codec::apply(encode, decode)]
@@ -37,7 +36,7 @@ async fn state(State(state): State<String>) -> Codec<Greeting> {
 	Codec(Greeting { message: state })
 }
 
-async fn openapi(Extension(api): Extension<Arc<aide::openapi::OpenApi>>) -> impl IntoResponse {
+async fn openapi(Extension(api): Extension<Arc<aide::openapi::OpenApi>>) -> impl IntoCodecResponse {
 	axum::Json(api)
 }
 
@@ -49,7 +48,7 @@ async fn main() {
 		.api_route("/me", get(me).into())
 		.api_route("/greet", post(greet).into())
 		.api_route("/state", get(state).into())
-		.route("/openapi.json", axum::routing::get(openapi))
+		.route("/openapi.json", get(openapi))
 		.finish_api(&mut api)
 		.layer(Extension(Arc::new(api)))
 		.with_state("Hello, world!".to_string());

examples/basic/src/main.rs

@@ -3,9 +3,8 @@ use axum::{
 	Router,
 };
 use axum_codec::{
-	handler::IntoCodecResponse,
 	routing::{get, post},
-	Codec,
+	Codec, IntoCodecResponse,
 };
 
 #[axum_codec::apply(encode, decode)]

macros/src/lib.rs

@@ -253,17 +253,6 @@ mod __private {
 			});
 		}
 
-		#[cfg(feature = "aide")]
-		{
-			if !constraints.is_empty() {
-				constraints.extend(quote! { + });
-			}
-
-			constraints.extend(quote! {
-				schemars::JsonSchema
-			});
-		}
-
 		#[cfg(feature = "validator")]
 		{
 			if !constraints.is_empty() {
@@ -350,17 +339,6 @@ mod __private {
 			});
 		}
 
-		#[cfg(feature = "aide")]
-		{
-			if !constraints.is_empty() {
-				constraints.extend(quote! { + });
-			}
-
-			constraints.extend(quote! {
-				schemars::JsonSchema
-			});
-		}
-
 		codec_trait.extend(constraints.clone());
 		codec_impl.extend(constraints);
 

src/handler.rs

@@ -6,46 +6,7 @@ use axum::{
 	response::{IntoResponse, Response},
 };
 
-use crate::{Accept, Codec, CodecEncode, ContentType};
-
-#[cfg(not(feature = "aide"))]
-pub trait IntoCodecResponse {
-	fn into_codec_response(self, content_type: ContentType) -> Response;
-}
-
-#[cfg(feature = "aide")]
-pub trait IntoCodecResponse: schemars::JsonSchema {
-	fn into_codec_response(self, content_type: ContentType) -> Response;
-}
-
-#[cfg(not(feature = "aide"))]
-impl<R> IntoCodecResponse for R
-where
-	R: IntoResponse,
-{
-	fn into_codec_response(self, _content_type: ContentType) -> Response {
-		self.into_response()
-	}
-}
-
-#[cfg(feature = "aide")]
-impl<R> IntoCodecResponse for R
-where
-	R: IntoResponse + schemars::JsonSchema,
-{
-	fn into_codec_response(self, _content_type: ContentType) -> Response {
-		self.into_response()
-	}
-}
-
-impl<D> IntoCodecResponse for Codec<D>
-where
-	D: CodecEncode,
-{
-	fn into_codec_response(self, content_type: ContentType) -> Response {
-		self.to_response(content_type)
-	}
-}
+use crate::{Accept, IntoCodecResponse};
 
 #[cfg(not(feature = "aide"))]
 pub trait Input {}
@@ -114,30 +75,38 @@ where
 #[cfg(feature = "aide")]
 impl<H, I, D> aide::OperationOutput for CodecHandlerFn<H, I, D>
 where
-	Codec<D>: aide::OperationOutput,
+	D: aide::OperationOutput,
 {
-	type Inner = <Codec<D> as aide::OperationOutput>::Inner;
+	type Inner = D;
 
 	fn operation_response(
 		ctx: &mut aide::gen::GenContext,
 		operation: &mut aide::openapi::Operation,
 	) -> Option<aide::openapi::Response> {
-		<Codec<D> as aide::OperationOutput>::operation_response(ctx, operation)
+		D::operation_response(ctx, operation)
 	}
 
 	fn inferred_responses(
 		ctx: &mut aide::gen::GenContext,
 		operation: &mut aide::openapi::Operation,
 	) -> Vec<(Option<u16>, aide::openapi::Response)> {
-		<Codec<D> as aide::OperationOutput>::inferred_responses(ctx, operation)
+		D::inferred_responses(ctx, operation)
 	}
 }
 
 #[cfg(feature = "aide")]
-impl<F, I, D> aide::operation::OperationHandler<I, Codec<D>> for CodecHandlerFn<F, I, D>
+impl<F, I, D> aide::operation::OperationHandler<I, crate::Codec<D>> for CodecHandlerFn<F, I, D>
+where
+	I: aide::OperationInput,
+	D: schemars::JsonSchema,
+{
+}
+
+#[cfg(feature = "aide")]
+impl<F, I, D> aide::operation::OperationHandler<I, D> for CodecHandlerFn<F, I, D>
 where
 	I: aide::OperationInput,
-	Codec<D>: aide::OperationOutput,
+	D: aide::OperationOutput,
 {
 }
 

src/lib.rs

@@ -9,6 +9,7 @@ mod encode;
 pub mod extract;
 pub mod handler;
 mod rejection;
+pub mod response;
 pub mod routing;
 
 use core::{
@@ -18,7 +19,7 @@ use core::{
 
 pub use {
 	content::ContentType, decode::CodecDecode, encode::CodecEncode, extract::Accept,
-	handler::CodecHandler, rejection::CodecRejection,
+	handler::CodecHandler, rejection::CodecRejection, response::IntoCodecResponse,
 };
 
 use axum::{
@@ -44,7 +45,6 @@ pub mod __private {
 
 pub use axum_codec_macros as macros;
 
-use handler::IntoCodecResponse;
 #[cfg(feature = "macros")]
 pub use macros::apply;
 
@@ -166,20 +166,6 @@ where
 	}
 }
 
-#[cfg(feature = "aide")]
-impl<T> schemars::JsonSchema for Codec<T>
-where
-	T: schemars::JsonSchema,
-{
-	fn schema_name() -> String {
-		T::schema_name()
-	}
-
-	fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-		T::json_schema(gen)
-	}
-}
-
 #[cfg(feature = "aide")]
 impl<T> aide::operation::OperationInput for Codec<T>
 where
@@ -202,7 +188,7 @@ impl<T> aide::operation::OperationOutput for Codec<T>
 where
 	T: schemars::JsonSchema,
 {
-	type Inner = <axum::Json<T> as aide::operation::OperationOutput>::Inner;
+	type Inner = T;
 
 	fn operation_response(
 		ctx: &mut aide::gen::GenContext,

src/rejection.rs

@@ -1,6 +1,6 @@
 use axum::{extract::rejection::BytesRejection, response::Response};
 
-use crate::{handler::IntoCodecResponse, ContentType};
+use crate::{ContentType, IntoCodecResponse};
 
 /// Rejection used for [`Codec`](crate::Codec).
 ///
@@ -47,13 +47,21 @@ impl IntoCodecResponse for CodecRejection {
 }
 
 #[cfg(feature = "aide")]
-impl schemars::JsonSchema for CodecRejection {
-	fn schema_name() -> String {
-		Message::schema_name()
+impl aide::OperationOutput for CodecRejection {
+	type Inner = Message;
+
+	fn operation_response(
+		ctx: &mut aide::gen::GenContext,
+		operation: &mut aide::openapi::Operation,
+	) -> Option<aide::openapi::Response> {
+		axum::Json::<Message>::operation_response(ctx, operation)
 	}
 
-	fn json_schema(gen: &mut schemars::gen::SchemaGenerator) -> schemars::schema::Schema {
-		Message::json_schema(gen)
+	fn inferred_responses(
+		ctx: &mut aide::gen::GenContext,
+		operation: &mut aide::openapi::Operation,
+	) -> Vec<(Option<u16>, aide::openapi::Response)> {
+		axum::Json::<Message>::inferred_responses(ctx, operation)
 	}
 }
 
@@ -77,6 +85,25 @@ pub struct Message {
 	pub content: String,
 }
 
+#[cfg(feature = "aide")]
+impl aide::OperationOutput for Message {
+	type Inner = Self;
+
+	fn operation_response(
+		ctx: &mut aide::gen::GenContext,
+		operation: &mut aide::openapi::Operation,
+	) -> Option<aide::openapi::Response> {
+		axum::Json::<Self>::operation_response(ctx, operation)
+	}
+
+	fn inferred_responses(
+		ctx: &mut aide::gen::GenContext,
+		operation: &mut aide::openapi::Operation,
+	) -> Vec<(Option<u16>, aide::openapi::Response)> {
+		axum::Json::<Self>::inferred_responses(ctx, operation)
+	}
+}
+
 impl CodecRejection {
 	/// Consumes the rejection and returns a pretty [`Message`] representing the error.
 	///

src/response.rs

@@ -0,0 +1,54 @@
+use axum::response::{IntoResponse, Response};
+
+use crate::{Codec, CodecEncode, ContentType};
+
+#[cfg(not(feature = "aide"))]
+pub trait IntoCodecResponse {
+	fn into_codec_response(self, content_type: ContentType) -> Response;
+}
+
+#[cfg(feature = "aide")]
+pub trait IntoCodecResponse: aide::OperationOutput {
+	fn into_codec_response(self, content_type: ContentType) -> Response;
+}
+
+#[cfg(not(feature = "aide"))]
+impl<R> IntoCodecResponse for R
+where
+	R: IntoResponse,
+{
+	fn into_codec_response(self, _content_type: ContentType) -> Response {
+		self.into_response()
+	}
+}
+
+#[cfg(feature = "aide")]
+impl<R> IntoCodecResponse for R
+where
+	R: IntoResponse + aide::OperationOutput,
+{
+	fn into_codec_response(self, _content_type: ContentType) -> Response {
+		self.into_response()
+	}
+}
+
+#[cfg(not(feature = "aide"))]
+impl<D> IntoCodecResponse for Codec<D>
+where
+	D: CodecEncode,
+{
+	fn into_codec_response(self, content_type: ContentType) -> Response {
+		self.to_response(content_type)
+	}
+}
+
+#[cfg(feature = "aide")]
+impl<D> IntoCodecResponse for Codec<D>
+where
+	D: CodecEncode,
+	Self: aide::OperationOutput,
+{
+	fn into_codec_response(self, content_type: ContentType) -> Response {
+		self.to_response(content_type)
+	}
+}

src/routing.rs

@@ -3,8 +3,8 @@ use std::convert::Infallible;
 use axum::routing;
 
 use crate::{
-	handler::{CodecHandlerFn, Input, IntoCodecResponse},
-	CodecHandler,
+	handler::{CodecHandlerFn, Input},
+	CodecHandler, IntoCodecResponse,
 };
 
 /// A light wrapper around axum's [`MethodRouter`](axum::routing::MethodRouter) (or [`ApiMethodRouter`](aide::axum::routing::ApiMethodRouter) if the `aide` feature is enabled).
@@ -98,7 +98,6 @@ macro_rules! method_router_chain_method {
 			H: CodecHandler<T, I, D, S> + Clone + Send + Sync + 'static,
 			I: Input + Send + 'static,
 			D: IntoCodecResponse + Send + 'static,
-			crate::Codec<D>: aide::OperationOutput,
 			S: Clone + Send + Sync + 'static,
 			T: 'static,
 		{
@@ -113,7 +112,6 @@ macro_rules! method_router_chain_method {
 			H: CodecHandler<T, I, D, S> + Clone + Send + Sync + 'static,
 			I: Input + Send + 'static,
 			D: IntoCodecResponse + Send + 'static,
-			crate::Codec<D>: aide::OperationOutput,
 			S: Clone + Send + Sync + 'static,
 			T: 'static,
 			F: FnOnce(aide::transform::TransformOperation) -> aide::transform::TransformOperation,
@@ -164,7 +162,6 @@ macro_rules! method_router_top_level {
 			H: CodecHandler<T, I, D, S> + Clone + Send + Sync + 'static,
 			I: Input + Send + 'static,
 			D: IntoCodecResponse + Send + 'static,
-			crate::Codec<D>: aide::OperationOutput,
 			S: Clone + Send + Sync + 'static,
 			T: 'static,
 		{
@@ -180,7 +177,6 @@ macro_rules! method_router_top_level {
 			H: CodecHandler<T, I, D, S> + Clone + Send + Sync + 'static,
 			I: Input + Send + 'static,
 			D: IntoCodecResponse + Send + Sync + 'static,
-			crate::Codec<D>: aide::OperationOutput,
 			S: Clone + Send + Sync + 'static,
 			T: 'static,
 			F: FnOnce(aide::transform::TransformOperation) -> aide::transform::TransformOperation,