more tests and cleanup

Author: makspll

assets/tests/has_component/dynamic_component.lua

@@ -0,0 +1,6 @@
+local NewComponent = world.register_new_component("ScriptComponentA")
+local entity = world.spawn()
+
+assert(world.has_component(entity, NewComponent) == false, "Entity should not have component")
+world.add_default_component(entity, NewComponent)
+assert(world.has_component(entity, NewComponent) == true, "Entity should have component")

assets/tests/has_component/dynamic_component.rhai

@@ -0,0 +1,6 @@
+let NewComponent = world.register_new_component.call("ScriptComponentA");
+let entity = world.spawn_.call();
+
+assert(world.has_component.call(entity, NewComponent) == false, "Entity should not have component");
+world.add_default_component.call(entity, NewComponent);
+assert(world.has_component.call(entity, NewComponent) == true, "Entity should have component");

assets/tests/remove_component/can_remove_dynamic_component.lua

@@ -0,0 +1,11 @@
+local NewComponent = world.register_new_component("ScriptComponentA")
+local new_entity = world.spawn()
+world.add_default_component(new_entity, NewComponent)
+
+local component_instance = world.get_component(new_entity, NewComponent)
+assert(component_instance ~= nil, "unexpected value: " .. tostring(component_instance.data))
+
+world.remove_component(new_entity, NewComponent)
+local component_instance = world.get_component(new_entity, NewComponent)
+
+assert(component_instance == nil, "unexpected value: " .. tostring(component_instance))

assets/tests/remove_component/can_remove_dynamic_component.rhai

@@ -0,0 +1,11 @@
+let NewComponent = world.register_new_component.call("ScriptComponentA");
+let new_entity = world.spawn_.call();
+world.add_default_component.call(new_entity, NewComponent);
+
+let component_instance = world.get_component.call(new_entity, NewComponent);
+assert(type_of(component_instance) != "()", "unexpected value: " + component_instance.data);
+
+world.remove_component.call(new_entity, NewComponent);
+let component_instance_after = world.get_component.call(new_entity, NewComponent);
+
+assert(type_of(component_instance_after) == "()", "unexpected value: " + component_instance_after);

crates/bevy_mod_scripting_core/src/bindings/query.rs

@@ -129,6 +129,21 @@ impl ScriptComponentRegistration {
         self.registration
     }
 
+    /// Removes an instance of this component from the given entity
+    pub fn remove_from_entity(
+        &self,
+        world: WorldGuard,
+        entity: Entity,
+    ) -> Result<(), InteropError> {
+        world.with_global_access(|world| {
+            let mut entity = world
+                .get_entity_mut(entity)
+                .map_err(|_| InteropError::missing_entity(entity))?;
+            entity.remove_by_id(self.component_id);
+            Ok(())
+        })?
+    }
+
     /// Inserts an instance of this component into the given entity
     ///
     /// Requires whole world access

crates/bevy_mod_scripting_core/src/bindings/script_component.rs

@@ -14,7 +14,7 @@ use bevy::{
 use parking_lot::RwLock;
 use std::{alloc::Layout, mem::needs_drop, sync::Arc};
 
-/// A dynamic script component, with script set
+/// A dynamic script component
 #[derive(Reflect, Clone, Default)]
 #[reflect(Default)]
 pub struct ScriptComponent {

crates/bevy_mod_scripting_core/src/bindings/world.rs

@@ -34,7 +34,7 @@ use bevy::{
     ecs::{
         component::{Component, ComponentId},
         entity::Entity,
-        reflect::{AppTypeRegistry, ReflectComponent, ReflectFromWorld, ReflectResource},
+        reflect::{AppTypeRegistry, ReflectFromWorld, ReflectResource},
         system::{Commands, Resource},
         world::{unsafe_world_cell::UnsafeWorldCell, CommandQueue, Mut, World},
     },
@@ -934,17 +934,14 @@ impl WorldAccessGuard<'_> {
             .type_registration()
             .data::<ReflectDefault>()
         {
-            bevy::log::debug!("found default data");
             default_td.default()
         } else if let Some(from_world_td) = registration
             .type_registration()
             .type_registration()
             .data::<ReflectFromWorld>()
         {
-            bevy::log::debug!("found reflect from world");
             self.with_global_access(|world| from_world_td.from_world(world))?
         } else {
-            bevy::log::debug!("found neither");
             return Err(InteropError::missing_type_data(
                 registration.registration.type_id(),
                 "ReflectDefault or ReflectFromWorld".to_owned(),
@@ -988,18 +985,11 @@ impl WorldAccessGuard<'_> {
             .get_entity(entity)
             .ok_or_else(|| InteropError::missing_entity(entity))?;
 
-        bevy::log::debug!("Retrieving component with component id: {:?}", component_id);
-
         let component_info = cell
             .components()
             .get_info(component_id)
             .ok_or_else(|| InteropError::invalid_component(component_id))?;
 
-        bevy::log::debug!(
-            "Retrieved component with component info: {:?}",
-            component_info
-        );
-
         if entity.contains_id(component_id) {
             let type_id = component_info.type_id().or_else(|| {
                 // check its a script component
@@ -1049,25 +1039,7 @@ impl WorldAccessGuard<'_> {
         entity: Entity,
         registration: ScriptComponentRegistration,
     ) -> Result<(), InteropError> {
-        let component_data = registration
-            .type_registration()
-            .type_registration()
-            .data::<ReflectComponent>()
-            .ok_or_else(|| {
-                InteropError::missing_type_data(
-                    registration.registration.type_id(),
-                    "ReflectComponent".to_owned(),
-                )
-            })?;
-
-        //  TODO: this shouldn't need entire world access it feels
-        self.with_global_access(|world| {
-            let mut entity = world
-                .get_entity_mut(entity)
-                .map_err(|_| InteropError::missing_entity(entity))?;
-            component_data.remove(&mut entity);
-            Ok(())
-        })?
+        registration.remove_from_entity(self.clone(), entity)
     }
 
     /// get the given resource

crates/bevy_mod_scripting_core/src/lib.rs

@@ -252,7 +252,6 @@ fn once_per_app_finalize(app: &mut App) {
     if app.world().contains_resource::<BMSFinalized>() {
         return;
     }
-    println!("Running init");
     app.insert_resource(BMSFinalized);
 
     // read extensions from asset settings