Merge branch 'main' into refactor/inline-contexts-into-scripts

Author: makspll

.github/workflows/pr-titles.yml

@@ -26,6 +26,8 @@ jobs:
             chore
             test
             docs
+            refactor
+
           scopes: |
             ladfile
             ladfile_builder

assets/tests/api_availability/api_available_on_callback.lua

@@ -0,0 +1,22 @@
+assert(world ~= nil, "World was not found")
+assert(world.get_type_by_name("TestComponent") ~= nil, "Could not find TestComponent type")
+local global_invocation = Entity.from_raw(1)
+
+function on_test()
+    assert(world ~= nil, "World was not found")
+    assert(world.get_type_by_name("TestComponent") ~= nil, "Could not find TestComponent type")
+    Entity.from_raw(1)
+
+    -- assert global_invocation happened
+    assert(global_invocation ~= nil, "Global invocation did not happen")
+
+    return true
+end
+
+function on_test_post_update()
+    return true
+end
+
+function on_test_last()
+    return true
+end

assets/tests/api_availability/api_available_on_callback.rhai

@@ -0,0 +1,22 @@
+assert(type_of(world) != "()", "World was not found");
+assert(type_of(world.get_type_by_name.call("TestComponent")) != "()", "Could not find TestComponent type");
+let global_invocation = Entity.from_raw.call(1);
+
+fn on_test(){
+    assert(type_of(world) != "()", "World was not found");
+    assert(type_of(world.get_type_by_name.call("TestComponent")) != "()", "Could not find TestComponent type");
+    Entity.from_raw.call(1);
+
+    // assert global_invocation happened
+    assert(type_of(global_invocation) != "()", "Global invocation did not happen");
+
+    return true;
+}
+
+fn on_test_post_update(){
+    return true;
+}
+
+fn on_test_last(){
+    return true;
+}

assets/tests/api_availability/api_available_on_callback_and_on_load__RETURN.lua

@@ -3,4 +3,4 @@ let res = world.get_resource.call(res_type);
 
 let popped = res.vec_usize.pop.call();
 
-assert(popped == 5, "Pop did not work");
+assert(popped == 5, "Pop did not work, got " + popped);

assets/tests/api_availability/api_available_on_callback_and_on_load__RETURN.rhai

@@ -192,16 +192,19 @@ fn load_rhai_content_into_context(
     runtime: &RhaiRuntime,
 ) -> Result<(), ScriptError> {
     let runtime = runtime.read();
-    let mut ast = runtime.compile(std::str::from_utf8(content)?)?;
-    ast.set_source(script.to_string());
+  
+    context.ast = runtime.compile(std::str::from_utf8(content)?)?;
+    context.ast.set_source(script.to_string());
+
     initializers
         .iter()
         .try_for_each(|init| init(script, context))?;
     pre_handling_initializers
         .iter()
         .try_for_each(|init| init(script, Entity::from_raw(0), context))?;
-    runtime.eval_ast_with_scope(&mut context.scope, &ast)?;
-    // Unlike before, do not clear statements so that definitions persist.
+    runtime.eval_ast_with_scope(&mut context.scope, &context.ast)?;
+
+    context.ast.clear_statements();
     Ok(())
 }
 

assets/tests/api_availability/api_available_on_script_load.lua

@@ -22,6 +22,7 @@ use bevy_mod_scripting_core::{
     asset::ScriptAsset,
     bindings::{pretty_print::DisplayWithWorld, script_value::ScriptValue, WorldGuard},
     callback_labels,
+    error::{InteropError, ScriptError},
     event::{IntoCallbackLabel, ScriptErrorEvent},
     extractors::{HandlerContext, WithWorldGuard},
     handler::handle_script_errors,
@@ -43,13 +44,14 @@ struct TestCallbackBuilder<P: IntoScriptPluginParams, L: IntoCallbackLabel> {
 }
 
 impl<L: IntoCallbackLabel, P: IntoScriptPluginParams> TestCallbackBuilder<P, L> {
-    fn build(script_id: impl Into<ScriptId>) -> SystemConfigs {
+    fn build(script_id: impl Into<ScriptId>, expect_response: bool) -> SystemConfigs {
         let script_id = script_id.into();
         IntoSystem::into_system(
             move |world: &mut World,
                   system_state: &mut SystemState<WithWorldGuard<HandlerContext<P>>>| {
                 let with_guard = system_state.get_mut(world);
-                run_test_callback::<P, L>(&script_id.clone(), with_guard);
+                let _ = run_test_callback::<P, L>(&script_id.clone(), with_guard, expect_response);
+
                 system_state.apply(world);
             },
         )
@@ -103,13 +105,22 @@ pub fn execute_integration_test<
         *handle = server.load(script_id.to_owned());
     };
 
+    // tests can opt in to this via "__RETURN"
+    let expect_callback_response = script_id.contains("__RETURN");
+
     app.add_systems(Startup, load_system);
-    app.add_systems(Update, TestCallbackBuilder::<P, OnTest>::build(script_id));
+    app.add_systems(
+        Update,
+        TestCallbackBuilder::<P, OnTest>::build(script_id, expect_callback_response),
+    );
     app.add_systems(
         PostUpdate,
-        TestCallbackBuilder::<P, OnTestPostUpdate>::build(script_id),
+        TestCallbackBuilder::<P, OnTestPostUpdate>::build(script_id, expect_callback_response),
+    );
+    app.add_systems(
+        Last,
+        TestCallbackBuilder::<P, OnTestLast>::build(script_id, expect_callback_response),
     );
-    app.add_systems(Last, TestCallbackBuilder::<P, OnTestLast>::build(script_id));
     app.add_systems(Update, dummy_update_system);
     app.add_systems(Startup, dummy_startup_system::<String>);
 
@@ -147,11 +158,12 @@ pub fn execute_integration_test<
 fn run_test_callback<P: IntoScriptPluginParams, C: IntoCallbackLabel>(
     script_id: &str,
     mut with_guard: WithWorldGuard<'_, '_, HandlerContext<'_, P>>,
-) {
+    expect_response: bool,
+) -> Result<ScriptValue, ScriptError> {
     let (guard, handler_ctxt) = with_guard.get_mut();
 
     if !handler_ctxt.is_script_fully_loaded(script_id.to_string().into()) {
-        return;
+        return Ok(ScriptValue::Unit);
     }
 
     let res = handler_ctxt.call::<C>(
@@ -163,14 +175,20 @@ fn run_test_callback<P: IntoScriptPluginParams, C: IntoCallbackLabel>(
     let e = match res {
         Ok(ScriptValue::Error(e)) => e.into(),
         Err(e) => e,
-        _ => {
-            match guard.with_resource_mut(|mut events: Mut<Events<TestEventFinished>>| {
-                events.send(TestEventFinished)
-            }) {
-                Ok(_) => return,
-                Err(e) => e.into(),
+        Ok(v) => {
+            if expect_response && !matches!(v, ScriptValue::Bool(true)) {
+                InteropError::external_error(format!("Response from callback {} was either not received or wasn't correct. Expected true, got: {v:?}", C::into_callback_label()).into()).into()
+            } else {
+                match guard.with_resource_mut(|mut events: Mut<Events<TestEventFinished>>| {
+                    events.send(TestEventFinished)
+                }) {
+                    Ok(_) => return Ok(v),
+                    Err(e) => e.into(),
+                }
             }
         }
     };
-    handle_script_errors(guard, vec![e].into_iter())
+    handle_script_errors(guard, vec![e.clone()].into_iter());
+
+    Err(e)
 }

assets/tests/api_availability/api_available_on_script_load.rhai

@@ -19,11 +19,13 @@ commit_parsers = [
     { message = "^chore.*", skip = true },
     { message = "^test.*", skip = true },
     { message = "^docs.*", skip = true },
+    { message = ".*[SKIP_CHANGELOG].*", skip = true },
     { message = "^feat", group = "added" },
     { message = "^changed", group = "changed" },
     { message = "^deprecated", group = "deprecated" },
     { message = "^fix", group = "fixed" },
     { message = "^security", group = "security" },
+    { message = "^refactor", group = "refactor" },
     { message = "^.*", group = "other" },
 ]