diff --git a/src/sync/impl/applyRemote.d.ts b/src/sync/impl/applyRemote.d.ts index 06eb18327..bcc4ae31b 100644 --- a/src/sync/impl/applyRemote.d.ts +++ b/src/sync/impl/applyRemote.d.ts @@ -3,8 +3,8 @@ import type { Database } from '../..' import type { SyncDatabaseChangeSet, SyncLog, - SyncConflictResolver, SyncShouldUpdateRecord, + SyncConflictResolver, } from '../index' export default function applyRemoteChanges( @@ -13,8 +13,8 @@ export default function applyRemoteChanges( db: Database, sendCreatedAsUpdated: boolean, log?: SyncLog, + shouldUpdateRecord?: SyncShouldUpdateRecord, conflictResolver?: SyncConflictResolver, _unsafeBatchPerCollection?: boolean, - syncUpdateCondition?: SyncUpdateCondition, } ): Promise diff --git a/src/sync/impl/applyRemote.js b/src/sync/impl/applyRemote.js index 4f6c1af92..5773ca93f 100644 --- a/src/sync/impl/applyRemote.js +++ b/src/sync/impl/applyRemote.js @@ -265,7 +265,7 @@ function prepareApplyRemoteChangesToCollection( collection: Collection, context: ApplyRemoteChangesContext, ): Array { - const { db, sendCreatedAsUpdated, log, conflictResolver, shouldUpdateRecord } = context + const { db, sendCreatedAsUpdated, log, shouldUpdateRecord, conflictResolver } = context const { table } = collection const { created, diff --git a/src/sync/impl/helpers.d.ts b/src/sync/impl/helpers.d.ts index ea1fc1780..373d37fa1 100644 --- a/src/sync/impl/helpers.d.ts +++ b/src/sync/impl/helpers.d.ts @@ -3,8 +3,8 @@ import type { RawRecord, DirtyRaw } from '../../RawRecord' import type { SyncLog, SyncDatabaseChangeSet, - SyncConflictResolver, SyncShouldUpdateRecord, + SyncConflictResolver, } from '../index' // Returns raw record with naive solution to a conflict based on local `_changed` field diff --git a/src/sync/impl/helpers.js b/src/sync/impl/helpers.js index 9f901f623..cbb3f94d5 100644 --- a/src/sync/impl/helpers.js +++ b/src/sync/impl/helpers.js @@ -68,7 +68,7 @@ export function requiresUpdate( ): boolean { if (shouldUpdateRecord) { if (!shouldUpdateRecord(collection.table, local, dirtyRemote)) { - return false; + return false } }