@dabble/patches 0.5.18 → 0.5.19

package/dist/algorithms/server/commitChanges.js

@@ -14,7 +14,15 @@ async function commitChanges(store, docId, changes, sessionTimeoutMillis, option
   const { state: initialState, rev: initialRev, changes: currentChanges } = await getSnapshotAtRevision(store, docId);
   const currentState = applyChanges(initialState, currentChanges);
   const currentRev = currentChanges.at(-1)?.rev ?? initialRev;
-  const baseRev = changes[0].baseRev ?? currentRev;
+  let baseRev = changes[0].baseRev ?? currentRev;
+  const batchedContinuation = batchId && changes[0].rev > 1;
+  if (changes[0].baseRev === 0 && currentRev > 0 && !batchedContinuation) {
+    const hasRootOp = changes.some((c) => c.ops.some((op) => op.path === ""));
+    if (!hasRootOp) {
+      baseRev = currentRev;
+      changes.forEach((c) => c.baseRev = baseRev);
+    }
+  }
   const serverNow = getISO();
   let rev = baseRev + 1;
   changes.forEach((c) => {
@@ -34,8 +42,7 @@ async function commitChanges(store, docId, changes, sessionTimeoutMillis, option
       `Client baseRev (${baseRev}) is ahead of server revision (${currentRev}) for doc ${docId}. Client needs to reload the document.`
     );
   }
-  const laterPartOfAnInitialBatch = batchId && changes[0].rev > 1;
-  if (baseRev === 0 && currentRev > 0 && !laterPartOfAnInitialBatch && changes[0].ops[0]?.path === "") {
+  if (changes[0].baseRev === 0 && currentRev > 0 && !batchedContinuation && changes[0].ops[0]?.path === "") {
     throw new Error(
       `Document ${docId} already exists (rev ${currentRev}). Cannot apply root-level replace (path: '') with baseRev 0 - this would overwrite the existing document. Load the existing document first, or use nested paths instead of replacing at root.`
     );

package/dist/net/protocol/JSONRPCClient.js

@@ -91,10 +91,7 @@ class JSONRPCClient {
       }
       console.warn("Received unexpected message format:", message);
     } catch (error) {
-      const parseError = new JSONRPCParseError(
-        data,
-        error instanceof Error ? error : new Error(String(error))
-      );
+      const parseError = new JSONRPCParseError(data, error instanceof Error ? error : new Error(String(error)));
       console.error("Failed to parse incoming message:", data, error);
       this.rejectAllPending(parseError);
     }

package/dist/net/websocket/RPCServer.js

@@ -43,7 +43,7 @@ class RPCServer {
     this.patches.onChangesCommitted((docId, changes, originClientId) => {
       this.rpc.notify("changesCommitted", { docId, changes }, originClientId);
     });
-    this.patches.onDocDeleted((docId, originClientId) => {
+    this.patches.onDocDeleted((docId, options, originClientId) => {
       this.rpc.notify("docDeleted", { docId }, originClientId);
     });
   }
@@ -95,7 +95,7 @@ class RPCServer {
   async deleteDoc(params, ctx) {
     const { docId, options } = params;
     await this.assertWrite(ctx, docId, "deleteDoc", params);
-    await this.patches.deleteDoc(docId, ctx?.clientId, options);
+    await this.patches.deleteDoc(docId, options, ctx?.clientId);
   }
   /**
    * Removes the tombstone for a deleted document, allowing it to be recreated.

package/dist/server/PatchesServer.d.ts

@@ -1,6 +1,6 @@
 import { Signal } from '../event-signal.js';
 import { PatchesStoreBackend } from './types.js';
-import { Change, PatchesState, ChangeInput, CommitChangesOptions, ChangeMutator, DeleteDocOptions, EditableVersionMetadata } from '../types.js';
+import { Change, DeleteDocOptions, PatchesState, ChangeInput, CommitChangesOptions, ChangeMutator, EditableVersionMetadata } from '../types.js';
 import { OpsCompressor } from '../compression/index.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
@@ -45,7 +45,7 @@ declare class PatchesServer {
     /** Notifies listeners whenever a batch of changes is *successfully* committed. */
     readonly onChangesCommitted: Signal<(docId: string, changes: Change[], originClientId?: string) => void>;
     /** Notifies listeners when a document is deleted. */
-    readonly onDocDeleted: Signal<(docId: string, originClientId?: string) => void>;
+    readonly onDocDeleted: Signal<(docId: string, options?: DeleteDocOptions, originClientId?: string) => void>;
     constructor(store: PatchesStoreBackend, options?: PatchesServerOptions);
     /**
      * Get the state of a document at a specific revision (or the latest state if no revision is provided).
@@ -91,7 +91,7 @@ declare class PatchesServer {
      * @param originClientId - The ID of the client that initiated the delete operation.
      * @param options - Optional deletion settings (e.g., skipTombstone for testing).
      */
-    deleteDoc(docId: string, originClientId?: string, options?: DeleteDocOptions): Promise<void>;
+    deleteDoc(docId: string, options?: DeleteDocOptions, originClientId?: string): Promise<void>;
     /**
      * Removes the tombstone for a deleted document, allowing it to be recreated.
      * @param docId The document ID.

package/dist/server/PatchesServer.js

@@ -103,7 +103,7 @@ class PatchesServer {
    * @param originClientId - The ID of the client that initiated the delete operation.
    * @param options - Optional deletion settings (e.g., skipTombstone for testing).
    */
-  async deleteDoc(docId, originClientId, options) {
+  async deleteDoc(docId, options, originClientId) {
     if (this.store.createTombstone && !options?.skipTombstone) {
       const { rev: lastRev } = await this.getDoc(docId);
       await this.store.createTombstone({
@@ -114,7 +114,7 @@ class PatchesServer {
       });
     }
     await this.store.deleteDoc(docId);
-    await this.onDocDeleted.emit(docId, originClientId);
+    await this.onDocDeleted.emit(docId, options, originClientId);
   }
   /**
    * Removes the tombstone for a deleted document, allowing it to be recreated.

package/package.json

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