@dabble/patches 0.8.12 → 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/PatchesBranchClient.d.ts

@@ -26,8 +26,8 @@ interface PatchesBranchClientOptions {
  * (offline-first, local store handles caching/pending/tombstones). The API shape
  * determines merge behavior:
  *
- * - `BranchAPI` has `mergeBranch` — server performs the merge
- * - `BranchClientStore` has `updateBranch` — client merges locally, updates `lastMergedRev`
+ * - `BranchAPI` — server performs the merge via `mergeBranch`
+ * - `BranchClientStore` — merge is not supported; call the server merge endpoint directly
  */
 declare class PatchesBranchClient {
     private readonly api;
@@ -81,16 +81,15 @@ declare class PatchesBranchClient {
     /**
      * Merge a branch's changes back into this document.
      *
-     * Online (BranchAPI with `mergeBranch`): server performs the merge.
-     * Offline (BranchClientStore with `updateBranch`): client reads branch changes,
-     * re-stamps them with `batchId: branchId`, submits via algorithm.handleDocChange
-     * on the source doc, then updates `lastMergedRev` locally.
+     * Requires a `BranchAPI` (online mode) — the server performs the merge.
+     * Throws if the API is a `BranchClientStore` (offline-first mode) because
+     * client stores don't maintain full change history needed for correct merging.
+     * Offline-first consumers should call the server merge endpoint directly.
      */
     mergeBranch(branchId: string): Promise<void>;
     /** Clear state */
     clear(): void;
     private _createBranchOffline;
-    private _mergeBranchLocally;
 }
 
 export { PatchesBranchClient, type PatchesBranchClientOptions };

package/dist/client/PatchesBranchClient.js

@@ -2,6 +2,7 @@ import "../chunk-IZ2YBCUP.js";
 import { store } from "easy-signal";
 import { breakChanges } from "../algorithms/ot/shared/changeBatching.js";
 import { createChange } from "../data/change.js";
+const OFFLINE_MERGE_ERROR = "Branch merging requires a server connection. Use a BranchAPI or call the server merge endpoint directly.";
 class PatchesBranchClient {
   constructor(id, api, patches, options) {
     this.api = api;
@@ -87,18 +88,17 @@ class PatchesBranchClient {
   /**
    * Merge a branch's changes back into this document.
    *
-   * Online (BranchAPI with `mergeBranch`): server performs the merge.
-   * Offline (BranchClientStore with `updateBranch`): client reads branch changes,
-   * re-stamps them with `batchId: branchId`, submits via algorithm.handleDocChange
-   * on the source doc, then updates `lastMergedRev` locally.
+   * Requires a `BranchAPI` (online mode) — the server performs the merge.
+   * Throws if the API is a `BranchClientStore` (offline-first mode) because
+   * client stores don't maintain full change history needed for correct merging.
+   * Offline-first consumers should call the server merge endpoint directly.
    */
   async mergeBranch(branchId) {
-    if (!this.isOffline) {
-      await this.api.mergeBranch(branchId);
-      await this.listBranches();
-      return;
+    if (this.isOffline) {
+      throw new Error(OFFLINE_MERGE_ERROR);
     }
-    await this._mergeBranchLocally(branchId);
+    await this.api.mergeBranch(branchId);
+    await this.listBranches();
   }
   /** Clear state */
   clear() {
@@ -148,29 +148,6 @@ class PatchesBranchClient {
     this.patches.onChange.emit(branchDocId);
     return branchDocId;
   }
-  async _mergeBranchLocally(branchId) {
-    const offlineApi = this.api;
-    const branch = this.branches.state.find((b) => b.id === branchId);
-    if (!branch) throw new Error(`Branch ${branchId} not found`);
-    const sourceDocId = branch.docId;
-    const algorithmName = this.options?.algorithm ?? this.patches.defaultAlgorithm;
-    const algorithm = this.patches.algorithms[algorithmName];
-    if (!algorithm?.listChanges) {
-      throw new Error("Offline merge requires an algorithm with listChanges support");
-    }
-    const startAfter = branch.lastMergedRev ?? (branch.contentStartRev ?? 2) - 1;
-    const branchChanges = await algorithm.listChanges(branchId, { startAfter });
-    if (branchChanges.length === 0) return;
-    const lastBranchRev = branchChanges[branchChanges.length - 1].rev;
-    for (const change of branchChanges) {
-      await this.patches.submitDocChange(sourceDocId, change.ops, { batchId: branchId });
-    }
-    await offlineApi.updateBranch(branchId, { lastMergedRev: lastBranchRev });
-    this.patches.onChange.emit(sourceDocId);
-    this.branches.state = this.branches.state.map(
-      (b) => b.id === branchId ? { ...b, lastMergedRev: lastBranchRev } : b
-    );
-  }
 }
 export {
   PatchesBranchClient

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.12",
+  "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": {