trait calls

Author: makspll

crates/bevy_api_gen/src/template.rs

@@ -317,6 +317,34 @@ pub(crate) fn configure_tera_env(tera: &mut Tera, crate_name: &str) {
             let case = expect_str(expect_arg(args, "case")?)?;
             Ok(Value::String(str.to_case(case_from_str(case)?)))
         },
+    );
+
+    tera.register_filter(
+        "to_arg_pattern",
+        |val: &Value, _args: &HashMap<String, Value>| {
+            let ty = expect_str(val)?;
+            if ty == "self" {
+                return Ok(Value::String("_self".to_owned()));
+            }
+            Ok(Value::String(ty.to_owned()))
+        },
+    );
+
+    tera.register_function(
+        "function_call_expression",
+        |args: &HashMap<String, Value>| {
+            let ident = expect_str(expect_arg(args, "type")?)?;
+            let function_name = expect_str(expect_arg(args, "function")?)?;
+            let trait_name: Option<&str> = args.get("trait").and_then(|v| v.as_str());
+
+            if let Some(trait_name) = trait_name {
+                Ok(Value::String(format!(
+                    "<{ident} as {trait_name}>::{function_name}"
+                )))
+            } else {
+                Ok(Value::String(format!("{ident}::{function_name}")))
+            }
+        },
     )
 }
 

crates/bevy_api_gen/templates/footer.tera

@@ -18,25 +18,23 @@ impl ::bevy::app::Plugin for {{ "ScriptingPlugin" | prefix_cratename | convert_c
             {%- for arg in function.args -%}
                 {%- if arg.proxy_ty is matching("Mut.*")-%}
                 mut {% endif -%}
-                {%- if arg.ident != "self" -%}
-                    {{- arg.ident -}}
-                {%- else -%}
-                    _{{- arg.ident -}}
-                {%- endif -%} 
+                {{- arg.ident | to_arg_pattern() -}}
             : {{- arg.proxy_ty -}},
             {%- endfor -%}
             | {
-                let output: {{ function.output.proxy_ty }} = ::{{ item.import_path }}::{{ function.ident }}(
+                let output: {{ function.output.proxy_ty }} =
+                {%- if function.from_trait_path -%}
+                {{- function_call_expression(type=item.import_path, trait=function.from_trait_path, function=function.ident) -}}
+                {%- else -%}
+                {{- function_call_expression(type=item.import_path, function=function.ident) -}}
+                {%- endif -%}
+                (
                     {%- for arg in function.args -%}
                         {%- if arg.proxy_ty is matching("Ref.*")-%}
                         &{% endif -%}
                         {%- if arg.proxy_ty is matching ("Mut.*")-%}
                         &mut {% endif -%}
-                        {%- if arg.ident != "self" -%}
-                            {{- arg.ident -}}
-                        {%- else -%}
-                            _{{- arg.ident -}}
-                        {%- endif -%}
+                        {{- arg.ident | to_arg_pattern() -}}
                         {%- if arg.proxy_ty is matching("Val.*")-%}
                         .into_inner()
                         {%- endif -%},