chore(bindgen): update wasm/wit deps to 0.245.1

Author: vados-cosmonic

Cargo.lock

@@ -46,18 +46,20 @@ webidl2wit = { version = "0.1.0", default-features = false }
 xshell = { version = "0.2.7", default-features = false }
 
 wasmtime = { version = "43.0.0", default-features = false }
-wasm-encoder = { version = "0.246.1", default-features = false }
-wasm-metadata = { version = "0.246.1", default-features = false }
-wasmparser = { version = "0.246.1", default-features = false }
-wasmprinter = { version = "0.246.1", default-features = false }
+wasm-encoder = { version = "0.245.1", default-features = false }
+wasm-metadata = { version = "0.245.1", default-features = false }
+wasmparser = { version = "0.245.1", default-features = false }
+wasmprinter = { version = "0.245.1", default-features = false }
 wasmtime-environ = { version = "43.0.0", features= [ "component-model", "compile" ] }
-wat = { version = "1.246.1", default-features = false }
+wat = { version = "1.245.1", default-features = false }
 wit-bindgen = { version = "0.54.0", default-features = false }
 wit-bindgen-core = { version = "0.54.0", default-features = false }
-wit-component = { version = "0.246.1", features = ["dummy-module"] }
-wit-parser = { version = "0.246.1", default-features = false }
+wit-component = { version = "0.245.1", features = ["dummy-module"] }
+wit-parser = { version = "0.245.1", default-features = false }
 
 js-component-bindgen = { version = "1.16.5", path = "./crates/js-component-bindgen" }
 
 [patch.crates-io]
-weedle = { git = "https://github.com/wasm-bindgen/weedle", ref = "v0.13.0" }
+# NOTE: weedle added a breaking change which gets pulled in by webidl2wit
+# see: https://github.com/wasi-gfx/webidl2wit/pull/56
+weedle = { git = "https://github.com/wasm-bindgen/weedle", rev = "33f52628f699502c8c9ec49a18adc53af6c4a846" }

Cargo.toml

@@ -201,13 +201,18 @@ impl<'a> Translation<'a> {
 
     /// Returns the exports of this module, which are not modified by
     /// augmentation.
-    pub fn exports(
-        &self,
-    ) -> &wasmtime_environ::wasmparser::collections::IndexMap<String, EntityIndex> {
-        match self {
-            Translation::Normal(translation) => &translation.module.exports,
-            Translation::Augmented { original, .. } => &original.module.exports,
-        }
+    pub fn exports(&self) -> HashMap<String, EntityIndex> {
+        let (translation, exports) = match self {
+            Translation::Normal(translation) => (translation, &translation.module.exports),
+            Translation::Augmented { original, .. } => (original, &original.module.exports),
+        };
+
+        exports
+            .iter()
+            .map(|(atom, entity_idx)| {
+                (String::from(&translation.module.strings[atom]), *entity_idx)
+            })
+            .collect()
     }
 }
 

crates/js-component-bindgen/src/core.rs

@@ -135,7 +135,7 @@ pub fn transpile(component: &[u8], opts: TranspileOpts) -> Result<Transpiled> {
             | WasmFeatures::CM_ASYNC_BUILTINS
             | WasmFeatures::CM_ASYNC_STACKFUL
             | WasmFeatures::CM_ERROR_CONTEXT
-            | WasmFeatures::CM_FIXED_SIZE_LIST,
+            | WasmFeatures::CM_FIXED_LENGTH_LISTS,
     );
 
     let mut types = ComponentTypesBuilder::new(&validator);

crates/js-component-bindgen/src/lib.rs

@@ -2316,36 +2316,38 @@ impl<'a> Instantiator<'a, '_> {
                 uwriteln!(self.src.js, "const trampoline{i} = {resource_transfer};");
             }
 
-            Trampoline::ResourceEnterCall => {
-                let scope_id = self.bindgen.intrinsic(Intrinsic::ScopeId);
-                uwrite!(self.src.js, "function trampoline{i}() {{ {scope_id}++; }}");
-            }
-
-            Trampoline::ResourceExitCall => {
-                let scope_id = self.bindgen.intrinsic(Intrinsic::ScopeId);
-                let resource_borrows = self
-                    .bindgen
-                    .intrinsic(Intrinsic::Resource(ResourceIntrinsic::ResourceCallBorrows));
-                let handle_tables = self.bindgen.intrinsic(Intrinsic::HandleTables);
-                // To verify that borrows are dropped, it is enough to verify that the handle
-                // either no longer exists (part of free list) or belongs to another scope, since
-                // the enter call closed off the ability to create new handles in the parent scope
-                uwrite!(
-                    self.src.js,
-                    r#"function trampoline{i}() {{
-                        {scope_id}--;
-                        for (const {{ rid, handle }} of {resource_borrows}) {{
-                            const storedScopeId = {handle_tables}[rid][handle << 1]
-                            if (storedScopeId === {scope_id}) {{
-                                throw new TypeError('borrows not dropped for resource call');
-                            }}
-                        }}
-                        {resource_borrows} = [];
-                    }}
-                    "#,
-                );
-            }
-
+            // TODO: we need to do this? does this mean we need to start keeping track of when we
+            // enter a call on a resource explicitly?
+
+            // Trampoline::ResourceEnterCall => {
+            //     let scope_id = self.bindgen.intrinsic(Intrinsic::ScopeId);
+            //     uwrite!(self.src.js, "function trampoline{i}() {{ {scope_id}++; }}");
+            // }
+
+            // Trampoline::ResourceExitCall => {
+            //     let scope_id = self.bindgen.intrinsic(Intrinsic::ScopeId);
+            //     let resource_borrows = self
+            //         .bindgen
+            //         .intrinsic(Intrinsic::Resource(ResourceIntrinsic::ResourceCallBorrows));
+            //     let handle_tables = self.bindgen.intrinsic(Intrinsic::HandleTables);
+            //     // To verify that borrows are dropped, it is enough to verify that the handle
+            //     // either no longer exists (part of free list) or belongs to another scope, since
+            //     // the enter call closed off the ability to create new handles in the parent scope
+            //     uwrite!(
+            //         self.src.js,
+            //         r#"function trampoline{i}() {{
+            //             {scope_id}--;
+            //             for (const {{ rid, handle }} of {resource_borrows}) {{
+            //                 const storedScopeId = {handle_tables}[rid][handle << 1]
+            //                 if (storedScopeId === {scope_id}) {{
+            //                     throw new TypeError('borrows not dropped for resource call');
+            //                 }}
+            //             }}
+            //             {resource_borrows} = [];
+            //         }}
+            //         "#,
+            //     );
+            // }
             Trampoline::ContextSet { instance, slot, .. } => {
                 let context_set_fn = self
                     .bindgen
@@ -2532,10 +2534,15 @@ impl<'a> Instantiator<'a, '_> {
             }
             Trampoline::ThreadIndex => todo!("Trampoline::ThreadIndex"),
             Trampoline::ThreadNewIndirect { .. } => todo!("Trampoline::ThreadNewIndirect"),
-            Trampoline::ThreadSwitchTo { .. } => todo!("Trampoline::ThreadSwitchTo"),
             Trampoline::ThreadSuspend { .. } => todo!("Trampoline::ThreadSuspend"),
-            Trampoline::ThreadResumeLater { .. } => todo!("Trampoline::ThreadResumeLater"),
-            Trampoline::ThreadYieldTo { .. } => todo!("Trampoline::ThreadYieldTo"),
+            Trampoline::ThreadSuspendTo { .. } => todo!("Trampoline::ThreadSuspendTo"),
+            Trampoline::ThreadUnsuspend { .. } => todo!("Trampoline::ThreadUnsuspend"),
+            Trampoline::ThreadYieldToSuspended { .. } => {
+                todo!("Trampoline::ThreadYieldToSuspended")
+            }
+            Trampoline::ThreadSuspendToSuspended { .. } => {
+                todo!("Trampoline::ThreadYieldToSuspended")
+            }
 
             Trampoline::Trap => {
                 uwriteln!(
@@ -3947,11 +3954,12 @@ impl<'a> Instantiator<'a, '_> {
                     .iter()
                     .find_map(|(name, i)| if *i == idx { Some(name) } else { None })
                     .unwrap()
+                    .to_string()
             }
-            ExportItem::Name(s) => s,
+            ExportItem::Name(s) => s.to_string(),
         };
         let i = export.instance.as_u32() as usize;
-        let quoted = maybe_quote_member(name);
+        let quoted = maybe_quote_member(&name);
         format!("exports{i}{quoted}")
     }