Skip to content

Commit ac42e1f

Browse files
committed
Rename FilterCondition to BooleanExpr
1 parent 33f5811 commit ac42e1f

File tree

6 files changed

+57
-57
lines changed

6 files changed

+57
-57
lines changed

packages/firestore/lite/pipelines/pipelines.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,6 @@ export {
204204
ExprType,
205205
AccumulatorTarget,
206206
Selectable,
207-
FilterCondition,
207+
BooleanExpr,
208208
Accumulator
209209
} from '../../src/lite-api/expressions';

packages/firestore/src/api_pipelines.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,6 @@ export type {
233233
ExprType,
234234
AccumulatorTarget,
235235
Selectable,
236-
FilterCondition,
236+
BooleanExpr,
237237
Accumulator
238238
} from './lite-api/expressions';

packages/firestore/src/core/pipeline-util.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { Firestore } from '../api/database';
1919
import {
2020
Constant,
2121
Field,
22-
FilterCondition,
22+
BooleanExpr,
2323
not,
2424
andFunction,
2525
orFunction,
@@ -56,7 +56,7 @@ import {
5656

5757
/* eslint @typescript-eslint/no-explicit-any: 0 */
5858

59-
export function toPipelineFilterCondition(f: FilterInternal): FilterCondition {
59+
export function toPipelineBooleanExpr(f: FilterInternal): BooleanExpr {
6060
if (f instanceof FieldFilterInternal) {
6161
const field = Field.of(f.field.toString());
6262
if (isNanValue(f.value)) {
@@ -137,13 +137,13 @@ export function toPipelineFilterCondition(f: FilterInternal): FilterCondition {
137137
case CompositeOperator.AND: {
138138
const conditions = f
139139
.getFilters()
140-
.map(f => toPipelineFilterCondition(f));
140+
.map(f => toPipelineBooleanExpr(f));
141141
return andFunction(conditions[0], ...conditions.slice(1));
142142
}
143143
case CompositeOperator.OR: {
144144
const conditions = f
145145
.getFilters()
146-
.map(f => toPipelineFilterCondition(f));
146+
.map(f => toPipelineBooleanExpr(f));
147147
return orFunction(conditions[0], ...conditions.slice(1));
148148
}
149149
default:
@@ -176,7 +176,7 @@ export function toPipeline(query: Query, db: Firestore): Pipeline {
176176

177177
// filters
178178
for (const filter of query.filters) {
179-
pipeline = pipeline.where(toPipelineFilterCondition(filter));
179+
pipeline = pipeline.where(toPipelineBooleanExpr(filter));
180180
}
181181

182182
// orders
@@ -240,7 +240,7 @@ function whereConditionsFromCursor(
240240
bound: Bound,
241241
orderings: Ordering[],
242242
position: 'before' | 'after'
243-
): FilterCondition {
243+
): BooleanExpr {
244244
const cursors = bound.position.map(value => Constant._fromProto(value));
245245
const filterFunc = position === 'before' ? lt : gt;
246246
const filterInclusiveFunc = position === 'before' ? lte : gte;

0 commit comments

Comments
 (0)