Serde compatibility with enum and tag field

This commit is contained in:
Jeremy Drouillard
2021-01-20 11:16:52 -08:00
parent f6a0bd896a
commit 69c9815b4f
5 changed files with 37 additions and 7 deletions
+4 -1
View File
@@ -7,6 +7,7 @@ use crate::utils::parse_attrs;
pub struct EnumAttr {
pub rename_all: Option<Inflection>,
pub rename: Option<String>,
pub tag: Option<String>,
}
#[cfg(feature = "serde-compat")]
@@ -22,9 +23,10 @@ impl EnumAttr {
Ok(result)
}
fn merge(&mut self, EnumAttr { rename_all, rename }: EnumAttr) {
fn merge(&mut self, EnumAttr { rename_all, rename, tag }: EnumAttr) {
self.rename = self.rename.take().or(rename);
self.rename_all = self.rename_all.take().or(rename_all);
self.tag = self.tag.take().or(tag);
}
}
@@ -40,5 +42,6 @@ impl_parse! {
SerdeEnumAttr(input, out) {
"rename" => out.0.rename = Some(parse_assign_str(input)?),
"rename_all" => out.0.rename_all = Some(parse_assign_inflection(input)?),
"tag" => out.0.tag = Some(parse_assign_str(input)?),
}
}
+10 -4
View File
@@ -5,7 +5,7 @@ use crate::attr::{EnumAttr, FieldAttr, Inflection};
use crate::DerivedTS;
pub(crate) fn r#enum(s: &ItemEnum) -> Result<DerivedTS> {
let EnumAttr { rename_all, rename } = EnumAttr::from_attrs(&s.attrs)?;
let EnumAttr { rename_all, rename, tag } = EnumAttr::from_attrs(&s.attrs)?;
if let Some(v) = s
.variants
@@ -18,7 +18,7 @@ pub(crate) fn r#enum(s: &ItemEnum) -> Result<DerivedTS> {
let name = rename.unwrap_or_else(|| s.ident.to_string());
let mut formatted_variants = vec![];
for variant in &s.variants {
format_variant(&mut formatted_variants, &rename_all, &variant)?;
format_variant(&mut formatted_variants, &tag, &rename_all, &variant)?;
}
Ok(DerivedTS {
@@ -32,6 +32,7 @@ pub(crate) fn r#enum(s: &ItemEnum) -> Result<DerivedTS> {
fn format_variant(
formatted_variants: &mut Vec<String>,
tag: &Option<String>,
rename_all: &Option<Inflection>,
variant: &Variant,
) -> Result<()> {
@@ -56,7 +57,12 @@ fn format_variant(
(None, None) => variant.ident.to_string(),
(None, Some(rn)) => rn.apply(&variant.ident.to_string()),
};
formatted_variants.push(format!("{:?}", name));
formatted_variants.push( match tag {
Some(tag_name) => {
format!("{{{}: {:?}}}", tag_name, name)
},
None => format!("{:?}", name)
});
Ok(())
}
+1 -1
View File
@@ -67,7 +67,7 @@ pub fn parse_serde_attrs<'a, A: TryFrom<&'a Attribute, Error = Error>>(
attrs
.iter()
.filter(|a| a.path.is_ident("serde"))
.flat_map(|attr| match A::try_from(attr) {
.flat_map(|attr| match A::try_from(attr) {
Ok(attr) => Some(attr),
Err(_) => {
use quote::ToTokens;
+2 -1
View File
@@ -12,4 +12,5 @@ repository = "https://github.com/Aleph-Alpha/ts-rs"
serde-compat = ["ts-rs-macros/serde-compat"]
[dependencies]
ts-rs-macros = { version = "2.1.2", path = "../macros" }
ts-rs-macros = { version = "2.1.2", path = "../macros" }
serde = { version = "1.0", features = ["derive"] }
+20
View File
@@ -0,0 +1,20 @@
#![allow(dead_code)]
use ts_rs::TS;
use serde::{Deserialize};
#[derive(TS, Deserialize)]
#[serde(tag="kind")]
enum SimpleEnum {
A,
B,
}
#[test]
fn test_serde_enum() {
assert_eq!(
SimpleEnum::decl(),
r#"export type SimpleEnum = {kind: "A"} | {kind: "B"};"#
)
}