GenericType

specta-rs · Aug 31, 2023 · d462f4a · d462f4a
1 parent b014aba
commit d462f4a
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 15 deletions.
diff --git a/src/datatype/enum.rs b/src/datatype/enum.rs
@@ -2,7 +2,7 @@ use std::borrow::Cow;
 
 use crate::{
     datatype::{DataType, ObjectType, TupleType},
-    ExportError, ImplLocation,
+    ExportError, GenericType, ImplLocation,
 };
 
 /// Enum type which dictates how the enum is represented.
@@ -16,11 +16,11 @@ use crate::{
 pub enum EnumType {
     Untagged {
         variants: Vec<EnumVariant>,
-        generics: Vec<Cow<'static, str>>,
+        generics: Vec<GenericType>,
     },
     Tagged {
         variants: Vec<(Cow<'static, str>, EnumVariant)>,
-        generics: Vec<Cow<'static, str>>,
+        generics: Vec<GenericType>,
         repr: EnumRepr,
     },
 }
@@ -32,7 +32,7 @@ impl From<EnumType> for DataType {
 }
 
 impl EnumType {
-    pub(crate) fn generics(&self) -> &Vec<Cow<'static, str>> {
+    pub(crate) fn generics(&self) -> &Vec<GenericType> {
         match self {
             Self::Untagged { generics, .. } => generics,
             Self::Tagged { generics, .. } => generics,

diff --git a/src/datatype/mod.rs b/src/datatype/mod.rs
@@ -1,4 +1,7 @@
-use std::{borrow::Cow, collections::BTreeMap};
+use std::{
+    borrow::{Borrow, Cow},
+    collections::BTreeMap,
+};
 
 mod r#enum;
 mod literal;
@@ -120,14 +123,12 @@ impl NamedDataTypeItem {
     }
 
     /// Returns the generics arguments for the type
-    pub fn generics(&self) -> Vec<Cow<'static, str>> {
+    pub fn generics(&self) -> Vec<GenericType> {
         match self {
             // Named struct
             Self::Object(ObjectType { generics, .. }) => generics.clone(),
             // Enum
-            Self::Enum(EnumType::Tagged { generics, .. } | EnumType::Untagged { generics, .. }) => {
-                generics.clone()
-            }
+            Self::Enum(e) => e.generics().clone(),
             // Struct with unnamed fields
             Self::Tuple(tuple) => match tuple {
                 TupleType::Unnamed => vec![],
@@ -159,6 +160,12 @@ pub struct DataTypeReference {
 #[allow(missing_docs)]
 pub struct GenericType(pub Cow<'static, str>);
 
+impl Borrow<str> for GenericType {
+    fn borrow(&self) -> &str {
+        &self.0
+    }
+}
+
 impl From<GenericType> for DataType {
     fn from(t: GenericType) -> Self {
         Self::Generic(t)

diff --git a/src/datatype/object.rs b/src/datatype/object.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use crate::{DataType, NamedDataType, NamedDataTypeItem};
+use crate::{DataType, GenericType, NamedDataType, NamedDataTypeItem};
 
 /// A field in an [`ObjectType`].
 #[derive(Debug, Clone, PartialEq)]
@@ -16,7 +16,7 @@ pub struct ObjectField {
 /// Could be from a struct or named enum variant.
 #[derive(Debug, Clone, PartialEq)]
 pub struct ObjectType {
-    pub generics: Vec<Cow<'static, str>>,
+    pub generics: Vec<GenericType>,
     pub fields: Vec<ObjectField>,
     pub tag: Option<Cow<'static, str>>,
 }

diff --git a/src/datatype/tuple.rs b/src/datatype/tuple.rs
@@ -1,6 +1,6 @@
 use std::borrow::Cow;
 
-use crate::{DataType, NamedDataType, NamedDataTypeItem};
+use crate::{DataType, GenericType, NamedDataType, NamedDataTypeItem};
 
 /// Type of a tuple.
 /// Could be from an actual tuple or unnamed struct.
@@ -16,7 +16,7 @@ pub enum TupleType {
     /// Be aware `()` is treated specially as `null` in Typescript.
     Named {
         fields: Vec<DataType>,
-        generics: Vec<Cow<'static, str>>,
+        generics: Vec<GenericType>,
     },
 }
 

diff --git a/src/lang/ts/mod.rs b/src/lang/ts/mod.rs
@@ -16,8 +16,9 @@ use reserved_terms::*;
 
 use crate::*;
 
+#[allow(missing_docs)]
 pub type Result<T> = std::result::Result<T, TsExportError>;
-pub type Output = Result<String>;
+type Output = Result<String>;
 
 /// Convert a type which implements [`Type`](crate::Type) to a TypeScript string with an export.
 ///
@@ -105,7 +106,7 @@ fn export_datatype_inner(
 
     let generics = Some(item.generics())
         .filter(|generics| !generics.is_empty())
-        .map(|generics| format!("<{}>", generics.to_vec().join(", ")))
+        .map(|generics| format!("<{}>", generics.join(", ")))
         .unwrap_or_default();
 
     let comments = ctx