♻️ - decouple functions from progress bar

Author: jfrolich

src/build.rs

@@ -1,7 +1,6 @@
 pub mod build_types;
 pub mod clean;
 pub mod compile;
-pub mod dependency_cycle;
 pub mod deps;
 pub mod logs;
 pub mod namespaces;
@@ -130,7 +129,7 @@ pub fn build(filter: &Option<regex::Regex>, path: &str, no_timing: bool) -> Resu
     );
 
     let timing_ast = Instant::now();
-    let result_asts = parse::generate_asts(&rescript_version, &mut build_state, &pb);
+    let result_asts = parse::generate_asts(&rescript_version, &mut build_state, || pb.inc(1));
     let timing_ast_elapsed = timing_ast.elapsed();
 
     match result_asts {
@@ -173,8 +172,22 @@ pub fn build(filter: &Option<regex::Regex>, path: &str, no_timing: bool) -> Resu
     );
 
     let start_compiling = Instant::now();
-    let (compile_errors, compile_warnings, num_compiled_modules) =
-        compile::compile(&mut build_state, &deleted_module_names, &rescript_version);
+    let pb = ProgressBar::new(build_state.modules.len().try_into().unwrap());
+    pb.set_style(
+        ProgressStyle::with_template(&format!(
+            "{} {} Compiling... {{spinner}} {{pos}}/{{len}} {{msg}}",
+            style("[6/7]").bold().dim(),
+            SWORDS
+        ))
+        .unwrap(),
+    );
+    let (compile_errors, compile_warnings, num_compiled_modules) = compile::compile(
+        &mut build_state,
+        &deleted_module_names,
+        &rescript_version,
+        || pb.inc(1),
+        |size| pb.set_length(size),
+    );
     let compile_duration = start_compiling.elapsed();
 
     logs::finalize(&build_state.project_root, &build_state.packages);

src/build/compile.rs

@@ -1,13 +1,12 @@
+mod dependency_cycle;
+
 use super::build_types::*;
-use super::dependency_cycle;
 use super::logs;
 use super::packages;
 use crate::bsconfig;
 use crate::helpers;
-use crate::helpers::emojis::*;
 use ahash::AHashSet;
 use console::style;
-use indicatif::{ProgressBar, ProgressStyle};
 use log::debug;
 use log::{info, log_enabled, Level::Info};
 use rayon::prelude::*;
@@ -18,6 +17,8 @@ pub fn compile(
     mut build_state: &mut BuildState,
     deleted_module_names: &AHashSet<String>,
     rescript_version: &str,
+    inc: impl Fn() -> () + std::marker::Sync,
+    set_length: impl Fn(u64) -> (),
 ) -> (String, String, usize) {
     let mut compiled_modules = AHashSet::<String>::new();
 
@@ -82,16 +83,8 @@ pub fn compile(
         }
     }
 
-    let pb = ProgressBar::new(compile_universe.len().try_into().unwrap());
-    pb.set_style(
-        ProgressStyle::with_template(&format!(
-            "{} {} Compiling... {{spinner}} {{pos}}/{{len}} {{msg}}",
-            style("[6/7]").bold().dim(),
-            SWORDS
-        ))
-        .unwrap(),
-    );
     let compile_universe_count = compile_universe.len();
+    set_length(compile_universe_count as u64);
 
     // start off with all modules that have no deps in this compile universe
     let mut in_progress_modules = compile_universe
@@ -237,7 +230,7 @@ pub fn compile(
                 }
                 .map(|res| {
                     if !(log_enabled!(Info)) {
-                        pb.inc(1);
+                        inc();
                     }
                     res
                 })

src/build/dependency_cycle.rs renamed to src/build/compile/dependency_cycle.rs

@@ -1,4 +1,4 @@
-use super::build_types::*;
+use super::super::build_types::*;
 use crate::helpers;
 use ahash::AHashSet;
 

src/build/parse.rs

@@ -5,7 +5,6 @@ use super::packages;
 use crate::bsconfig;
 use crate::bsconfig::OneOrMore;
 use crate::helpers;
-use indicatif::ProgressBar;
 use log::debug;
 use rayon::prelude::*;
 use std::path::{Path, PathBuf};
@@ -14,7 +13,7 @@ use std::process::Command;
 pub fn generate_asts(
     version: &str,
     build_state: &mut BuildState,
-    pb: &ProgressBar,
+    inc: impl Fn() -> () + std::marker::Sync,
 ) -> Result<String, String> {
     let mut has_failure = false;
     let mut stderr = "".to_string();
@@ -69,7 +68,7 @@ pub fn generate_asts(
                         || source_file.interface.as_ref().map(|i| i.dirty).unwrap_or(false)
                     {
                         // dbg!("Compiling", source_file.implementation.path.to_owned());
-                        pb.inc(1);
+                        inc();
                         let ast_result = generate_ast(
                             package.to_owned(),
                             root_package.to_owned(),