feat: refactor generated bindings to use new derive macro (#268)

* feat: refactor generated bindings to use new derive macro

* remove semicolon

* Update bevy bindings feat/refactor generated bindings use new macro (#269)

chore(codegen): update bevy bindings

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* add core path

* update branch name

* simplify

* chore(codegen): update bevy bindings

* add _functions postfix

* chore(codegen): update bevy bindings

* add docstrings

* add output type

* chore(codegen): update bevy bindings

* make return type matter in the macro and fix resulting errors

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: makspll

.github/workflows/bevy_mod_scripting.yml

@@ -144,6 +144,8 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@v4
+      with:
+        ref: ${{ github.head_ref || github.ref_name }}
     - name: Setup Bot GitHub Credentials
       run: |
         git config user.name "github-actions[bot]"
@@ -163,19 +165,6 @@ jobs:
     - name: Commit Changes
       if: steps.check_changes.outputs.changes
       run: |
-        git checkout -b ${{ env.CODEGEN_BRANCH_NAME }} || git checkout ${{ env.CODEGEN_BRANCH_NAME }}
         git add -A
         git commit -m "chore(codegen): update bevy bindings"
-        git push -u origin ${{ env.CODEGEN_BRANCH_NAME }} --force
-    - uses: jwalton/gh-find-current-pr@master
-      if: steps.check_changes.outputs.changes
-      id: findPR
-      with:
-        state: all
-    - name: Create Or Update PR
-      if: steps.check_changes.outputs.changes && success() && steps.findPR.outputs.number 
-      run: |
-        gh pr list --base ${{ github.ref }} --search "chore(codegen): update bevy bindings" --json number > prs.json
-        if [ $(jq '. | length' prs.json) -eq 0 ]; then
-          gh pr create --title "chore(codegen): update bevy bindings" --body "This PR updates the bevy bindings for #${{ steps.findPR.outputs.number }}" --base ${{ github.ref }} --head ${{ env.CODEGEN_BRANCH_NAME }} || true
-        fi
+        git push

crates/bevy_api_gen/src/template.rs

@@ -32,12 +32,6 @@ pub enum TemplateKind {
     SharedModule,
     #[strum(to_string = "crate.tera")]
     CrateArtifact,
-    #[strum(to_string = "field.tera")]
-    Field,
-    #[strum(to_string = "function.tera")]
-    Function,
-    #[strum(to_string = "item.tera")]
-    Item,
     #[strum(to_string = "header.tera")]
     Header,
     #[strum(to_string = "footer.tera")]

crates/bevy_api_gen/templates/field.tera

@@ -7,42 +7,56 @@
 
 pub struct {{ "ScriptingPlugin" | prefix_cratename | convert_case(case="upper_camel")}};
 
+{% for item in items %}
+#[script_bindings(
+    remote,
+    name = "{{ item.ident | convert_case(case="snake") }}_functions",
+    bms_core_path="bevy_mod_scripting_core"
+)]
+impl {{item.import_path}} {
+{% for function in item.functions %}
+
+    {% for docstring in function.docstrings %}
+    /// {{ docstring }}
+    {% endfor %}
+    fn {{ function.ident }} (
+        {%- for arg in function.args -%}
+            {%- if arg.proxy_ty is matching("Mut.*")-%}
+            mut {% endif -%}
+            {{- arg.ident | to_arg_pattern() -}}
+        : {{- arg.proxy_ty -}},
+        {%- endfor -%}
+    ) -> {{ function.output.proxy_ty }} {
+        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 -%}
+                {{- arg.ident | to_arg_pattern() -}}
+                {%- if arg.proxy_ty is matching("Val.*")-%}
+                .into_inner()
+                {%- endif -%}, 
+            {%- endfor -%}
+        ).into();
+        output
+    }
+{% endfor %}     
+}
+{% endfor %}
+
 impl ::bevy::app::Plugin for {{ "ScriptingPlugin" | prefix_cratename | convert_case(case="upper_camel")}} {
     fn build(&self, app: &mut ::bevy::prelude::App) {
         let mut world = app.world_mut();
 
         {% for item in items %}
-        NamespaceBuilder::<::{{ item.import_path }}>::new(world)
-        {%- for function in item.functions -%}
-            .register("{{ function.ident }}", |
-            {%- for arg in function.args -%}
-                {%- if arg.proxy_ty is matching("Mut.*")-%}
-                mut {% endif -%}
-                {{- arg.ident | to_arg_pattern() -}}
-            : {{- arg.proxy_ty -}},
-            {%- endfor -%}
-            | {
-                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 -%}
-                        {{- arg.ident | to_arg_pattern() -}}
-                        {%- if arg.proxy_ty is matching("Val.*")-%}
-                        .into_inner()
-                        {%- endif -%}, 
-                    {%- endfor -%}
-                ).into();
-                output
-            })
-        {%- endfor -%};     
+            register_{{ item.ident | convert_case(case="snake") }}_functions(&mut world);
         {% endfor %}
     }
 }

crates/bevy_api_gen/templates/footer.tera

@@ -8,6 +8,9 @@ use bevy_mod_scripting_core::{
         function::{from::{Ref, Mut, Val}, namespace::{NamespaceBuilder}}
     }
 };
+
+use bevy_mod_scripting_derive::script_bindings;
+
 {% if args.self_is_bms_lua %}
 use crate::*;
 {% else %}

crates/bevy_api_gen/templates/function.tera

@@ -166,10 +166,21 @@ fn process_impl_fn(fun: &ImplItemFn) -> TokenStream {
         .unwrap_or(syn::LitStr::new("", Span::call_site()));
     let fun_name = syn::LitStr::new(&fun.sig.ident.to_string(), Span::call_site());
     let fun_span = fun.sig.ident.span();
+    let out_type = match &fun.sig.output {
+        syn::ReturnType::Default => quote_spanned! {fun_span=>
+            ()
+        },
+        syn::ReturnType::Type(_, ty) => quote_spanned! {fun_span=>
+            #ty
+        },
+    };
     quote_spanned! {fun_span=>
         .register_documented(
             #fun_name,
-            |#args| #body,
+            |#args| {
+                let output: #out_type = {#body};
+                output
+            },
             #docstring,
             &[#(#args_names),*]
         )

crates/bevy_api_gen/templates/header.tera

@@ -9,34 +9,36 @@ use bevy_mod_scripting_core::bindings::{
         namespace::NamespaceBuilder,
     },
 };
+use bevy_mod_scripting_derive::script_bindings;
 use crate::*;
 pub struct BevyCoreScriptingPlugin;
+#[script_bindings(
+    remote,
+    name = "name_functions",
+    bms_core_path = "bevy_mod_scripting_core"
+)]
+impl bevy::core::prelude::Name {
+    fn clone(_self: Ref<bevy::core::prelude::Name>) -> Val<bevy::core::prelude::Name> {
+        let output: Val<bevy::core::prelude::Name> = <bevy::core::prelude::Name as std::clone::Clone>::clone(
+                &_self,
+            )
+            .into();
+        output
+    }
+    fn eq(
+        _self: Ref<bevy::core::prelude::Name>,
+        other: Ref<bevy::core::prelude::Name>,
+    ) -> bool {
+        let output: bool = <bevy::core::prelude::Name as std::cmp::PartialEq<
+            bevy::core::prelude::Name,
+        >>::eq(&_self, &other)
+            .into();
+        output
+    }
+}
 impl ::bevy::app::Plugin for BevyCoreScriptingPlugin {
     fn build(&self, app: &mut ::bevy::prelude::App) {
         let mut world = app.world_mut();
-        NamespaceBuilder::<::bevy::core::prelude::Name>::new(world)
-            .register(
-                "clone",
-                |_self: Ref<bevy::core::prelude::Name>| {
-                    let output: Val<bevy::core::prelude::Name> = <bevy::core::prelude::Name as std::clone::Clone>::clone(
-                            &_self,
-                        )
-                        .into();
-                    output
-                },
-            )
-            .register(
-                "eq",
-                |
-                    _self: Ref<bevy::core::prelude::Name>,
-                    other: Ref<bevy::core::prelude::Name>|
-                {
-                    let output: bool = <bevy::core::prelude::Name as std::cmp::PartialEq<
-                        bevy::core::prelude::Name,
-                    >>::eq(&_self, &other)
-                        .into();
-                    output
-                },
-            );
+        register_name_functions(&mut world);
     }
 }