@tanstack/electric-db-collection 0.5.4 → 0.5.5

package/dist/esm/electric.js

@@ -1,7 +1,7 @@
-import { isVisibleInSnapshot, isChangeMessage, ShapeStream, isControlMessage } from "@electric-sql/client";
+import { isVisibleInSnapshot, isChangeMessage, isControlMessage, ShapeStream } from "@electric-sql/client";
 import { isChangeMessage as isChangeMessage2, isControlMessage as isControlMessage2 } from "@electric-sql/client";
 import DebugModule from "debug";
-import { withCollectionSyncConfigFactory, withCollectionConfigFactory, validateSyncPersistenceCapability, warnOnce, withCollectionSyncConfigCleanup, DeduplicatedLoadSubset, and, LoadSubsetOperationAbortedError } from "@tanstack/db";
+import { withCollectionSyncConfigFactory, withCollectionConfigFactory, warnOnce, withCollectionSyncConfigCleanup, validateSyncPersistenceCapability, DeduplicatedLoadSubset, whenSyncAccepted, and, LoadSubsetOperationAbortedError } from "@tanstack/db";
 import { StreamAbortedError, ExpectedNumberInAwaitTxIdError, TimeoutWaitingForTxIdError, TimeoutWaitingForMatchError } from "./errors.js";
 import { compileSQL } from "./sql-compiler.js";
 import { isMoveOutMessage, isMoveInMessage, deriveDisjunctPositions, getTagLength, addTagToIndex, parseTag, removeTagFromIndex, findRowsMatchingPattern, rowVisible, tagMatchesPattern } from "./tag-index.js";
@@ -187,10 +187,11 @@ function createLoadSubsetDedupe({
       const snapshotParams = compileSQL(opts, compileOptions);
       try {
         const { data: rows } = await stream.fetchSnapshot(snapshotParams);
-        if (opts.signal?.aborted || !isBufferingInitialSync()) {
+        if (!isBufferingInitialSync()) {
           debug(`${logPrefix}Ignoring snapshot - sync completed while fetching`);
           return;
         }
+        throwIfAborted();
         if (rows.length > 0) {
           begin();
           for (const row of rows) {
@@ -206,12 +207,13 @@ function createLoadSubsetDedupe({
           debug(`${logPrefix}Applied snapshot with ${rows.length} rows`);
         }
       } catch (error) {
-        if (opts.signal?.aborted) return;
         if (handleSnapshotError(error, `fetchSnapshot`)) {
           return;
         }
+        if (opts.signal?.aborted) throw abortReason(opts.signal);
         throw error;
       }
+      if (opts.signal?.aborted) throw abortReason(opts.signal);
       return;
     }
     if (syncMode === `progressive`) {
@@ -933,8 +935,8 @@ function createElectricSync(shapeOptions, options) {
         return applied;
       };
       const beginSourceTransaction = () => {
-        if (metadata?.persistence) begin({ immediate: true });
-        else begin();
+        begin();
+        metadata?.persistence?.reserveCommitTurn();
       };
       const syncedKeys = /* @__PURE__ */ new Set();
       let resumeInvalid = false;
@@ -965,7 +967,7 @@ function createElectricSync(shapeOptions, options) {
         };
         lifecycle.resumeState = resetState;
         if (metadata) {
-          begin({ immediate: true });
+          begin();
           metadata.collection.set(`electric:resume`, resetState);
           if (expectInResumeSnapshot) {
             expectCurrentCommit?.();
@@ -1272,11 +1274,18 @@ function createElectricSync(shapeOptions, options) {
             }
           }
           const readyErrorVersion = streamErrorVersion;
-          if (applied === true) {
+          const accepted = whenSyncAccepted(applied);
+          if (accepted === true) {
             wrappedMarkReady(wasBufferingInitialSync, readyErrorVersion);
           } else {
-            void applied.then(
+            void accepted.then(
               () => wrappedMarkReady(wasBufferingInitialSync, readyErrorVersion),
+              () => void 0
+            );
+          }
+          if (applied !== true) {
+            void applied.then(
+              () => void 0,
               (error) => {
                 if (!isActiveLifecycle() || abortController.signal.aborted) {
                   return;