3 files changed, 19 insertions, 48 deletions

diff --git a/ecs/src/component/storage.rs b/ecs/src/component/storage.rs
index 40909fb..14aa191 100644
--- a/ecs/src/component/storage.rs
+++ b/ecs/src/component/storage.rs
@@ -1,4 +1,3 @@
-use std::any::type_name;
 use std::array::IntoIter as ArrayIter;
 use std::cell::RefCell;
 use std::vec::IntoIter as VecIntoIter;
@@ -18,7 +17,6 @@ use crate::component::storage::graph::{
     Graph,
 };
 use crate::component::Component;
-use crate::type_name::TypeName;
 use crate::uid::{Kind as UidKind, Uid};
 use crate::util::{BorrowedOrOwned, Either, StreamingIterator, VecExt};
 
@@ -161,11 +159,13 @@ impl Storage
     pub fn add_entity_component(
         &mut self,
         entity_uid: Uid,
-        component: (Uid, Box<dyn Component>),
+        (component_id, component_name, component): (
+            Uid,
+            &'static str,
+            Box<dyn Component>,
+        ),
     ) -> Result<(), Error>
     {
-        let (component_id, component) = component;
-
         debug_assert!(
             !component.self_is_optional(),
             "Adding a optional component to a entity is not supported"
@@ -212,17 +212,12 @@ impl Storage
             None => {
                 let archetype_node = self
                     .graph
-                    .get_node_by_id_mut(archetype_id)
+                    .get_node_by_id(archetype_id)
                     .expect("Archetype should exist");
 
                 let (add_edge_id, add_edge_comp_ids) =
                     archetype_node.make_add_edge(component_id);
 
-                archetype_node
-                    .get_edges_mut(component_id)
-                    .expect("Edges for component in archetype should exist")
-                    .add = Some(add_edge_id);
-
                 if !self.graph.contains_archetype(add_edge_id) {
                     self.graph.create_node(add_edge_id, &add_edge_comp_ids);
                 }
@@ -231,18 +226,6 @@ impl Storage
             }
         };
 
-        {
-            let add_edge_archetype_node = self
-                .graph
-                .get_node_by_id_mut(add_edge_archetype_id)
-                .expect("Add edge archetype should exist");
-
-            let add_edge_archetype_edges = add_edge_archetype_node
-                .get_or_insert_edges(component_id, ArchetypeEdges::default);
-
-            add_edge_archetype_edges.remove = Some(archetype_id);
-        }
-
         let archetype_node = self
             .graph
             .get_node_by_id_mut(archetype_id)
@@ -261,7 +244,7 @@ impl Storage
 
         entity.insert_component(
             component_id,
-            ArchetypeEntityComponent::new(component),
+            ArchetypeEntityComponent::new(component, component_name),
             add_edge_archetype,
         );
 
@@ -312,11 +295,6 @@ impl Storage
                 let (remove_edge_id, remove_edge_comp_ids) =
                     archetype_node.make_remove_edge(component_id);
 
-                archetype_node
-                    .get_edges_mut(component_id)
-                    .expect("Edges for component in archetype should exist")
-                    .remove = Some(remove_edge_id);
-
                 if !self.graph.contains_archetype(remove_edge_id) {
                     self.graph
                         .create_node(remove_edge_id, &remove_edge_comp_ids);
@@ -415,14 +393,6 @@ impl Storage
     }
 }
 
-impl TypeName for Storage
-{
-    fn type_name(&self) -> &'static str
-    {
-        type_name::<Self>()
-    }
-}
-
 #[cfg(feature = "vizoxide")]
 impl Storage
 {
diff --git a/ecs/src/component/storage/archetype.rs b/ecs/src/component/storage/archetype.rs
index 5306cf9..8d48e13 100644
--- a/ecs/src/component/storage/archetype.rs
+++ b/ecs/src/component/storage/archetype.rs
@@ -215,11 +215,11 @@ pub struct EntityComponent
 
 impl EntityComponent
 {
-    pub fn new(component: Box<dyn Component>) -> Self
+    pub fn new(component: Box<dyn Component>, component_name: &'static str) -> Self
     {
         Self {
-            name: component.type_name(),
-            component: Lock::new(component),
+            name: component_name,
+            component: Lock::new(component, component_name),
         }
     }
 
diff --git a/ecs/src/component/storage/graph.rs b/ecs/src/component/storage/graph.rs
index 11160e7..d38223a 100644
--- a/ecs/src/component/storage/graph.rs
+++ b/ecs/src/component/storage/graph.rs
@@ -140,7 +140,7 @@ impl Graph
     }
 
     fn create_missing_subset_node_edges(
-        target_node: &ArchetypeNode,
+        target_node: &mut ArchetypeNode,
         subset_node: &mut ArchetypeNode,
     )
     {
@@ -153,6 +153,14 @@ impl Graph
         subset_node
             .get_or_insert_edges(uniq_comp_id, ArchetypeEdges::default)
             .add = Some(subset_node.make_add_edge(uniq_comp_id).0);
+
+        if target_node.archetype().component_cnt()
+            == subset_node.archetype().component_cnt() + 1
+        {
+            target_node
+                .get_or_insert_edges(uniq_comp_id, ArchetypeEdges::default)
+                .remove = Some(subset_node.archetype().id());
+        }
     }
 
     fn create_missing_superset_node_edges(
@@ -245,13 +253,6 @@ impl ArchetypeNode
         self.edges.iter()
     }
 
-    pub fn get_edges_mut(&mut self, component_id: Uid) -> Option<&mut ArchetypeEdges>
-    {
-        debug_assert_eq!(component_id.kind(), UidKind::Component);
-
-        self.edges.get_mut(&component_id)
-    }
-
     pub fn make_add_edge(&self, component_id: Uid) -> (ArchetypeId, Vec<Uid>)
     {
         let mut edge_comp_ids = self