mobx-keystone-yjs 1.5.4 → 1.5.5

package/src/binding/convertJsonToYjsData.ts

@@ -3,7 +3,6 @@ import { YjsTextModel, yjsTextModelId } from "./YjsTextModel"
 import { SnapshotOutOf } from "mobx-keystone"
 import { YjsData } from "./convertYjsDataToJson"
 import { PlainArray, PlainObject, PlainPrimitive, PlainValue } from "../plainTypes"
-import { action, runInAction } from "mobx"
 
 function isPlainPrimitive(v: PlainValue): v is PlainPrimitive {
   const t = typeof v
@@ -24,53 +23,51 @@ function isPlainObject(v: PlainValue): v is PlainObject {
  * Frozen values are a special case and they are kept as immutable plain values.
  */
 export function convertJsonToYjsData(v: PlainValue): YjsData {
-  return runInAction(() => {
-    if (isPlainPrimitive(v)) {
+  if (isPlainPrimitive(v)) {
+    return v
+  }
+
+  if (isPlainArray(v)) {
+    const arr = new Y.Array()
+    applyJsonArrayToYArray(arr, v)
+    return arr
+  }
+
+  if (isPlainObject(v)) {
+    if (v.$frozen === true) {
+      // frozen value, save as immutable object
       return v
     }
 
-    if (isPlainArray(v)) {
-      const arr = new Y.Array()
-      applyJsonArrayToYArray(arr, v)
-      return arr
+    if (v.$modelType === yjsTextModelId) {
+      const text = new Y.Text()
+      const yjsTextModel = v as unknown as SnapshotOutOf<YjsTextModel>
+      yjsTextModel.deltaList.forEach((frozenDeltas) => {
+        text.applyDelta(frozenDeltas.data)
+      })
+      return text
     }
 
-    if (isPlainObject(v)) {
-      if (v.$frozen === true) {
-        // frozen value, save as immutable object
-        return v
-      }
-
-      if (v.$modelType === yjsTextModelId) {
-        const text = new Y.Text()
-        const yjsTextModel = v as unknown as SnapshotOutOf<YjsTextModel>
-        yjsTextModel.deltaList.forEach((frozenDeltas) => {
-          text.applyDelta(frozenDeltas.data)
-        })
-        return text
-      }
-
-      const map = new Y.Map()
-      applyJsonObjectToYMap(map, v)
-      return map
-    }
+    const map = new Y.Map()
+    applyJsonObjectToYMap(map, v)
+    return map
+  }
 
-    throw new Error(`unsupported value type: ${v}`)
-  })
+  throw new Error(`unsupported value type: ${v}`)
 }
 
 /**
  * Applies a JSON array to a Y.Array, using the convertJsonToYjsData to convert the values.
  */
-export const applyJsonArrayToYArray = action((dest: Y.Array<any>, source: PlainArray) => {
+export const applyJsonArrayToYArray = (dest: Y.Array<any>, source: PlainArray) => {
   dest.push(source.map(convertJsonToYjsData))
-})
+}
 
 /**
  * Applies a JSON object to a Y.Map, using the convertJsonToYjsData to convert the values.
  */
-export const applyJsonObjectToYMap = action((dest: Y.Map<any>, source: PlainObject) => {
+export const applyJsonObjectToYMap = (dest: Y.Map<any>, source: PlainObject) => {
   Object.entries(source).forEach(([k, v]) => {
     dest.set(k, convertJsonToYjsData(v))
   })
-})
+}

package/src/binding/convertYjsDataToJson.ts

@@ -1,8 +1,8 @@
+import { action } from "mobx"
 import { modelSnapshotOutWithMetadata } from "mobx-keystone"
 import * as Y from "yjs"
 import { PlainObject, PlainValue } from "../plainTypes"
 import { YjsTextModel } from "./YjsTextModel"
-import { action } from "mobx"
 
 export type YjsData = Y.Array<any> | Y.Map<any> | Y.Text | PlainValue
 

package/src/binding/convertYjsEventToPatches.ts

@@ -1,7 +1,7 @@
 import { Patch } from "mobx-keystone"
 import * as Y from "yjs"
-import { PlainArray, PlainObject, PlainValue } from "../plainTypes"
 import { failure } from "../utils/error"
+import { convertYjsDataToJson } from "./convertYjsDataToJson"
 
 export function convertYjsEventToPatches(event: Y.YEvent<any>): Patch[] {
   const patches: Patch[] = []
@@ -17,7 +17,7 @@ export function convertYjsEventToPatches(event: Y.YEvent<any>): Patch[] {
           patches.push({
             op: "add",
             path,
-            value: toPlainValue(source.get(key)),
+            value: convertYjsDataToJson(source.get(key)),
           })
           break
 
@@ -25,7 +25,7 @@ export function convertYjsEventToPatches(event: Y.YEvent<any>): Patch[] {
           patches.push({
             op: "replace",
             path,
-            value: toPlainValue(source.get(key)),
+            value: convertYjsDataToJson(source.get(key)),
           })
           break
 
@@ -65,7 +65,7 @@ export function convertYjsEventToPatches(event: Y.YEvent<any>): Patch[] {
           patches.push({
             op: "add",
             path,
-            value: toPlainValue(v),
+            value: convertYjsDataToJson(v),
           })
           retain++
         })
@@ -82,11 +82,3 @@ export function convertYjsEventToPatches(event: Y.YEvent<any>): Patch[] {
 
   return patches
 }
-
-function toPlainValue(v: Y.Map<any> | Y.Array<any> | PlainValue) {
-  if (v instanceof Y.Map || v instanceof Y.Array) {
-    return v.toJSON() as PlainObject | PlainArray
-  } else {
-    return v
-  }
-}

package/src/index.ts

@@ -1,10 +1,10 @@
-export { YjsTextModel, yjsTextModelId } from "./binding/YjsTextModel"
 export { bindYjsToMobxKeystone } from "./binding/bindYjsToMobxKeystone"
 export {
   applyJsonArrayToYArray,
   applyJsonObjectToYMap,
   convertJsonToYjsData,
 } from "./binding/convertJsonToYjsData"
-export { yjsBindingContext } from "./binding/yjsBindingContext"
+export { YjsTextModel, yjsTextModelId } from "./binding/YjsTextModel"
 export type { YjsBindingContext } from "./binding/yjsBindingContext"
+export { yjsBindingContext } from "./binding/yjsBindingContext"
 export { MobxKeystoneYjsError } from "./utils/error"

package/src/utils/isYjsValueDeleted.ts

@@ -0,0 +1,14 @@
+import * as Y from "yjs"
+
+/**
+ * Checks if a Y.js value has been deleted or its document destroyed.
+ *
+ * @param yjsValue The Y.js value to check.
+ * @returns `true` if the value is deleted or destroyed, `false` otherwise.
+ */
+export function isYjsValueDeleted(yjsValue: unknown): boolean {
+  if (yjsValue instanceof Y.AbstractType) {
+    return !!(yjsValue as any)._item?.deleted || !!yjsValue.doc?.isDestroyed
+  }
+  return false
+}