bug fix

Author: vporton

src/dfx/src/lib/builders/motoko.rs

@@ -44,16 +44,23 @@ impl MotokoBuilder {
 }
 
 // TODO: Rename this function.
-#[context("Failed to find imports for canister at '{}'.", info.get_main_path().display())]
-fn get_imports(cache: &dyn Cache, info: &MotokoCanisterInfo, imports: &mut ImportsTracker, pool: &CanisterPool) -> DfxResult<()> {
+// TODO: Is `unwrap()` in the next line correct?
+#[context("Failed to find imports for canister at '{}'.", info.as_info::<MotokoCanisterInfo>().unwrap().get_main_path().display())]
+fn get_imports(cache: &dyn Cache, info: &CanisterInfo, imports: &mut ImportsTracker, pool: &CanisterPool) -> DfxResult<()> {
+    let motoko_info = info.as_info::<MotokoCanisterInfo>()?;
     #[context("Failed recursive dependency detection at {}.", file.display())]
     fn get_imports_recursive (
         cache: &dyn Cache,
         file: &Path,
         imports: &mut ImportsTracker,
         pool: &CanisterPool,
+        top: Option<&CanisterInfo>, // hackish
     ) -> DfxResult {
-        let parent = MotokoImport::Relative(file.to_path_buf());
+        let parent = if let Some(top) = top {
+            MotokoImport::Canister(top.get_name().to_string()) // a little inefficient
+        } else {
+            MotokoImport::Relative(file.to_path_buf())
+        };
         if imports.nodes.contains_key(&parent) {
             return Ok(());
         }
@@ -71,13 +78,13 @@ fn get_imports(cache: &dyn Cache, info: &MotokoCanisterInfo, imports: &mut Impor
             let child = MotokoImport::try_from(line).context("Failed to create MotokoImport.")?;
             match &child {
                 MotokoImport::Relative(path) => {
-                    get_imports_recursive(cache, path.as_path(), imports, pool)?;
+                    get_imports_recursive(cache, path.as_path(), imports, pool, None)?;
                 }
                 MotokoImport::Canister(canister_name) => { // duplicate code
                     if let Some(canister) = pool.get_first_canister_with_name(canister_name.as_str()) {
                         let main_file = canister.get_info().get_main_file();
                         if let Some(main_file) = main_file {
-                            get_imports_recursive(cache, Path::new(main_file), imports, pool)?;
+                            get_imports_recursive(cache, Path::new(main_file), imports, pool, None)?;
                         }
                     }
                 }
@@ -91,7 +98,7 @@ fn get_imports(cache: &dyn Cache, info: &MotokoCanisterInfo, imports: &mut Impor
         Ok(())
     }
 
-    get_imports_recursive(cache, info.get_main_path(), imports, pool)?;
+    get_imports_recursive(cache, motoko_info.get_main_path(), imports, pool, Some(info))?;
 
     Ok(())
 }
@@ -103,8 +110,7 @@ impl CanisterBuilder for MotokoBuilder {
         pool: &CanisterPool,
         info: &CanisterInfo,
     ) -> DfxResult<Vec<CanisterId>> {
-        let motoko_info = info.as_info::<MotokoCanisterInfo>()?;
-        get_imports(self.cache.as_ref(), &motoko_info, &mut *pool.imports.borrow_mut(), pool)?;
+        get_imports(self.cache.as_ref(), info, &mut *pool.imports.borrow_mut(), pool)?;
 
         let graph = &pool.imports.borrow().graph;
         match petgraph::algo::toposort(&pool.imports.borrow().graph, None) {
@@ -177,7 +183,7 @@ impl CanisterBuilder for MotokoBuilder {
         std::fs::create_dir_all(idl_dir_path)
             .with_context(|| format!("Failed to create {}.", idl_dir_path.to_string_lossy()))?;
 
-        get_imports(cache.as_ref(), &motoko_info, &mut *pool.imports.borrow_mut(), pool)?;
+        get_imports(cache.as_ref(), canister_info, &mut *pool.imports.borrow_mut(), pool)?;
 
         // If the management canister is being imported, emit the candid file.
         if pool.imports.borrow().nodes.contains_key(&MotokoImport::Ic("aaaaa-aa".to_string()))

src/dfx/src/lib/models/canister.rs

@@ -572,9 +572,12 @@ impl CanisterPool {
             }
         }
 
+        println!("GRAPH2: {:?}", self.imports.borrow().graph);
+        // FIXME: Error on indirect dependencies.
         Ok(self.imports.borrow().graph.filter_map(
             |_node_index, node_weight| {
                 match node_weight {
+                    // FIXME: The "tops" of the digraph are `Relative()`, not `Canister()`
                     // TODO: `get_first_canister_with_name` is a hack
                     MotokoImport::Canister(name) => Some(self.get_first_canister_with_name(&name).unwrap().canister_id()),
                     _ => None,
@@ -709,6 +712,7 @@ impl CanisterPool {
 
         trace!(log, "Building dependencies graph.");
         let graph = self.build_dependencies_graph(build_config.canisters_to_build.clone())?; // TODO: Can `clone` be eliminated?
+        println!("GRAPH: {:?}", graph);
         let nodes = petgraph::algo::toposort(&graph, None).map_err(|cycle| {
             let message = match graph.node_weight(cycle.node_id()) {
                 Some(canister_id) => match self.get_canister_info(canister_id) {
@@ -724,6 +728,7 @@ impl CanisterPool {
             .rev() // Reverse the order, as we have a dependency graph, we want to reverse indices.
             .map(|idx| *graph.node_weight(*idx).unwrap())
             .collect();
+        println!("ORDER: {:?}", order.iter().map(|c| c.to_text()).collect::<Vec<_>>());
 
         // let canisters_to_build = Bfs::new(graph, start);
         // let canisters_to_build = self.canisters_to_build(build_config); // FIXME