From 6817d4e942a0ec5ca687e2d9490a97af6267d769 Mon Sep 17 00:00:00 2001
From: Roman Volosatovs <rvolosatovs@riseup.net>
Date: Mon, 23 Sep 2024 19:01:30 +0200
Subject: [PATCH] feat!: use updated passthrough

Signed-off-by: Roman Volosatovs <rvolosatovs@riseup.net>
---
 Cargo.lock                       | 29 ++++++++++++++++++++++++++---
 Cargo.toml                       |  5 ++++-
 crates/passthrough/Cargo.toml    |  5 ++++-
 crates/passthrough/src/lib.rs    |  2 ++
 tests/components/wasi/Cargo.toml |  1 +
 tests/components/wasi/src/lib.rs |  1 +
 6 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 878aacc..cb95cdc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1607,9 +1607,28 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasi-passthrough"
-version = "0.1.2"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330d3c13cddb628bb3fbf698d7ca5768b712fd9c3e4e06177279b04c05417a79"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasi-passthrough-ext"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "977613992b50ed021a32390994b0a3c4cecc7bb04951e08d67898e987ea34134"
+dependencies = [
+ "wasi-passthrough",
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasi-passthrough-logging"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f9720d94dc2220d47198299ec7c0d3ab15c8e883c97c8cefc220700e1e2bb83"
+checksum = "e0716d0e57714fbf9a4dfef9cb54fa037905cc82fe528fff126c54f591d9ec92"
 dependencies = [
  "wit-bindgen",
 ]
@@ -1625,6 +1644,7 @@ name = "wasi-test-component"
 version = "0.1.0"
 dependencies = [
  "wasi-passthrough",
+ "wasi-passthrough-ext",
  "wit-bindgen",
 ]
 
@@ -2061,9 +2081,12 @@ dependencies = [
 
 [[package]]
 name = "west-passthrough"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "wasi-passthrough",
+ "wasi-passthrough-ext",
+ "wasi-passthrough-logging",
+ "wit-bindgen",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 2b42c9b..9f78058 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -65,7 +65,10 @@ http = { version = "1", default-features = false }
 tokio = { version = "1", default-features = false }
 tracing = { version = "0.1", default-features = false }
 tracing-subscriber = { version = "0.3", default-features = false }
-wasi-passthrough = { version = "0.1.2", default-features = false }
+wasi-passthrough = { version = "0.3.2", default-features = false }
+wasi-passthrough-ext = { version = "0.1.4", default-features = false }
+wasi-passthrough-keyvalue = { version = "0.1.1", default-features = false }
+wasi-passthrough-logging = { version = "0.1.1", default-features = false }
 wasi-preview1-component-adapter-provider = { version = "24", default-features = false }
 wasmparser = { version = "0.217", default-features = false }
 wasmtime = { version = "24", default-features = false }
diff --git a/crates/passthrough/Cargo.toml b/crates/passthrough/Cargo.toml
index d55c5d7..506d5a7 100644
--- a/crates/passthrough/Cargo.toml
+++ b/crates/passthrough/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "west-passthrough"
-version = "0.1.1"
+version = "0.1.2"
 description = "WebAssembly component, which reexports WASI from the host"
 
 authors.workspace = true
@@ -13,4 +13,7 @@ repository.workspace = true
 crate-type = ["cdylib"]
 
 [dependencies]
+wit-bindgen = { workspace = true }
 wasi-passthrough = { workspace = true }
+wasi-passthrough-ext = { workspace = true }
+wasi-passthrough-logging = { workspace = true }
diff --git a/crates/passthrough/src/lib.rs b/crates/passthrough/src/lib.rs
index 09b95e5..4b0725b 100644
--- a/crates/passthrough/src/lib.rs
+++ b/crates/passthrough/src/lib.rs
@@ -1 +1,3 @@
 use wasi_passthrough as _;
+use wasi_passthrough_ext as _;
+use wasi_passthrough_logging as _;
diff --git a/tests/components/wasi/Cargo.toml b/tests/components/wasi/Cargo.toml
index f622360..ee597d1 100644
--- a/tests/components/wasi/Cargo.toml
+++ b/tests/components/wasi/Cargo.toml
@@ -14,4 +14,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 wasi-passthrough = { workspace = true }
+wasi-passthrough-ext = { workspace = true }
 wit-bindgen = { workspace = true, features = ["realloc", "macros"] }
diff --git a/tests/components/wasi/src/lib.rs b/tests/components/wasi/src/lib.rs
index 5a32ee8..1c4d5dd 100644
--- a/tests/components/wasi/src/lib.rs
+++ b/tests/components/wasi/src/lib.rs
@@ -16,6 +16,7 @@ mod bindings {
 use core::iter::{self, zip};
 
 use wasi_passthrough::bindings::wasi::io::streams::{InputStream, OutputStream};
+use wasi_passthrough_ext as _;
 
 pub struct Handler;