refactor

typify-impl/src/lib.rs

@@ -587,13 +587,7 @@ impl TypeSpace {
  let type_id = TypeId(index);
  let mut type_entry = self.id_to_entry.get(&type_id).unwrap().clone();
  type_entry.finalize(self)?;
- if let Some(mut name) = type_entry.name().cloned() {
- while self.names.contains(&name) {
- name = format!("{name}Alias");
- }
- self.names.insert(name.clone());
- type_entry.rename(name);
- }
+ type_entry.ensure_unique_name(self);
  self.id_to_entry.insert(type_id, type_entry);
  }
 
@@ -689,6 +683,7 @@ impl TypeSpace {
  let type_id = TypeId(index);
  let mut type_entry = self.id_to_entry.get(&type_id).unwrap().clone();
  type_entry.finalize(self)?;
+ type_entry.ensure_unique_name(self);
  self.id_to_entry.insert(type_id, type_entry);
  }
 

typify-impl/src/type_entry.rs

@@ -514,6 +514,21 @@ impl TypeEntry {
  self.check_defaults(type_space)
  }
 
+ // Ensures that the name is unique within the provided `TypeSpace`.
+ //
+ // This function checks if the current object's name already exists in the `TypeSpace`. If it does,
+ // the function modifies the name by appending "Alias" until a unique name is found. The unique name
+ // is then inserted into the `TypeSpace` and the object's name is updated accordingly.
+ pub(crate) fn ensure_unique_name(&mut self, type_space: &mut TypeSpace) {
+ if let Some(mut name) = self.name().cloned() {
+ while type_space.names.contains(&name) {
+ name = format!("{name}Alias");
+ }
+ type_space.names.insert(name.clone());
+ self.rename(name);
+ }
+ }
+
  pub(crate) fn name(&self) -> Option<&String> {
  match &self.details {
  TypeEntryDetails::Enum(TypeEntryEnum { name, .. })