@@ -52,7 +52,6 @@ import { Code, FirestoreError } from '../util/error';
52
52
import * as obj from '../util/obj' ;
53
53
import * as typeUtils from '../util/types' ;
54
54
55
- import { DoubleValue , NullValue , NumberValue } from '../model/field_value' ;
56
55
import {
57
56
ArrayRemoveTransformOperation ,
58
57
ArrayUnionTransformOperation ,
@@ -1158,7 +1157,7 @@ export class JsonProtoSerializer {
1158
1157
}
1159
1158
1160
1159
private toFilter ( filters : Filter [ ] ) : api . Filter | undefined {
1161
- if ( filters . length === 0 ) return ;
1160
+ if ( filters . length === 0 ) { return ; }
1162
1161
const protos = filters . map ( filter => {
1163
1162
if ( filter instanceof FieldFilter ) {
1164
1163
return this . toUnaryOrFieldFilter ( filter ) ;
@@ -1293,14 +1292,14 @@ export class JsonProtoSerializer {
1293
1292
// visible for testing
1294
1293
toUnaryOrFieldFilter ( filter : FieldFilter ) : api . Filter {
1295
1294
if ( filter . op === Operator . EQUAL ) {
1296
- if ( filter . value . isEqual ( DoubleValue . NAN ) ) {
1295
+ if ( filter . value . isEqual ( fieldValue . DoubleValue . NAN ) ) {
1297
1296
return {
1298
1297
unaryFilter : {
1299
1298
field : this . toFieldPathReference ( filter . field ) ,
1300
1299
op : 'IS_NAN'
1301
1300
}
1302
1301
} ;
1303
- } else if ( filter . value . isEqual ( NullValue . INSTANCE ) ) {
1302
+ } else if ( filter . value . isEqual ( fieldValue . NullValue . INSTANCE ) ) {
1304
1303
return {
1305
1304
unaryFilter : {
1306
1305
field : this . toFieldPathReference ( filter . field ) ,
@@ -1324,12 +1323,12 @@ export class JsonProtoSerializer {
1324
1323
const nanField = this . fromFieldPathReference (
1325
1324
filter . unaryFilter ! . field !
1326
1325
) ;
1327
- return new FieldFilter ( nanField , Operator . EQUAL , DoubleValue . NAN ) ;
1326
+ return new FieldFilter ( nanField , Operator . EQUAL , fieldValue . DoubleValue . NAN ) ;
1328
1327
case 'IS_NULL' :
1329
1328
const nullField = this . fromFieldPathReference (
1330
1329
filter . unaryFilter ! . field !
1331
1330
) ;
1332
- return new FieldFilter ( nullField , Operator . EQUAL , NullValue . INSTANCE ) ;
1331
+ return new FieldFilter ( nullField , Operator . EQUAL , fieldValue . NullValue . INSTANCE ) ;
1333
1332
case 'OPERATOR_UNSPECIFIED' :
1334
1333
return fail ( 'Unspecified filter' ) ;
1335
1334
default :
0 commit comments