From 7a1c2adf7b93eec38428407d74e728232a9ac479 Mon Sep 17 00:00:00 2001
From: Brian Hardock <brian.hardock@fermyon.com>
Date: Mon, 10 Nov 2025 15:57:36 -0700
Subject: [PATCH] Remap futures and stream correctly

Signed-off-by: Brian Hardock <brian.hardock@fermyon.com>
---
 Cargo.lock                         | 312 ++++++++++++++++-------------
 Cargo.toml                         |  12 +-
 crates/wac-types/src/aggregator.rs |  12 +-
 3 files changed, 191 insertions(+), 145 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 67d092c..f71327f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -261,7 +261,7 @@ checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -296,7 +296,7 @@ checksum = "a507401cad91ec6a857ed5513a2073c82a9b9048762b885bb98655b306964681"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -323,7 +323,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5c7bf8143dfc3c0258df908843e169b5cc5fcf76c7718bd66135ef4a9cd558c5"
 dependencies = [
  "semver",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_json",
  "topological-sort",
 ]
@@ -357,7 +357,7 @@ dependencies = [
  "percent-encoding",
  "pin-project-lite",
  "rustversion",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_json",
  "serde_path_to_error",
  "serde_urlencoded",
@@ -399,7 +399,7 @@ dependencies = [
  "heck 0.4.1",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -560,7 +560,7 @@ dependencies = [
  "android-tzdata",
  "iana-time-zone",
  "num-traits 0.2.18",
- "serde 1.0.197",
+ "serde 1.0.228",
  "windows-targets 0.52.6",
 ]
 
@@ -604,7 +604,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -637,7 +637,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "nom",
  "rust-ini",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde-hjson",
  "serde_json",
  "toml 0.5.11",
@@ -765,7 +765,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.10.0",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -776,7 +776,7 @@ checksum = "a668eda54683121533a393014d8692171709ff57a7d61f187b6e782719f8933f"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -797,7 +797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
 dependencies = [
  "powerfmt",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -945,7 +945,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
 dependencies = [
  "enumflags2_derive",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -956,7 +956,7 @@ checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1214,7 +1214,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1298,7 +1298,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -1318,9 +1318,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
 dependencies = [
  "foldhash",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
 [[package]]
 name = "heck"
 version = "0.4.1"
@@ -1581,18 +1587,19 @@ checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
 dependencies = [
  "autocfg",
  "hashbrown 0.12.3",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
 name = "indexmap"
-version = "2.7.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
- "serde 1.0.197",
+ "hashbrown 0.16.0",
+ "serde 1.0.228",
+ "serde_core",
 ]
 
 [[package]]
@@ -1824,7 +1831,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex-syntax 0.6.29",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1839,7 +1846,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex-syntax 0.8.3",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -1901,7 +1908,7 @@ dependencies = [
  "cfg-if",
  "miette-derive",
  "owo-colors",
- "serde 1.0.197",
+ "serde 1.0.228",
  "supports-color 3.0.0",
  "supports-hyperlinks",
  "supports-unicode",
@@ -1919,7 +1926,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2173,7 +2180,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2298,7 +2305,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1030c719b0ec2a2d25a5df729d6cff1acf3cc230bf766f4f97833591f7577b90"
 dependencies = [
  "base64 0.21.7",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -2325,7 +2332,7 @@ dependencies = [
  "pbjson-build",
  "prost",
  "prost-build",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -2350,7 +2357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
 dependencies = [
  "fixedbitset",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
 ]
 
 [[package]]
@@ -2370,7 +2377,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2488,7 +2495,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"
 dependencies = [
  "proc-macro2",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2512,9 +2519,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.79"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
@@ -2553,7 +2560,7 @@ dependencies = [
  "prost",
  "prost-types",
  "regex",
- "syn 2.0.57",
+ "syn 2.0.110",
  "tempfile",
  "which",
 ]
@@ -2568,7 +2575,7 @@ dependencies = [
  "itertools 0.11.0",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -2631,7 +2638,7 @@ dependencies = [
  "config",
  "directories",
  "petgraph",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde-value",
  "tint",
 ]
@@ -2884,7 +2891,7 @@ dependencies = [
  "rustls",
  "rustls-pemfile",
  "rustls-pki-types",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper 1.0.0",
@@ -3087,7 +3094,7 @@ dependencies = [
  "num",
  "once_cell",
  "rand 0.8.5",
- "serde 1.0.197",
+ "serde 1.0.228",
  "sha2",
  "zbus",
 ]
@@ -3121,7 +3128,7 @@ version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
 dependencies = [
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -3132,10 +3139,11 @@ checksum = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
 
 [[package]]
 name = "serde"
-version = "1.0.197"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 dependencies = [
+ "serde_core",
  "serde_derive",
 ]
 
@@ -3158,18 +3166,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
 dependencies = [
  "ordered-float",
- "serde 1.0.197",
+ "serde 1.0.228",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.197"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3180,7 +3197,7 @@ checksum = "12dc5c46daa8e9fdf4f5e71b6cf9a53f2487da0e86e55808e2d35539666497dd"
 dependencies = [
  "itoa",
  "ryu",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -3190,7 +3207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "af99884400da37c88f5e9146b7f1fd0fbcae8f6eec4e9da38b67d05486f814a6"
 dependencies = [
  "itoa",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -3201,7 +3218,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3210,7 +3227,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
 dependencies = [
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -3222,7 +3239,7 @@ dependencies = [
  "form_urlencoded",
  "itoa",
  "ryu",
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -3235,8 +3252,8 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.7.1",
- "serde 1.0.197",
+ "indexmap 2.12.0",
+ "serde 1.0.228",
  "serde_derive",
  "serde_json",
  "serde_with_macros",
@@ -3252,7 +3269,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3261,10 +3278,10 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "itoa",
  "ryu",
- "serde 1.0.197",
+ "serde 1.0.228",
  "unsafe-libyaml",
 ]
 
@@ -3481,9 +3498,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.57"
+version = "2.0.110"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11a6ae1e52eb25aab8f3fb9fca13be982a373b8f1157ca14b897a825ba4a2d35"
+checksum = "a99801b5bd34ede4cf3fc688c5919368fea4e4814a4664359503e6015b280aea"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3595,7 +3612,7 @@ checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3618,7 +3635,7 @@ dependencies = [
  "itoa",
  "num-conv",
  "powerfmt",
- "serde 1.0.197",
+ "serde 1.0.228",
  "time-core",
  "time-macros",
 ]
@@ -3689,7 +3706,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -3745,7 +3762,7 @@ version = "0.5.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
 dependencies = [
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -3754,7 +3771,7 @@ version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_spanned",
  "toml_datetime",
  "toml_edit 0.22.9",
@@ -3766,7 +3783,7 @@ version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
- "serde 1.0.197",
+ "serde 1.0.228",
 ]
 
 [[package]]
@@ -3775,7 +3792,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "toml_datetime",
  "winnow 0.5.40",
 ]
@@ -3786,8 +3803,8 @@ version = "0.22.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4"
 dependencies = [
- "indexmap 2.7.1",
- "serde 1.0.197",
+ "indexmap 2.12.0",
+ "serde 1.0.228",
  "serde_spanned",
  "toml_datetime",
  "winnow 0.6.5",
@@ -3872,7 +3889,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
 ]
 
 [[package]]
@@ -4040,14 +4057,14 @@ version = "0.9.0-dev"
 dependencies = [
  "anyhow",
  "clap",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "indicatif",
  "log",
  "miette",
  "owo-colors",
  "pretty_env_logger",
  "semver",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_json",
  "thiserror",
  "tokio",
@@ -4057,7 +4074,7 @@ dependencies = [
  "wac-types",
  "warg-client",
  "warg-protocol",
- "wasmprinter 0.238.0",
+ "wasmprinter 0.239.0",
  "wat",
  "wit-component",
  "wit-parser",
@@ -4069,19 +4086,19 @@ version = "0.9.0-dev"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "log",
  "petgraph",
  "pretty_assertions",
  "semver",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_json",
  "thiserror",
  "wac-types",
- "wasm-encoder 0.238.0",
+ "wasm-encoder 0.239.0",
  "wasm-metadata",
- "wasmparser 0.238.0",
- "wasmprinter 0.238.0",
+ "wasmparser 0.239.0",
+ "wasmprinter 0.239.0",
  "wat",
  "wit-component",
  "wit-parser",
@@ -4093,7 +4110,7 @@ version = "0.9.0-dev"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "log",
  "logos 0.14.0",
  "miette",
@@ -4102,16 +4119,16 @@ dependencies = [
  "pretty_env_logger",
  "rayon",
  "semver",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_json",
  "thiserror",
  "tokio",
  "wac-graph",
  "wac-resolver",
- "wasm-encoder 0.238.0",
+ "wasm-encoder 0.239.0",
  "wasm-metadata",
- "wasmparser 0.238.0",
- "wasmprinter 0.238.0",
+ "wasmparser 0.239.0",
+ "wasmprinter 0.239.0",
 ]
 
 [[package]]
@@ -4120,7 +4137,7 @@ version = "0.9.0-dev"
 dependencies = [
  "anyhow",
  "futures",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "log",
  "miette",
  "pretty_assertions",
@@ -4137,7 +4154,7 @@ dependencies = [
  "warg-crypto",
  "warg-protocol",
  "warg-server",
- "wasmprinter 0.238.0",
+ "wasmprinter 0.239.0",
  "wat",
  "wit-component",
  "wit-parser",
@@ -4149,11 +4166,11 @@ version = "0.9.0-dev"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "semver",
- "serde 1.0.197",
- "wasm-encoder 0.238.0",
- "wasmparser 0.238.0",
+ "serde 1.0.228",
+ "wasm-encoder 0.239.0",
+ "wasmparser 0.239.0",
 ]
 
 [[package]]
@@ -4187,9 +4204,9 @@ version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a44b422328c3a86be288f569694aa97df958ade0cd9514ed00bc562952c6778e"
 dependencies = [
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "itertools 0.12.1",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_with",
  "thiserror",
  "warg-crypto",
@@ -4210,7 +4227,7 @@ dependencies = [
  "dialoguer",
  "dirs",
  "futures-util",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "itertools 0.12.1",
  "keyring",
  "libc",
@@ -4221,7 +4238,7 @@ dependencies = [
  "reqwest",
  "secrecy",
  "semver",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_json",
  "sha256",
  "tempfile",
@@ -4257,7 +4274,7 @@ dependencies = [
  "p256",
  "rand_core 0.6.4",
  "secrecy",
- "serde 1.0.197",
+ "serde 1.0.228",
  "sha2",
  "signature",
  "thiserror",
@@ -4278,7 +4295,7 @@ dependencies = [
  "prost-types",
  "protox",
  "regex",
- "serde 1.0.197",
+ "serde 1.0.228",
  "warg-crypto",
 ]
 
@@ -4291,12 +4308,12 @@ dependencies = [
  "anyhow",
  "base64 0.21.7",
  "hex",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "pbjson-types",
  "prost",
  "prost-types",
  "semver",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_with",
  "thiserror",
  "warg-crypto",
@@ -4316,9 +4333,9 @@ dependencies = [
  "bytes",
  "clap",
  "futures",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "secrecy",
- "serde 1.0.197",
+ "serde 1.0.228",
  "tempfile",
  "thiserror",
  "tokio",
@@ -4343,7 +4360,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5b950a71a544b7ac8f5a5e95f43886ac97c3fe5c7080b955b1b534037596d7be"
 dependencies = [
  "anyhow",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "prost",
  "thiserror",
  "warg-crypto",
@@ -4377,7 +4394,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
  "wasm-bindgen-shared",
 ]
 
@@ -4411,7 +4428,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.57",
+ "syn 2.0.110",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -4431,10 +4448,10 @@ dependencies = [
  "anyhow",
  "heck 0.4.1",
  "im-rc",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "log",
  "petgraph",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_derive",
  "serde_yaml",
  "smallvec",
@@ -4455,31 +4472,41 @@ dependencies = [
 
 [[package]]
 name = "wasm-encoder"
-version = "0.238.0"
+version = "0.239.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be00faa2b4950c76fe618c409d2c3ea5a3c9422013e079482d78544bb2d184c"
+dependencies = [
+ "leb128fmt",
+ "wasmparser 0.239.0",
+]
+
+[[package]]
+name = "wasm-encoder"
+version = "0.240.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50143b010bdc3adbd16275710f9085cc80d9c12cb869309a51a98ce2ff96558e"
+checksum = "06d642d8c5ecc083aafe9ceb32809276a304547a3a6eeecceb5d8152598bc71f"
 dependencies = [
  "leb128fmt",
- "wasmparser 0.238.0",
+ "wasmparser 0.240.0",
 ]
 
 [[package]]
 name = "wasm-metadata"
-version = "0.238.0"
+version = "0.239.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a587a83ac49c2feb922b7ec5d504419320d5da41cf0726f44b2968c78fa2ee2a"
+checksum = "20b3ec880a9ac69ccd92fbdbcf46ee833071cf09f82bb005b2327c7ae6025ae2"
 dependencies = [
  "anyhow",
  "auditable-serde",
  "flate2",
- "indexmap 2.7.1",
- "serde 1.0.197",
+ "indexmap 2.12.0",
+ "serde 1.0.228",
  "serde_derive",
  "serde_json",
  "spdx",
  "url",
- "wasm-encoder 0.238.0",
- "wasmparser 0.238.0",
+ "wasm-encoder 0.239.0",
+ "wasmparser 0.239.0",
 ]
 
 [[package]]
@@ -4502,21 +4529,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab"
 dependencies = [
  "bitflags 2.5.0",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "semver",
 ]
 
 [[package]]
 name = "wasmparser"
-version = "0.238.0"
+version = "0.239.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ad4ca2ecb86b79ea410cd970985665de1d05774b7107b214bc5852b1bcbad7"
+checksum = "8c9d90bb93e764f6beabf1d02028c70a2156a6583e63ac4218dd07ef733368b0"
 dependencies = [
  "bitflags 2.5.0",
  "hashbrown 0.15.2",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
+ "semver",
+ "serde 1.0.228",
+]
+
+[[package]]
+name = "wasmparser"
+version = "0.240.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b722dcf61e0ea47440b53ff83ccb5df8efec57a69d150e4f24882e4eba7e24a4"
+dependencies = [
+ "bitflags 2.5.0",
+ "indexmap 2.12.0",
  "semver",
- "serde 1.0.197",
 ]
 
 [[package]]
@@ -4531,33 +4569,33 @@ dependencies = [
 
 [[package]]
 name = "wasmprinter"
-version = "0.238.0"
+version = "0.239.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fec8a560f7288effd1a61fe8d7bfe9fc3efdc2173949d7a5ee38ea9e8eaa336"
+checksum = "b3981f3d51f39f24f5fc90f93049a90f08dbbca8deba602cd46bb8ca67a94718"
 dependencies = [
  "anyhow",
  "termcolor",
- "wasmparser 0.238.0",
+ "wasmparser 0.239.0",
 ]
 
 [[package]]
 name = "wast"
-version = "238.0.0"
+version = "240.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8c671ea796336ebaa49b963adb14cf13cb98de4e64d69ed4a16ace8c7b4db87b"
+checksum = "b0efe1c93db4ac562b9733e3dca19ed7fc878dba29aef22245acf84f13da4a19"
 dependencies = [
  "bumpalo",
  "leb128fmt",
  "memchr",
  "unicode-width 0.2.0",
- "wasm-encoder 0.238.0",
+ "wasm-encoder 0.240.0",
 ]
 
 [[package]]
 name = "wat"
-version = "1.238.0"
+version = "1.240.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8de04a6a9c93aaae4de7bec6323bf11f810457b479f9f877e80d212fd77ffdbc"
+checksum = "4ec9b6eab7ecd4d639d78515e9ea491c9bacf494aa5eda10823bd35992cf8c1e"
 dependencies = [
  "wast",
 ]
@@ -4831,40 +4869,40 @@ dependencies = [
 
 [[package]]
 name = "wit-component"
-version = "0.238.0"
+version = "0.239.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d577b6b6ca3d05cf2a0367e85b1cdfb269155022ba272ae5a0e14c1e1cb59e4d"
+checksum = "88a866b19dba2c94d706ec58c92a4c62ab63e482b4c935d2a085ac94caecb136"
 dependencies = [
  "anyhow",
  "bitflags 2.5.0",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "log",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_derive",
  "serde_json",
- "wasm-encoder 0.238.0",
+ "wasm-encoder 0.239.0",
  "wasm-metadata",
- "wasmparser 0.238.0",
+ "wasmparser 0.239.0",
  "wat",
  "wit-parser",
 ]
 
 [[package]]
 name = "wit-parser"
-version = "0.238.0"
+version = "0.239.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d28fd1ea7579c62574b01b413d80293a0a3f3076d387752cd823a3b0e43e96f0"
+checksum = "55c92c939d667b7bf0c6bf2d1f67196529758f99a2a45a3355cc56964fd5315d"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.7.1",
+ "indexmap 2.12.0",
  "log",
  "semver",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_derive",
  "serde_json",
  "unicode-xid",
- "wasmparser 0.238.0",
+ "wasmparser 0.239.0",
 ]
 
 [[package]]
@@ -4920,7 +4958,7 @@ dependencies = [
  "once_cell",
  "ordered-stream",
  "rand 0.8.5",
- "serde 1.0.197",
+ "serde 1.0.228",
  "serde_repr",
  "sha1",
  "static_assertions",
@@ -4953,7 +4991,7 @@ version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "437d738d3750bed6ca9b8d423ccc7a8eb284f6b1d6d4e225a0e4e6258d864c8d"
 dependencies = [
- "serde 1.0.197",
+ "serde 1.0.228",
  "static_assertions",
  "zvariant",
 ]
@@ -4973,7 +5011,7 @@ dependencies = [
  "byteorder",
  "enumflags2",
  "libc",
- "serde 1.0.197",
+ "serde 1.0.228",
  "static_assertions",
  "zvariant_derive",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 89d26f3..c9ca638 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -63,12 +63,12 @@ wac-parser = { path = "crates/wac-parser", version = "0.9.0-dev", default-featur
 wac-resolver = { path = "crates/wac-resolver", version = "0.9.0-dev", default-features = false }
 wac-graph = { path = "crates/wac-graph", version = "0.9.0-dev" }
 wac-types = { path = "crates/wac-types", version = "0.9.0-dev" }
-wit-parser = "0.238.0"
-wasmparser = "0.238.0"
-wit-component = "0.238.0"
-wasm-encoder = "0.238.0"
-wasmprinter = "0.238.0"
-wasm-metadata = "0.238.0"
+wit-parser = "0.239.0"
+wasmparser = "0.239.0"
+wit-component = "0.239.0"
+wasm-encoder = "0.239.0"
+wasmprinter = "0.239.0"
+wasm-metadata = "0.239.0"
 wat = "1.238.0"
 anyhow = "1.0.81"
 clap = { version = "4.5.4", features = ["derive"] }
diff --git a/crates/wac-types/src/aggregator.rs b/crates/wac-types/src/aggregator.rs
index cd5d4a3..de10c18 100644
--- a/crates/wac-types/src/aggregator.rs
+++ b/crates/wac-types/src/aggregator.rs
@@ -831,8 +831,16 @@ impl TypeAggregator {
             DefinedType::Alias(ty) => {
                 DefinedType::Alias(self.remap_value_type(types, *ty, checker)?)
             }
-            DefinedType::Stream(s) => DefinedType::Stream(*s),
-            DefinedType::Future(f) => DefinedType::Future(*f),
+            DefinedType::Stream(s) => DefinedType::Stream(
+                s.as_ref()
+                    .map(|ty| self.remap_value_type(types, *ty, checker))
+                    .transpose()?,
+            ),
+            DefinedType::Future(f) => DefinedType::Future(
+                f.as_ref()
+                    .map(|ty| self.remap_value_type(types, *ty, checker))
+                    .transpose()?,
+            ),
         };
 
         let remapped = self.types.add_defined_type(defined);