@dabble/patches 0.8.19 → 0.8.21

package/dist/{BaseDoc-CXHXcW18.d.ts → BaseDoc-rCKMFV6B.d.ts}

@@ -246,4 +246,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 PatchesDocOptions as P, type PatchesDoc as a };
+export { BaseDoc as B, OTDoc as O, type PatchesDoc as P, type PatchesDocOptions as a };

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

@@ -1,5 +1,5 @@
 import { OTStoreBackend } from '../../../server/types.js';
-import { EditableVersionMetadata, VersionMetadata, Change } from '../../../types.js';
+import { EditableVersionMetadata, Change, VersionMetadata } 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-CXHXcW18.js';
+export { B as BaseDoc } from '../BaseDoc-rCKMFV6B.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 { a as PatchesDoc } from '../BaseDoc-CXHXcW18.js';
+import { P as PatchesDoc } from '../BaseDoc-rCKMFV6B.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 { a as PatchesDoc } from '../BaseDoc-CXHXcW18.js';
+import { P as PatchesDoc } from '../BaseDoc-rCKMFV6B.js';
 import { TrackedDoc } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/LWWDoc.d.ts

@@ -1,6 +1,6 @@
 import { JSONPatchOp } from '../json-patch/types.js';
 import { PatchesSnapshot, Change } from '../types.js';
-import { B as BaseDoc } from '../BaseDoc-CXHXcW18.js';
+import { B as BaseDoc } from '../BaseDoc-rCKMFV6B.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import 'easy-signal';

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 { P as PatchesDocOptions, a as PatchesDoc } from '../BaseDoc-CXHXcW18.js';
+import { a as PatchesDocOptions, P as PatchesDoc } from '../BaseDoc-rCKMFV6B.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-CXHXcW18.js';
+export { O as OTDoc } from '../BaseDoc-rCKMFV6B.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';

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 { P as PatchesDocOptions, a as PatchesDoc } from '../BaseDoc-CXHXcW18.js';
+import { a as PatchesDocOptions, P as PatchesDoc } from '../BaseDoc-rCKMFV6B.js';
 import { AlgorithmName } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/PatchesBranchClient.d.ts

@@ -8,7 +8,7 @@ import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';
 import './ClientAlgorithm.js';
-import '../BaseDoc-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.js';
 
 interface PatchesBranchClientOptions {
     /** Algorithm to use for the branch document (defaults to the Patches instance default). */

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, a as PatchesDoc, P as PatchesDocOptions } from '../BaseDoc-CXHXcW18.js';
+export { O as OTDoc, P as PatchesDoc, a as PatchesDocOptions } from '../BaseDoc-rCKMFV6B.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 { P as PatchesDocOptions } from '../BaseDoc-CXHXcW18.js';
+import { a as PatchesDocOptions } from '../BaseDoc-rCKMFV6B.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, a as PatchesDoc, P as PatchesDocOptions } from '../BaseDoc-CXHXcW18.js';
+export { B as BaseDoc, O as OTDoc, P as PatchesDoc, a as PatchesDocOptions } from '../BaseDoc-rCKMFV6B.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, a as PatchesDoc, P as PatchesDocOptions } from './BaseDoc-CXHXcW18.js';
+export { B as BaseDoc, O as OTDoc, P as PatchesDoc, a as PatchesDocOptions } from './BaseDoc-rCKMFV6B.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/json-patch/applyPatch.js

@@ -3,6 +3,7 @@ import { getTypes } from "./ops/index.js";
 import { runWithObject } from "./state.js";
 import { exit } from "./utils/exit.js";
 import { getType } from "./utils/getType.js";
+import { isSoftOp, pathExistsInState } from "./utils/softWrites.js";
 function applyPatch(object, patches, opts = {}, custom) {
   if (patches.length === 0) {
     return object;
@@ -14,6 +15,9 @@ function applyPatch(object, patches, opts = {}, custom) {
   return runWithObject(object, types, patches.length > 1, (state) => {
     for (let i = 0, imax = patches.length; i < imax; i++) {
       const patch = patches[i];
+      if (isSoftOp(patch) && pathExistsInState(state.root[""], patch.path)) {
+        continue;
+      }
       const handler = getType(state, patch)?.apply;
       const error = handler ? handler(state, "" + patch.path, patch.from || patch.value) : `[op:${patch.op}] unknown`;
       if (error) {

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

@@ -8,7 +8,7 @@ export { isAdd, mapAndFilterOps, transformRemove, updateRemovedOps } from './ops
 export { getArrayIndex, getArrayPrefixAndIndex, getIndexAndEnd, getPrefix, getPrefixAndProp, getProp, getPropAfter, isArrayPath } from './paths.js';
 export { EMPTY, EMPTY_ARRAY, getValue, pluck, pluckWithShallowCopy } from './pluck.js';
 export { shallowCopy } from './shallowCopy.js';
-export { filterSoftWritesAgainstState, isEmptyContainer, updateSoftWrites } from './softWrites.js';
+export { filterSoftWritesAgainstState, isEmptyContainer, isSoftOp, pathExistsInState, updateSoftWrites } from './softWrites.js';
 export { toArrayIndex } from './toArrayIndex.js';
 export { toKeys } from './toKeys.js';
 export { updateArrayIndexes } from './updateArrayIndexes.js';

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

@@ -7,10 +7,17 @@ declare function isEmptyContainer(value: any): boolean;
  * for any value that already exists.
  */
 declare function updateSoftWrites(overPath: string, ops: JSONPatchOp[], originalValue: any): JSONPatchOp[];
+/**
+ * Returns true when an op carries soft semantics — either an explicit
+ * `soft: true` flag, or an empty-container `add` (treated as initialization
+ * by convention). Mirrors the check used by the LWW consolidation algorithm.
+ */
+declare function isSoftOp(op: JSONPatchOp): boolean;
 /**
  * Filters out soft writes that would overwrite existing data in state.
  * Used when baseRev: 0 is jumped forward, bypassing normal transformation.
  */
 declare function filterSoftWritesAgainstState(ops: JSONPatchOp[], state: any): JSONPatchOp[];
+declare function pathExistsInState(state: any, path: string): boolean;
 
-export { filterSoftWritesAgainstState, isEmptyContainer, updateSoftWrites };
+export { filterSoftWritesAgainstState, isEmptyContainer, isSoftOp, pathExistsInState, updateSoftWrites };

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

@@ -16,10 +16,12 @@ function updateSoftWrites(overPath, ops, originalValue) {
     return op;
   });
 }
+function isSoftOp(op) {
+  return op.soft === true || op.op === "add" && isEmptyContainer(op.value);
+}
 function filterSoftWritesAgainstState(ops, state) {
   return ops.filter((op) => {
-    const isSoft = op.soft || op.op === "add" && isEmptyContainer(op.value);
-    if (!isSoft) return true;
+    if (!isSoftOp(op)) return true;
     return !pathExistsInState(state, op.path);
   });
 }
@@ -37,5 +39,7 @@ function pathExistsInState(state, path) {
 export {
   filterSoftWritesAgainstState,
   isEmptyContainer,
+  isSoftOp,
+  pathExistsInState,
   updateSoftWrites
 };

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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.js';
 import '../utils/deferred.js';
 
 interface PatchesSyncState {

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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.js';
 import '../client/PatchesStore.js';
 import '../client/Patches.js';
 import '../server/types.js';

package/dist/net/rest/PatchesREST.js

@@ -4,6 +4,8 @@ import { StatusError } from "../error.js";
 import { onlineState } from "../websocket/onlineState.js";
 import { normalizeIds } from "./utils.js";
 const SESSION_STORAGE_KEY = "patches-clientId";
+const REQUEST_TIMEOUT_MS = 3e4;
+const CONNECT_TIMEOUT_MS = 3e4;
 class PatchesREST {
   /** The client ID used for SSE connection and subscription management. */
   clientId;
@@ -49,16 +51,26 @@ class PatchesREST {
       const es = new EventSource(`${this._url}/events/${this.clientId}`);
       this.eventSource = es;
       let settled = false;
+      const timer = globalThis.setTimeout(() => {
+        if (settled) return;
+        settled = true;
+        es.close();
+        if (this.eventSource === es) this.eventSource = null;
+        this._setState("error");
+        reject(new Error("SSE connection timed out"));
+      }, CONNECT_TIMEOUT_MS);
       es.onopen = () => {
         this._setState("connected");
         if (!settled) {
           settled = true;
+          globalThis.clearTimeout(timer);
           resolve();
         }
       };
       es.onerror = () => {
         if (!settled) {
           settled = true;
+          globalThis.clearTimeout(timer);
           this._setState("error");
           reject(new Error("SSE connection failed"));
           return;
@@ -202,7 +214,8 @@ class PatchesREST {
         ...hasBody ? { "Content-Type": "application/json" } : {},
         ...headers
       },
-      body: hasBody ? JSON.stringify(init.body) : void 0
+      body: hasBody ? JSON.stringify(init.body) : void 0,
+      signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS)
     });
     if (!response.ok) {
       let message = response.statusText;

package/dist/server/LWWBranchManager.d.ts

@@ -5,10 +5,10 @@ import { LWWServer } from './LWWServer.js';
 import { LWWStoreBackend, BranchingStoreBackend } from './types.js';
 import 'easy-signal';
 import '../net/websocket/AuthorizationProvider.js';
-import '../json-patch/types.js';
+import '../net/protocol/types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
-import '../net/protocol/types.js';
+import '../json-patch/types.js';
 import './PatchesServer.js';
 
 /**

package/dist/server/LWWServer.d.ts

@@ -4,10 +4,10 @@ import { Change, CommitChangesOptions, DeleteDocOptions, ChangeInput, ChangeMuta
 import { PatchesServer } from './PatchesServer.js';
 import { LWWStoreBackend } from './types.js';
 import '../net/websocket/AuthorizationProvider.js';
-import '../json-patch/types.js';
+import '../net/protocol/types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
-import '../net/protocol/types.js';
+import '../json-patch/types.js';
 
 /**
  * Configuration options for LWWServer.

package/dist/server/branchUtils.d.ts

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

package/dist/server/types.d.ts

@@ -1,5 +1,5 @@
 import { JSONPatchOp } from '../json-patch/types.js';
-import { DocumentTombstone, VersionMetadata, Change, ListVersionsOptions, EditableVersionMetadata, ListChangesOptions, ListBranchesOptions, Branch } from '../types.js';
+import { VersionMetadata, Change, ListVersionsOptions, EditableVersionMetadata, ListChangesOptions, DocumentTombstone, ListBranchesOptions, Branch } from '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 

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

@@ -1,5 +1,5 @@
 import { Patches, OpenDocOptions } from '../client/Patches.js';
-import { a as PatchesDoc } from '../BaseDoc-CXHXcW18.js';
+import { P as PatchesDoc } from '../BaseDoc-rCKMFV6B.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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.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 { a as PatchesDoc } from '../BaseDoc-CXHXcW18.js';
+import { P as PatchesDoc } from '../BaseDoc-rCKMFV6B.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, MaybeRefOrGetter, MaybeRef } from 'vue';
+import { ShallowRef, Ref, MaybeRef, MaybeRefOrGetter } from 'vue';
 import { OpenDocOptions } from '../client/Patches.js';
-import { a as PatchesDoc } from '../BaseDoc-CXHXcW18.js';
+import { P as PatchesDoc } from '../BaseDoc-rCKMFV6B.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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.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 { Ref, ShallowRef } from 'vue';
+import { ShallowRef, Ref } 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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.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-CXHXcW18.js';
+import '../BaseDoc-rCKMFV6B.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.19",
+  "version": "0.8.21",
   "description": "Immutable JSON Patch implementation based on RFC 6902 supporting operational transformation and last-writer-wins",
   "author": "Jacob Wright <jacwright@gmail.com>",
   "bugs": {