@dabble/patches 0.8.13 → 0.8.15

package/dist/{BaseDoc-BT18xPxU.d.ts → BaseDoc-CD5wZQMm.d.ts}

@@ -237,4 +237,4 @@ declare abstract class BaseDoc<T extends object = object> extends ReadonlyStoreC
     abstract import(snapshot: PatchesSnapshot<T>): void;
 }
 
-export { BaseDoc as B, OTDoc as O, type PatchesDoc as P, type PatchesDocOptions as a };
+export { BaseDoc as B, OTDoc as O, type PatchesDocOptions as P, type PatchesDoc as a };

package/dist/algorithms/ot/server/createVersion.d.ts

@@ -1,5 +1,5 @@
 import { OTStoreBackend } from '../../../server/types.js';
-import { EditableVersionMetadata, Change, VersionMetadata } from '../../../types.js';
+import { EditableVersionMetadata, VersionMetadata, Change } from '../../../types.js';
 import '../../../json-patch/types.js';
 import '../../../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/BaseDoc.d.ts

@@ -1,6 +1,6 @@
 import 'easy-signal';
 import '../json-patch/types.js';
 import '../types.js';
-export { B as BaseDoc } from '../BaseDoc-BT18xPxU.js';
+export { B as BaseDoc } from '../BaseDoc-CD5wZQMm.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/ClientAlgorithm.d.ts

@@ -1,6 +1,6 @@
 import { JSONPatchOp } from '../json-patch/types.js';
 import { PatchesSnapshot, Change } from '../types.js';
-import { P as PatchesDoc } from '../BaseDoc-BT18xPxU.js';
+import { a as PatchesDoc } from '../BaseDoc-CD5wZQMm.js';
 import { PatchesStore, TrackedDoc } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/LWWAlgorithm.d.ts

@@ -2,7 +2,7 @@ import { JSONPatchOp } from '../json-patch/types.js';
 import { PatchesSnapshot, Change } from '../types.js';
 import { ClientAlgorithm } from './ClientAlgorithm.js';
 import { LWWClientStore } from './LWWClientStore.js';
-import { P as PatchesDoc } from '../BaseDoc-BT18xPxU.js';
+import { a as PatchesDoc } from '../BaseDoc-CD5wZQMm.js';
 import { TrackedDoc } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/LWWDoc.d.ts

@@ -1,5 +1,5 @@
 import { PatchesSnapshot, Change } from '../types.js';
-import { B as BaseDoc } from '../BaseDoc-BT18xPxU.js';
+import { B as BaseDoc } from '../BaseDoc-CD5wZQMm.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';

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/OTAlgorithm.d.ts

@@ -2,7 +2,7 @@ import { JSONPatchOp } from '../json-patch/types.js';
 import { PatchesSnapshot, Change } from '../types.js';
 import { ClientAlgorithm } from './ClientAlgorithm.js';
 import { OTClientStore } from './OTClientStore.js';
-import { a as PatchesDocOptions, P as PatchesDoc } from '../BaseDoc-BT18xPxU.js';
+import { P as PatchesDocOptions, a as PatchesDoc } from '../BaseDoc-CD5wZQMm.js';
 import { TrackedDoc } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/OTDoc.d.ts

@@ -1,5 +1,5 @@
 import '../types.js';
-export { O as OTDoc } from '../BaseDoc-BT18xPxU.js';
+export { O as OTDoc } from '../BaseDoc-CD5wZQMm.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';

package/dist/client/OTInMemoryStore.js

@@ -32,9 +32,10 @@ class OTInMemoryStore {
   // ─── Writes ────────────────────────────────────────────────────────────
   async saveDoc(docId, snapshot) {
     const existing = this.docs.get(docId);
+    const changes = snapshot.changes;
     this.docs.set(docId, {
       snapshot,
-      committed: [],
+      committed: changes ? [...changes] : [],
       pending: existing?.pending ?? []
     });
   }

package/dist/client/OTIndexedDBStore.js

@@ -116,10 +116,13 @@ const _OTIndexedDBStore = class _OTIndexedDBStore {
       "readwrite"
     );
     const { rev, state } = docState;
+    const changes = docState.changes;
+    const committedRev = changes?.length ? changes[changes.length - 1].rev : rev;
+    await committedChanges.delete([docId, 0], [docId, Infinity]);
     await Promise.all([
-      docsStore.put({ docId, committedRev: rev, algorithm: "ot" }),
+      docsStore.put({ docId, committedRev, algorithm: "ot" }),
       snapshots.put({ docId, state, rev }),
-      committedChanges.delete([docId, 0], [docId, Infinity])
+      ...changes?.map((change) => committedChanges.put({ ...change, docId })) ?? []
     ]);
     await tx.complete();
   }

package/dist/client/Patches.d.ts

@@ -3,7 +3,7 @@ import { Unsubscriber } from 'easy-signal';
 import { JSONPatchOp } from '../json-patch/types.js';
 import { Change } from '../types.js';
 import { ClientAlgorithm } from './ClientAlgorithm.js';
-import { a as PatchesDocOptions, P as PatchesDoc } from '../BaseDoc-BT18xPxU.js';
+import { P as PatchesDocOptions, a as PatchesDoc } from '../BaseDoc-CD5wZQMm.js';
 import { AlgorithmName } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
@@ -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/client/PatchesBranchClient.d.ts

@@ -9,7 +9,7 @@ import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';
 import './ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 
 interface PatchesBranchClientOptions {
     /** Maximum size in bytes for a single change in storage. Used to break large initial changes. */

package/dist/client/PatchesDoc.d.ts

@@ -1,6 +1,6 @@
 import 'easy-signal';
 import '../json-patch/types.js';
 import '../types.js';
-export { O as OTDoc, P as PatchesDoc, a as PatchesDocOptions } from '../BaseDoc-BT18xPxU.js';
+export { O as OTDoc, a as PatchesDoc, P as PatchesDocOptions } from '../BaseDoc-CD5wZQMm.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/factories.d.ts

@@ -1,6 +1,6 @@
 import { AlgorithmName } from './PatchesStore.js';
 import { Patches } from './Patches.js';
-import { a as PatchesDocOptions } from '../BaseDoc-BT18xPxU.js';
+import { P as PatchesDocOptions } from '../BaseDoc-CD5wZQMm.js';
 import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/index.d.ts

@@ -1,4 +1,4 @@
-export { B as BaseDoc, O as OTDoc, P as PatchesDoc, a as PatchesDocOptions } from '../BaseDoc-BT18xPxU.js';
+export { B as BaseDoc, O as OTDoc, a as PatchesDoc, P as PatchesDocOptions } from '../BaseDoc-CD5wZQMm.js';
 export { IndexedDBFactoryOptions, MultiAlgorithmFactoryOptions, MultiAlgorithmIndexedDBFactoryOptions, PatchesFactoryOptions, createLWWIndexedDBPatches, createLWWPatches, createMultiAlgorithmExternalDBPatches, createMultiAlgorithmIndexedDBPatches, createMultiAlgorithmPatches, createOTIndexedDBPatches, createOTPatches, upgradePatchesDB } from './factories.js';
 export { IDBStoreWrapper, IDBTransactionWrapper, IndexedDBStore } from './IndexedDBStore.js';
 export { OTIndexedDBStore } from './OTIndexedDBStore.js';

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { Delta } from '@dabble/delta';
-export { B as BaseDoc, O as OTDoc, P as PatchesDoc, a as PatchesDocOptions } from './BaseDoc-BT18xPxU.js';
+export { B as BaseDoc, O as OTDoc, a as PatchesDoc, P as PatchesDocOptions } from './BaseDoc-CD5wZQMm.js';
 export { IndexedDBFactoryOptions, MultiAlgorithmFactoryOptions, MultiAlgorithmIndexedDBFactoryOptions, PatchesFactoryOptions, createLWWIndexedDBPatches, createLWWPatches, createMultiAlgorithmExternalDBPatches, createMultiAlgorithmIndexedDBPatches, createMultiAlgorithmPatches, createOTIndexedDBPatches, createOTPatches, upgradePatchesDB } from './client/factories.js';
 export { IDBStoreWrapper, IDBTransactionWrapper, IndexedDBStore } from './client/IndexedDBStore.js';
 export { OTIndexedDBStore } from './client/OTIndexedDBStore.js';

package/dist/net/PatchesSync.d.ts

@@ -13,7 +13,7 @@ import { WebSocketOptions } from './websocket/WebSocketTransport.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../utils/deferred.js';
 
 interface PatchesSyncState {

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;
@@ -326,7 +344,8 @@ class PatchesSync extends (_a = ReadonlyStoreClass, _syncDoc_dec = [serialGate],
         } else {
           const snapshot = await this.connection.getDoc(docId);
           await algorithm.store.saveDoc(docId, snapshot);
-          this._updateDocSyncState(docId, { committedRev: snapshot.rev });
+          const savedRev = await algorithm.getCommittedRev(docId);
+          this._updateDocSyncState(docId, { committedRev: savedRev });
           if (baseDoc) {
             baseDoc.import({ ...snapshot, changes: [] });
           }

package/dist/net/index.d.ts

@@ -22,7 +22,7 @@ import '../algorithms/ot/shared/changeBatching.js';
 import '../client/BranchClientStore.js';
 import '../client/ClientAlgorithm.js';
 import '../json-patch/types.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';
 import '../client/Patches.js';
 import '../server/types.js';

package/dist/server/branchUtils.d.ts

@@ -1,5 +1,5 @@
 import { ApiDefinition } from '../net/protocol/JSONRPCServer.js';
-import { EditableBranchMetadata, Branch, CreateBranchMetadata } from '../types.js';
+import { EditableBranchMetadata, CreateBranchMetadata, Branch } from '../types.js';
 import 'easy-signal';
 import '../net/websocket/AuthorizationProvider.js';
 import './types.js';

package/dist/shared/doc-manager.d.ts

@@ -1,5 +1,5 @@
 import { Patches, OpenDocOptions } from '../client/Patches.js';
-import { P as PatchesDoc } from '../BaseDoc-BT18xPxU.js';
+import { a as PatchesDoc } from '../BaseDoc-CD5wZQMm.js';
 import 'easy-signal';
 import '../json-patch/types.js';
 import '../types.js';

package/dist/solid/context.d.ts

@@ -7,7 +7,7 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';
 import '../algorithms/ot/shared/changeBatching.js';
 import '../client/BranchClientStore.js';

package/dist/solid/doc-manager.d.ts

@@ -6,5 +6,5 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';

package/dist/solid/index.d.ts

@@ -11,7 +11,7 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';
 import '../net/PatchesSync.js';
 import '../algorithms/ot/shared/changeBatching.js';

package/dist/solid/primitives.d.ts

@@ -1,6 +1,6 @@
 import { Accessor } from 'solid-js';
 import { OpenDocOptions } from '../client/Patches.js';
-import { P as PatchesDoc } from '../BaseDoc-BT18xPxU.js';
+import { a as PatchesDoc } from '../BaseDoc-CD5wZQMm.js';
 import { ChangeMutator } from '../types.js';
 import 'easy-signal';
 import '../json-patch/types.js';

package/dist/vue/composables.d.ts

@@ -1,6 +1,6 @@
-import { ShallowRef, Ref, MaybeRef, MaybeRefOrGetter } from 'vue';
+import { ShallowRef, Ref, MaybeRefOrGetter, MaybeRef } from 'vue';
 import { OpenDocOptions } from '../client/Patches.js';
-import { P as PatchesDoc } from '../BaseDoc-BT18xPxU.js';
+import { a as PatchesDoc } from '../BaseDoc-CD5wZQMm.js';
 import { ChangeMutator } from '../types.js';
 import 'easy-signal';
 import '../json-patch/types.js';

package/dist/vue/doc-manager.d.ts

@@ -6,5 +6,5 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';

package/dist/vue/index.d.ts

@@ -11,7 +11,7 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';
 import '../net/PatchesSync.js';
 import '../algorithms/ot/shared/changeBatching.js';

package/dist/vue/managed-docs.d.ts

@@ -1,4 +1,4 @@
-import { ShallowRef, Ref } from 'vue';
+import { Ref, ShallowRef } from 'vue';
 import { OpenDocOptions } from '../client/Patches.js';
 import 'easy-signal';
 import '../json-patch/types.js';
@@ -6,7 +6,7 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';
 
 /**

package/dist/vue/provider.d.ts

@@ -7,7 +7,7 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-BT18xPxU.js';
+import '../BaseDoc-CD5wZQMm.js';
 import '../client/PatchesStore.js';
 import '../algorithms/ot/shared/changeBatching.js';
 import '../client/BranchClientStore.js';

package/package.json

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