@@ -19,7 +19,7 @@ import { Firestore } from '../api/database';
19
19
import {
20
20
Constant ,
21
21
Field ,
22
- FilterCondition ,
22
+ BooleanExpr ,
23
23
not ,
24
24
andFunction ,
25
25
orFunction ,
@@ -56,7 +56,7 @@ import {
56
56
57
57
/* eslint @typescript-eslint/no-explicit-any: 0 */
58
58
59
- export function toPipelineFilterCondition ( f : FilterInternal ) : FilterCondition {
59
+ export function toPipelineBooleanExpr ( f : FilterInternal ) : BooleanExpr {
60
60
if ( f instanceof FieldFilterInternal ) {
61
61
const field = Field . of ( f . field . toString ( ) ) ;
62
62
if ( isNanValue ( f . value ) ) {
@@ -137,13 +137,13 @@ export function toPipelineFilterCondition(f: FilterInternal): FilterCondition {
137
137
case CompositeOperator . AND : {
138
138
const conditions = f
139
139
. getFilters ( )
140
- . map ( f => toPipelineFilterCondition ( f ) ) ;
140
+ . map ( f => toPipelineBooleanExpr ( f ) ) ;
141
141
return andFunction ( conditions [ 0 ] , ...conditions . slice ( 1 ) ) ;
142
142
}
143
143
case CompositeOperator . OR : {
144
144
const conditions = f
145
145
. getFilters ( )
146
- . map ( f => toPipelineFilterCondition ( f ) ) ;
146
+ . map ( f => toPipelineBooleanExpr ( f ) ) ;
147
147
return orFunction ( conditions [ 0 ] , ...conditions . slice ( 1 ) ) ;
148
148
}
149
149
default :
@@ -176,7 +176,7 @@ export function toPipeline(query: Query, db: Firestore): Pipeline {
176
176
177
177
// filters
178
178
for ( const filter of query . filters ) {
179
- pipeline = pipeline . where ( toPipelineFilterCondition ( filter ) ) ;
179
+ pipeline = pipeline . where ( toPipelineBooleanExpr ( filter ) ) ;
180
180
}
181
181
182
182
// orders
@@ -240,7 +240,7 @@ function whereConditionsFromCursor(
240
240
bound : Bound ,
241
241
orderings : Ordering [ ] ,
242
242
position : 'before' | 'after'
243
- ) : FilterCondition {
243
+ ) : BooleanExpr {
244
244
const cursors = bound . position . map ( value => Constant . _fromProto ( value ) ) ;
245
245
const filterFunc = position === 'before' ? lt : gt ;
246
246
const filterInclusiveFunc = position === 'before' ? lte : gte ;
0 commit comments