update firestore generics (#366)

* update firestore generics

* doc regen

Author: jhuleatt

docs/reference/modules/firestore.md

@@ -36,15 +36,15 @@ ___
 
 ### useFirestoreCollection
 
-▸ **useFirestoreCollection**<T\>(`query`: firebase.firestore.Query, `options?`: [*ReactFireOptions*](../interfaces/index.reactfireoptions.md)<T[]\>): [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<T *extends* {} ? T[] : firebase.firestore.QuerySnapshot\>
+▸ **useFirestoreCollection**<T\>(`query`: firebase.firestore.Query, `options?`: [*ReactFireOptions*](../interfaces/index.reactfireoptions.md)<T[]\>): [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<firebase.firestore.QuerySnapshot<T\>\>
 
 Subscribe to a Firestore collection
 
 #### Type parameters:
 
 | Name | Default |
 | :------ | :------ |
-| `T` | { [key: string]: *unknown*;  } |
+| `T` | DocumentData |
 
 #### Parameters:
 
@@ -53,7 +53,7 @@ Subscribe to a Firestore collection
 | `query` | firebase.firestore.Query |
 | `options?` | [*ReactFireOptions*](../interfaces/index.reactfireoptions.md)<T[]\> |
 
-**Returns:** [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<T *extends* {} ? T[] : firebase.firestore.QuerySnapshot\>
+**Returns:** [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<firebase.firestore.QuerySnapshot<T\>\>
 
 Defined in: [src/firestore.tsx:108](https://github.com/FirebaseExtended/reactfire/blob/main/src/firestore.tsx#L108)
 
@@ -86,15 +86,15 @@ ___
 
 ### useFirestoreDoc
 
-▸ **useFirestoreDoc**<T\>(`ref`: firebase.firestore.DocumentReference, `options?`: [*ReactFireOptions*](../interfaces/index.reactfireoptions.md)<T\>): [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<T *extends* {} ? T : firebase.firestore.DocumentSnapshot\>
+▸ **useFirestoreDoc**<T\>(`ref`: firebase.firestore.DocumentReference, `options?`: [*ReactFireOptions*](../interfaces/index.reactfireoptions.md)<T\>): [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<firebase.firestore.DocumentSnapshot<T\>\>
 
 Suscribe to Firestore Document changes
 
 #### Type parameters:
 
 | Name | Default |
 | :------ | :------ |
-| `T` | *unknown* |
+| `T` | DocumentData |
 
 #### Parameters:
 
@@ -103,7 +103,7 @@ Suscribe to Firestore Document changes
 | `ref` | firebase.firestore.DocumentReference | Reference to the document you want to listen to |
 | `options?` | [*ReactFireOptions*](../interfaces/index.reactfireoptions.md)<T\> |  |
 
-**Returns:** [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<T *extends* {} ? T : firebase.firestore.DocumentSnapshot\>
+**Returns:** [*ObservableStatus*](../interfaces/useobservable.observablestatus.md)<firebase.firestore.DocumentSnapshot<T\>\>
 
 Defined in: [src/firestore.tsx:46](https://github.com/FirebaseExtended/reactfire/blob/main/src/firestore.tsx#L46)
 

src/firestore.tsx

@@ -43,10 +43,10 @@ export function preloadFirestoreDoc(
  * @param ref - Reference to the document you want to listen to
  * @param options
  */
-export function useFirestoreDoc<T = unknown>(
+export function useFirestoreDoc<T = firebase.firestore.DocumentData>(
   ref: firebase.firestore.DocumentReference,
   options?: ReactFireOptions<T>
-): ObservableStatus<T extends {} ? T : firebase.firestore.DocumentSnapshot> {
+): ObservableStatus<firebase.firestore.DocumentSnapshot<T>> {
   const observableId = `firestore:doc:${ref.firestore.app.name}:${ref.path}`;
   const observable$ = doc(ref);
 
@@ -105,10 +105,10 @@ export function useFirestoreDocDataOnce<T = unknown>(ref: firebase.firestore.Doc
  * @param ref - Reference to the collection you want to listen to
  * @param options
  */
-export function useFirestoreCollection<T = { [key: string]: unknown }>(
+export function useFirestoreCollection<T = firebase.firestore.DocumentData>(
   query: firebase.firestore.Query,
   options?: ReactFireOptions<T[]>
-): ObservableStatus<T extends {} ? T[] : firebase.firestore.QuerySnapshot> {
+): ObservableStatus<firebase.firestore.QuerySnapshot<T>> {
   const observableId = `firestore:collection:${getUniqueIdForFirestoreQuery(query)}`;
   const observable$ = fromCollectionRef(query);
 

test/firestore.test.tsx

@@ -64,7 +64,7 @@ describe('Firestore', () => {
 
       await waitFor(() => result.current.status === 'success');
 
-      const doc: firebase.firestore.DocumentSnapshot = (result.current.data as unknown) as firebase.firestore.DocumentSnapshot;
+      const doc = result.current.data;
 
       expect(doc).toBeDefined();
       const data = doc.data();
@@ -171,7 +171,7 @@ describe('Firestore', () => {
 
       await waitFor(() => result.current.status === 'success');
 
-      const collectionSnap = (result.current.data as unknown) as firebase.firestore.QuerySnapshot;
+      const collectionSnap = result.current.data;
       expect(collectionSnap.docs.length).toEqual(2);
     });
 
@@ -191,8 +191,8 @@ describe('Firestore', () => {
       await waitForUnfiltered(() => unfilteredResult.current.status === 'success');
       await waitForFiltered(() => filteredResult.current.status === 'success');
 
-      const filteredSnap = (filteredResult.current.data as unknown) as firebase.firestore.QuerySnapshot;
-      const unfilteredSnap = (unfilteredResult.current.data as unknown) as firebase.firestore.QuerySnapshot;
+      const filteredSnap = filteredResult.current.data;
+      const unfilteredSnap = unfilteredResult.current.data;
 
       // filteredList's length should be 1 since we only added one value that matches its query
       expect(filteredSnap.docs.length).toEqual(1);