wip

crates/core/src/extract/mod.rs

@@ -31,7 +31,7 @@
 //! # use salvo_core::prelude::*;
 //! # use serde::{Deserialize, Serialize};
 //! #[derive(Serialize, Deserialize, Extractible, Debug)]
-//! #[salvo(extract(default_source(from = "body", format = "json")))]
+//! #[salvo(extract(default_source(from = "body")))]
 //! struct GoodMan<'a> {
 //!     #[salvo(extract(source(from = "param")))]
 //!     id: i64,
@@ -46,7 +46,7 @@
 //! }
 //!
 //! #[derive(Serialize, Deserialize, Extractible, Debug)]
-//! #[salvo(extract(default_source(from = "body", format = "json")))]
+//! #[salvo(extract(default_source(from = "body")))]
 //! struct Nested<'a> {
 //!     #[salvo(extract(source(from = "param")))]
 //!     id: i64,

crates/core/src/serde/request.rs

@@ -383,6 +383,7 @@ impl<'de> RequestDeserializer<'de> {
         while self.field_index < self.metadata.fields.len() as isize - 1 {
             self.field_index += 1;
             let field = &self.metadata.fields[self.field_index as usize];
+            self.field_flatten = field.flatten;
             self.field_str_value = None;
             self.field_vec_value = None;
 
@@ -656,7 +657,7 @@ mod tests {
     #[tokio::test]
     async fn test_de_request_with_json_str() {
         #[derive(Deserialize, Extractible, Eq, PartialEq, Debug)]
-        #[salvo(extract(default_source(from = "body", format = "json")))]
+        #[salvo(extract(default_source(from = "body", parser = "json")))]
         struct RequestData<'a> {
             #[salvo(extract(source(from = "param")))]
             p2: &'a str,

crates/macros/src/extract.rs

@@ -291,6 +291,7 @@ pub(crate) fn generate(args: DeriveInput) -> Result<TokenStream, Error> {
                 let ty = omit_type_path_lifetimes(ty);
                 nested_metadata = Some(quote! {
                     field = field.metadata(<#ty as #salvo::extract::Extractible>::metadata());
+                    field = field.set_flatten(true);
                 });
             } else {
                 return Err(Error::new_spanned(name, "Invalid type for request source."));