fix: better return type of Data - when no options are used it returns…

… the doc type
hannojg · Dec 10, 2021 · 7163295 · 7163295
1 parent 2932c7e
commit 7163295
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/firestore/types.ts b/src/firestore/types.ts
@@ -32,12 +32,18 @@ export type OnceDataOptions<
 export type Data<
   T = FirebaseFirestoreTypes.DocumentData,
   IDField extends string | undefined = undefined,
-  RefField extends string | undefined = undefined
-> = T &
-  (IDField extends string ? Record<IDField, string> : {}) &
-  (RefField extends string
-    ? Record<RefField, FirebaseFirestoreTypes.DocumentReference<T>>
-    : {});
+  RefField extends string | undefined = undefined,
+  // This is the type used with IDField and RefField merged onto the type
+  ResultType = T &
+    (IDField extends string ? Record<IDField, string> : {}) &
+    (RefField extends string
+      ? Record<RefField, FirebaseFirestoreTypes.DocumentReference<T>>
+      : {})
+> = IDField extends undefined
+  ? RefField extends undefined
+    ? T
+    : ResultType
+  : ResultType;
 
 export type CollectionHook<T = FirebaseFirestoreTypes.DocumentData> =
   LoadingHook<FirebaseFirestoreTypes.QuerySnapshot<T>, Error>;