Working YArray on ywasm

y-crdt · Horusiath · Mar 9, 2024 · Feb 11, 2024 · Feb 15, 2024 · Feb 16, 2024
commit 73d2626d441bd98391783492e342c6302602c008
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/yrs/src/lib.rs b/yrs/src/lib.rs
@@ -493,7 +493,7 @@
 mod alt;
 pub mod block;
 mod block_store;
-mod doc;
+pub mod doc;
 mod event;
 mod id_set;
 mod store;

diff --git a/yrs/src/transaction.rs b/yrs/src/transaction.rs
@@ -1048,6 +1048,12 @@ impl<'a> From<&'a str> for Origin {
     }
 }
 
+impl From<String> for Origin {
+    fn from(v: String) -> Self {
+        Origin(SmallVec::from(Vec::from(v)))
+    }
+}
+
 impl std::fmt::Debug for Origin {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         std::fmt::Display::fmt(self, f)

diff --git a/yrs/src/types/mod.rs b/yrs/src/types/mod.rs
@@ -24,6 +24,7 @@ use crate::types::weak::{LinkSource, WeakEvent, WeakRef};
 use crate::types::xml::{XmlElementRef, XmlEvent, XmlTextEvent, XmlTextRef};
 use crate::updates::decoder::{Decode, Decoder};
 use crate::updates::encoder::{Encode, Encoder};
+use serde::{Serialize, Serializer};
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::convert::{TryFrom, TryInto};
 use std::fmt::Formatter;
@@ -687,6 +688,18 @@ pub enum PathSegment {
     Index(u32),
 }
 
+impl Serialize for PathSegment {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            PathSegment::Key(key) => serializer.serialize_str(&*key),
+            PathSegment::Index(i) => serializer.serialize_u32(*i),
+        }
+    }
+}
+
 pub(crate) struct ChangeSet<D> {
     added: HashSet<ID>,
     deleted: HashSet<ID>,

diff --git a/ywasm/Cargo.toml b/ywasm/Cargo.toml
@@ -19,6 +19,8 @@ default = ["console_error_panic_hook"]
 [dependencies]
 yrs = { path = "../yrs", version = "0.17.3", features = ["weak"] }
 wasm-bindgen = { version = "0.2" }
+serde = { version = "1.0", features = ["derive"] }
+gloo-utils = { version = "0.2.0", features = ["serde"] }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires