1 files changed, 85 insertions, 3 deletions

diff --git a/src/axum.rs b/src/axum.rs
index bba133c..3b603f3 100644
--- a/src/axum.rs
+++ b/src/axum.rs
@@ -43,7 +43,7 @@ use axum::{
 /// }
 ///
 /// fn main() {
-///     let app = Router::<(), Body>::new()
+///     let app = Router::<()>::new()
 ///         .route("/users", get(filter_users));
 /// }
 pub struct QsQuery<T>(pub T);
@@ -68,7 +68,6 @@ impl<T: std::fmt::Debug> std::fmt::Debug for QsQuery<T> {
     }
 }
 
-#[axum::async_trait]
 impl<T, S> FromRequestParts<S> for QsQuery<T>
 where
     T: serde::de::DeserializeOwned,
@@ -96,6 +95,89 @@ where
     }
 }
 
+/// Extractor that differentiates between the absence and presence of the query string
+/// using `Option<T>`. Absence of query string encoded as `None`. Otherwise, it behaves
+/// identical to the `QsQuery`.
+///
+/// ## Example
+///
+/// ```rust
+/// # extern crate axum_framework as axum;
+/// use serde_qs::axum::OptionalQsQuery;
+/// use serde_qs::Config;
+/// use axum::{response::IntoResponse, routing::get, Router, body::Body};
+///
+/// #[derive(serde::Deserialize)]
+/// pub struct UsersFilter {
+///    id: Vec<u64>,
+/// }
+///
+/// async fn filter_users(
+///     OptionalQsQuery(info): OptionalQsQuery<UsersFilter>
+/// ) -> impl IntoResponse {
+///     match info {
+///         Some(info) => todo!("Select users based on query string"),
+///         None => { todo!("No query string provided")}
+///     }
+/// }
+///
+/// fn main() {
+///     let app = Router::<()>::new()
+///         .route("/users", get(filter_users));
+/// }
+#[derive(Clone, Copy, Default)]
+pub struct OptionalQsQuery<T>(pub Option<T>);
+
+impl<T> std::ops::Deref for OptionalQsQuery<T> {
+    type Target = Option<T>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<T> std::ops::DerefMut for OptionalQsQuery<T> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<T: std::fmt::Debug> std::fmt::Debug for OptionalQsQuery<T> {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
+impl<T, S> FromRequestParts<S> for OptionalQsQuery<T>
+where
+    T: serde::de::DeserializeOwned,
+    S: Send + Sync,
+{
+    type Rejection = QsQueryRejection;
+
+    async fn from_request_parts(
+        parts: &mut axum::http::request::Parts,
+        state: &S,
+    ) -> Result<Self, Self::Rejection> {
+        let Extension(qs_config) = Extension::<QsQueryConfig>::from_request_parts(parts, state)
+            .await
+            .unwrap_or_else(|_| Extension(QsQueryConfig::default()));
+        if let Some(query) = parts.uri.query() {
+            let error_handler = qs_config.error_handler.clone();
+            let config: QsConfig = qs_config.into();
+            config
+                .deserialize_str::<T>(query)
+                .map(|query| OptionalQsQuery(Some(query)))
+                .map_err(|err| match error_handler {
+                    Some(handler) => handler(err),
+                    None => QsQueryRejection::new(err, StatusCode::BAD_REQUEST),
+                })
+        } else {
+            Ok(OptionalQsQuery(None))
+        }
+    }
+}
+
 #[derive(Debug)]
 /// Rejection type for extractors that deserialize query strings
 pub struct QsQueryRejection {
@@ -178,7 +260,7 @@ impl std::error::Error for QsQueryRejection {
 /// }
 ///
 /// fn main() {
-///     let app = Router::<(), Body>::new()
+///     let app = Router::<()>::new()
 ///         .route("/users", get(filter_users))
 ///         .layer(Extension(QsQueryConfig::new(5, false)
 ///             .error_handler(|err| {