Merge remote-tracking branch 'origin/master' into HEAD

Author: dconeybe

.changeset/blue-eels-warn.md

@@ -0,0 +1,6 @@
+---
+'@firebase/firestore': patch
+'firebase': patch
+---
+
+Improved debug logging of networking abstractions

.changeset/heavy-starfishes-count.md

@@ -0,0 +1,6 @@
+---
+"@firebase/firestore": minor
+'firebase': minor
+---
+
+OR Query public API

.changeset/large-lemons-relax.md

@@ -46,6 +46,9 @@ export type AggregateSpecData<T extends AggregateSpec> = {
     [P in keyof T]: T[P] extends AggregateField<infer U> ? U : never;
 };
 
+// @public
+export function and(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
+
 // @public
 export function arrayRemove(...elements: unknown[]): FieldValue;
 
@@ -234,6 +237,9 @@ export type NestedUpdateFields<T extends Record<string, unknown>> = UnionToInter
     [K in keyof T & string]: ChildUpdateFields<K, T[K]>;
 }[keyof T & string]>;
 
+// @public
+export function or(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
+
 // @public
 export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryOrderByConstraint;
 
@@ -258,9 +264,17 @@ export class Query<T = DocumentData> {
     withConverter<U>(converter: FirestoreDataConverter<U>): Query<U>;
 }
 
+// @public
+export function query<T>(query: Query<T>, compositeFilter: QueryCompositeFilterConstraint, ...queryConstraints: QueryNonFilterConstraint[]): Query<T>;
+
 // @public
 export function query<T>(query: Query<T>, ...queryConstraints: QueryConstraint[]): Query<T>;
 
+// @public
+export class QueryCompositeFilterConstraint {
+    readonly type: 'or' | 'and';
+}
+
 // @public
 export abstract class QueryConstraint {
     abstract readonly type: QueryConstraintType;
@@ -288,6 +302,9 @@ export class QueryFieldFilterConstraint extends QueryConstraint {
     readonly type = "where";
 }
 
+// @public
+export type QueryFilterConstraint = QueryFieldFilterConstraint | QueryCompositeFilterConstraint;
+
 // @public
 export class QueryLimitConstraint extends QueryConstraint {
     readonly type: 'limit' | 'limitToLast';