chore: add test for empty insert + addition of script

assets/tests/lifecycle/default/entity_script/loading_via_entry_and_modify/lifecycle.lua

@@ -0,0 +1,11 @@
+function on_script_loaded()
+    return "loaded!"
+end
+
+function on_script_unloaded()
+    return "unloaded!"
+end
+
+function on_script_reloaded(val)
+    return "reloaded with: " .. val
+end

assets/tests/lifecycle/default/entity_script/loading_via_entry_and_modify/scenario.bmsscenario

@@ -0,0 +1,14 @@
+// #main_script lifecycle.lua
+SetCurrentLanguage language="@this_script_language"
+InstallPlugin emit_responses=true
+FinalizeApp
+
+// load script by inserting empty component and immediately modifying
+SpawnEntity name="test_entity_a"
+LoadScriptAs as_name="script_b", path="lifecycle.lua"
+WaitForScriptAssetLoaded name="script_b"
+AddScriptToEntity name="test_entity_a", script="script_b"
+RunUpdateOnce
+AssertCallbackSuccess attachment="EntityScript", entity="test_entity_a", label="OnScriptLoaded", script="script_b", expect_string_value="loaded!"
+AssertNoCallbackResponsesEmitted
+AssertContextResidents attachment="EntityScript", script="script_b", entity="test_entity_a", residents_num=1

crates/bevy_mod_scripting_core/src/event.rs

@@ -1,7 +1,5 @@
 //! Event handlers and event types for scripting.
 
-use std::marker::PhantomData;
-
 use ::{bevy_ecs::entity::Entity, bevy_reflect::Reflect};
 use bevy_asset::{AssetId, Handle};
 use bevy_ecs::message::Message;
@@ -41,50 +39,6 @@ pub struct ScriptDetachedEvent(pub ScriptAttachment);
 #[derive(Message, Clone, Debug)]
 pub struct ScriptAssetModifiedEvent(pub AssetId<ScriptAsset>);
 
-#[derive(Message)]
-/// Wrapper around a script event making it available to read by a specific plugin only
-pub struct ForPlugin<T, P: IntoScriptPluginParams>(T, PhantomData<fn(P)>);
-
-impl<T: std::fmt::Debug, P: IntoScriptPluginParams> std::fmt::Debug for ForPlugin<T, P> {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        f.debug_tuple("ForPlugin").field(&self.0).finish()
-    }
-}
-
-impl<T, P: IntoScriptPluginParams> From<T> for ForPlugin<T, P> {
-    fn from(value: T) -> Self {
-        Self::new(value)
-    }
-}
-
-impl<T: Clone, P: IntoScriptPluginParams> Clone for ForPlugin<T, P> {
-    fn clone(&self) -> Self {
-        Self(self.0.clone(), self.1)
-    }
-}
-
-impl<T, P: IntoScriptPluginParams> ForPlugin<T, P> {
-    /// Creates a new wrapper for the specific plugin
-    pub fn new(message: T) -> Self {
-        Self(message, Default::default())
-    }
-
-    /// Retrieves the inner event
-    pub fn event(&self) -> &T {
-        &self.0
-    }
-
-    /// Retrieves the inner event mutably
-    pub fn event_mut(&mut self) -> &mut T {
-        &mut self.0
-    }
-
-    /// Unpacks the inner event
-    pub fn inner(self) -> T {
-        self.0
-    }
-}
-
 /// A string which disallows common invalid characters in callback labels,
 /// particularly at the start of the string
 ///

crates/bevy_mod_scripting_core/src/pipeline/mod.rs

@@ -22,7 +22,7 @@ use crate::{
     context::ScriptingLoader,
     error::ScriptError,
     event::{
-        ForPlugin, Recipients, ScriptAssetModifiedEvent, ScriptAttachedEvent, ScriptDetachedEvent,
+        Recipients, ScriptAssetModifiedEvent, ScriptAttachedEvent, ScriptDetachedEvent,
         ScriptErrorEvent,
     },
     pipeline::hooks::{
@@ -136,13 +136,6 @@ impl<P: IntoScriptPluginParams> std::fmt::Debug for ScriptProcessingSchedule<P>
     }
 }
 
-impl<P: IntoScriptPluginParams> ScriptLoadingPipeline<P> {
-    fn add_plugin_message<E: Message>(&self, app: &mut App) -> &Self {
-        app.add_message::<E>().add_message::<ForPlugin<E, P>>();
-        self
-    }
-}
-
 /// A trait describing things containing script handles
 pub trait GetScriptHandle {
     /// Retrieve the contained script handle
@@ -204,9 +197,9 @@ impl<T: GetScriptHandle + Message + Clone> LoadedWithHandles<'_, '_, T> {
 
 impl<P: IntoScriptPluginParams> Plugin for ScriptLoadingPipeline<P> {
     fn build(&self, app: &mut App) {
-        self.add_plugin_message::<ScriptAttachedEvent>(app)
-            .add_plugin_message::<ScriptDetachedEvent>(app)
-            .add_plugin_message::<ScriptAssetModifiedEvent>(app);
+        app.add_message::<ScriptAttachedEvent>()
+            .add_message::<ScriptDetachedEvent>()
+            .add_message::<ScriptAssetModifiedEvent>();
 
         app.init_resource::<ActiveMachinesData>();
 

crates/testing_crates/bevy_mod_scripting_test_scenario_syntax/src/parse.rs

@@ -110,6 +110,11 @@ pub enum ScenarioStepSerialized {
         /// the script to spawn on the entity
         script: String,
     },
+    /// Spawns an entity with the given name
+    SpawnEntity {
+        /// the name to give this entity for future reference
+        name: String,
+    },
     /// Pushes a script into the existing script component on an entity, or creates a new one and inserts the script
     AddScriptToEntity {
         /// the name of the entity to insert into

crates/testing_crates/bevy_mod_scripting_test_scenario_syntax/src/schema.rs

@@ -159,6 +159,18 @@ fn get_schema() -> ScenarioSchema {
                     .collect(),
                 },
             ),
+            (
+                "SpawnEntity".into(),
+                StepSchema {
+                    fields: vec![str_field(
+                        "name",
+                        false,
+                        "the name to give this entity for future reference",
+                    )]
+                    .into_iter()
+                    .collect(),
+                },
+            ),
             (
                 "AttachStaticScript".into(),
                 StepSchema {

crates/testing_crates/script_integration_test_harness/src/scenario.rs

@@ -298,6 +298,9 @@ impl Scenario {
                     entity: name,
                 }
             }
+            ScenarioStepSerialized::SpawnEntity { name } => {
+                ScenarioStep::SpawnEntity { entity: name }
+            }
             ScenarioStepSerialized::AddScriptToEntity { name, script } => {
                 ScenarioStep::AddScriptToEntity {
                     script: self.context.get_script_handle(&script)?,
@@ -523,6 +526,10 @@ pub enum ScenarioStep {
     WaitForScriptAssetLoaded {
         script: Handle<ScriptAsset>,
     },
+    /// Spawns an entity with no components
+    SpawnEntity {
+        entity: String,
+    },
     /// Spawns an entity with the given name and attaches the given script to it.
     SpawnEntityWithScript {
         script: Handle<ScriptAsset>,
@@ -829,6 +836,12 @@ impl ScenarioStep {
                     script.display()
                 );
             }
+            ScenarioStep::SpawnEntity { entity: name } => {
+                let entity = app.world_mut().spawn_empty().id();
+                context.entities.insert(name.to_string(), entity);
+                info!("Spawned empty entity '{entity}'");
+            }
+
             ScenarioStep::EmitScriptCallbackEvent { event } => {
                 app.world_mut().write_message(event.clone());
             }

scenario_file_language_server/src/scenario.tmLanguage.json

@@ -21,7 +21,7 @@
             "patterns": [
                 {
                     "name": "keyword.control.step.scenario",
-                    "match": "\\b(SetCurrentLanguage|InstallPlugin|SetupHandler|FinalizeApp|LoadScriptAs|WaitForScriptAssetLoaded|SpawnEntityWithScript|RunUpdateOnce|EmitScriptCallbackEvent|AssertCallbackSuccess|AssertNoCallbackResponsesEmitted|AssertContextState|AssertContextResidents|ReloadScriptFrom|DropScriptAsset|DespawnEntity|AttachStaticScript|RemoveScriptFromEntity|AddScriptToEntity)\\b"
+                    "match": "\\b(SetCurrentLanguage|InstallPlugin|SetupHandler|FinalizeApp|LoadScriptAs|WaitForScriptAssetLoaded|SpawnEntityWithScript|RunUpdateOnce|EmitScriptCallbackEvent|AssertCallbackSuccess|AssertNoCallbackResponsesEmitted|AssertContextState|AssertContextResidents|ReloadScriptFrom|DropScriptAsset|DespawnEntity|AttachStaticScript|RemoveScriptFromEntity|AddScriptToEntity|SpawnEntity)\\b"
                 },
                 {
                     "name": "variable.parameter.field.scenario",