Add skip support for newtype enum variants

siefkenj · Aug 10, 2024 · 285f720 · 285f720
1 parent 29abef8
commit 285f720
Show file tree

Hide file tree

Showing 2 changed files with 80 additions and 2 deletions.
diff --git a/tests/skip.rs b/tests/skip.rs
@@ -66,6 +66,17 @@ fn test_skip() {
         C,
         /// Comment for D
         D,
+        /// Comment for Struct
+        Struct {
+            #[serde(skip)]
+            field_a: bool,
+            field_b: u8,
+            field_c: String,
+        },
+        /// Comment for Tuple
+        Tuple(#[serde(skip)] bool, u8, String),
+        /// Comment for NewType
+        NewType(#[serde(skip)] bool),
     }
 
     let expected = indoc! {r#"
@@ -77,13 +88,69 @@ fn test_skip() {
              * Comment for D
              */
             export type D = "D";
+            /**
+             * Comment for Struct
+             */
+            export type Struct = { Struct: { field_b: number; field_c: string } };
+            /**
+             * Comment for Tuple
+             */
+            export type Tuple = { Tuple: [number, string] };
+            /**
+             * Comment for NewType
+             */
+            export type NewType = { NewType: null };
         }
 
         /**
          * Comment for Enum
          */
-        export type Enum = "D";"#
+        export type Enum = "D" | { Struct: { field_b: number; field_c: string } } | { Tuple: [number, string] } | { NewType: null };"#
     };
 
     assert_eq!(Enum::DECL, expected);
+
+    /// Comment for InternalTagEnum
+    #[derive(Tsify)]
+    #[serde(tag = "type")]
+    #[tsify(namespace)]
+    enum InternalTagEnum {
+        /// Comment for Unit
+        Unit,
+        /// Comment for Struct
+        Struct {
+            #[serde(skip)]
+            field_a: bool,
+            field_b: u8,
+        },
+        /// Comment for NewType
+        NewType(#[serde(skip)] bool),
+    }
+
+    let expected = indoc! {r#"
+        /**
+         * Comment for InternalTagEnum
+         */
+        declare namespace InternalTagEnum {
+            /**
+             * Comment for Unit
+             */
+            export type Unit = { type: "Unit" };
+            /**
+             * Comment for Struct
+             */
+            export type Struct = { type: "Struct"; field_b: number };
+            /**
+             * Comment for NewType
+             */
+            export type NewType = { type: "NewType" };
+        }
+
+        /**
+         * Comment for InternalTagEnum
+         */
+        export type InternalTagEnum = { type: "Unit" } | { type: "Struct"; field_b: number } | { type: "NewType" };"#
+    };
+
+    assert_eq!(InternalTagEnum::DECL, expected);
 }
diff --git a/tsify-next-macros/src/parser.rs b/tsify-next-macros/src/parser.rs
@@ -143,7 +143,18 @@ impl<'a> Parser<'a> {
     fn parse_fields(&self, style: Style, fields: &[Field]) -> ParsedFields {
         let style = match style {
             Style::Struct => FieldsStyle::Named,
-            Style::Newtype => return ParsedFields::Transparent(self.parse_field(&fields[0]).0),
+            Style::Newtype => {
+                let field = &fields[0];
+                if field.attrs.skip_serializing()
+                    || field.attrs.skip_deserializing()
+                    || is_phantom(field.ty)
+                {
+                    return ParsedFields::Transparent(TsType::nullish(
+                        &self.container.attrs.ty_config,
+                    ));
+                }
+                return ParsedFields::Transparent(self.parse_field(field).0);
+            }
             Style::Tuple => FieldsStyle::Unnamed,
             Style::Unit => {
                 return ParsedFields::Transparent(TsType::nullish(&self.container.attrs.ty_config))