resolve comments

Author: milaGGL

packages/firestore/src/api/aggregate.ts

@@ -26,7 +26,7 @@ export {
   AggregateSpec,
   AggregateSpecData,
   AggregateQuerySnapshot,
-  aggregateSnapshotEqual
+  aggregateQuerySnapshotEqual
 } from '../lite-api/aggregate';
 
 /**

packages/firestore/src/core/firestore_client.ts

@@ -25,8 +25,8 @@ import {
 } from '../api/credentials';
 import { User } from '../auth/user';
 import {
-  getCount as getCountFromServer,
-  AggregateQuerySnapshot as LiteAggregateQuerySnapshot
+  getCount,
+  AggregateQuerySnapshot
 } from '../lite-api/aggregate';
 import { Query as LiteQuery } from '../lite-api/reference';
 import { LocalStore } from '../local/local_store';
@@ -511,9 +511,9 @@ export function firestoreClientTransaction<T>(
 export function firestoreClientRunCountQuery(
   client: FirestoreClient,
   query: LiteQuery<unknown>
-): Promise<LiteAggregateQuerySnapshot<{ count: AggregateField<number> }>> {
+): Promise<AggregateQuerySnapshot<{ count: AggregateField<number> }>> {
   const deferred = new Deferred<
-    LiteAggregateQuerySnapshot<{ count: AggregateField<number> }>
+    AggregateQuerySnapshot<{ count: AggregateField<number> }>
   >();
   client.asyncQueue.enqueueAndForget(async () => {
     const remoteStore = await getRemoteStore(client);
@@ -526,7 +526,7 @@ export function firestoreClientRunCountQuery(
       );
     } else {
       try {
-        const result = await getCountFromServer(query);
+        const result = await getCount(query);
         deferred.resolve(result);
       } catch (e) {
         deferred.reject(e as Error);

packages/firestore/src/lite-api/aggregate.ts

@@ -143,7 +143,7 @@ export function getCount(
  *
  * @returns true if the AggregateQuerySnapshos are equal.
  */
-export function aggregateSnapshotEqual<T extends AggregateSpec>(
+export function aggregateQuerySnapshotEqual<T extends AggregateSpec>(
   left: AggregateQuerySnapshot<T>,
   right: AggregateQuerySnapshot<T>
 ): boolean {

packages/firestore/test/lite/integration.test.ts

@@ -20,7 +20,7 @@ import { initializeApp } from '@firebase/app';
 import { expect, use } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
 
-import { aggregateSnapshotEqual, getCount } from '../../src/lite-api/aggregate';
+import { aggregateQuerySnapshotEqual, getCount } from '../../src/lite-api/aggregate';
 import { Bytes } from '../../src/lite-api/bytes';
 import {
   Firestore,
@@ -2240,8 +2240,8 @@ describe('countQuery()', () => {
       const snapshot1A = await getCount(query1);
       const snapshot1B = await getCount(query1);
       const snapshot2 = await getCount(query2);
-      expect(aggregateSnapshotEqual(snapshot1A, snapshot1B)).to.be.true;
-      expect(aggregateSnapshotEqual(snapshot1A, snapshot2)).to.be.true;
+      expect(aggregateQuerySnapshotEqual(snapshot1A, snapshot1B)).to.be.true;
+      expect(aggregateQuerySnapshotEqual(snapshot1A, snapshot2)).to.be.true;
     });
   });
 
@@ -2257,7 +2257,7 @@ describe('countQuery()', () => {
       const query2 = query(coll, where('author', '==', 'authorB'));
       const snapshot1 = await getCount(query1);
       const snapshot2 = await getCount(query2);
-      expect(aggregateSnapshotEqual(snapshot1, snapshot2)).to.be.false;
+      expect(aggregateQuerySnapshotEqual(snapshot1, snapshot2)).to.be.false;
     });
   });