fix: exactOptionalPropertyTypes TS option compatibility

package.json

@@ -54,6 +54,7 @@
         "@semantic-release/git": "10.0.1",
         "@testing-library/react": "14.0.0",
         "@tsconfig/recommended": "1.0.3",
+        "@tsconfig/strictest": "2.0.2",
         "@types/react": "18.2.33",
         "@typescript-eslint/eslint-plugin": "6.9.0",
         "@typescript-eslint/parser": "6.9.0",

src/database/useObjectValue.ts

@@ -10,8 +10,8 @@ export type UseObjectValueResult<Value = unknown> = ValueHookResult<Value, Error
 export type UseObjectValueConverter<Value> = (snap: DataSnapshot) => Value;
 
 export interface UseObjectValueOptions<Value> {
-    converter?: UseObjectValueConverter<Value>;
-    initialValue?: Value;
+    converter?: UseObjectValueConverter<Value> | undefined;
+    initialValue?: Value | undefined;
 }
 
 /**
@@ -28,7 +28,7 @@ export interface UseObjectValueOptions<Value> {
  */
 export function useObjectValue<Value = unknown>(
     query: Query | undefined | null,
-    options?: UseObjectValueOptions<Value>,
+    options?: UseObjectValueOptions<Value> | undefined,
 ): UseObjectValueResult<Value> {
     const { converter = defaultConverter, initialValue = LoadingState } = options ?? {};
 

src/database/useObjectValueOnce.ts

@@ -9,7 +9,7 @@ export type UseObjectValueOnceResult<Value = unknown> = ValueHookResult<Value, E
 export type UseObjectValueOnceConverter<Value> = (snap: DataSnapshot) => Value;
 
 export interface UseObjectValueOnceOptions<Value> {
-    converter?: UseObjectValueOnceConverter<Value>;
+    converter?: UseObjectValueOnceConverter<Value> | undefined;
 }
 
 /**
@@ -25,7 +25,7 @@ export interface UseObjectValueOnceOptions<Value> {
  */
 export function useObjectValueOnce<Value = unknown>(
     query: Query | undefined | null,
-    options?: UseObjectValueOnceOptions<Value>,
+    options?: UseObjectValueOnceOptions<Value> | undefined,
 ): UseObjectValueOnceResult<Value> {
     const { converter = defaultConverter } = options ?? {};
 

src/firestore/internal.spec.ts

@@ -125,6 +125,13 @@ describe("isAggregateSpecEqual", () => {
         expect(isAggregateSpecEqual(spec1, spec2)).toBe(false);
     });
 
+    it("different keys", () => {
+        const spec1 = { count: count() };
+        const spec2 = { total: count() };
+        // @ts-expect-error Different specs
+        expect(isAggregateSpecEqual(spec1, spec2)).toBe(false);
+    });
+
     it("different aggregations", () => {
         const spec1 = { value: count() };
         const spec2 = { value: average("abc") };

src/firestore/internal.ts

@@ -83,5 +83,5 @@ export function isAggregateSpecEqual<T extends AggregateSpec>(a: T, b: T): boole
         return false;
     }
 
-    return Object.entries(a).every(([key, value]) => aggregateFieldEqual(value, b[key]));
+    return Object.entries(a).every(([key, value]) => aggregateFieldEqual(value, b[key]!));
 }

src/firestore/useDocument.ts

@@ -18,7 +18,7 @@ export type UseDocumentResult<AppModelType = DocumentData> = ValueHookResult<Doc
  * Options to configure the subscription
  */
 export interface UseDocumentOptions {
-    snapshotListenOptions?: SnapshotListenOptions;
+    snapshotListenOptions?: SnapshotListenOptions | undefined;
 }
 
 /**
@@ -34,10 +34,10 @@ export interface UseDocumentOptions {
  */
 export function useDocument<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     reference: DocumentReference<AppModelType, DbModelType> | undefined | null,
-    options?: UseDocumentOptions,
+    options?: UseDocumentOptions | undefined,
 ): UseDocumentResult<AppModelType> {
     const { snapshotListenOptions } = options ?? {};
-    const { includeMetadataChanges } = snapshotListenOptions ?? {};
+    const { includeMetadataChanges = false } = snapshotListenOptions ?? {};
 
     const onChange: UseListenOnChange<
         DocumentSnapshot<AppModelType, DbModelType>,

src/firestore/useDocumentData.ts

@@ -18,9 +18,9 @@ export type UseDocumentDataResult<AppModelType = DocumentData> = ValueHookResult
  * Options to configure the subscription
  */
 export interface UseDocumentDataOptions<AppModelType = DocumentData> {
-    snapshotListenOptions?: SnapshotListenOptions;
-    snapshotOptions?: SnapshotOptions;
-    initialValue?: AppModelType;
+    snapshotListenOptions?: SnapshotListenOptions | undefined;
+    snapshotOptions?: SnapshotOptions | undefined;
+    initialValue?: AppModelType | undefined;
 }
 
 /**
@@ -37,11 +37,11 @@ export interface UseDocumentDataOptions<AppModelType = DocumentData> {
  */
 export function useDocumentData<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     reference: DocumentReference<AppModelType, DbModelType> | undefined | null,
-    options?: UseDocumentDataOptions<AppModelType>,
+    options?: UseDocumentDataOptions<AppModelType> | undefined,
 ): UseDocumentDataResult<AppModelType> {
     const { snapshotListenOptions, snapshotOptions } = options ?? {};
-    const { includeMetadataChanges } = snapshotListenOptions ?? {};
-    const { serverTimestamps } = snapshotOptions ?? {};
+    const { includeMetadataChanges = false } = snapshotListenOptions ?? {};
+    const { serverTimestamps = "none" } = snapshotOptions ?? {};
 
     const onChange: UseListenOnChange<
         AppModelType,

src/firestore/useDocumentDataOnce.ts

@@ -11,8 +11,8 @@ export type UseDocumentDataOnceResult<AppModelType = DocumentData> = ValueHookRe
  * Options to configure how the document is fetched
  */
 export interface UseDocumentDataOnceOptions {
-    source?: Source;
-    snapshotOptions?: SnapshotOptions;
+    source?: Source | undefined;
+    snapshotOptions?: SnapshotOptions | undefined;
 }
 
 /**
@@ -28,10 +28,10 @@ export interface UseDocumentDataOnceOptions {
  */
 export function useDocumentDataOnce<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     reference: DocumentReference<AppModelType, DbModelType> | undefined | null,
-    options?: UseDocumentDataOnceOptions,
+    options?: UseDocumentDataOnceOptions | undefined,
 ): UseDocumentDataOnceResult<AppModelType> {
     const { source = "default", snapshotOptions } = options ?? {};
-    const { serverTimestamps } = snapshotOptions ?? {};
+    const { serverTimestamps = "none" } = snapshotOptions ?? {};
 
     const getData = useCallback(
         async (stableRef: DocumentReference<AppModelType, DbModelType>) => {

src/firestore/useDocumentOnce.ts

@@ -14,7 +14,7 @@ export type UseDocumentOnceResult<AppModelType = DocumentData> = ValueHookResult
  * Options to configure how the document is fetched
  */
 export interface UseDocumentOnceOptions {
-    source?: Source;
+    source?: Source | undefined;
 }
 
 /**
@@ -30,7 +30,7 @@ export interface UseDocumentOnceOptions {
  */
 export function useDocumentOnce<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     reference: DocumentReference<AppModelType, DbModelType> | undefined | null,
-    options?: UseDocumentOnceOptions,
+    options?: UseDocumentOnceOptions | undefined,
 ): UseDocumentOnceResult<AppModelType> {
     const { source = "default" } = options ?? {};
 

src/firestore/useQueries.ts

@@ -12,7 +12,7 @@ export type UseQueriesResult<AppModelTypes extends ReadonlyArray<unknown> = Read
  * Options to configure the subscription
  */
 export interface UseQueriesOptions {
-    snapshotListenOptions?: SnapshotListenOptions;
+    snapshotListenOptions?: SnapshotListenOptions | undefined;
 }
 
 /**
@@ -31,10 +31,10 @@ export function useQueries<
     DbModelTypes extends ReadonlyArray<DocumentData> = ReadonlyArray<DocumentData>,
 >(
     queries: { [Index in keyof AppModelTypes]: Query<AppModelTypes[Index], DbModelTypes[number]> },
-    options?: UseQueriesOptions,
+    options?: UseQueriesOptions | undefined,
 ): UseQueriesResult<AppModelTypes> {
     const { snapshotListenOptions } = options ?? {};
-    const { includeMetadataChanges } = snapshotListenOptions ?? {};
+    const { includeMetadataChanges = false } = snapshotListenOptions ?? {};
 
     const onChange: UseMultiListenChange<
         QuerySnapshot<AppModelTypes[number], DbModelTypes[number]>,

src/firestore/useQueriesData.ts

@@ -12,8 +12,8 @@ export type UseQueriesDataResult<AppModelTypes extends ReadonlyArray<unknown> =
  * Options to configure the subscription
  */
 export interface UseQueriesDataOptions {
-    snapshotListenOptions?: SnapshotListenOptions;
-    snapshotOptions?: SnapshotOptions;
+    snapshotListenOptions?: SnapshotListenOptions | undefined;
+    snapshotOptions?: SnapshotOptions | undefined;
 }
 
 /**
@@ -32,11 +32,11 @@ export function useQueriesData<
     DbModelTypes extends ReadonlyArray<DocumentData> = ReadonlyArray<DocumentData>,
 >(
     queries: { [Index in keyof AppModelTypes]: Query<AppModelTypes[Index], DbModelTypes[number]> },
-    options?: UseQueriesDataOptions,
+    options?: UseQueriesDataOptions | undefined,
 ): UseQueriesDataResult<AppModelTypes> {
     const { snapshotListenOptions, snapshotOptions } = options ?? {};
-    const { includeMetadataChanges } = snapshotListenOptions ?? {};
-    const { serverTimestamps } = snapshotOptions ?? {};
+    const { includeMetadataChanges = false } = snapshotListenOptions ?? {};
+    const { serverTimestamps = "none" } = snapshotOptions ?? {};
 
     const onChange: UseMultiListenChange<
         AppModelTypes[number],

src/firestore/useQueriesDataOnce.ts

@@ -13,8 +13,8 @@ export type UseQueriesDataOnceResult<AppModelTypes extends ReadonlyArray<unknown
  * Options to configure the subscription
  */
 export interface UseQueriesDataOnceOptions {
-    source?: Source;
-    snapshotOptions?: SnapshotOptions;
+    source?: Source | undefined;
+    snapshotOptions?: SnapshotOptions | undefined;
 }
 
 /**
@@ -33,10 +33,10 @@ export function useQueriesDataOnce<
     DbModelTypes extends ReadonlyArray<DocumentData> = ReadonlyArray<DocumentData>,
 >(
     queries: { [Index in keyof AppModelTypes]: Query<AppModelTypes[Index], DbModelTypes[number]> },
-    options?: UseQueriesDataOnceOptions,
+    options?: UseQueriesDataOnceOptions | undefined,
 ): UseQueriesDataOnceResult<AppModelTypes> {
     const { source = "default", snapshotOptions } = options ?? {};
-    const { serverTimestamps } = snapshotOptions ?? {};
+    const { serverTimestamps = "none" } = snapshotOptions ?? {};
 
     const getData = useCallback(
         async (stableQuery: Query<AppModelTypes[number], DbModelTypes[number]>) => {

src/firestore/useQueriesOnce.ts

@@ -13,8 +13,8 @@ export type UseQueriesOnceResult<AppModelTypes extends ReadonlyArray<unknown> =
  * Options to configure the subscription
  */
 export interface UseQueriesOnceOptions {
-    source?: Source;
-    snapshotOptions?: SnapshotOptions;
+    source?: Source | undefined;
+    snapshotOptions?: SnapshotOptions | undefined;
 }
 
 /**
@@ -33,7 +33,7 @@ export function useQueriesOnce<
     DbModelTypes extends ReadonlyArray<DocumentData> = ReadonlyArray<DocumentData>,
 >(
     queries: { [Index in keyof AppModelTypes]: Query<AppModelTypes[Index], DbModelTypes[number]> },
-    options?: UseQueriesOnceOptions,
+    options?: UseQueriesOnceOptions | undefined,
 ): UseQueriesOnceResult<AppModelTypes> {
     const { source = "default" } = options ?? {};
 

src/firestore/useQuery.ts

@@ -11,7 +11,7 @@ export type UseQueryResult<AppModelType = DocumentData> = ValueHookResult<QueryS
  * Options to configure the subscription
  */
 export interface UseQueryOptions {
-    snapshotListenOptions?: SnapshotListenOptions;
+    snapshotListenOptions?: SnapshotListenOptions | undefined;
 }
 
 /**
@@ -27,10 +27,10 @@ export interface UseQueryOptions {
  */
 export function useQuery<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     query: Query<AppModelType, DbModelType> | undefined | null,
-    options?: UseQueryOptions,
+    options?: UseQueryOptions | undefined,
 ): UseQueryResult<AppModelType> {
     const { snapshotListenOptions } = options ?? {};
-    const { includeMetadataChanges } = snapshotListenOptions ?? {};
+    const { includeMetadataChanges = false } = snapshotListenOptions ?? {};
 
     const onChange: UseListenOnChange<
         QuerySnapshot<AppModelType, DbModelType>,

src/firestore/useQueryData.ts

@@ -11,9 +11,9 @@ export type UseQueryDataResult<AppModelType = DocumentData> = ValueHookResult<Ap
  * Options to configure the subscription
  */
 export interface UseQueryDataOptions<AppModelType = DocumentData> {
-    snapshotListenOptions?: SnapshotListenOptions;
-    snapshotOptions?: SnapshotOptions;
-    initialValue?: AppModelType[];
+    snapshotListenOptions?: SnapshotListenOptions | undefined;
+    snapshotOptions?: SnapshotOptions | undefined;
+    initialValue?: AppModelType[] | undefined;
 }
 
 /**
@@ -30,26 +30,19 @@ export interface UseQueryDataOptions<AppModelType = DocumentData> {
  */
 export function useQueryData<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     query: Query<AppModelType, DbModelType> | undefined | null,
-    options?: UseQueryDataOptions<AppModelType>,
+    options?: UseQueryDataOptions<AppModelType> | undefined,
 ): UseQueryDataResult<AppModelType> {
     const { snapshotListenOptions, snapshotOptions } = options ?? {};
-    const { includeMetadataChanges } = snapshotListenOptions ?? {};
-    const { serverTimestamps } = snapshotOptions ?? {};
+    const { includeMetadataChanges = false } = snapshotListenOptions ?? {};
+    const { serverTimestamps = "none" } = snapshotOptions ?? {};
 
     const onChange: UseListenOnChange<AppModelType[], FirestoreError, Query<AppModelType, DbModelType>> = useCallback(
         (stableQuery, next, error) =>
             onSnapshot(
                 stableQuery,
                 { includeMetadataChanges },
                 {
-                    next: (snap) =>
-                        next(
-                            snap.docs.map((doc) =>
-                                doc.data({
-                                    serverTimestamps,
-                                }),
-                            ),
-                        ),
+                    next: (snap) => next(snap.docs.map((doc) => doc.data({ serverTimestamps }))),
                     error,
                 },
             ),

src/firestore/useQueryDataOnce.ts

@@ -11,8 +11,8 @@ export type UseQueryDataOnceResult<AppModelType = DocumentData> = ValueHookResul
  * Options to configure the subscription
  */
 export interface UseQueryDataOnceOptions {
-    source?: Source;
-    snapshotOptions?: SnapshotOptions;
+    source?: Source | undefined;
+    snapshotOptions?: SnapshotOptions | undefined;
 }
 
 /**
@@ -28,10 +28,10 @@ export interface UseQueryDataOnceOptions {
  */
 export function useQueryDataOnce<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     query: Query<AppModelType, DbModelType> | undefined | null,
-    options?: UseQueryDataOnceOptions,
+    options?: UseQueryDataOnceOptions | undefined,
 ): UseQueryDataOnceResult<AppModelType> {
     const { source = "default", snapshotOptions } = options ?? {};
-    const { serverTimestamps } = snapshotOptions ?? {};
+    const { serverTimestamps = "none" } = snapshotOptions ?? {};
 
     const getData = useCallback(
         async (stableQuery: Query<AppModelType, DbModelType>) => {

src/firestore/useQueryOnce.ts

@@ -11,7 +11,7 @@ export type UseQueryOnceResult<AppModelType = DocumentData> = ValueHookResult<Qu
  * Options to configure how the query is fetched
  */
 export interface UseQueryOnceOptions {
-    source?: Source;
+    source?: Source | undefined;
 }
 
 /**
@@ -27,7 +27,7 @@ export interface UseQueryOnceOptions {
  */
 export function useQueryOnce<AppModelType = DocumentData, DbModelType extends DocumentData = DocumentData>(
     query: Query<AppModelType, DbModelType> | undefined | null,
-    options?: UseQueryOnceOptions,
+    options?: UseQueryOnceOptions | undefined,
 ): UseQueryOnceResult<AppModelType> {
     const { source = "default" } = options ?? {};