add async-streams-and-futures test to wit-component

Signed-off-by: Joel Dice <joel.dice@fermyon.com>
bytecodealliance · Nov 18, 2024 · 27bb59a · 27bb59a
1 parent ec67b25
commit 27bb59a
Show file tree

Hide file tree

Showing 6 changed files with 791 additions and 7 deletions.
diff --git a/crates/wit-component/src/printing.rs b/crates/wit-component/src/printing.rs
@@ -534,11 +534,19 @@ impl WitPrinter {
                         self.output.push_str(">");
                     }
                     TypeDefKind::Type(ty) => self.print_type_name(resolve, ty)?,
-                    TypeDefKind::Future(_) => {
-                        todo!("document has an unnamed future type")
+                    TypeDefKind::Future(ty) => {
+                        if let Some(ty) = ty {
+                            self.output.push_str("future<");
+                            self.print_type_name(resolve, ty)?;
+                            self.output.push_str(">");
+                        } else {
+                            self.output.push_str("future");
+                        }
                     }
-                    TypeDefKind::Stream(_) => {
-                        todo!("document has an unnamed stream type")
+                    TypeDefKind::Stream(ty) => {
+                        self.output.push_str("stream<");
+                        self.print_type_name(resolve, ty)?;
+                        self.output.push_str(">");
                     }
                     TypeDefKind::ErrorContext => self.output.push_str("error-context"),
                     TypeDefKind::Unknown => unreachable!(),

diff --git a/crates/wit-component/src/validation.rs b/crates/wit-component/src/validation.rs
@@ -1388,7 +1388,7 @@ impl NameMangling for Legacy {
             if let Some((suffix, imported)) = module
                 .strip_prefix("[import-payload]")
                 .map(|v| (v, true))
-                .or_else(|| name.strip_prefix("[export-payload]").map(|v| (v, false)))
+                .or_else(|| module.strip_prefix("[export-payload]").map(|v| (v, false)))
             {
                 let (key, interface) = if suffix == self.import_root() {
                     (WorldKey::Name(name.to_string()), None)
@@ -1469,7 +1469,11 @@ impl NameMangling for Legacy {
                             ty: info(key)?.ty,
                         }
                     } else if let Some(key) = match_payload_prefix(name, "[future-cancel-read-") {
-                        validate_func_sig(name, &FuncType::new([ValType::I32], []), ty)?;
+                        validate_func_sig(
+                            name,
+                            &FuncType::new([ValType::I32], [ValType::I32]),
+                            ty,
+                        )?;
                         Import::FutureCancelRead {
                             async_,
                             ty: info(key)?.ty,
@@ -1525,7 +1529,11 @@ impl NameMangling for Legacy {
                             ty: info(key)?.ty,
                         }
                     } else if let Some(key) = match_payload_prefix(name, "[stream-cancel-read-") {
-                        validate_func_sig(name, &FuncType::new([ValType::I32], []), ty)?;
+                        validate_func_sig(
+                            name,
+                            &FuncType::new([ValType::I32], [ValType::I32]),
+                            ty,
+                        )?;
                         Import::StreamCancelRead {
                             async_,
                             ty: info(key)?.ty,