chore: convert type_patch into a struct with named fields

Author: ericszentivanyi

typify-impl/src/lib.rs

@@ -582,7 +582,7 @@ impl TypeSpacePatch {
 }
 
 impl TypeSpace {
-    /// Create a new TypeSpace with custom settings
+    /// Create a new TypeSpace with custom settings.
     pub fn new(settings: &TypeSpaceSettings) -> Self {
         let mut cache = SchemaCache::default();
 

typify-impl/src/type_entry.rs

@@ -13,7 +13,7 @@ use crate::{
     output::{OutputSpace, OutputSpaceMod},
     sanitize,
     structs::{generate_serde_attr, DefaultFunction},
-    util::{get_type_name, metadata_description, type_patch, unique},
+    util::{get_type_name, metadata_description, unique, TypePatch},
     Case, DefaultImpl, Name, Result, TypeId, TypeSpace, TypeSpaceImpl,
 };
 
@@ -291,10 +291,10 @@ impl TypeEntryEnum {
         let rename = None;
         let description = metadata_description(metadata);
 
-        let (name, extra_derives, extra_attrs) = type_patch(type_space, name);
+        let type_patch = TypePatch::new(type_space, name);
 
         let details = TypeEntryDetails::Enum(Self {
-            name,
+            name: type_patch.name,
             rename,
             description,
             default: None,
@@ -307,8 +307,8 @@ impl TypeEntryEnum {
 
         TypeEntry {
             details,
-            extra_derives,
-            extra_attrs,
+            extra_derives: type_patch.derives,
+            extra_attrs: type_patch.attrs,
         }
     }
 
@@ -383,10 +383,10 @@ impl TypeEntryStruct {
             .cloned()
             .map(WrappedValue::new);
 
-        let (name, extra_derives, extra_attrs) = type_patch(type_space, name);
+        let type_patch = TypePatch::new(type_space, name);
 
         let details = TypeEntryDetails::Struct(Self {
-            name,
+            name: type_patch.name,
             rename,
             description,
             default,
@@ -397,8 +397,8 @@ impl TypeEntryStruct {
 
         TypeEntry {
             details,
-            extra_derives,
-            extra_attrs,
+            extra_derives: type_patch.derives,
+            extra_attrs: type_patch.attrs,
         }
     }
 }
@@ -415,10 +415,10 @@ impl TypeEntryNewtype {
         let rename = None;
         let description = metadata_description(metadata);
 
-        let (name, extra_derives, extra_attrs) = type_patch(type_space, name);
+        let type_patch = TypePatch::new(type_space, name);
 
         let details = TypeEntryDetails::Newtype(Self {
-            name,
+            name: type_patch.name,
             rename,
             description,
             default: None,
@@ -429,8 +429,8 @@ impl TypeEntryNewtype {
 
         TypeEntry {
             details,
-            extra_derives,
-            extra_attrs,
+            extra_derives: type_patch.derives,
+            extra_attrs: type_patch.attrs,
         }
     }
 
@@ -446,10 +446,10 @@ impl TypeEntryNewtype {
         let rename = None;
         let description = metadata_description(metadata);
 
-        let (name, extra_derives, extra_attrs) = type_patch(type_space, name);
+        let type_patch = TypePatch::new(type_space, name);
 
         let details = TypeEntryDetails::Newtype(Self {
-            name,
+            name: type_patch.name,
             rename,
             description,
             default: None,
@@ -462,8 +462,8 @@ impl TypeEntryNewtype {
 
         TypeEntry {
             details,
-            extra_derives,
-            extra_attrs,
+            extra_derives: type_patch.derives,
+            extra_attrs: type_patch.attrs,
         }
     }
 
@@ -479,10 +479,10 @@ impl TypeEntryNewtype {
         let rename = None;
         let description = metadata_description(metadata);
 
-        let (name, extra_derives, extra_attrs) = type_patch(type_space, name);
+        let type_patch = TypePatch::new(type_space, name);
 
         let details = TypeEntryDetails::Newtype(Self {
-            name,
+            name: type_patch.name,
             rename,
             description,
             default: None,
@@ -495,8 +495,8 @@ impl TypeEntryNewtype {
 
         TypeEntry {
             details,
-            extra_derives,
-            extra_attrs,
+            extra_derives: type_patch.derives,
+            extra_attrs: type_patch.attrs,
         }
     }
 
@@ -518,10 +518,10 @@ impl TypeEntryNewtype {
             pattern,
         } = validation.clone();
 
-        let (name, extra_derives, extra_attrs) = type_patch(type_space, name);
+        let type_patch = TypePatch::new(type_space, name);
 
         let details = TypeEntryDetails::Newtype(Self {
-            name,
+            name: type_patch.name,
             rename,
             description,
             default: None,
@@ -536,8 +536,8 @@ impl TypeEntryNewtype {
 
         TypeEntry {
             details,
-            extra_derives,
-            extra_attrs,
+            extra_derives: type_patch.derives,
+            extra_attrs: type_patch.attrs,
         }
     }
 }

typify-impl/src/util.rs

@@ -835,21 +835,33 @@ pub(crate) fn get_type_name(type_name: &Name, metadata: &Option<Box<Metadata>>)
     Some(sanitize(&name, Case::Pascal))
 }
 
-/// Check for patches which include potential type renames and additional
-/// derive macros.
-pub(crate) fn type_patch(
-    type_space: &TypeSpace,
-    type_name: String,
-) -> (String, BTreeSet<String>, BTreeSet<String>) {
-    match type_space.settings.patch.get(&type_name) {
-        None => (type_name, Default::default(), Default::default()),
-
-        Some(patch) => {
-            let name = patch.rename.clone().unwrap_or(type_name);
-            let derives = patch.derives.iter().cloned().collect();
-            let attrs = patch.attrs.iter().cloned().collect();
-
-            (name, derives, attrs)
+pub(crate) struct TypePatch {
+    pub name: String,
+    pub derives: BTreeSet<String>,
+    pub attrs: BTreeSet<String>,
+}
+
+impl TypePatch {
+    /// Creates a new TypePatch by resolving patches for the given type name.
+    pub fn new(type_space: &TypeSpace, type_name: String) -> Self {
+        match type_space.settings.patch.get(&type_name) {
+            None => Self {
+                name: type_name,
+                derives: Default::default(),
+                attrs: Default::default(),
+            },
+
+            Some(patch) => {
+                let name = patch.rename.clone().unwrap_or(type_name);
+                let derives = patch.derives.iter().cloned().collect();
+                let attrs = patch.attrs.iter().cloned().collect();
+
+                Self {
+                    name,
+                    derives,
+                    attrs,
+                }
+            }
         }
     }
 }