@pluv/crdt-yjs 0.42.0 → 0.44.0

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @pluv/crdt-yjs@0.42.0 build /home/runner/work/pluv/pluv/packages/crdt-yjs
+> @pluv/crdt-yjs@0.44.0 build /home/runner/work/pluv/pluv/packages/crdt-yjs
 > tsup src/index.ts --format esm,cjs --dts
 
 CLI Building entry: src/index.ts
@@ -8,11 +8,11 @@
 CLI Target: es6
 ESM Build start
 CJS Build start
-CJS dist/index.js 11.76 KB
-CJS ⚡️ Build success in 114ms
-ESM dist/index.mjs 10.97 KB
-ESM ⚡️ Build success in 114ms
+ESM dist/index.mjs 11.15 KB
+ESM ⚡️ Build success in 105ms
+CJS dist/index.js 11.96 KB
+CJS ⚡️ Build success in 106ms
 DTS Build start
-DTS ⚡️ Build success in 2140ms
+DTS ⚡️ Build success in 2319ms
 DTS dist/index.d.mts 3.95 KB
 DTS dist/index.d.ts  3.95 KB

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @pluv/crdt-yjs
 
+## 0.44.0
+
+### Patch Changes
+
+- 503c23b: Updated `batchApplyEncodedState` to use `Yjs.mergeUpdates` to more efficiently update the document under-the-hood, while also producing a smaller document.
+  - @pluv/crdt@0.44.0
+  - @pluv/types@0.44.0
+
+## 0.43.0
+
+### Patch Changes
+
+- @pluv/crdt@0.43.0
+- @pluv/types@0.43.0
+
 ## 0.42.0
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { Array, Doc, Map, Text, XmlElement, XmlText, XmlFragment } from 'yjs';
-import { CrdtType, AbstractCrdtDoc, DocApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
+import { CrdtType, AbstractCrdtDoc, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
 
 type YjsType<TValue extends unknown, TJson extends unknown = any> = CrdtType<TValue, TJson> & {
     initialValue?: any;
@@ -14,7 +14,7 @@ declare class CrdtYjsDoc<TStorage extends Record<string, YjsType<any, any>>> ext
     private _undoManager;
     constructor(value?: TStorage);
     applyEncodedState(params: DocApplyEncodedStateParams): this;
-    batchApplyEncodedState(updates: readonly (DocApplyEncodedStateParams | string | null | undefined)[]): this;
+    batchApplyEncodedState(params: DocBatchApplyEncodedStateParams): this;
     canRedo(): boolean;
     canUndo(): boolean;
     destroy(): void;

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { Array, Doc, Map, Text, XmlElement, XmlText, XmlFragment } from 'yjs';
-import { CrdtType, AbstractCrdtDoc, DocApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
+import { CrdtType, AbstractCrdtDoc, DocApplyEncodedStateParams, DocBatchApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson, AbstractCrdtDocFactory } from '@pluv/crdt';
 
 type YjsType<TValue extends unknown, TJson extends unknown = any> = CrdtType<TValue, TJson> & {
     initialValue?: any;
@@ -14,7 +14,7 @@ declare class CrdtYjsDoc<TStorage extends Record<string, YjsType<any, any>>> ext
     private _undoManager;
     constructor(value?: TStorage);
     applyEncodedState(params: DocApplyEncodedStateParams): this;
-    batchApplyEncodedState(updates: readonly (DocApplyEncodedStateParams | string | null | undefined)[]): this;
+    batchApplyEncodedState(params: DocBatchApplyEncodedStateParams): this;
     canRedo(): boolean;
     canUndo(): boolean;
     destroy(): void;

package/dist/index.js

@@ -196,20 +196,25 @@ var CrdtYjsDoc = class extends import_crdt.AbstractCrdtDoc {
     (0, import_yjs7.applyUpdate)(this.value, uint8Update, origin);
     return this;
   }
-  batchApplyEncodedState(updates) {
-    const params = updates.reduce((acc, update) => {
+  batchApplyEncodedState(params) {
+    var _a;
+    const { origin } = params;
+    const updates = (_a = params.updates) != null ? _a : [];
+    const filtered = updates.reduce((acc, update) => {
       if (!update) return acc;
       if (typeof update === "string") {
-        acc.push({ update });
+        acc.push((0, import_js_base64.toUint8Array)(update));
         return acc;
       }
-      if (!!update && typeof update === "object") {
+      if (typeof update === "object") {
         acc.push(update);
         return acc;
       }
       return acc;
     }, []);
-    return params.reduce((doc2, update) => doc2.applyEncodedState(update), this);
+    if (!filtered.length) return this;
+    const merged = (0, import_yjs7.mergeUpdates)(filtered);
+    return this.applyEncodedState({ origin, update: merged });
   }
   canRedo() {
     var _a;

package/dist/index.mjs

@@ -67,7 +67,8 @@ import {
   XmlFragment as YXmlFragment,
   XmlText as YXmlText2,
   applyUpdate,
-  encodeStateAsUpdate
+  encodeStateAsUpdate,
+  mergeUpdates
 } from "yjs";
 
 // src/map/YjsMap.ts
@@ -188,20 +189,25 @@ var CrdtYjsDoc = class extends AbstractCrdtDoc {
     applyUpdate(this.value, uint8Update, origin);
     return this;
   }
-  batchApplyEncodedState(updates) {
-    const params = updates.reduce((acc, update) => {
+  batchApplyEncodedState(params) {
+    var _a;
+    const { origin } = params;
+    const updates = (_a = params.updates) != null ? _a : [];
+    const filtered = updates.reduce((acc, update) => {
       if (!update) return acc;
       if (typeof update === "string") {
-        acc.push({ update });
+        acc.push(toUint8Array(update));
         return acc;
       }
-      if (!!update && typeof update === "object") {
+      if (typeof update === "object") {
         acc.push(update);
         return acc;
       }
       return acc;
     }, []);
-    return params.reduce((doc2, update) => doc2.applyEncodedState(update), this);
+    if (!filtered.length) return this;
+    const merged = mergeUpdates(filtered);
+    return this.applyEncodedState({ origin, update: merged });
   }
   canRedo() {
     var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pluv/crdt-yjs",
-  "version": "0.42.0",
+  "version": "0.44.0",
   "description": "yjs for @pluv/io",
   "author": "leedavidcs",
   "license": "MIT",
@@ -18,8 +18,8 @@
   },
   "dependencies": {
     "js-base64": "^3.7.7",
-    "@pluv/crdt": "^0.42.0",
-    "@pluv/types": "^0.42.0"
+    "@pluv/crdt": "^0.44.0",
+    "@pluv/types": "^0.44.0"
   },
   "peerDependencies": {
     "yjs": "^13.0.0"
@@ -29,8 +29,8 @@
     "tsup": "^8.4.0",
     "typescript": "^5.8.3",
     "yjs": "^13.6.26",
-    "@pluv/tsconfig": "^0.42.0",
-    "eslint-config-pluv": "^0.42.0"
+    "@pluv/tsconfig": "^0.44.0",
+    "eslint-config-pluv": "^0.44.0"
   },
   "scripts": {
     "build": "tsup src/index.ts --format esm,cjs --dts",

package/src/doc/CrdtYjsDoc.ts

@@ -1,4 +1,9 @@
-import type { DocApplyEncodedStateParams, DocSubscribeCallbackParams, InferCrdtJson } from "@pluv/crdt";
+import type {
+    DocApplyEncodedStateParams,
+    DocBatchApplyEncodedStateParams,
+    DocSubscribeCallbackParams,
+    InferCrdtJson,
+} from "@pluv/crdt";
 import { AbstractCrdtDoc } from "@pluv/crdt";
 import { fromUint8Array, toUint8Array } from "js-base64";
 import {
@@ -13,6 +18,7 @@ import {
     XmlText as YXmlText,
     applyUpdate,
     encodeStateAsUpdate,
+    mergeUpdates,
 } from "yjs";
 import { YjsArray } from "../array/YjsArray";
 import { YjsMap } from "../map/YjsMap";
@@ -108,26 +114,31 @@ export class CrdtYjsDoc<TStorage extends Record<string, YjsType<any, any>>> exte
         return this;
     }
 
-    public batchApplyEncodedState(updates: readonly (DocApplyEncodedStateParams | string | null | undefined)[]): this {
-        const params = updates.reduce<DocApplyEncodedStateParams[]>((acc, update) => {
+    public batchApplyEncodedState(params: DocBatchApplyEncodedStateParams): this {
+        const { origin } = params;
+        const updates = params.updates ?? [];
+
+        const filtered = updates.reduce<Uint8Array[]>((acc, update) => {
             if (!update) return acc;
 
             if (typeof update === "string") {
-                acc.push({ update });
-
+                acc.push(toUint8Array(update));
                 return acc;
             }
 
-            if (!!update && typeof update === "object") {
+            if (typeof update === "object") {
                 acc.push(update);
-
                 return acc;
             }
 
             return acc;
         }, []);
 
-        return params.reduce((doc, update) => doc.applyEncodedState(update), this);
+        if (!filtered.length) return this;
+
+        const merged = mergeUpdates(filtered);
+
+        return this.applyEncodedState({ origin, update: merged });
     }
 
     public canRedo(): boolean {