react-query-firebase 2.8.0 → 2.9.1

package/package.json

@@ -12,7 +12,7 @@
         "@react-native-firebase/firestore": "^22.x.x",
         "@react-native-firebase/installations": "^22.x.x",
         "@react-native-firebase/remote-config": "^22.x.x",
-        "@tanstack/react-query": "^5.x.x",
+        "@tanstack/react-query": "^5.83.0",
         "firebase": "^11.x.x",
         "react": "^18.x.x || ^19.x.x"
     },
@@ -24,22 +24,22 @@
         "@laverve/eslint-utils": "^5.3.1",
         "@react-native-firebase/analytics": "^22.2.1",
         "@react-native-firebase/app": "^22.2.1",
-        "@react-native-firebase/auth": "^22.2.1",
-        "@react-native-firebase/crashlytics": "^22.2.1",
-        "@react-native-firebase/firestore": "^22.2.1",
-        "@react-native-firebase/installations": "^22.2.1",
-        "@react-native-firebase/remote-config": "^22.2.1",
-        "@types/react": "^19.1.7",
+        "@react-native-firebase/auth": "^22.4.0",
+        "@react-native-firebase/crashlytics": "^22.4.0",
+        "@react-native-firebase/firestore": "^22.4.0",
+        "@react-native-firebase/installations": "^22.4.0",
+        "@react-native-firebase/remote-config": "^22.4.0",
+        "@types/react": "^19.1.8",
+        "firebase": "^11.9.0",
         "husky": "^9.1.7",
-        "lint-staged": "^16.1.0",
-        "prettier": "^3.5.3",
+        "lint-staged": "^16.1.2",
+        "prettier": "^3.6.2",
         "react": "^19.1.0",
-        "typedoc": "^0.28.5",
-        "typedoc-plugin-markdown": "^4.6.4",
+        "typedoc": "^0.28.7",
+        "typedoc-plugin-markdown": "^4.7.1",
         "typedoc-vitepress-theme": "^1.1.2",
         "typescript": "^5.8.3",
-        "vitepress": "^1.6.3",
-        "firebase": "^11.9.0"
+        "vitepress": "^1.6.3"
     },
     "homepage": "https://github.com/vpishuk/react-query-firebase",
     "keywords": [
@@ -74,5 +74,5 @@
         "docs:build": "vitepress build docs",
         "docs:preview": "vitepress preview docs"
     },
-    "version": "2.8.0"
+    "version": "2.9.1"
 }

package/react-native/auth/index.d.ts

@@ -14,4 +14,5 @@ export * from "./useAuthStateReady";
 export * from "./useSignInAnonymouslyMutation";
 export * from "./useEmailAuthProviderCredential";
 export * from "./useFacebookAuthProviderCredential";
+export * from "./useAppleAuthProviderCredential";
 export * from "./useLinkWithCredentialMutation";

package/react-native/auth/index.js

@@ -14,4 +14,5 @@ export * from "./useAuthStateReady";
 export * from "./useSignInAnonymouslyMutation";
 export * from "./useEmailAuthProviderCredential";
 export * from "./useFacebookAuthProviderCredential";
+export * from "./useAppleAuthProviderCredential";
 export * from "./useLinkWithCredentialMutation";

package/react-native/auth/index.ts

@@ -14,4 +14,5 @@ export * from "./useAuthStateReady";
 export * from "./useSignInAnonymouslyMutation";
 export * from "./useEmailAuthProviderCredential";
 export * from "./useFacebookAuthProviderCredential";
+export * from "./useAppleAuthProviderCredential";
 export * from "./useLinkWithCredentialMutation";

package/react-native/auth/useAppleAuthProviderCredential.d.ts

@@ -0,0 +1,24 @@
+import { FirebaseAuthTypes } from "@react-native-firebase/auth";
+type Credential = {
+    token: string;
+    nonce: string;
+};
+/**
+ * A custom hook that returns an auth credential for facebook.
+ *
+ * @group Hook
+ * @param {AuthProvider} provider alas of a provider
+ *
+ * @returns {AuthCredential}
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const getCredential = useAppleAuthProviderCredential();
+ *  // ...
+ *  getCredential({token, nonce: ''})
+ * };
+ * ```
+ */
+export declare const useAppleAuthProviderCredential: () => (credential: Credential) => FirebaseAuthTypes.AuthCredential;
+export {};

package/react-native/auth/useAppleAuthProviderCredential.js

@@ -0,0 +1,24 @@
+import { AppleAuthProvider } from "@react-native-firebase/auth";
+import { useCallback } from "react";
+/**
+ * A custom hook that returns an auth credential for facebook.
+ *
+ * @group Hook
+ * @param {AuthProvider} provider alas of a provider
+ *
+ * @returns {AuthCredential}
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const getCredential = useAppleAuthProviderCredential();
+ *  // ...
+ *  getCredential({token, nonce: ''})
+ * };
+ * ```
+ */
+export const useAppleAuthProviderCredential = () => {
+    return useCallback((credential) => {
+        return AppleAuthProvider.credential(credential.token, credential.nonce);
+    }, []);
+};

package/react-native/auth/useAppleAuthProviderCredential.ts

@@ -0,0 +1,31 @@
+import { AppleAuthProvider, FirebaseAuthTypes } from "@react-native-firebase/auth";
+import { useCallback } from "react";
+
+type Credential = {
+    token: string;
+    nonce: string;
+};
+
+/**
+ * A custom hook that returns an auth credential for facebook.
+ *
+ * @group Hook
+ * @param {AuthProvider} provider alas of a provider
+ *
+ * @returns {AuthCredential}
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const getCredential = useAppleAuthProviderCredential();
+ *  // ...
+ *  getCredential({token, nonce: ''})
+ * };
+ * ```
+ */
+
+export const useAppleAuthProviderCredential = () => {
+    return useCallback((credential: Credential): FirebaseAuthTypes.AuthCredential => {
+        return AppleAuthProvider.credential(credential.token, credential.nonce);
+    }, []);
+};

package/react-native/auth/useAuthStateReady.js

@@ -1,3 +1,4 @@
+import { onAuthStateChanged } from "@react-native-firebase/auth";
 import { useAuth } from "./useAuth";
 import { useEffect, useState } from "react";
 /**
@@ -20,7 +21,7 @@ export const useAuthStateReady = () => {
     const firebaseAuth = useAuth();
     const [isAuthStateReady, setIsAuthStateReady] = useState(false);
     useEffect(() => {
-        const subscription = firebaseAuth.onAuthStateChanged(() => {
+        const subscription = onAuthStateChanged(firebaseAuth, () => {
             if (!isAuthStateReady) {
                 setIsAuthStateReady(true);
             }

package/react-native/auth/useAuthStateReady.ts

@@ -1,3 +1,4 @@
+import { onAuthStateChanged } from "@react-native-firebase/auth";
 import { useAuth } from "./useAuth";
 import { useEffect, useState } from "react";
 
@@ -23,7 +24,7 @@ export const useAuthStateReady = () => {
     const [isAuthStateReady, setIsAuthStateReady] = useState(false);
 
     useEffect(() => {
-        const subscription = firebaseAuth.onAuthStateChanged(() => {
+        const subscription = onAuthStateChanged(firebaseAuth, () => {
             if (!isAuthStateReady) {
                 setIsAuthStateReady(true);
             }

package/react-native/firestore/useAddDocMutation.ts

@@ -72,9 +72,9 @@ export const useAddDocMutation = <AppModelType extends AppModel = AppModel, TCon
         mutationKey,
         ...options,
         mutationFn: async ({ data }) => {
-            const docRef = await addDoc<AppModelType>(collectionReference, data);
+            const docRef = await addDoc<AppModelType, AppModelType>(collectionReference, data);
             const docSnap = await getDoc(docRef);
-            return { ...docSnap.data(), uid: docRef.id } as AppModelType;
+            return { ...(docSnap.data() as AppModelType), uid: docRef.id } as AppModelType;
         }
     });
 };

package/react-native/firestore/useCountQuery.ts

@@ -73,7 +73,7 @@ export const useCountQuery = <AppModelType extends AppModel = AppModel>({
         queryFn: async () => {
             const queryToExecute = compositeFilter
                 ? query(collectionReference, compositeFilter, ...(queryConstraints as QueryNonFilterConstraint[]))
-                : query(collectionReference, ...queryConstraints);
+                : query(collectionReference, ...(queryConstraints as QueryConstraint[]));
 
             const querySnapshot = await getCountFromServer(queryToExecute);
             if (querySnapshot) {

package/react-native/firestore/useInfiniteQuery.ts

@@ -96,9 +96,12 @@ export const useInfiniteQuery = <AppModelType extends AppModel = AppModel, TQuer
             const allQueryConstraints = [...queryConstraints, ...(pageParam ? [pageParam] : [])];
             const queryToExecute = compositeFilter
                 ? query(collectionReference, compositeFilter, ...(allQueryConstraints as QueryNonFilterConstraint[]))
-                : query(collectionReference, ...allQueryConstraints);
+                : query(collectionReference, ...(allQueryConstraints as QueryConstraint[]));
 
-            const querySnapshot = await getDocs(queryToExecute);
+            const querySnapshot: FirebaseFirestoreTypes.QuerySnapshot<AppModelType> = await getDocs<
+                AppModelType,
+                AppModelType
+            >(queryToExecute);
             const docs: AppModelType[] = [];
 
             if (querySnapshot) {

package/react-native/firestore/useQuery.ts

@@ -73,9 +73,9 @@ export const useQuery = <AppModelType extends AppModel = AppModel>({
         queryFn: async () => {
             const queryToExecute = compositeFilter
                 ? query(collectionReference, compositeFilter, ...(queryConstraints as QueryNonFilterConstraint[]))
-                : query(collectionReference, ...queryConstraints);
+                : query(collectionReference, ...(queryConstraints as QueryConstraint[]));
 
-            const querySnapshot = await getDocs(queryToExecute);
+            const querySnapshot: FirebaseFirestoreTypes.QuerySnapshot<AppModelType> = await getDocs(queryToExecute);
             const docs: AppModelType[] = [];
 
             if (querySnapshot) {

package/web/auth/index.d.ts

@@ -14,4 +14,5 @@ export * from "./useReauthenticateWitRedirectMutation";
 export * from "./useSignInAnonymouslyMutation";
 export * from "./useEmailAuthProviderCredential";
 export * from "./useFacebookAuthProviderCredential";
+export * from "./useAppleAuthProviderCredential";
 export * from "./useLinkWithCredentialMutation";

package/web/auth/index.js

@@ -14,4 +14,5 @@ export * from "./useReauthenticateWitRedirectMutation";
 export * from "./useSignInAnonymouslyMutation";
 export * from "./useEmailAuthProviderCredential";
 export * from "./useFacebookAuthProviderCredential";
+export * from "./useAppleAuthProviderCredential";
 export * from "./useLinkWithCredentialMutation";

package/web/auth/index.ts

@@ -14,4 +14,5 @@ export * from "./useReauthenticateWitRedirectMutation";
 export * from "./useSignInAnonymouslyMutation";
 export * from "./useEmailAuthProviderCredential";
 export * from "./useFacebookAuthProviderCredential";
+export * from "./useAppleAuthProviderCredential";
 export * from "./useLinkWithCredentialMutation";

package/web/auth/useAppleAuthProviderCredential.d.ts

@@ -0,0 +1,24 @@
+import { AuthCredential } from "firebase/auth";
+type Credential = {
+    token: string;
+    nonce: string;
+};
+/**
+ * A custom hook that returns an auth credential for facebook.
+ *
+ * @group Hook
+ * @param {AuthProvider} provider alas of a provider
+ *
+ * @returns {AuthCredential}
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const getCredential = useAppleAuthProviderCredential();
+ *  // ...
+ *  getCredential({token, nonce: ''})
+ * };
+ * ```
+ */
+export declare const useAppleAuthProviderCredential: () => (credential: Credential) => AuthCredential;
+export {};

package/web/auth/useAppleAuthProviderCredential.js

@@ -0,0 +1,25 @@
+import { OAuthProvider } from "firebase/auth";
+import { useCallback } from "react";
+/**
+ * A custom hook that returns an auth credential for facebook.
+ *
+ * @group Hook
+ * @param {AuthProvider} provider alas of a provider
+ *
+ * @returns {AuthCredential}
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const getCredential = useAppleAuthProviderCredential();
+ *  // ...
+ *  getCredential({token, nonce: ''})
+ * };
+ * ```
+ */
+export const useAppleAuthProviderCredential = () => {
+    return useCallback((credential) => {
+        const authProvider = new OAuthProvider("apple.com");
+        return authProvider.credential({ accessToken: credential.token, rawNonce: credential.nonce });
+    }, []);
+};

package/web/auth/useAppleAuthProviderCredential.ts

@@ -0,0 +1,32 @@
+import { AuthCredential, OAuthProvider } from "firebase/auth";
+import { useCallback } from "react";
+
+type Credential = {
+    token: string;
+    nonce: string;
+};
+
+/**
+ * A custom hook that returns an auth credential for facebook.
+ *
+ * @group Hook
+ * @param {AuthProvider} provider alas of a provider
+ *
+ * @returns {AuthCredential}
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const getCredential = useAppleAuthProviderCredential();
+ *  // ...
+ *  getCredential({token, nonce: ''})
+ * };
+ * ```
+ */
+
+export const useAppleAuthProviderCredential = () => {
+    return useCallback((credential: Credential): AuthCredential => {
+        const authProvider = new OAuthProvider("apple.com");
+        return authProvider.credential({ accessToken: credential.token, rawNonce: credential.nonce });
+    }, []);
+};

package/react-native/auth/useAuthProvider.d.ts

@@ -1,18 +0,0 @@
-type AuthProvider = "google" | "facebook" | "email" | "github" | "twitter";
-/**
- * A custom hook that returns an auth provider by id.
- *
- * @group Hook
- * @param {AuthProvider} provider alas of a provider
- *
- * @returns {AuthProvider}
- *
- * @example
- * ```jsx
- * export const MyComponent = () => {
- *  const authProvider = useAuthProvider('email');
- * };
- * ```
- */
-export declare const useAuthProvider: (provider: AuthProvider) => any;
-export {};

package/react-native/auth/useAuthProvider.js

@@ -1,35 +0,0 @@
-import { EmailAuthProvider, FacebookAuthProvider, GithubAuthProvider, GoogleAuthProvider, TwitterAuthProvider } from "@react-native-firebase/auth";
-import { useMemo } from "react";
-/**
- * A custom hook that returns an auth provider by id.
- *
- * @group Hook
- * @param {AuthProvider} provider alas of a provider
- *
- * @returns {AuthProvider}
- *
- * @example
- * ```jsx
- * export const MyComponent = () => {
- *  const authProvider = useAuthProvider('email');
- * };
- * ```
- */
-export const useAuthProvider = (provider) => {
-    return useMemo(() => {
-        switch (provider) {
-            case "google":
-                return new GoogleAuthProvider();
-            case "email":
-                return new EmailAuthProvider();
-            case "facebook":
-                return new FacebookAuthProvider();
-            case "github":
-                return new GithubAuthProvider();
-            case "twitter":
-                return new TwitterAuthProvider();
-            default:
-                throw new Error(`Auth provider ${provider} is not supported.`);
-        }
-    }, [provider]);
-};

package/react-native/auth/useAuthProvider.ts

@@ -1,45 +0,0 @@
-import {
-    EmailAuthProvider,
-    FacebookAuthProvider,
-    GithubAuthProvider,
-    GoogleAuthProvider,
-    TwitterAuthProvider
-} from "@react-native-firebase/auth";
-import { useMemo } from "react";
-
-type AuthProvider = "google" | "facebook" | "email" | "github" | "twitter";
-
-/**
- * A custom hook that returns an auth provider by id.
- *
- * @group Hook
- * @param {AuthProvider} provider alas of a provider
- *
- * @returns {AuthProvider}
- *
- * @example
- * ```jsx
- * export const MyComponent = () => {
- *  const authProvider = useAuthProvider('email');
- * };
- * ```
- */
-
-export const useAuthProvider = (provider: AuthProvider) => {
-    return useMemo(() => {
-        switch (provider) {
-            case "google":
-                return new GoogleAuthProvider();
-            case "email":
-                return new EmailAuthProvider();
-            case "facebook":
-                return new FacebookAuthProvider();
-            case "github":
-                return new GithubAuthProvider();
-            case "twitter":
-                return new TwitterAuthProvider();
-            default:
-                throw new Error(`Auth provider ${provider} is not supported.`);
-        }
-    }, [provider]);
-};