Fixes and cleanup.

Author: MarkDuckworth

common/api-review/firestore-lite.api.md

@@ -19,7 +19,7 @@ export type AddPrefixToKeys<Prefix extends string, T extends Record<string, unkn
 
 // @public
 export class AggregateField<R> {
-    constructor(aggregateType: AggregateType, methodName: string, field?: string | FieldPath);
+    constructor(aggregateType?: AggregateType, methodName?: string, field?: string | FieldPath);
     // (undocumented)
     readonly aggregateType: AggregateType;
     readonly type = "AggregateField";
@@ -50,7 +50,7 @@ export type AggregateSpecData<T extends AggregateSpec> = {
 };
 
 // @public
-export type AggregateType = 'avg' | 'count' | 'sum';
+export type AggregateType = 'count' | 'avg' | 'sum';
 
 // @public
 export function arrayRemove(...elements: unknown[]): FieldValue;

common/api-review/firestore.api.md

@@ -19,7 +19,7 @@ export type AddPrefixToKeys<Prefix extends string, T extends Record<string, unkn
 
 // @public
 export class AggregateField<R> {
-    constructor(aggregateType: AggregateType, methodName: string, field?: string | FieldPath);
+    constructor(aggregateType?: AggregateType, methodName?: string, field?: string | FieldPath);
     // (undocumented)
     readonly aggregateType: AggregateType;
     readonly type = "AggregateField";
@@ -50,7 +50,7 @@ export type AggregateSpecData<T extends AggregateSpec> = {
 };
 
 // @public
-export type AggregateType = 'avg' | 'count' | 'sum';
+export type AggregateType = 'count' | 'avg' | 'sum';
 
 // @public
 export function arrayRemove(...elements: unknown[]): FieldValue;

packages/firestore/src/api/aggregate.ts

@@ -15,14 +15,11 @@
  * limitations under the License.
  */
 
-import { AggregateSpec, Query } from '../api';
+import { AggregateField, AggregateSpec, Query } from '../api';
 import { AggregateImpl } from '../core/aggregate';
 import { firestoreClientRunAggregateQuery } from '../core/firestore_client';
 import { count } from '../lite-api/aggregate';
-import {
-  AggregateQuerySnapshot,
-  CountAggregateSpec
-} from '../lite-api/aggregate_types';
+import { AggregateQuerySnapshot } from '../lite-api/aggregate_types';
 import { ObjectValue } from '../model/object_value';
 import { cast } from '../util/input_validation';
 import { mapToArray } from '../util/obj';
@@ -60,8 +57,8 @@ export {
  */
 export function getCountFromServer(
   query: Query<unknown>
-): Promise<AggregateQuerySnapshot<CountAggregateSpec>> {
-  const countQuerySpec: CountAggregateSpec = {
+): Promise<AggregateQuerySnapshot<{ count: AggregateField<number> }>> {
+  const countQuerySpec: { count: AggregateField<number> } = {
     count: count()
   };
 

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

@@ -26,8 +26,7 @@ import { mapToArray } from '../util/obj';
 import {
   AggregateField,
   AggregateQuerySnapshot,
-  AggregateSpec,
-  CountAggregateSpec
+  AggregateSpec
 } from './aggregate_types';
 import { getDatastore } from './components';
 import { Firestore } from './database';
@@ -51,8 +50,8 @@ import { LiteUserDataWriter } from './reference_impl';
  */
 export function getCount(
   query: Query<unknown>
-): Promise<AggregateQuerySnapshot<CountAggregateSpec>> {
-  const countQuerySpec: CountAggregateSpec = {
+): Promise<AggregateQuerySnapshot<{ count: AggregateField<number> }>> {
+  const countQuerySpec: { count: AggregateField<number> } = {
     count: count()
   };
 

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

@@ -76,12 +76,6 @@ 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`