react-query-firebase 2.15.1 → 3.1.0

package/dist/react-native/auth/useCurrentUser.js

@@ -8,7 +8,7 @@ import { useAuth } from "./useAuth.js";
  */
 export const useCurrentUser = () => {
     const firebaseAuth = useAuth();
-    const [currentUser, setCurrentUser] = useState(firebaseAuth.currentUser);
+    const [currentUser, setCurrentUser] = useState(firebaseAuth?.currentUser ?? null);
     useEffect(() => {
         const unsubscribe = onAuthStateChanged(firebaseAuth, (user) => {
             setCurrentUser(user);

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

@@ -21,3 +21,4 @@ export * from "./utils/getDocRef.js";
 export * from "./utils/buildQueryConstraint.js";
 export * from "./utils/buildCompositeFilter.js";
 export * from "./useEnsureDoc.js";
+export * from "./useFirestoreQueryEngine.js";

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

@@ -21,3 +21,4 @@ export * from "./utils/getDocRef.js";
 export * from "./utils/buildQueryConstraint.js";
 export * from "./utils/buildCompositeFilter.js";
 export * from "./useEnsureDoc.js";
+export * from "./useFirestoreQueryEngine.js";

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

@@ -0,0 +1,44 @@
+import { FirebaseFirestoreTypes } 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";
+/**
+ * @inline
+ */
+type UseFirestoreQueryEngineOptions<AppModelType extends AppModel = AppModel> = {
+    /**
+     * Reference to a Firestore collection
+     */
+    collectionReference: FirebaseFirestoreTypes.CollectionReference<AppModelType>;
+    /**
+     * Non composite filter constraints such as limit, order, where
+     */
+    queryConstraints?: NonFilterQueryConstraint<AppModelType>[];
+    /**
+     * Composite filter
+     */
+    compositeFilter?: CompositeFilter<AppModelType>;
+};
+/**
+ * Returns an async wrapper around native firestore query engine.
+ *
+ * @group Hook
+ *
+ * @returns {(options: UseFirestoreQueryEngineOptions<AppModelType>): Promise<AppModelType[]>} A function to execute firestore query
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const query = useFirestoreQueryEngine();
+ *  const callback = useCallback(async () => {
+ *      const docs = await query({
+ *          collectionReference: collection(),
+ *          queryConstraints: [],
+ *      });
+ *      // do something with docs
+ *  });
+ * };
+ * ```
+ */
+export declare const useFirestoreQueryEngine: <AppModelType extends AppModel = AppModel>() => ((options: UseFirestoreQueryEngineOptions<AppModelType>) => Promise<AppModelType[]>);
+export {};

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

@@ -0,0 +1,47 @@
+import { getDocs, query, or, and } from "@react-native-firebase/firestore";
+import { useCallback } from "react";
+import { buildCompositeFilter } from "./utils/buildCompositeFilter.js";
+import { buildQueryConstraint } from "./utils/buildQueryConstraint.js";
+/**
+ * Returns an async wrapper around native firestore query engine.
+ *
+ * @group Hook
+ *
+ * @returns {(options: UseFirestoreQueryEngineOptions<AppModelType>): Promise<AppModelType[]>} A function to execute firestore query
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const query = useFirestoreQueryEngine();
+ *  const callback = useCallback(async () => {
+ *      const docs = await query({
+ *          collectionReference: collection(),
+ *          queryConstraints: [],
+ *      });
+ *      // do something with docs
+ *  });
+ * };
+ * ```
+ */
+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 querySnapshot = await getDocs(queryToExecute);
+        const docs = [];
+        if (querySnapshot) {
+            querySnapshot.forEach((doc) => {
+                docs.push({ ...doc.data(), uid: doc.id });
+            });
+        }
+        return docs;
+    }, []);
+};

package/dist/react-native.d.ts

@@ -0,0 +1,2 @@
+export * from "./react-native/index.js";
+export * from "./types/index.js";

package/dist/react-native.js

@@ -0,0 +1,2 @@
+export * from "./react-native/index.js";
+export * from "./types/index.js";

package/dist/web/auth/useCurrentUser.js

@@ -8,7 +8,7 @@ import { useAuth } from "./useAuth.js";
  */
 export const useCurrentUser = () => {
     const firebaseAuth = useAuth();
-    const [currentUser, setCurrentUser] = useState(firebaseAuth.currentUser);
+    const [currentUser, setCurrentUser] = useState(firebaseAuth?.currentUser ?? null);
     useEffect(() => {
         const unsubscribe = onAuthStateChanged(firebaseAuth, (user) => {
             setCurrentUser(user);

package/dist/web/firestore/index.d.ts

@@ -21,3 +21,4 @@ export * from "./utils/getDocSnap.js";
 export * from "./utils/getDocRef.js";
 export * from "./utils/buildQueryConstraint.js";
 export * from "./utils/buildCompositeFilter.js";
+export * from "./useFirestoreQueryEngine.js";

package/dist/web/firestore/index.js

@@ -21,3 +21,4 @@ export * from "./utils/getDocSnap.js";
 export * from "./utils/getDocRef.js";
 export * from "./utils/buildQueryConstraint.js";
 export * from "./utils/buildCompositeFilter.js";
+export * from "./useFirestoreQueryEngine.js";

package/dist/web/firestore/useFirestoreQueryEngine.d.ts

@@ -0,0 +1,44 @@
+import { CollectionReference } from "firebase/firestore";
+import { NonFilterQueryConstraint } from "../../types/QueryConstraints.js";
+import { AppModel } from "../../types/index.js";
+import { CompositeFilter } from "./utils/buildCompositeFilter.js";
+/**
+ * @inline
+ */
+type UseFirestoreQueryEngineOptions<AppModelType extends AppModel = AppModel> = {
+    /**
+     * Reference to a Firestore collection
+     */
+    collectionReference: CollectionReference<AppModelType, AppModelType>;
+    /**
+     * Non composite filter constraints such as limit, order, where
+     */
+    queryConstraints: NonFilterQueryConstraint<AppModelType>[];
+    /**
+     * Composite filter
+     */
+    compositeFilter?: CompositeFilter;
+};
+/**
+ * Returns an async wrapper around native firestore query engine.
+ *
+ * @group Hook
+ *
+ * @returns {(options: UseFirestoreQueryEngineOptions<AppModelType>): Promise<AppModelType[]>} A function to execute firestore query
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const query = useFirestoreQueryEngine();
+ *  const callback = useCallback(async () => {
+ *      const docs = await query({
+ *          collectionReference: collection(),
+ *          queryConstraints: [],
+ *      });
+ *      // do something with docs
+ *  });
+ * };
+ * ```
+ */
+export declare const useFirestoreQueryEngine: <AppModelType extends AppModel = AppModel>() => ((options: UseFirestoreQueryEngineOptions<AppModelType>) => Promise<AppModelType[]>);
+export {};

package/dist/web/firestore/useFirestoreQueryEngine.js

@@ -0,0 +1,47 @@
+import { getDocs, query, or, and } from "firebase/firestore";
+import { useCallback } from "react";
+import { buildCompositeFilter } from "./utils/buildCompositeFilter.js";
+import { buildQueryConstraint } from "./utils/buildQueryConstraint.js";
+/**
+ * Returns an async wrapper around native firestore query engine.
+ *
+ * @group Hook
+ *
+ * @returns {(options: UseFirestoreQueryEngineOptions<AppModelType>): Promise<AppModelType[]>} A function to execute firestore query
+ *
+ * @example
+ * ```jsx
+ * export const MyComponent = () => {
+ *  const query = useFirestoreQueryEngine();
+ *  const callback = useCallback(async () => {
+ *      const docs = await query({
+ *          collectionReference: collection(),
+ *          queryConstraints: [],
+ *      });
+ *      // do something with docs
+ *  });
+ * };
+ * ```
+ */
+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);
+        const querySnapshot = await getDocs(queryToExecute);
+        const docs = [];
+        if (querySnapshot) {
+            querySnapshot.forEach((doc) => {
+                docs.push({ ...doc.data(), uid: doc.id });
+            });
+        }
+        return docs;
+    }, []);
+};

package/dist/web.d.ts

@@ -0,0 +1,2 @@
+export * from "./web/index.js";
+export * from "./types/index.js";

package/dist/web.js

@@ -0,0 +1,2 @@
+export * from "./web/index.js";
+export * from "./types/index.js";

package/package.json

@@ -29,12 +29,12 @@
         "@react-native-firebase/firestore": "^23.7.0",
         "@react-native-firebase/installations": "^23.7.0",
         "@react-native-firebase/remote-config": "^23.7.0",
-        "@tanstack/react-query": "^5.90.12",
+        "@tanstack/react-query": "^5.90.15",
         "@types/react": "^19.2.7",
         "eslint": "^9.39.2",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-import": "^2.32.0",
-        "eslint-plugin-jest": "^29.5.0",
+        "eslint-plugin-jest": "^29.11.2",
         "eslint-plugin-jsonc": "^2.21.0",
         "eslint-plugin-prettier": "^5.5.4",
         "eslint-plugin-react": "^7.37.5",
@@ -48,7 +48,7 @@
         "typedoc-plugin-markdown": "^4.9.0",
         "typedoc-vitepress-theme": "^1.1.2",
         "typescript": "^5.9.3",
-        "typescript-eslint": "^8.50.0",
+        "typescript-eslint": "^8.51.0",
         "vitepress": "^1.6.4"
     },
     "homepage": "https://github.com/vpishuk/react-query-firebase",
@@ -66,24 +66,11 @@
     },
     "exports": {
         ".": {
-            "import": "./dist/index.js",
-            "require": "./dist/index.js",
-            "types": "./dist/index.d.ts"
-        },
-        "./react-native": {
-            "import": "./dist/react-native/index.js",
-            "require": "./dist/react-native/index.js",
-            "types": "./dist/react-native/index.d.ts"
-        },
-        "./web": {
-            "import": "./dist/web/index.js",
-            "require": "./dist/web/index.js",
-            "types": "./dist/web/index.d.ts"
-        },
-        "./types": {
-            "import": "./dist/types/index.js",
-            "require": "./dist/types/index.js",
-            "types": "./dist/types/index.d.ts"
+            "browser": "./dist/web.js",
+            "react-native": "./dist/react-native.js",
+            "import": "./dist/web.js",
+            "require": "./dist/web.js",
+            "types": "./dist/web.d.ts"
         }
     },
     "files": [
@@ -104,5 +91,5 @@
         "docs:build": "vitepress build docs",
         "docs:preview": "vitepress preview docs"
     },
-    "version": "2.15.1"
+    "version": "3.1.0"
 }

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-export * as RN from "./react-native/index.js";
-export * as Web from "./web/index.js";

package/dist/index.js

@@ -1,4 +0,0 @@
-import * as RN_1 from "./react-native/index.js";
-export { RN_1 as RN };
-import * as Web_1 from "./web/index.js";
-export { Web_1 as Web };