Code cleanup

Author: MarkDuckworth

packages/firestore/src/api/aggregate.ts

@@ -20,8 +20,8 @@ import { AggregateImpl } from '../core/aggregate';
 import { firestoreClientRunAggregateQuery } from '../core/firestore_client';
 import { count } from '../lite-api/aggregate';
 import {
-  AggregateField,
-  AggregateQuerySnapshot
+  AggregateQuerySnapshot,
+  CountAggregateSpec
 } from '../lite-api/aggregate_types';
 import { ObjectValue } from '../model/object_value';
 import { cast } from '../util/input_validation';
@@ -60,34 +60,12 @@ export {
  */
 export function getCountFromServer(
   query: Query<unknown>
-): Promise<AggregateQuerySnapshot<{ count: AggregateField<number> }>> {
-  const firestore = cast(query.firestore, Firestore);
-  const client = ensureFirestoreConfigured(firestore);
-
-  const countQuerySpec: { count: AggregateField<number> } = {
+): Promise<AggregateQuerySnapshot<CountAggregateSpec>> {
+  const countQuerySpec: CountAggregateSpec = {
     count: count()
   };
 
-  const internalAggregates = mapToArray(countQuerySpec, (aggregate, alias) => {
-    return new AggregateImpl(
-      alias,
-      aggregate.aggregateType,
-      aggregate._internalFieldPath
-    );
-  });
-
-  return firestoreClientRunAggregateQuery(
-    client,
-    query._query,
-    internalAggregates
-  ).then(aggregateResult =>
-    convertToAggregateQuerySnapshot(
-      firestore,
-      query,
-      countQuerySpec,
-      aggregateResult
-    )
-  );
+  return getAggregateFromServer(query, countQuerySpec);
 }
 
 /**

packages/firestore/src/core/aggregate.ts

@@ -17,7 +17,10 @@
 
 import { FieldPath } from '../model/path';
 
-type AggregateType = 'count' | 'avg' | 'sum';
+/**
+ * Union type representing the aggregate type to be performed.
+ */
+export type AggregateType = 'count' | 'avg' | 'sum';
 
 /**
  * TODO

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

@@ -26,7 +26,8 @@ import { mapToArray } from '../util/obj';
 import {
   AggregateField,
   AggregateQuerySnapshot,
-  AggregateSpec
+  AggregateSpec,
+  CountAggregateSpec
 } from './aggregate_types';
 import { getDatastore } from './components';
 import { Firestore } from './database';
@@ -50,34 +51,12 @@ import { LiteUserDataWriter } from './reference_impl';
  */
 export function getCount(
   query: Query<unknown>
-): Promise<AggregateQuerySnapshot<{ count: AggregateField<number> }>> {
-  const firestore = cast(query.firestore, Firestore);
-  const datastore = getDatastore(firestore);
-
-  const countQuerySpec: { count: AggregateField<number> } = {
+): Promise<AggregateQuerySnapshot<CountAggregateSpec>> {
+  const countQuerySpec: CountAggregateSpec = {
     count: count()
   };
 
-  const internalAggregates = mapToArray(countQuerySpec, (aggregate, alias) => {
-    return new AggregateImpl(
-      alias,
-      aggregate.aggregateType,
-      aggregate._internalFieldPath
-    );
-  });
-
-  return invokeRunAggregationQueryRpc(
-    datastore,
-    query._query,
-    internalAggregates
-  ).then(aggregateResult =>
-    convertToAggregateQuerySnapshot(
-      firestore,
-      query,
-      countQuerySpec,
-      aggregateResult
-    )
-  );
+  return getAggregate(query, countQuerySpec);
 }
 
 /**

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

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+import { AggregateType } from '../core/aggregate';
 import { ObjectValue } from '../model/object_value';
 import { FieldPath as InternalFieldPath } from '../model/path';
 
@@ -28,7 +29,7 @@ import { AbstractUserDataWriter } from './user_data_writer';
 /**
  * Union type representing the aggregate type to be performed.
  */
-export type AggregateType = 'avg' | 'count' | 'sum';
+export { AggregateType };
 
 /**
  * Represents an aggregation that can be performed by Firestore.
@@ -51,7 +52,7 @@ export class AggregateField<R> {
    */
   constructor(
     public readonly aggregateType: AggregateType = 'count',
-    methodName: string,
+    methodName: string = 'new AggregateField',
     field?: string | FieldPath
   ) {
     if (field !== undefined) {
@@ -75,6 +76,12 @@ export interface AggregateSpec {
   [field: string]: AggregateFieldType;
 }
 
+/**
+ * Helper AggregateSpec for count.
+ * @internal
+ */
+export interface CountAggregateSpec { count: AggregateField<number> }
+
 /**
  * A type whose keys are taken from an `AggregateSpec`, and whose values are the
  * result of the aggregation performed by the corresponding `AggregateField`

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

@@ -2701,9 +2701,11 @@ describe('Aggregate quries', () => {
           where('key1', '==', 42),
           where('key2', '<', 42)
         );
-        await expect(getAggregate(query_, {
-          myCount: count()
-        })).to.be.eventually.rejectedWith(
+        await expect(
+          getAggregate(query_, {
+            myCount: count()
+          })
+        ).to.be.eventually.rejectedWith(
           /index.*https:\/\/console\.firebase\.google\.com/
         );
       });