Merge 3321ae9 into 44b5251

Author: schmidt-sebastian

packages/firestore/src/core/bundle_impl.ts

@@ -19,8 +19,8 @@ import { LoadBundleTaskProgress } from '@firebase/firestore-types';
 
 import { LocalStore } from '../local/local_store';
 import {
-  applyBundleDocuments,
-  saveNamedQuery
+  localStoreApplyBundledDocuments,
+  localStoreSaveNamedQuery
 } from '../local/local_store_impl';
 import { documentKeySet, DocumentKeySet } from '../model/collections';
 import { MaybeDocument, NoDocument } from '../model/document';
@@ -173,7 +173,7 @@ export class BundleLoader {
     );
     debugAssert(!!this.bundleMetadata.id, 'Bundle ID must be set.');
 
-    const changedDocuments = await applyBundleDocuments(
+    const changedDocuments = await localStoreApplyBundledDocuments(
       this.localStore,
       new BundleConverterImpl(this.serializer),
       this.documents,
@@ -183,7 +183,11 @@ export class BundleLoader {
     const queryDocumentMap = this.getQueryDocumentMapping(this.documents);
 
     for (const q of this.queries) {
-      await saveNamedQuery(this.localStore, q, queryDocumentMap.get(q.name!));
+      await localStoreSaveNamedQuery(
+        this.localStore,
+        q,
+        queryDocumentMap.get(q.name!)
+      );
     }
 
     this.progress.taskState = 'Success';

packages/firestore/src/core/component_provider.ts

@@ -24,7 +24,7 @@ import {
 import { LocalStore } from '../local/local_store';
 import {
   newLocalStore,
-  synchronizeLastDocumentChangeReadTime
+  localStoreSynchronizeLastDocumentChangeReadTime
 } from '../local/local_store_impl';
 import { LruParams } from '../local/lru_garbage_collector';
 import { LruScheduler } from '../local/lru_garbage_collector_impl';
@@ -172,7 +172,7 @@ export class IndexedDbOfflineComponentProvider extends MemoryOfflineComponentPro
 
   async initialize(cfg: ComponentConfiguration): Promise<void> {
     await super.initialize(cfg);
-    await synchronizeLastDocumentChangeReadTime(this.localStore);
+    await localStoreSynchronizeLastDocumentChangeReadTime(this.localStore);
 
     await this.onlineComponentProvider.initialize(this, cfg);
 

packages/firestore/src/core/firestore_client.ts

@@ -25,10 +25,10 @@ import {
 import { User } from '../auth/user';
 import { LocalStore } from '../local/local_store';
 import {
-  executeQuery,
-  getNamedQuery,
-  handleUserChange,
-  readLocalDocument
+  localStoreExecuteQuery,
+  localStoreGetNamedQuery,
+  localStoreHandleUserChange,
+  localStoreReadDocument
 } from '../local/local_store_impl';
 import { Persistence } from '../local/persistence';
 import { Document, NoDocument } from '../model/document';
@@ -202,7 +202,10 @@ export async function setOfflineComponentProvider(
     if (!currentUser.isEqual(user)) {
       currentUser = user;
       client.asyncQueue.enqueueRetryable(async () => {
-        await handleUserChange(offlineComponentProvider.localStore, user);
+        await localStoreHandleUserChange(
+          offlineComponentProvider.localStore,
+          user
+        );
       });
     }
   });
@@ -495,7 +498,7 @@ async function readDocumentFromCache(
   result: Deferred<Document | null>
 ): Promise<void> {
   try {
-    const maybeDoc = await readLocalDocument(localStore, docKey);
+    const maybeDoc = await localStoreReadDocument(localStore, docKey);
     if (maybeDoc instanceof Document) {
       result.resolve(maybeDoc);
     } else if (maybeDoc instanceof NoDocument) {
@@ -597,7 +600,7 @@ async function executeQueryFromCache(
   result: Deferred<ViewSnapshot>
 ): Promise<void> {
   try {
-    const queryResult = await executeQuery(
+    const queryResult = await localStoreExecuteQuery(
       localStore,
       query,
       /* usePreviousResults= */ true
@@ -678,7 +681,7 @@ export function firestoreClientGetNamedQuery(
   queryName: string
 ): Promise<NamedQuery | undefined> {
   return client.asyncQueue.enqueue(async () =>
-    getNamedQuery(await getLocalStore(client), queryName)
+    localStoreGetNamedQuery(await getLocalStore(client), queryName)
   );
 }