Fixes to subscription

Author: kevin-dp

packages/db/src/collection/subscription.ts

@@ -1,12 +1,11 @@
 import { ensureIndexForExpression } from "../indexes/auto-index.js"
 import { and, gt, lt } from "../query/builder/functions.js"
-import { Value } from "../query/ir.js"
 import {
   createFilterFunctionFromExpression,
   createFilteredCallback,
 } from "./change-events.js"
-import type { BasicExpression, OrderBy } from "../query/ir.js"
 import type { IndexInterface } from "../indexes/base-index.js"
+import { Value, type BasicExpression, type OrderBy } from "../query/ir.js"
 import type { ChangeMessage } from "../types.js"
 import type { CollectionImpl } from "./index.js"
 
@@ -154,6 +153,7 @@ export class CollectionSubscription {
     limit,
     minValue,
   }: RequestLimitedSnapshotOptions) {
+    console.log("in requestLimitedSnapshot")
     if (!limit) throw new Error(`limit is required`)
 
     if (!this.orderByIndex) {

packages/db/src/collection/sync.ts

@@ -11,13 +11,8 @@ import { deepEquals } from "../utils"
 import type { StandardSchemaV1 } from "@standard-schema/spec"
 import type {
   ChangeMessage,
-<<<<<<< HEAD
   CleanupFn,
   CollectionConfig,
-=======
-  CollectionConfig,
-  CleanupFn,
->>>>>>> 684c70ec (Add onLoadMore callback and call it from the requestSnapshot methods)
   OnLoadMoreOptions,
   SyncConfigRes,
 } from "../types"
@@ -99,7 +94,6 @@ export class CollectionSyncManager<
             }
             const key = this.config.getKey(messageWithoutKey.value)
 
-<<<<<<< HEAD
             let messageType = messageWithoutKey.type
 
             // Check if an item with this key already exists when inserting
@@ -177,71 +171,6 @@ export class CollectionSyncManager<
               throw new SyncTransactionAlreadyCommittedWriteError()
             }
 
-=======
-            // Check if an item with this key already exists when inserting
-            if (messageWithoutKey.type === `insert`) {
-              const insertingIntoExistingSynced = this.state.syncedData.has(key)
-              const hasPendingDeleteForKey =
-                pendingTransaction.deletedKeys.has(key)
-              const isTruncateTransaction = pendingTransaction.truncate === true
-              // Allow insert after truncate in the same transaction even if it existed in syncedData
-              if (
-                insertingIntoExistingSynced &&
-                !hasPendingDeleteForKey &&
-                !isTruncateTransaction
-              ) {
-                throw new DuplicateKeySyncError(key, this.id)
-              }
-            }
-
-            const message: ChangeMessage<TOutput> = {
-              ...messageWithoutKey,
-              key,
-            }
-            pendingTransaction.operations.push(message)
-
-            if (messageWithoutKey.type === `delete`) {
-              pendingTransaction.deletedKeys.add(key)
-            }
-          },
-          commit: () => {
-            const pendingTransaction =
-              this.state.pendingSyncedTransactions[
-                this.state.pendingSyncedTransactions.length - 1
-              ]
-            if (!pendingTransaction) {
-              throw new NoPendingSyncTransactionCommitError()
-            }
-            if (pendingTransaction.committed) {
-              throw new SyncTransactionAlreadyCommittedError()
-            }
-
-            pendingTransaction.committed = true
-
-            // Update status to initialCommit when transitioning from loading
-            // This indicates we're in the process of committing the first transaction
-            if (this.lifecycle.status === `loading`) {
-              this.lifecycle.setStatus(`initialCommit`)
-            }
-
-            this.state.commitPendingTransactions()
-          },
-          markReady: () => {
-            this.lifecycle.markReady()
-          },
-          truncate: () => {
-            const pendingTransaction =
-              this.state.pendingSyncedTransactions[
-                this.state.pendingSyncedTransactions.length - 1
-              ]
-            if (!pendingTransaction) {
-              throw new NoPendingSyncTransactionWriteError()
-            }
-            if (pendingTransaction.committed) {
-              throw new SyncTransactionAlreadyCommittedWriteError()
-            }
-
->>>>>>> 684c70ec (Add onLoadMore callback and call it from the requestSnapshot methods)
             // Clear all operations from the current transaction
             pendingTransaction.operations = []
             pendingTransaction.deletedKeys.clear()