diff --git a/Cargo.lock b/Cargo.lock index 0e7a8dcff..abcccb105 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "ahash" @@ -173,6 +173,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" dependencies = [ "ahash", + "serde", ] [[package]] @@ -257,12 +258,12 @@ dependencies = [ "heck 0.5.0", "log", "semver", - "wasm-encoder 0.221.2", - "wasmparser 0.221.2", + "wasm-encoder 0.220.0", + "wasmparser 0.220.0", "wasmtime-environ", "wit-bindgen-core", - "wit-component 0.221.2", - "wit-parser 0.221.2", + "wit-component", + "wit-parser", ] [[package]] @@ -637,35 +638,19 @@ dependencies = [ "wasmparser 0.220.0", ] -[[package]] -name = "wasm-metadata" -version = "0.221.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a7018a96c4f55a8f339954c66e09728f2d6112689000e58f15f6a6d7436e8f" -dependencies = [ - "anyhow", - "indexmap", - "serde", - "serde_derive", - "serde_json", - "spdx", - "wasm-encoder 0.221.2", - "wasmparser 0.221.2", -] - [[package]] name = "wasm-tools-js" version = "0.1.0" dependencies = [ "anyhow", - "wasm-encoder 0.221.2", - "wasm-metadata 0.221.2", - "wasmparser 0.221.2", - "wasmprinter", + "wasm-encoder 0.220.0", + "wasm-metadata", + "wasmparser 0.220.0", + "wasmprinter 0.220.0", "wat", "wit-bindgen", - "wit-component 0.221.2", - "wit-parser 0.221.2", + "wit-component", + "wit-parser", ] [[package]] @@ -679,6 +664,7 @@ dependencies = [ "hashbrown 0.14.5", "indexmap", "semver", + "serde", ] [[package]] @@ -705,6 +691,17 @@ dependencies = [ "semver", ] +[[package]] +name = "wasmprinter" +version = "0.220.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae749f2c66587777ce9ad0e8c632e72c77574336b17d2f040a47cffbd92198c7" +dependencies = [ + "anyhow", + "termcolor", + "wasmparser 0.220.0", +] + [[package]] name = "wasmprinter" version = "0.221.2" @@ -743,7 +740,7 @@ dependencies = [ "target-lexicon", "wasm-encoder 0.221.2", "wasmparser 0.221.2", - "wasmprinter", + "wasmprinter 0.221.2", "wasmtime-component-util", ] @@ -912,7 +909,7 @@ checksum = "b632a5a0fa2409489bd49c9e6d99fcc61bb3d4ce9d1907d44662e75a28c71172" dependencies = [ "anyhow", "heck 0.5.0", - "wit-parser 0.220.0", + "wit-parser", ] [[package]] @@ -935,9 +932,9 @@ dependencies = [ "indexmap", "prettyplease", "syn 2.0.96", - "wasm-metadata 0.220.0", + "wasm-metadata", "wit-bindgen-core", - "wit-component 0.220.0", + "wit-component", ] [[package]] @@ -969,29 +966,10 @@ dependencies = [ "serde_derive", "serde_json", "wasm-encoder 0.220.0", - "wasm-metadata 0.220.0", + "wasm-metadata", "wasmparser 0.220.0", - "wit-parser 0.220.0", -] - -[[package]] -name = "wit-component" -version = "0.221.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c6b907a1af1f2cf2160d7fe2ff5967cef120dc5c034d22593a1f24e40272cb2" -dependencies = [ - "anyhow", - "bitflags 2.8.0", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder 0.221.2", - "wasm-metadata 0.221.2", - "wasmparser 0.221.2", "wat", - "wit-parser 0.221.2", + "wit-parser", ] [[package]] @@ -1023,24 +1001,6 @@ dependencies = [ "wasmparser 0.220.0", ] -[[package]] -name = "wit-parser" -version = "0.221.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe1538eea6ea5ddbe5defd0dc82539ad7ba751e1631e9185d24a931f0a5adc8" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser 0.221.2", -] - [[package]] name = "xshell" version = "0.2.7" @@ -1066,7 +1026,7 @@ dependencies = [ "structopt", "webidl2wit", "weedle", - "wit-component 0.221.2", + "wit-component", "wit-encoder", "xshell", ] diff --git a/Cargo.toml b/Cargo.toml index 24752f028..d63708fe0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -41,20 +41,20 @@ log = "0.4.22" semver = "1.0.25" js-component-bindgen = { path = "./crates/js-component-bindgen" } structopt = "0.3.26" -wasm-encoder = "0.221.2" -wasm-metadata = "0.221.2" -wasmparser = "0.221.2" -wasmprinter = "0.221.2" +wasm-encoder = "0.220.0" +wasm-metadata = "0.220.0" +wasmparser = "0.220.0" +wasmprinter = "0.220.0" wasmtime-environ = { version = "29.0.0", features = [ "component-model", "compile", ] } -wat = "1.221.2" +wat = "1.220.0" wit-bindgen = "0.36.0" wit-bindgen-core = "0.36.0" -wit-component = { version = "0.221.2", features = ["dummy-module"] } -wit-parser = "=0.221.2" +wit-component = { version = "0.220.0", features = ["dummy-module"] } +wit-parser = "0.220.0" xshell = "0.2.6" [dev-dependencies] -anyhow = { workspace = true } \ No newline at end of file +anyhow = { workspace = true } diff --git a/crates/js-component-bindgen/src/core.rs b/crates/js-component-bindgen/src/core.rs index e8dccdbbd..2ff1f64f0 100644 --- a/crates/js-component-bindgen/src/core.rs +++ b/crates/js-component-bindgen/src/core.rs @@ -188,7 +188,9 @@ impl<'a> Translation<'a> { /// Returns the exports of this module, which are not modified by /// augmentation. - pub fn exports(&self) -> &IndexMap { + pub fn exports( + &self, + ) -> &wasmtime_environ::wasmparser::collections::IndexMap { match self { Translation::Normal(translation) => &translation.module.exports, Translation::Augmented { original, .. } => &original.module.exports, @@ -546,7 +548,7 @@ macro_rules! define_visit { impl<'a> VisitOperator<'a> for CollectMemOps<'_, 'a> { type Output = (); - wasmparser::for_each_visit_operator!(define_visit); + wasmparser::for_each_operator!(define_visit); } impl AugmentedOp { @@ -772,7 +774,7 @@ macro_rules! define_translate { impl<'a> VisitOperator<'a> for Translator<'_, 'a> { type Output = (); - wasmparser::for_each_visit_operator!(define_translate); + wasmparser::for_each_operator!(define_translate); } #[derive(Debug, Hash, Eq, PartialEq, Copy, Clone)] diff --git a/crates/js-component-bindgen/src/lib.rs b/crates/js-component-bindgen/src/lib.rs index 587babb79..827915531 100644 --- a/crates/js-component-bindgen/src/lib.rs +++ b/crates/js-component-bindgen/src/lib.rs @@ -80,7 +80,6 @@ pub fn generate_types( /// Outputs the file map and import and export metadata for the Transpilation #[cfg(feature = "transpile-bindgen")] pub fn transpile(component: &[u8], opts: TranspileOpts) -> Result { - use wasmparser::Validator; use wasmtime_environ::component::{Component, Translator}; let name = opts.name.clone(); @@ -116,7 +115,7 @@ pub fn transpile(component: &[u8], opts: TranspileOpts) -> Result