Migrate back to tsify

Author: dani-garcia

Cargo.lock

@@ -55,7 +55,7 @@ serde_qs = ">=0.12.0, <0.16"
 serde_repr = ">=0.1.12, <0.2"
 thiserror = ">=1.0.40, <3"
 tokio = { version = "1.36.0", features = ["macros"] }
-tsify-next = { version = ">=0.5.4, <0.6", features = [
+tsify = { version = ">=0.5.5, <0.6", features = [
     "js",
 ], default-features = false }
 uniffi = "=0.28.3"

Cargo.toml

@@ -24,7 +24,7 @@ uniffi = ["bitwarden-crypto/uniffi", "dep:uniffi"] # Uniffi bindings
 wasm = [
     "bitwarden-error/wasm",
     "dep:wasm-bindgen",
-    "dep:tsify-next"
+    "dep:tsify"
 ] # WASM support
 
 [dependencies]
@@ -45,7 +45,7 @@ serde_json = { workspace = true }
 serde_qs = { workspace = true }
 serde_repr = { workspace = true }
 thiserror = { workspace = true }
-tsify-next = { workspace = true, optional = true }
+tsify = { workspace = true, optional = true }
 uniffi = { workspace = true, optional = true, features = ["tokio"] }
 uuid = { workspace = true }
 wasm-bindgen = { workspace = true, optional = true }

crates/bitwarden-core/Cargo.toml

@@ -21,7 +21,7 @@ use serde::{Deserialize, Serialize};
 #[cfg_attr(feature = "uniffi", derive(uniffi::Record))]
 #[cfg_attr(
     feature = "wasm",
-    derive(tsify_next::Tsify),
+    derive(tsify::Tsify),
     tsify(into_wasm_abi, from_wasm_abi)
 )]
 pub struct ClientSettings {
@@ -51,7 +51,7 @@ impl Default for ClientSettings {
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 #[cfg_attr(
     feature = "wasm",
-    derive(tsify_next::Tsify),
+    derive(tsify::Tsify),
     tsify(into_wasm_abi, from_wasm_abi)
 )]
 pub enum DeviceType {

crates/bitwarden-core/src/client/client_settings.rs

@@ -13,7 +13,7 @@ use bitwarden_crypto::{
 };
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]
-use {tsify_next::Tsify, wasm_bindgen::prelude::*};
+use {tsify::Tsify, wasm_bindgen::prelude::*};
 
 use crate::{
     client::{encryption_settings::EncryptionSettingsError, LoginMethod, UserLoginMethod},

crates/bitwarden-core/src/mobile/crypto.rs

@@ -16,7 +16,7 @@ keywords.workspace = true
 
 [features]
 default = []
-wasm = ["dep:tsify-next", "dep:wasm-bindgen"] # WASM support
+wasm = ["dep:tsify", "dep:wasm-bindgen"] # WASM support
 
 uniffi = ["dep:uniffi"]  # Uniffi bindings
 no-memory-hardening = [] # Disable memory hardening features
@@ -49,7 +49,7 @@ sha1 = ">=0.10.5, <0.11"
 sha2 = ">=0.10.6, <0.11"
 subtle = ">=2.5.0, <3.0"
 thiserror = { workspace = true }
-tsify-next = { workspace = true, optional = true }
+tsify = { workspace = true, optional = true }
 typenum = ">=1.18.0, <1.19.0"
 uniffi = { workspace = true, optional = true }
 uuid = { workspace = true }

crates/bitwarden-crypto/Cargo.toml

@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use sha2::Digest;
 #[cfg(feature = "wasm")]
-use tsify_next::Tsify;
+use tsify::Tsify;
 use typenum::U32;
 use zeroize::Zeroize;
 

crates/bitwarden-crypto/src/keys/kdf.rs

@@ -34,5 +34,5 @@ bitwarden-error = { workspace = true, features = ["wasm"] }
 js-sys.workspace = true
 serde.workspace = true
 thiserror.workspace = true
-tsify-next.workspace = true
+tsify.workspace = true
 wasm-bindgen.workspace = true

crates/bitwarden-error-macro/Cargo.toml

@@ -14,7 +14,7 @@ pub(crate) fn bitwarden_error_full(
 
     let wasm_attributes = cfg!(feature = "wasm").then(|| {
         quote! {
-            #[derive(bitwarden_error::tsify_next::Tsify)]
+            #[derive(bitwarden_error::tsify::Tsify)]
             #[tsify(into_wasm_abi)]
         }
     });

crates/bitwarden-error-macro/src/full/attribute.rs

@@ -101,7 +101,7 @@ mod full;
 /// }
 /// ```
 ///
-/// will use tsify_next::Tsify to generate roughly the following TypeScript definition:
+/// will use tsify::Tsify to generate roughly the following TypeScript definition:
 ///
 /// ```typescript
 /// export type CryptoError =

crates/bitwarden-error-macro/src/lib.rs

@@ -18,14 +18,14 @@ keywords.workspace = true
 wasm = [
     "bitwarden-error-macro/wasm",
     "dep:js-sys",
-    "dep:tsify-next",
+    "dep:tsify",
     "dep:wasm-bindgen"
 ]
 
 [dependencies]
 bitwarden-error-macro = { workspace = true }
 js-sys = { workspace = true, optional = true }
-tsify-next = { workspace = true, optional = true }
+tsify = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 
 [lints]

crates/bitwarden-error/Cargo.toml

@@ -9,10 +9,10 @@ pub mod wasm;
 #[cfg(feature = "wasm")]
 #[doc(hidden)]
 pub use ::js_sys;
-/// Re-export the `tsify_next` crate since the proc macro depends on it.
+/// Re-export the `tsify` crate since the proc macro depends on it.
 #[cfg(feature = "wasm")]
 #[doc(hidden)]
-pub use ::tsify_next;
+pub use ::tsify;
 /// Re-export the `wasm_bindgen` crate since the proc macro depends on it.
 #[cfg(feature = "wasm")]
 #[doc(hidden)]

crates/bitwarden-error/src/lib.rs

@@ -17,7 +17,7 @@ keywords.workspace = true
 
 [features]
 uniffi = ["dep:uniffi", "bitwarden-core/uniffi"] # Uniffi bindings
-wasm = ["dep:tsify-next", "dep:wasm-bindgen"]    # WebAssembly bindings
+wasm = ["dep:tsify", "dep:wasm-bindgen"]    # WebAssembly bindings
 
 [dependencies]
 base64 = ">=0.22.1, <0.23"
@@ -33,7 +33,7 @@ num-traits = ">=0.2, <0.3"
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-tsify-next = { workspace = true, optional = true }
+tsify = { workspace = true, optional = true }
 uniffi = { workspace = true, optional = true }
 uuid = { workspace = true }
 wasm-bindgen = { workspace = true, optional = true }

crates/bitwarden-exporters/Cargo.toml

@@ -4,7 +4,7 @@ use credential_exchange_format::{
 };
 use uuid::Uuid;
 #[cfg(feature = "wasm")]
-use {tsify_next::Tsify, wasm_bindgen::prelude::*};
+use {tsify::Tsify, wasm_bindgen::prelude::*};
 
 use crate::{cxf::CxfError, Cipher, CipherType, Login};
 

crates/bitwarden-exporters/src/cxf/export.rs

@@ -26,7 +26,7 @@ pub use error::ExportError;
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 #[cfg_attr(
     feature = "wasm",
-    derive(serde::Serialize, serde::Deserialize, tsify_next::Tsify),
+    derive(serde::Serialize, serde::Deserialize, tsify::Tsify),
     tsify(into_wasm_abi, from_wasm_abi)
 )]
 pub enum ExportFormat {

crates/bitwarden-exporters/src/lib.rs

@@ -16,7 +16,7 @@ keywords.workspace = true
 
 [features]
 uniffi = ["dep:uniffi"] # Uniffi bindings
-wasm = ["dep:tsify-next", "dep:wasm-bindgen"]
+wasm = ["dep:tsify", "dep:wasm-bindgen"]
 
 [dependencies]
 bitwarden-core = { workspace = true, features = ["internal"] }
@@ -28,7 +28,7 @@ schemars = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
-tsify-next = { workspace = true, optional = true }
+tsify = { workspace = true, optional = true }
 uniffi = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 

crates/bitwarden-generators/Cargo.toml

@@ -5,7 +5,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 #[cfg(feature = "wasm")]
-use tsify_next::Tsify;
+use tsify::Tsify;
 
 use crate::util::capitalize_first_letter;
 

crates/bitwarden-generators/src/passphrase.rs

@@ -6,7 +6,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 #[cfg(feature = "wasm")]
-use tsify_next::Tsify;
+use tsify::Tsify;
 
 #[bitwarden_error(flat)]
 #[derive(Debug, Error)]

crates/bitwarden-generators/src/password.rs

@@ -6,7 +6,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 use thiserror::Error;
 #[cfg(feature = "wasm")]
-use tsify_next::Tsify;
+use tsify::Tsify;
 
 use crate::util::capitalize_first_letter;
 
@@ -41,7 +41,7 @@ pub enum AppendType {
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 #[cfg_attr(
     feature = "wasm",
-    derive(tsify_next::Tsify),
+    derive(tsify::Tsify),
     tsify(into_wasm_abi, from_wasm_abi)
 )]
 /// Configures the email forwarding service to use.
@@ -78,7 +78,7 @@ pub enum ForwarderServiceType {
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
 #[cfg_attr(
     feature = "wasm",
-    derive(tsify_next::Tsify),
+    derive(tsify::Tsify),
     tsify(into_wasm_abi, from_wasm_abi)
 )]
 pub enum UsernameGeneratorRequest {

crates/bitwarden-generators/src/username.rs

@@ -11,7 +11,7 @@ keywords.workspace = true
 
 [features]
 wasm = [
-    "dep:tsify-next",
+    "dep:tsify",
     "dep:wasm-bindgen",
     "dep:wasm-bindgen-futures",
     "dep:js-sys",
@@ -25,7 +25,7 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 thiserror = { workspace = true }
 tokio = { features = ["sync", "time"], workspace = true }
-tsify-next = { workspace = true, optional = true }
+tsify = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 wasm-bindgen-futures = { workspace = true, optional = true }
 

crates/bitwarden-ipc/Cargo.toml

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 #[cfg(feature = "wasm")]
-use {tsify_next::Tsify, wasm_bindgen::prelude::*};
+use {tsify::Tsify, wasm_bindgen::prelude::*};
 
 #[derive(Serialize, Deserialize, Debug, Clone, Copy, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "wasm", derive(Tsify), tsify(into_wasm_abi, from_wasm_abi))]

crates/bitwarden-ipc/src/endpoint.rs

@@ -18,7 +18,7 @@ keywords.workspace = true
 [features]
 wasm = [
     "bitwarden-error/wasm",
-    "dep:tsify-next",
+    "dep:tsify",
     "dep:wasm-bindgen"
 ] # WASM support
 uniffi = ["dep:uniffi"] # Uniffi bindings
@@ -38,7 +38,7 @@ ssh-key = { version = ">=0.6.7, <0.7", features = [
     "rsa",
 ], default-features = false }
 thiserror = { workspace = true }
-tsify-next = { workspace = true, optional = true }
+tsify = { workspace = true, optional = true }
 uniffi = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }