@dereekb/firebase 13.10.9 → 13.11.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dereekb/firebase",
-  "version": "13.10.9",
+  "version": "13.11.1",
   "sideEffects": false,
   "exports": {
     "./test": {
@@ -18,10 +18,10 @@
     }
   },
   "peerDependencies": {
-    "@dereekb/util": "13.10.9",
-    "@dereekb/date": "13.10.9",
-    "@dereekb/model": "13.10.9",
-    "@dereekb/rxjs": "13.10.9",
+    "@dereekb/util": "13.11.1",
+    "@dereekb/date": "13.11.1",
+    "@dereekb/model": "13.11.1",
+    "@dereekb/rxjs": "13.11.1",
     "@firebase/rules-unit-testing": "5.0.0",
     "arktype": "^2.2.0",
     "date-fns": "^4.1.0",

package/test/index.cjs.js

@@ -260,6 +260,7 @@ function _ts_generator$6(thisArg, body) {
  * ```
  *
  * @param driver - The base driver to wrap with fuzzing behavior.
+ * @returns A {@link TestingFirestoreAccessorDriver} with `collection`, `subcollection`, and `collectionGroup` rewired to use fuzzed paths, plus helpers to inspect the fuzz map.
  */ function makeTestingFirestoreAccesorDriver(driver) {
     var fuzzerKey = 0;
     var time = new Date().getTime();
@@ -316,8 +317,8 @@ function _ts_generator$6(thisArg, body) {
 /**
  * Extends the input drivers to generate new drivers for a testing environment.
  *
- * @param drivers
- * @returns
+ * @param drivers - The base Firestore drivers to wrap.
+ * @returns A {@link TestingFirestoreDrivers} marked with `firestoreDriverType: 'testing'` and a wrapped accessor driver from {@link makeTestingFirestoreAccesorDriver}.
  */ function makeTestingFirestoreDrivers(drivers) {
     return _object_spread_props$2(_object_spread$3({}, drivers), {
         firestoreDriverType: 'testing',
@@ -413,6 +414,7 @@ var bucketTestNameKey = 0;
  *
  * @param driver - The base storage accessor driver to wrap.
  * @param config - Optional configuration controlling test bucket behavior.
+ * @returns A driver with the same surface as `driver`, but with `getDefaultBucket` overridden to return a unique test bucket name when {@link MakeTestingFirebaseStorageAccessorDriverConfig.useTestDefaultBucket} requires it.
  */ function makeTestingFirebaseStorageAccesorDriver(driver, config) {
     var useTestDefaultBucket = (config !== null && config !== void 0 ? config : {}).useTestDefaultBucket;
     // The default bucket is only used if another bucket is not input.
@@ -429,8 +431,9 @@ var bucketTestNameKey = 0;
 /**
  * Extends the input drivers to generate new drivers for a testing environment.
  *
- * @param drivers
- * @returns
+ * @param drivers - The base Firebase Storage drivers to wrap.
+ * @param config - Optional config forwarded to {@link makeTestingFirebaseStorageAccesorDriver}; controls test-bucket override behavior.
+ * @returns A {@link TestingFirebaseStorageDrivers} marked with `storageDriverType: 'testing'` and a wrapped accessor driver.
  */ function makeTestingFirebaseStorageDrivers(drivers, config) {
     return _object_spread_props$1(_object_spread$2({}, drivers), {
         storageDriverType: 'testing',
@@ -848,6 +851,11 @@ function _ts_generator$5(thisArg, body) {
  *
  * Combines the Firestore client drivers with the rules test environment and context
  * to produce a context suitable for client-side Firestore tests.
+ *
+ * @param drivers - Testing Firestore drivers used to back the context (typically with collection name fuzzing).
+ * @param rulesTestEnvironment - The shared `@firebase/rules-unit-testing` environment for the suite.
+ * @param rulesTestContext - The per-test rules context (authenticated or unauthenticated) used to obtain the Firestore instance.
+ * @returns A {@link RulesUnitTestTestFirestoreContext} that exposes the rules-test environment and context alongside the standard Firestore context.
  */ function makeRulesTestFirestoreContext(drivers, rulesTestEnvironment, rulesTestContext) {
     var context = _object_spread_props(_object_spread$1({}, firebase.firestoreContextFactory(drivers)(rulesTestContext.firestore())), {
         drivers: drivers,
@@ -861,6 +869,11 @@ function _ts_generator$5(thisArg, body) {
  *
  * Combines the Storage client drivers with the rules test environment and context
  * to produce a context suitable for client-side Firebase Storage tests.
+ *
+ * @param drivers - Testing Firebase Storage drivers used to back the context (typically with a unique test bucket).
+ * @param rulesTestEnvironment - The shared `@firebase/rules-unit-testing` environment for the suite.
+ * @param rulesTestContext - The per-test rules context used to obtain the Storage instance.
+ * @returns A {@link RulesUnitTestTestFirebaseStorageContext} that exposes the rules-test environment and context alongside the standard Storage context.
  */ function makeRulesTestFirebaseStorageContext(drivers, rulesTestEnvironment, rulesTestContext) {
     var context = _object_spread_props(_object_spread$1({}, firebase.firebaseStorageContextFactory(drivers)(rulesTestContext.storage())), {
         drivers: drivers,
@@ -944,6 +957,9 @@ function _ts_generator$5(thisArg, body) {
  * preventing interference between parallel workers sharing the same Firebase Storage emulator. The Storage
  * emulator maintains rules globally (not per-project), so concurrent `setRules` calls from multiple workers
  * can momentarily leave the emulator in a transitional state that causes `storage/unauthorized` errors.
+ *
+ * @param inputConfig - Optional partial config; `testEnvironment` defaults to an empty object and `rulesContext` defaults to undefined (unauthenticated).
+ * @returns A function that, given a `buildTests` callback, registers Vitest hooks (`beforeAll`/`afterAll`/`beforeEach`/`afterEach`) and invokes the callback with a {@link RulesUnitTestFirebaseTestingContextFixture}.
  */ var firebaseRulesUnitTestBuilder = function firebaseRulesUnitTestBuilder(inputConfig) {
     var _ref;
     var config = {
@@ -1255,8 +1271,8 @@ function _is_native_reflect_construct$4() {
 /**
  * Used to build a mockItemCollection from a firestore instance with a converter setup.
  *
- * @param firestore
- * @returns
+ * @param context - The Firestore context to resolve the root collection against.
+ * @returns A typed {@link CollectionReference} for the root MockItem collection.
  */ function mockItemCollectionReference(context) {
     return context.collection(mockItemIdentity.collectionName);
 }
@@ -1268,6 +1284,9 @@ function _is_native_reflect_construct$4() {
  * const collection = mockItemFirestoreCollection(firestoreContext);
  * const doc = collection.documentAccessor().newDocument();
  * ```
+ *
+ * @param firestoreContext - The Firestore context (test or production) used to resolve the underlying collection reference.
+ * @returns A {@link MockItemFirestoreCollection} wired with the {@link mockItemConverter} and {@link mockItemIdentity}.
  */ function mockItemFirestoreCollection(firestoreContext) {
     return firestoreContext.firestoreCollection({
         converter: mockItemConverter,
@@ -1372,13 +1391,11 @@ function _is_native_reflect_construct$4() {
     })
 });
 /**
- * Used to build a mockItemCollection from a firestore instance with a converter setup.
- *
- * @param firestore
- * @returns
- */ /**
  * Creates a factory that produces {@link CollectionReference} instances for {@link MockItemPrivate}
  * subcollections under a given {@link MockItemDocument} parent.
+ *
+ * @param context - The Firestore context used to resolve subcollections.
+ * @returns A function that, given a parent {@link MockItemDocument}, returns a typed {@link CollectionReference} for that parent's MockItemPrivate subcollection.
  */ function mockItemPrivateCollectionReferenceFactory(context) {
     return function(parent) {
         return context.subcollection(parent.documentRef, mockItemPrivateIdentity.collectionName);
@@ -1386,6 +1403,9 @@ function _is_native_reflect_construct$4() {
 }
 /**
  * Creates a factory for producing {@link MockItemPrivateFirestoreCollection} instances bound to a parent {@link MockItemDocument}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying subcollection.
+ * @returns A factory that, given a parent {@link MockItemDocument}, returns a single-item collection wired with {@link mockItemPrivateConverter}.
  */ function mockItemPrivateFirestoreCollection(firestoreContext) {
     var factory = mockItemPrivateCollectionReferenceFactory(firestoreContext);
     return function(parent) {
@@ -1403,11 +1423,17 @@ function _is_native_reflect_construct$4() {
 }
 /**
  * Creates a {@link CollectionGroup} reference for querying all {@link MockItemPrivate} documents across parents.
+ *
+ * @param context - The Firestore context used to resolve the collection group.
+ * @returns A typed {@link CollectionGroup} reference for the MockItemPrivate collection name.
  */ function mockItemPrivateCollectionReference(context) {
     return context.collectionGroup(mockItemPrivateIdentity.collectionName);
 }
 /**
  * Creates a {@link MockItemPrivateFirestoreCollectionGroup} for cross-parent queries on {@link MockItemPrivate}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying collection group reference.
+ * @returns A typed {@link MockItemPrivateFirestoreCollectionGroup} wired with the {@link mockItemPrivateConverter}.
  */ function mockItemPrivateFirestoreCollectionGroup(firestoreContext) {
     return firestoreContext.firestoreCollectionGroup({
         modelIdentity: mockItemPrivateIdentity,
@@ -1460,10 +1486,11 @@ var mockItemUserIdentifier = '0';
     })
 });
 /**
- * Used to build a mockItemCollection from a firestore instance with a converter setup.
+ * Creates a factory that produces {@link CollectionReference} instances for {@link MockItemUser}
+ * subcollections under a given {@link MockItemDocument} parent.
  *
- * @param firestore
- * @returns
+ * @param context - The Firestore context used to resolve subcollections.
+ * @returns A function that, given a parent {@link MockItemDocument}, returns a typed {@link CollectionReference} for that parent's MockItemUser subcollection.
  */ function mockItemUserCollectionReferenceFactory(context) {
     return function(parent) {
         return context.subcollection(parent.documentRef, mockItemUserCollectionName);
@@ -1474,6 +1501,9 @@ var mockItemUserIdentifier = '0';
  */ var mockItemUserAccessorFactory = firebase.copyUserRelatedDataAccessorFactoryFunction();
 /**
  * Creates a factory for producing {@link MockItemUserFirestoreCollection} instances bound to a parent {@link MockItemDocument}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying subcollection.
+ * @returns A factory that, given a parent {@link MockItemDocument}, returns a per-parent collection wired with {@link mockItemUserConverter} and {@link mockItemUserAccessorFactory}.
  */ function mockItemUserFirestoreCollection(firestoreContext) {
     var factory = mockItemUserCollectionReferenceFactory(firestoreContext);
     return function(parent) {
@@ -1492,11 +1522,17 @@ var mockItemUserIdentifier = '0';
 }
 /**
  * Creates a {@link CollectionGroup} reference for querying all {@link MockItemUser} documents across parents.
+ *
+ * @param context - The Firestore context used to resolve the collection group.
+ * @returns A typed {@link CollectionGroup} reference for the MockItemUser collection name.
  */ function mockItemUserCollectionReference(context) {
     return context.collectionGroup(mockItemUserCollectionName);
 }
 /**
  * Creates a {@link MockItemUserFirestoreCollectionGroup} for cross-parent queries on {@link MockItemUser}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying collection group reference.
+ * @returns A typed {@link MockItemUserFirestoreCollectionGroup} wired with the {@link mockItemUserConverter} and {@link mockItemUserAccessorFactory}.
  */ function mockItemUserFirestoreCollectionGroup(firestoreContext) {
     return firestoreContext.firestoreCollectionGroup({
         modelIdentity: mockItemUserIdentity,
@@ -1546,6 +1582,9 @@ var mockItemUserIdentifier = '0';
 /**
  * Creates a factory that produces {@link CollectionReference} instances for {@link MockItemSubItem}
  * subcollections under a given {@link MockItemDocument} parent.
+ *
+ * @param context - The Firestore context used to resolve subcollections.
+ * @returns A function that, given a parent {@link MockItemDocument}, returns a typed {@link CollectionReference} for that parent's MockItemSubItem subcollection.
  */ function mockItemSubItemCollectionReferenceFactory(context) {
     return function(parent) {
         return context.subcollection(parent.documentRef, mockItemSubItemIdentity.collectionName);
@@ -1553,6 +1592,9 @@ var mockItemUserIdentifier = '0';
 }
 /**
  * Creates a factory for producing {@link MockItemSubItemFirestoreCollection} instances bound to a parent {@link MockItemDocument}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying subcollection.
+ * @returns A factory that, given a parent {@link MockItemDocument}, returns a per-parent collection wired with {@link mockItemSubItemConverter}.
  */ function mockItemSubItemFirestoreCollection(firestoreContext) {
     var factory = mockItemSubItemCollectionReferenceFactory(firestoreContext);
     return function(parent) {
@@ -1570,11 +1612,17 @@ var mockItemUserIdentifier = '0';
 }
 /**
  * Creates a {@link CollectionGroup} reference for querying all {@link MockItemSubItem} documents across parents.
+ *
+ * @param context - The Firestore context used to resolve the collection group.
+ * @returns A typed {@link CollectionGroup} reference for the MockItemSubItem collection name.
  */ function mockItemSubItemCollectionReference(context) {
     return context.collectionGroup(mockItemSubItemIdentity.collectionName);
 }
 /**
  * Creates a {@link MockItemSubItemFirestoreCollectionGroup} for cross-parent queries on {@link MockItemSubItem}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying collection group reference.
+ * @returns A typed {@link MockItemSubItemFirestoreCollectionGroup} wired with the {@link mockItemSubItemConverter}.
  */ function mockItemSubItemFirestoreCollectionGroup(firestoreContext) {
     return firestoreContext.firestoreCollectionGroup({
         modelIdentity: mockItemSubItemIdentity,
@@ -1623,6 +1671,9 @@ var mockItemUserIdentifier = '0';
 /**
  * Creates a factory that produces {@link CollectionReference} instances for {@link MockItemSubItemDeep}
  * subcollections under a given {@link MockItemSubItemDocument} parent.
+ *
+ * @param context - The Firestore context used to resolve subcollections.
+ * @returns A function that, given a parent {@link MockItemSubItemDocument}, returns a typed {@link CollectionReference} for that parent's MockItemSubItemDeep subcollection.
  */ function mockItemSubItemDeepCollectionReferenceFactory(context) {
     return function(parent) {
         return context.subcollection(parent.documentRef, mockItemSubItemDeepIdentity.collectionName);
@@ -1630,6 +1681,9 @@ var mockItemUserIdentifier = '0';
 }
 /**
  * Creates a factory for producing {@link MockItemSubItemDeepFirestoreCollection} instances bound to a parent {@link MockItemSubItemDocument}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying subcollection.
+ * @returns A factory that, given a parent {@link MockItemSubItemDocument}, returns a per-parent collection wired with {@link mockItemSubItemDeepConverter}.
  */ function mockItemSubItemDeepFirestoreCollection(firestoreContext) {
     var factory = mockItemSubItemDeepCollectionReferenceFactory(firestoreContext);
     return function(parent) {
@@ -1647,11 +1701,17 @@ var mockItemUserIdentifier = '0';
 }
 /**
  * Creates a {@link CollectionGroup} reference for querying all {@link MockItemSubItemDeep} documents across parents.
+ *
+ * @param context - The Firestore context used to resolve the collection group.
+ * @returns A typed {@link CollectionGroup} reference for the MockItemSubItemDeep collection name.
  */ function mockItemSubItemDeepCollectionReference(context) {
     return context.collectionGroup(mockItemSubItemDeepIdentity.collectionName);
 }
 /**
  * Creates a {@link MockItemSubItemDeepFirestoreCollectionGroup} for cross-parent queries on {@link MockItemSubItemDeep}.
+ *
+ * @param firestoreContext - The Firestore context used to resolve the underlying collection group reference.
+ * @returns A typed {@link MockItemSubItemDeepFirestoreCollectionGroup} wired with the {@link mockItemSubItemDeepConverter}.
  */ function mockItemSubItemDeepFirestoreCollectionGroup(firestoreContext) {
     return firestoreContext.firestoreCollectionGroup({
         modelIdentity: mockItemSubItemDeepIdentity,
@@ -1706,6 +1766,9 @@ function _class_call_check$4(instance, Constructor) {
  * Creates a concrete {@link MockItemCollections} instance with all collections bound to the given {@link FirestoreContext}.
  *
  * This is the primary way to instantiate the full set of mock collections for a test run.
+ *
+ * @param firestoreContext - The Firestore context (typically a {@link TestFirestoreContext}) that backs every collection.
+ * @returns A fully populated {@link MockItemCollections} with each mock collection, factory, and collection group wired to `firestoreContext`.
  */ function makeMockItemCollections(firestoreContext) {
     return {
         mockItemCollection: mockItemFirestoreCollection(firestoreContext),
@@ -1931,6 +1994,9 @@ function _is_native_reflect_construct$3() {
         {
             key: "firestoreCollection",
             get: /**
+     * Backwards-compatible alias for {@link MockItemCollectionFixtureInstance.mockItemCollection}.
+     *
+     * @returns The root {@link MockItemFirestoreCollection} from the fixture's underlying {@link MockItemCollections}.
      * @deprecated Use mockItemCollection instead.
      */ function get() {
                 return this.collections.mockItemCollection;
@@ -2019,6 +2085,9 @@ function _is_native_reflect_construct$3() {
  *   it('should work', () => { ... });
  * }));
  * ```
+ *
+ * @param _config - Reserved for future setup/teardown configuration; currently unused.
+ * @returns A factory builder that wraps a parent {@link TestFirestoreContextFixture} with a {@link MockItemCollectionFixture} per test.
  */ function testWithMockItemCollectionFixture(_config) {
     return test.instanceWrapTestContextFactory({
         wrapFixture: function wrapFixture(fixture) {
@@ -2185,6 +2254,9 @@ function _is_native_reflect_construct$2() {
  *   it('should upload', () => { ... });
  * }));
  * ```
+ *
+ * @param _config - Reserved for future setup/teardown configuration; currently unused.
+ * @returns A factory builder that wraps a parent {@link TestFirebaseStorageContextFixture} with a {@link MockItemStorageFixture} per test.
  */ function testWithMockItemStorageFixture(_config) {
     return test.instanceWrapTestContextFactory({
         wrapFixture: function wrapFixture(fixture) {
@@ -2357,11 +2429,17 @@ function _is_native_reflect_construct$1() {
  * const constraint = mockItemWithValue('hello');
  * const results = await collection.query(constraint);
  * ```
+ *
+ * @param value - The exact `value` to match.
+ * @returns A `where('value', '==', value)` constraint typed for {@link MockItem}.
  */ function mockItemWithValue(value) {
     return firebase.where('value', '==', value);
 }
 /**
  * Creates a Firestore query constraint that filters {@link MockItem} documents by their `test` boolean field.
+ *
+ * @param test - The boolean value of the `test` field to match.
+ * @returns A `where('test', '==', test)` constraint.
  */ function mockItemWithTestValue(test) {
     return firebase.where('test', '==', test);
 }
@@ -2379,8 +2457,8 @@ function _is_native_reflect_construct$1() {
  * From:
  * https://medium.com/firebase-developers/how-to-query-collections-in-firestore-under-a-certain-path-6a0d686cebd2
  *
- * @param parent
- * @returns
+ * @param mockItem - The parent {@link MockItem} document reference whose descendant documents the constraint should bound to.
+ * @returns An array of constraints (suitable for use on a collection group query) that restricts results to documents under the given parent path.
  */ function allChildMockItemSubItemDeepsWithinMockItem(mockItem) {
     return firebase.allChildDocumentsUnderParent(mockItem);
 }
@@ -5058,6 +5136,27 @@ function _ts_generator$3(thisArg, body) {
         };
     }
 }
+/**
+ * Creates a gate that calls `done()` once both `setSeen()` and `setCompleted()` have been invoked.
+ *
+ * Used to coordinate streamed-emission and post-mutation callbacks in stream-update tests.
+ *
+ * @param done - The Vitest async-test completion callback to invoke once both sides of the gate have fired.
+ * @returns A two-method gate; the test calls `setSeen()` from the stream subscription and `setCompleted()` from the mutation continuation, and `done()` runs only after both have happened (in either order).
+ */ function makeAwaitBothGate(done) {
+    var seen = false;
+    var completed = false;
+    return {
+        setSeen: function setSeen() {
+            seen = true;
+            if (completed) done();
+        },
+        setCompleted: function setCompleted() {
+            completed = true;
+            if (seen) done();
+        }
+    };
+}
 /**
  * Describes query driver tests, using a MockItemCollectionFixture.
  *
@@ -6196,20 +6295,13 @@ function _ts_generator$3(thisArg, body) {
                                 sub.destroy();
                             });
                             it('should emit when the query results update (an item is added).', test.callbackTest(function(done) {
-                                var tryComplete = function tryComplete() {
-                                    if (addSeen && addCompleted) {
-                                        done();
-                                    }
-                                };
                                 var itemsToAdd = 1;
-                                var addCompleted = false;
-                                var addSeen = false;
+                                var gate = makeAwaitBothGate(done);
                                 sub.subscription = querySubItems().streamDocs().pipe(rxjs$1.filter(function(x) {
                                     return x.docs.length > allSubItems.length;
                                 })).subscribe(function(results) {
-                                    addSeen = true;
                                     expect(results.docs.length).toBe(allSubItems.length + itemsToAdd);
-                                    tryComplete();
+                                    gate.setSeen();
                                 });
                                 // add one item
                                 void firebase.makeDocuments(f.instance.mockItemSubItemCollection(parentA).documentAccessor(), {
@@ -6220,32 +6312,23 @@ function _ts_generator$3(thisArg, body) {
                                         };
                                     }
                                 }).then(function() {
-                                    addCompleted = true;
-                                    tryComplete();
+                                    gate.setCompleted();
                                 });
                             }));
                             it('should emit when the query results update (an item is removed).', test.callbackTest(function(done) {
-                                var tryComplete = function tryComplete() {
-                                    if (deleteSeen && deleteCompleted) {
-                                        done();
-                                    }
-                                };
                                 var itemsToRemove = 1;
-                                var deleteCompleted = false;
-                                var deleteSeen = false;
+                                var gate = makeAwaitBothGate(done);
                                 sub.subscription = querySubItems().streamDocs().pipe(rxjs$1.filter(function(x) {
                                     return x.docs.length < allSubItems.length;
                                 })).subscribe(function(results) {
-                                    deleteSeen = true;
                                     expect(results.docs.length).toBe(allSubItems.length - itemsToRemove);
-                                    tryComplete();
+                                    gate.setSeen();
                                 });
                                 void allSubItems[0].accessor.exists().then(function(exists) {
                                     expect(exists).toBe(true);
                                     // remove one item
                                     return allSubItems[0].accessor.delete().then(function() {
-                                        deleteCompleted = true;
-                                        tryComplete();
+                                        gate.setCompleted();
                                     });
                                 });
                             }));
@@ -6444,20 +6527,13 @@ function _ts_generator$3(thisArg, body) {
                     sub.destroy();
                 });
                 it('should emit when the query results update (an item is added).', test.callbackTest(function(done) {
-                    var tryComplete = function tryComplete() {
-                        if (addSeen && addCompleted) {
-                            done();
-                        }
-                    };
                     var itemsToAdd = 1;
-                    var addCompleted = false;
-                    var addSeen = false;
+                    var gate = makeAwaitBothGate(done);
                     sub.subscription = queryDocument().streamDocs().pipe(rxjs$1.filter(function(documents) {
                         return documents.length > items.length;
                     })).subscribe(function(documents) {
-                        addSeen = true;
                         expect(documents.length).toBe(items.length + itemsToAdd);
-                        tryComplete();
+                        gate.setSeen();
                     });
                     // add one item
                     void util.waitForMs(10).then(function() {
@@ -6470,32 +6546,23 @@ function _ts_generator$3(thisArg, body) {
                                 };
                             }
                         }).then(function() {
-                            addCompleted = true;
-                            tryComplete();
+                            gate.setCompleted();
                         });
                     });
                 }));
                 it('should emit when the query results update (an item is removed).', test.callbackTest(function(done) {
-                    var tryComplete = function tryComplete() {
-                        if (deleteSeen && deleteCompleted) {
-                            done();
-                        }
-                    };
                     var itemsToRemove = 1;
-                    var deleteCompleted = false;
-                    var deleteSeen = false;
+                    var gate = makeAwaitBothGate(done);
                     sub.subscription = queryDocument().streamDocs().pipe(rxjs$1.skip(1)).subscribe(function(documents) {
-                        deleteSeen = true;
                         expect(documents.length).toBe(items.length - itemsToRemove);
-                        tryComplete();
+                        gate.setSeen();
                     });
                     void util.waitForMs(10).then(function() {
                         return items[0].exists().then(function(exists) {
                             expect(exists).toBe(true);
                             // remove one item
                             return items[0].accessor.delete().then(function() {
-                                deleteCompleted = true;
-                                tryComplete();
+                                gate.setCompleted();
                             });
                         });
                     });
@@ -6510,18 +6577,11 @@ function _ts_generator$3(thisArg, body) {
                     sub.destroy();
                 });
                 it('should emit when the query results update (an item is added).', test.callbackTest(function(done) {
-                    var tryComplete = function tryComplete() {
-                        if (addSeen && addCompleted) {
-                            done();
-                        }
-                    };
                     var itemsToAdd = 1;
-                    var addCompleted = false;
-                    var addSeen = false;
+                    var gate = makeAwaitBothGate(done);
                     sub.subscription = queryDocument().streamDocSnapshotDataPairs().pipe(rxjs$1.filter(function(documents) {
                         return documents.length > items.length;
                     })).subscribe(function(documents) {
-                        addSeen = true;
                         expect(documents.length).toBe(items.length + itemsToAdd);
                         documents.forEach(function(x) {
                             // validate each document returned
@@ -6533,7 +6593,7 @@ function _ts_generator$3(thisArg, body) {
                             expect(x.snapshot.ref).toBeDefined();
                             expect(x.snapshot.id).toBe(x.document.id);
                         });
-                        tryComplete();
+                        gate.setSeen();
                     });
                     // add one item
                     void util.waitForMs(10).then(function() {
@@ -6546,32 +6606,23 @@ function _ts_generator$3(thisArg, body) {
                                 };
                             }
                         }).then(function() {
-                            addCompleted = true;
-                            tryComplete();
+                            gate.setCompleted();
                         });
                     });
                 }));
                 it('should emit when the query results update (an item is removed).', test.callbackTest(function(done) {
-                    var tryComplete = function tryComplete() {
-                        if (deleteSeen && deleteCompleted) {
-                            done();
-                        }
-                    };
                     var itemsToRemove = 1;
-                    var deleteCompleted = false;
-                    var deleteSeen = false;
+                    var gate = makeAwaitBothGate(done);
                     sub.subscription = queryDocument().streamDocs().pipe(rxjs$1.skip(1)).subscribe(function(documents) {
-                        deleteSeen = true;
                         expect(documents.length).toBe(items.length - itemsToRemove);
-                        tryComplete();
+                        gate.setSeen();
                     });
                     void util.waitForMs(10).then(function() {
                         return items[0].exists().then(function(exists) {
                             expect(exists).toBe(true);
                             // remove one item
                             return items[0].accessor.delete().then(function() {
-                                deleteCompleted = true;
-                                tryComplete();
+                                gate.setCompleted();
                             });
                         });
                     });
@@ -6599,20 +6650,13 @@ function _ts_generator$3(thisArg, body) {
                     sub.destroy();
                 });
                 it('should emit when the query results update (an item is added).', test.callbackTest(function(done) {
-                    var tryComplete = function tryComplete() {
-                        if (addSeen && addCompleted) {
-                            done();
-                        }
-                    };
                     var itemsToAdd = 1;
-                    var addCompleted = false;
-                    var addSeen = false;
+                    var gate = makeAwaitBothGate(done);
                     sub.subscription = query().streamDocs().pipe(rxjs$1.filter(function(x) {
                         return x.docs.length > items.length;
                     })).subscribe(function(results) {
-                        addSeen = true;
                         expect(results.docs.length).toBe(items.length + itemsToAdd);
-                        tryComplete();
+                        gate.setSeen();
                     });
                     // add one item
                     void util.waitForMs(10).then(function() {
@@ -6625,32 +6669,23 @@ function _ts_generator$3(thisArg, body) {
                                 };
                             }
                         }).then(function() {
-                            addCompleted = true;
-                            tryComplete();
+                            gate.setCompleted();
                         });
                     });
                 }));
                 it('should emit when the query results update (an item is removed).', test.callbackTest(function(done) {
-                    var tryComplete = function tryComplete() {
-                        if (deleteSeen && deleteCompleted) {
-                            done();
-                        }
-                    };
                     var itemsToRemove = 1;
-                    var deleteCompleted = false;
-                    var deleteSeen = false;
+                    var gate = makeAwaitBothGate(done);
                     sub.subscription = query().streamDocs().pipe(rxjs$1.skip(1)).subscribe(function(results) {
-                        deleteSeen = true;
                         expect(results.docs.length).toBe(items.length - itemsToRemove);
-                        tryComplete();
+                        gate.setSeen();
                     });
                     void util.waitForMs(10).then(function() {
                         return items[0].accessor.exists().then(function(exists) {
                             expect(exists).toBe(true);
                             // remove one item
                             return items[0].accessor.delete().then(function() {
-                                deleteCompleted = true;
-                                tryComplete();
+                                gate.setCompleted();
                             });
                         });
                     });