Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

json: Allow proxies for optional types #78

Merged
merged 1 commit into from
Sep 1, 2023
Merged

json: Allow proxies for optional types #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 21 additions & 16 deletions derive/src/serde_json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@ pub fn derive_ser_json_proxy(proxy_type: &str, type_: &str) -> TokenStream {
.unwrap()
}

fn ser_proxy_guard(fieldname: &str, field: &Field) -> String {
if let Some(proxy) = crate::shared::attrs_proxy(&field.attributes) {
if field.ty.base() == "Option" {
format!(
"{{{fieldname}.as_ref().map(|f| {{let proxy: {proxy} = Into::into(f);proxy}})}}"
)
} else {
format!("{{let proxy: {proxy} = Into::into(&{fieldname});proxy}}",)
}
} else {
format!("{fieldname}")
}
}

pub fn derive_ser_json_struct(struct_: &Struct) -> TokenStream {
let mut s = String::new();
let (generic_w_bounds, generic_no_bounds) = struct_bounds_strings(struct_, "SerJson");
Expand All @@ -40,14 +54,7 @@ pub fn derive_ser_json_struct(struct_: &Struct) -> TokenStream {
if skip {
continue;
}
let proxied_field = if let Some(proxy) = crate::shared::attrs_proxy(&field.attributes) {
format!(
"{{let proxy: {} = Into::into(&self.{});proxy}}",
proxy, struct_fieldname
)
} else {
format!("self.{}", struct_fieldname)
};
let proxied_field = ser_proxy_guard(&format!("self.{struct_fieldname}"), field);

if field.ty.base() == "Option" {
l!(
Expand Down Expand Up @@ -135,7 +142,11 @@ pub fn derive_de_json_named(name: &str, defaults: bool, fields: &[Field]) -> Tok
let skip = crate::shared::attrs_skip(&field.attributes);

let proxified_t = if let Some(proxy) = proxy {
format!("From::<&{}>::from(&t)", proxy)
if field.ty.base() == "Option" {
format!("Some(From::<&{proxy}>::from(&t))")
} else {
format!("From::<&{proxy}>::from(&t)")
}
} else {
format!("t")
};
Expand Down Expand Up @@ -276,13 +287,7 @@ pub fn derive_ser_json_enum(enum_: &Enum) -> TokenStream {
let last = contents.fields.len() - 1;
for (index, field) in contents.fields.iter().enumerate() {
if let Some(name) = &&field.field_name {
let proxied_field =
if let Some(proxy) = crate::shared::attrs_proxy(&variant.attributes) {
format!("{{let proxy: {} = Into::into(&{});proxy}}", proxy, name)
} else {
format!("{}", name)
};

let proxied_field = ser_proxy_guard(name, field);
if index == last {
if field.ty.base() == "Option" {
l!(
Expand Down
75 changes: 75 additions & 0 deletions tests/json.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,6 +626,81 @@ fn field_proxy() {
assert!(test == test_deserialized);
}

#[test]
fn field_option_proxy() {
#[derive(PartialEq, Clone, Debug)]
#[repr(u32)]
enum SomeEnum {
One,
Two,
Three,
}

#[derive(PartialEq, Debug, DeJson, SerJson)]
#[nserde(transparent)]
pub struct U32(u32);

impl From<&SomeEnum> for U32 {
fn from(e: &SomeEnum) -> U32 {
U32(e.clone() as u32)
}
}
impl From<&U32> for SomeEnum {
fn from(n: &U32) -> SomeEnum {
match n.0 {
0 => SomeEnum::One,
1 => SomeEnum::Two,
2 => SomeEnum::Three,
_ => panic!(),
}
}
}

#[derive(DeJson, SerJson, PartialEq, Debug)]
pub struct Test {
#[nserde(proxy = "U32")]
foo: Option<SomeEnum>,
#[nserde(proxy = "U32")]
bar: SomeEnum,
}

let test = Test {
foo: Some(SomeEnum::Three),
bar: SomeEnum::Two,
};
let bytes = SerJson::serialize_json(&test);
let test_deserialized = DeJson::deserialize_json(&bytes).unwrap();
assert!(test == test_deserialized);
let test = Test {
foo: None,
bar: SomeEnum::One,
};
let bytes = SerJson::serialize_json(&test);
let test_deserialized = DeJson::deserialize_json(&bytes).unwrap();
assert!(test == test_deserialized);

#[derive(DeJson, SerJson, PartialEq, Debug)]
enum Test2 {
//A(#[nserde(proxy = "U32")] Option<SomeEnum>),
B {
#[nserde(proxy = "U32")]
bar: Option<SomeEnum>,
},
}

// TODO
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this intentional?

Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yea, it is. Proxies never worked on tuples (no attributes did), so this feature is just as broken as it was before the PR :D

but better keep a little reminder and maybe revisit it later

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I see 👍

// let test = Test2::A(Some(SomeEnum::Three));
// let bytes = SerJson::serialize_json(&test);
// let test_deserialized = DeJson::deserialize_json(&bytes).unwrap();
// assert!(test == test_deserialized);
let test = Test2::B {
bar: Some(SomeEnum::One),
};
let bytes = SerJson::serialize_json(&test);
let test_deserialized = DeJson::deserialize_json(&bytes).unwrap();
assert!(test == test_deserialized);
}

#[test]
fn tuple_struct() {
#[derive(DeJson, SerJson, PartialEq)]
Expand Down
Loading