Assorted test fixes

specta-typescript/src/types.rs

@@ -30,10 +30,12 @@ use specta::{
 /// use specta::Type;
 /// use specta_typescript::Any;
 ///
+/// # #[cfg(feature = "serde")] {
 /// #[derive(Serialize, Type)]
 /// pub struct Demo {
 ///     pub field: Any<String>,
 /// }
+/// # }
 /// ```
 pub struct Any<T = ()>(T);
 
@@ -102,10 +104,12 @@ impl<T: serde::Serialize> serde::Serialize for Any<T> {
 /// use specta::Type;
 /// use specta_typescript::Unknown;
 ///
+/// # #[cfg(feature = "serde")] {
 /// #[derive(Serialize, Type)]
 /// pub struct Demo {
 ///     pub field: Unknown<String>,
 /// }
+/// # }
 /// ```
 pub struct Unknown<T = ()>(T);
 
@@ -174,10 +178,12 @@ impl<T: serde::Serialize> serde::Serialize for Unknown<T> {
 /// use specta::Type;
 /// use specta_typescript::Never;
 ///
+/// # #[cfg(feature = "serde")] {
 /// #[derive(Serialize, Type)]
 /// pub struct Demo {
 ///     pub field: Never<String>,
 /// }
+/// # }
 /// ```
 pub struct Never<T = ()>(T);
 

tests/Cargo.toml

@@ -11,7 +11,7 @@ path = "tests/lib.rs"
 harness = true
 
 [dependencies]
-specta = { path = "../specta", features = ["derive", "serde_json", "serde_yaml", "unstable_json_macro", "toml"] }
+specta = { path = "../specta", features = ["derive", "serde_json", "serde_yaml", "unstable_json_macro", "toml", "chrono", "either", "ulid", "glam"] }
 specta-serde = { path = "../specta-serde" }
 specta-typescript = { path = "../specta-typescript" }
 specta-util = { path = "../specta-util", features = ["serde"] }                # TODO: Remove `serde` feature
@@ -23,3 +23,7 @@ serde_json = "1.0.140"
 serde_yaml = "0.9.34"
 toml = "0.8.20"
 insta = "1.42.2"
+chrono = { version = "0.4", default-features = false, features = ["clock"] }
+either = { version = "1.15", default-features = false }
+ulid = { version = "1.2", default-features = false, features = [] }
+glam = { version = "0.30", default-features = false, features = ["std"] }

tests/tests/export.rs

@@ -28,6 +28,7 @@ pub struct ReferingToUnexportedType {
 
 // TODO: Enable this test on Windows again. It's ordering of types is different for seemingly no reason.
 #[cfg(all(not(target_os = "windows"), all(feature = "export", feature = "ts")))]
+// TODO: This feature guard is bogus because this test package doesn't define any features.
 #[test]
 fn test_export_feature() {
     use specta::{

tests/tests/json.rs

@@ -21,9 +21,13 @@ fn test_json_macro() {
 
     // TODO: Fix these
     // assert_ts!(() => json!({ "a": "b" }), r#"{ "a": "b" }"#);
+    // assert_ts!(() => json!({ "hello": "world" }), "{ hello: string }");
+    // assert_ts!(() => json!({
+    //     "hello": "world",
+    // }), "{ hello: string }");
     // assert_ts!(() => json!({ "a": 5, "c": true, "d": false, "e": 42u8, "f": 2.7 }), r#""#);
     // assert_ts!(() => json!([]), "[]");
-    // assert_ts!(() => json!(["a", "b", "c"]), "");
+    // assert_ts!(() => json!(["a", "b", "c"]), "string[]");
     // assert_ts!(() => json!([{}, {}, {}]), "");
     // assert_ts!(() => json!([{ "n": "0" }, { "n": "1" }, { "n": "2" }]), "");
 }

tests/tests/lib.rs

@@ -30,9 +30,7 @@ mod ty_override;
 mod type_collection;
 mod type_map;
 mod typescript;
-// TODO: Bring this back
-// #[cfg(all(feature = "ulid", feature = "typescript"))]
-// mod ulid;
+mod ulid;
 
 #[test]
 fn test_compile_errors() {

tests/tests/remote_impls.rs

@@ -1,5 +1,4 @@
 #[test]
-#[cfg(feature = "glam")]
 fn typescript_types_glam() {
     use crate::ts::assert_ts;
 
@@ -34,6 +33,7 @@ fn typescript_types_glam() {
 
 #[test]
 #[cfg(feature = "bevy_ecs")]
+// TODO: This feature guard is bogus because this test package doesn't define any features.
 fn typescript_types_bevy_ecs() {
     use specta_typescript::{self, BigIntExportBehavior, ExportConfig, ExportPath};
 

tests/tests/ts.rs

@@ -324,11 +324,8 @@ fn typescript_types() {
     assert_ts!(PhantomData<String>, r#"null"#);
     assert_ts!(Infallible, r#"never"#);
 
-    #[cfg(feature = "either")]
-    {
-        assert_ts!(either::Either<String, i32>, r#"string | number"#);
-        assert_ts!(either::Either<i16, i32>, r#"number"#);
-    }
+    assert_ts!(either::Either<String, i32>, r#"string | number"#);
+    assert_ts!(either::Either<i16, i32>, r#"number"#);
 
     assert_ts!(Any, r#"any"#);
 

tests/tests/ts_rs/generics.rs

@@ -33,8 +33,8 @@ struct GenericAutoBound2<T: PartialEq> {
 #[specta(export = false)]
 struct Container1 {
     foo: Generic1<u32>,
-    bar: Box<HashSet<Generic1<u32>>>,
-    baz: Box<BTreeMap<String, Rc<Generic1<String>>>>,
+    bar: HashSet<Generic1<u32>>,
+    baz: BTreeMap<String, Rc<Generic1<String>>>,
 }
 
 #[test]

tests/tests/ts_rs/indexmap.rs

@@ -1,4 +1,5 @@
 #![cfg(feature = "indexmap")]
+// TODO: This feature guard is bogus because this test package doesn't define any features.
 
 use indexmap::{IndexMap, IndexSet};
 use specta::Type;

tests/tests/ts_rs/mod.rs

@@ -1,5 +1,4 @@
 mod arrays;
-#[cfg(feature = "chrono")]
 mod chrono;
 mod field_rename;
 mod flatten;

tests/tests/ts_rs/union_serde.rs

@@ -30,7 +30,6 @@ enum Untagged {
     None,
 }
 
-#[cfg(feature = "serde")]
 #[test]
 fn test_serde_enum() {
     assert_ts!(SimpleEnumA, r#"{ kind: "A" } | { kind: "B" }"#);

tests/tests/ts_rs/union_with_internal_tag.rs

@@ -31,7 +31,6 @@ enum EnumWithInternalTag2 {
 }
 
 #[test]
-#[cfg(feature = "serde")]
 fn test_enums_with_internal_tags() {
     assert_ts!(
         EnumWithInternalTag,

tests/tests/type_collection.rs

@@ -31,7 +31,6 @@ fn type_collection_duplicate_register_ty() {
 
 // TODO: Bring this back
 // #[test]
-// #[cfg(feature = "typescript")]
 // fn type_collection_ts() {
 //     let result = TypeCollection::default()
 //         .register::<A>()