react-query-firebase 3.2.0 → 3.3.0

package/dist/react-native/context/FirebaseContext.d.ts

@@ -1,15 +1,15 @@
-import { type ReactNativeFirebase } from "@react-native-firebase/app";
+import { type FirebaseApp } from "@react-native-firebase/app";
 import { type FirebaseAuthTypes } from "@react-native-firebase/auth";
 import { type Analytics } from "@react-native-firebase/analytics";
 import { type Messaging } from "@react-native-firebase/messaging";
 import { type FirebaseRemoteConfigTypes } from "@react-native-firebase/remote-config";
-import { type FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { type Firestore } from "@react-native-firebase/firestore";
 export type FirebaseContextValue = {
     auth: FirebaseAuthTypes.Module;
     analytics: Analytics;
-    firebase: ReactNativeFirebase.FirebaseApp;
+    firebase: FirebaseApp;
     remoteConfig: FirebaseRemoteConfigTypes.Module;
-    firestore: FirebaseFirestoreTypes.Module;
+    firestore: Firestore;
     messaging: Messaging;
 };
 /**

package/dist/react-native/context/FirebaseContextProvider.d.ts

@@ -1,25 +1,8 @@
 import React, { PropsWithChildren } from "react";
 import { ConsentSettings } from "@react-native-firebase/analytics";
 import { FirebaseRemoteConfigTypes } from "@react-native-firebase/remote-config";
+import { FirestoreSettings } from "@react-native-firebase/firestore";
 import { ReactNativeFirebase } from "@react-native-firebase/app";
-/**
- * @inline
- * @see https://firebase.google.com/docs/reference/js/firestore_.firestoresettings
- */
-export type FirestoreSettings = {
-    cacheSizeBytes?: number;
-    experimentalAutoDetectLongPolling?: boolean;
-    experimentalForceLongPolling?: boolean;
-    experimentalLongPollingOptions?: {
-        timeoutSeconds: number;
-    };
-    host?: string;
-    ignoreUndefinedProperties?: boolean;
-    localCache?: {
-        kind: "memory" | "persistent";
-    };
-    ssl?: boolean;
-};
 /**
  * @inline
  */

package/dist/react-native/context/FirebaseContextProvider.js

@@ -3,7 +3,7 @@ import { connectAuthEmulator, getAuth } from "@react-native-firebase/auth";
 import { getMessaging } from "@react-native-firebase/messaging";
 import { setAnalyticsCollectionEnabled, setConsent, getAnalytics } from "@react-native-firebase/analytics";
 import { getRemoteConfig } from "@react-native-firebase/remote-config";
-import { connectFirestoreEmulator, getFirestore } from "@react-native-firebase/firestore";
+import { connectFirestoreEmulator, getFirestore, initializeFirestore } from "@react-native-firebase/firestore";
 import { getApp } from "@react-native-firebase/app";
 import { FirebaseContext } from "./FirebaseContext.js";
 /**
@@ -48,10 +48,7 @@ export const FirebaseContextProvider = ({ emulators, children, authEnabled = tru
             if (emulators?.firestore?.host && emulators?.firestore?.port) {
                 connectFirestoreEmulator(getFirestore(internalFirebase), emulators.firestore.host, emulators.firestore.port);
             }
-            const localFirestore = getFirestore(internalFirebase);
-            if (firestoreSettings) {
-                localFirestore.settings(firestoreSettings);
-            }
+            const localFirestore = initializeFirestore(internalFirebase, firestoreSettings || {});
             return localFirestore;
         }
         return null;

package/dist/react-native/firestore/useAddDocMutation.d.ts

@@ -1,5 +1,5 @@
 import { UseMutationOptions } from "@tanstack/react-query";
-import { FirebaseFirestoreTypes, WithFieldValue } from "@react-native-firebase/firestore";
+import { type CollectionReference, WithFieldValue } from "@react-native-firebase/firestore";
 import { ReactNativeFirebase } from "@react-native-firebase/app";
 import { AppModel } from "../../types/index.js";
 /**
@@ -18,7 +18,7 @@ export type UseAddDocMutationOptions<AppModelType extends AppModel = AppModel, T
     /**
      * Reference to a collection where document must be added
      */
-    collectionReference: FirebaseFirestoreTypes.CollectionReference<AppModelType>;
+    collectionReference: CollectionReference<AppModelType, AppModelType>;
     /**
      * Options for useMutation hook excluding mutationFn. MutationKey will be equal to reference.path by default.
      */

package/dist/react-native/firestore/useBatchWrite.d.ts

@@ -1,10 +1,10 @@
 import { UseMutationOptions } from "@tanstack/react-query";
-import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { writeBatch } from "@react-native-firebase/firestore";
 import { ReactNativeFirebase } from "@react-native-firebase/app";
 /**
  * @inline
  */
-export type UseBatchWriteVariables = (batch: FirebaseFirestoreTypes.WriteBatch) => Promise<void> | void;
+export type UseBatchWriteVariables = (batch: ReturnType<typeof writeBatch>) => Promise<void> | void;
 /**
  * @inline
  */

package/dist/react-native/firestore/useCollectionReference.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { CollectionReference, DocumentReference } from "@react-native-firebase/firestore";
 import { AppModel } from "../../types/index.js";
 /**
  * @inline
@@ -7,7 +7,7 @@ export type UseCollectionReferenceOptions<AppModelType extends AppModel = AppMod
     /**
      * CollectionReference or DocumentReference that is used as a root to lookup a sub-collection
      */
-    reference?: FirebaseFirestoreTypes.CollectionReference<AppModelType> | FirebaseFirestoreTypes.DocumentReference<AppModelType>;
+    reference?: CollectionReference<AppModelType, AppModelType> | DocumentReference<AppModelType, AppModelType>;
     /**
      * A slash-separated path to a collection.
      */
@@ -25,7 +25,7 @@ export type UseCollectionReferenceOptions<AppModelType extends AppModel = AppMod
  *
  * @param {UseCollectionReferenceOptions<AppModelType>} options - Options
  *
- * @returns {FirebaseFirestoreTypes.CollectionReference<AppModelType, AppModelType>} A reference to a Firestore collection
+ * @returns {CollectionReference<AppModelType, AppModelType>} A reference to a Firestore collection
  *
  * @example
  * ```jsx
@@ -36,4 +36,4 @@ export type UseCollectionReferenceOptions<AppModelType extends AppModel = AppMod
  * };
  * ```
  */
-export declare const useCollectionReference: <AppModelType extends AppModel = AppModel>({ path, reference, pathSegments }: UseCollectionReferenceOptions<AppModelType>) => FirebaseFirestoreTypes.CollectionReference<AppModelType>;
+export declare const useCollectionReference: <AppModelType extends AppModel = AppModel>({ path, reference, pathSegments }: UseCollectionReferenceOptions<AppModelType>) => CollectionReference<AppModelType, AppModelType>;

package/dist/react-native/firestore/useCollectionReference.js

@@ -9,7 +9,7 @@ import { useFirestore } from "./useFirestore.js";
  *
  * @param {UseCollectionReferenceOptions<AppModelType>} options - Options
  *
- * @returns {FirebaseFirestoreTypes.CollectionReference<AppModelType, AppModelType>} A reference to a Firestore collection
+ * @returns {CollectionReference<AppModelType, AppModelType>} A reference to a Firestore collection
  *
  * @example
  * ```jsx

package/dist/react-native/firestore/useCompositeFilter.d.ts

@@ -1,5 +1,5 @@
 import { AppModel } from "../../types/index.js";
-import { CompositeFilter, QueryFilterConstraint } from "./utils/buildCompositeFilter.js";
+import { CompositeFilter } from "./utils/buildCompositeFilter.js";
 /**
  * @inline
  */
@@ -34,4 +34,4 @@ export type UseCompositeFilter<AppModelType extends AppModel = AppModel> = {
  * };
  * ```
  */
-export declare const useCompositeFilter: <AppModelType extends AppModel = AppModel>({ query }: UseCompositeFilter<AppModelType>) => QueryFilterConstraint | undefined;
+export declare const useCompositeFilter: <AppModelType extends AppModel = AppModel>({ query }: UseCompositeFilter<AppModelType>) => import("@firebase/firestore").QueryCompositeFilterConstraint | null;

package/dist/react-native/firestore/useCompositeFilter.js

@@ -1,4 +1,3 @@
-import { and, or } from "@react-native-firebase/firestore";
 import { useMemo } from "react";
 import { buildCompositeFilter } from "./utils/buildCompositeFilter.js";
 /**
@@ -31,15 +30,6 @@ import { buildCompositeFilter } from "./utils/buildCompositeFilter.js";
  */
 export const useCompositeFilter = ({ query }) => {
     return useMemo(() => {
-        const queryConstraints = query?.children
-            ?.map?.((subQuery) => buildCompositeFilter(subQuery))
-            ?.filter?.((constraint) => !!constraint) ?? [];
-        if (queryConstraints.length <= 0) {
-            return undefined;
-        }
-        if (queryConstraints.length <= 1) {
-            return queryConstraints[0];
-        }
-        return query?.operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
+        return query ? buildCompositeFilter(query) : null;
     }, [query]);
 };

package/dist/react-native/firestore/useCountQuery.d.ts

@@ -1,7 +1,6 @@
-import { FirebaseFirestoreTypes, QueryConstraint, QueryNonFilterConstraint } from "@react-native-firebase/firestore";
+import { CollectionReference, QueryCompositeFilterConstraint, QueryConstraint, QueryNonFilterConstraint } from "@react-native-firebase/firestore";
 import { UseQueryResult, UseQueryOptions as UseReactQueryOptions } from "@tanstack/react-query";
 import { AppModel } from "../../types/index.js";
-import { QueryFilterConstraint } from "./utils/buildCompositeFilter.js";
 /**
  * @inline
  */
@@ -13,7 +12,7 @@ type UseCountQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Reference to a Firestore collection
      */
-    collectionReference: FirebaseFirestoreTypes.CollectionReference<AppModelType>;
+    collectionReference: CollectionReference<AppModelType, AppModelType>;
     /**
      * Non composite filter constraints such as limit, order, where
      */
@@ -21,7 +20,7 @@ type UseCountQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Composite filter
      */
-    compositeFilter?: QueryFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint;
 };
 /**
  * Executes a query with specified constraints and returns the count of matched documents.

package/dist/react-native/firestore/useDeleteDocMutation.d.ts

@@ -1,5 +1,5 @@
 import { UseMutationOptions } from "@tanstack/react-query";
-import { FirebaseFirestoreTypes, WithFieldValue } from "@react-native-firebase/firestore";
+import { DocumentReference, WithFieldValue, DocumentData } from "@react-native-firebase/firestore";
 import { AppModel } from "../../types/index.js";
 /**
  * @inline
@@ -14,7 +14,7 @@ export type UseDeleteDocMutationOptions<AppModelType extends AppModel = AppModel
     /**
      * A reference to a firestore document
      */
-    reference: FirebaseFirestoreTypes.DocumentReference<AppModelType> | null;
+    reference: DocumentReference<AppModelType, AppModelType> | null;
     /**
      * Options for useMutation hook excluding mutationFn. MutationKey will be equal to reference.path by default.
      */
@@ -44,4 +44,4 @@ export type UseDeleteDocMutationOptions<AppModelType extends AppModel = AppModel
  * };
  * ```
  */
-export declare const useDeleteDocMutation: <AppModelType extends FirebaseFirestoreTypes.DocumentData = FirebaseFirestoreTypes.DocumentData, TContext = unknown>({ reference, options }: UseDeleteDocMutationOptions<AppModelType, TContext>) => import("@tanstack/react-query").UseMutationResult<void, Error, void, TContext>;
+export declare const useDeleteDocMutation: <AppModelType extends DocumentData = DocumentData, TContext = unknown>({ reference, options }: UseDeleteDocMutationOptions<AppModelType, TContext>) => import("@tanstack/react-query").UseMutationResult<void, Error, void, TContext>;

package/dist/react-native/firestore/useDocReference.d.ts

@@ -11,7 +11,7 @@ export type UseDocReferenceOptions<AppModelType extends AppModel = AppModel> = O
  *
  * @param {UseDocReferenceOptions<AppModelType>} options - Options
  *
- * @returns {FirebaseFirestoreTypes.DocumentReference<AppModelType, AppModelType> | null} A reference to a Firestore document
+ * @returns {DocumentReference<AppModelType, AppModelType> | null} A reference to a Firestore document
  *
  * @example
  * ```jsx
@@ -23,4 +23,4 @@ export type UseDocReferenceOptions<AppModelType extends AppModel = AppModel> = O
  * };
  * ```
  */
-export declare const useDocReference: <AppModelType extends AppModel = AppModel>({ path, reference, pathSegments }: UseDocReferenceOptions<AppModelType>) => import("@react-native-firebase/firestore").FirebaseFirestoreTypes.DocumentReference<AppModelType> | null;
+export declare const useDocReference: <AppModelType extends AppModel = AppModel>({ path, reference, pathSegments }: UseDocReferenceOptions<AppModelType>) => import("@react-native-firebase/firestore").DocumentReference<AppModelType, AppModelType> | null;

package/dist/react-native/firestore/useDocReference.js

@@ -8,7 +8,7 @@ import { getDocRef } from "./utils/getDocRef.js";
  *
  * @param {UseDocReferenceOptions<AppModelType>} options - Options
  *
- * @returns {FirebaseFirestoreTypes.DocumentReference<AppModelType, AppModelType> | null} A reference to a Firestore document
+ * @returns {DocumentReference<AppModelType, AppModelType> | null} A reference to a Firestore document
  *
  * @example
  * ```jsx

package/dist/react-native/firestore/useDocReferences.d.ts

@@ -13,7 +13,7 @@ export type UseDocReferencesOptions<AppModelType extends AppModel = AppModel> =
  *
  * @param {UseDocReferencesOptions<AppModelType>} options - Options
  *
- * @returns {Array<FirebaseFirestoreTypes.DocumentReference<AppModelType> | null>} A reference to a Firestore document
+ * @returns {Array<DocumentReference<AppModelType> | null>} A reference to a Firestore document
  *
  * @example
  * ```jsx
@@ -25,4 +25,4 @@ export type UseDocReferencesOptions<AppModelType extends AppModel = AppModel> =
  * };
  * ```
  */
-export declare const useDocReferences: <AppModelType extends AppModel = AppModel>({ references }: UseDocReferencesOptions<AppModelType>) => (import("@react-native-firebase/firestore").FirebaseFirestoreTypes.DocumentReference<AppModelType> | null)[];
+export declare const useDocReferences: <AppModelType extends AppModel = AppModel>({ references }: UseDocReferencesOptions<AppModelType>) => (import("@react-native-firebase/firestore").DocumentReference<AppModelType, AppModelType> | null)[];

package/dist/react-native/firestore/useDocReferences.js

@@ -8,7 +8,7 @@ import { getDocRef } from "./utils/getDocRef.js";
  *
  * @param {UseDocReferencesOptions<AppModelType>} options - Options
  *
- * @returns {Array<FirebaseFirestoreTypes.DocumentReference<AppModelType> | null>} A reference to a Firestore document
+ * @returns {Array<DocumentReference<AppModelType> | null>} A reference to a Firestore document
  *
  * @example
  * ```jsx

package/dist/react-native/firestore/useFirestore.d.ts

@@ -5,4 +5,4 @@
  *
  * @returns {Firestore}
  */
-export declare const useFirestore: () => import("@react-native-firebase/firestore").FirebaseFirestoreTypes.Module;
+export declare const useFirestore: () => import("@react-native-firebase/firestore").Firestore;

package/dist/react-native/firestore/useFirestoreQueryEngine.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { CollectionReference } from "@react-native-firebase/firestore";
 import { AppModel } from "../../types/index.js";
 import { type NonFilterQueryConstraint } from "../../types/QueryConstraints.js";
 import { type CompositeFilter } from "./utils/buildCompositeFilter.js";
@@ -9,7 +9,7 @@ type UseFirestoreQueryEngineOptions<AppModelType extends AppModel = AppModel> =
     /**
      * Reference to a Firestore collection
      */
-    collectionReference: FirebaseFirestoreTypes.CollectionReference<AppModelType>;
+    collectionReference: CollectionReference<AppModelType, AppModelType>;
     /**
      * Non composite filter constraints such as limit, order, where
      */

package/dist/react-native/firestore/useFirestoreQueryEngine.js

@@ -1,4 +1,4 @@
-import { getDocs, query, or, and } from "@react-native-firebase/firestore";
+import { getDocs, query } from "@react-native-firebase/firestore";
 import { useCallback } from "react";
 import { buildCompositeFilter } from "./utils/buildCompositeFilter.js";
 import { buildQueryConstraint } from "./utils/buildQueryConstraint.js";
@@ -25,16 +25,9 @@ import { buildQueryConstraint } from "./utils/buildQueryConstraint.js";
  */
 export const useFirestoreQueryEngine = () => {
     return useCallback(async ({ collectionReference, queryConstraints = [], compositeFilter: inputCompositeFilter }) => {
-        const compositeFilter = (inputCompositeFilter?.children?.map?.((subQuery) => buildCompositeFilter(subQuery))
-            ?.filter)?.((constraint) => !!constraint) ?? [];
-        const finalCompositeFilter = compositeFilter.length > 0
-            ? inputCompositeFilter?.operator === "OR"
-                ? or(...compositeFilter)
-                : and(...compositeFilter)
-            : undefined;
-        const queryToExecute = finalCompositeFilter
-            ? query(collectionReference, finalCompositeFilter, ...queryConstraints.map(buildQueryConstraint))
-            : query(collectionReference, ...queryConstraints.map(buildQueryConstraint));
+        const compositeFilter = inputCompositeFilter ? buildCompositeFilter(inputCompositeFilter) : null;
+        const builtQueryConstraints = queryConstraints.map(buildQueryConstraint);
+        const queryToExecute = query(collectionReference, ...[...(compositeFilter ? [compositeFilter] : []), ...builtQueryConstraints]);
         const querySnapshot = await getDocs(queryToExecute);
         const docs = [];
         if (querySnapshot) {

package/dist/react-native/firestore/useGetRealtimeDocData.d.ts

@@ -1,4 +1,4 @@
-import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { DocumentReference } from "@react-native-firebase/firestore";
 import { ReactNativeFirebase } from "@react-native-firebase/app";
 import { AppModel } from "../../types/index.js";
 /**
@@ -12,7 +12,7 @@ export type UseGetRealtimeDocDataOptions<AppModelType extends AppModel = AppMode
     /**
      * A reference to a collection.
      */
-    reference?: FirebaseFirestoreTypes.DocumentReference<AppModelType>;
+    reference?: DocumentReference<AppModelType, AppModelType>;
     /**
      * Additional path segments that will be applied relative
      * to the first argument.

package/dist/react-native/firestore/useInfiniteQuery.d.ts

@@ -1,7 +1,6 @@
-import { FirebaseFirestoreTypes, QueryConstraint, QueryNonFilterConstraint } from "@react-native-firebase/firestore";
+import { CollectionReference, QueryCompositeFilterConstraint, QueryConstraint, QueryNonFilterConstraint } from "@react-native-firebase/firestore";
 import { UseInfiniteQueryOptions as UseReactInfiniteQueryOptions, QueryKey, UseInfiniteQueryResult, InfiniteData } from "@tanstack/react-query";
 import { AppModel } from "../../types/index.js";
-import { QueryFilterConstraint } from "./utils/buildCompositeFilter.js";
 /**
  * @inline
  */
@@ -13,7 +12,7 @@ type UseInfiniteQueryOptions<AppModelType extends AppModel = AppModel, TQueryKey
     /**
      * Reference to a Firestore collection
      */
-    collectionReference: FirebaseFirestoreTypes.CollectionReference<AppModelType>;
+    collectionReference: CollectionReference<AppModelType, AppModelType>;
     /**
      * Non composite filter constraints such as limit, order, where
      */
@@ -21,7 +20,7 @@ type UseInfiniteQueryOptions<AppModelType extends AppModel = AppModel, TQueryKey
     /**
      * Composite filter
      */
-    compositeFilter?: QueryFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint;
 };
 /**
  * Executes an infinite query on a Firestore data source and returns the resulting documents as an array.

package/dist/react-native/firestore/useInfiniteQuery.js

@@ -27,9 +27,7 @@ export const useInfiniteQuery = ({ options, collectionReference, queryConstraint
         ...options,
         queryFn: async ({ pageParam }) => {
             const allQueryConstraints = [...queryConstraints, ...(pageParam ? [pageParam] : [])];
-            const queryToExecute = compositeFilter
-                ? query(collectionReference, compositeFilter, ...allQueryConstraints)
-                : query(collectionReference, ...allQueryConstraints);
+            const queryToExecute = query(collectionReference, ...[...(compositeFilter ? [compositeFilter] : []), ...allQueryConstraints]);
             const querySnapshot = await getDocs(queryToExecute);
             const docs = [];
             if (querySnapshot) {

package/dist/react-native/firestore/useQuery.d.ts

@@ -1,7 +1,7 @@
-import { FirebaseFirestoreTypes, QueryConstraint, QueryNonFilterConstraint } from "@react-native-firebase/firestore";
+import { CollectionReference, QueryConstraint, QueryNonFilterConstraint } from "@react-native-firebase/firestore";
 import { UseQueryResult, UseQueryOptions as UseReactQueryOptions } from "@tanstack/react-query";
+import { QueryCompositeFilterConstraint } from "firebase/firestore";
 import { AppModel } from "../../types/index.js";
-import { QueryFilterConstraint } from "./utils/buildCompositeFilter.js";
 /**
  * @inline
  */
@@ -13,7 +13,7 @@ type UseQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Reference to a Firestore collection
      */
-    collectionReference: FirebaseFirestoreTypes.CollectionReference<AppModelType>;
+    collectionReference: CollectionReference<AppModelType, AppModelType>;
     /**
      * Non composite filter constraints such as limit, order, where
      */
@@ -21,7 +21,7 @@ type UseQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Composite filter
      */
-    compositeFilter?: QueryFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint;
 };
 /**
  * Executes a query on a Firestore data source and returns the resulting documents as an array.

package/dist/react-native/firestore/useQuery.js

@@ -26,9 +26,7 @@ export const useQuery = ({ options, collectionReference, queryConstraints = [],
     return useReactQuery({
         ...options,
         queryFn: async () => {
-            const queryToExecute = compositeFilter
-                ? query(collectionReference, compositeFilter, ...queryConstraints)
-                : query(collectionReference, ...queryConstraints);
+            const queryToExecute = query(collectionReference, ...[...(compositeFilter ? [compositeFilter] : []), ...queryConstraints]);
             const querySnapshot = await getDocs(queryToExecute);
             const docs = [];
             if (querySnapshot) {

package/dist/react-native/firestore/useQueryConstraints.d.ts

@@ -18,7 +18,7 @@ export type UseQueryConstraints<AppModelType extends AppModel = AppModel> = {
  *
  * @param {UseQueryConstraints<AppModelType>} options
  *
- * @returns {FirebaseFirestoreTypes.QueryNonFilterConstraint}
+ * @returns {QueryNonFilterConstraint}
  *
  * @example
  * ```jsx

package/dist/react-native/firestore/useQueryConstraints.js

@@ -8,7 +8,7 @@ import { buildQueryConstraint } from "./utils/buildQueryConstraint.js";
  *
  * @param {UseQueryConstraints<AppModelType>} options
  *
- * @returns {FirebaseFirestoreTypes.QueryNonFilterConstraint}
+ * @returns {QueryNonFilterConstraint}
  *
  * @example
  * ```jsx

package/dist/react-native/firestore/useRunTransaction.d.ts

@@ -1,9 +1,9 @@
 import { UseMutationOptions } from "@tanstack/react-query";
-import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { runTransaction } from "@react-native-firebase/firestore";
 /**
  * @inline
  */
-export type UseRunTransactionValues = <T = unknown>(transaction: FirebaseFirestoreTypes.Transaction) => T;
+export type UseRunTransactionValues<T = unknown> = Parameters<typeof runTransaction<T>>[1];
 /**
  * @inline
  */
@@ -11,7 +11,7 @@ export type UseRunTransactionOptions<T = unknown, TContext = unknown> = {
     /**
      * Reqct-mutation options that shall omit mutationFn
      */
-    options?: Omit<UseMutationOptions<T, Error, UseRunTransactionValues, TContext>, "mutationFn">;
+    options?: Omit<UseMutationOptions<T, Error, UseRunTransactionValues<T>, TContext>, "mutationFn">;
 };
 /**
  * Executes a Firestore transaction
@@ -36,4 +36,4 @@ export type UseRunTransactionOptions<T = unknown, TContext = unknown> = {
  * };
  * ```
  */
-export declare const useRunTransaction: <T = unknown, TContext = unknown>({ options }: UseRunTransactionOptions<T, TContext>) => import("@tanstack/react-query").UseMutationResult<T, Error, UseRunTransactionValues, TContext>;
+export declare const useRunTransaction: <T = unknown, TContext = unknown>({ options }: UseRunTransactionOptions<T, TContext>) => import("@tanstack/react-query").UseMutationResult<T, Error, (transaction: import("@react-native-firebase/firestore/dist/typescript/lib/types/firestore.js").Transaction) => Promise<T>, TContext>;

package/dist/react-native/firestore/useSetDocMutation.d.ts

@@ -1,5 +1,5 @@
 import { UseMutationOptions } from "@tanstack/react-query";
-import { FirebaseFirestoreTypes, WithFieldValue } from "@react-native-firebase/firestore";
+import { DocumentReference, WithFieldValue } from "@react-native-firebase/firestore";
 import { AppModel } from "../../types/index.js";
 /**
  * @inline
@@ -17,7 +17,7 @@ export type UseSetDocMutationOptions<AppModelType extends AppModel = AppModel, T
     /**
      * Reference to a document that must be written
      */
-    reference: FirebaseFirestoreTypes.DocumentReference<AppModelType> | null;
+    reference: DocumentReference<AppModelType, AppModelType> | null;
     /**
      * Options for useMutation hook excluding mutationFn.
      */

package/dist/react-native/firestore/useUpdateDocMutation.d.ts

@@ -1,5 +1,5 @@
 import { UseMutationOptions } from "@tanstack/react-query";
-import { FirebaseFirestoreTypes, UpdateData } from "@react-native-firebase/firestore";
+import { DocumentReference, UpdateData } from "@react-native-firebase/firestore";
 import { AppModel } from "../../types/index.js";
 /**
  * @inline
@@ -17,7 +17,7 @@ export type UseUpdateDocMutationOptions<AppModelType extends AppModel = AppModel
     /**
      * Reference to a document that must be updated
      */
-    reference: FirebaseFirestoreTypes.DocumentReference<AppModelType> | null;
+    reference: DocumentReference<AppModelType, AppModelType> | null;
     /**
      * Options for useMutation hook excluding mutationFn.
      */

package/dist/react-native/firestore/utils/buildCompositeFilter.d.ts

@@ -1,20 +1,18 @@
-import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { WhereFilterOp } from "@react-native-firebase/firestore";
+import { QueryCompositeFilterConstraint } from "firebase/firestore";
 import { AppModel } from "../../../types/index.js";
-export type QueryFilterConstraint = FirebaseFirestoreTypes.QueryCompositeFilterConstraint | FirebaseFirestoreTypes.QueryFilterConstraint;
 export type QueryElement<AppModelType extends AppModel = AppModel> = {
-    operator?: "OR" | "AND";
-    children?: QueryElement[];
-    field?: keyof (AppModelType & {
+    field: keyof (AppModelType & {
         documentId?: string[];
     });
-    value?: AppModelType[keyof AppModelType];
-    op?: FirebaseFirestoreTypes.WhereFilterOp;
+    value: AppModelType[keyof AppModelType];
+    op: WhereFilterOp;
 };
 export type CompositeFilter<AppModelType extends AppModel = AppModel> = {
     operator: "OR" | "AND";
-    children: QueryElement<AppModelType & {
+    children: Array<CompositeFilter<AppModelType> | QueryElement<AppModelType & {
         documentId?: string[];
-    }>[];
+    }>>;
 };
 /**
  * Constructs a composite or where query filter based on the provided query structure.
@@ -24,7 +22,7 @@ export type CompositeFilter<AppModelType extends AppModel = AppModel> = {
  *
  * @param {QueryElement<AppModelType>} query
  *
- * @returns {QueryFilterConstraint | null}
+ * @returns {QueryCompositeFilterConstraint | null}
  *
  * @example
  * ```jsx
@@ -44,4 +42,4 @@ export type CompositeFilter<AppModelType extends AppModel = AppModel> = {
  * };
  * ```
  */
-export declare const buildCompositeFilter: <AppModelType extends AppModel = AppModel>(query: QueryElement<AppModelType>) => QueryFilterConstraint | null;
+export declare const buildCompositeFilter: <AppModelType extends AppModel = AppModel>(query: CompositeFilter<AppModelType> | QueryElement<AppModelType>) => QueryCompositeFilterConstraint | null;

package/dist/react-native/firestore/utils/buildCompositeFilter.js

@@ -7,7 +7,7 @@ import { and, or, where, FieldPath } from "@react-native-firebase/firestore";
  *
  * @param {QueryElement<AppModelType>} query
  *
- * @returns {QueryFilterConstraint | null}
+ * @returns {QueryCompositeFilterConstraint | null}
  *
  * @example
  * ```jsx
@@ -29,17 +29,23 @@ import { and, or, where, FieldPath } from "@react-native-firebase/firestore";
  */
 export const buildCompositeFilter = (query) => {
     if (query.children) {
-        const queryConstraints = query.children.map(buildCompositeFilter).filter((constraint) => !!constraint);
+        const queryConstraints = query.children
+            .map(buildCompositeFilter)
+            .filter((constraint) => !!constraint);
         if (queryConstraints.length <= 0) {
             return null;
         }
         if (queryConstraints.length <= 1) {
-            return queryConstraints[0];
+            return and(queryConstraints[0]);
         }
-        return query.operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
+        return query.operator === "OR"
+            ? or(...queryConstraints)
+            : and(...queryConstraints);
     }
     if (query.field && query.op) {
-        return where(query.field === "documentId" ? new FieldPath("__name__") : query.field, query.op, query.value);
+        return and(where(query.field === "documentId"
+            ? new FieldPath("__name__")
+            : query.field, query.op, query.value));
     }
     return null;
 };

package/dist/react-native/firestore/utils/buildQueryConstraint.d.ts

@@ -7,7 +7,7 @@ import { AppModel, type NonFilterQueryConstraint } from "../../../types/index.js
  *
  * @param {NonFilterQueryConstraint<AppModelType>} constraint
  *
- * @returns {FirebaseFirestoreTypes.QueryNonFilterConstraint}
+ * @returns {QueryNonFilterConstraint}
  *
  * @example
  * ```jsx

package/dist/react-native/firestore/utils/buildQueryConstraint.js

@@ -6,7 +6,7 @@ import { orderBy, startAt, startAfter, endAt, endBefore, limit, limitToLast } fr
  *
  * @param {NonFilterQueryConstraint<AppModelType>} constraint
  *
- * @returns {FirebaseFirestoreTypes.QueryNonFilterConstraint}
+ * @returns {QueryNonFilterConstraint}
  *
  * @example
  * ```jsx

package/dist/react-native/firestore/utils/getDocRef.d.ts

@@ -1,11 +1,11 @@
-import { FirebaseFirestoreTypes } from "@react-native-firebase/firestore";
+import { CollectionReference, DocumentReference, Firestore } from "@react-native-firebase/firestore";
 import { AppModel } from "../../../types/index.js";
 /**
  * @inline
  */
 export type GetDocRefOptions<AppModelType extends AppModel = AppModel> = {
-    db: FirebaseFirestoreTypes.Module;
-    reference?: FirebaseFirestoreTypes.CollectionReference<AppModelType> | FirebaseFirestoreTypes.DocumentReference<AppModelType>;
+    db: Firestore;
+    reference?: CollectionReference<AppModelType, AppModelType> | DocumentReference<AppModelType, AppModelType>;
     path?: string;
     pathSegments?: string[];
 };
@@ -19,4 +19,4 @@ export type GetDocRefOptions<AppModelType extends AppModel = AppModel> = {
  *
  * @returns {DocumentReference<AppModelType, AppModelType>} Returns a document reference
  */
-export declare const getDocRef: <AppModelType extends AppModel = AppModel>({ db, reference, path, pathSegments }: GetDocRefOptions<AppModelType>) => FirebaseFirestoreTypes.DocumentReference<AppModelType> | null;
+export declare const getDocRef: <AppModelType extends AppModel = AppModel>({ db, reference, path, pathSegments }: GetDocRefOptions<AppModelType>) => DocumentReference<AppModelType, AppModelType> | null;

package/dist/react-native/firestore/utils/getDocSnap.d.ts

@@ -15,4 +15,4 @@ export type GetDocSnapOptions<AppModelType extends AppModel = AppModel> = GetDoc
  *
  * @returns {Promise<DocumentSnapshot<AppModelType, AppModelType> | null>} Returns a document reference
  */
-export declare const getDocSnap: <AppModelType extends AppModel = AppModel>({ db, reference, path, pathSegments }: GetDocSnapOptions<AppModelType>) => Promise<import("@react-native-firebase/firestore").FirebaseFirestoreTypes.DocumentSnapshot<AppModelType> | null>;
+export declare const getDocSnap: <AppModelType extends AppModel = AppModel>({ db, reference, path, pathSegments }: GetDocSnapOptions<AppModelType>) => Promise<import("@react-native-firebase/firestore/dist/typescript/lib/types/firestore.js").DocumentSnapshot<AppModelType, AppModelType> | null>;

package/dist/react-native/firestore/utils/getDocSnap.js

@@ -12,7 +12,7 @@ import { getDocRef } from "./getDocRef.js";
  * @returns {Promise<DocumentSnapshot<AppModelType, AppModelType> | null>} Returns a document reference
  */
 export const getDocSnap = async ({ db, reference, path, pathSegments }) => {
-    const docRef = await getDocRef({ db, reference, path, pathSegments });
+    const docRef = getDocRef({ db, reference, path, pathSegments });
     if (docRef) {
         return await firestoreGetDoc(docRef);
     }

package/package.json

@@ -5,14 +5,14 @@
         "url": "https://github.com/vpishuk/react-query-firebase/issues"
     },
     "peerDependencies": {
-        "@react-native-firebase/analytics": "^23.x.x",
-        "@react-native-firebase/app": "^23.x.x",
-        "@react-native-firebase/auth": "^23.x.x",
-        "@react-native-firebase/crashlytics": "^23.x.x",
-        "@react-native-firebase/firestore": "^23.x.x",
-        "@react-native-firebase/installations": "^23.x.x",
-        "@react-native-firebase/messaging": "^23.x.x",
-        "@react-native-firebase/remote-config": "^23.x.x",
+        "@react-native-firebase/analytics": "^24.x.x",
+        "@react-native-firebase/app": "^24.x.x",
+        "@react-native-firebase/auth": "^24.x.x",
+        "@react-native-firebase/crashlytics": "^24.x.x",
+        "@react-native-firebase/firestore": "^24.x.x",
+        "@react-native-firebase/installations": "^24.x.x",
+        "@react-native-firebase/messaging": "^24.x.x",
+        "@react-native-firebase/remote-config": "^24.x.x",
         "@tanstack/react-query": "^5.x.x",
         "firebase": "^11.x.x || ^12.x.x",
         "react": "^18.x.x || ^19.x.x"
@@ -23,34 +23,34 @@
     "description": "This module offers react hooks to work with Firebase on react-native and web platforms",
     "devDependencies": {
         "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1",
-        "@react-native-firebase/analytics": "^23.5.0",
-        "@react-native-firebase/app": "^23.5.0",
-        "@react-native-firebase/auth": "^23.8.8",
-        "@react-native-firebase/crashlytics": "^23.8.8",
-        "@react-native-firebase/firestore": "^23.8.8",
-        "@react-native-firebase/installations": "^23.8.8",
-        "@react-native-firebase/messaging": "^23.8.8",
-        "@react-native-firebase/remote-config": "^23.8.8",
-        "@tanstack/react-query": "^5.90.21",
+        "@react-native-firebase/analytics": "^24.0.0",
+        "@react-native-firebase/app": "^24.0.0",
+        "@react-native-firebase/auth": "^24.0.0",
+        "@react-native-firebase/crashlytics": "^24.0.0",
+        "@react-native-firebase/firestore": "^24.0.0",
+        "@react-native-firebase/installations": "^24.0.0",
+        "@react-native-firebase/messaging": "^24.0.0",
+        "@react-native-firebase/remote-config": "^24.0.0",
+        "@tanstack/react-query": "^5.99.2",
         "@types/react": "^19.2.14",
         "eslint": "^9.39.4",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-import": "^2.32.0",
-        "eslint-plugin-jest": "^29.15.0",
+        "eslint-plugin-jest": "^29.15.2",
         "eslint-plugin-jsonc": "^2.21.1",
         "eslint-plugin-prettier": "^5.5.5",
         "eslint-plugin-react": "^7.37.5",
-        "eslint-plugin-react-hooks": "^7.0.1",
-        "firebase": "^12.7.0",
+        "eslint-plugin-react-hooks": "^7.1.1",
+        "firebase": "^12.12.1",
         "husky": "^9.1.7",
         "lint-staged": "^16.4.0",
-        "prettier": "^3.8.1",
-        "react": "^19.2.4",
-        "typedoc": "^0.28.17",
-        "typedoc-plugin-markdown": "^4.10.0",
+        "prettier": "^3.8.3",
+        "react": "^19.2.5",
+        "typedoc": "^0.28.19",
+        "typedoc-plugin-markdown": "^4.11.0",
         "typedoc-vitepress-theme": "^1.1.2",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.57.0",
+        "typescript-eslint": "^8.59.0",
         "vitepress": "^1.6.4"
     },
     "homepage": "https://github.com/vpishuk/react-query-firebase",
@@ -93,5 +93,5 @@
         "docs:build": "vitepress build docs",
         "docs:preview": "vitepress preview docs"
     },
-    "version": "3.2.0"
+    "version": "3.3.0"
 }