Relaxing in restrictions.

common/api-review/firestore-lite.api.md

@@ -17,6 +17,9 @@ export type AddPrefixToKeys<Prefix extends string, T extends Record<string, unkn
     [K in keyof T & string as `${Prefix}.${K}`]+?: T[K];
 };
 
+// @public
+export function and(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
+
 // @public
 export function arrayRemove(...elements: unknown[]): FieldValue;
 
@@ -111,16 +114,16 @@ export class DocumentSnapshot<T = DocumentData> {
 export { EmulatorMockTokenOptions }
 
 // @public
-export function endAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function endAt(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
 
 // @public
-export function endAt(...fieldValues: unknown[]): QueryConstraint;
+export function endAt(...fieldValues: unknown[]): QueryEndAtConstraint;
 
 // @public
-export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
 
 // @public
-export function endBefore(...fieldValues: unknown[]): QueryConstraint;
+export function endBefore(...fieldValues: unknown[]): QueryEndAtConstraint;
 
 // @public
 export class FieldPath {
@@ -188,10 +191,10 @@ export function increment(n: number): FieldValue;
 export function initializeFirestore(app: FirebaseApp, settings: Settings): Firestore;
 
 // @public
-export function limit(limit: number): QueryConstraint;
+export function limit(limit: number): QueryLimitConstraint;
 
 // @public
-export function limitToLast(limit: number): QueryConstraint;
+export function limitToLast(limit: number): QueryLimitConstraint;
 
 export { LogLevel }
 
@@ -201,7 +204,10 @@ export type NestedUpdateFields<T extends Record<string, unknown>> = UnionToInter
 }[keyof T & string]>;
 
 // @public
-export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryConstraint;
+export function or(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
+
+// @public
+export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryOrderByConstraint;
 
 // @public
 export type OrderByDirection = 'desc' | 'asc';
@@ -224,12 +230,24 @@ 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;
+    /**
+     * Takes the provided {@link Query} and returns a copy of the {@link Query} with this
+     * {@link AppliableConstraint} applied.
+     */
 }
 
 // @public
@@ -241,9 +259,35 @@ export class QueryDocumentSnapshot<T = DocumentData> extends DocumentSnapshot<T>
     data(): T;
 }
 
+// @public
+export class QueryEndAtConstraint extends QueryConstraint {
+    readonly type: 'endBefore' | 'endAt';
+}
+
 // @public
 export function queryEqual<T>(left: Query<T>, right: Query<T>): boolean;
 
+// @public
+export class QueryFieldFilterConstraint extends QueryConstraint {
+    readonly type = "where";
+}
+
+// @public
+export type QueryFilterConstraint = QueryFieldFilterConstraint | QueryCompositeFilterConstraint;
+
+// @public
+export class QueryLimitConstraint extends QueryConstraint {
+    readonly type: 'limit' | 'limitToLast';
+}
+
+// @public
+export type QueryNonFilterConstraint = QueryOrderByConstraint | QueryLimitConstraint | QueryStartAtConstraint | QueryEndAtConstraint;
+
+// @public
+export class QueryOrderByConstraint extends QueryConstraint {
+    readonly type = "orderBy";
+}
+
 // @public
 export class QuerySnapshot<T = DocumentData> {
     get docs(): Array<QueryDocumentSnapshot<T>>;
@@ -253,6 +297,11 @@ export class QuerySnapshot<T = DocumentData> {
     get size(): number;
 }
 
+// @public
+export class QueryStartAtConstraint extends QueryConstraint {
+    readonly type: 'startAt' | 'startAfter';
+}
+
 // @public
 export function refEqual<T>(left: DocumentReference<T> | CollectionReference<T>, right: DocumentReference<T> | CollectionReference<T>): boolean;
 
@@ -289,16 +338,16 @@ export interface Settings {
 export function snapshotEqual<T>(left: DocumentSnapshot<T> | QuerySnapshot<T>, right: DocumentSnapshot<T> | QuerySnapshot<T>): boolean;
 
 // @public
-export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
 
 // @public
-export function startAfter(...fieldValues: unknown[]): QueryConstraint;
+export function startAfter(...fieldValues: unknown[]): QueryStartAtConstraint;
 
 // @public
-export function startAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function startAt(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
 
 // @public
-export function startAt(...fieldValues: unknown[]): QueryConstraint;
+export function startAt(...fieldValues: unknown[]): QueryStartAtConstraint;
 
 // @public
 export function terminate(firestore: Firestore): Promise<void>;
@@ -354,7 +403,7 @@ export function updateDoc<T>(reference: DocumentReference<T>, data: UpdateData<T
 export function updateDoc(reference: DocumentReference<unknown>, field: string | FieldPath, value: unknown, ...moreFieldsAndValues: unknown[]): Promise<void>;
 
 // @public
-export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryConstraint;
+export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryFieldFilterConstraint;
 
 // @public
 export type WhereFilterOp = '<' | '<=' | '==' | '!=' | '>=' | '>' | 'array-contains' | 'in' | 'array-contains-any' | 'not-in';

common/api-review/firestore.api.md

@@ -17,6 +17,9 @@ export type AddPrefixToKeys<Prefix extends string, T extends Record<string, unkn
     [K in keyof T & string as `${Prefix}.${K}`]+?: T[K];
 };
 
+// @public
+export function and(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
+
 // @public
 export function arrayRemove(...elements: unknown[]): FieldValue;
 
@@ -141,16 +144,16 @@ export function enableMultiTabIndexedDbPersistence(firestore: Firestore): Promis
 export function enableNetwork(firestore: Firestore): Promise<void>;
 
 // @public
-export function endAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function endAt(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
 
 // @public
-export function endAt(...fieldValues: unknown[]): QueryConstraint;
+export function endAt(...fieldValues: unknown[]): QueryEndAtConstraint;
 
 // @public
-export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function endBefore(snapshot: DocumentSnapshot<unknown>): QueryEndAtConstraint;
 
 // @public
-export function endBefore(...fieldValues: unknown[]): QueryConstraint;
+export function endBefore(...fieldValues: unknown[]): QueryEndAtConstraint;
 
 // @public
 export class FieldPath {
@@ -240,10 +243,10 @@ export function increment(n: number): FieldValue;
 export function initializeFirestore(app: FirebaseApp, settings: FirestoreSettings, databaseId?: string): Firestore;
 
 // @public
-export function limit(limit: number): QueryConstraint;
+export function limit(limit: number): QueryLimitConstraint;
 
 // @public
-export function limitToLast(limit: number): QueryConstraint;
+export function limitToLast(limit: number): QueryLimitConstraint;
 
 // @public
 export function loadBundle(firestore: Firestore, bundleData: ReadableStream<Uint8Array> | ArrayBuffer | string): LoadBundleTask;
@@ -325,7 +328,10 @@ export function onSnapshotsInSync(firestore: Firestore, observer: {
 export function onSnapshotsInSync(firestore: Firestore, onSync: () => void): Unsubscribe;
 
 // @public
-export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryConstraint;
+export function or(...queryConstraints: QueryFilterConstraint[]): QueryCompositeFilterConstraint;
+
+// @public
+export function orderBy(fieldPath: string | FieldPath, directionStr?: OrderByDirection): QueryOrderByConstraint;
 
 // @public
 export type OrderByDirection = 'desc' | 'asc';
@@ -353,12 +359,24 @@ 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;
+    /**
+     * Takes the provided {@link Query} and returns a copy of the {@link Query} with this
+     * {@link AppliableConstraint} applied.
+     */
 }
 
 // @public
@@ -370,9 +388,35 @@ export class QueryDocumentSnapshot<T = DocumentData> extends DocumentSnapshot<T>
     data(options?: SnapshotOptions): T;
 }
 
+// @public
+export class QueryEndAtConstraint extends QueryConstraint {
+    readonly type: 'endBefore' | 'endAt';
+}
+
 // @public
 export function queryEqual<T>(left: Query<T>, right: Query<T>): boolean;
 
+// @public
+export class QueryFieldFilterConstraint extends QueryConstraint {
+    readonly type = "where";
+}
+
+// @public
+export type QueryFilterConstraint = QueryFieldFilterConstraint | QueryCompositeFilterConstraint;
+
+// @public
+export class QueryLimitConstraint extends QueryConstraint {
+    readonly type: 'limit' | 'limitToLast';
+}
+
+// @public
+export type QueryNonFilterConstraint = QueryOrderByConstraint | QueryLimitConstraint | QueryStartAtConstraint | QueryEndAtConstraint;
+
+// @public
+export class QueryOrderByConstraint extends QueryConstraint {
+    readonly type = "orderBy";
+}
+
 // @public
 export class QuerySnapshot<T = DocumentData> {
     docChanges(options?: SnapshotListenOptions): Array<DocumentChange<T>>;
@@ -384,6 +428,11 @@ export class QuerySnapshot<T = DocumentData> {
     get size(): number;
 }
 
+// @public
+export class QueryStartAtConstraint extends QueryConstraint {
+    readonly type: 'startAt' | 'startAfter';
+}
+
 // @public
 export function refEqual<T>(left: DocumentReference<T> | CollectionReference<T>, right: DocumentReference<T> | CollectionReference<T>): boolean;
 
@@ -430,16 +479,16 @@ export interface SnapshotOptions {
 }
 
 // @public
-export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function startAfter(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
 
 // @public
-export function startAfter(...fieldValues: unknown[]): QueryConstraint;
+export function startAfter(...fieldValues: unknown[]): QueryStartAtConstraint;
 
 // @public
-export function startAt(snapshot: DocumentSnapshot<unknown>): QueryConstraint;
+export function startAt(snapshot: DocumentSnapshot<unknown>): QueryStartAtConstraint;
 
 // @public
-export function startAt(...fieldValues: unknown[]): QueryConstraint;
+export function startAt(...fieldValues: unknown[]): QueryStartAtConstraint;
 
 // @public
 export type TaskState = 'Error' | 'Running' | 'Success';
@@ -506,7 +555,7 @@ export function updateDoc(reference: DocumentReference<unknown>, field: string |
 export function waitForPendingWrites(firestore: Firestore): Promise<void>;
 
 // @public
-export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryConstraint;
+export function where(fieldPath: string | FieldPath, opStr: WhereFilterOp, value: unknown): QueryFieldFilterConstraint;
 
 // @public
 export type WhereFilterOp = '<' | '<=' | '==' | '!=' | '>=' | '>' | 'array-contains' | 'in' | 'array-contains-any' | 'not-in';

packages/firestore/lite/index.ts

@@ -55,19 +55,29 @@ export {
 } from '../src/lite-api/reference';
 
 export {
+  and,
   endAt,
   endBefore,
   startAt,
   startAfter,
   limit,
   limitToLast,
-  orderBy,
-  OrderByDirection,
   where,
-  WhereFilterOp,
+  or,
+  orderBy,
   query,
   QueryConstraint,
-  QueryConstraintType
+  QueryConstraintType,
+  QueryCompositeFilterConstraint,
+  QueryFilterConstraint,
+  QueryFieldFilterConstraint,
+  QueryOrderByConstraint,
+  QueryLimitConstraint,
+  QueryNonFilterConstraint,
+  QueryStartAtConstraint,
+  QueryEndAtConstraint,
+  OrderByDirection,
+  WhereFilterOp
 } from '../src/lite-api/query';
 
 export {

packages/firestore/package.json

@@ -30,6 +30,8 @@
     "test:all:ci": "run-p test:browser test:lite:browser test:travis",
     "test:all": "run-p test:browser test:lite:browser test:travis test:minified",
     "test:browser": "karma start --single-run",
+    "test:browser:emulator:debug": "karma start --browsers=Chrome --local",
+    "test:browser:emulator": "karma start --single-run --local",
     "test:browser:unit": "karma start --single-run --unit",
     "test:browser:debug": "karma start --browsers=Chrome --auto-watch",
     "test:node": "node ./scripts/run-tests.js  --main=test/register.ts  --emulator 'test/{,!(browser|lite)/**/}*.test.ts'",

packages/firestore/src/api.ts

@@ -72,17 +72,27 @@ export {
 } from './api/reference';
 
 export {
+  and,
   endAt,
   endBefore,
   startAt,
   startAfter,
   limit,
   limitToLast,
   where,
+  or,
   orderBy,
   query,
   QueryConstraint,
   QueryConstraintType,
+  QueryCompositeFilterConstraint,
+  QueryFilterConstraint,
+  QueryFieldFilterConstraint,
+  QueryOrderByConstraint,
+  QueryLimitConstraint,
+  QueryNonFilterConstraint,
+  QueryStartAtConstraint,
+  QueryEndAtConstraint,
   OrderByDirection,
   WhereFilterOp
 } from './api/filter';