chore: use one error

Author: appflowy

Cargo.lock

@@ -76,45 +76,3 @@ default_to_workspace = false
 
 [env]
 CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
-
-[tasks.wasm_build]
-script_runner = "bash"
-script = [
-  """
-  #!/bin/bash
-  BASE_DIR=$(pwd)
-  crates=("collab")
-
-  # Iterate over each crate and build it
-  for crate in "${crates[@]}"; do
-    echo "🔥🔥🔥  Building $crate with wasm-pack..."
-
-    # Navigate to the crate directory
-    cd "$BASE_DIR/$crate" || { echo "Failed to enter directory $crate"; exit 1; }
-
-    # Build the crate
-    wasm-pack build || { echo "Build failed for $crate"; exit 1; }
-  done
-  """
-]
-
-[tasks.wasm_test]
-script_runner = "bash"
-script = [
-  """
-  #!/bin/bash
-  BASE_DIR=$(pwd)
-  crates=("collab")
-
-  # Iterate over each crate and build it
-  for crate in "${crates[@]}"; do
-    echo "🔥🔥🔥  Running $crate tests with wasm-pack..."
-
-    # Navigate to the crate directory
-    cd "$BASE_DIR/$crate" || { echo "Failed to enter directory $crate"; exit 1; }
-
-    # Build the crate
-    wasm-pack test --headless --firefox
-  done
-  """
-]

Makefile.toml

@@ -58,16 +58,7 @@ async-recursion = "1.1"
 sanitize-filename = "0.5.0"
 indexmap = { version = "2.3", features = ["serde"] }
 zip = "0.6.6"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-web-sys = { version = "0.3" }
-js-sys = "0.3"
-getrandom = { version = "0.2", features = ["js"] }
-indexed_db_futures = { version = "0.4" }
-async-stream = "0.3"
-wasm-bindgen = "0.2"
-wasm-bindgen-futures = "0.4"
-tracing-wasm = "0.2"
+rocksdb = { version = "0.22.0", default-features = false, features = ["zstd"], optional = true }
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros", "sync", "rt"] }
@@ -93,6 +84,3 @@ import_csv = []
 [build-dependencies]
 prost-build = "0.12"
 protoc-bin-vendored = "3.0.0"
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-rocksdb = { version = "0.22.0", default-features = false, features = ["zstd"], optional = true }

collab/Cargo.toml

@@ -1,24 +1,19 @@
+use crate::error::CollabError;
 use crate::util::ArrayExt;
 
 use yrs::types::TypeRef;
 use yrs::{Any, Array, ArrayPrelim, ArrayRef, Map, MapPrelim, MapRef, SharedRef, TransactionMut};
 
-#[derive(Debug, thiserror::Error)]
-pub enum FillError {
-  #[error("cannot fill {0} with: {0}")]
-  InvalidData(TypeRef, String),
-}
-
 /// Trait that allows to fill shared refs with data.
 pub trait FillRef<R>
 where
   R: SharedRef,
 {
-  fn fill(self, txn: &mut TransactionMut, shared_ref: &R) -> Result<(), FillError>;
+  fn fill(self, txn: &mut TransactionMut, shared_ref: &R) -> Result<(), CollabError>;
 }
 
 impl FillRef<MapRef> for Any {
-  fn fill(self, txn: &mut TransactionMut, shared_ref: &MapRef) -> Result<(), FillError> {
+  fn fill(self, txn: &mut TransactionMut, shared_ref: &MapRef) -> Result<(), CollabError> {
     match self {
       Any::Map(map) => {
         for (key, value) in map.iter() {
@@ -40,13 +35,13 @@ impl FillRef<MapRef> for Any {
         }
         Ok(())
       },
-      _ => Err(FillError::InvalidData(TypeRef::Map, self.to_string())),
+      _ => Err(CollabError::FillInvalidData(TypeRef::Map, self.to_string())),
     }
   }
 }
 
 impl FillRef<ArrayRef> for Any {
-  fn fill(self, txn: &mut TransactionMut, shared_ref: &ArrayRef) -> Result<(), FillError> {
+  fn fill(self, txn: &mut TransactionMut, shared_ref: &ArrayRef) -> Result<(), CollabError> {
     match self {
       Any::Array(array) => {
         shared_ref.clear(txn);
@@ -56,7 +51,10 @@ impl FillRef<ArrayRef> for Any {
         }
         Ok(())
       },
-      _ => Err(FillError::InvalidData(TypeRef::Array, self.to_string())),
+      _ => Err(CollabError::FillInvalidData(
+        TypeRef::Array,
+        self.to_string(),
+      )),
     }
   }
 }