Format WASM generator code to be in line with other clients

crates/bitwarden-generators/src/generator_client.rs

@@ -1,15 +1,19 @@
 use bitwarden_core::Client;
+#[cfg(feature = "wasm")]
+use wasm_bindgen::prelude::*;
 
 use crate::{
     passphrase::passphrase, password::password, username::username, PassphraseError,
     PassphraseGeneratorRequest, PasswordError, PasswordGeneratorRequest, UsernameError,
     UsernameGeneratorRequest,
 };
 
+#[cfg_attr(feature = "wasm", wasm_bindgen)]
 pub struct GeneratorClient {
     client: Client,
 }
 
+#[cfg_attr(feature = "wasm", wasm_bindgen)]
 impl GeneratorClient {
     fn new(client: Client) -> Self {
         Self { client }
@@ -68,7 +72,9 @@ impl GeneratorClient {
     pub fn passphrase(&self, input: PassphraseGeneratorRequest) -> Result<String, PassphraseError> {
         passphrase(input)
     }
+}
 
+impl GeneratorClient {
     /// Generates a random username.
     /// There are different username generation strategies, which can be customized using the
     /// `input` parameter.

crates/bitwarden-generators/src/username.rs

@@ -1,4 +1,5 @@
 use bitwarden_crypto::EFF_LONG_WORD_LIST;
+use bitwarden_error::bitwarden_error;
 use rand::{distributions::Distribution, seq::SliceRandom, Rng, RngCore};
 use reqwest::StatusCode;
 use schemars::JsonSchema;
@@ -7,6 +8,7 @@
 
 use crate::util::capitalize_first_letter;
 
+#[bitwarden_error(flat)]
 #[derive(Debug, Error)]
 pub enum UsernameError {
     #[error("Invalid API Key")]
@@ -66,6 +68,11 @@
 #[derive(Serialize, Deserialize, Debug, JsonSchema)]
 #[serde(rename_all = "camelCase", deny_unknown_fields)]
 #[cfg_attr(feature = "uniffi", derive(uniffi::Enum))]
+#[cfg_attr(
+    feature = "wasm",
+    derive(tsify_next::Tsify),
+    tsify(into_wasm_abi, from_wasm_abi)
+)]
 pub enum UsernameGeneratorRequest {
     /// Generates a single word username
     Word {

crates/bitwarden-wasm-internal/src/client.rs

@@ -4,10 +4,11 @@
 use bitwarden_core::{Client, ClientSettings};
 use bitwarden_error::bitwarden_error;
 use bitwarden_exporters::ExporterClientExt;
+use bitwarden_generators::GeneratorClientsExt;
 use bitwarden_vault::VaultClientExt;
 use wasm_bindgen::prelude::*;
 
-use crate::{CryptoClient, GeneratorClient, VaultClient};
+use crate::{CryptoClient, VaultClient};
 
 #[wasm_bindgen]
 pub struct BitwardenClient(pub(crate) Client);
@@ -49,8 +50,8 @@
     }
 
     /// Constructs a specific client for generating passwords and passphrases
-    pub fn generator(&self) -> GeneratorClient {
-        GeneratorClient::new(self.0.clone())
+    pub fn generator(&self) -> bitwarden_generators::GeneratorClient {
+        self.0.generator()
     }
 
     pub fn exporters(&self) -> bitwarden_exporters::ExporterClient {

crates/bitwarden-wasm-internal/src/lib.rs

@@ -3,7 +3,6 @@
 mod client;
 mod crypto;
 mod custom_types;
-mod generators;
 mod init;
 mod pure_crypto;
 mod ssh;
@@ -12,6 +11,5 @@ mod vault;
 pub use bitwarden_ipc::wasm::*;
 pub use client::BitwardenClient;
 pub use crypto::CryptoClient;
-pub use generators::GeneratorClient;
 pub use init::init_sdk;
 pub use vault::{folders::FoldersClient, VaultClient};