Build Dev Dependencies with flag

Author: rolandpeelen

src/build.rs

@@ -59,6 +59,7 @@ pub fn get_compiler_args(
     path: &str,
     rescript_version: Option<String>,
     bsc_path: Option<String>,
+    build_dev_deps: bool,
 ) -> Result<String> {
     let filename = &helpers::get_abs_path(path);
     let package_root = helpers::get_abs_path(
@@ -115,6 +116,7 @@ pub fn get_compiler_args(
         &package_root,
         &workspace_root,
         &None,
+        build_dev_deps,
     );
 
     let result = serde_json::to_string_pretty(&CompilerArgs {
@@ -277,6 +279,7 @@ pub fn incremental_build(
     show_progress: bool,
     only_incremental: bool,
     create_sourcedirs: bool,
+    build_dev_deps: bool,
 ) -> Result<(), IncrementalBuildError> {
     logs::initialize(&build_state.packages);
     let num_dirty_modules = build_state.modules.values().filter(|m| is_dirty(m)).count() as u64;
@@ -389,6 +392,7 @@ pub fn incremental_build(
         show_progress,
         || pb.inc(1),
         |size| pb.set_length(size),
+        build_dev_deps,
     )
     .map_err(|e| IncrementalBuildError::CompileError(Some(e.to_string())))?;
 
@@ -460,6 +464,7 @@ pub fn build(
     no_timing: bool,
     create_sourcedirs: bool,
     bsc_path: Option<String>,
+    build_dev_deps: bool,
 ) -> Result<BuildState> {
     let default_timing: Option<std::time::Duration> = if no_timing {
         Some(std::time::Duration::new(0.0 as u64, 0.0 as u32))
@@ -477,6 +482,7 @@ pub fn build(
         show_progress,
         false,
         create_sourcedirs,
+        build_dev_deps,
     ) {
         Ok(_) => {
             if show_progress {

src/build/compile.rs

@@ -21,6 +21,7 @@ pub fn compile(
     show_progress: bool,
     inc: impl Fn() + std::marker::Sync,
     set_length: impl Fn(u64),
+    build_dev_deps: bool,
 ) -> Result<(String, String, usize)> {
     let mut compiled_modules = AHashSet::<String>::new();
     let dirty_modules = build_state
@@ -169,6 +170,7 @@ pub fn compile(
                                         &build_state.packages,
                                         &build_state.project_root,
                                         &build_state.workspace_root,
+                                        build_dev_deps,
                                     );
                                     Some(result)
                                 }
@@ -185,6 +187,7 @@ pub fn compile(
                                 &build_state.packages,
                                 &build_state.project_root,
                                 &build_state.workspace_root,
+                                build_dev_deps,
                             );
                             let cmi_digest_after = helpers::compute_file_hash(&cmi_path);
 
@@ -359,20 +362,19 @@ pub fn compiler_args(
     // if packages are known, we pass a reference here
     // this saves us a scan to find their paths
     packages: &Option<&AHashMap<String, packages::Package>>,
+    build_dev_deps: bool,
 ) -> Vec<String> {
     let normal_deps = config.bs_dependencies.as_ref().unwrap_or(&vec![]).to_owned();
 
     let bsc_flags = config::flatten_flags(&config.bsc_flags);
     // don't compile dev-deps yet
-    // let dev_deps = source
-    //     .package
-    //     .config
-    //     .bs_dev_dependencies
-    //     .as_ref()
-    //     .unwrap_or(&vec![])
-    //     .to_owned();
-
-    let deps = [normal_deps]
+    let dev_deps = if build_dev_deps {
+        config.bs_dev_dependencies.as_ref().unwrap_or(&vec![]).to_owned()
+    } else {
+        vec![]
+    };
+
+    let deps = [dev_deps, normal_deps]
         .concat()
         .par_iter()
         .map(|package_name| {
@@ -511,6 +513,7 @@ fn compile_file(
     packages: &AHashMap<String, packages::Package>,
     project_root: &str,
     workspace_root: &Option<String>,
+    build_dev_deps: bool,
 ) -> Result<Option<String>> {
     let build_path_abs = package.get_build_path();
     let implementation_file_path = match &module.source_type {
@@ -534,6 +537,7 @@ fn compile_file(
         project_root,
         workspace_root,
         &Some(packages),
+        build_dev_deps,
     );
 
     let to_mjs = Command::new(bsc_path)

src/build/packages.rs

@@ -803,7 +803,7 @@ fn get_unallowed_dependents(
 struct UnallowedDependency {
     bs_deps: Vec<String>,
     pinned_deps: Vec<String>,
-    bs_dev_deps: Vec<String>,
+    bs_build_dev_deps: Vec<String>,
 }
 
 pub fn validate_packages_dependencies(packages: &AHashMap<String, Package>) -> bool {
@@ -827,15 +827,15 @@ pub fn validate_packages_dependencies(packages: &AHashMap<String, Package>) -> b
                 let empty_unallowed_deps = UnallowedDependency {
                     bs_deps: vec![],
                     pinned_deps: vec![],
-                    bs_dev_deps: vec![],
+                    bs_build_dev_deps: vec![],
                 };
 
                 let unallowed_dependency = detected_unallowed_dependencies.entry(String::from(package_name));
                 let value = unallowed_dependency.or_insert_with(|| empty_unallowed_deps);
                 match *dependency_type {
                     "bs-dependencies" => value.bs_deps.push(unallowed_dependency_name),
                     "pinned-dependencies" => value.pinned_deps.push(unallowed_dependency_name),
-                    "bs-dev-dependencies" => value.bs_dev_deps.push(unallowed_dependency_name),
+                    "bs-dev-dependencies" => value.bs_build_dev_deps.push(unallowed_dependency_name),
                     _ => (),
                 }
             }
@@ -851,7 +851,7 @@ pub fn validate_packages_dependencies(packages: &AHashMap<String, Package>) -> b
         [
             ("bs-dependencies", unallowed_deps.bs_deps.to_owned()),
             ("pinned-dependencies", unallowed_deps.pinned_deps.to_owned()),
-            ("bs-dev-dependencies", unallowed_deps.bs_dev_deps.to_owned()),
+            ("bs-dev-dependencies", unallowed_deps.bs_build_dev_deps.to_owned()),
         ]
         .iter()
         .for_each(|(deps_type, map)| {
@@ -887,7 +887,7 @@ mod test {
         name: String,
         bs_deps: Vec<String>,
         pinned_deps: Vec<String>,
-        dev_deps: Vec<String>,
+        build_dev_deps: Vec<String>,
         allowed_dependents: Option<Vec<String>>,
     ) -> Package {
         Package {
@@ -902,7 +902,7 @@ mod test {
                 suffix: None,
                 pinned_dependencies: Some(pinned_deps),
                 bs_dependencies: Some(bs_deps),
-                bs_dev_dependencies: Some(dev_deps),
+                bs_dev_dependencies: Some(build_dev_deps),
                 ppx_flags: None,
                 bsc_flags: None,
                 reason: None,

src/main.rs

@@ -41,29 +41,36 @@ struct Args {
     #[arg(short, long)]
     after_build: Option<String>,
 
-    #[arg(short, long)]
-    no_timing: Option<bool>,
+    #[arg(short, long, default_value = "false")]
+    no_timing: bool,
 
     /// Verbosity:
     /// -v -> Debug
     /// -vv -> Trace
     /// -q -> Warn
-    /// -qq -> Error 
-    /// -qqq -> Off. 
+    /// -qq -> Error
+    /// -qqq -> Off.
     /// Default (/ no argument given): 'info'
     #[command(flatten)]
     verbose: clap_verbosity_flag::Verbosity<InfoLevel>,
 
     /// This creates a source_dirs.json file at the root of the monorepo, which is needed when you
     /// want to use Reanalyze
-    #[arg(short, long)]
-    create_sourcedirs: Option<bool>,
+    #[arg(short, long, default_value = "false")]
+    create_sourcedirs: bool,
 
     /// This prints the compiler arguments. It expects the path to a rescript.json file.
     /// This also requires --bsc-path and --rescript-version to be present
     #[arg(long)]
     compiler_args: Option<String>,
 
+    /// This is the flag to also compile development dependencies
+    /// It's important to know that we currently do not discern between project src, and
+    /// dependencies. So enabling this flag will enable building _all_ development dependencies of
+    /// _all_ packages
+    #[arg(long, default_value = "false")]
+    dev: bool,
+
     /// To be used in conjunction with compiler_args
     #[arg(long)]
     rescript_version: Option<String>,
@@ -94,7 +101,7 @@ fn main() -> Result<()> {
         Some(path) => {
             println!(
                 "{}",
-                build::get_compiler_args(&path, args.rescript_version, args.bsc_path)?
+                build::get_compiler_args(&path, args.rescript_version, args.bsc_path, args.dev)?
             );
             std::process::exit(0);
         }
@@ -116,9 +123,10 @@ fn main() -> Result<()> {
                     &filter,
                     &folder,
                     show_progress,
-                    args.no_timing.unwrap_or(false),
-                    args.create_sourcedirs.unwrap_or(false),
+                    args.no_timing,
+                    args.create_sourcedirs,
                     args.bsc_path,
+                    args.dev,
                 ) {
                     Err(e) => {
                         log::error!("{e}");
@@ -138,7 +146,8 @@ fn main() -> Result<()> {
                     show_progress,
                     &folder,
                     args.after_build,
-                    args.create_sourcedirs.unwrap_or(false),
+                    args.create_sourcedirs,
+                    args.dev,
                 );
 
                 Ok(())

src/watcher.rs

@@ -53,6 +53,7 @@ async fn async_watch(
     filter: &Option<regex::Regex>,
     after_build: Option<String>,
     create_sourcedirs: bool,
+    build_dev_deps: bool,
 ) -> notify::Result<()> {
     let mut build_state =
         build::initialize_build(None, filter, show_progress, path, None).expect("Can't initialize build");
@@ -190,6 +191,7 @@ async fn async_watch(
                     show_progress,
                     !initial_build,
                     create_sourcedirs,
+                    build_dev_deps,
                 )
                 .is_ok()
                 {
@@ -221,6 +223,7 @@ async fn async_watch(
                     show_progress,
                     false,
                     create_sourcedirs,
+                    build_dev_deps,
                 );
                 if let Some(a) = after_build.clone() {
                     cmd::run(a)
@@ -255,6 +258,7 @@ pub fn start(
     folder: &str,
     after_build: Option<String>,
     create_sourcedirs: bool,
+    build_dev_deps: bool,
 ) {
     futures::executor::block_on(async {
         let queue = Arc::new(FifoQueue::<Result<Event, Error>>::new());
@@ -274,6 +278,7 @@ pub fn start(
             filter,
             after_build,
             create_sourcedirs,
+            build_dev_deps,
         )
         .await
         {