1 files changed, 30 insertions, 28 deletions

diff --git a/engine-ecs/src/lib.rs b/engine-ecs/src/lib.rs
index 53e49df..aef374c 100644
--- a/engine-ecs/src/lib.rs
+++ b/engine-ecs/src/lib.rs
@@ -170,20 +170,13 @@ impl World
     #[tracing::instrument(skip_all)]
     pub fn spawn_with_uid<BundleT: Bundle>(&mut self, entity_uid: Uid, bundle: BundleT)
     {
-        let components_parts = bundle.into_parts_array();
+        let components_parts = bundle.iter_component_parts();
 
-        if let Some(comp_parts) = components_parts
-            .as_ref()
-            .iter()
-            .find(|comp_parts| comp_parts.is_sole)
-        {
-            panic!(
-                "Cannot spawn entity with sole component {}",
-                comp_parts.name
-            );
-        }
-
-        self.create_ent(entity_uid, components_parts);
+        self.create_ent(
+            entity_uid,
+            components_parts,
+            ComponentAddingFlags { allow_soles: false },
+        );
     }
 
     /// Creates a entity with the given components. The entity will have the specified
@@ -199,24 +192,12 @@ impl World
         bundle: BundleT,
     )
     {
-        let components_parts = bundle.into_parts_array();
-
-        if let Some(comp_parts) = components_parts
-            .as_ref()
-            .iter()
-            .find(|comp_parts| comp_parts.is_sole)
-        {
-            panic!(
-                "Cannot spawn entity with sole component {}",
-                comp_parts.name
-            );
-        }
+        let components_parts = bundle.iter_component_parts();
 
         self.create_ent(
             entity_uid,
-            components_parts
-                .into_iter()
-                .chain([EntityName { name: name.into() }.into_parts()]),
+            components_parts.chain([EntityName { name: name.into() }.into_parts()]),
+            ComponentAddingFlags { allow_soles: false },
         );
     }
 
@@ -233,6 +214,7 @@ impl World
             [component_parts],
             &mut self.data.component_storage,
             &EventSubmitter::new(&self.data.new_events),
+            ComponentAddingFlags { allow_soles: false },
         );
     }
 
@@ -266,6 +248,7 @@ impl World
                 sole.into_parts(),
                 EntityName { name: name.into() }.into_parts(),
             ],
+            ComponentAddingFlags { allow_soles: true },
         );
 
         Ok(())
@@ -288,6 +271,7 @@ impl World
                     .into_iter()
                     .map(IntoComponentParts::into_parts),
             ),
+            ComponentAddingFlags { allow_soles: false },
         );
 
         system_callbacks.on_created(self, SystemMetadata { ent_id });
@@ -471,6 +455,7 @@ impl World
         &mut self,
         entity_uid: Uid,
         components: impl IntoIterator<Item = ComponentParts>,
+        flags: ComponentAddingFlags,
     )
     {
         debug_assert!(!entity_uid.is_pair());
@@ -486,6 +471,7 @@ impl World
             components,
             &mut self.data.component_storage,
             &EventSubmitter::new(&self.data.new_events),
+            flags,
         );
     }
 
@@ -623,6 +609,7 @@ impl World
                         components,
                         &mut self.data.component_storage,
                         &EventSubmitter::new(&self.data.new_events),
+                        ComponentAddingFlags { allow_soles: false },
                     );
                 }
                 Action::Despawn(entity_id) => {
@@ -640,6 +627,7 @@ impl World
                         components,
                         &mut self.data.component_storage,
                         &EventSubmitter::new(&self.data.new_events),
+                        ComponentAddingFlags { allow_soles: false },
                     );
                 }
                 Action::RemoveComponents(entity_uid, component_ids) => {
@@ -670,6 +658,7 @@ impl World
                         [new_pair],
                         &mut self.data.component_storage,
                         &EventSubmitter::new(&self.data.new_events),
+                        ComponentAddingFlags { allow_soles: false },
                     );
                 }
                 Action::Stop => {
@@ -684,11 +673,18 @@ impl World
         components: impl IntoIterator<Item = ComponentParts>,
         component_storage: &mut ComponentStorage,
         event_submitter: &EventSubmitter<'_>,
+        flags: ComponentAddingFlags,
     )
     {
         let component_iter = components.into_iter();
 
         for component_parts in component_iter {
+            assert!(
+                flags.allow_soles || !component_parts.is_sole,
+                "Cannot add sole component '{}' to an entity",
+                component_parts.name
+            );
+
             let comp_id = component_parts.id;
             let comp_name = component_parts.name;
             let comp_type_id = (&*component_parts.data).type_id();
@@ -999,3 +995,9 @@ impl ActionQueue
 #[derive(Debug, thiserror::Error)]
 #[error("Sole already exists")]
 pub struct SoleAlreadyExistsError;
+
+#[derive(Debug)]
+struct ComponentAddingFlags
+{
+    allow_soles: bool,
+}