added dependency log to resolver

Author: mkatychev

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

@@ -181,27 +181,33 @@ impl Config {
     /// - The default registry
     /// - Hard-coded fallbacks for certain well-known namespaces
     pub fn resolve_registry(&self, package: &PackageRef) -> Option<&Registry> {
-        if let Some(RegistryMapping::Registry(reg)) = self.package_registry_overrides.get(package) {
-            Some(reg)
-        } else if let Some(RegistryMapping::Custom(custom)) =
-            self.package_registry_overrides.get(package)
+        if let Some(reg) = self
+            .package_registry_overrides
+            .get(package)
+            .map(|m| match m {
+                RegistryMapping::Registry(reg) => reg,
+                RegistryMapping::Custom(custom) => &custom.registry,
+            })
         {
-            Some(&custom.registry)
-        } else if let Some(RegistryMapping::Registry(reg)) =
-            self.namespace_registries.get(package.namespace())
-        {
-            Some(reg)
-        } else if let Some(RegistryMapping::Custom(custom)) =
-            self.namespace_registries.get(package.namespace())
+            return Some(reg);
+        }
+
+        if let Some(reg) = self
+            .namespace_registries
+            .get(package.namespace())
+            .map(|m| match m {
+                RegistryMapping::Registry(reg) => reg,
+                RegistryMapping::Custom(custom) => &custom.registry,
+            })
         {
-            Some(&custom.registry)
-        } else if let Some(reg) = self.default_registry.as_ref() {
-            Some(reg)
-        } else if let Some(reg) = self.fallback_namespace_registries.get(package.namespace()) {
-            Some(reg)
-        } else {
-            None
+            return Some(reg);
         }
+
+        if let Some(reg) = self.default_registry.as_ref() {
+            return Some(reg);
+        }
+
+        self.fallback_namespace_registries.get(package.namespace())
     }
 
     /// Returns the default registry.

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

@@ -51,7 +51,7 @@ impl std::fmt::Display for Dependency {
 
                 write!(
                     f,
-                    "{{ registry =  {registry} package = {}@{version} }}",
+                    "{{registry=\"{registry}\" package=\"{}@{version}\"}}",
                     name.as_deref().unwrap_or("_:_"),
                 )
             }
@@ -435,7 +435,7 @@ impl<'a> DependencyResolver<'a> {
                 if !force_override
                     && (self.resolutions.contains_key(name) || self.dependencies.contains_key(name))
                 {
-                    tracing::debug!(%name, "dependency already exists and override is not set, ignoring");
+                    tracing::debug!(%name, %dependency, "dependency already exists and override is not set, ignoring");
                     return Ok(());
                 }
                 self.dependencies.insert(