refactor: extract fns from hooks (#241)

Author: andipaetzold

src/app-check/useAppCheckToken.ts

@@ -1,11 +1,13 @@
 import { AppCheck, AppCheckTokenResult, onTokenChanged } from "firebase/app-check";
-import { useCallback } from "react";
 import { ValueHookResult } from "../common/index.js";
 import { useListen, UseListenOnChange } from "../internal/useListen.js";
 import { LoadingState } from "../internal/useLoadingValue.js";
 
 export type UseAppCheckToken = ValueHookResult<AppCheckTokenResult | null, Error>;
 
+const onChange: UseListenOnChange<AppCheckTokenResult | null, Error, AppCheck> = (stableAppCheck, next, error) =>
+    onTokenChanged(stableAppCheck, next, error);
+
 /**
  * Returns and updates the current App Check token
  * @param appCheck Firebase App Check instance
@@ -15,10 +17,5 @@ export type UseAppCheckToken = ValueHookResult<AppCheckTokenResult | null, Error
  * error: `undefined` if no error occurred
  */
 export function useAppCheckToken(appCheck: AppCheck): UseAppCheckToken {
-    const onChange: UseListenOnChange<AppCheckTokenResult | null, Error, AppCheck> = useCallback(
-        (stableAppCheck, next, error) => onTokenChanged(stableAppCheck, next, error),
-        [],
-    );
-
     return useListen(appCheck, onChange, () => true, LoadingState);
 }

src/auth/useAuthIdToken.ts

@@ -1,11 +1,25 @@
 import { Auth, AuthError, getIdToken, onIdTokenChanged } from "firebase/auth";
-import { useCallback } from "react";
 import { ValueHookResult } from "../common/index.js";
-import { useListen, UseListenOnChange } from "../internal/useListen.js";
+import { UseListenOnChange, useListen } from "../internal/useListen.js";
 import { LoadingState } from "../internal/useLoadingValue.js";
 
 export type UseAuthIdTokenResult = ValueHookResult<string | null, AuthError>;
 
+const onChange: UseListenOnChange<string | null, AuthError, Auth> = (stableAuth, next, error) =>
+    onIdTokenChanged(stableAuth, async (user) => {
+        if (user) {
+            try {
+                // Can also be accessed via `user.accessToken`, but that's not officially documented
+                const idToken = await getIdToken(user);
+                next(idToken);
+            } catch (e) {
+                error(e as AuthError);
+            }
+        } else {
+            next(null);
+        }
+    });
+
 /**
  * Returns and updates the JWT of the currently authenticated user
  * @param auth Firebase Auth instance
@@ -15,23 +29,5 @@ export type UseAuthIdTokenResult = ValueHookResult<string | null, AuthError>;
  * error: `undefined` if no error occurred
  */
 export function useAuthIdToken(auth: Auth): UseAuthIdTokenResult {
-    const onChange: UseListenOnChange<string | null, AuthError, Auth> = useCallback(
-        (stableAuth, next, error) =>
-            onIdTokenChanged(stableAuth, async (user) => {
-                if (user) {
-                    try {
-                        // Can also be accessed via `user.accessToken`, but that's not officially documented
-                        const idToken = await getIdToken(user);
-                        next(idToken);
-                    } catch (e) {
-                        error(e as AuthError);
-                    }
-                } else {
-                    next(null);
-                }
-            }),
-        [],
-    );
-
     return useListen(auth, onChange, () => true, LoadingState);
 }

src/auth/useAuthIdTokenResult.ts

@@ -1,11 +1,25 @@
 import { Auth, AuthError, getIdTokenResult, IdTokenResult, onIdTokenChanged } from "firebase/auth";
-import { useCallback } from "react";
 import { ValueHookResult } from "../common/index.js";
 import { useListen, UseListenOnChange } from "../internal/useListen.js";
 import { LoadingState } from "../internal/useLoadingValue.js";
 
 export type UseAuthIdTokenResultResult = ValueHookResult<IdTokenResult | null, AuthError>;
 
+const onChange: UseListenOnChange<IdTokenResult | null, AuthError, Auth> = (stableAuth, next, error) =>
+    onIdTokenChanged(stableAuth, async (user) => {
+        if (user) {
+            try {
+                // Can also be accessed via `user.accessToken`, but that's not officially documented
+                const idTokenResult = await getIdTokenResult(user);
+                next(idTokenResult);
+            } catch (e) {
+                error(e as AuthError);
+            }
+        } else {
+            next(null);
+        }
+    });
+
 /**
  * Returns and updates the deserialized JWT of the currently authenticated user
  * @param auth Firebase Auth instance
@@ -15,23 +29,5 @@ export type UseAuthIdTokenResultResult = ValueHookResult<IdTokenResult | null, A
  * error: `undefined` if no error occurred
  */
 export function useAuthIdTokenResult(auth: Auth): UseAuthIdTokenResultResult {
-    const onChange: UseListenOnChange<IdTokenResult | null, AuthError, Auth> = useCallback(
-        (stableAuth, next, error) =>
-            onIdTokenChanged(stableAuth, async (user) => {
-                if (user) {
-                    try {
-                        // Can also be accessed via `user.accessToken`, but that's not officially documented
-                        const idTokenResult = await getIdTokenResult(user);
-                        next(idTokenResult);
-                    } catch (e) {
-                        error(e as AuthError);
-                    }
-                } else {
-                    next(null);
-                }
-            }),
-        [],
-    );
-
     return useListen(auth, onChange, () => true, LoadingState);
 }

src/auth/useAuthState.ts

@@ -1,11 +1,13 @@
 import { Auth, AuthError, onAuthStateChanged, User } from "firebase/auth";
-import { useCallback } from "react";
 import { ValueHookResult } from "../common/index.js";
 import { useListen, UseListenOnChange } from "../internal/useListen.js";
 import { LoadingState } from "../internal/useLoadingValue.js";
 
 export type UseAuthStateResult = ValueHookResult<User | null, AuthError>;
 
+const onChange: UseListenOnChange<User | null, AuthError, Auth> = (stableAuth, next, error) =>
+    onAuthStateChanged(stableAuth, next, (e) => error(e as AuthError));
+
 /**
  * Returns and updates the currently authenticated user
  * @param auth Firebase Auth instance
@@ -15,10 +17,5 @@ export type UseAuthStateResult = ValueHookResult<User | null, AuthError>;
  * error: `undefined` if no error occurred
  */
 export function useAuthState(auth: Auth): UseAuthStateResult {
-    const onChange: UseListenOnChange<User | null, AuthError, Auth> = useCallback(
-        (stableAuth, next, error) => onAuthStateChanged(stableAuth, next, (e) => error(e as AuthError)),
-        [],
-    );
-
     return useListen(auth, onChange, () => true, auth.currentUser ? auth.currentUser : LoadingState);
 }

src/firestore/useQueriesData.ts

@@ -44,7 +44,6 @@ export function useQueriesData<Values extends ReadonlyArray<DocumentData> = Read
                     error,
                 },
             ),
-
         [includeMetadataChanges, serverTimestamps],
     );