support dependencies across multiple namespaces

Author: macovedj

Cargo.lock

@@ -38,9 +38,11 @@ indexmap = { workspace = true }
 miette = { workspace = true, features = ["fancy"] }
 semver = { workspace = true }
 indicatif = { workspace = true, optional = true }
+warg-client = { workspace = true }
+dialoguer = "0.11.0"
 
 [features]
-default = ["wit"]
+default = ["wit", "registry"]
 wat = ["wac-resolver/wat"]
 wit = ["wac-resolver/wit"]
 registry = ["wac-resolver/registry", "indicatif"]
@@ -71,11 +73,11 @@ wat = "1.202.0"
 logos = "0.14.0"
 miette = "7.2.0"
 thiserror = "1.0.58"
-warg-client = "0.4.1"
-warg-protocol = "0.4.1"
-warg-crypto = "0.4.1"
-warg-server = "0.4.1"
-warg-credentials = "0.4.1"
+warg-protocol = { git = "https://github.com/bytecodealliance/registry", branch = "namespace-enhancements" }
+warg-crypto = { git = "https://github.com/bytecodealliance/registry", branch = "namespace-enhancements" }
+warg-client = { git = "https://github.com/bytecodealliance/registry", branch = "namespace-enhancements" }
+warg-credentials = { git = "https://github.com/bytecodealliance/registry", branch = "namespace-enhancements" }
+warg-server = { git = "https://github.com/bytecodealliance/registry", branch = "namespace-enhancements" }
 secrecy = "0.8.0"
 futures = "0.3.30"
 indicatif = "0.17.8"

Cargo.toml

@@ -13,7 +13,7 @@ repository = { workspace = true }
 wac-types = { workspace = true }
 wac-parser = { workspace = true }
 semver = { workspace = true }
-thiserror = { workspace = true }
+thiserror.workspace = true
 anyhow = { workspace = true }
 log = { workspace = true }
 wit-component = { workspace = true }
@@ -28,6 +28,7 @@ warg-credentials = { workspace = true, optional = true }
 secrecy = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 futures = { workspace = true, optional = true }
+serde_json = "1.0.116"
 
 [dev-dependencies]
 wac-graph = { workspace = true }

crates/wac-resolver/Cargo.toml

@@ -1,8 +1,11 @@
 //! Modules for package resolvers.
 
+use crate::Error as WacResolutionError;
+use anyhow::anyhow;
 use indexmap::IndexMap;
 use miette::{Diagnostic, SourceSpan};
-use wac_parser::Document;
+use thiserror::Error;
+use wac_parser::{resolution::Error as WacError, Document};
 
 mod fs;
 #[cfg(feature = "registry")]
@@ -14,6 +17,7 @@ pub use fs::*;
 pub use registry::*;
 pub use visitor::*;
 use wac_types::BorrowedPackageKey;
+use warg_client::ClientError;
 
 /// Represents a package resolution error.
 #[derive(thiserror::Error, Diagnostic, Debug)]
@@ -149,3 +153,64 @@ pub fn packages<'a>(
     visitor.visit(document)?;
     Ok(keys)
 }
+
+#[derive(Debug, Error)]
+/// Error for WAC commands
+pub enum CommandError {
+    /// General errors
+    #[error("Error: `{0}`")]
+    General(anyhow::Error),
+    /// Serde errors
+    #[error("Error: `{0}`")]
+    Serde(serde_json::Error),
+    /// Wac resolution errors
+    #[error("Error: `{0}`")]
+    WacResolution(WacResolutionError),
+    /// Wac errors
+    #[error("Error: `{0}`")]
+    Wac(WacError),
+    /// Client Error
+    #[error("Warg Client Error: {0}")]
+    WargClient(ClientError),
+    /// Client Error With Hint
+    #[error("Warg Client Error: {0}")]
+    WargHint(ClientError),
+}
+
+/// Error from warg client
+pub struct WargClientError(pub ClientError);
+
+impl std::fmt::Debug for WargClientError {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        f.debug_tuple("WargClientError").field(&self.0).finish()
+    }
+}
+
+impl From<anyhow::Error> for CommandError {
+    fn from(value: anyhow::Error) -> Self {
+        CommandError::General(value)
+    }
+}
+
+impl From<WacResolutionError> for CommandError {
+    fn from(value: WacResolutionError) -> Self {
+        CommandError::General(anyhow!(value))
+    }
+}
+
+impl From<serde_json::Error> for CommandError {
+    fn from(value: serde_json::Error) -> Self {
+        CommandError::Serde(value)
+    }
+}
+
+impl From<WargClientError> for CommandError {
+    fn from(value: WargClientError) -> Self {
+        match &value.0 {
+            ClientError::PackageDoesNotExistWithHint { .. } => {
+                CommandError::WargHint(value.0.into())
+            }
+            _ => CommandError::WargClient(value.0.into()),
+        }
+    }
+}