fix(firestore): Filter typing. Filter.or & Filter.and can accept …

…each other (#7904)

packages/firestore/lib/index.d.ts

@@ -55,16 +55,19 @@ export namespace FirebaseFirestoreTypes {
 
   export type QueryFilterType = 'OR' | 'AND';
 
-  export interface QueryFilterConstraint {
+  export interface QueryFieldFilterConstraint {
     fieldPath: keyof T | FieldPath;
     operator: WhereFilterOp;
     value: any;
   }
 
   export interface QueryCompositeFilterConstraint {
     operator: QueryFilterType;
-    queries: QueryFilterConstraint[];
+    queries: QueryFieldFilterConstraint[];
   }
+
+  export type QueryFilterConstraint = QueryFieldFilterConstraint | QueryCompositeFilterConstraint;
+
   /**
    * The Filter functions used to generate an instance of Filter.
    */
@@ -73,7 +76,11 @@ export namespace FirebaseFirestoreTypes {
      * The Filter function used to generate an instance of Filter.
      * e.g. Filter('name', '==', 'Ada')
      */
-    (fieldPath: keyof T | FieldPath, operator: WhereFilterOp, value: any): QueryFilterConstraint;
+    (
+      fieldPath: keyof T | FieldPath,
+      operator: WhereFilterOp,
+      value: any,
+    ): QueryFieldFilterConstraint;
     /**
      * The Filter.or() static function used to generate a logical OR query using multiple Filter instances.
      * e.g. Filter.or(Filter('name', '==', 'Ada'), Filter('name', '==', 'Bob'))
@@ -1412,7 +1419,7 @@ export namespace FirebaseFirestoreTypes {
      *
      * @param filter The filter to apply to the query.
      */
-    where(filter: QueryFilterConstraint | QueryCompositeFilterConstraint): Query<T>;
+    where(filter: QueryFilterConstraint): Query<T>;
   }
 
   /**