Recreate PR #75 against latest version of code

chrisbianca · chrisbianca · commit faad6778a1bb · 2020-12-10T20:46:41.000Z
diff --git a/firestore/useCollection.ts b/firestore/useCollection.ts
@@ -3,18 +3,18 @@ import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type CollectionHook = LoadingHook<
-  firebase.firestore.QuerySnapshot,
+export type CollectionHook<T> = LoadingHook<
+  firebase.firestore.QuerySnapshot<T>,
   Error
 >;
 export type CollectionDataHook<T> = LoadingHook<T[], Error>;
 
-export const useCollection = (
+export const useCollection = <T>(
   query?: firebase.firestore.Query | null,
   options?: {
     snapshotListenOptions?: firebase.firestore.SnapshotListenOptions;
   }
-): CollectionHook => {
+): CollectionHook<T> => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
     firebase.firestore.QuerySnapshot,
     Error
@@ -40,11 +40,12 @@ export const useCollection = (
     };
   }, [ref.current]);
 
-  const resArray: CollectionHook = [value, loading, error];
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  const resArray: CollectionHook<T> = [
+    value as firebase.firestore.QuerySnapshot<T>,
+    loading,
+    error,
+  ];
+  return useMemo(() => resArray, resArray);
 };
 
 export const useCollectionData = <T>(
@@ -58,19 +59,17 @@ export const useCollectionData = <T>(
   const snapshotListenOptions = options
     ? options.snapshotListenOptions
     : undefined;
-  const [snapshots, loading, error] = useCollection(query, {
+  const [snapshots, loading, error] = useCollection<T>(query, {
     snapshotListenOptions,
   });
   const values = useMemo(
-    () => (snapshots
-      ? snapshots.docs.map(doc => snapshotToData(doc, idField))
-      : undefined) as T[],
+    () =>
+      (snapshots
+        ? snapshots.docs.map((doc) => snapshotToData(doc, idField))
+        : undefined) as T[],
     [snapshots, idField]
   );
 
-  const resArray: CollectionDataHook<T> = [values, loading, error]
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  const resArray: CollectionDataHook<T> = [values, loading, error];
+  return useMemo(() => resArray, resArray);
 };
diff --git a/firestore/useCollectionOnce.ts b/firestore/useCollectionOnce.ts
@@ -3,18 +3,18 @@ import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type CollectionOnceHook = LoadingHook<
-  firebase.firestore.QuerySnapshot,
+export type CollectionOnceHook<T> = LoadingHook<
+  firebase.firestore.QuerySnapshot<T>,
   Error
 >;
 export type CollectionDataOnceHook<T> = LoadingHook<T[], Error>;
 
-export const useCollectionOnce = (
+export const useCollectionOnce = <T>(
   query?: firebase.firestore.Query | null,
   options?: {
     getOptions?: firebase.firestore.GetOptions;
   }
-): CollectionOnceHook => {
+): CollectionOnceHook<T> => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
     firebase.firestore.QuerySnapshot,
     Error
@@ -32,11 +32,12 @@ export const useCollectionOnce = (
       .catch(setError);
   }, [ref.current]);
 
-  const resArray: CollectionOnceHook = [value, loading, error];
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  const resArray: CollectionOnceHook<T> = [
+    value as firebase.firestore.QuerySnapshot<T>,
+    loading,
+    error,
+  ];
+  return useMemo(() => resArray, resArray);
 };
 
 export const useCollectionDataOnce = <T>(
@@ -48,20 +49,16 @@ export const useCollectionDataOnce = <T>(
 ): CollectionDataOnceHook<T> => {
   const idField = options ? options.idField : undefined;
   const getOptions = options ? options.getOptions : undefined;
-  const [snapshots, loading, error] = useCollectionOnce(query, { getOptions });
+  const [snapshots, loading, error] = useCollectionOnce<T>(query, {
+    getOptions,
+  });
   const values = useMemo(
-    () => (snapshots
-      ? snapshots.docs.map(doc => snapshotToData(doc, idField))
-      : undefined) as T[],
+    () =>
+      (snapshots
+        ? snapshots.docs.map((doc) => snapshotToData(doc, idField))
+        : undefined) as T[],
     [snapshots, idField]
   );
-  const resArray: CollectionDataOnceHook<T> = [
-    values,
-    loading,
-    error,
-  ];
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  const resArray: CollectionDataOnceHook<T> = [values, loading, error];
+  return useMemo(() => resArray, resArray);
 };
diff --git a/firestore/useDocument.ts b/firestore/useDocument.ts
@@ -3,18 +3,18 @@ import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type DocumentHook = LoadingHook<
-  firebase.firestore.DocumentSnapshot,
+export type DocumentHook<T> = LoadingHook<
+  firebase.firestore.DocumentSnapshot<T>,
   Error
 >;
 export type DocumentDataHook<T> = LoadingHook<T, Error>;
 
-export const useDocument = (
+export const useDocument = <T>(
   docRef?: firebase.firestore.DocumentReference | null,
   options?: {
     snapshotListenOptions?: firebase.firestore.SnapshotListenOptions;
   }
-): DocumentHook => {
+): DocumentHook<T> => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
     firebase.firestore.DocumentSnapshot,
     Error
@@ -40,11 +40,12 @@ export const useDocument = (
     };
   }, [ref.current]);
 
-  const resArray: DocumentHook = [value, loading, error];
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  const resArray: DocumentHook<T> = [
+    value as firebase.firestore.DocumentSnapshot<T>,
+    loading,
+    error,
+  ];
+  return useMemo(() => resArray, resArray);
 };
 
 export const useDocumentData = <T>(
@@ -58,7 +59,7 @@ export const useDocumentData = <T>(
   const snapshotListenOptions = options
     ? options.snapshotListenOptions
     : undefined;
-  const [snapshot, loading, error] = useDocument(docRef, {
+  const [snapshot, loading, error] = useDocument<T>(docRef, {
     snapshotListenOptions,
   });
   const value = useMemo(
@@ -67,8 +68,5 @@ export const useDocumentData = <T>(
   );
 
   const resArray: DocumentDataHook<T> = [value, loading, error];
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  return useMemo(() => resArray, resArray);
 };
diff --git a/firestore/useDocumentOnce.ts b/firestore/useDocumentOnce.ts
@@ -3,18 +3,18 @@ import { useEffect, useMemo } from 'react';
 import { snapshotToData } from './helpers';
 import { LoadingHook, useIsEqualRef, useLoadingValue } from '../util';
 
-export type DocumentOnceHook = LoadingHook<
-  firebase.firestore.DocumentSnapshot,
+export type DocumentOnceHook<T> = LoadingHook<
+  firebase.firestore.DocumentSnapshot<T>,
   Error
 >;
 export type DocumentDataOnceHook<T> = LoadingHook<T, Error>;
 
-export const useDocumentOnce = (
+export const useDocumentOnce = <T>(
   docRef?: firebase.firestore.DocumentReference | null,
   options?: {
     getOptions?: firebase.firestore.GetOptions;
   }
-): DocumentOnceHook => {
+): DocumentOnceHook<T> => {
   const { error, loading, reset, setError, setValue, value } = useLoadingValue<
     firebase.firestore.DocumentSnapshot,
     Error
@@ -32,11 +32,12 @@ export const useDocumentOnce = (
       .catch(setError);
   }, [ref.current]);
 
-  const resArray: DocumentOnceHook = [value, loading, error]
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  const resArray: DocumentOnceHook<T> = [
+    value as firebase.firestore.DocumentSnapshot<T>,
+    loading,
+    error,
+  ];
+  return useMemo(() => resArray, resArray);
 };
 
 export const useDocumentDataOnce = <T>(
@@ -48,15 +49,12 @@ export const useDocumentDataOnce = <T>(
 ): DocumentDataOnceHook<T> => {
   const idField = options ? options.idField : undefined;
   const getOptions = options ? options.getOptions : undefined;
-  const [snapshot, loading, error] = useDocumentOnce(docRef, { getOptions });
+  const [snapshot, loading, error] = useDocumentOnce<T>(docRef, { getOptions });
   const value = useMemo(
     () => (snapshot ? snapshotToData(snapshot, idField) : undefined) as T,
     [snapshot, idField]
   );
 
-  const resArray: DocumentDataOnceHook<T> = [value, loading, error]
-  return useMemo(
-    () => resArray,
-    resArray,
-  );
+  const resArray: DocumentDataOnceHook<T> = [value, loading, error];
+  return useMemo(() => resArray, resArray);
 };
