Fix UpdateData typing issues

packages/firestore/lite/index.ts

@@ -60,8 +60,8 @@ export {
 export {
   DocumentData,
   UpdateData,
+  DeepPartial,
   WithFieldValue,
-  PartialWithFieldValue,
   SetOptions,
   DocumentReference,
   Query,

packages/firestore/src/api.ts

@@ -99,8 +99,8 @@ export {
   SetOptions,
   DocumentData,
   UpdateData,
+  DeepPartial,
   WithFieldValue,
-  PartialWithFieldValue,
   refEqual,
   queryEqual
 } from './api/reference';

packages/firestore/src/api/aggregate.ts

@@ -26,6 +26,7 @@ import { cast } from '../util/input_validation';
 import { mapToArray } from '../util/obj';
 
 import { ensureFirestoreConfigured, Firestore } from './database';
+import { DocumentData } from './reference';
 import { ExpUserDataWriter } from './reference_impl';
 
 export {
@@ -57,9 +58,18 @@ export {
  * retrieved from `snapshot.data().count`, where `snapshot` is the
  * `AggregateQuerySnapshot` to which the returned Promise resolves.
  */
-export function getCountFromServer(
-  query: Query<unknown>
-): Promise<AggregateQuerySnapshot<{ count: AggregateField<number> }>> {
+export function getCountFromServer<
+  ModelT,
+  SerializedModelT extends DocumentData
+>(
+  query: Query<ModelT, SerializedModelT>
+): Promise<
+  AggregateQuerySnapshot<
+    { count: AggregateField<number> },
+    ModelT,
+    SerializedModelT
+  >
+> {
   const countQuerySpec: { count: AggregateField<number> } = {
     count: count()
   };
@@ -101,10 +111,14 @@ export function getCountFromServer(
  * ```
  * @internal TODO (sum/avg) remove when public
  */
-export function getAggregateFromServer<T extends AggregateSpec>(
-  query: Query<unknown>,
-  aggregateSpec: T
-): Promise<AggregateQuerySnapshot<T>> {
+export function getAggregateFromServer<
+  AggregateSpecT extends AggregateSpec,
+  ModelT,
+  SerializedModelT extends DocumentData
+>(
+  query: Query<ModelT, SerializedModelT>,
+  aggregateSpec: AggregateSpecT
+): Promise<AggregateQuerySnapshot<AggregateSpecT, ModelT, SerializedModelT>> {
   const firestore = cast(query.firestore, Firestore);
   const client = ensureFirestoreConfigured(firestore);
 
@@ -133,16 +147,20 @@ export function getAggregateFromServer<T extends AggregateSpec>(
  * @param aggregateResult Core aggregation result
  * @internal
  */
-function convertToAggregateQuerySnapshot<T extends AggregateSpec>(
+function convertToAggregateQuerySnapshot<
+  AggregateSpecT extends AggregateSpec,
+  ModelT,
+  SerializedModelT extends DocumentData
+>(
   firestore: Firestore,
-  query: Query<unknown>,
+  query: Query<ModelT, SerializedModelT>,
   aggregateResult: ObjectValue
-): AggregateQuerySnapshot<T> {
+): AggregateQuerySnapshot<AggregateSpecT, ModelT, SerializedModelT> {
   const userDataWriter = new ExpUserDataWriter(firestore);
-  const querySnapshot = new AggregateQuerySnapshot<T>(
-    query,
-    userDataWriter,
-    aggregateResult
-  );
+  const querySnapshot = new AggregateQuerySnapshot<
+    AggregateSpecT,
+    ModelT,
+    SerializedModelT
+  >(query, userDataWriter, aggregateResult);
   return querySnapshot;
 }

packages/firestore/src/api/database.ts

@@ -47,7 +47,7 @@ import {
   Firestore as LiteFirestore,
   connectFirestoreEmulator
 } from '../lite-api/database';
-import { Query } from '../lite-api/reference';
+import { DocumentData, Query } from '../lite-api/reference';
 import {
   indexedDbClearPersistence,
   indexedDbStoragePrefix
@@ -621,14 +621,13 @@ export function loadBundle(
 export function namedQuery(
   firestore: Firestore,
   name: string
-): Promise<Query | null> {
+): Promise<Query<DocumentData, DocumentData> | null> {
   firestore = cast(firestore, Firestore);
   const client = ensureFirestoreConfigured(firestore);
   return firestoreClientGetNamedQuery(client, name).then(namedQuery => {
     if (!namedQuery) {
       return null;
     }
-
     return new Query(firestore, null, namedQuery.query);
   });
 }

packages/firestore/src/api/reference.ts

@@ -26,7 +26,7 @@ export {
   SetOptions,
   DocumentData,
   UpdateData,
+  DeepPartial,
   WithFieldValue,
-  PartialWithFieldValue,
   refEqual
 } from '../lite-api/reference';