Combine multiple optional parameters into a single options parameter

Author: chrisbianca

firestore/index.js.flow

@@ -40,13 +40,17 @@ declare export function useCollectionOnce(
 ): CollectionHook;
 declare export function useCollectionData<T>(
   query?: Query | null,
-  options?: SnapshotListenOptions,
-  idField?: string
+  options?: {
+    idField?: string,
+    snapshotListenOptions?: SnapshotListenOptions,
+  }
 ): CollectionDataHook<T>;
 declare export function useCollectionDataOnce<T>(
   query?: Query | null,
-  options?: GetOptions,
-  idField?: string
+  options?: {
+    getOptions?: GetOptions,
+    idField?: string,
+  }
 ): CollectionDataHook<T>;
 declare export function useDocument(
   ref?: DocumentReference | null,
@@ -58,11 +62,15 @@ declare export function useDocumentOnce(
 ): DocumentHook;
 declare export function useDocumentData<T>(
   ref?: DocumentReference | null,
-  options?: SnapshotListenOptions,
-  idField?: string
+  options?: {
+    idField?: string,
+    snapshotListenOptions?: SnapshotListenOptions,
+  }
 ): DocumentDataHook<T>;
 declare export function useDocumentDataOnce<T>(
   ref?: DocumentReference | null,
-  options?: GetOptions,
-  idField?: string
+  options?: {
+    getOptions?: GetOptions,
+    idField?: string,
+  }
 ): DocumentDataHook<T>;

firestore/useCollectionData.ts

@@ -10,10 +10,16 @@ export type CollectionDataHook<T> = {
 
 export default <T>(
   query?: firestore.Query | null,
-  options?: firestore.SnapshotListenOptions,
-  idField?: string
+  options?: {
+    idField?: string;
+    snapshotListenOptions?: firestore.SnapshotListenOptions;
+  }
 ): CollectionDataHook<T> => {
-  const { error, loading, value } = useCollection(query, options);
+  const idField = options ? options.idField : undefined;
+  const snapshotListenOptions = options
+    ? options.snapshotListenOptions
+    : undefined;
+  const { error, loading, value } = useCollection(query, snapshotListenOptions);
   return {
     error,
     loading,

firestore/useCollectionDataOnce.ts

@@ -5,10 +5,14 @@ import { CollectionDataHook } from './useCollectionData';
 
 export default <T>(
   query?: firestore.Query | null,
-  options?: firestore.GetOptions,
-  idField?: string
+  options?: {
+    getOptions?: firestore.GetOptions;
+    idField?: string;
+  }
 ): CollectionDataHook<T> => {
-  const { error, loading, value } = useCollectionOnce(query, options);
+  const idField = options ? options.idField : undefined;
+  const getOptions = options ? options.getOptions : undefined;
+  const { error, loading, value } = useCollectionOnce(query, getOptions);
   return {
     error,
     loading,

firestore/useDocumentData.ts

@@ -10,10 +10,16 @@ export type DocumentDataHook<T> = {
 
 export default <T>(
   docRef?: firestore.DocumentReference | null,
-  options?: firestore.SnapshotListenOptions,
-  idField?: string
+  options?: {
+    idField?: string;
+    snapshotListenOptions?: firestore.SnapshotListenOptions;
+  }
 ): DocumentDataHook<T> => {
-  const { error, loading, value } = useDocument(docRef, options);
+  const idField = options ? options.idField : undefined;
+  const snapshotListenOptions = options
+    ? options.snapshotListenOptions
+    : undefined;
+  const { error, loading, value } = useDocument(docRef, snapshotListenOptions);
   return {
     error,
     loading,

firestore/useDocumentDataOnce.ts

@@ -5,9 +5,14 @@ import { DocumentDataHook } from './useDocumentData';
 
 export default <T>(
   docRef?: firestore.DocumentReference | null,
-  idField?: string
+  options?: {
+    getOptions?: firestore.GetOptions;
+    idField?: string;
+  }
 ): DocumentDataHook<T> => {
-  const { error, loading, value } = useDocumentOnce(docRef);
+  const idField = options ? options.idField : undefined;
+  const getOptions = options ? options.getOptions : undefined;
+  const { error, loading, value } = useDocumentOnce(docRef, getOptions);
   return {
     error,
     loading,