Skip to content

Commit 8221fa7

Browse files
Prefix syncEngine methods
1 parent bd72f9f commit 8221fa7

File tree

4 files changed

+140
-123
lines changed

4 files changed

+140
-123
lines changed

packages/firestore/src/core/component_provider.ts

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,19 +58,19 @@ import { Code, FirestoreError } from '../util/error';
5858
import { DatabaseInfo } from './database_info';
5959
import { EventManager, newEventManager } from './event_manager';
6060
import { SyncEngine } from './sync_engine';
61-
import { OnlineStateSource } from './types';
6261
import {
63-
applyActiveTargetsChange,
64-
applyBatchState,
65-
applyOnlineStateChange,
66-
applyPrimaryState,
67-
applyTargetState,
62+
syncEngineApplyActiveTargetsChange,
63+
syncEngineApplyBatchState,
64+
syncEngineApplyOnlineStateChange,
65+
syncEngineApplyPrimaryState,
66+
syncEngineApplyTargetState,
6867
ensureWriteCallbacks,
69-
getActiveClients,
68+
syncEngineGetActiveClients,
7069
newSyncEngine,
7170
syncEngineHandleCredentialChange,
72-
synchronizeWithChangedDocuments
71+
syncEngineSynchronizeWithChangedDocuments
7372
} from './sync_engine_impl';
73+
import { OnlineStateSource } from './types';
7474

7575
export interface ComponentConfiguration {
7676
asyncQueue: AsyncQueue;
@@ -252,14 +252,14 @@ export class MultiTabOfflineComponentProvider extends IndexedDbOfflineComponentP
252252

253253
if (this.sharedClientState instanceof WebStorageSharedClientState) {
254254
this.sharedClientState.syncEngine = {
255-
applyBatchState: applyBatchState.bind(null, syncEngine),
256-
applyTargetState: applyTargetState.bind(null, syncEngine),
257-
applyActiveTargetsChange: applyActiveTargetsChange.bind(
255+
applyBatchState: syncEngineApplyBatchState.bind(null, syncEngine),
256+
applyTargetState: syncEngineApplyTargetState.bind(null, syncEngine),
257+
applyActiveTargetsChange: syncEngineApplyActiveTargetsChange.bind(
258258
null,
259259
syncEngine
260260
),
261-
getActiveClients: getActiveClients.bind(null, syncEngine),
262-
synchronizeWithChangedDocuments: synchronizeWithChangedDocuments.bind(
261+
getActiveClients: syncEngineGetActiveClients.bind(null, syncEngine),
262+
synchronizeWithChangedDocuments: syncEngineSynchronizeWithChangedDocuments.bind(
263263
null,
264264
syncEngine
265265
)
@@ -270,7 +270,7 @@ export class MultiTabOfflineComponentProvider extends IndexedDbOfflineComponentP
270270
// NOTE: This will immediately call the listener, so we make sure to
271271
// set it after localStore / remoteStore are started.
272272
await this.persistence.setPrimaryStateListener(async isPrimary => {
273-
await applyPrimaryState(
273+
await syncEngineApplyPrimaryState(
274274
this.onlineComponentProvider.syncEngine,
275275
isPrimary
276276
);
@@ -339,7 +339,7 @@ export class OnlineComponentProvider {
339339
);
340340

341341
this.sharedClientState.onlineStateHandler = onlineState =>
342-
applyOnlineStateChange(
342+
syncEngineApplyOnlineStateChange(
343343
this.syncEngine,
344344
onlineState,
345345
OnlineStateSource.SharedClientState
@@ -372,7 +372,7 @@ export class OnlineComponentProvider {
372372
this.datastore,
373373
cfg.asyncQueue,
374374
onlineState =>
375-
applyOnlineStateChange(
375+
syncEngineApplyOnlineStateChange(
376376
this.syncEngine,
377377
onlineState,
378378
OnlineStateSource.RemoteStore

packages/firestore/src/core/firestore_client.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,17 +74,17 @@ import {
7474
} from './event_manager';
7575
import { newQueryForPath, Query } from './query';
7676
import { SyncEngine } from './sync_engine';
77-
import { Transaction } from './transaction';
78-
import { TransactionRunner } from './transaction_runner';
79-
import { View } from './view';
80-
import { ViewSnapshot } from './view_snapshot';
8177
import {
82-
registerPendingWritesCallback,
78+
syncEngineRegisterPendingWritesCallback,
8379
syncEngineListen,
8480
syncEngineLoadBundle,
8581
syncEngineUnlisten,
8682
syncEngineWrite
8783
} from './sync_engine_impl';
84+
import { Transaction } from './transaction';
85+
import { TransactionRunner } from './transaction_runner';
86+
import { View } from './view';
87+
import { ViewSnapshot } from './view_snapshot';
8888

8989
const LOG_TAG = 'FirestoreClient';
9090
export const MAX_CONCURRENT_LIMBO_RESOLUTIONS = 100;
@@ -342,7 +342,7 @@ export function firestoreClientWaitForPendingWrites(
342342
const deferred = new Deferred<void>();
343343
client.asyncQueue.enqueueAndForget(async () => {
344344
const syncEngine = await getSyncEngine(client);
345-
return registerPendingWritesCallback(syncEngine, deferred);
345+
return syncEngineRegisterPendingWritesCallback(syncEngine, deferred);
346346
});
347347
return deferred.promise;
348348
}

0 commit comments

Comments
 (0)