fix lifetime issue, allow refs

Author: makspll

assets/scripts/bevy_api.lua

@@ -15,6 +15,7 @@ function on_event()
     print(script)
     print(world)
 
+    print(world:hello(entity))
     print(world:test_vec({entity, entity})[1])
 
 

crates/bevy_mod_scripting_core/src/bindings/function/from.rs

@@ -146,7 +146,7 @@ impl<T> Deref for Ref<'_, T> {
 }
 
 impl<T: FromReflect> FromScript for Ref<'_, T> {
-    type This<'w> = Ref<'w, T>;
+    type This<'a> = Ref<'a, T>;
 
     fn from_script(
         value: ScriptValue,

crates/bevy_mod_scripting_core/src/bindings/function/script_function.rs

@@ -34,6 +34,7 @@ macro_rules! impl_script_function {
     (@ $( $param:ident ),* : $(($callback:ident: $callbackty:ty))? -> O => $res:ty $(where $out:ident)?) => {
         #[allow(non_snake_case)]
         impl<
+            'l,
             $( $param: FromScript, )*
             O,
             F
@@ -43,7 +44,7 @@ macro_rules! impl_script_function {
         where
             O: IntoScript,
             F: Fn( $( $callbackty, )? $($param ),* ) -> $res + Send + Sync + 'static,
-            $( for<'a> $param::This<'a>: Into<$param>, )*
+            $( $param::This<'l>: Into<$param>),*
         {
             fn into_dynamic_function(self) -> DynamicFunction<'static> {
                 (move |world: WorldCallbackAccess, $( $param: ScriptValue ),* | {

crates/bevy_mod_scripting_functions/src/core.rs

@@ -10,7 +10,10 @@ use bevy::{
 };
 use bevy_mod_scripting_core::*;
 use bindings::{
-    function::{from::Val, script_function::ScriptFunction},
+    function::{
+        from::{Ref, Val},
+        script_function::ScriptFunction,
+    },
     script_value::{FromScriptValue, IntoScriptValue, ScriptValue},
     ReflectReference, ReflectionPathExt, ScriptTypeRegistration, WorldAccessGuard,
     WorldCallbackAccess,
@@ -58,7 +61,7 @@ assert_is_script_function!(|a: Val<usize>| Ok(2));
 
 fn register_world_functions(reg: &mut FunctionRegistry) -> Result<(), FunctionRegistrationError> {
     NamespaceBuilder::<WorldCallbackAccess>::new(reg)
-        // .overwrite_script_function("hello", |a: Val<usize>| 2)
+        .overwrite_script_function("hello", |b: Ref<Entity>| None::<usize>)
         .overwrite(
             "test_vec",
             |s: WorldCallbackAccess, entities: Vec<Entity>| entities,