chore(deps): update upstream wasm deps to *.227.1

Signed-off-by: Victor Adossi <vadossi@cosmonic.com>

Author: vados-cosmonic

Cargo.toml

@@ -8,13 +8,28 @@ edition = "2021"
 version = "0.1.0"
 
 [workspace.dependencies]
-anyhow = "1.0.95"
-heck = "0.5"
-js-component-bindgen = "1.10.0"
-wasm-encoder = "0.225.0"
-wasmparser = "0.224.0"
-wit-bindgen = "0.39.0"
-wit-bindgen-core = "0.39.0"
-wit-component = { version = "0.225.0", features = ["dummy-module"] }
-wit-parser = "0.225.0"
-orca-wasm = "0.9.0"
+anyhow = { version = "1.0.95", default-features = false }
+heck = { version = "0.5", default-features = false }
+#js-component-bindgen = { version = "1.10.0", default-features = false }
+#orca-wasm = { version = "0.9.0", default-features = false }
+rand = { version = "0.8", default-features = false }
+#wasm-encoder = { version = "0.225.0", default-features = false }
+#wasmparser = { version = "0.224.0", features = ["features"] }
+#wit-bindgen = { version = "0.39.0", features = [ "macros" ] }
+#wit-bindgen-core = { version = "0.39.0", default-features = false }
+#wit-component = { version = "0.225.0", features = ["dummy-module"] }
+#wit-parser = { version = "0.225.0", default-features = false }
+
+# TODO: remove once js-component-bindgen with newer upstream versions is released
+js-component-bindgen = { path = "../jco/crates/js-component-bindgen", default-features = false }
+
+# TODO: remove once orca PR has merged
+# see: https://github.com/thesuhas/orca/pull/241
+orca-wasm = { path = "../orca" }
+
+wasm-encoder = { version = "0.227.1", default-features = false }
+wasmparser = { version = "0.227.1", features = ["features"] }
+wit-bindgen = { version = "0.41.0", features = [ "macros" ] }
+wit-bindgen-core = { version = "0.41.0", default-features = false }
+wit-component = { version = "0.227.1", features = ["dummy-module"] }
+wit-parser = { version = "0.227.1", default-features = false }

crates/spidermonkey-embedding-splicer/Cargo.toml

@@ -10,13 +10,14 @@ edition.workspace = true
 
 [dependencies]
 anyhow = { workspace = true }
+clap = { version = "4.5.31", features = ["suggestions", "color", "derive"] }
 heck = { workspace = true }
 js-component-bindgen = { workspace = true }
-wasmparser = { workspace = true }
+orca-wasm = { workspace = true }
+rand = { workspace = true }
 wasm-encoder = { workspace = true }
+wasmparser = { workspace = true }
+wit-bindgen = { workspace = true }
+wit-bindgen-core = { workspace = true }
 wit-component = { workspace = true }
 wit-parser = { workspace = true }
-wit-bindgen-core = { workspace = true }
-wit-bindgen = { workspace = true }
-orca-wasm.workspace = true
-clap = { version = "4.5.31", features = ["suggestions", "color", "derive"] }

crates/spidermonkey-embedding-splicer/src/bindgen.rs

@@ -1,14 +1,14 @@
-use crate::{uwrite, uwriteln};
-use anyhow::Result;
+use std::collections::{BTreeMap, BTreeSet, HashMap};
+use std::fmt::Write;
+
+use anyhow::{bail, Result};
 use heck::*;
 use js_component_bindgen::function_bindgen::{
     ErrHandling, FunctionBindgen, ResourceData, ResourceMap, ResourceTable,
 };
 use js_component_bindgen::intrinsics::{render_intrinsics, Intrinsic};
 use js_component_bindgen::names::LocalNames;
 use js_component_bindgen::source::Source;
-use std::collections::{BTreeMap, BTreeSet, HashMap};
-use std::fmt::Write;
 use wit_bindgen_core::abi::{self, LiftLower};
 use wit_bindgen_core::wit_parser::Resolve;
 use wit_bindgen_core::wit_parser::{
@@ -19,6 +19,8 @@ use wit_component::StringEncoding;
 use wit_parser::abi::WasmType;
 use wit_parser::abi::{AbiVariant, WasmSignature};
 
+use crate::{uwrite, uwriteln, Features};
+
 #[derive(Debug)]
 pub enum Resource {
     None,
@@ -518,6 +520,9 @@ impl JsBindgen<'_> {
                                     resource_name,
                                 );
                             }
+                            FunctionKind::AsyncFreestanding => todo!(),
+                            FunctionKind::AsyncMethod(_id) => todo!(),
+                            FunctionKind::AsyncStatic(_id) => todo!(),
                         };
                     }
                 }
@@ -607,10 +612,14 @@ impl JsBindgen<'_> {
                         BTreeMap::<_, Vec<_>>::new(),
                         |mut map, (name, func)| {
                             map.entry(match &func.kind {
-                                FunctionKind::Freestanding => None,
+                                FunctionKind::Freestanding | FunctionKind::AsyncFreestanding => {
+                                    None
+                                }
                                 FunctionKind::Method(ty)
                                 | FunctionKind::Static(ty)
-                                | FunctionKind::Constructor(ty) => Some(*ty),
+                                | FunctionKind::Constructor(ty)
+                                | FunctionKind::AsyncMethod(ty)
+                                | FunctionKind::AsyncStatic(ty) => Some(*ty),
                             })
                             .or_default()
                             .push((name.as_str(), func));
@@ -728,6 +737,9 @@ impl JsBindgen<'_> {
                     Resource::Constructor(self.resolve.types[*ty].name.clone().unwrap()),
                 )
             }
+            FunctionKind::AsyncFreestanding => todo!(),
+            FunctionKind::AsyncMethod(_id) => todo!(),
+            FunctionKind::AsyncStatic(_id) => todo!(),
         };
 
         // imports are canonicalized as exports because
@@ -783,8 +795,8 @@ impl JsBindgen<'_> {
         for (_, ty) in func.params.iter() {
             self.iter_resources(ty, &mut resource_map);
         }
-        for ty in func.results.iter_types() {
-            self.iter_resources(ty, &mut resource_map);
+        if let Some(ty) = func.result {
+            self.iter_resources(&ty, &mut resource_map);
         }
         resource_map
     }
@@ -893,23 +905,27 @@ impl JsBindgen<'_> {
             }
         }
 
+        let err = if get_thrown_type(self.resolve, func.result)
+            .is_some_and(|(_, err_ty)| err_ty.is_some())
+        {
+            match abi {
+                AbiVariant::GuestExport => ErrHandling::ThrowResultErr,
+                AbiVariant::GuestImport => ErrHandling::ResultCatchHandler,
+                AbiVariant::GuestImportAsync => todo!(),
+                AbiVariant::GuestExportAsync => todo!(),
+                AbiVariant::GuestExportAsyncStackful => todo!(),
+            }
+        } else {
+            ErrHandling::None
+        };
+
         let mut f = FunctionBindgen {
             is_async: false,
             tracing_prefix: None,
             intrinsics: &mut self.all_intrinsics,
             valid_lifting_optimization: true,
             sizes: &self.sizes,
-            err: if func.results.throws(self.resolve).is_some() {
-                match abi {
-                    AbiVariant::GuestExport => ErrHandling::ThrowResultErr,
-                    AbiVariant::GuestImport => ErrHandling::ResultCatchHandler,
-                    AbiVariant::GuestImportAsync => todo!(),
-                    AbiVariant::GuestExportAsync => todo!(),
-                    AbiVariant::GuestExportAsyncStackful => todo!(),
-                }
-            } else {
-                ErrHandling::None
-            },
+            err,
             block_storage: Vec::new(),
             blocks: Vec::new(),
             callee,
@@ -973,6 +989,9 @@ impl JsBindgen<'_> {
                 Resource::Constructor(self.resolve.types[*ty].name.clone().unwrap()),
                 format!("new {callee}"),
             ),
+            FunctionKind::AsyncFreestanding => todo!(),
+            FunctionKind::AsyncMethod(_id) => todo!(),
+            FunctionKind::AsyncStatic(_id) => todo!(),
         };
 
         let binding_name = format!(
@@ -1017,8 +1036,8 @@ impl JsBindgen<'_> {
         CoreFn {
             retsize: if sig.retptr {
                 let mut retsize: u32 = 0;
-                for ret_ty in func.results.iter_types() {
-                    retsize += self.sizes.size(ret_ty).size_wasm32() as u32;
+                if let Some(ret_ty) = func.result {
+                    retsize += self.sizes.size(&ret_ty).size_wasm32() as u32;
                 }
                 retsize
             } else {
@@ -1327,3 +1346,20 @@ fn binding_name(func_name: &str, iface_name: &Option<String>) -> String {
         None => format!("{func_name}"),
     }
 }
+
+/// Utility function for deducing whether a type can throw
+pub fn get_thrown_type<'a>(
+    resolve: &'a Resolve,
+    return_type: Option<Type>,
+) -> Option<(Option<&'a Type>, Option<&'a Type>)> {
+    match return_type {
+        None => None,
+        Some(ty) => match ty {
+            Type::Id(id) => match &resolve.types[id].kind {
+                TypeDefKind::Result(r) => Some((r.ok.as_ref(), r.err.as_ref())),
+                _ => None,
+            },
+            _ => None,
+        },
+    }
+}