deps: upgrade Jco, StarlingMonkey (#123)

Author: Guy Bedford

Cargo.lock

@@ -1,32 +1,25 @@
 [workspace]
 members = ["crates/spidermonkey-embedding-splicer"]
-exclude = [
-  "deps/js-compute-runtime/runtime/js-compute-runtime/rust-url",
-  "deps/js-compute-runtime/runtime/js-compute-runtime/rust-encoding",
-  "StarlingMonkey/crates/rust-encoding",
-  "StarlingMonkey/crates/rust-url"
-]
+exclude = ["StarlingMonkey/crates/rust-url"]
 resolver = "2"
 
 [workspace.package]
 edition = "2021"
 version = "0.1.0"
 
 [workspace.dependencies]
-anyhow = "1.0.81"
-base64 = "0.22.0"
-bitflags = "2.5.0"
-env_logger = "0.11.3"
+anyhow = "1.0.86"
+base64 = "0.22.1"
 heck = "0.5"
-js-component-bindgen = { version = "1.1.1", no-default-features = ["transpile-bindgen"] }
+js-component-bindgen = { git = "https://github.com/bytecodealliance/jco", rev = "3946278b4471961f2d3a6b80576097996472bc07" }
 pulldown-cmark = { version = "0.10", default-features = false }
 rand = "0.8"
 walrus = "0.20.3"
-wasm-encoder = "0.201.0"
-wasmparser = "0.201.0"
-wasmprinter = "0.201.0"
-wat = "1.201.0"
-wit-bindgen = "0.22.0"
-wit-bindgen-core = "0.22.0"
-wit-component = { version = "0.201.0", features = ["dummy-module"] }
-wit-parser = "0.201.0"
+wasm-encoder = "0.212.0"
+wasmparser = "0.212.0"
+wasmprinter = "0.212.0"
+wat = "1.212.0"
+wit-bindgen = "0.27.0"
+wit-bindgen-core = "0.27.0"
+wit-component = { version = "0.212.0", features = ["dummy-module"] }
+wit-parser = "0.212.0"

Cargo.toml

@@ -234,7 +234,11 @@ pub fn componentize_bindgen(
     let mut finalization_registries = Vec::new();
     for (key, export) in &resolve.worlds[id].exports {
         let key_name = resolve.name_world_key(key);
-        if let WorldItem::Interface(iface_id) = export {
+        if let WorldItem::Interface {
+            id: iface_id,
+            stability: _,
+        } = export
+        {
             let iface = &resolve.interfaces[*iface_id];
             for ty_id in iface.types.values() {
                 let ty = &resolve.types[*ty_id];
@@ -277,7 +281,11 @@ pub fn componentize_bindgen(
     let mut imported_resource_modules = HashMap::new();
     for (key, import) in &resolve.worlds[id].imports {
         let key_name = resolve.name_world_key(key);
-        if let WorldItem::Interface(iface_id) = import {
+        if let WorldItem::Interface {
+            id: iface_id,
+            stability: _,
+        } = import
+        {
             let iface = &resolve.interfaces[*iface_id];
             for ty_id in iface.types.values() {
                 let ty = &resolve.types[*ty_id];
@@ -441,7 +449,7 @@ impl JsBindgen<'_> {
                         func.name.to_lower_camel_case(),
                     );
                 }
-                WorldItem::Interface(id) => {
+                WorldItem::Interface { id, stability: _ } => {
                     let iface = &self.resolve.interfaces[*id];
                     for id in iface.types.values() {
                         if let TypeDefKind::Resource = &self.resolve.types[*id].kind {
@@ -520,7 +528,10 @@ impl JsBindgen<'_> {
                 WorldItem::Function(f) => {
                     self.import_bindgen(import_name, f, false, None);
                 }
-                WorldItem::Interface(i) => {
+                WorldItem::Interface {
+                    id: i,
+                    stability: _,
+                } => {
                     let iface = &self.resolve.interfaces[*i];
                     for id in iface.types.values() {
                         if let TypeDefKind::Resource = &self.resolve.types[*id].kind {
@@ -836,7 +847,7 @@ impl JsBindgen<'_> {
             },
             src: Source::default(),
             resource_map: &resource_map,
-            cur_resource_borrows: Vec::new(),
+            cur_resource_borrows: false,
             resolve: self.resolve,
             callee_resource_dynamic: false,
         };

StarlingMonkey

@@ -16,7 +16,7 @@ use wit_component::{
     metadata::{decode, Bindgen},
     StringEncoding,
 };
-use wit_parser::{PackageId, Resolve, UnresolvedPackage};
+use wit_parser::{PackageId, Resolve};
 
 wit_bindgen::generate!({
     world: "spidermonkey-embedding-splicer",
@@ -79,9 +79,9 @@ fn map_core_fn(cfn: &bindgen::CoreFn) -> CoreFn {
     }
 }
 
-fn parse_wit(path: &Path) -> Result<(Resolve, PackageId)> {
+fn parse_wit(path: &Path) -> Result<(Resolve, Vec<PackageId>)> {
     let mut resolve = Resolve::default();
-    let id = if path.is_dir() {
+    let ids = if path.is_dir() {
         resolve.push_dir(&path)?.0
     } else {
         let contents =
@@ -90,10 +90,9 @@ fn parse_wit(path: &Path) -> Result<(Resolve, PackageId)> {
             Ok(s) => s,
             Err(_) => bail!("input file is not valid utf-8"),
         };
-        let pkg = UnresolvedPackage::parse(&path, text)?;
-        resolve.push(pkg)?
+        resolve.push_str(&path, text)?
     };
-    Ok((resolve, id))
+    Ok((resolve, ids))
 }
 
 impl Guest for SpidermonkeyEmbeddingSplicerComponent {
@@ -120,20 +119,19 @@ impl Guest for SpidermonkeyEmbeddingSplicerComponent {
     ) -> Result<SpliceResult, String> {
         let source_name = source_name.unwrap_or("source.js".to_string());
 
-        let (mut resolve, id) = if let Some(wit_source) = wit_source {
+        let (mut resolve, ids) = if let Some(wit_source) = wit_source {
             let mut resolve = Resolve::default();
             let path = PathBuf::from("component.wit");
-            let pkg = UnresolvedPackage::parse(&path, &wit_source).map_err(|e| e.to_string())?;
-
-            let id = resolve.push(pkg).map_err(|e| e.to_string())?;
-
-            (resolve, id)
+            let ids = resolve
+                .push_str(&path, &wit_source)
+                .map_err(|e| e.to_string())?;
+            (resolve, ids)
         } else {
             parse_wit(&PathBuf::from(wit_path.unwrap())).map_err(|e| format!("{:?}", e))?
         };
 
         let world = resolve
-            .select_world(id, world_name.as_deref())
+            .select_world(&ids, world_name.as_deref())
             .map_err(|e| e.to_string())?;
 
         let mut wasm_bytes = wit_component::dummy_module(&resolve, world);

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

@@ -9,7 +9,7 @@ use walrus::{
     Function, FunctionBuilder, FunctionId, FunctionKind, ImportKind, ImportedFunction, InitExpr,
     InstrSeqBuilder, LocalId, Module, ValType,
 };
-use wit_parser::{Resolve, UnresolvedPackage};
+use wit_parser::Resolve;
 
 use crate::{parse_wit, Features};
 
@@ -64,19 +64,17 @@ pub fn stub_wasi(
     wit_path: Option<String>,
     world_name: Option<String>,
 ) -> Result<Vec<u8>> {
-    let (resolve, id) = if let Some(wit_source) = wit_source {
+    let (resolve, ids) = if let Some(wit_source) = wit_source {
         let mut resolve = Resolve::default();
         let path = PathBuf::from("component.wit");
-        let pkg = UnresolvedPackage::parse(&path, &wit_source)?;
+        let ids = resolve.push_str(&path, &wit_source)?;
 
-        let id = resolve.push(pkg)?;
-
-        (resolve, id)
+        (resolve, ids)
     } else {
         parse_wit(&PathBuf::from(wit_path.unwrap()))?
     };
 
-    let world = resolve.select_world(id, world_name.as_deref())?;
+    let world = resolve.select_world(&ids, world_name.as_deref())?;
 
     let target_world = &resolve.worlds[world];
     let mut target_world_imports = HashSet::new();