@absolutejs/sync 1.18.0 → 1.18.2

package/dist/client/index.js

@@ -789,6 +789,7 @@ var createSyncCollection = (options) => {
   let attempt = 0;
   let reconnectTimer;
   let appliedVersion = 0;
+  let appliedCursor;
   const persist = () => {
     options.storage?.save(pending.map((mutation) => ({
       mutationId: mutation.mutationId,
@@ -828,6 +829,9 @@ var createSyncCollection = (options) => {
       if (frame.version !== undefined) {
         appliedVersion = frame.version;
       }
+      if (frame.cursor !== undefined) {
+        appliedCursor = frame.cursor;
+      }
       persistCache();
       recompute({ status: "ready", error: undefined });
     } else if (frame.type === "diff") {
@@ -840,6 +844,9 @@ var createSyncCollection = (options) => {
       for (const row of frame.changed) {
         confirmed.set(key(row), row);
       }
+      if (frame.cursor !== undefined) {
+        appliedCursor = frame.cursor;
+      }
       if (frame.version !== undefined) {
         appliedVersion = Math.max(appliedVersion, frame.version);
       }
@@ -890,7 +897,7 @@ var createSyncCollection = (options) => {
         id: SUBSCRIPTION_ID,
         collection: options.collection,
         params: options.params,
-        since: appliedVersion > 0 ? appliedVersion : undefined
+        since: appliedCursor ?? (appliedVersion > 0 ? appliedVersion : undefined)
       }));
       for (const mutation of pending) {
         sendMutate(mutation);
@@ -1267,6 +1274,9 @@ var createSyncClient = (options) => {
       if (frame.version !== undefined) {
         entry.appliedVersion = frame.version;
       }
+      if (frame.cursor !== undefined) {
+        entry.cursor = frame.cursor;
+      }
       recompute(entry, { status: "ready", error: undefined });
     } else if (frame.type === "diff") {
       const entry = entries.get(frame.id);
@@ -1277,6 +1287,9 @@ var createSyncClient = (options) => {
       if (frame.version !== undefined) {
         entry.appliedVersion = Math.max(entry.appliedVersion, frame.version);
       }
+      if (frame.cursor !== undefined) {
+        entry.cursor = frame.cursor;
+      }
       recompute(entry);
     } else if (frame.type === "frame") {
       const affected = new Set;
@@ -1289,6 +1302,9 @@ var createSyncClient = (options) => {
         if (frame.version !== undefined) {
           entry.appliedVersion = Math.max(entry.appliedVersion, frame.version);
         }
+        if (frame.cursor !== undefined) {
+          entry.cursor = frame.cursor;
+        }
         rebuild(entry);
         affected.add(entry);
       }
@@ -1321,12 +1337,13 @@ var createSyncClient = (options) => {
     socket?.send(payload);
   };
   const sendSubscribe = (entry) => {
+    const since = entry.cursor ?? (entry.appliedVersion > 0 ? entry.appliedVersion : undefined);
     wsSend(serializer.encodeClient({
       type: "subscribe",
       id: entry.id,
       collection: entry.collection,
       params: entry.params,
-      since: entry.appliedVersion > 0 ? entry.appliedVersion : undefined
+      since
     }));
   };
   const sendMutate = (mutation) => {
@@ -1389,6 +1406,7 @@ var createSyncClient = (options) => {
       state: { data: [], status: "connecting", error: undefined },
       listeners: new Set,
       appliedVersion: 0,
+      cursor: undefined,
       closed: false
     };
     entries.set(entryId, entry);
@@ -1541,6 +1559,7 @@ var syncStore = (options) => {
   let attempt = 0;
   let reconnectTimer;
   let appliedVersion = 0;
+  let appliedCursor;
   const applyFrame = (frame) => {
     if (frame.type === "snapshot") {
       confirmed.clear();
@@ -1550,6 +1569,9 @@ var syncStore = (options) => {
       if (frame.version !== undefined) {
         appliedVersion = frame.version;
       }
+      if (frame.cursor !== undefined) {
+        appliedCursor = frame.cursor;
+      }
       recompute({ status: "ready", error: undefined });
       reconcileSettled();
     } else if (frame.type === "diff") {
@@ -1565,6 +1587,9 @@ var syncStore = (options) => {
       if (frame.version !== undefined) {
         appliedVersion = Math.max(appliedVersion, frame.version);
       }
+      if (frame.cursor !== undefined) {
+        appliedCursor = frame.cursor;
+      }
       recompute();
       reconcileSettled();
     } else if (frame.type === "error") {
@@ -1624,7 +1649,7 @@ var syncStore = (options) => {
         id: SUBSCRIPTION_ID2,
         collection: options.collection,
         params: options.params,
-        since: appliedVersion > 0 ? appliedVersion : undefined
+        since: appliedCursor ?? (appliedVersion > 0 ? appliedVersion : undefined)
       }));
       for (const mutation of pending) {
         if (!mutation.settled && !mutation.inFlight) {
@@ -1791,5 +1816,5 @@ export {
   createCollaborativeText
 };
 
-//# debugId=91907A0D295C48AD64756E2164756E21
+//# debugId=12EB9063154AECE864756E2164756E21
 //# sourceMappingURL=index.js.map