4 files changed, 59 insertions, 36 deletions

diff --git a/ecs/src/component/local.rs b/ecs/src/component/local.rs
index 0f6f641..6b2463f 100644
--- a/ecs/src/component/local.rs
+++ b/ecs/src/component/local.rs
@@ -1,7 +1,17 @@
+use std::any::type_name;
 use std::ops::{Deref, DerefMut};
 
-use crate::component::{Component, HandleMut as ComponentHandleMut};
-use crate::system::{Param as SystemParam, System};
+use ecs_macros::Component;
+
+use crate::component::{
+    Component,
+    HandleMut as ComponentHandleMut,
+    IntoParts as _,
+    Parts as ComponentParts,
+};
+use crate::pair::Pair;
+use crate::system::initializable::Param as InitializableParam;
+use crate::system::{Metadata as SystemMetadata, Param as SystemParam};
 use crate::World;
 
 /// Holds a component which is local to a single system.
@@ -17,27 +27,44 @@ where
 {
     type Input = LocalComponent;
 
-    fn initialize<SystemImpl>(
-        system: &mut impl System<'world, SystemImpl>,
-        input: Self::Input,
-    )
+    fn new(world: &'world World, system_metadata: &SystemMetadata) -> Self
     {
-        system.set_local_component(input);
-    }
+        let Some(system_ent) = world.get_entity(system_metadata.ent_id) else {
+            panic!(
+                "System entity with ID {} does not exist",
+                system_metadata.ent_id
+            );
+        };
 
-    fn new<SystemImpl>(
-        system: &'world impl System<'world, SystemImpl>,
-        _world: &'world World,
-    ) -> Self
-    {
-        let local_component = system
-            .get_local_component_mut::<LocalComponent>()
-            .expect("Local component is uninitialized");
+        let Some(local_component) = system_ent.get_with_id_mut::<LocalComponent>(
+            Pair::new::<IsLocalComponent>(LocalComponent::id()).id(),
+        ) else {
+            panic!(
+                "Local component {} of system with ID {} is uninitialized",
+                type_name::<LocalComponent>(),
+                system_metadata.ent_id
+            );
+        };
 
         Self { local_component }
     }
 }
 
+impl<'world, LocalComponent, SystemT> InitializableParam<'world, SystemT>
+    for Local<'world, LocalComponent>
+where
+    LocalComponent: Component,
+    SystemT: SystemWithLocalComponents,
+    Self: SystemParam<'world, Input = LocalComponent>,
+{
+    fn initialize(system: &mut SystemT, input: Self::Input)
+    {
+        system.add_local_component(
+            Pair::new_with_comp_target::<IsLocalComponent>(input).into_parts(),
+        );
+    }
+}
+
 impl<LocalComponent> Deref for Local<'_, LocalComponent>
 where
     LocalComponent: Component,
@@ -59,3 +86,11 @@ where
         &mut self.local_component
     }
 }
+
+pub trait SystemWithLocalComponents
+{
+    fn add_local_component(&mut self, component_parts: ComponentParts);
+}
+
+#[derive(Component)]
+struct IsLocalComponent;
diff --git a/ecs/src/component/storage.rs b/ecs/src/component/storage.rs
index b27b552..4ec5222 100644
--- a/ecs/src/component/storage.rs
+++ b/ecs/src/component/storage.rs
@@ -270,7 +270,7 @@ impl Storage
 
         entity.insert_component(
             component_id,
-            ArchetypeEntityComponent::new(component, component_id, component_name),
+            ArchetypeEntityComponent::new(component, component_name),
             add_edge_archetype,
         );
 
diff --git a/ecs/src/component/storage/archetype.rs b/ecs/src/component/storage/archetype.rs
index a88e0e8..d96632e 100644
--- a/ecs/src/component/storage/archetype.rs
+++ b/ecs/src/component/storage/archetype.rs
@@ -122,7 +122,7 @@ impl Archetype
     pub fn get_matching_component_indices(
         &self,
         component_id: Uid,
-    ) -> MatchingComponentIter
+    ) -> MatchingComponentIter<'_>
     {
         assert!(
             component_id.kind() == UidKind::Component
@@ -314,29 +314,18 @@ impl Entity
 #[derive(Debug)]
 pub struct EntityComponent
 {
-    id: Uid,
     component: Lock<Box<dyn Any>>,
 }
 
 impl EntityComponent
 {
-    pub fn new(
-        component: Box<dyn Any>,
-        component_id: Uid,
-        component_name: &'static str,
-    ) -> Self
+    pub fn new(component: Box<dyn Any>, component_name: &'static str) -> Self
     {
         Self {
-            id: component_id,
             component: Lock::new(component, component_name),
         }
     }
 
-    pub fn id(&self) -> Uid
-    {
-        self.id
-    }
-
     pub fn component(&self) -> &Lock<Box<dyn Any>>
     {
         &self.component
@@ -370,11 +359,10 @@ impl Id
         }
 
         for comp_id in component_id_iter {
-            if prev_component_id.is_some_and(|prev_comp_id| *comp_id < prev_comp_id) {
-                panic!(
-                    "Cannot create archetype ID from a unsorted component metadata list"
-                );
-            }
+            assert!(
+                prev_component_id.is_none_or(|prev_comp_id| *comp_id >= prev_comp_id),
+                "Cannot create archetype ID from a unsorted component metadata list"
+            );
 
             prev_component_id = Some(*comp_id);
 
diff --git a/ecs/src/component/storage/graph.rs b/ecs/src/component/storage/graph.rs
index 29fa937..76200f9 100644
--- a/ecs/src/component/storage/graph.rs
+++ b/ecs/src/component/storage/graph.rs
@@ -80,7 +80,7 @@ impl Graph
     pub fn dfs_archetype_add_edges(
         &self,
         archetype_id: ArchetypeId,
-    ) -> Option<ArchetypeAddEdgeDfsIter>
+    ) -> Option<ArchetypeAddEdgeDfsIter<'_>>
     {
         let node = self.get_node_by_id(archetype_id)?;