feat: codegen improvements for bevy 0.17

codegen/Cargo.bootstrap.toml

@@ -5,13 +5,16 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
+
+# {{ANALYZED_CRATE}}
 bevy_mod_scripting_bindings = { path = "{{BMS_BINDINGS_PATH}}" }
-bevy_reflect = { version = "0.17", features = [
-    "smol_str",
-    "glam",
-    "petgraph",
-    "smallvec",
-    "uuid",
-] }
+
+# bevy_reflect = { version = "0.17", features = [
+#     "smol_str",
+#     "glam",
+#     "petgraph",
+#     "smallvec",
+#     "uuid",
+# ] }
 
 [workspace]

codegen/Cargo.toml

@@ -62,6 +62,7 @@ syn = { version = "2", features = ["parsing"], default-features = false }
 itertools = "0.12"
 chrono = "0.4"
 pretty_assertions = "1.3"
+regex = "1"
 
 [dependencies]
 crate_feature_graph = { workspace = true, features = ["dot_parser", "serde"] }
@@ -81,6 +82,7 @@ serde = { workspace = true, features = ["std"] }
 prettyplease = { workspace = true }
 convert_case = { workspace = true }
 chrono = { workspace = true }
+regex = { workspace = true }
 
 [build-dependencies]
 toml = "0.8"

codegen/crates/crate_feature_graph/bin/main.rs

@@ -48,7 +48,7 @@ pub fn main() -> std::io::Result<()> {
     let mut graph = WorkspaceGraph::from(workspace);
 
     let root = args.root_package;
-    log::info!(
+    log::debug!(
         "Calculating features for root: {:?} with features: {:?}, default features: {}",
         root,
         args.features,

codegen/crates/crate_feature_graph/src/feature.rs

@@ -17,6 +17,12 @@ use log::error;
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct CrateName(pub(crate) String);
 
+impl AsRef<str> for CrateName {
+    fn as_ref(&self) -> &str {
+        &self.0
+    }
+}
+
 impl<'a, T: Borrow<Package>> From<&'a T> for CrateName {
     fn from(pkg: &'a T) -> Self {
         CrateName(pkg.borrow().name.clone())

codegen/crates/crate_feature_graph/src/graph.rs

@@ -227,7 +227,7 @@ impl WorkspaceGraph {
 
         // finally filter out nodes we don't want to show but connect edges
         if !only_show_crates.is_empty() {
-            log::info!("Filtering to only show crates: {only_show_crates:?}");
+            log::debug!("Filtering to only show crates: {only_show_crates:?}");
             let only_show_crates: HashSet<_> = only_show_crates
                 .into_iter()
                 .map(|s| s.to_string())
@@ -237,14 +237,14 @@ impl WorkspaceGraph {
                 .filter(|c| !only_show_crates.contains(&c.to_string()))
                 .collect();
 
-            log::info!(
+            log::debug!(
                 "Removing and interconnecting {} nodes, out of {}",
                 to_remove.len(),
                 visualiser_graph.node_count()
             );
 
             for n in to_remove {
-                log::info!("Removing node {n}");
+                log::debug!("Removing node {n}");
                 let node_index =
                     match visualiser_graph.find_node_by_opt(|node| node.contains(&n.to_string())) {
                         Some(n) => n,
@@ -408,7 +408,7 @@ impl WorkspaceGraph {
             }
         }
 
-        log::info!("Parsed features map: {features_map:?}");
+        log::debug!("Parsed features map: {features_map:?}");
         self.calculate_enabled_features_and_dependencies(features_map, false);
     }
 
@@ -454,7 +454,7 @@ impl WorkspaceGraph {
 
         open_set.extend(enabled_crates.keys().cloned());
 
-        log::info!("Starting feature calculation with open set: {open_set:?}");
+        log::debug!("Starting feature calculation with open set: {open_set:?}");
 
         while let Some(krate) = open_set.pop_front() {
             log::trace!("Processing crate `{krate}`");

codegen/src/args.rs

@@ -284,6 +284,7 @@ impl WorkspaceMeta {
 
     /// Returns true if the given crate is in the workspace and if the plugin will run on it
     pub fn is_workspace_and_included_crate(&self, crate_name: &str) -> bool {
+        // TODO: temp
         self.include_crates
             .as_ref()
             .map(|include_crates| include_crates.contains(&crate_name.to_owned()))

codegen/src/bin/driver.rs

@@ -1,5 +1,5 @@
 #![feature(rustc_private)]
-use bevy_mod_scripting_codegen::{driver::driver_main, *};
+use bevy_mod_scripting_codegen::{driver::rustc_driver_main, *};
 // use rustc_log::LoggerConfig;
 
 extern crate rustc_log;
@@ -10,5 +10,5 @@ fn main() {
         .parse_filters(&std::env::var("RUST_LOG").unwrap_or_else(|_| "warn".into()))
         .init();
 
-    driver_main(BevyAnalyzer);
+    rustc_driver_main(BevyAnalyzer::initialize_from_env());
 }