chore(deps): bump wasm-bindgen from 0.2.93 to 0.2.100

.github/workflows/include/rust-wasm-setup/action.yml

@@ -1,7 +1,7 @@
 name: Rust + WASM common deps
 
 runs:
-  using: "composite"
+  using: 'composite'
   steps:
     - name: Set default toolchain
       shell: bash
@@ -15,7 +15,7 @@ runs:
 
     - name: Install wasm-bindgen
       shell: bash
-      run: cargo binstall -y wasm-bindgen-cli@0.2.93
+      run: cargo binstall -y wasm-bindgen-cli@0.2.100
 
     - name: Install Binaryen (includes wasm-opt)
       uses: jaxxstorm/action-install-gh-release@v1.14.0

Cargo.toml

@@ -122,7 +122,7 @@ serde_json = { version = "1", features = [
     "raw_value",
 ] }
 serde_repr = "0.1"
-serde-wasm-bindgen = "0.5"
+serde-wasm-bindgen = "0.6"
 strip-ansi-escapes = "0.1"
 structopt = "0.3"
 sqlformat = "0.2"
@@ -141,16 +141,14 @@ tracing-core = "0.1"
 tracing-error = "0.2"
 tracing-subscriber = "0.3"
 tracing-futures = "0.2"
-tsify = "0.4"
+tsify-next = { version = "0.5", default-features = false, features = ["js"] }
 thiserror = "1"
 url = "2"
 ulid = "1"
 uuid = { version = "1", features = ["v4", "v7", "js"] }
 versions = "6"
 
-# version for `wasm-bindgen@0.2.93`, see:
-# https://github.com/rustwasm/wasm-bindgen/pull/4072/
-js-sys = "=0.3.70"
+js-sys = "0.3"
 wasm-bindgen = "0.2"
 wasm-bindgen-futures = "0.4"
 wasm-logger = "0.2"

libs/driver-adapters/Cargo.toml

@@ -41,4 +41,4 @@ js-sys.workspace = true
 serde-wasm-bindgen.workspace = true
 wasm-bindgen.workspace = true
 wasm-bindgen-futures.workspace = true
-tsify.workspace = true
+tsify-next.workspace = true

libs/driver-adapters/src/lib.rs

@@ -71,7 +71,7 @@ pub(crate) use wasm::*;
 mod arch {
     pub(crate) use js_sys::JsString;
     use std::str::FromStr;
-    use tsify::Tsify;
+    use tsify_next::Tsify;
 
     pub(crate) fn get_named_property<T>(object: &super::wasm::JsObjectExtern, name: &str) -> JsResult<T>
     where

libs/driver-adapters/src/types.rs

@@ -8,7 +8,7 @@ use napi::bindgen_prelude::{FromNapiValue, ToNapiValue};
 
 use quaint::connector::{ColumnType as QuaintColumnType, ExternalConnectionInfo, SqlFamily};
 #[cfg(target_arch = "wasm32")]
-use tsify::Tsify;
+use tsify_next::Tsify;
 
 use crate::conversion::{JSArg, JSArgType};
 use serde::{Deserialize, Serialize};

libs/driver-adapters/src/wasm/from_js.rs

@@ -10,6 +10,7 @@ where
     T: DeserializeOwned,
 {
     fn from_js_value(value: JsValue) -> Result<Self, JsValue> {
+        let value = if value.is_undefined() { JsValue::null() } else { value };
         serde_wasm_bindgen::from_value(value).map_err(JsValue::from)
     }
 }

libs/query-engine-common/Cargo.toml

@@ -28,4 +28,4 @@ napi.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen.workspace = true
-tsify.workspace = true
+tsify-next.workspace = true

libs/query-engine-common/src/engine.rs

@@ -11,7 +11,7 @@ use std::{
 };
 
 #[cfg(target_arch = "wasm32")]
-use tsify::Tsify;
+use tsify_next::Tsify;
 
 /// The state of the engine.
 pub enum Inner {

query-compiler/query-compiler-wasm/Cargo.toml

@@ -19,7 +19,7 @@ tracing.workspace = true
 js-sys.workspace = true
 serde.workspace = true
 serde_json.workspace = true
-tsify.workspace = true
+tsify-next.workspace = true
 wasm-bindgen.workspace = true
 wasm-rs-dbg.workspace = true
 query-core.workspace = true

query-compiler/query-compiler-wasm/src/compiler.rs

@@ -4,7 +4,7 @@ use query_core::protocol::EngineProtocol;
 use request_handlers::RequestBody;
 use serde::Deserialize;
 use std::sync::Arc;
-use tsify::Tsify;
+use tsify_next::Tsify;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 use crate::params::{AdapterProvider, JsConnectionInfo};

query-engine/query-engine-wasm/Cargo.toml

@@ -53,7 +53,7 @@ connection-string.workspace = true
 js-sys.workspace = true
 serde-wasm-bindgen.workspace = true
 serde_json.workspace = true
-tsify.workspace = true
+tsify-next.workspace = true
 wasm-bindgen.workspace = true
 wasm-bindgen-futures.workspace = true
 wasm-rs-dbg.workspace = true

query-engine/query-engine-wasm/src/wasm/functions.rs

@@ -2,7 +2,7 @@
 #![allow(clippy::empty_docs)]
 
 use serde::Serialize;
-use tsify::Tsify;
+use tsify_next::Tsify;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 #[derive(Serialize, Tsify)]

schema-engine/core-wasm/Cargo.toml

@@ -21,4 +21,4 @@ url.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
 wasm-bindgen.workspace = true
-tsify.workspace = true
+tsify-next.workspace = true

schema-engine/schema-engine-wasm/Cargo.toml

@@ -23,7 +23,7 @@ tracing.workspace = true
 
 js-sys.workspace = true
 serde.workspace = true
-tsify.workspace = true
+tsify-next.workspace = true
 wasm-bindgen.workspace = true
 wasm-bindgen-futures.workspace = true
 wasm-rs-dbg.workspace = true

schema-engine/schema-engine-wasm/src/wasm/engine.rs

@@ -6,7 +6,7 @@ use psl::{ConnectorRegistry, ValidatedSchema};
 use quaint::connector::ExternalConnector;
 use serde::Deserialize;
 use std::sync::Arc;
-use tsify::Tsify;
+use tsify_next::Tsify;
 use wasm_bindgen::prelude::wasm_bindgen;
 
 const CONNECTOR_REGISTRY: ConnectorRegistry<'_> = &[

shell.nix

@@ -17,7 +17,7 @@ pkgs.mkShell {
     pnpm_9
     rustup
     wabt
-    wasm-bindgen-cli_0_2_93
+    wasm-bindgen-cli_0_2_100
     wasm-pack
   ];