react-query-firebase 3.3.0 → 3.3.2

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

@@ -20,7 +20,7 @@ type UseCountQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Composite filter
      */
-    compositeFilter?: QueryCompositeFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint | null;
 };
 /**
  * Executes a query with specified constraints and returns the count of matched documents.

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

@@ -20,7 +20,7 @@ type UseInfiniteQueryOptions<AppModelType extends AppModel = AppModel, TQueryKey
     /**
      * Composite filter
      */
-    compositeFilter?: QueryCompositeFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint | null;
 };
 /**
  * Executes an infinite query on a Firestore data source and returns the resulting documents as an array.

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

@@ -21,7 +21,7 @@ type UseQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Composite filter
      */
-    compositeFilter?: QueryCompositeFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint | null;
 };
 /**
  * Executes a query on a Firestore data source and returns the resulting documents as an array.

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

@@ -34,4 +34,4 @@ export type UseCompositeFilter<AppModelType extends AppModel = AppModel> = {
  * };
  * ```
  */
-export declare const useCompositeFilter: <AppModelType extends AppModel = AppModel>({ query }: UseCompositeFilter<AppModelType>) => import("@firebase/firestore").QueryCompositeFilterConstraint | undefined;
+export declare const useCompositeFilter: <AppModelType extends AppModel = AppModel>({ query }: UseCompositeFilter<AppModelType>) => import("@firebase/firestore").QueryCompositeFilterConstraint | null;

package/dist/web/firestore/useCompositeFilter.js

@@ -1,4 +1,3 @@
-import { and, or } from "firebase/firestore";
 import { useMemo } from "react";
 import { buildCompositeFilter } from "./utils/buildCompositeFilter.js";
 /**
@@ -31,10 +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;
-        }
-        return query?.operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
+        return query ? buildCompositeFilter(query) : null;
     }, [query]);
 };

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

@@ -1,7 +1,6 @@
-import { CollectionReference, QueryConstraint, QueryNonFilterConstraint } from "firebase/firestore";
+import { CollectionReference, QueryConstraint, QueryNonFilterConstraint, QueryCompositeFilterConstraint } from "firebase/firestore";
 import { UseQueryResult, UseQueryOptions as UseReactQueryOptions } from "@tanstack/react-query";
 import { AppModel } from "../../types/index.js";
-import { QueryFilterConstraint } from "./utils/buildCompositeFilter.js";
 /**
  * @inline
  */
@@ -21,7 +20,7 @@ type UseCountQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Composite filter
      */
-    compositeFilter?: QueryFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint | null;
 };
 /**
  * Executes a query with specified constraints and returns the count of matched documents.

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

@@ -17,7 +17,7 @@ type UseFirestoreQueryEngineOptions<AppModelType extends AppModel = AppModel> =
     /**
      * Composite filter
      */
-    compositeFilter?: CompositeFilter;
+    compositeFilter?: CompositeFilter<AppModelType>;
 };
 /**
  * Returns an async wrapper around native firestore query engine.

package/dist/web/firestore/useFirestoreQueryEngine.js

@@ -1,4 +1,4 @@
-import { getDocs, query, or, and } from "firebase/firestore";
+import { getDocs, query } from "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);
+        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/web/firestore/useInfiniteQuery.d.ts

@@ -1,7 +1,6 @@
-import { CollectionReference, QueryConstraint, QueryNonFilterConstraint } from "firebase/firestore";
+import { CollectionReference, QueryCompositeFilterConstraint, QueryConstraint, QueryNonFilterConstraint } from "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
  */
@@ -21,7 +20,7 @@ type UseInfiniteQueryOptions<AppModelType extends AppModel = AppModel, TQueryKey
     /**
      * Composite filter
      */
-    compositeFilter?: QueryFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint | null;
 };
 /**
  * Executes an infinite query on a Firestore data source and returns the resulting documents as an array.

package/dist/web/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/web/firestore/useQuery.d.ts

@@ -1,7 +1,6 @@
-import { CollectionReference, QueryConstraint, QueryNonFilterConstraint } from "firebase/firestore";
+import { CollectionReference, QueryCompositeFilterConstraint, QueryConstraint, QueryNonFilterConstraint } from "firebase/firestore";
 import { UseQueryResult, UseQueryOptions as UseReactQueryOptions } from "@tanstack/react-query";
 import { AppModel } from "../../types/index.js";
-import { QueryFilterConstraint } from "./utils/buildCompositeFilter.js";
 /**
  * @inline
  */
@@ -21,7 +20,7 @@ type UseQueryOptions<AppModelType extends AppModel = AppModel> = {
     /**
      * Composite filter
      */
-    compositeFilter?: QueryFilterConstraint;
+    compositeFilter?: QueryCompositeFilterConstraint | null;
 };
 /**
  * Executes a query on a Firestore data source and returns the resulting documents as an array.

package/dist/web/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/web/firestore/utils/buildCompositeFilter.d.ts

@@ -1,20 +1,17 @@
-import { QueryFilterConstraint as FBQueryFilterConstraint, QueryCompositeFilterConstraint as FBQueryCompositeFilterConstraint, WhereFilterOp } from "firebase/firestore";
+import { WhereFilterOp, QueryCompositeFilterConstraint } from "firebase/firestore";
 import { AppModel } from "../../../types/AppModel.js";
-export type QueryFilterConstraint = FBQueryFilterConstraint | FBQueryCompositeFilterConstraint;
 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?: 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.
@@ -44,4 +41,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/web/firestore/utils/buildCompositeFilter.js

@@ -29,14 +29,23 @@ import { or, and, where, documentId } from "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;
         }
-        return query.operator === "OR" ? or(...queryConstraints) : and(...queryConstraints);
+        if (queryConstraints.length <= 1) {
+            return and(queryConstraints[0]);
+        }
+        return query.operator === "OR"
+            ? or(...queryConstraints)
+            : and(...queryConstraints);
     }
     if (query.field && query.op) {
-        return where(query.field === "documentId" ? documentId() : query.field, query.op, query.value);
+        return and(where(query.field === "documentId"
+            ? documentId()
+            : query.field, query.op, query.value));
     }
     return null;
 };

package/package.json

@@ -93,5 +93,5 @@
         "docs:build": "vitepress build docs",
         "docs:preview": "vitepress preview docs"
     },
-    "version": "3.3.0"
+    "version": "3.3.2"
 }