moved DependencyGraph into core with pub(crate)

Author: mkatychev

Cargo.lock

@@ -31,7 +31,6 @@ tokio = { workspace = true, optional = true, features = ["fs"] }
 toml = { workspace = true, optional = true }
 thiserror = { workspace = true }
 tracing.workspace = true
-petgraph.workspace = true
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros", "rt"] }

crates/wasm-pkg-common/Cargo.toml

@@ -1,5 +1,4 @@
 use http::uri::Authority;
-use petgraph::{acyclic::Acyclic, graph::DiGraph};
 use serde::{Deserialize, Serialize};
 
 use crate::Error;
@@ -56,6 +55,3 @@ impl TryFrom<String> for Registry {
         Ok(Self(value.try_into()?))
     }
 }
-
-/// Graph of publishable packages with the [`petgraph::Direction`] edges describing the dependency direction.
-pub type DependencyGraph<N> = Acyclic<DiGraph<N, petgraph::Direction>>;

crates/wasm-pkg-common/src/registry.rs

@@ -12,14 +12,18 @@ use std::{
 use anyhow::{bail, Context, Result};
 use futures_util::TryStreamExt;
 use indexmap::{IndexMap, IndexSet};
-use petgraph::{graph::NodeIndex, Direction};
+use petgraph::{
+    acyclic::Acyclic,
+    graph::{DiGraph, NodeIndex},
+    Direction,
+};
 use semver::{Comparator, Op, Version, VersionReq};
 use tokio::io::{AsyncRead, AsyncReadExt};
 use wasm_pkg_client::{
     caching::{CachingClient, FileCache},
     Client, Config, ContentDigest, Error as WasmPkgError, PackageRef, Release, VersionInfo,
 };
-use wasm_pkg_common::{package::PackageSpec, registry::DependencyGraph};
+use wasm_pkg_common::package::PackageSpec;
 use wit_component::DecodedWasm;
 use wit_parser::{PackageId, PackageName, Resolve, UnresolvedPackageGroup, WorldId};
 
@@ -840,6 +844,9 @@ fn visit<'a>(
     Ok(())
 }
 
+/// Graph of publishable packages with the [`petgraph::Direction`] edges describing the dependency direction.
+pub(crate) type DependencyGraph<N> = Acyclic<DiGraph<N, petgraph::Direction>>;
+
 /// Mapping of [`PackageRef`]s to the respective index inside the dependency graph.
 pub type LocalPackageIndex = HashMap<PackageRef, (NodeIndex, PathBuf)>;
 

crates/wasm-pkg-core/src/resolver.rs

@@ -14,16 +14,17 @@ use wasm_pkg_client::{
     caching::{CachingClient, FileCache},
     PackageRef,
 };
-use wasm_pkg_common::{package::PackageSpec, registry::DependencyGraph};
+use wasm_pkg_common::package::PackageSpec;
 use wit_component::WitPrinter;
 use wit_parser::{PackageId, PackageName, Resolve};
 
 use crate::{
     config::Config,
     lock::LockFile,
     resolver::{
-        DecodedDependency, Dependency, DependencyResolution, DependencyResolutionMap,
-        DependencyResolver, LocalPackageIndex, LocalResolution, RegistryPackage,
+        DecodedDependency, Dependency, DependencyGraph, DependencyResolution,
+        DependencyResolutionMap, DependencyResolver, LocalPackageIndex, LocalResolution,
+        RegistryPackage,
     },
 };
 

crates/wasm-pkg-core/src/wit.rs

@@ -100,11 +100,7 @@ async fn publish_multiple_transitive_local_packages() {
     // copy the transitive-local fixtures from wasm-pkg-core into a temp dir
     let temp_dir = tempfile::tempdir().expect("Failed to create tempdir");
     let src_root = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .join("..")
-        .join("wasm-pkg-core")
-        .join("tests")
-        .join("fixtures")
-        .join("transitive-local");
+        .join("../wasm-pkg-core/tests/fixtures/transitive-local");
     let fixture_root = temp_dir.path().join("transitive-local");
     copy_dir(&src_root, &fixture_root).await.unwrap();