@dabble/patches 0.7.7 → 0.7.9

package/dist/{BaseDoc-DkP3tUhT.d.ts → BaseDoc-_Rsau70J.d.ts}

@@ -8,7 +8,7 @@ import { Change, PatchesSnapshot, SyncingState, ChangeMutator } from './types.js
  * for handling concurrent edits.
  *
  * The `change()` method (inherited from BaseDoc) captures ops and emits them
- * via `onChange` - it does NOT apply locally. The OTStrategy handles packaging
+ * via `onChange` - it does NOT apply locally. The OTAlgorithm handles packaging
  * ops into Changes, persisting them, and calling `applyChanges()` to update state.
  *
  * ## State Model
@@ -90,7 +90,7 @@ interface PatchesDocOptions {
  * Interface for a document synchronized using JSON patches.
  *
  * This is the app-facing interface. The doc captures user changes as JSON Patch
- * ops and emits them via onChange. The strategy handles packaging ops into Changes,
+ * ops and emits them via onChange. The algorithm handles packaging ops into Changes,
  * persisting them, and updating the doc's state.
  *
  * This interface is implemented by both OTDoc (Operational Transformation)
@@ -112,7 +112,7 @@ interface PatchesDoc<T extends object = object> {
     /**
      * Subscribe to be notified when the user makes local changes.
      * Emits the JSON Patch ops captured from the change() call.
-     * The strategy handles packaging these into Changes.
+     * The algorithm handles packaging these into Changes.
      */
     readonly onChange: Signal<(ops: JSONPatchOp[]) => void>;
     /** Subscribe to be notified whenever state changes from any source. */
@@ -123,7 +123,7 @@ interface PatchesDoc<T extends object = object> {
     subscribe(onUpdate: (newValue: T) => void): Unsubscriber;
     /**
      * Captures an update to the document, emitting JSON Patch ops via onChange.
-     * Does NOT apply locally - the strategy handles state updates.
+     * Does NOT apply locally - the algorithm handles state updates.
      * @param mutator Function that uses JSONPatch methods with type-safe paths.
      */
     change(mutator: ChangeMutator<T>): void;
@@ -134,11 +134,11 @@ interface PatchesDoc<T extends object = object> {
  * Contains shared state and methods used by both OTDoc and LWWDoc.
  *
  * The `change()` method captures ops and emits them via `onChange` - it does NOT
- * apply locally. The strategy handles packaging ops, persisting them, and updating
+ * apply locally. The algorithm handles packaging ops, persisting them, and updating
  * the doc's state via `applyChanges()`.
  *
  * Internal methods (updateSyncing, applyChanges, import) are on this class but not
- * on the PatchesDoc interface, as they're only used by Strategy and PatchesSync.
+ * on the PatchesDoc interface, as they're only used by Algorithm and PatchesSync.
  */
 declare abstract class BaseDoc<T extends object = object> implements PatchesDoc<T> {
     protected _id: string;
@@ -147,7 +147,7 @@ declare abstract class BaseDoc<T extends object = object> implements PatchesDoc<
     /**
      * Subscribe to be notified when the user makes local changes.
      * Emits the JSON Patch ops captured from the change() call.
-     * The strategy handles packaging these into Changes.
+     * The algorithm handles packaging these into Changes.
      */
     readonly onChange: Signal<(ops: JSONPatchOp[]) => void>;
     /** Subscribe to be notified whenever state changes from any source. */
@@ -174,7 +174,7 @@ declare abstract class BaseDoc<T extends object = object> implements PatchesDoc<
     subscribe(onUpdate: (newValue: T) => void): Unsubscriber;
     /**
      * Captures an update to the document, emitting JSON Patch ops via onChange.
-     * Does NOT apply locally - the strategy handles state updates via applyChanges.
+     * Does NOT apply locally - the algorithm handles state updates via applyChanges.
      * @param mutator Function that uses JSONPatch methods with type-safe paths.
      */
     change(mutator: ChangeMutator<T>): void;
@@ -186,7 +186,7 @@ declare abstract class BaseDoc<T extends object = object> implements PatchesDoc<
     updateSyncing(newSyncing: SyncingState): void;
     /**
      * Applies changes to the document state.
-     * Called by Strategy for local changes and broadcasts - not part of PatchesDoc interface.
+     * Called by Algorithm for local changes and broadcasts - not part of PatchesDoc interface.
      *
      * For OT: Distinguishes committed (committedAt > 0) vs pending (committedAt === 0) changes.
      * For LWW: Applies all ops from changes and updates metadata.

package/dist/algorithms/lww/consolidateOps.d.ts

@@ -33,7 +33,7 @@ declare function consolidateOps(existingOps: JSONPatchOp[], newOps: JSONPatchOp[
     opsToReturn: JSONPatchOp[];
 };
 /**
- * Any delta ops that aren't combined in consolidateOps need to be converted to replace ops.
+ * Any delta ops that aren't combined in consolidateOps need to be converted to replace/remove ops.
  */
 declare function convertDeltaOps(ops: JSONPatchOp[]): JSONPatchOp[];
 

package/dist/algorithms/lww/consolidateOps.js

@@ -87,6 +87,7 @@ function consolidateOps(existingOps, newOps) {
 }
 function convertDeltaOps(ops) {
   return ops.map((op) => {
+    if (op.op === "remove") return op;
     const combiner = combinableOps[op.op];
     const value = typeof op.value === "string" ? "" : 0;
     if (combiner) return { ...op, op: "replace", value: combiner.apply(value, op.value) };

package/dist/client/BaseDoc.d.ts

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

package/dist/client/BaseDoc.js

@@ -8,7 +8,7 @@ class BaseDoc {
   /**
    * Subscribe to be notified when the user makes local changes.
    * Emits the JSON Patch ops captured from the change() call.
-   * The strategy handles packaging these into Changes.
+   * The algorithm handles packaging these into Changes.
    */
   onChange = signal();
   /** Subscribe to be notified whenever state changes from any source. */
@@ -44,7 +44,7 @@ class BaseDoc {
   }
   /**
    * Captures an update to the document, emitting JSON Patch ops via onChange.
-   * Does NOT apply locally - the strategy handles state updates via applyChanges.
+   * Does NOT apply locally - the algorithm handles state updates via applyChanges.
    * @param mutator Function that uses JSONPatch methods with type-safe paths.
    */
   change(mutator) {

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-DkP3tUhT.js';
+import { a as PatchesDoc } from '../BaseDoc-_Rsau70J.js';
 import { PatchesStore, TrackedDoc } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/IndexedDBStore.d.ts

@@ -7,10 +7,10 @@ import '@dabble/delta';
 import '../json-patch/types.js';
 
 /**
- * IndexedDB store providing common database operations for all sync strategies.
+ * IndexedDB store providing common database operations for all sync algorithms.
  *
  * Can be used as a standalone store or as a shared database connection
- * for multiple strategy-specific stores (OT, LWW).
+ * for multiple algorithm-specific stores (OT, LWW).
  *
  * Provides:
  * - Database lifecycle management (open, close, delete)
@@ -18,7 +18,7 @@ import '../json-patch/types.js';
  * - Document tracking (listDocs, trackDocs, untrackDocs)
  * - Basic document operations (deleteDoc, confirmDeleteDoc)
  * - Revision tracking
- * - Extensibility via onUpgrade signal for strategy-specific stores
+ * - Extensibility via onUpgrade signal for algorithm-specific stores
  */
 declare class IndexedDBStore implements PatchesStore {
     private static readonly DB_VERSION;
@@ -26,13 +26,13 @@ declare class IndexedDBStore implements PatchesStore {
     protected dbName?: string;
     protected dbPromise: Deferred<IDBDatabase>;
     /**
-     * Signal emitted during database upgrade, allowing strategy-specific stores
+     * Signal emitted during database upgrade, allowing algorithm-specific stores
      * to create their object stores.
      */
     readonly onUpgrade: Signal<(db: IDBDatabase, oldVersion: number, transaction: IDBTransaction) => void>;
     constructor(dbName?: string);
     /**
-     * Creates shared object stores used by all sync strategies.
+     * Creates shared object stores used by all sync algorithms.
      */
     protected createSharedStores(db: IDBDatabase, _oldVersion: number, _transaction: IDBTransaction): void;
     protected initDB(): Promise<void>;
@@ -52,19 +52,19 @@ declare class IndexedDBStore implements PatchesStore {
     transaction(storeNames: string[], mode: IDBTransactionMode): Promise<[IDBTransactionWrapper, ...IDBStoreWrapper[]]>;
     /**
      * Retrieves the current document snapshot from storage.
-     * Implementation varies by sync strategy (OT vs LWW).
-     * This base implementation throws an error - override in strategy-specific stores.
+     * Implementation varies by sync algorithm (OT vs LWW).
+     * This base implementation throws an error - override in algorithm-specific stores.
      */
     getDoc(_docId: string): Promise<PatchesSnapshot | undefined>;
     /**
      * Saves the current document state to persistent storage.
-     * Implementation varies by sync strategy.
-     * This base implementation throws an error - override in strategy-specific stores.
+     * Implementation varies by sync algorithm.
+     * This base implementation throws an error - override in algorithm-specific stores.
      */
     saveDoc(_docId: string, _docState: PatchesState): Promise<void>;
     /**
      * Completely remove all data for this docId and mark it as deleted (tombstone).
-     * This base implementation throws an error - override in strategy-specific stores.
+     * This base implementation throws an error - override in algorithm-specific stores.
      */
     deleteDoc(_docId: string): Promise<void>;
     /**
@@ -88,7 +88,7 @@ declare class IndexedDBStore implements PatchesStore {
     /**
      * Untrack a document.
      * @param docIds - The IDs of the documents to untrack.
-     * This base implementation throws an error - override in strategy-specific stores.
+     * This base implementation throws an error - override in algorithm-specific stores.
      */
     untrackDocs(_docIds: string[]): Promise<void>;
     /**

package/dist/client/IndexedDBStore.js

@@ -7,7 +7,7 @@ class IndexedDBStore {
   dbName;
   dbPromise;
   /**
-   * Signal emitted during database upgrade, allowing strategy-specific stores
+   * Signal emitted during database upgrade, allowing algorithm-specific stores
    * to create their object stores.
    */
   onUpgrade = signal();
@@ -22,7 +22,7 @@ class IndexedDBStore {
     }
   }
   /**
-   * Creates shared object stores used by all sync strategies.
+   * Creates shared object stores used by all sync algorithms.
    */
   createSharedStores(db, _oldVersion, _transaction) {
     if (!db.objectStoreNames.contains("docs")) {
@@ -94,30 +94,30 @@ class IndexedDBStore {
     const stores = storeNames.map((name) => tx.getStore(name));
     return [tx, ...stores];
   }
-  // ─── Strategy-Specific Methods ───────────────────────────────────────────
-  // These are implemented by strategy-specific stores (OT, LWW)
+  // ─── Algorithm-Specific Methods ──────────────────────────────────────────
+  // These are implemented by algorithm-specific stores (OT, LWW)
   /**
    * Retrieves the current document snapshot from storage.
-   * Implementation varies by sync strategy (OT vs LWW).
-   * This base implementation throws an error - override in strategy-specific stores.
+   * Implementation varies by sync algorithm (OT vs LWW).
+   * This base implementation throws an error - override in algorithm-specific stores.
    */
   async getDoc(_docId) {
-    throw new Error("getDoc must be implemented by strategy-specific store");
+    throw new Error("getDoc must be implemented by algorithm-specific store");
   }
   /**
    * Saves the current document state to persistent storage.
-   * Implementation varies by sync strategy.
-   * This base implementation throws an error - override in strategy-specific stores.
+   * Implementation varies by sync algorithm.
+   * This base implementation throws an error - override in algorithm-specific stores.
    */
   async saveDoc(_docId, _docState) {
-    throw new Error("saveDoc must be implemented by strategy-specific store");
+    throw new Error("saveDoc must be implemented by algorithm-specific store");
   }
   /**
    * Completely remove all data for this docId and mark it as deleted (tombstone).
-   * This base implementation throws an error - override in strategy-specific stores.
+   * This base implementation throws an error - override in algorithm-specific stores.
    */
   async deleteDoc(_docId) {
-    throw new Error("deleteDoc must be implemented by strategy-specific store");
+    throw new Error("deleteDoc must be implemented by algorithm-specific store");
   }
   /**
    * Confirm the deletion of a document.
@@ -180,10 +180,10 @@ class IndexedDBStore {
   /**
    * Untrack a document.
    * @param docIds - The IDs of the documents to untrack.
-   * This base implementation throws an error - override in strategy-specific stores.
+   * This base implementation throws an error - override in algorithm-specific stores.
    */
   async untrackDocs(_docIds) {
-    throw new Error("untrackDocs must be implemented by strategy-specific store");
+    throw new Error("untrackDocs must be implemented by algorithm-specific store");
   }
   /**
    * Returns the last committed revision for a document.

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-DkP3tUhT.js';
+import { a as PatchesDoc } from '../BaseDoc-_Rsau70J.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-DkP3tUhT.js';
+import { B as BaseDoc } from '../BaseDoc-_Rsau70J.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';
@@ -9,13 +9,13 @@ import '../event-signal.js';
  * LWW (Last-Write-Wins) document implementation.
  *
  * The `change()` method (inherited from BaseDoc) captures ops and emits them
- * via `onChange` - it does NOT apply locally. The LWWStrategy handles:
+ * via `onChange` - it does NOT apply locally. The LWWAlgorithm handles:
  * - Packaging ops with timestamps
  * - Merging with pending fields
  * - Updating the doc's state via `applyChanges()`
  *
  * Unlike OTDoc, LWWDoc doesn't need to track committed vs pending state
- * separately - the strategy handles all conflict resolution by timestamp.
+ * separately - the algorithm handles all conflict resolution by timestamp.
  *
  * ## Wire Efficiency
  * For Worker-Tab communication, `applyChanges()` sends only changes over the wire,

package/dist/client/LWWIndexedDBStore.d.ts

@@ -9,7 +9,7 @@ import '../event-signal.js';
 import '../utils/deferred.js';
 
 /**
- * IndexedDB store implementation for Last-Writer-Wins (LWW) sync strategy.
+ * IndexedDB store implementation for Last-Writer-Wins (LWW) sync algorithm.
  *
  * Creates stores:
  * - docs<{ docId: string; committedRev: number; deleted?: boolean }> (primary key: docId) [shared with OT]

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

package/dist/client/OTIndexedDBStore.d.ts

@@ -9,7 +9,7 @@ import '../event-signal.js';
 import '../utils/deferred.js';
 
 /**
- * IndexedDB store implementation for Operational Transformation (OT) sync strategy.
+ * IndexedDB store implementation for Operational Transformation (OT) sync algorithm.
  *
  * Creates stores:
  * - snapshots<{ docId: string; rev: number; state: any }> (primary key: docId) [shared]

package/dist/client/Patches.d.ts

@@ -2,7 +2,7 @@ import { Unsubscriber, Signal } from '../event-signal.js';
 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-DkP3tUhT.js';
+import { P as PatchesDocOptions, a as PatchesDoc } from '../BaseDoc-_Rsau70J.js';
 import { AlgorithmName } from './PatchesStore.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';

package/dist/client/PatchesDoc.d.ts

@@ -1,6 +1,6 @@
 import '../event-signal.js';
 import '../json-patch/types.js';
 import '../types.js';
-export { O as OTDoc, a as PatchesDoc, O as PatchesDocClass, P as PatchesDocOptions } from '../BaseDoc-DkP3tUhT.js';
+export { O as OTDoc, a as PatchesDoc, O as PatchesDocClass, P as PatchesDocOptions } from '../BaseDoc-_Rsau70J.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-DkP3tUhT.js';
+import { P as PatchesDocOptions } from '../BaseDoc-_Rsau70J.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, O as PatchesDocClass, P as PatchesDocOptions } from '../BaseDoc-DkP3tUhT.js';
+export { B as BaseDoc, O as OTDoc, a as PatchesDoc, O as PatchesDocClass, P as PatchesDocOptions } from '../BaseDoc-_Rsau70J.js';
 export { IndexedDBFactoryOptions, MultiAlgorithmFactoryOptions, MultiAlgorithmIndexedDBFactoryOptions, PatchesFactoryOptions, createLWWIndexedDBPatches, createLWWPatches, createMultiAlgorithmIndexedDBPatches, createMultiAlgorithmPatches, createOTIndexedDBPatches, createOTPatches } 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, O as PatchesDocClass, P as PatchesDocOptions } from './BaseDoc-DkP3tUhT.js';
+export { B as BaseDoc, O as OTDoc, a as PatchesDoc, O as PatchesDocClass, P as PatchesDocOptions } from './BaseDoc-_Rsau70J.js';
 export { IndexedDBFactoryOptions, MultiAlgorithmFactoryOptions, MultiAlgorithmIndexedDBFactoryOptions, PatchesFactoryOptions, createLWWIndexedDBPatches, createLWWPatches, createMultiAlgorithmIndexedDBPatches, createMultiAlgorithmPatches, createOTIndexedDBPatches, createOTPatches } from './client/factories.js';
 export { IDBStoreWrapper, IDBTransactionWrapper, IndexedDBStore } from './client/IndexedDBStore.js';
 export { OTIndexedDBStore } from './client/OTIndexedDBStore.js';

package/dist/net/PatchesClient.d.ts

@@ -42,7 +42,7 @@ declare class PatchesClient implements PatchesAPI {
      * @param docId - The ID of the document.
      * @returns A promise resolving with the document snapshot.
      */
-    getDoc<T = any>(docId: string, atRev?: number): Promise<PatchesState<T>>;
+    getDoc<T = any>(docId: string): Promise<PatchesState<T>>;
     /**
      * Gets changes that occurred for a document after a specific revision number.
      * @param docId - The ID of the document.

package/dist/net/PatchesClient.js

@@ -49,8 +49,8 @@ class PatchesClient {
    * @param docId - The ID of the document.
    * @returns A promise resolving with the document snapshot.
    */
-  async getDoc(docId, atRev) {
-    return this.rpc.call("getDoc", docId, atRev);
+  async getDoc(docId) {
+    return this.rpc.call("getDoc", docId);
   }
   /**
    * Gets changes that occurred for a document after a specific revision number.

package/dist/net/PatchesSync.d.ts

@@ -5,15 +5,15 @@ import { JSONRPCClient } from './protocol/JSONRPCClient.js';
 import { PatchesWebSocket } from './websocket/PatchesWebSocket.js';
 import { WebSocketOptions } from './websocket/WebSocketTransport.js';
 import { SizeCalculator } from '../algorithms/ot/shared/changeBatching.js';
+import { ClientAlgorithm } from '../client/ClientAlgorithm.js';
 import { Patches } from '../client/Patches.js';
 import { AlgorithmName } from '../client/PatchesStore.js';
-import { ClientAlgorithm } from '../client/ClientAlgorithm.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../json-patch/types.js';
 import './PatchesClient.js';
 import '../utils/deferred.js';
-import '../BaseDoc-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.js';
 
 interface PatchesSyncState {
     online: boolean;
@@ -142,6 +142,16 @@ declare class PatchesSync {
      * Cleans up local state and notifies the application with any pending changes that were lost.
      */
     protected _handleRemoteDocDeleted(docId: string): Promise<void>;
+    /**
+     * Applies the subscribeFilter option to a list of doc IDs, returning the subset
+     * that should be sent to ws.subscribe/unsubscribe. Returns the full list if no filter is set.
+     */
+    protected _filterSubscribeIds(docIds: string[]): string[];
+    /**
+     * Returns the set of doc IDs currently subscribed on the server, derived by
+     * applying the subscribe filter to the full tracked set.
+     */
+    protected _getActiveSubscriptions(): Set<string>;
     /**
      * Helper to detect DOC_DELETED (410) errors from the server.
      */

package/dist/net/PatchesSync.js

@@ -155,7 +155,7 @@ class PatchesSync {
       this.trackedDocs = new Set(activeDocIds);
       if (activeDocIds.length > 0) {
         try {
-          const subscribeIds = this.options?.subscribeFilter?.(activeDocIds) || activeDocIds;
+          const subscribeIds = this._filterSubscribeIds(activeDocIds);
           if (subscribeIds.length) {
             await this.ws.subscribe(subscribeIds);
           }
@@ -318,6 +318,7 @@ class PatchesSync {
   async _handleDocsTracked(docIds) {
     const newIds = docIds.filter((id) => !this.trackedDocs.has(id));
     if (!newIds.length) return;
+    const alreadySubscribed = this._getActiveSubscriptions();
     newIds.forEach((id) => this.trackedDocs.add(id));
     for (const docId of newIds) {
       for (const algorithm of Object.values(this.patches.algorithms)) {
@@ -330,13 +331,9 @@ class PatchesSync {
         }
       }
     }
-    let subscribeIds = newIds;
-    if (this.options?.subscribeFilter) {
-      const alreadyTracked = this.options.subscribeFilter([...this.trackedDocs]);
-      subscribeIds = subscribeIds.filter((id) => !alreadyTracked.includes(id));
-    }
     if (this.state.connected) {
       try {
+        const subscribeIds = this._filterSubscribeIds(newIds).filter((id) => !alreadySubscribed.has(id));
         if (subscribeIds.length) {
           await this.ws.subscribe(subscribeIds);
         }
@@ -350,8 +347,10 @@ class PatchesSync {
   async _handleDocsUntracked(docIds) {
     const existingIds = docIds.filter((id) => this.trackedDocs.has(id));
     if (!existingIds.length) return;
+    const subscribedBefore = this._getActiveSubscriptions();
     existingIds.forEach((id) => this.trackedDocs.delete(id));
-    const unsubscribeIds = this.options?.subscribeFilter?.(existingIds) || existingIds;
+    const subscribedAfter = this._getActiveSubscriptions();
+    const unsubscribeIds = [...subscribedBefore].filter((id) => !subscribedAfter.has(id));
     if (this.state.connected && unsubscribeIds.length) {
       try {
         await this.ws.unsubscribe(unsubscribeIds);
@@ -380,6 +379,20 @@ class PatchesSync {
     await algorithm.confirmDeleteDoc(docId);
     await this.onRemoteDocDeleted.emit(docId, pendingChanges);
   }
+  /**
+   * Applies the subscribeFilter option to a list of doc IDs, returning the subset
+   * that should be sent to ws.subscribe/unsubscribe. Returns the full list if no filter is set.
+   */
+  _filterSubscribeIds(docIds) {
+    return this.options?.subscribeFilter?.(docIds) || docIds;
+  }
+  /**
+   * Returns the set of doc IDs currently subscribed on the server, derived by
+   * applying the subscribe filter to the full tracked set.
+   */
+  _getActiveSubscriptions() {
+    return new Set(this._filterSubscribeIds([...this.trackedDocs]));
+  }
   /**
    * Helper to detect DOC_DELETED (410) errors from the server.
    */

package/dist/net/index.d.ts

@@ -15,11 +15,11 @@ export { WebSocketOptions, WebSocketTransport } from './websocket/WebSocketTrans
 export { CommitChangesOptions } from '../types.js';
 import '../event-signal.js';
 import '../algorithms/ot/shared/changeBatching.js';
-import '../client/Patches.js';
-import '../json-patch/types.js';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-DkP3tUhT.js';
+import '../json-patch/types.js';
+import '../BaseDoc-_Rsau70J.js';
 import '../client/PatchesStore.js';
+import '../client/Patches.js';
 import '../server/types.js';
 import '../utils/deferred.js';
 import '../json-patch/JSONPatch.js';

package/dist/net/protocol/JSONRPCClient.js

@@ -24,6 +24,7 @@ class JSONRPCClient {
    */
   async call(method, ...args) {
     const id = this.nextId++;
+    while (args.length > 0 && args[args.length - 1] === void 0) args.pop();
     const params = args.length > 0 ? args : void 0;
     const message = { jsonrpc: "2.0", id, method, params };
     return new Promise((resolve, reject) => {
@@ -38,6 +39,7 @@ class JSONRPCClient {
    * @param args - The arguments to pass to the remote procedure (sent as array)
    */
   notify(method, ...args) {
+    while (args.length > 0 && args[args.length - 1] === void 0) args.pop();
     const params = args.length > 0 ? args : void 0;
     const message = { jsonrpc: "2.0", method, params };
     this.transport.send(JSON.stringify(message));

package/dist/net/protocol/JSONRPCServer.js

@@ -52,6 +52,13 @@ class JSONRPCServer {
         throw new Error(`Method '${method}' not found on object`);
       }
       this.registerMethod(method, async (...args) => {
+        const docId = args[0];
+        if (typeof docId !== "string" || !docId) {
+          throw new StatusError(
+            400,
+            `INVALID_REQUEST: docId is required (got ${docId === "" ? "empty string" : String(docId)})`
+          );
+        }
         const ctx = getAuthContext();
         await this.assertAccess(access, ctx, method, args);
         return obj[method](...args);
@@ -132,7 +139,12 @@ class JSONRPCServer {
   async assertAccess(access, ctx, method, args) {
     if (!this.auth) return;
     const docId = args?.[0];
-    if (typeof docId !== "string") return;
+    if (typeof docId !== "string" || !docId) {
+      throw new StatusError(
+        400,
+        `INVALID_REQUEST: docId is required (got ${docId === "" ? "empty string" : String(docId)})`
+      );
+    }
     const ok = await this.auth.canAccess(ctx, docId, access, method);
     if (!ok) {
       throw new StatusError(401, `${access.toUpperCase()}_FORBIDDEN:${docId}`);

package/dist/net/protocol/types.d.ts

@@ -119,7 +119,7 @@ interface PatchesAPI {
      */
     unsubscribe(ids: string | string[]): Promise<void>;
     /** Get the latest version of a document and changes since the last version. */
-    getDoc(docId: string, atRev?: number): Promise<PatchesState>;
+    getDoc(docId: string): Promise<PatchesState>;
     /** Get changes that occurred after a specific revision. */
     getChangesSince(docId: string, rev: number): Promise<Change[]>;
     /** Apply a set of changes from the client to a document. Returns the committed changes. */

package/dist/net/websocket/WebSocketServer.d.ts

@@ -42,20 +42,14 @@ declare class WebSocketServer {
     /**
      * Subscribes the client to one or more documents to receive real-time updates.
      * If a document has been deleted (tombstone exists), sends immediate docDeleted notification.
-     * @param params - The subscription parameters
-     * @param params.ids - Document ID or IDs to subscribe to
+     * @param ids - Document ID or IDs to subscribe to
      */
-    subscribe(params: {
-        ids: string | string[];
-    }): Promise<string[]>;
+    subscribe(ids: string | string[]): Promise<string[]>;
     /**
      * Unsubscribes the client from one or more documents.
-     * @param params - The unsubscription parameters
-     * @param params.ids - Document ID or IDs to unsubscribe from
+     * @param ids - Document ID or IDs to unsubscribe from
      */
-    unsubscribe(params: {
-        ids: string | string[];
-    }): Promise<string[]>;
+    unsubscribe(ids: string | string[]): Promise<string[]>;
 }
 
 export { WebSocketServer, type WebSocketServerOptions };

package/dist/net/websocket/WebSocketServer.js

@@ -39,19 +39,17 @@ class WebSocketServer {
   /**
    * Subscribes the client to one or more documents to receive real-time updates.
    * If a document has been deleted (tombstone exists), sends immediate docDeleted notification.
-   * @param params - The subscription parameters
-   * @param params.ids - Document ID or IDs to subscribe to
+   * @param ids - Document ID or IDs to subscribe to
    */
-  async subscribe(params) {
+  async subscribe(ids) {
     const ctx = getAuthContext();
     if (!ctx?.clientId) return [];
-    const { ids } = params;
     const allIds = Array.isArray(ids) ? ids : [ids];
     const allowed = [];
     await Promise.all(
       allIds.map(async (id) => {
         try {
-          if (await this.auth.canAccess(ctx, id, "read", "subscribe", params)) {
+          if (await this.auth.canAccess(ctx, id, "read", "subscribe")) {
             allowed.push(id);
           }
         } catch (err) {
@@ -75,13 +73,11 @@ class WebSocketServer {
   }
   /**
    * Unsubscribes the client from one or more documents.
-   * @param params - The unsubscription parameters
-   * @param params.ids - Document ID or IDs to unsubscribe from
+   * @param ids - Document ID or IDs to unsubscribe from
    */
-  async unsubscribe(params) {
+  async unsubscribe(ids) {
     const ctx = getAuthContext();
     if (!ctx?.clientId) return [];
-    const { ids } = params;
     return this.transport.removeSubscription(ctx.clientId, Array.isArray(ids) ? ids : [ids]);
   }
 }

package/dist/server/LWWBranchManager.d.ts

@@ -64,11 +64,11 @@ declare class LWWBranchManager implements BranchManager {
      * @param branchId - The branch document ID.
      * @param status - The status to set (defaults to 'closed').
      */
-    closeBranch(branchId: string, status?: Exclude<BranchStatus, 'open'>): Promise<void>;
+    closeBranch(branchId: string, status?: Exclude<BranchStatus, 'open'> | null): Promise<void>;
     /**
      * Merges a branch back into its source document.
      *
-     * LWW merge strategy:
+     * LWW merge algorithm:
      * 1. Get all ops changes made on the branch since it was created
      * 2. Apply those changes to the source document
      * 3. Timestamps automatically resolve any conflicts (later wins)

package/dist/server/LWWBranchManager.js

@@ -61,13 +61,13 @@ class LWWBranchManager {
    * @param branchId - The branch document ID.
    * @param status - The status to set (defaults to 'closed').
    */
-  async closeBranch(branchId, status = "closed") {
-    await this.store.updateBranch(branchId, { status });
+  async closeBranch(branchId, status) {
+    await this.store.updateBranch(branchId, { status: status ?? "closed" });
   }
   /**
    * Merges a branch back into its source document.
    *
-   * LWW merge strategy:
+   * LWW merge algorithm:
    * 1. Get all ops changes made on the branch since it was created
    * 2. Apply those changes to the source document
    * 3. Timestamps automatically resolve any conflicts (later wins)

package/dist/server/OTBranchManager.d.ts

@@ -60,7 +60,7 @@ declare class OTBranchManager implements BranchManager {
      * @param branchId - The ID of the branch to close.
      * @param status - The status to set for the branch.
      */
-    closeBranch(branchId: string, status?: Exclude<BranchStatus, 'open'>): Promise<void>;
+    closeBranch(branchId: string, status?: Exclude<BranchStatus, 'open'> | null): Promise<void>;
     /**
      * Merges changes from a branch back into its source document.
      * @param branchId - The ID of the branch document to merge.

package/dist/server/OTBranchManager.js

@@ -70,8 +70,8 @@ class OTBranchManager {
    * @param branchId - The ID of the branch to close.
    * @param status - The status to set for the branch.
    */
-  async closeBranch(branchId, status = "closed") {
-    await this.store.updateBranch(branchId, { status });
+  async closeBranch(branchId, status) {
+    await this.store.updateBranch(branchId, { status: status ?? "closed" });
   }
   /**
    * Merges changes from a branch back into its source document.

package/dist/server/branchUtils.d.ts

@@ -77,6 +77,6 @@ declare function wrapMergeCommit<T>(branchId: string, sourceDocId: string, commi
  */
 declare function closeBranch(store: {
     updateBranch(branchId: string, updates: Partial<Pick<Branch, 'status' | 'name'>>): Promise<void>;
-}, branchId: string, status?: Exclude<BranchStatus, 'open'>): Promise<void>;
+}, branchId: string, status?: Exclude<BranchStatus, 'open'> | null): Promise<void>;
 
 export { type BranchIdGenerator, type BranchLoader, assertBranchMetadata, assertBranchOpenForMerge, assertNotABranch, branchManagerApi, closeBranch, createBranchRecord, generateBranchId, wrapMergeCommit };

package/dist/server/branchUtils.js

@@ -51,8 +51,8 @@ async function wrapMergeCommit(branchId, sourceDocId, commitFn) {
     throw new Error(`Merge failed: ${error instanceof Error ? error.message : String(error)}`);
   }
 }
-async function closeBranch(store, branchId, status = "closed") {
-  await store.updateBranch(branchId, { status });
+async function closeBranch(store, branchId, status) {
+  await store.updateBranch(branchId, { status: status ?? "closed" });
 }
 export {
   assertBranchMetadata,

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

@@ -1,5 +1,5 @@
 import { Patches, OpenDocOptions } from '../client/Patches.js';
-import { a as PatchesDoc } from '../BaseDoc-DkP3tUhT.js';
+import { a as PatchesDoc } from '../BaseDoc-_Rsau70J.js';
 import '../event-signal.js';
 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-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.js';
 import '../client/PatchesStore.js';
 import '../net/protocol/types.js';
 import '../net/protocol/JSONRPCClient.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-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.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-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.js';
 import '../client/PatchesStore.js';
 import '../net/PatchesSync.js';
 import '../net/protocol/types.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-DkP3tUhT.js';
+import { a as PatchesDoc } from '../BaseDoc-_Rsau70J.js';
 import { JSONPatch } from '../json-patch/JSONPatch.js';
 import { ChangeMutator } from '../types.js';
 import '../event-signal.js';

package/dist/solid/primitives.js

@@ -66,7 +66,24 @@ function createDocReactiveState(options) {
     change,
     doc
   };
-  return { doc, setDoc, data, setData, loading, setLoading, error, setError, rev, setRev, hasPending, setHasPending, setupDoc, resetSignals, change, baseReturn };
+  return {
+    doc,
+    setDoc,
+    data,
+    setData,
+    loading,
+    setLoading,
+    error,
+    setError,
+    rev,
+    setRev,
+    hasPending,
+    setHasPending,
+    setupDoc,
+    resetSignals,
+    change,
+    baseReturn
+  };
 }
 function usePatchesDoc(docIdOrOptions, options) {
   if (typeof docIdOrOptions === "string" || typeof docIdOrOptions === "function") {

package/dist/vue/composables.d.ts

@@ -1,6 +1,6 @@
 import { ShallowRef, Ref, MaybeRef } from 'vue';
 import { OpenDocOptions } from '../client/Patches.js';
-import { a as PatchesDoc } from '../BaseDoc-DkP3tUhT.js';
+import { a as PatchesDoc } from '../BaseDoc-_Rsau70J.js';
 import { JSONPatch } from '../json-patch/JSONPatch.js';
 import { ChangeMutator } from '../types.js';
 import '../event-signal.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-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.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-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.js';
 import '../client/PatchesStore.js';
 import '../net/PatchesSync.js';
 import '../net/protocol/types.js';

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

@@ -6,7 +6,7 @@ import '../types.js';
 import '../json-patch/JSONPatch.js';
 import '@dabble/delta';
 import '../client/ClientAlgorithm.js';
-import '../BaseDoc-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.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-DkP3tUhT.js';
+import '../BaseDoc-_Rsau70J.js';
 import '../client/PatchesStore.js';
 import '../net/protocol/types.js';
 import '../net/protocol/JSONRPCClient.js';

package/package.json

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