Merge #356: Optimize DependencyMapBuilder for multiple entry roots

b31c413 feat: optimize `DependencyMapBuilder` for several entry roots (LesterEvSe)

Pull request description:

  Introduce a new `ValidatedDeps` structure and remove `entry_root` from `DependencyMapBuilder`. This also optimizes the build algorithm complexity from `O(n²)` to `O(n log n)`.

  Finally, this refactors the tests to accommodate the new functionality and adds helper macros to make testing more convenient.

ACKs for top commit:
  KyrylR:
    ACK b31c413; successfully ran local tests

Tree-SHA512: f72603e6e7033d21dcc34bb7796dccd2fb118147e07cfee7c302474c8021c9852fb305f4cf513b987600f0d6cb52d00d7d05a9e62b7bd1466e3c6108e60ad6e9

Author: KyrylR

src/ast.rs

@@ -1074,7 +1074,6 @@ impl Program {
         })
     }
 
-    // Put this helper function inside your impl block or just above your logic
     fn extract_single_main(items: &[Item]) -> Result<Option<Expression>, Error> {
         let mut main_expr = None;
 

src/driver/mod.rs

@@ -397,8 +397,7 @@ struct CurrentModule {
 #[cfg(test)]
 pub(crate) mod tests {
     use super::*;
-    use crate::resolution::tests::canon;
-    use crate::resolution::DependencyMapBuilder;
+    use crate::resolution::tests::{build_map, canon};
     use crate::test_utils::TempWorkspace;
 
     /// Initializes a raw graph environment for testing, explicitly allowing for and capturing failure states.
@@ -437,11 +436,8 @@ pub(crate) mod tests {
         let lib_dir = canon(&ws.create_dir("workspace/libs/lib"));
 
         // Set up the dependency map for imports (e.g. `use lib::...`)
-        let map = DependencyMapBuilder::new(workspace_dir.clone())
-            .add_dependency(workspace_dir.clone(), "lib".to_string(), lib_dir.clone())
-            .build()
-            .expect("Failed to create dependency map");
-        let map = Arc::new(map);
+        let map =
+            Arc::new(build_map(&workspace_dir, &[(&workspace_dir, "lib", &lib_dir)]).unwrap());
 
         let mut root_file_path = None;
         let mut root_content = String::new();

src/lib.rs

@@ -422,7 +422,7 @@ pub trait ArbitraryOfType: Sized {
 pub(crate) mod tests {
     use crate::ast::{CoreJetHinter, ElementsJetHinter, JetHinter};
     use crate::parse::ParseFromStr;
-    use crate::resolution::tests::canon;
+    use crate::resolution::tests::{build_map, canon};
     use crate::resolution::DependencyMapBuilder;
     use crate::source::CanonPath;
     use crate::test_utils::TempWorkspace;
@@ -471,15 +471,15 @@ pub(crate) mod tests {
     {
         let parent = prog_path.as_ref().parent().unwrap();
         let canon_root = canon(parent);
-        let mut builder = DependencyMapBuilder::new(canon_root);
+        let mut builder = DependencyMapBuilder::new();
 
         for (context, alias, target) in dependencies {
             let context = canon(context.as_ref());
             let target = canon(target.as_ref());
 
-            builder = builder.add_dependency(context, alias.into(), target);
+            builder.add_dependency(context, alias.into(), target);
         }
-        builder.build().unwrap()
+        builder.build(canon_root).unwrap()
     }
 
     pub(crate) struct TestCase<T> {
@@ -871,7 +871,7 @@ pub(crate) mod tests {
         let main_path = root.join(MAIN);
         let canon_root = CanonPath::canonicalize(&root).unwrap();
 
-        let dependency_map = DependencyMapBuilder::new(canon_root).build().unwrap();
+        let dependency_map = build_map(&canon_root, &[]).unwrap();
 
         TestCase::<TemplateProgram>::template_deps(&main_path, &dependency_map)
             .with_arguments(Arguments::default())
@@ -1352,19 +1352,15 @@ mod error_tests {
     use super::*;
 
     use crate::ast::ElementsJetHinter;
-    use crate::resolution::tests::canon;
-    use crate::resolution::DependencyMapBuilder;
+    use crate::resolution::tests::{build_map, canon};
     use crate::source::CanonPath;
     use crate::test_utils::TempWorkspace;
 
     fn dependency_map(root_dir: &Path, drp: &str, lib_dir: &Path) -> DependencyMap {
         let context = CanonPath::canonicalize(root_dir).unwrap();
         let target = CanonPath::canonicalize(lib_dir).unwrap();
 
-        DependencyMapBuilder::new(context.clone())
-            .add_dependency(context, drp.into(), target)
-            .build()
-            .unwrap()
+        build_map(&context, &[(&context, drp, &target)]).unwrap()
     }
 
     fn source_file(path: &Path) -> CanonSourceFile {
@@ -1455,7 +1451,8 @@ mod error_tests {
 #[cfg(test)]
 mod functional_tests {
     use crate::ast::ElementsJetHinter;
-    use crate::resolution::{DependencyMap, DependencyMapBuilder};
+    use crate::resolution::tests::build_map;
+    use crate::resolution::DependencyMap;
     use crate::source::{CanonPath, CanonSourceFile};
     use crate::tests::{flatten_multidep_test, run_dependency_test, run_multidep_test};
     use crate::{Arguments, CompiledProgram};
@@ -1664,12 +1661,9 @@ mod functional_tests {
         let lib_canon = CanonPath::canonicalize(&lib_dir).unwrap();
 
         // 3. Set up the dependency maps
-        let dependency_map = DependencyMapBuilder::new(root_canon.clone())
-            .add_dependency(root_canon.clone(), "lib".to_string(), lib_canon)
-            .build()
-            .unwrap();
+        let dependency_map = build_map(&root_canon, &[(&root_canon, "lib", &lib_canon)]).unwrap();
 
-        let no_dependency_map = DependencyMapBuilder::new(root_canon).build().unwrap();
+        let no_dependency_map = build_map(&root_canon, &[]).unwrap();
 
         // Compile both programs reading directly from the file system
         let poisoned = compile_with_deps(&poisoned_main, &dependency_map);

src/main.rs

@@ -135,7 +135,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         .and_then(|p| CanonPath::canonicalize(p).ok())
         .ok_or("Failed to determine project root directory from entry file")?;
 
-    let mut builder = DependencyMapBuilder::new(canon_root.clone());
+    let mut builder = DependencyMapBuilder::new();
 
     for arg in dep_args {
         let (left_side, path_str) = arg.split_once('=').unwrap_or_else(|| {
@@ -157,11 +157,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         };
 
         let target_path = CanonPath::canonicalize(Path::new(path_str))?;
-
-        builder = builder.add_dependency(context_path, alias.to_string(), target_path);
+        builder.add_dependency(context_path, alias.to_string(), target_path);
     }
 
-    let dependencies = match builder.build() {
+    let dependencies = match builder.build(canon_root.clone()) {
         Ok(map) => map,
         Err(e) => {
             eprintln!("Error: {e}");