Cleanup

Author: MarkDuckworth

packages/firestore/src/api_pipelines.ts

@@ -122,7 +122,6 @@ export {
   rand,
   array,
   arrayOffset,
-  currentContext,
   isError,
   ifError,
   isAbsent,

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

@@ -221,7 +221,7 @@ export function toPipeline(query: Query, db: Firestore): Pipeline {
         );
       }
 
-      pipeline = pipeline._limit(query.limit!, true);
+      pipeline = pipeline.limit(query.limit!, true);
       pipeline = pipeline.sort(orderings[0], ...orderings.slice(1));
     } else {
       pipeline = pipeline.sort(orderings[0], ...orderings.slice(1));

packages/firestore/src/lite-api/expressions.ts

@@ -2134,7 +2134,7 @@ export class ExprWithAlias implements Selectable, UserData {
 /**
  * @internal
  */
-class ListOfExprs extends Expr {
+class ListOfExprs extends Expr implements UserData {
   exprType: ExprType = 'ListOfExprs';
 
   constructor(private exprs: Expr[]) {
@@ -2345,7 +2345,7 @@ export function constant(value: string): Constant;
  * @param value The boolean value.
  * @return A new `Constant` instance.
  */
-export function constant(value: boolean): Constant;
+export function constant(value: boolean): BooleanExpr;
 
 /**
  * Creates a `Constant` instance for a null value.

packages/firestore/src/lite-api/pipeline.ts

@@ -339,21 +339,6 @@ export class Pipeline implements ProtoSerializable<ProtoPipeline> {
     return this._addStage(new Limit(limit));
   }
 
-  /**
-   * Internal use only.
-   * Helper to add a limit stage when converting from a Query.
-   *
-   * @internal
-   * @private
-   *
-   * @param limit
-   * @param convertedFromLimitToLast
-   */
-  _limit(limit: number, convertedFromLimitToLast: boolean): Pipeline {
-    return this._addStage(new Limit(limit, convertedFromLimitToLast));
-  }
-
-
   /**
    * Returns a set of distinct values from the inputs to this stage.
    *
@@ -552,31 +537,11 @@ export class Pipeline implements ProtoSerializable<ProtoPipeline> {
    * @param additionalOrderings Optional additional {@link Ordering} instances specifying the additional sorting criteria.
    * @return A new {@code Pipeline} object with this stage appended to the stage list.
    */
-  sort(ordering: Ordering, ...additionalOrderings: Ordering[]): Pipeline;
-  sort(
-    optionsOrOrderings:
-      | Ordering
-      | {
-          orderings: Ordering[];
-        },
-    ...rest: Ordering[]
-  ): Pipeline {
-    // Option object
-    if (optionsOrOrderings && 'orderings' in optionsOrOrderings) {
-      return this._addStage(
-        new Sort(
-          this.readUserData(
-            'sort',
-            this.readUserData('sort', optionsOrOrderings.orderings)
-          )
-        )
-      );
-    } else {
-      // Ordering object
-      return this._addStage(
-        new Sort(this.readUserData('sort', [optionsOrOrderings, ...rest]))
-      );
-    }
+  sort(ordering: Ordering, ...additionalOrderings: Ordering[]): Pipeline {
+    // Ordering object
+    return this._addStage(
+      new Sort(this.readUserData('sort', [ordering, ...additionalOrderings]))
+    );
   }
 
   /**

packages/firestore/src/lite-api/stage.ts

@@ -319,10 +319,7 @@ export class FindNearest implements Stage {
 export class Limit implements Stage {
   name = 'limit';
 
-  constructor(
-    readonly limit: number,
-    readonly convertedFromLimitTolast: boolean = false
-  ) {
+  constructor(readonly limit: number) {
     hardAssert(
       !isNaN(limit) && limit !== Infinity && limit !== -Infinity,
       'Invalid limit value'

packages/firestore/test/integration/api/pipeline.test.ts

@@ -1139,6 +1139,18 @@ apiDescribe.only('Pipelines', persistence => {
           { title: "The Handmaid's Tale" }
         );
       });
+
+      it('where with boolean constant', async () => {
+        const snapshot = await execute(
+          firestore
+            .pipeline()
+            .collection(randomCol.path)
+            .where(constant(true))
+            .sort(ascending('__name__'))
+            .limit(2)
+        );
+        expectResults(snapshot, 'book1', 'book10');
+      });
     });
 
     describe('sort, offset, and limit stages', () => {

packages/firestore/test/integration/api/transactions.test.ts

@@ -33,7 +33,7 @@ import {
   runTransaction,
   setDoc
 } from '../util/firebase_export';
-import { apiDescribe, withTestDb } from '../util/helpers';
+import { apiDescribe, withTestCollection, withTestDb } from '../util/helpers';
 
 apiDescribe('Database transactions', persistence => {
   type TransactionStage = (