@dabble/patches 0.7.13 → 0.7.15

package/dist/client/Patches.d.ts

@@ -53,7 +53,7 @@ declare class Patches {
         docId?: string;
     }) => void>;
     readonly onServerCommit: Signal<(docId: string, changes: Change[]) => void>;
-    readonly onTrackDocs: Signal<(docIds: string[]) => void>;
+    readonly onTrackDocs: Signal<(docIds: string[], algorithmName: AlgorithmName) => void>;
     readonly onUntrackDocs: Signal<(docIds: string[]) => void>;
     readonly onDeleteDoc: Signal<(docId: string) => void>;
     /** Emitted when a doc has pending changes ready to send */

package/dist/client/Patches.js

@@ -44,11 +44,11 @@ class Patches {
    * Extracted as a protected method so subclasses can override initialization behavior.
    */
   init() {
-    const algorithms = Object.values(this.algorithms).filter(Boolean);
+    const entries = Object.entries(this.algorithms).filter(([, a]) => Boolean(a));
     Promise.all(
-      algorithms.map(
-        (algorithm) => algorithm.listDocs().then((docs) => {
-          this.trackDocs(docs.map(({ docId }) => docId));
+      entries.map(
+        ([name, algorithm]) => algorithm.listDocs().then((docs) => {
+          this.trackDocs(docs.map(({ docId }) => docId), name);
         })
       )
     ).catch((err) => {
@@ -83,7 +83,7 @@ class Patches {
     docIds = docIds.filter((id) => !this.trackedDocs.has(id));
     if (!docIds.length) return;
     docIds.forEach(this.trackedDocs.add, this.trackedDocs);
-    this.onTrackDocs.emit(docIds);
+    this.onTrackDocs.emit(docIds, algorithmName ?? this.defaultAlgorithm);
     const algorithm = this._getAlgorithm(algorithmName ?? this.defaultAlgorithm);
     await algorithm.trackDocs(docIds);
   }

package/dist/fractionalIndex.js

@@ -202,9 +202,11 @@ function createOrderGetter(orderField) {
 function sortByOrder(items, orderField = "order") {
   const getOrder = createOrderGetter(orderField);
   return Object.entries(items).sort((a, b) => {
-    const orderCmp = getOrder(a[1]).localeCompare(getOrder(b[1]));
+    const orderA = getOrder(a[1]);
+    const orderB = getOrder(b[1]);
+    const orderCmp = orderA < orderB ? -1 : orderA > orderB ? 1 : 0;
     if (orderCmp !== 0) return orderCmp;
-    return a[0].localeCompare(b[0]);
+    return a[0] < b[0] ? -1 : a[0] > b[0] ? 1 : 0;
   });
 }
 function healDuplicateOrders(items, orderField = "order") {

package/dist/json-patch/pathProxy.js

@@ -1,4 +1,5 @@
 import "../chunk-IZ2YBCUP.js";
+import { escapePathComponent } from "./utils/escapePathComponent.js";
 const proxyFodder = {};
 const createPathProxy = pathProxy;
 function pathProxy(path = "") {
@@ -9,7 +10,7 @@ function pathProxy(path = "") {
           return path;
         };
       }
-      return pathProxy(`${path}/${prop}`);
+      return pathProxy(`${path}/${escapePathComponent(prop)}`);
     },
     set(_, prop) {
       throw new Error(

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

@@ -0,0 +1,7 @@
+/**
+ * Escapes a single path component for use in a JSON Pointer (RFC 6901).
+ * `~` is escaped as `~0` and `/` is escaped as `~1`.
+ */
+declare function escapePathComponent(component: string): string;
+
+export { escapePathComponent };

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

@@ -0,0 +1,7 @@
+import "../../chunk-IZ2YBCUP.js";
+function escapePathComponent(component) {
+  return component.replace(/~/g, "~0").replace(/\//g, "~1");
+}
+export {
+  escapePathComponent
+};

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

@@ -1,4 +1,5 @@
 export { deepEqual } from './deepEqual.js';
+export { escapePathComponent } from './escapePathComponent.js';
 export { get } from './get.js';
 export { getOpData } from './getOpData.js';
 export { getType, getTypeLike } from './getType.js';

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

@@ -1,4 +1,5 @@
 export * from "./deepEqual.js";
+export * from "./escapePathComponent.js";
 export * from "./get.js";
 export * from "./getOpData.js";
 export * from "./getType.js";

package/dist/net/PatchesSync.d.ts

@@ -145,7 +145,7 @@ declare class PatchesSync {
      */
     protected _handleDocDeleted(docId: string): Promise<void>;
     protected _handleConnectionChange(connectionState: ConnectionState): void;
-    protected _handleDocsTracked(docIds: string[]): Promise<void>;
+    protected _handleDocsTracked(docIds: string[], algorithmName?: AlgorithmName): Promise<void>;
     protected _handleDocsUntracked(docIds: string[]): Promise<void>;
     protected _handleDocChange(docId: string): Promise<void>;
     /**

package/dist/net/PatchesSync.js

@@ -377,19 +377,25 @@ class PatchesSync {
       this._resetSyncingStatuses();
     }
   }
-  async _handleDocsTracked(docIds) {
+  async _handleDocsTracked(docIds, algorithmName) {
     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)) {
-        if (!algorithm) continue;
-        const docs = await algorithm.listDocs(false);
-        const tracked = docs.find((d) => d.docId === docId);
-        if (tracked?.algorithm) {
-          this.docAlgorithms.set(docId, tracked.algorithm);
-          break;
+    if (algorithmName) {
+      for (const docId of newIds) {
+        this.docAlgorithms.set(docId, algorithmName);
+      }
+    } else {
+      for (const docId of newIds) {
+        for (const algorithm of Object.values(this.patches.algorithms)) {
+          if (!algorithm) continue;
+          const docs = await algorithm.listDocs(false);
+          const tracked = docs.find((d) => d.docId === docId);
+          if (tracked?.algorithm) {
+            this.docAlgorithms.set(docId, tracked.algorithm);
+            break;
+          }
         }
       }
     }
@@ -442,8 +448,7 @@ class PatchesSync {
     if (!this.trackedDocs.has(docId)) return;
     this._updateSyncedDoc(docId, { hasPending: true }, !this.state.connected);
     if (!this.state.connected) return;
-    this._updateSyncedDoc(docId, { syncStatus: "syncing" });
-    await this.flushDoc(docId);
+    await this.syncDoc(docId);
   }
   /**
    * Unified handler for remote document deletion (both real-time notifications and offline discovery).

package/package.json

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