Merge the wasm-bridge-js crate

kajacx · Mar 10, 2024 · b9c4503 · b9c4503
1 parent 28c4cc7
commit b9c4503
Show file tree

Hide file tree

Showing 44 changed files with 22 additions and 42 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,6 @@
 
 members = [
   "crates/wasm-bridge",
-  "crates/wasm-bridge-js",
   "crates/wasm-bridge-wasi",
   "crates/wasm-bridge-macros",
 ]

diff --git a/crates/wasm-bridge-js/Cargo.toml b/crates/wasm-bridge-js/Cargo.toml
diff --git a/crates/wasm-bridge-js/README.md b/crates/wasm-bridge-js/README.md
diff --git a/crates/wasm-bridge/Cargo.toml b/crates/wasm-bridge/Cargo.toml
@@ -14,11 +14,21 @@ wasm-bridge-macros = { workspace = true, optional = true }
 async-trait = { workspace = true, optional = true }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-wasm-bridge-js = { workspace = true }
+js-sys = { workspace = true }
+wasm-bindgen = { workspace = true }
+wasm-bindgen-futures = { workspace = true }
+wat = { workspace = true, optional = true }
+wasm-bridge-macros = { workspace = true, optional = true }
+async-trait = { workspace = true, optional = true }
+js-component-bindgen = { workspace = true, optional = true }
+anyhow = { workspace = true }
+
+[dev-dependencies]
+wasm-bindgen-test = { workspace = true }
 
 [features]
 default = ["wat", "error-logging"]
-wat = ["wasmtime/wat", "wasm-bridge-js/wat"]
-component-model = ["wasmtime/component-model", "wasm-bridge-macros", "wasm-bridge-js/component-model"]
-async = ["wasmtime/async", "async-trait", "wasm-bridge-js/async", "wasm-bridge-macros/async"]
-error-logging = ["wasm-bridge-js/error-logging"]
+wat = ["dep:wat", "wasmtime/wat"]
+component-model = ["wasmtime/component-model", "wasm-bridge-macros", "js-component-bindgen"]
+async = ["wasmtime/async", "async-trait", "wasm-bridge-macros/async"]
+error-logging = []
diff --git a/crates/wasm-bridge-js/src/caller.rs → crates/wasm-bridge/src/js/caller.rs b/crates/wasm-bridge-js/src/caller.rs → crates/wasm-bridge/src/js/caller.rs
diff --git a/...wasm-bridge-js/src/component/component.rs → ...wasm-bridge/src/js/component/component.rs b/...wasm-bridge-js/src/component/component.rs → ...wasm-bridge/src/js/component/component.rs
diff --git a/...idge-js/src/component/component_loader.rs → ...idge/src/js/component/component_loader.rs b/...idge-js/src/component/component_loader.rs → ...idge/src/js/component/component_loader.rs
diff --git a/...s/wasm-bridge-js/src/component/exports.rs → ...s/wasm-bridge/src/js/component/exports.rs b/...s/wasm-bridge-js/src/component/exports.rs → ...s/wasm-bridge/src/js/component/exports.rs
diff --git a/crates/wasm-bridge-js/src/component/func.rs → crates/wasm-bridge/src/js/component/func.rs b/crates/wasm-bridge-js/src/component/func.rs → crates/wasm-bridge/src/js/component/func.rs
diff --git a/.../wasm-bridge-js/src/component/instance.rs → .../wasm-bridge/src/js/component/instance.rs b/.../wasm-bridge-js/src/component/instance.rs → .../wasm-bridge/src/js/component/instance.rs
diff --git a/...es/wasm-bridge-js/src/component/linker.rs → ...es/wasm-bridge/src/js/component/linker.rs b/...es/wasm-bridge-js/src/component/linker.rs → ...es/wasm-bridge/src/js/component/linker.rs
diff --git a/...m-bridge-js/src/component/make_closure.rs → ...m-bridge/src/js/component/make_closure.rs b/...m-bridge-js/src/component/make_closure.rs → ...m-bridge/src/js/component/make_closure.rs
@@ -3,8 +3,8 @@ use std::rc::Rc;
 
 use wasm_bindgen::{prelude::*, JsValue};
 
-use crate::conversions::FromJsValue;
 use crate::direct::*;
+use crate::FromJsValue;
 use crate::{DataHandle, DropHandle, Result, StoreContextMut};
 use js_sys::{Array, Function};
 

diff --git a/crates/wasm-bridge-js/src/component/mod.rs → crates/wasm-bridge/src/js/component/mod.rs b/crates/wasm-bridge-js/src/component/mod.rs → crates/wasm-bridge/src/js/component/mod.rs
diff --git a/...wasm-bridge-js/src/component/resources.rs → ...wasm-bridge/src/js/component/resources.rs b/...wasm-bridge-js/src/component/resources.rs → ...wasm-bridge/src/js/component/resources.rs
diff --git a/...asm-bridge-js/src/component/typed_func.rs → ...asm-bridge/src/js/component/typed_func.rs b/...asm-bridge-js/src/component/typed_func.rs → ...asm-bridge/src/js/component/typed_func.rs
diff --git a/crates/wasm-bridge-js/src/config.rs → crates/wasm-bridge/src/js/config.rs b/crates/wasm-bridge-js/src/config.rs → crates/wasm-bridge/src/js/config.rs
diff --git a/crates/wasm-bridge-js/src/context.rs → crates/wasm-bridge/src/js/context.rs b/crates/wasm-bridge-js/src/context.rs → crates/wasm-bridge/src/js/context.rs
diff --git a/...ridge-js/src/conversions/from_js_value.rs → ...ridge/src/js/conversions/from_js_value.rs b/...ridge-js/src/conversions/from_js_value.rs → ...ridge/src/js/conversions/from_js_value.rs
diff --git a/...js/src/conversions/from_js_value_tests.rs → ...src/js/conversions/from_js_value_tests.rs b/...js/src/conversions/from_js_value_tests.rs → ...src/js/conversions/from_js_value_tests.rs
diff --git a/...bridge-js/src/conversions/into_closure.rs → ...bridge/src/js/conversions/into_closure.rs b/...bridge-js/src/conversions/into_closure.rs → ...bridge/src/js/conversions/into_closure.rs
diff --git a/crates/wasm-bridge-js/src/conversions/mod.rs → crates/wasm-bridge/src/js/conversions/mod.rs b/crates/wasm-bridge-js/src/conversions/mod.rs → crates/wasm-bridge/src/js/conversions/mod.rs
diff --git a/...-bridge-js/src/conversions/to_js_value.rs → ...-bridge/src/js/conversions/to_js_value.rs b/...-bridge-js/src/conversions/to_js_value.rs → ...-bridge/src/js/conversions/to_js_value.rs
diff --git a/crates/wasm-bridge-js/src/direct/lift.rs → crates/wasm-bridge/src/js/direct/lift.rs b/crates/wasm-bridge-js/src/direct/lift.rs → crates/wasm-bridge/src/js/direct/lift.rs
diff --git a/...s/wasm-bridge-js/src/direct/lift_impls.rs → ...s/wasm-bridge/src/js/direct/lift_impls.rs b/...s/wasm-bridge-js/src/direct/lift_impls.rs → ...s/wasm-bridge/src/js/direct/lift_impls.rs
@@ -1,6 +1,6 @@
 use crate::component::ResourceAny;
 use crate::Result;
-use crate::{component::Resource, conversions::FromJsValue};
+use crate::{component::Resource, FromJsValue};
 use anyhow::{bail, Context};
 use wasm_bindgen::JsValue;
 

diff --git a/crates/wasm-bridge-js/src/direct/lower.rs → crates/wasm-bridge/src/js/direct/lower.rs b/crates/wasm-bridge-js/src/direct/lower.rs → crates/wasm-bridge/src/js/direct/lower.rs
diff --git a/.../wasm-bridge-js/src/direct/lower_impls.rs → .../wasm-bridge/src/js/direct/lower_impls.rs b/.../wasm-bridge-js/src/direct/lower_impls.rs → .../wasm-bridge/src/js/direct/lower_impls.rs
@@ -1,7 +1,7 @@
 use super::*;
 use crate::component::{Resource, ResourceAny};
-use crate::conversions::ToJsValue;
 use crate::Result;
+use crate::ToJsValue;
 use wasm_bindgen::JsValue;
 
 macro_rules! lower_primitive {

diff --git a/crates/wasm-bridge-js/src/direct/memory.rs → crates/wasm-bridge/src/js/direct/memory.rs b/crates/wasm-bridge-js/src/direct/memory.rs → crates/wasm-bridge/src/js/direct/memory.rs
diff --git a/crates/wasm-bridge-js/src/direct/mod.rs → crates/wasm-bridge/src/js/direct/mod.rs b/crates/wasm-bridge-js/src/direct/mod.rs → crates/wasm-bridge/src/js/direct/mod.rs
diff --git a/...-bridge-js/src/direct/size_description.rs → ...-bridge/src/js/direct/size_description.rs b/...-bridge-js/src/direct/size_description.rs → ...-bridge/src/js/direct/size_description.rs
diff --git a/crates/wasm-bridge-js/src/engine.rs → crates/wasm-bridge/src/js/engine.rs b/crates/wasm-bridge-js/src/engine.rs → crates/wasm-bridge/src/js/engine.rs
diff --git a/crates/wasm-bridge-js/src/helpers.rs → crates/wasm-bridge/src/js/helpers.rs b/crates/wasm-bridge-js/src/helpers.rs → crates/wasm-bridge/src/js/helpers.rs
diff --git a/crates/wasm-bridge-js/src/lib.rs → crates/wasm-bridge/src/js/mod.rs b/crates/wasm-bridge-js/src/lib.rs → crates/wasm-bridge/src/js/mod.rs
diff --git a/crates/wasm-bridge-js/src/no_bindgen/func.rs → crates/wasm-bridge/src/js/no_bindgen/func.rs b/crates/wasm-bridge-js/src/no_bindgen/func.rs → crates/wasm-bridge/src/js/no_bindgen/func.rs
diff --git a/...wasm-bridge-js/src/no_bindgen/instance.rs → ...wasm-bridge/src/js/no_bindgen/instance.rs b/...wasm-bridge-js/src/no_bindgen/instance.rs → ...wasm-bridge/src/js/no_bindgen/instance.rs
diff --git a/...s/wasm-bridge-js/src/no_bindgen/linker.rs → ...s/wasm-bridge/src/js/no_bindgen/linker.rs b/...s/wasm-bridge-js/src/no_bindgen/linker.rs → ...s/wasm-bridge/src/js/no_bindgen/linker.rs
diff --git a/...s/wasm-bridge-js/src/no_bindgen/memory.rs → ...s/wasm-bridge/src/js/no_bindgen/memory.rs b/...s/wasm-bridge-js/src/no_bindgen/memory.rs → ...s/wasm-bridge/src/js/no_bindgen/memory.rs
diff --git a/crates/wasm-bridge-js/src/no_bindgen/mod.rs → crates/wasm-bridge/src/js/no_bindgen/mod.rs b/crates/wasm-bridge-js/src/no_bindgen/mod.rs → crates/wasm-bridge/src/js/no_bindgen/mod.rs
diff --git a/...s/wasm-bridge-js/src/no_bindgen/module.rs → ...s/wasm-bridge/src/js/no_bindgen/module.rs b/...s/wasm-bridge-js/src/no_bindgen/module.rs → ...s/wasm-bridge/src/js/no_bindgen/module.rs
diff --git a/...sm-bridge-js/src/no_bindgen/typed_func.rs → ...sm-bridge/src/js/no_bindgen/typed_func.rs b/...sm-bridge-js/src/no_bindgen/typed_func.rs → ...sm-bridge/src/js/no_bindgen/typed_func.rs
diff --git a/...es/wasm-bridge-js/src/no_bindgen/types.rs → ...es/wasm-bridge/src/js/no_bindgen/types.rs b/...es/wasm-bridge-js/src/no_bindgen/types.rs → ...es/wasm-bridge/src/js/no_bindgen/types.rs
diff --git a/crates/wasm-bridge-js/src/no_bindgen/val.rs → crates/wasm-bridge/src/js/no_bindgen/val.rs b/crates/wasm-bridge-js/src/no_bindgen/val.rs → crates/wasm-bridge/src/js/no_bindgen/val.rs
diff --git a/crates/wasm-bridge-js/src/store.rs → crates/wasm-bridge/src/js/store.rs b/crates/wasm-bridge-js/src/store.rs → crates/wasm-bridge/src/js/store.rs
diff --git a/crates/wasm-bridge/src/lib.rs b/crates/wasm-bridge/src/lib.rs
@@ -5,4 +5,7 @@ mod sys;
 pub use sys::*;
 
 #[cfg(target_arch = "wasm32")]
-pub use wasm_bridge_js::*;
+mod js;
+
+#[cfg(target_arch = "wasm32")]
+pub use js::*;
diff --git a/release.sh b/release.sh
@@ -39,7 +39,6 @@ echo
 
 echo Releasing crates
 cargo publish -p wasm-bridge-macros
-cargo publish -p wasm-bridge-js
 cargo publish -p wasm-bridge
 cargo publish -p wasm-bridge-wasi
 echo