Remove extra methods for option inner type

Aleph-Alpha · Nov 10, 2024 · ad4f024 · ad4f024
1 parent 6f064f5
commit ad4f024
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 20 deletions.
diff --git a/macros/src/types/named.rs b/macros/src/types/named.rs
@@ -144,7 +144,7 @@ fn format_field(
                 if let Optional::Optional { nullable: false } = opt {
                     quote! {
                         if <#ty as #crate_rename::TS>::IS_OPTION {
-                            <#ty as #crate_rename::TS>::option_inner_inline().unwrap()
+                            <#ty as #crate_rename::TS>::name().trim_end_matches(" | null").to_owned()
                         } else {
                             <#ty as #crate_rename::TS>::inline()
                         }
@@ -157,7 +157,7 @@ fn format_field(
                 if let Optional::Optional { nullable: false } = opt {
                     quote! {
                         if <#ty as #crate_rename::TS>::IS_OPTION {
-                            <#ty as #crate_rename::TS>::option_inner_name().unwrap()
+                            <#ty as #crate_rename::TS>::name().trim_end_matches(" | null").to_owned()
                         } else {
                             <#ty as #crate_rename::TS>::name()
                         }

diff --git a/ts-rs/src/lib.rs b/ts-rs/src/lib.rs
@@ -397,16 +397,6 @@ pub trait TS {
     #[doc(hidden)]
     const IS_OPTION: bool = false;
 
-    #[doc(hidden)]
-    fn option_inner_name() -> Option<String> {
-        None
-    }
-
-    #[doc(hidden)]
-    fn option_inner_inline() -> Option<String> {
-        None
-    }
-
     /// Identifier of this type, excluding generic parameters.
     fn ident() -> String {
         // by default, fall back to `TS::name()`.
@@ -745,14 +735,6 @@ impl<T: TS> TS for Option<T> {
         format!("{} | null", T::inline())
     }
 
-    fn option_inner_name() -> Option<String> {
-        Some(T::name())
-    }
-
-    fn option_inner_inline() -> Option<String> {
-        Some(T::inline())
-    }
-
     fn visit_dependencies(v: &mut impl TypeVisitor)
     where
         Self: 'static,