mobx-keystone-yjs 1.5.3 → 1.5.5

package/src/binding/convertYjsDataToJson.ts

@@ -1,11 +1,12 @@
+import { action } from "mobx"
 import { modelSnapshotOutWithMetadata } from "mobx-keystone"
 import * as Y from "yjs"
 import { PlainObject, PlainValue } from "../plainTypes"
 import { YjsTextModel } from "./YjsTextModel"
 
-export type YjsData = Y.Array<YjsData> | Y.Map<YjsData> | Y.Text | PlainValue
+export type YjsData = Y.Array<any> | Y.Map<any> | Y.Text | PlainValue
 
-export function convertYjsDataToJson(yjsData: YjsData): PlainValue {
+export const convertYjsDataToJson = action((yjsData: YjsData): PlainValue => {
   if (yjsData instanceof Y.Array) {
     return yjsData.map((v) => convertYjsDataToJson(v))
   }
@@ -28,4 +29,4 @@ export function convertYjsDataToJson(yjsData: YjsData): PlainValue {
 
   // assume it's a primitive
   return yjsData
-}
+})

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
+}