Ordering and some fixes

crates/bevy_api_gen/src/passes/find_methods_and_fields.rs

@@ -81,13 +81,18 @@ pub(crate) fn find_methods_and_fields(ctxt: &mut BevyCtxt<'_>, _args: &Args) ->
         ty_ctxt.valid_functions = Some(Vec::default());
 
         // filter the list of all methods and select candidates applicable to proxy generation
-        for impl_did in ctxt
+        let mut all_impls = ctxt
             .tcx
             .inherent_impls(def_id)
             .unwrap()
             .iter()
             .chain(trait_impls_for_ty.iter())
-        {
+            .collect::<Vec<_>>();
+
+        // sort them to avoid unnecessary diffs, we can use hashes here as they are forever stable (touch wood)
+        all_impls.sort_by_cached_key(|a| ctxt.tcx.def_path_hash(**a));
+
+        for impl_did in all_impls {
             let functions = ctxt
                 .tcx
                 .associated_items(impl_did)

crates/bevy_api_gen/src/passes/find_reflect_types.rs

@@ -60,7 +60,7 @@ pub(crate) fn find_reflect_types(ctxt: &mut BevyCtxt<'_>, args: &Args) -> bool {
     }
 
     ctxt.reflect_types
-        .sort_by_cached_key(|did, _| did.index.as_u32() + did.krate.as_u32());
+        .sort_by_cached_key(|did, _| tcx.item_name(*did));
 
     if args.cmd.is_list_types() {
         for did in ctxt.reflect_types.keys() {

crates/bevy_api_gen/templates/function.tera

@@ -15,6 +15,8 @@ as_trait="{{ function.from_trait_path }}",
 
 {% if function.has_self and not is_op %}
 kind="{% if function.args.0.ty is starting_with("&mut") %}Mutating{% endif %}Method",
+{% elif is_op %}
+kind="MetaFunction",
 {% else %}
 kind="Function",
 {% endif %}
@@ -27,7 +29,6 @@ output(proxy),
 composite="{{ function.ident }}",
 {% endif %}
 
-{# forgive me father, this probably should be a filter #}
 {% if function.from_trait_path == "std::ops::Neg" %}
 metamethod="Unm",
 {% elif function.from_trait_path == "std::ops::Mul" %}
@@ -40,7 +41,7 @@ metamethod="Sub",
 metamethod="Div",
 {% elif function.from_trait_path == "std::ops::Rem" %}
 metamethod="Mod",
-{% elif function.from_trait_path == "std::cmp:PartialEq" %}
+{% elif function.from_trait_path == "std::cmp::PartialEq" %}
 metamethod="Eq",
 {% endif %}
 

crates/bevy_api_gen/templates/item.tera

@@ -21,10 +21,7 @@ functions[
         {%- include "function.tera" -%}
     {%- endfor -%}
     {% if item.import_path is matching("bevy::math::[^B]?Vec.?") %}
-        ---
-        r#"
-        {%- set vec_type = item.import_path | split(pat="::") | last -%}
-
+    {%- set vec_type = item.import_path | split(pat="::") | last -%}
         {%- if vec_type is starting_with("V") -%} 
             {%- set num_type = "f32" -%}
         {%- elif vec_type is starting_with("U16") -%}
@@ -42,8 +39,15 @@ functions[
         {%- elif vec_type is starting_with("I64") -%}
             {%- set num_type = "i64" -%}
         {%- endif -%} 
+
+        ---
+        r#"
         {{- macros::vector_index(num_type=num_type) -}}
         "#
+        ---
+        r#"
+        {{- macros::vector_newindex(num_type=num_type) -}}
+        "#
     {% endif %}
     {%- endfilter -%}
 ]

crates/bevy_api_gen/templates/macros.tera

@@ -1,13 +1,13 @@
 {% macro vector_index(num_type) %}
-#[lua(kind="Method", raw , metamethod="Index")]
+#[lua(kind="MetaMethod", raw , metamethod="Index")]
 fn index(&self, lua: &Lua, idx: crate::lua::util::LuaIndex) -> Result<{{ num_type }},_> {
     Ok(self.inner()?[*idx])
 }
 {% endmacro vector_index %}
 
 {% macro vector_newindex(num_type) %}
-#[lua(kind="MutatingMethod", raw , metamethod="NewIndex")]
-fn index(&mut self, lua: &Lua, (idx, val): (crate::lua::util::LuaIndex,{{ num_type }})) -> Result<{{ num_type }},_> {
+#[lua(kind="MutatingMetaMethod", raw , metamethod="NewIndex")]
+fn index(&mut self, lua: &Lua, idx: crate::lua::util::LuaIndex, val: {{ num_type }}) -> Result<(),_> {
     self.val_mut(|s| Ok(s[*idx] = val))?
 }
 {% endmacro vector_newindex %}

crates/bevy_script_api/src/providers/bevy_core.rs

@@ -43,7 +43,12 @@ functions[r#"
 "#,
 			r#"
 
-    #[lua(as_trait = "std::cmp::PartialEq", kind = "Function", composite = "eq")]
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
     fn eq(&self, #[proxy] other: &name::Name) -> bool;
 
 "#]

crates/bevy_script_api/src/providers/bevy_ecs.rs

@@ -73,20 +73,25 @@ functions[r#"
 "#,
 			r#"
 
-    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
-    fn clone(&self) -> bevy::ecs::component::ComponentId;
+    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
+    fn assert_receiver_is_total_eq(&self) -> ();
 
 "#,
 			r#"
 
-    #[lua(as_trait = "std::cmp::PartialEq", kind = "Function", composite = "eq")]
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
     fn eq(&self, #[proxy] other: &component::ComponentId) -> bool;
 
 "#,
 			r#"
 
-    #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
-    fn assert_receiver_is_total_eq(&self) -> ();
+    #[lua(as_trait = "std::clone::Clone", kind = "Method", output(proxy))]
+    fn clone(&self) -> bevy::ecs::component::ComponentId;
 
 "#]
 )]
@@ -145,12 +150,6 @@ functions[r#"
         this_run: bevy::ecs::component::Tick,
     ) -> bool;
 
-"#,
-			r#"
-
-    #[lua(as_trait = "std::cmp::PartialEq", kind = "Function", composite = "eq")]
-    fn eq(&self, #[proxy] other: &component::Tick) -> bool;
-
 "#,
 			r#"
 
@@ -163,6 +162,17 @@ functions[r#"
     #[lua(as_trait = "std::cmp::Eq", kind = "Method")]
     fn assert_receiver_is_total_eq(&self) -> ();
 
+"#,
+			r#"
+
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
+    fn eq(&self, #[proxy] other: &component::Tick) -> bool;
+
 "#]
 )]
 
@@ -442,7 +452,12 @@ functions[r#"
 "#,
 			r#"
 
-    #[lua(as_trait = "std::cmp::PartialEq", kind = "Function", composite = "eq")]
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
     fn eq(&self, #[proxy] other: &entity::Entity) -> bool;
 
 "#,

crates/bevy_script_api/src/providers/bevy_hierarchy.rs

@@ -103,7 +103,12 @@ functions[r#"
 "#,
 			r#"
 
-    #[lua(as_trait = "std::cmp::PartialEq", kind = "Function", composite = "eq")]
+    #[lua(
+        as_trait = "std::cmp::PartialEq",
+        kind = "MetaFunction",
+        composite = "eq",
+        metamethod = "Eq",
+    )]
     fn eq(&self, #[proxy] other: &components::parent::Parent) -> bool;
 
 "#,