inject BMS into codegen :D

Author: makspll

crates/bevy_api_gen/src/bin/main.rs

@@ -15,7 +15,7 @@ use log::{debug, error, info};
 use strum::VariantNames;
 use tera::Context;
 
-const BOOTSTRAP_DEPS: [&str; 2] = ["mlua", "bevy_reflect"];
+const BOOTSTRAP_DEPS: [&str; 3] = ["mlua", "bevy_reflect", "bevy_mod_scripting_core"];
 
 fn main() {
     // parse this here to early exit on wrong args
@@ -186,6 +186,9 @@ fn main() {
 
     debug!("RUSTFLAGS={}", env::var("RUSTFLAGS").unwrap_or_default());
 
+    // disable incremental compilation
+    env::set_var("CARGO_INCREMENTAL", "0");
+
     rustc_plugin::cli_main(BevyAnalyzer);
 
     // just making sure the temp dir lives until everything is done

crates/bevy_api_gen/src/context.rs

@@ -81,6 +81,15 @@ impl ReflectType<'_> {
     }
 }
 
+pub(crate) const DEF_PATHS_BMS_FROM_SCRIPT: [&str; 2] = [
+    "bevy_mod_scripting_core::bindings::function::from::FromScript",
+    "bindings::function::from::FromScript",
+];
+pub(crate) const DEF_PATHS_BMS_INTO_SCRIPT: [&str; 2] = [
+    "bevy_mod_scripting_core::bindings::function::into::IntoScript",
+    "bindings::function::into::IntoScript",
+];
+
 pub(crate) const DEF_PATHS_FROM_LUA: [&str; 2] = ["value::FromLuaMulti", "mlua::FromLuaMulti"];
 pub(crate) const DEF_PATHS_INTO_LUA: [&str; 2] = ["value::IntoLuaMulti", "mlua::IntoLuaMulti"];
 pub(crate) const DEF_PATHS_REFLECT: [&str; 2] =
@@ -117,6 +126,8 @@ pub(crate) const STD_SOURCE_TRAITS: [&str; 14] = [
 pub(crate) struct CachedTraits {
     pub(crate) mlua_from_lua_multi: Option<DefId>,
     pub(crate) mlua_into_lua_multi: Option<DefId>,
+    pub(crate) bms_into_script: Option<DefId>,
+    pub(crate) bms_from_script: Option<DefId>,
     pub(crate) bevy_reflect_reflect: Option<DefId>,
     pub(crate) bevy_reflect_get_type_registration: Option<DefId>,
     /// Map from def_path_str to DefId of common std traits we work with
@@ -125,6 +136,10 @@ pub(crate) struct CachedTraits {
 }
 
 impl CachedTraits {
+    pub(crate) fn has_all_bms_traits(&self) -> bool {
+        self.bms_into_script.is_some() && self.bms_from_script.is_some()
+    }
+
     pub(crate) fn has_all_mlua_traits(&self) -> bool {
         self.mlua_from_lua_multi.is_some() && self.mlua_into_lua_multi.is_some()
     }

crates/bevy_api_gen/src/modifying_file_loader.rs

@@ -28,7 +28,7 @@ impl FileLoader for ModifyingFileLoader {
             RealFileLoader.read_file(path).map(|mut f| {
                 // we make it pub so in case we are re-exporting this crate we won't run into private re-export issues
 
-                for crate_ in &["bevy_reflect", "mlua"] {
+                for crate_ in &["bevy_reflect", "mlua", "bevy_mod_scripting_core"] {
                     if !f.contains(&format!("extern crate {crate_}")) {
                         if f.contains(&format!("pub use {crate_}")) {
                             f.push_str(&format!(

crates/bevy_api_gen/src/passes/cache_traits.rs

@@ -3,8 +3,8 @@ use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_span::Symbol;
 
 use crate::{
-    Args, BevyCtxt, DEF_PATHS_FROM_LUA, DEF_PATHS_GET_TYPE_REGISTRATION, DEF_PATHS_INTO_LUA,
-    DEF_PATHS_REFLECT, STD_SOURCE_TRAITS,
+    Args, BevyCtxt, DEF_PATHS_BMS_FROM_SCRIPT, DEF_PATHS_BMS_INTO_SCRIPT, DEF_PATHS_FROM_LUA,
+    DEF_PATHS_GET_TYPE_REGISTRATION, DEF_PATHS_INTO_LUA, DEF_PATHS_REFLECT, STD_SOURCE_TRAITS,
 };
 
 /// Finds and caches relevant traits, if they cannot be found throws an ICE
@@ -13,7 +13,6 @@ pub(crate) fn cache_traits(ctxt: &mut BevyCtxt<'_>, _args: &Args) -> bool {
 
     for trait_did in tcx.all_traits() {
         let def_path_str = tcx.def_path_str(trait_did);
-
         if DEF_PATHS_FROM_LUA.contains(&def_path_str.as_str()) {
             trace!("found FromLuaMulti trait def id: {trait_did:?}");
             ctxt.cached_traits.mlua_from_lua_multi = Some(trait_did);
@@ -31,9 +30,22 @@ pub(crate) fn cache_traits(ctxt: &mut BevyCtxt<'_>, _args: &Args) -> bool {
             ctxt.cached_traits
                 .std_source_traits
                 .insert(def_path_str.to_string(), trait_did);
+        } else if DEF_PATHS_BMS_INTO_SCRIPT.contains(&def_path_str.as_str()) {
+            trace!("found IntoScript trait def id: {trait_did:?}");
+            ctxt.cached_traits.bms_into_script = Some(trait_did);
+        } else if DEF_PATHS_BMS_FROM_SCRIPT.contains(&def_path_str.as_str()) {
+            trace!("found FromScript trait def id: {trait_did:?}");
+            ctxt.cached_traits.bms_from_script = Some(trait_did);
         }
     }
 
+    if !ctxt.cached_traits.has_all_bms_traits() {
+        panic!(
+            "Could not find all bms traits in crate: {}",
+            tcx.crate_name(LOCAL_CRATE)
+        )
+    }
+
     if !ctxt.cached_traits.has_all_mlua_traits() {
         panic!(
             "Could not find all mlua traits in crate: {}, did bootstrapping go wrong?",

crates/bevy_api_gen/src/passes/populate_template_data.rs

@@ -82,35 +82,10 @@ pub(crate) fn populate_template_data(ctxt: &mut BevyCtxt<'_>, args: &Args) -> bo
     }
 
     let crate_name = tcx.crate_name(LOCAL_CRATE).to_string();
-    let dep_names = tcx
-        .crates(())
-        .iter()
-        .map(|d| tcx.crate_name(*d).to_ident_string())
-        .collect::<Vec<_>>();
-
-    let dependencies = ctxt
-        .meta_loader
-        .workspace_meta
-        .crates
-        .iter()
-        .filter(|c| {
-            dep_names.contains(c)
-                && ctxt
-                    .meta_loader
-                    .meta_for(c)
-                    .unwrap_or_else(|| panic!("Expected meta for dependency: {c}"))
-                    .will_generate
-        })
-        .cloned()
-        .collect();
 
     ctxt.clear();
 
-    ctxt.template_context = Some(TemplateContext {
-        crate_name,
-        items,
-        dependencies,
-    });
+    ctxt.template_context = Some(TemplateContext { crate_name, items });
 
     if let crate::Command::Generate {
         template_data_only, ..

crates/bevy_api_gen/src/template.rs

@@ -59,7 +59,6 @@ impl ValueEnum for TemplateKind {
 
 #[derive(Serialize)]
 pub(crate) struct TemplateContext {
-    pub(crate) dependencies: Vec<String>,
     pub(crate) crate_name: String,
     pub(crate) items: Vec<Item>,
 }

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_core.rs

@@ -2,8 +2,6 @@
 #![allow(clippy::all)]
 #![allow(unused, deprecated, dead_code)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
-use super::bevy_ecs::*;
-use super::bevy_reflect::*;
 use bevy_mod_scripting_core::bindings::{
     ReflectReference,
     function::{

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_ecs.rs

@@ -2,7 +2,6 @@
 #![allow(clippy::all)]
 #![allow(unused, deprecated, dead_code)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
-use super::bevy_reflect::*;
 use bevy_mod_scripting_core::bindings::{
     ReflectReference,
     function::{

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_hierarchy.rs

@@ -2,9 +2,6 @@
 #![allow(clippy::all)]
 #![allow(unused, deprecated, dead_code)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
-use super::bevy_ecs::*;
-use super::bevy_reflect::*;
-use super::bevy_core::*;
 use bevy_mod_scripting_core::bindings::{
     ReflectReference,
     function::{

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_input.rs

@@ -2,10 +2,6 @@
 #![allow(clippy::all)]
 #![allow(unused, deprecated, dead_code)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
-use super::bevy_ecs::*;
-use super::bevy_reflect::*;
-use super::bevy_core::*;
-use super::bevy_math::*;
 use bevy_mod_scripting_core::bindings::{
     ReflectReference,
     function::{

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_math.rs

@@ -2,7 +2,6 @@
 #![allow(clippy::all)]
 #![allow(unused, deprecated, dead_code)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
-use super::bevy_reflect::*;
 use bevy_mod_scripting_core::bindings::{
     ReflectReference,
     function::{

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_time.rs

@@ -2,8 +2,6 @@
 #![allow(clippy::all)]
 #![allow(unused, deprecated, dead_code)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
-use super::bevy_ecs::*;
-use super::bevy_reflect::*;
 use bevy_mod_scripting_core::bindings::{
     ReflectReference,
     function::{

crates/bevy_mod_scripting_functions/src/bevy_bindings/bevy_transform.rs

@@ -2,11 +2,6 @@
 #![allow(clippy::all)]
 #![allow(unused, deprecated, dead_code)]
 #![cfg_attr(rustfmt, rustfmt_skip)]
-use super::bevy_ecs::*;
-use super::bevy_reflect::*;
-use super::bevy_core::*;
-use super::bevy_math::*;
-use super::bevy_hierarchy::*;
 use bevy_mod_scripting_core::bindings::{
     ReflectReference,
     function::{

crates/xtask/src/main.rs

@@ -995,7 +995,7 @@ impl Xtasks {
                 template_args.as_str(),
                 "--features",
                 bevy_features.join(",").as_str(),
-                "-vv",
+                "-v",
             ],
             Some(&bevy_dir),
         )?;
@@ -1013,7 +1013,7 @@ impl Xtasks {
                 output_dir.to_str().unwrap(),
                 "--template-args",
                 template_args.as_str(),
-                "-vv",
+                "-v",
             ],
             Some(&bevy_dir),
         )?;