1 files changed, 41 insertions, 24 deletions
diff --git a/ecs/src/entity.rs b/ecs/src/entity.rs
index 4496a2b..ef91d20 100644
--- a/ecs/src/entity.rs
+++ b/ecs/src/entity.rs
@@ -1,6 +1,6 @@
 use std::any::type_name;
-
-use linkme::distributed_slice;
+use std::ops::Deref;
+use std::sync::LazyLock;
 
 use crate::component::storage::archetype::{
     Archetype,
@@ -124,31 +124,48 @@ impl<'a> Iterator for MatchingComponentIter<'a>
     }
 }
 
+/// The data type of a declaration of a entity.
+#[derive(Debug)]
+pub struct Declaration
+{
+    uid: LazyLock<Uid>,
+    create_func: fn(&mut World),
+}
+
+impl Declaration
+{
+    pub(crate) fn create(&self, world: &mut World)
+    {
+        (self.create_func)(world);
+    }
+
+    #[doc(hidden)]
+    pub const fn new(create_func: fn(&mut World)) -> Self
+    {
+        Self {
+            uid: LazyLock::new(|| Uid::new_unique(UidKind::Entity)),
+            create_func,
+        }
+    }
+}
+
+impl Deref for Declaration
+{
+    type Target = Uid;
+
+    fn deref(&self) -> &Self::Target
+    {
+        &self.uid
+    }
+}
+
 #[allow(clippy::module_name_repetitions)]
 #[macro_export]
-macro_rules! static_entity {
+macro_rules! declare_entity {
     ($visibility: vis $ident: ident, $components: expr) => {
-        $visibility static $ident: ::std::sync::LazyLock<$crate::uid::Uid> =
-            ::std::sync::LazyLock::new(|| {
-                $crate::uid::Uid::new_unique($crate::uid::Kind::Entity)
+        $visibility static $ident: $crate::entity::Declaration =
+            $crate::entity::Declaration::new(|world| {
+                world.create_entity_with_uid(*$ident, $components);
             });
-
-        $crate::private::paste::paste! {
-            mod [<__ecs_ $ident:lower _static_entity_priv>] {
-                use super::*;
-
-                #[$crate::private::linkme::distributed_slice(
-                    $crate::entity::CREATE_STATIC_ENTITIES
-                )]
-                #[linkme(crate=$crate::private::linkme)]
-                static CREATE_STATIC_ENTITY: fn(&mut $crate::World) = |world| {
-                    world.create_entity_with_uid($components, *$ident);
-                };
-            }
-        }
     }
 }
-
-#[distributed_slice]
-#[doc(hidden)]
-pub static CREATE_STATIC_ENTITIES: [fn(&mut World)];