Skip to content

Commit e711f06

Browse files
committed
Merge branch 'markduckworth/or-queries-pr-9' into markduckworth/or-queries-relaxing-in-restrictions
2 parents 934fbef + 9c6395b commit e711f06

File tree

4 files changed

+662
-645
lines changed

4 files changed

+662
-645
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,10 +244,6 @@ export class QueryCompositeFilterConstraint {
244244
// @public
245245
export abstract class QueryConstraint {
246246
abstract readonly type: QueryConstraintType;
247-
/**
248-
* Takes the provided {@link Query} and returns a copy of the {@link Query} with this
249-
* {@link AppliableConstraint} applied.
250-
*/
251247
}
252248

253249
// @public

common/api-review/firestore.api.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -373,10 +373,6 @@ export class QueryCompositeFilterConstraint {
373373
// @public
374374
export abstract class QueryConstraint {
375375
abstract readonly type: QueryConstraintType;
376-
/**
377-
* Takes the provided {@link Query} and returns a copy of the {@link Query} with this
378-
* {@link AppliableConstraint} applied.
379-
*/
380376
}
381377

382378
// @public

packages/firestore/src/lite-api/query.ts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,20 @@ export abstract class AppliableConstraint {
101101
/**
102102
* A `QueryConstraint` is used to narrow the set of documents returned by a
103103
* Firestore query. `QueryConstraint`s are created by invoking {@link where},
104-
* {@link orderBy}, {@link startAt:}, {@link startAfter}, {@link
104+
* {@link orderBy}, {@link startAt}, {@link startAfter}, {@link
105105
* endBefore}, {@link endAt}, {@link limit}, {@link limitToLast} and
106106
* can then be passed to {@link query} to create a new query instance that
107107
* also contains this `QueryConstraint`.
108108
*/
109109
export abstract class QueryConstraint extends AppliableConstraint {
110110
/** The type of this query constraint */
111111
abstract readonly type: QueryConstraintType;
112+
113+
/**
114+
* Takes the provided {@link Query} and returns a copy of the {@link Query} with this
115+
* {@link AppliableConstraint} applied.
116+
*/
117+
abstract _apply<T>(query: Query<T>): Query<T>;
112118
}
113119

114120
/**
@@ -332,10 +338,9 @@ export class QueryCompositeFilterConstraint extends AppliableConstraint {
332338
}
333339

334340
/**
335-
* `QueryNonFilterConstraint` is a helper union type that represents all
336-
* QueryConstraints which do not inherit from QueryFieldFilterConstraint. These
337-
* are used to narrow or order the set of documents returned by a Firestore
338-
* query, but they do not explicitly filter on a document field.
341+
* `QueryNonFilterConstraint` is a helper union type that represents
342+
* QueryConstraints which are used to narrow or order the set of documents,
343+
* but that do not explicitly filter on a document field.
339344
* `QueryNonFilterConstraint`s are created by invoking {@link orderBy},
340345
* {@link startAt}, {@link startAfter}, {@link endBefore}, {@link endAt},
341346
* {@link limit} or {@link limitToLast} and can then be passed to {@link query}

0 commit comments

Comments
 (0)