wip

macros/Cargo.toml

@@ -10,14 +10,14 @@ documentation = "https://docs.rs/specta/latest/specta"
 keywords = ["async", "specta", "rspc", "typescript", "typesafe"]
 categories = ["web-programming", "asynchronous"]
 
+[lib]
+proc-macro = true
+
 [features]
 serde = []
 functions = []
 export = []
 
-[lib]
-proc-macro = true
-
 [dependencies]
 Inflector = { version = "0.11.4", default-features = false }
 itertools = "0.10.5"

src/datatype/enum.rs

@@ -72,6 +72,14 @@ pub enum EnumRepr {
     },
 }
 
+// TODO: Refactor into this instead
+// pub struct EnumVariant {
+//     name: Cow<'static, str>,
+//     deprecated: Option<DeprecatedTy>,
+//     comments: Vec<Cow<'static, str>>,
+//     variant: EnumVariantTy,
+// }
+
 /// Type of an [`EnumType`] variant.
 #[derive(Debug, Clone, PartialEq)]
 pub enum EnumVariant {

src/datatype/mod.rs

@@ -100,6 +100,28 @@ impl DataTypeReference {
     }
 }
 
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[non_exhaustive]
+pub enum DeprecatedType {
+    /// A type that has been deprecated without a message.
+    ///
+    /// Eg. `#[deprecated]`
+    Deprecated,
+    /// A type that has been deprecated with a message.
+    ///
+    /// Eg. `#[deprecated = "Use something else"]`
+    #[non_exhaustive]
+    DeprecatedWithMsg { message: Cow<'static, str> },
+    /// A type that has been deprecated with a message and a `since` version.
+    ///
+    /// Eg. `#[deprecated(since = "1.0.0", message = "Use something else")]`
+    #[non_exhaustive]
+    DeprecatedWithSince {
+        since: Option<Cow<'static, str>>,
+        message: Option<Cow<'static, str>>,
+    },
+}
+
 /// A generic ("placeholder") argument to a Specta-enabled type.
 ///
 /// A generic does not hold a specific type instead it acts as a slot where a type can be provided when referencing this type.

tests/deprecated.rs

@@ -0,0 +1,50 @@
+#[allow(deprecated)]
+#[derive(Type)]
+#[specta(export = false)]
+#[deprecated]
+struct DeprecatedType {
+    a: i32,
+}
+
+#[derive(Type)]
+#[specta(export = false)]
+#[deprecated = "Look at you big man using a deprecation message"]
+struct DeprecatedTypeWithMsg {
+    a: i32,
+}
+
+#[derive(Type)]
+#[specta(export = false)]
+#[deprecated(note = "Look at you big man using a deprecation message")]
+struct DeprecatedTypeWithMsg2 {
+    a: i32,
+}
+
+#[derive(Type)]
+#[specta(export = false)]
+struct DeprecatedFields {
+    a: i32,
+    #[deprecated]
+    b: String,
+    #[deprecated = "This field is cringe!"]
+    c: String,
+    #[deprecated(note = "This field is cringe!")]
+    d: String,
+}
+
+#[derive(Type)]
+#[specta(export = false)]
+pub struct DeprecatedTupleVariant(
+    #[deprecated] String,
+    #[deprecated = "Nope"] String,
+    #[deprecated(note = "Nope")] i32,
+);
+
+#[test]
+fn test_deprecated_types() {
+    assert_ts_export!(DeprecatedType, "");
+    assert_ts_export!(DeprecatedTypeWithMsg, "");
+    assert_ts_export!(DeprecatedTypeWithMsg2, "");
+    assert_ts_export!(DeprecatedFields, "");
+    assert_ts_export!(DeprecatedTupleVariant, "");
+}

tests/ts.rs

@@ -1,5 +1,3 @@
-#![allow(deprecated)]
-
 use std::{
     cell::RefCell,
     collections::HashMap,
@@ -249,10 +247,6 @@ fn typescript_types() {
         MyEmptyInput,
         "export type MyEmptyInput = Record<string, never>"
     );
-
-    // assert_ts_export!(DeprecatedType, "");
-    // assert_ts_export!(DeprecatedTypeWithMsg, "");
-    // assert_ts_export!(DeprecatedFields, "");
 }
 
 #[derive(Type)]
@@ -537,36 +531,3 @@ pub struct EnumReferenceRecordKey {
 #[serde(rename_all = "camelCase")]
 #[serde(default)]
 pub(super) struct MyEmptyInput {}
-
-// #[derive(Type)]
-// #[specta(export = false)]
-// #[deprecated]
-// struct DeprecatedType {
-//     a: i32,
-// }
-
-// #[derive(Type)]
-// #[specta(export = false)]
-// #[deprecated = "Look at you big man using a deprecation message"]
-// struct DeprecatedTypeWithMsg {
-//     a: i32,
-// }
-
-// #[derive(Type)]
-// #[specta(export = false)]
-// #[deprecated(note = "Look at you big man using a deprecation message")]
-// struct DeprecatedTypeWithMsg2 {
-//     a: i32,
-// }
-
-// #[derive(Type)]
-// #[specta(export = false)]
-// struct DeprecatedFields {
-//     a: i32,
-//     // #[deprecated]
-//     b: String,
-//     #[deprecated = "This field is cringe!"]
-//     c: String,
-//     #[deprecated(note = "This field is cringe!")]
-//     d: String,
-// }