NationTech/yaserde
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Evaluate serialization conditions also for Struct, Vec and Enum

Browse Source
This commit is contained in:
Luca Benini 2022-12-28 10:42:43 +01:00
parent aa3dd831e4
commit ee04c928a4
1 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
yaserde_derive/src/ser/expand_struct.rs
View File

@ -215,20 +215,24 @@ pub fn serialize(
} }
Field::FieldStruct { .. } => Some(if field.is_flatten() { Field::FieldStruct { .. } => Some(if field.is_flatten() {
quote! { quote! {
#conditions {
if let ::std::option::Option::Some(ref item) = &self.#label { if let ::std::option::Option::Some(ref item) = &self.#label {
writer.set_start_event_name(::std::option::Option::None); writer.set_start_event_name(::std::option::Option::None);
writer.set_skip_start_end(true); writer.set_skip_start_end(true);
::yaserde::YaSerialize::serialize(item, writer)?; ::yaserde::YaSerialize::serialize(item, writer)?;
} }
} }
}
} else { } else {
quote! { quote! {
#conditions {
if let ::std::option::Option::Some(ref item) = &self.#label { if let ::std::option::Option::Some(ref item) = &self.#label {
writer.set_start_event_name(::std::option::Option::Some(#label_name.to_string())); writer.set_start_event_name(::std::option::Option::Some(#label_name.to_string()));
writer.set_skip_start_end(false); writer.set_skip_start_end(false);
::yaserde::YaSerialize::serialize(item, writer)?; ::yaserde::YaSerialize::serialize(item, writer)?;
} }
} }
}
}), }),
_ => unimplemented!(), _ => unimplemented!(),
}, },
@ -243,9 +247,11 @@ pub fn serialize(
}; };
Some(quote! { Some(quote! {
#conditions {
writer.set_start_event_name(#start_event); writer.set_start_event_name(#start_event);
writer.set_skip_start_end(#skip_start); writer.set_skip_start_end(#skip_start);
::yaserde::YaSerialize::serialize(&self.#label, writer)?; ::yaserde::YaSerialize::serialize(&self.#label, writer)?;
}
}) })
} }
Field::FieldVec { data_type } => match *data_type { Field::FieldVec { data_type } => match *data_type {
@ -254,9 +260,11 @@ pub fn serialize(
let inner = enclose_formatted_characters_for_value(&item_ident, label_name); let inner = enclose_formatted_characters_for_value(&item_ident, label_name);
Some(quote! { Some(quote! {
#conditions {
for yaserde_item in &self.#label { for yaserde_item in &self.#label {
#inner #inner
} }
}
}) })
} }
Field::FieldBool Field::FieldBool
@ -274,12 +282,15 @@ pub fn serialize(
let inner = enclose_formatted_characters_for_value(&item_ident, label_name); let inner = enclose_formatted_characters_for_value(&item_ident, label_name);
Some(quote! { Some(quote! {
#conditions {
for yaserde_item in &self.#label { for yaserde_item in &self.#label {
#inner #inner
} }
}
}) })
} }
Field::FieldOption { .. } => Some(quote! { Field::FieldOption { .. } => Some(quote! {
#conditions {
for item in &self.#label { for item in &self.#label {
if let Some(value) = item { if let Some(value) = item {
writer.set_start_event_name(None); writer.set_start_event_name(None);
@ -287,23 +298,28 @@ pub fn serialize(
::yaserde::YaSerialize::serialize(value, writer)?; ::yaserde::YaSerialize::serialize(value, writer)?;
} }
} }
}
}), }),
Field::FieldStruct { .. } => { Field::FieldStruct { .. } => {
if field.is_flatten() { if field.is_flatten() {
Some(quote! { Some(quote! {
#conditions {
for item in &self.#label { for item in &self.#label {
writer.set_start_event_name(::std::option::Option::None); writer.set_start_event_name(::std::option::Option::None);
writer.set_skip_start_end(true); writer.set_skip_start_end(true);
::yaserde::YaSerialize::serialize(item, writer)?; ::yaserde::YaSerialize::serialize(item, writer)?;
} }
}
}) })
} else { } else {
Some(quote! { Some(quote! {
#conditions {
for item in &self.#label { for item in &self.#label {
writer.set_start_event_name(::std::option::Option::Some(#label_name.to_string())); writer.set_start_event_name(::std::option::Option::Some(#label_name.to_string()));
writer.set_skip_start_end(false); writer.set_skip_start_end(false);
::yaserde::YaSerialize::serialize(item, writer)?; ::yaserde::YaSerialize::serialize(item, writer)?;
} }
}
}) })
} }
/*let (start_event, skip_start) = if field.is_flatten() { /*let (start_event, skip_start) = if field.is_flatten() {