shallow dependencies

Author: Daniel Macovei

Cargo.lock

@@ -38,7 +38,7 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
 ] }
 wasm-pkg-common = { version = "0.8.2", path = "crates/wasm-pkg-common" }
 wasm-pkg-client = { version = "0.8.2", path = "crates/wasm-pkg-client" }
-wasm-metadata = "0.219"
-wit-component = "0.219"
-wit-parser = "0.219"
+wasm-metadata = "0.220"
+wit-component = "0.220"
+wit-parser = "0.220"
 wasm-pkg-core = { version = "0.8.2", path = "crates/wasm-pkg-core" }

Cargo.toml

@@ -360,39 +360,29 @@ impl<'a> DependencyResolver<'a> {
     /// Add a dependency to the resolver. If the dependency already exists, then it will be ignored.
     /// To override an existing dependency, use [`override_dependency`](Self::override_dependency).
 
-    #[deprecated(since = "0.9.0", note = "please use `new_method` instead")]
-    pub async fn add_dependency(
-        &mut self,
-        name: &PackageRef,
-        dependency: &Dependency,
-    ) -> Result<()> {
-        self.add_wit_dependency_internal(name, dependency, false)
-            .await
-    }
-
     /// Add a wit dependency to the resolver. If the dependency already exists, then it will be ignored.
     /// To override an existing dependency, use [`override_dependency`](Self::override_dependency).
-    pub async fn add_wit_dependency(
+    pub async fn add_dependency(
         &mut self,
         name: &PackageRef,
         dependency: &Dependency,
     ) -> Result<()> {
-        self.add_wit_dependency_internal(name, dependency, false)
+        self.add_dependency_internal(name, dependency, false)
             .await
     }
 
     /// Add a concrete component dependency to the resolver. If the dependency already exists, then it will be ignored.
     /// To override an existing dependency, use [`override_dependency`](Self::override_dependency).
-    pub async fn add_component_dependency(
+    pub async fn add_shallow_dependency(
         &mut self,
         name: &PackageRef,
         dependency: &Dependency,
     ) -> Result<()> {
-        self.add_component_dependency_internal(name, dependency, false)
+        self.add_shallow_dependency_internal(name, dependency, false)
             .await
     }
 
-    async fn add_component_dependency_internal(
+    async fn add_shallow_dependency_internal(
         &mut self,
         name: &PackageRef,
         dependency: &Dependency,
@@ -429,7 +419,7 @@ impl<'a> DependencyResolver<'a> {
         name: &PackageRef,
         dependency: &Dependency,
     ) -> Result<()> {
-        self.add_wit_dependency_internal(name, dependency, true)
+        self.add_dependency_internal(name, dependency, true)
             .await
     }
 
@@ -478,7 +468,7 @@ impl<'a> DependencyResolver<'a> {
         Ok(())
     }
 
-    async fn add_wit_dependency_internal(
+    async fn add_dependency_internal(
         &mut self,
         name: &PackageRef,
         dependency: &Dependency,
@@ -502,13 +492,11 @@ impl<'a> DependencyResolver<'a> {
 
                 // // Now that we check we haven't already inserted this dep, get the packages from the
                 // // local dependency and add those to the resolver before adding the dependency
-                // if is_wit {
                 let (_, packages) = get_packages(p)
                     .context("Error getting dependent packages from local dependency")?;
                 Box::pin(self.add_packages(packages))
                     .await
                     .context("Error adding packages to resolver for local dependency")?;
-                // }
 
                 let prev = self.resolutions.insert(name.clone(), res);
                 assert!(prev.is_none());
@@ -525,7 +513,7 @@ impl<'a> DependencyResolver<'a> {
         packages: impl IntoIterator<Item = (PackageRef, VersionReq)>,
     ) -> Result<()> {
         for (package, req) in packages {
-            self.add_wit_dependency(
+            self.add_dependency(
                 &package,
                 &Dependency::Package(RegistryPackage {
                     name: Some(package.clone()),

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

@@ -186,7 +186,7 @@ pub async fn resolve_dependencies(
                 }
             };
             resolver
-                .add_wit_dependency(&pkg, &dep)
+                .add_dependency(&pkg, &dep)
                 .await
                 .context("Unable to add dependency")?;
         }