Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/fullstack-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ impl CompiledRoute {
pub fn query_extractor(&self) -> TokenStream2 {
let idents = self.query_params.iter().map(|item| &item.0);
quote! {
dioxus_server::axum::extract::Query(__QueryParams__ { #(#idents,)* }): dioxus_server::axum::extract::Query<__QueryParams__>,
dioxus_server::extract::Query(__QueryParams__ { #(#idents,)* }): dioxus_server::extract::Query<__QueryParams__>,
}
}

Expand Down
2 changes: 2 additions & 0 deletions packages/fullstack-server/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,8 @@ chrono = { workspace = true }
rustc-hash = { workspace = true }
lru = { workspace = true }
walkdir = { workspace = true }
axum-core.workspace = true
serde_core = "1.0.221"

[target.'cfg(target_arch = "wasm32")'.dependencies]
tokio = { workspace = true, features = ["rt", "sync", "macros"], optional = true }
Expand Down
36 changes: 36 additions & 0 deletions packages/fullstack-server/src/extract.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
use axum::extract::FromRequestParts;
use axum_core::__composite_rejection as composite_rejection;
use axum_core::__define_rejection as define_rejection;
use http::request::Parts;
use serde_core::de::DeserializeOwned;

#[derive(Debug, Clone, Copy, Default)]
pub struct Query<T>(pub T);

impl<T, S> FromRequestParts<S> for Query<T>
where
T: DeserializeOwned,
S: Send + Sync,
{
type Rejection = QueryRejection;

async fn from_request_parts(parts: &mut Parts, _state: &S) -> Result<Self, Self::Rejection> {
let inner: T = serde_qs::from_str(parts.uri.query().unwrap_or_default())
.map_err(FailedToDeserializeQueryString::from_err)?;
Ok(Self(inner))
}
}

axum_core::__impl_deref!(Query);

define_rejection! {
#[status = BAD_REQUEST]
#[body = "Failed to deserialize query string"]
pub struct FailedToDeserializeQueryString(Error);
}

composite_rejection! {
pub enum QueryRejection {
FailedToDeserializeQueryString,
}
}
2 changes: 2 additions & 0 deletions packages/fullstack-server/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,5 @@ pub use isrg::*;

mod index_html;
pub(crate) use index_html::IndexHtml;

pub mod extract;
Loading