chore(deps): update wasm tools

Cargo.toml

@@ -54,9 +54,10 @@ tracing-subscriber = { version = "0.3.20", default-features = false, features =
     "env-filter",
 ] }
 url = "2.5.0"
-wasm-metadata = "0.244"
-wit-component = "0.244"
-wit-parser = "0.244"
+
+wasm-metadata = "0.253"
+wit-component = "0.253"
+wit-parser = "0.253"
 
 # https://github.com/crate-ci/typos/blob/master/docs/reference.md
 [workspace.metadata.typos.default]

crates/wasm-pkg-client/src/decoded_component.rs

@@ -93,10 +93,21 @@ impl DecodedComponent {
 
         // Merge resolves, remap merged resolve, check for incompatibility
         let mut merged = prev_resolve.clone();
-        let new_world = merged
+        let new_world = match merged
             .merge(new_resolve.clone())
-            .and_then(|remap| remap.map_world(new_world, None))
-            .map_err(Error::InvalidComponent)?;
+            .map(|remap| remap.map_world(new_world, wit_parser::Span::default()))
+        {
+            Ok(Ok(w)) => w,
+            Ok(Err(e)) => {
+                return Err(Error::InvalidComponent(anyhow::format_err!(
+                    "failed to remap merged worlds: {}",
+                    e.kind()
+                )));
+            }
+            Err(e) => {
+                return Err(Error::InvalidComponent(e));
+            }
+        };
 
         wit_component::semver_check(merged, prev_world, new_world).map_err(|e| {
             Error::SemverIncompatible {

crates/wasm-pkg-client/src/lib.rs

@@ -55,8 +55,8 @@ pub use wasm_pkg_common::{
 use crate::loader::VersionSort;
 use crate::local::LocalBackend;
 use crate::metadata::RegistryMetadataExt;
-pub use crate::{loader::PackageLoader, publisher::PackagePublisher};
 use crate::oci::OciBackend;
+pub use crate::{loader::PackageLoader, publisher::PackagePublisher};
 
 pub use release::{Release, VersionInfo};
 

crates/wasm-pkg-client/src/local.rs

@@ -94,7 +94,7 @@ impl PackageLoader for LocalBackend {
         let mut entries = match tokio::fs::read_dir(&package_dir).await {
             Ok(entries) => entries,
             Err(e) if e.kind() == std::io::ErrorKind::NotFound => {
-                return Err(Error::PackageNotFound)
+                return Err(Error::PackageNotFound);
             }
             Err(e) => return Err(registry_path_context(e, &package_dir)),
         };

crates/wasm-pkg-client/tests/e2e.rs

@@ -66,9 +66,9 @@ async fn publish_and_fetch_smoke_test() {
 #[tokio::test]
 async fn publish_with_semver_check_succeeds_for_new_package() {
     use testcontainers::{
+        GenericImage, ImageExt,
         core::{IntoContainerPort, WaitFor},
         runners::AsyncRunner,
-        GenericImage, ImageExt,
     };
 
     let _container = GenericImage::new("registry", "2")

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

@@ -240,18 +240,26 @@ impl DependencyResolution {
         };
 
         if &bytes[0..4] != b"\0asm" {
+            let package = UnresolvedPackageGroup::parse(
+                // This is fake, but it's needed for the parser to work.
+                self.name().to_string(),
+                std::str::from_utf8(&bytes).with_context(|| {
+                    format!(
+                        "dependency `{name}` is not UTF-8 encoded",
+                        name = self.name()
+                    )
+                })?,
+            )
+            .map_err(|(src_map, parse_err)| {
+                anyhow::format_err!(
+                    "failed to parse package group: {}",
+                    parse_err.render(&src_map)
+                )
+            })?;
+
             return Ok(DecodedDependency::Wit {
                 resolution: self,
-                package: UnresolvedPackageGroup::parse(
-                    // This is fake, but it's needed for the parser to work.
-                    self.name().to_string(),
-                    std::str::from_utf8(&bytes).with_context(|| {
-                        format!(
-                            "dependency `{name}` is not UTF-8 encoded",
-                            name = self.name()
-                        )
-                    })?,
-                )?,
+                package,
             });
         }