fix: detached loro text issues (#665)

* fix: detached loro text issues

resolve lorotext.toDelta must be attached? #661

* chore: changeset and update test

* chore: fix warnings

.changeset/twenty-rockets-fetch.md

@@ -0,0 +1,5 @@
+---
+"loro-crdt": patch
+---
+
+fix: detached loro text issues #665

crates/loro-internal/src/container/richtext/richtext_state.rs

@@ -63,8 +63,6 @@ impl Display for RichtextState {
 use cache::CachedCursor;
 
 mod cache {
-    use tracing::trace;
-
     use super::*;
 
     #[derive(Clone, Debug)]
@@ -143,7 +141,6 @@ mod cache {
 
                         let cached_index = match c.index.entry(pos_type) {
                             std::collections::hash_map::Entry::Vacant(vacant_entry) => {
-                                trace!("new cache");
                                 let index = self.get_index_from_cursor(
                                     Cursor {
                                         leaf: c.leaf,
@@ -164,7 +161,6 @@ mod cache {
                         }
 
                         if cached_index == index {
-                            trace!("eq");
                             break 'block Some(Cursor {
                                 leaf: c.leaf,
                                 offset: 0,
@@ -175,14 +171,6 @@ mod cache {
                         let elem_len = elem.len_with(pos_type);
                         if cached_index + elem_len == index {
                             let offset = elem.len_with(PosType::Entity);
-                            trace!(
-                                "end cached_index={} index={} elem.len_with(pos_type) = {} offset={}",
-                                cached_index,
-                                index,
-                                elem_len,
-                                offset
-                            );
-
                             break 'block Some(Cursor {
                                 leaf: c.leaf,
                                 offset,
@@ -195,11 +183,6 @@ mod cache {
 
                         let offset =
                             pos_type_offset_to_entity_offset(pos_type, elem, index - cached_index)?;
-                        trace!(
-                            "offset convert from {} to {:?}",
-                            index - cached_index,
-                            offset
-                        );
                         Some(Cursor {
                             leaf: c.leaf,
                             offset,
@@ -214,7 +197,6 @@ mod cache {
             {
                 if let Some(c) = ans.as_ref() {
                     let actual = self.get_index_from_cursor(*c, pos_type);
-                    trace!("actual={} index={}", actual.unwrap(), index);
                     assert_eq!(actual.unwrap(), index);
                 }
             }
@@ -2570,7 +2552,6 @@ fn entity_offset_to_pos_type_offset(
     }
 }
 
-#[tracing::instrument(level = "trace")]
 fn pos_type_offset_to_entity_offset(
     pos_type: PosType,
     elem: &RichtextStateChunk,

crates/loro-internal/src/handler.rs

@@ -1340,13 +1340,11 @@ impl TextHandler {
     /// Get the version id of the richtext
     ///
     /// This can be used to detect whether the richtext is changed
-    pub fn version_id(&self) -> usize {
+    pub fn version_id(&self) -> Option<usize> {
         match &self.inner {
-            MaybeDetached::Detached(_) => {
-                unimplemented!("Detached text container does not have version id")
-            }
+            MaybeDetached::Detached(_) => None,
             MaybeDetached::Attached(a) => {
-                a.with_state(|state| state.as_richtext_state_mut().unwrap().get_version_id())
+                Some(a.with_state(|state| state.as_richtext_state_mut().unwrap().get_version_id()))
             }
         }
     }
@@ -1928,8 +1926,8 @@ impl TextHandler {
     ) -> LoroResult<()> {
         match &self.inner {
             MaybeDetached::Detached(t) => {
-                let mut v = t.try_lock().unwrap().value.clone();
-                self.mark_for_detached(&mut v, key, &value, start, end, false)
+                let mut g = t.try_lock().unwrap();
+                self.mark_for_detached(&mut g.value, key, &value, start, end, false)
             }
             MaybeDetached::Attached(a) => {
                 a.with_txn(|txn| self.mark_with_txn(txn, start, end, key, value, false))
@@ -1947,7 +1945,7 @@ impl TextHandler {
         is_delete: bool,
     ) -> Result<(), LoroError> {
         let key: InternalString = key.into();
-        let len = self.len_event();
+        let len = state.len_event();
         if start >= end {
             return Err(loro_common::LoroError::ArgErr(
                 "Start must be less than end".to_string().into_boxed_str(),

crates/loro-wasm/src/lib.rs

@@ -2507,16 +2507,20 @@ impl LoroText {
     #[wasm_bindgen(js_name = "toDelta")]
     pub fn to_delta(&mut self) -> JsStringDelta {
         let version = self.handler.version_id();
-        if let Some((v, delta)) = self.delta_cache.as_ref() {
-            if *v == version {
-                return delta.clone().into();
+        if let Some(v) = version {
+            if let Some((vv, delta)) = self.delta_cache.as_ref() {
+                if v == *vv {
+                    return delta.clone().into();
+                }
             }
         }
 
         let delta = self.handler.get_richtext_value();
         let value: JsValue = delta.into();
         let ans: JsStringDelta = value.clone().into();
-        self.delta_cache = Some((version, value));
+        if let Some(v) = version {
+            self.delta_cache = Some((v, value));
+        }
         ans
     }
 

crates/loro-wasm/tests/__snapshots__/basic.test.ts.snap

@@ -1,5 +1,16 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
+exports[`call toDelta on detached text 1`] = `
+[
+  {
+    "attributes": {
+      "bold": true,
+    },
+    "insert": "Hello",
+  },
+]
+`;
+
 exports[`can diff two versions 1`] = `
 [
   [

crates/loro-wasm/tests/basic.test.ts

@@ -1532,3 +1532,11 @@ it("text mark on LoroText", () => {
   text.insert(0, "Hello");
   text.mark({ start: 0, end: 5 }, "bold", true);
 })
+
+it("call toDelta on detached text", () => {
+  const text = new LoroText();
+  text.insert(0, "Hello");
+  text.mark({ start: 0, end: 5 }, "bold", true);
+  const d = text.toDelta();
+  expect(d).toMatchSnapshot();
+})

crates/loro/tests/loro_rust_test.rs

@@ -20,7 +20,7 @@ use loro::{
     LoroText, LoroValue, ToJson, TreeParentId,
 };
 use loro_internal::{
-    encoding::EncodedBlobMode, handler::TextDelta, id::ID, version_range, vv, LoroResult,
+    encoding::EncodedBlobMode, fx_map, handler::TextDelta, id::ID, version_range, vv, LoroResult,
 };
 use rand::{Rng, SeedableRng};
 use serde_json::json;
@@ -3260,3 +3260,18 @@ fn test_iter_change_on_edge() {
     doc.fork_at(&Frontiers::from_id(ID::new(1, 10)));
     doc.fork_at(&Frontiers::from_id(ID::new(1, 11)));
 }
+
+#[test]
+fn test_to_delta_on_detached_text() {
+    let text = LoroText::new();
+    text.insert(0, "Hello").unwrap();
+    text.mark(0..5, "bold", true).unwrap();
+    let delta = text.to_delta();
+    assert_eq!(
+        delta,
+        vec![TextDelta::Insert {
+            insert: "Hello".to_string(),
+            attributes: Some(fx_map! { "bold".into() => LoroValue::Bool(true) }),
+        }]
+    );
+}