Formatting

Author: MarkDuckworth

packages/firestore/src/core/target.ts

@@ -787,21 +787,30 @@ export class CompositeFilter extends Filter {
   }
 }
 
-export function compositeFilterIsConjunction(compositeFilter: CompositeFilter): boolean {
+export function compositeFilterIsConjunction(
+  compositeFilter: CompositeFilter
+): boolean {
   return compositeFilter.op === CompositeOperator.AND;
 }
 
 /**
  * Returns true if this filter is a conjunction of field filters only. Returns false otherwise.
  */
-export function compositeFilterIsFlatConjunction(compositeFilter: CompositeFilter): boolean {
-  return compositeFilterIsFlat(compositeFilter) && compositeFilterIsConjunction(compositeFilter);
+export function compositeFilterIsFlatConjunction(
+  compositeFilter: CompositeFilter
+): boolean {
+  return (
+    compositeFilterIsFlat(compositeFilter) &&
+    compositeFilterIsConjunction(compositeFilter)
+  );
 }
 
 /**
  * Returns true if this filter does not contain any composite filters. Returns false otherwise.
  */
-export function compositeFilterIsFlat(compositeFilter: CompositeFilter): boolean {
+export function compositeFilterIsFlat(
+  compositeFilter: CompositeFilter
+): boolean {
   for (const filter of compositeFilter.filters) {
     if (filter instanceof CompositeFilter) {
       return false;
@@ -854,15 +863,20 @@ export function fieldFilterEquals(f1: FieldFilter, f2: Filter): boolean {
   );
 }
 
-export function compositeFilterEquals(f1: CompositeFilter, f2: Filter): boolean {
+export function compositeFilterEquals(
+  f1: CompositeFilter,
+  f2: Filter
+): boolean {
   if (
     f2 instanceof CompositeFilter &&
     f1.op === f2.op &&
-    f1.filters.length === f2.filters.length) {
+    f1.filters.length === f2.filters.length
+  ) {
     const subFiltersMatch: boolean = f1.filters.reduce(
       (result: boolean, f1Filter: Filter, index: number): boolean =>
-        (result && filterEquals(f1Filter, f2.filters[index])),
-      true);
+        result && filterEquals(f1Filter, f2.filters[index]),
+      true
+    );
 
     return subFiltersMatch;
   }

packages/firestore/src/remote/serializer.ts

@@ -999,7 +999,10 @@ function decodeFilters(filter: ProtoFilter): Filter[] {
   // F2, ...
   // TODO(orquery): Once proper support for composite filters has been completed, we can remove
   // this flattening from here.
-  if (result instanceof CompositeFilter && compositeFilterIsFlatConjunction(result)) {
+  if (
+    result instanceof CompositeFilter &&
+    compositeFilterIsFlatConjunction(result)
+  ) {
     return result.getFilters();
   }
 
@@ -1079,7 +1082,9 @@ export function toOperatorName(op: Operator): ProtoFieldFilterOp {
   return OPERATORS[op];
 }
 
-export function toCompositeOperatorName(op: CompositeOperator): ProtoCompositeFilterOp {
+export function toCompositeOperatorName(
+  op: CompositeOperator
+): ProtoCompositeFilterOp {
   return COMPOSITE_OPERATORS[op];
 }
 
@@ -1112,7 +1117,9 @@ export function fromOperatorName(op: ProtoFieldFilterOp): Operator {
   }
 }
 
-export function fromCompositeOperatorName(op: ProtoCompositeFilterOp): CompositeOperator {
+export function fromCompositeOperatorName(
+  op: ProtoCompositeFilterOp
+): CompositeOperator {
   // TODO(orquery) support OR
   switch (op) {
     case 'AND':

packages/firestore/test/unit/core/query.test.ts

@@ -436,6 +436,7 @@ describe('Query', () => {
     expect(queryMatches(query1, doc5)).to.equal(true);
   });
 
+  // TODO(orquery) this will be useful for testing
   it('filters based on array value', () => {
     const baseQuery = query('collection');
     const doc1 = doc('collection/doc', 0, { tags: ['foo', 1, true] });

packages/firestore/test/unit/remote/serializer.helper.ts

@@ -1097,14 +1097,12 @@ export function serializerTest(
       /* eslint-disable no-restricted-properties */
       it('converts deep collections', () => {
         const input = orFilter(
-          filter("prop", "<", 42),
+          filter('prop', '<', 42),
           andFilter(
             filter('author', '==', 'ehsann'),
             filter('tags', 'array-contains', 'pending'),
-            orFilter(
-              filter('version', '==', 4),
-              filter('version', '==', NaN)
-            ))
+            orFilter(filter('version', '==', 4), filter('version', '==', NaN))
+          )
         );
 
         // Encode
@@ -1152,31 +1150,21 @@ export function serializerTest(
         const innerOrProtoFilter = {
           compositeFilter: {
             op: protoCompositeFilterOrOp,
-            filters: [
-              versionProtoFilter,
-              nanVersionProtoFilter
-            ]
+            filters: [versionProtoFilter, nanVersionProtoFilter]
           }
         };
 
         const innerAndProtoFilter = {
           compositeFilter: {
             op: 'AND',
-            filters: [
-              authorProtoFilter,
-              tagsProtoFilter,
-              innerOrProtoFilter
-            ]
+            filters: [authorProtoFilter, tagsProtoFilter, innerOrProtoFilter]
           }
         };
 
         expect(actual).to.deep.equal({
           compositeFilter: {
             op: protoCompositeFilterOrOp,
-            filters: [
-              propProtoFilter,
-              innerAndProtoFilter
-            ]
+            filters: [propProtoFilter, innerAndProtoFilter]
           }
         });