Update functions with variadic params to match signatures of the backend

Author: MarkDuckworth

packages/firestore/src/api_pipelines.ts

@@ -107,7 +107,7 @@ export {
   genericFunction,
   ascending,
   descending,
-  countif,
+  countIf,
   bitAnd,
   bitOr,
   bitXor,
@@ -133,7 +133,7 @@ export {
   key,
   substr,
   manhattanDistance,
-  Countif,
+  CountIf,
   BitAnd,
   BitOr,
   BitXor,

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

@@ -135,16 +135,16 @@ export function toPipelineBooleanExpr(f: FilterInternal): BooleanExpr {
   } else if (f instanceof CompositeFilterInternal) {
     switch (f.op) {
       case CompositeOperator.AND: {
-        const conditions = f
-          .getFilters()
-          .map(f => toPipelineBooleanExpr(f));
-        return andFunction(conditions[0], ...conditions.slice(1));
+        const conditions = f.getFilters().map(f => toPipelineBooleanExpr(f));
+        return andFunction(
+          conditions[0],
+          conditions[1],
+          ...conditions.slice(2)
+        );
       }
       case CompositeOperator.OR: {
-        const conditions = f
-          .getFilters()
-          .map(f => toPipelineBooleanExpr(f));
-        return orFunction(conditions[0], ...conditions.slice(1));
+        const conditions = f.getFilters().map(f => toPipelineBooleanExpr(f));
+        return orFunction(conditions[0], conditions[1], ...conditions.slice(2));
       }
       default:
         fail('Unexpected operator');