fix: allow components to *not* import resources from WASI interfaces

Signed-off-by: Roman Volosatovs <[email protected]>

Author: rvolosatovs

Cargo.lock

@@ -184,5 +184,5 @@ wrpc-transport-web = { version = "0.2", path = "./crates/transport-web", default
 wrpc-wasi-keyvalue = { version = "0.1.1", path = "./crates/wasi-keyvalue", default-features = false }
 wrpc-wasi-keyvalue-mem = { version = "0.1", path = "./crates/wasi-keyvalue-mem", default-features = false }
 wrpc-wasi-keyvalue-redis = { version = "0.1", path = "./crates/wasi-keyvalue-redis", default-features = false }
-wrpc-wasmtime-cli = { version = "0.8", path = "./crates/wasmtime-cli", default-features = false }
+wrpc-wasmtime-cli = { version = "0.8.1", path = "./crates/wasmtime-cli", default-features = false }
 wtransport = { version = "0.6.1", default-features = false }

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "wrpc-wasmtime-cli"
-version = "0.8.0"
+version = "0.8.1"
 description = "wRPC Wasmtime CLI"
 
 authors.workspace = true

crates/wasmtime-cli/Cargo.toml

@@ -235,58 +235,37 @@ where
             Bound::Included("wasi:io/[email protected]"),
             Bound::Excluded("wasi:io/[email protected]"),
         ))
-        .map(|(name, instance)| {
-            instance
-                .get("error")
-                .copied()
-                .with_context(|| format!("{name} instance import missing `error` resource"))
-        })
-        .collect::<anyhow::Result<Box<[_]>>>()?;
+        .flat_map(|(_, instance)| instance.get("error"))
+        .copied()
+        .collect::<Box<[_]>>();
     let io_pollable_tys = host_resources
         .range::<str, _>((
             Bound::Included("wasi:io/[email protected]"),
             Bound::Excluded("wasi:io/[email protected]"),
         ))
-        .map(|(name, instance)| {
-            instance
-                .get("pollable")
-                .copied()
-                .with_context(|| format!("{name} instance import missing `pollable` resource"))
-        })
-        .collect::<anyhow::Result<Box<[_]>>>()?;
+        .flat_map(|(_, instance)| instance.get("pollable"))
+        .copied()
+        .collect::<Box<[_]>>();
     let io_input_stream_tys = host_resources
         .range::<str, _>((
             Bound::Included("wasi:io/[email protected]"),
             Bound::Excluded("wasi:io/[email protected]"),
         ))
-        .map(|(name, instance)| {
-            instance
-                .get("input-stream")
-                .copied()
-                .with_context(|| format!("{name} instance import missing `input-stream` resource"))
-        })
-        .collect::<anyhow::Result<Box<[_]>>>()?;
+        .flat_map(|(_, instance)| instance.get("input-stream"))
+        .copied()
+        .collect::<Box<[_]>>();
     let io_output_stream_tys = host_resources
         .range::<str, _>((
             Bound::Included("wasi:io/[email protected]"),
             Bound::Excluded("wasi:io/[email protected]"),
         ))
-        .map(|(name, instance)| {
-            instance
-                .get("output-stream")
-                .copied()
-                .with_context(|| format!("{name} instance import missing `output-stream` resource"))
-        })
-        .collect::<anyhow::Result<Box<[_]>>>()?;
+        .flat_map(|(_, instance)| instance.get("output-stream"))
+        .copied()
+        .collect::<Box<[_]>>();
     let rpc_err_ty = host_resources
         .get("wrpc:rpc/[email protected]")
-        .map(|instance| {
-            instance
-                .get("error")
-                .copied()
-                .context("`wrpc:rpc/[email protected]` instance import missing `error` resource")
-        })
-        .transpose()?;
+        .and_then(|instance| instance.get("error"))
+        .copied();
     // TODO: This should include `wasi:http` resources
     let host_resources = host_resources
         .into_iter()