@dabble/patches 0.5.16 → 0.5.17

package/dist/json-patch/ops/add.js

@@ -26,10 +26,10 @@ const add = {
       if (index < 0 || target.length < index) {
         return `[op:add] invalid array index: ${path}`;
       }
-      pluckWithShallowCopy(state, keys, true).splice(index, 0, value);
+      pluckWithShallowCopy(state, keys, true, true).splice(index, 0, value);
     } else {
       if (!deepEqual(target[lastKey], value)) {
-        pluckWithShallowCopy(state, keys, true)[lastKey] = value;
+        pluckWithShallowCopy(state, keys, true, true)[lastKey] = value;
       }
     }
   },

package/dist/json-patch/utils/index.d.ts

@@ -5,7 +5,7 @@ export { getType, getTypeLike } from './getType.js';
 export { log, verbose } from './log.js';
 export { isAdd, mapAndFilterOps, transformRemove, updateRemovedOps } from './ops.js';
 export { getArrayIndex, getArrayPrefixAndIndex, getIndexAndEnd, getPrefix, getPrefixAndProp, getProp, getPropAfter, isArrayPath } from './paths.js';
-export { EMPTY, getValue, pluck, pluckWithShallowCopy } from './pluck.js';
+export { EMPTY, EMPTY_ARRAY, getValue, pluck, pluckWithShallowCopy } from './pluck.js';
 export { shallowCopy } from './shallowCopy.js';
 export { isEmptyObject, updateSoftWrites } from './softWrites.js';
 export { toArrayIndex } from './toArrayIndex.js';

package/dist/json-patch/utils/pluck.d.ts

@@ -1,8 +1,9 @@
 import { State } from '../types.js';
 
 declare const EMPTY: {};
+declare const EMPTY_ARRAY: any[];
 declare function pluck(state: State, keys: string[]): any;
-declare function pluckWithShallowCopy(state: State, keys: string[], createMissingObjects?: boolean): any;
+declare function pluckWithShallowCopy(state: State, keys: string[], createMissingObjects?: boolean, createMissingArrays?: boolean): any;
 declare function getValue(state: State, value: any, addKey?: string, addValue?: any): any;
 
-export { EMPTY, getValue, pluck, pluckWithShallowCopy };
+export { EMPTY, EMPTY_ARRAY, getValue, pluck, pluckWithShallowCopy };

package/dist/json-patch/utils/pluck.js

@@ -1,6 +1,7 @@
 import "../../chunk-IZ2YBCUP.js";
 import { shallowCopy } from "./shallowCopy.js";
 const EMPTY = {};
+const EMPTY_ARRAY = [];
 function pluck(state, keys) {
   let object = state.root;
   for (let i = 0, imax = keys.length - 1; i < imax; i++) {
@@ -12,11 +13,12 @@ function pluck(state, keys) {
   }
   return object;
 }
-function pluckWithShallowCopy(state, keys, createMissingObjects) {
+function pluckWithShallowCopy(state, keys, createMissingObjects, createMissingArrays) {
   let object = state.root;
   for (let i = 0, imax = keys.length - 1; i < imax; i++) {
     const key = keys[i];
-    object = object[key] = createMissingObjects && !object[key] ? getValue(state, EMPTY) : getValue(state, object[key]);
+    const container = createMissingArrays && keys[i + 1] === "0" ? EMPTY_ARRAY : EMPTY;
+    object = object[key] = createMissingObjects && !object[key] ? getValue(state, container) : getValue(state, object[key]);
   }
   return object;
 }
@@ -30,6 +32,7 @@ function getValue(state, value, addKey, addValue) {
 }
 export {
   EMPTY,
+  EMPTY_ARRAY,
   getValue,
   pluck,
   pluckWithShallowCopy

package/dist/net/PatchesSync.d.ts

@@ -101,8 +101,9 @@ declare class PatchesSync {
     /**
      * Flushes a document to the server.
      * @param docId The ID of the document to flush.
+     * @param pending Optional pending changes to flush, to avoid redundant store fetch.
      */
-    protected flushDoc(docId: string): Promise<void>;
+    protected flushDoc(docId: string, pending?: Change[]): Promise<void>;
     /**
      * Receives committed changes from the server and applies them to the document. This is a blockable function, so it
      * is separate from applyServerChangesToDoc, which is called by other blockable functions. Ensuring this is blockable
@@ -114,7 +115,7 @@ declare class PatchesSync {
      * Applies server changes to a document using the centralized sync algorithm.
      * This ensures consistent OT behavior regardless of whether the doc is open in memory.
      */
-    protected _applyServerChangesToDoc(docId: string, serverChanges: Change[], sentPendingRange?: [number, number]): Promise<void>;
+    protected _applyServerChangesToDoc(docId: string, serverChanges: Change[], sentPendingRange?: [number, number]): Promise<Change[]>;
     /**
      * Initiates the deletion process for a document both locally and on the server.
      * This now delegates the local tombstone marking to Patches.
@@ -133,6 +134,14 @@ declare class PatchesSync {
      * Helper to detect DOC_DELETED (410) errors from the server.
      */
     protected _isDocDeletedError(err: unknown): boolean;
+    /**
+     * Helper to detect "document already exists" errors from the server.
+     */
+    private _isDocExistsError;
+    /**
+     * Recovers from a "document already exists" error by fetching server state and retrying.
+     */
+    private _recoverFromDocExists;
 }
 
 export { PatchesSync, type PatchesSyncOptions, type PatchesSyncState };

package/dist/net/PatchesSync.js

@@ -169,7 +169,7 @@ class PatchesSync {
     try {
       const pending = await this.store.getPendingChanges(docId);
       if (pending.length > 0) {
-        await this.flushDoc(docId);
+        await this.flushDoc(docId, pending);
       } else {
         const [committedRev] = await this.store.getLastRevs(docId);
         if (committedRev) {
@@ -203,8 +203,9 @@ class PatchesSync {
   /**
    * Flushes a document to the server.
    * @param docId The ID of the document to flush.
+   * @param pending Optional pending changes to flush, to avoid redundant store fetch.
    */
-  async flushDoc(docId) {
+  async flushDoc(docId, pending) {
     if (!this.trackedDocs.has(docId)) {
       throw new Error(`Document ${docId} is not tracked`);
     }
@@ -212,7 +213,7 @@ class PatchesSync {
       throw new Error("Not connected to server");
     }
     try {
-      let pending = await this.store.getPendingChanges(docId);
+      if (!pending) pending = await this.store.getPendingChanges(docId);
       if (!pending.length) {
         return;
       }
@@ -235,6 +236,10 @@ class PatchesSync {
         await this._handleRemoteDocDeleted(docId);
         return;
       }
+      if (this._isDocExistsError(err)) {
+        await this._recoverFromDocExists(docId);
+        return;
+      }
       console.error(`Flush failed for doc ${docId}:`, err);
       this.onError.emit(err, { docId });
       throw err;
@@ -255,7 +260,7 @@ class PatchesSync {
     const currentSnapshot = await this.store.getDoc(docId);
     if (!currentSnapshot) {
       console.warn(`Cannot apply server changes to non-existent doc: ${docId}`);
-      return;
+      return [];
     }
     const doc = this.patches.getOpenDoc(docId);
     if (doc) {
@@ -276,6 +281,7 @@ class PatchesSync {
       this.store.saveCommittedChanges(docId, serverChanges, sentPendingRange),
       this.store.replacePendingChanges(docId, rebasedPendingChanges)
     ]);
+    return rebasedPendingChanges;
   }
   /**
    * Initiates the deletion process for a document both locally and on the server.
@@ -362,6 +368,23 @@ class PatchesSync {
   _isDocDeletedError(err) {
     return typeof err === "object" && err !== null && "code" in err && err.code === 410;
   }
+  /**
+   * Helper to detect "document already exists" errors from the server.
+   */
+  _isDocExistsError(err) {
+    const message = err?.message ?? "";
+    return message.includes("already exists");
+  }
+  /**
+   * Recovers from a "document already exists" error by fetching server state and retrying.
+   */
+  async _recoverFromDocExists(docId) {
+    const serverChanges = await this.ws.getChangesSince(docId, 0);
+    const rebasedPending = await this._applyServerChangesToDoc(docId, serverChanges);
+    if (rebasedPending.length > 0) {
+      await this.flushDoc(docId, rebasedPending);
+    }
+  }
 }
 _init = __decoratorStart(null);
 __decorateElement(_init, 1, "syncDoc", _syncDoc_dec, PatchesSync);

package/package.json

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