@tanstack/electric-db-collection 0.5.4 → 0.5.5

package/src/electric.ts

@@ -11,6 +11,7 @@ import {
   and,
   validateSyncPersistenceCapability,
   warnOnce,
+  whenSyncAccepted,
   withCollectionConfigFactory,
   withCollectionSyncConfigCleanup,
   withCollectionSyncConfigFactory,
@@ -717,10 +718,12 @@ function createLoadSubsetDedupe<T extends Row<unknown>>({
       const snapshotParams = compileSQL<T>(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
         }
+        // Check the signal before commit to discard a stale snapshot.
+        throwIfAborted()
 
         if (rows.length > 0) {
           begin()
@@ -737,12 +740,16 @@ function createLoadSubsetDedupe<T extends Row<unknown>>({
           debug(`${logPrefix}Applied snapshot with ${rows.length} rows`)
         }
       } catch (error) {
-        if (opts.signal?.aborted) return
+        // Cleanup is quiet; a caller that aborted sees `AbortError`.
         if (handleSnapshotError(error, `fetchSnapshot`)) {
           return
         }
+        if (opts.signal?.aborted) throw abortReason(opts.signal)
         throw error
       }
+      // Rows accepted before an abort still apply, but the caller that
+      // aborted sees `AbortError`.
+      if (opts.signal?.aborted) throw abortReason(opts.signal)
       return
     }
 
@@ -1922,9 +1929,10 @@ function createElectricSync<T extends Row<unknown>>(
         return applied
       }
 
+      // Subset hydration must not split a stream transaction it overlaps.
       const beginSourceTransaction = () => {
-        if (metadata?.persistence) begin({ immediate: true })
-        else begin()
+        begin()
+        metadata?.persistence?.reserveCommitTurn()
       }
 
       // Track keys that have been synced to handle overlapping subset queries.
@@ -1966,7 +1974,7 @@ function createElectricSync<T extends Row<unknown>>(
         lifecycle.resumeState = resetState
 
         if (metadata) {
-          begin({ immediate: true })
+          begin()
           metadata.collection.set(`electric:resume`, resetState)
           if (expectInResumeSnapshot) {
             expectCurrentCommit?.()
@@ -2000,8 +2008,7 @@ function createElectricSync<T extends Row<unknown>>(
 
         // Extract active_conditions from headers (DNF support)
         const activeConditions = changeMessage.headers.active_conditions as
-          | ActiveConditions
-          | undefined
+          ActiveConditions | undefined
 
         const rowId = collection.getKeyFromItem(changeMessage.value)
         const operation = changeMessage.headers.operation
@@ -2415,12 +2422,20 @@ function createElectricSync<T extends Row<unknown>>(
             }
           }
           const readyErrorVersion = streamErrorVersion
-          if (applied === true) {
+          // Readiness counts accepted rows.
+          const accepted = whenSyncAccepted(applied)
+          if (accepted === true) {
             wrappedMarkReady(wasBufferingInitialSync, readyErrorVersion)
           } else {
-            void applied.then(
+            void accepted.then(
               () =>
                 wrappedMarkReady(wasBufferingInitialSync, readyErrorVersion),
+              () => undefined,
+            )
+          }
+          if (applied !== true) {
+            void applied.then(
+              () => undefined,
               (error: unknown) => {
                 if (!isActiveLifecycle() || abortController.signal.aborted) {
                   return