diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index bed59e4..e27ed4b 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -100,11 +100,12 @@ jobs: toolchain: stable - uses: Swatinem/rust-cache@v2 - name: Test + working-directory: ts-rs run: | cargo test --all-features shopt -s globstar - tsc ts-rs/bindings/**/*.ts --noEmit --noUnusedLocals --strict - rm -rf ts-rs/bindings + tsc bindings/**/*.ts --noEmit --noUnusedLocals --strict + rm -rf bindings test-export-env: name: Test ts-rs with TS_RS_EXPORT_DIR @@ -118,11 +119,12 @@ jobs: toolchain: stable - uses: Swatinem/rust-cache@v2 - name: Test + working-directory: ts-rs run: | TS_RS_EXPORT_DIR=output cargo test --no-default-features shopt -s globstar - tsc ts-rs/output/**/*.ts --noEmit --noUnusedLocals --strict - rm -rf ts-rs/output + tsc output/**/*.ts --noEmit --noUnusedLocals --strict + rm -rf output test-no-features: name: Test ts-rs with --no-default-features @@ -136,8 +138,9 @@ jobs: toolchain: stable - uses: Swatinem/rust-cache@v2 - name: Test + working-directory: ts-rs run: | cargo test --no-default-features shopt -s globstar - tsc ts-rs/bindings/**/*.ts --noEmit --noUnusedLocals - rm -rf ts-rs/bindings + tsc bindings/**/*.ts --noEmit --noUnusedLocals + rm -rf bindings diff --git a/macros/src/attr/enum.rs b/macros/src/attr/enum.rs index 5532a69..21ff59c 100644 --- a/macros/src/attr/enum.rs +++ b/macros/src/attr/enum.rs @@ -50,8 +50,7 @@ impl EnumAttr { pub fn from_attrs(attrs: &[Attribute]) -> Result { let mut result = parse_attrs::(attrs)?; - #[cfg(feature = "serde-compat")] - { + if cfg!(feature = "serde-compat") { let serde_attr = crate::utils::parse_serde_attrs::(attrs); result = result.merge(serde_attr.0); } @@ -223,7 +222,6 @@ impl_parse! { } } -#[cfg(feature = "serde-compat")] impl_parse! { Serde(input, out) { "rename" => out.0.rename = Some(parse_assign_str(input)?), diff --git a/macros/src/attr/field.rs b/macros/src/attr/field.rs index dd8552c..dde475d 100644 --- a/macros/src/attr/field.rs +++ b/macros/src/attr/field.rs @@ -18,7 +18,6 @@ pub struct FieldAttr { pub flatten: bool, pub docs: String, - #[cfg(feature = "serde-compat")] pub using_serde_with: bool, } @@ -35,8 +34,7 @@ impl FieldAttr { pub fn from_attrs(attrs: &[Attribute]) -> Result { let mut result = parse_attrs::(attrs)?; - #[cfg(feature = "serde-compat")] - if !result.skip { + if cfg!(feature = "serde-compat") && !result.skip { let serde_attr = crate::utils::parse_serde_attrs::(attrs); result = result.merge(serde_attr.0); } @@ -71,7 +69,7 @@ impl Attr for FieldAttr { nullable: self.optional.nullable || other.optional.nullable, }, flatten: self.flatten || other.flatten, - #[cfg(feature = "serde-compat")] + using_serde_with: self.using_serde_with || other.using_serde_with, // We can't emit TSDoc for a flattened field @@ -86,8 +84,10 @@ impl Attr for FieldAttr { } fn assert_validity(&self, field: &Self::Item) -> Result<()> { - #[cfg(feature = "serde-compat")] - if self.using_serde_with && !(self.type_as.is_some() || self.type_override.is_some()) { + if cfg!(feature = "serde-compat") + && self.using_serde_with + && !(self.type_as.is_some() || self.type_override.is_some()) + { syn_err_spanned!( field; r#"using `#[serde(with = "...")]` requires the use of `#[ts(as = "...")]` or `#[ts(type = "...")]`"# @@ -196,7 +196,6 @@ impl_parse! { } } -#[cfg(feature = "serde-compat")] impl_parse! { Serde(input, out) { "rename" => out.0.rename = Some(parse_assign_str(input)?), diff --git a/macros/src/attr/mod.rs b/macros/src/attr/mod.rs index 196166f..27d12eb 100644 --- a/macros/src/attr/mod.rs +++ b/macros/src/attr/mod.rs @@ -38,13 +38,11 @@ pub(super) trait ContainerAttr: Attr { fn crate_rename(&self) -> Path; } -#[cfg(feature = "serde-compat")] #[derive(Default)] pub(super) struct Serde(pub T) where T: Attr; -#[cfg(feature = "serde-compat")] impl Serde where T: Attr, diff --git a/macros/src/attr/struct.rs b/macros/src/attr/struct.rs index 69a4b06..4613801 100644 --- a/macros/src/attr/struct.rs +++ b/macros/src/attr/struct.rs @@ -30,8 +30,7 @@ impl StructAttr { pub fn from_attrs(attrs: &[Attribute]) -> Result { let mut result = parse_attrs::(attrs)?; - #[cfg(feature = "serde-compat")] - { + if cfg!(feature = "serde-compat") { let serde_attr = crate::utils::parse_serde_attrs::(attrs); result = result.merge(serde_attr.0); } @@ -145,7 +144,6 @@ impl_parse! { } } -#[cfg(feature = "serde-compat")] impl_parse! { Serde(input, out) { "rename" => out.0.rename = Some(parse_assign_str(input)?), diff --git a/macros/src/attr/variant.rs b/macros/src/attr/variant.rs index 52daeda..cd1fee9 100644 --- a/macros/src/attr/variant.rs +++ b/macros/src/attr/variant.rs @@ -18,8 +18,7 @@ pub struct VariantAttr { impl VariantAttr { pub fn from_attrs(attrs: &[Attribute]) -> Result { let mut result = parse_attrs::(attrs)?; - #[cfg(feature = "serde-compat")] - if !result.skip { + if cfg!(feature = "serde-compat") && !result.skip { let serde_attr = crate::utils::parse_serde_attrs::(attrs); result = result.merge(serde_attr.0); } @@ -62,7 +61,6 @@ impl_parse! { } } -#[cfg(feature = "serde-compat")] impl_parse! { Serde(input, out) { "rename" => out.0.rename = Some(parse_assign_str(input)?), diff --git a/macros/src/utils.rs b/macros/src/utils.rs index e4f7b1b..07ce47a 100644 --- a/macros/src/utils.rs +++ b/macros/src/utils.rs @@ -111,15 +111,11 @@ where } /// Parse all `#[serde(..)]` attributes from the given slice. -#[cfg(feature = "serde-compat")] -#[allow(unused)] -pub(crate) fn parse_serde_attrs<'a, A>(attrs: &'a [Attribute]) -> Serde +pub fn parse_serde_attrs<'a, A>(attrs: &'a [Attribute]) -> Serde where A: Attr, Serde: TryFrom<&'a Attribute, Error = Error>, { - use crate::attr::Serde; - attrs .iter() .filter(|a| a.path().is_ident("serde")) @@ -223,6 +219,20 @@ mod warning { writer.print(&buffer) } } +#[cfg(not(feature = "serde-compat"))] +mod warning { + use std::fmt::Display; + + // Just a stub! + #[allow(unused)] + pub fn print_warning( + title: impl Display, + content: impl Display, + note: impl Display, + ) -> std::io::Result<()> { + Ok(()) + } +} /// formats the generic arguments (like A, B in struct X{..}) as "" where x is a comma /// seperated list of generic arguments, or an empty string if there are no type generics (lifetime/const generics are ignored). diff --git a/ts-rs/tests/integration/serde_skip_with_default.rs b/ts-rs/tests/integration/serde_skip_with_default.rs index b67e2e5..6660059 100644 --- a/ts-rs/tests/integration/serde_skip_with_default.rs +++ b/ts-rs/tests/integration/serde_skip_with_default.rs @@ -1,3 +1,4 @@ +#![cfg(feature = "serde-compat")] #![allow(dead_code)] // from issue #107. This does now no longer generate a warning. diff --git a/ts-rs/tests/integration/struct_rename.rs b/ts-rs/tests/integration/struct_rename.rs index 9536fca..9976a5a 100644 --- a/ts-rs/tests/integration/struct_rename.rs +++ b/ts-rs/tests/integration/struct_rename.rs @@ -59,10 +59,6 @@ struct RenameAllScreamingKebab { #[test] fn rename_all_screaming_kebab_case() { let rename_all = RenameAllScreamingKebab::default(); - assert_eq!( - serde_json::to_string(&rename_all).unwrap(), - r#"{"CRC32C-HASH":0,"SOME-FIELD":0,"SOME-OTHER-FIELD":0}"# - ); assert_eq!( RenameAllScreamingKebab::inline(), r#"{ "CRC32C-HASH": number, "SOME-FIELD": number, "SOME-OTHER-FIELD": number, }"#