Skip to content

Commit 9ca6441

Browse files
committed
reordered some args after rebasing
1 parent b8a9ca5 commit 9ca6441

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

src/sync/impl/applyRemote.d.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import type { Database } from '../..'
33
import type {
44
SyncDatabaseChangeSet,
55
SyncLog,
6-
SyncConflictResolver,
76
SyncShouldUpdateRecord,
7+
SyncConflictResolver,
88
} from '../index'
99

1010
export default function applyRemoteChanges(
@@ -13,8 +13,8 @@ export default function applyRemoteChanges(
1313
db: Database,
1414
sendCreatedAsUpdated: boolean,
1515
log?: SyncLog,
16+
shouldUpdateRecord?: SyncShouldUpdateRecord,
1617
conflictResolver?: SyncConflictResolver,
1718
_unsafeBatchPerCollection?: boolean,
18-
syncUpdateCondition?: SyncUpdateCondition,
1919
}
2020
): Promise<void>

src/sync/impl/applyRemote.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ function prepareApplyRemoteChangesToCollection<T: Model>(
265265
collection: Collection<T>,
266266
context: ApplyRemoteChangesContext,
267267
): Array<?T> {
268-
const { db, sendCreatedAsUpdated, log, conflictResolver, shouldUpdateRecord } = context
268+
const { db, sendCreatedAsUpdated, log, shouldUpdateRecord, conflictResolver } = context
269269
const { table } = collection
270270
const {
271271
created,

src/sync/impl/helpers.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import type { RawRecord, DirtyRaw } from '../../RawRecord'
33
import type {
44
SyncLog,
55
SyncDatabaseChangeSet,
6-
SyncConflictResolver,
76
SyncShouldUpdateRecord,
7+
SyncConflictResolver,
88
} from '../index'
99

1010
// Returns raw record with naive solution to a conflict based on local `_changed` field

src/sync/impl/helpers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ export function requiresUpdate<T: Model>(
6868
): boolean {
6969
if (shouldUpdateRecord) {
7070
if (!shouldUpdateRecord(collection.table, local, dirtyRemote)) {
71-
return false;
71+
return false
7272
}
7373
}
7474

0 commit comments

Comments
 (0)