re-do newindex

Author: makspll

assets/scripts/bevy_api.lua

@@ -25,10 +25,10 @@ function on_event()
     print(comp.option_usize)
     comp.option_usize = nil
     print(comp.option_usize)
-
-    -- print("\nvec")
+    world:exit()
+    print("\nvec")
     -- print(table_to_string(comp.vec_of_usize))
-    -- comp.vec_of_usize = {42,69,72}
+    comp.vec_of_usize = {42,69,72}
     -- comp.vec_of_usize[1] = 0
     -- print(comp.vec_of_usize[2])
     -- print(table_to_string(comp.vec_of_usize))

crates/bevy_mod_scripting_core/src/bindings/script_val.rs

@@ -277,11 +277,6 @@ impl FromScriptValue for dyn PartialReflect {
         world: WorldGuard,
         target_type_id: TypeId,
     ) -> Option<ScriptResult<Box<dyn PartialReflect>>> {
-        println!(
-            "type: {:?}",
-            target_type_id.display_with_world(world.clone())
-        );
-
         match target_type_id {
             // TODO: if these types ever support reflect, we can uncomment these lines
             // For some of these we specifically require the borrowed static variant, this will never let you use a dynamically created string from the script
@@ -344,7 +339,6 @@ impl FromScriptValue for dyn PartialReflect {
                 return u128::from_script_value(value, world, target_type_id)
             }
             t if t == TypeId::of::<usize>() => {
-                println!("usize {:?}", value);
                 return usize::from_script_value(value, world, target_type_id);
             }
             // t if t == TypeId::of::<Box<str>>() => return <Box<str>>::from_script_value(value, world, target_type_id),
@@ -1451,24 +1445,6 @@ mod test {
         .unwrap()
         .reflect_partial_eq(&"hello")
         .unwrap());
-
-        println!(
-            "{:?}",
-            <dyn PartialReflect>::from_script_value(
-                ScriptValue::Reference(option_reference.clone()),
-                guard.clone(),
-                TypeId::of::<Option<usize>>()
-            )
-        );
-
-        println!(
-            "heL: {:?}",
-            <dyn PartialReflect>::from_script_value(
-                ScriptValue::Reference(usize_reference.clone()),
-                guard.clone(),
-                TypeId::of::<Option<usize>>()
-            )
-        );
         assert!(<dyn PartialReflect>::from_script_value(
             ScriptValue::Reference(usize_reference.clone()),
             guard.clone(),
@@ -1499,14 +1475,6 @@ mod test {
         .reflect_partial_eq(&Some(Some(2usize)))
         .unwrap());
 
-        println!(
-            "heL: {:?}",
-            <dyn PartialReflect>::from_script_value(
-                ScriptValue::Unit,
-                guard.clone(),
-                TypeId::of::<Option<Option<usize>>>()
-            )
-        );
         assert!(<dyn PartialReflect>::from_script_value(
             ScriptValue::Unit,
             guard.clone(),
@@ -1553,14 +1521,6 @@ mod test {
         .reflect_partial_eq(&Some("hello".to_string()))
         .unwrap());
 
-        println!(
-            "{:?}",
-            <dyn PartialReflect>::from_script_value(
-                ScriptValue::Unit,
-                guard.clone(),
-                TypeId::of::<Option<String>>()
-            )
-        );
         assert!(<dyn PartialReflect>::from_script_value(
             ScriptValue::Unit,
             guard.clone(),

crates/languages/bevy_mod_scripting_lua/src/bindings/reference.rs

@@ -20,7 +20,7 @@ use bevy_mod_scripting_core::{
         DeferredReflection, ReflectAllocator, ReflectRefIter, ReflectReference, ReflectionPathElem,
         TypeIdSource, WorldCallbackAccess,
     },
-    error::{FunctionError, ScriptError, ScriptResult},
+    error::{FunctionError, ScriptError, ScriptResult, ValueConversionError},
     new_deferred_reflection,
     reflection_extensions::{PartialReflectExt, TypeIdExtensions},
     Either,
@@ -318,11 +318,55 @@ impl UserData for LuaReflectReference {
                 let mut reflect_path: ReflectionPathElem = key.try_into()?;
                 reflect_path.convert_to_0_indexed();
                 self_.index_path(reflect_path);
-                let script_value = self_.into_script_value(world)?;
+                let script_value = self_.with_reflect(world.clone(), |r| {
+                    <&dyn PartialReflect>::into_script_value(r, world.clone())
+                })??;
                 LuaScriptValue::from(script_value).into_lua(lua)
             },
         );
 
+        m.add_meta_function(
+            MetaMethod::NewIndex,
+            |lua, (self_, key, value): (LuaReflectReference, LuaScriptValue, LuaScriptValue)| {
+                let mut self_: ReflectReference = self_.into();
+                let key: ScriptValue = key.into();
+                let value: ScriptValue = value.into();
+                let mut reflect_path: ReflectionPathElem = key.try_into()?;
+                reflect_path.convert_to_0_indexed();
+
+                let world = lua.get_world();
+
+                self_.index_path(reflect_path);
+                self_.with_reflect_mut(world.clone(), |r| {
+                    let target_type_id = r
+                        .get_represented_type_info()
+                        .map(|i| i.type_id())
+                        .type_id_or_fake_id();
+                    let other = <dyn PartialReflect>::from_script_value(
+                        value,
+                        world.clone(),
+                        target_type_id,
+                    )
+                    .transpose()?
+                    .ok_or_else(|| ValueConversionError::TypeMismatch {
+                        expected_type: target_type_id.display_with_world(world.clone()).into(),
+                        actual_type: Some(
+                            r.get_represented_type_info()
+                                .map(|i| i.type_id())
+                                .type_id_or_fake_id()
+                                .display_with_world(world.clone())
+                                .into(),
+                        ),
+                    })?;
+
+                    r.try_apply(other.as_partial_reflect())?;
+                    Ok::<_, ScriptError>(())
+                })??;
+
+                Ok(())
+            },
+        );
+
         // m.add_meta_function(
         //     MetaMethod::Index,
         //     |l, (mut self_, key): (LuaReflectReference, Value)| {