@dabble/patches 0.8.13 → 0.8.14

package/dist/client/LWWInMemoryStore.js

@@ -162,6 +162,10 @@ class LWWInMemoryStore {
     const buf = this.docs.get(docId);
     if (!buf?.sendingChange) return;
     for (const op of buf.sendingChange.ops) {
+      const childPrefix = op.path + "/";
+      for (const key of buf.committedFields.keys()) {
+        if (key.startsWith(childPrefix)) buf.committedFields.delete(key);
+      }
       buf.committedFields.set(op.path, op.value);
     }
     if (buf.sendingChange.rev > buf.committedRev) {
@@ -176,6 +180,10 @@ class LWWInMemoryStore {
     const buf = this.getOrCreateBuffer(docId);
     for (const change of serverChanges) {
       for (const op of change.ops) {
+        const childPrefix = op.path + "/";
+        for (const key of buf.committedFields.keys()) {
+          if (key.startsWith(childPrefix)) buf.committedFields.delete(key);
+        }
         buf.committedFields.set(op.path, op.value);
       }
     }

package/dist/client/LWWIndexedDBStore.js

@@ -245,7 +245,12 @@ const _LWWIndexedDBStore = class _LWWIndexedDBStore {
       await tx.complete();
       return;
     }
-    await Promise.all(sending.change.ops.map((op) => committedOps.put({ ...op, docId })));
+    await Promise.all(
+      sending.change.ops.map(async (op) => {
+        await committedOps.delete([docId, op.path + "/"], [docId, op.path + "/\uFFFF"]);
+        await committedOps.put({ ...op, docId });
+      })
+    );
     const rev = sending.change.rev;
     if (rev !== void 0) {
       const docMeta = await docsStore.get(docId) ?? { docId, committedRev: 0, algorithm: "lww" };
@@ -262,7 +267,12 @@ const _LWWIndexedDBStore = class _LWWIndexedDBStore {
       "readwrite"
     );
     const allOps = serverChanges.flatMap((change) => change.ops);
-    await Promise.all(allOps.map((op) => committedOps.put({ ...op, docId })));
+    await Promise.all(
+      allOps.map(async (op) => {
+        await committedOps.delete([docId, op.path + "/"], [docId, op.path + "/\uFFFF"]);
+        await committedOps.put({ ...op, docId });
+      })
+    );
     const lastCommittedRev = serverChanges.at(-1)?.rev;
     if (lastCommittedRev !== void 0) {
       const docMeta = await docsStore.get(docId) ?? { docId, committedRev: 0, algorithm: "lww" };

package/dist/client/Patches.d.ts

@@ -123,6 +123,12 @@ declare class Patches {
      * Should be called when shutting down the client.
      */
     close(): Promise<void>;
+    /**
+     * Submits ops for a document through the serialized change queue.
+     * Used by PatchesBranchClient to merge branch changes without racing
+     * against concurrent user edits on the same document.
+     */
+    submitDocChange(docId: string, ops: JSONPatchOp[], metadata?: Record<string, any>): Promise<void>;
     /**
      * Internal handler for doc changes. Called when doc.onChange emits ops.
      * Serializes calls per docId to prevent concurrent handleDocChange from

package/dist/client/Patches.js

@@ -197,6 +197,17 @@ class Patches {
     this.onServerCommit.clear();
     this.onError.clear();
   }
+  /**
+   * Submits ops for a document through the serialized change queue.
+   * Used by PatchesBranchClient to merge branch changes without racing
+   * against concurrent user edits on the same document.
+   */
+  submitDocChange(docId, ops, metadata = {}) {
+    const managed = this.docs.get(docId);
+    const algorithm = this.getDocAlgorithm(docId) ?? this.algorithms[this.defaultAlgorithm];
+    if (!algorithm) throw new Error(`No algorithm found for document ${docId}`);
+    return this._handleDocChange(docId, ops, managed?.doc, algorithm, metadata);
+  }
   /**
    * Internal handler for doc changes. Called when doc.onChange emits ops.
    * Serializes calls per docId to prevent concurrent handleDocChange from

package/dist/net/PatchesSync.js

@@ -191,7 +191,15 @@ class PatchesSync extends (_a = ReadonlyStoreClass, _syncDoc_dec = [serialGate],
     for (const branch of creates) {
       if (!this.state.connected) break;
       try {
-        const { docId: sourceDocId, branchedAtRev, createdAt: _1, modifiedAt: _2, pendingOp: _3, deleted: _4, ...metadata } = branch;
+        const {
+          docId: sourceDocId,
+          branchedAtRev,
+          createdAt: _1,
+          modifiedAt: _2,
+          pendingOp: _3,
+          deleted: _4,
+          ...metadata
+        } = branch;
         await branchApi.createBranch(sourceDocId, branchedAtRev, metadata);
         const synced = { ...branch, pendingOp: void 0 };
         delete synced.pendingOp;
@@ -205,7 +213,17 @@ class PatchesSync extends (_a = ReadonlyStoreClass, _syncDoc_dec = [serialGate],
     for (const branch of updates) {
       if (!this.state.connected) break;
       try {
-        const { id: _id, docId: _did, branchedAtRev: _bar, createdAt: _ca, modifiedAt: _ma, contentStartRev: _csr, pendingOp: _po, deleted: _del, ...metadata } = branch;
+        const {
+          id: _id,
+          docId: _did,
+          branchedAtRev: _bar,
+          createdAt: _ca,
+          modifiedAt: _ma,
+          contentStartRev: _csr,
+          pendingOp: _po,
+          deleted: _del,
+          ...metadata
+        } = branch;
         await branchApi.updateBranch(branch.id, metadata);
         const synced = { ...branch, pendingOp: void 0 };
         delete synced.pendingOp;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dabble/patches",
-  "version": "0.8.13",
+  "version": "0.8.14",
   "description": "Immutable JSON Patch implementation based on RFC 6902 supporting operational transformation and last-writer-wins",
   "author": "Jacob Wright <jacwright@gmail.com>",
   "bugs": {