reordered some args after rebasing

Nozbe · Jan 16, 2024 · 3fb82dd · 3fb82dd
1 parent b8a9ca5
commit 3fb82dd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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<void>
diff --git a/src/sync/impl/applyRemote.js b/src/sync/impl/applyRemote.js
@@ -265,7 +265,7 @@ function prepareApplyRemoteChangesToCollection<T: Model>(
   collection: Collection<T>,
   context: ApplyRemoteChangesContext,
 ): Array<?T> {
-  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
@@ -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
@@ -68,7 +68,7 @@ export function requiresUpdate<T: Model>(
 ): boolean {
   if (shouldUpdateRecord) {
     if (!shouldUpdateRecord(collection.table, local, dirtyRemote)) {
-      return false;
+      return false
     }
   }