@dereekb/firebase 10.2.0 → 11.0.0

package/test/src/lib/common/firestore/test.driver.query.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.describeFirestoreQueryDriverTests = void 0;
-const tslib_1 = require("tslib");
 const date_fns_1 = require("date-fns");
 const test_1 = require("@dereekb/util/test");
 const rxjs_1 = require("@dereekb/rxjs");
@@ -22,8 +21,8 @@ function describeFirestoreQueryDriverTests(f) {
         const startDate = (0, date_fns_1.addDays)((0, date_fns_1.startOfDay)(new Date()), 1);
         const EVEN_TAG = 'even';
         const ODD_TAG = 'odd';
-        beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-            items = yield (0, firebase_1.makeDocuments)(f.instance.firestoreCollection.documentAccessor(), {
+        beforeEach(async () => {
+            items = await (0, firebase_1.makeDocuments)(f.instance.firestoreCollection.documentAccessor(), {
                 count: testDocumentCount,
                 init: (i) => {
                     return {
@@ -35,20 +34,20 @@ function describeFirestoreQueryDriverTests(f) {
                     };
                 }
             });
-        }));
+        });
         describe('firestoreIdBatchVerifierFactory()', () => {
             const mockItemIdBatchVerifier = (0, firebase_1.firestoreIdBatchVerifierFactory)({
                 readKeys: (x) => [x.id],
                 fieldToQuery: '_id'
             });
-            it('should query on the id field.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            it('should query on the id field.', async () => {
                 const takenIds = items.map((x) => x.id);
-                const result = yield f.instance.mockItemCollection.queryDocument((0, firebase_1.whereDocumentId)('in', takenIds)).getDocs();
+                const result = await f.instance.mockItemCollection.queryDocument((0, firebase_1.whereDocumentId)('in', takenIds)).getDocs();
                 expect(result).toBeDefined();
                 expect(result.length).toBe(takenIds.length);
                 expect(result.map((x) => x.id)).toContain(takenIds[0]);
-            }));
-            it('should return ids that are not taken.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            });
+            it('should return ids that are not taken.', async () => {
                 const takenIds = items.map((x) => x.id);
                 const idFactory = (0, util_1.arrayFactory)((0, util_1.mapGetter)((0, util_1.randomNumberFactory)(10000000), (x) => `test-id-${x}`));
                 const random = (0, util_1.randomFromArrayFactory)(takenIds);
@@ -60,18 +59,18 @@ function describeFirestoreQueryDriverTests(f) {
                     }
                 });
                 const idsToMake = 30;
-                const result = yield factory(idsToMake);
+                const result = await factory(idsToMake);
                 expect(result).toBeDefined();
                 expect((0, util_1.unique)(result).length).toBe(idsToMake);
                 expect((0, util_1.unique)(result, takenIds).length).toBe(idsToMake);
-            }));
+            });
         });
         describe('mockItemUser', () => {
             let testUserId;
             let allMockUserItems;
-            beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            beforeEach(async () => {
                 testUserId = 'userid' + Math.ceil(Math.random() * 100000);
-                const results = yield Promise.all(items.map((parent) => (0, firebase_1.makeDocuments)(f.instance.mockItemUserCollection(parent).documentAccessor(), {
+                const results = await Promise.all(items.map((parent) => (0, firebase_1.makeDocuments)(f.instance.mockItemUserCollection(parent).documentAccessor(), {
                     count: 1,
                     newDocument: (x) => x.loadDocumentForId(testUserId),
                     init: (i) => {
@@ -82,22 +81,22 @@ function describeFirestoreQueryDriverTests(f) {
                     }
                 })));
                 allMockUserItems = results.flat();
-            }));
+            });
             describe('utils', () => {
                 describe('iterate load firestore utilities', () => {
                     describe('loadAllFirestoreDocumentSnapshotPairs()', () => {
-                        it('should iterate batches of snapshot pairs.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should iterate batches of snapshot pairs.', async () => {
                             const documentAccessor = f.instance.mockItemUserCollectionGroup.documentAccessor();
                             const mockUserItemsVisited = new Set();
-                            const result = yield (0, firebase_1.loadAllFirestoreDocumentSnapshotPairs)({
+                            const result = await (0, firebase_1.loadAllFirestoreDocumentSnapshotPairs)({
                                 documentAccessor,
-                                iterateSnapshotPairsBatch: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                iterateSnapshotPairsBatch: async (x) => {
                                     x.forEach((y) => mockUserItemsVisited.add(y.document.key));
                                     const pair = x[0];
                                     expect(pair.data).toBeDefined();
                                     expect(pair.snapshot).toBeDefined();
                                     expect(pair.document).toBeDefined();
-                                }),
+                                },
                                 queryFactory: f.instance.mockItemUserCollectionGroup,
                                 constraintsFactory: [] // no constraints
                             });
@@ -107,18 +106,18 @@ function describeFirestoreQueryDriverTests(f) {
                             expect(result.snapshotPairs[0].data).toBeDefined();
                             expect(result.snapshotPairs[0].document).toBeDefined();
                             expect(result.snapshotPairs[0].snapshot).toBeDefined();
-                        }));
+                        });
                     });
                     describe('loadAllFirestoreDocumentSnapshot()', () => {
-                        it('should iterate batches of snapshot pairs.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should iterate batches of snapshot pairs.', async () => {
                             const mockUserItemsVisited = new Set();
-                            const result = yield (0, firebase_1.loadAllFirestoreDocumentSnapshot)({
-                                iterateSnapshotsForCheckpoint: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            const result = await (0, firebase_1.loadAllFirestoreDocumentSnapshot)({
+                                iterateSnapshotsForCheckpoint: async (x) => {
                                     x.forEach((y) => mockUserItemsVisited.add(y.ref.path));
                                     const snapshot = x[0];
                                     expect(snapshot.ref).toBeDefined();
                                     expect(snapshot.data()).toBeDefined();
-                                }),
+                                },
                                 queryFactory: f.instance.mockItemUserCollectionGroup,
                                 constraintsFactory: [] // no constraints
                             });
@@ -127,22 +126,22 @@ function describeFirestoreQueryDriverTests(f) {
                             expect(result.snapshots.length).toBe(allMockUserItems.length);
                             expect(result.snapshots[0].ref).toBeDefined();
                             expect(result.snapshots[0].data()).toBeDefined();
-                        }));
+                        });
                     });
                 });
                 describe('iterate firestore utilities', () => {
                     describe('iterateFirestoreDocumentSnapshotPairs()', () => {
-                        it('should iterate across all mock users by each snapshot pair.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should iterate across all mock users by each snapshot pair.', async () => {
                             const documentAccessor = f.instance.mockItemUserCollectionGroup.documentAccessor();
                             const mockUserItemsVisited = new Set();
                             const batchSize = 2;
-                            const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotPairs)({
+                            const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotPairs)({
                                 batchSize,
                                 handleRepeatCursor: false,
-                                filterCheckpointSnapshots: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                filterCheckpointSnapshots: async (x) => {
                                     return x;
-                                }),
-                                iterateSnapshotPair: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                },
+                                iterateSnapshotPair: async (x) => {
                                     expect(x.data).toBeDefined();
                                     expect(x.snapshot).toBeDefined();
                                     expect(x.document).toBeDefined();
@@ -153,32 +152,32 @@ function describeFirestoreQueryDriverTests(f) {
                                     else {
                                         mockUserItemsVisited.add(key);
                                     }
-                                }),
-                                useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                },
+                                useCheckpointResult: async (x) => {
                                     if (x.docSnapshots.length > 0) {
                                         expect(x.results[0].snapshots.length).toBeLessThanOrEqual(batchSize);
                                     }
-                                }),
+                                },
                                 documentAccessor,
                                 queryFactory: f.instance.mockItemUserCollectionGroup,
                                 constraintsFactory: [] // no constraints
                             });
                             expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
                             expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
-                        }));
+                        });
                         describe('1 item exists', () => {
                             let onlyItem;
-                            beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            beforeEach(async () => {
                                 onlyItem = allMockUserItems.pop();
-                                yield Promise.all(allMockUserItems.map((x) => x.accessor.delete()));
+                                await Promise.all(allMockUserItems.map((x) => x.accessor.delete()));
                                 allMockUserItems = [onlyItem];
-                            }));
-                            it('should iterate the single item', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            });
+                            it('should iterate the single item', async () => {
                                 const documentAccessor = f.instance.mockItemUserCollectionGroup.documentAccessor();
                                 const mockUserItemsVisited = new Set();
                                 expect(allMockUserItems).toHaveLength(1);
-                                const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotPairs)({
-                                    iterateSnapshotPair: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotPairs)({
+                                    iterateSnapshotPair: async (x) => {
                                         expect(x.data).toBeDefined();
                                         expect(x.snapshot).toBeDefined();
                                         expect(x.document).toBeDefined();
@@ -189,7 +188,7 @@ function describeFirestoreQueryDriverTests(f) {
                                         else {
                                             mockUserItemsVisited.add(key);
                                         }
-                                    }),
+                                    },
                                     documentAccessor,
                                     queryFactory: f.instance.mockItemUserCollectionGroup,
                                     batchSize: null,
@@ -202,8 +201,8 @@ function describeFirestoreQueryDriverTests(f) {
                                 });
                                 expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
                                 expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
-                            }));
-                            // TODO: Case where a document was visited twice via iteration after it was updated. Assumed
+                            });
+                            // TODO(TEST): Case where a document was visited twice via iteration after it was updated. Assumed
                             // to occur when the updated item matches an "or" case or other value when using "in". Cannot
                             // reproduce at the moment.
                             /*
@@ -252,14 +251,14 @@ function describeFirestoreQueryDriverTests(f) {
                             */
                         });
                         describe('0 items exists', () => {
-                            beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                yield Promise.all(allMockUserItems.map((x) => x.accessor.delete()));
-                            }));
-                            it('should iterate no items', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            beforeEach(async () => {
+                                await Promise.all(allMockUserItems.map((x) => x.accessor.delete()));
+                            });
+                            it('should iterate no items', async () => {
                                 const documentAccessor = f.instance.mockItemUserCollectionGroup.documentAccessor();
                                 const mockUserItemsVisited = new Set();
-                                const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotPairs)({
-                                    iterateSnapshotPair: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotPairs)({
+                                    iterateSnapshotPair: async (x) => {
                                         expect(x.data).toBeDefined();
                                         expect(x.snapshot).toBeDefined();
                                         expect(x.document).toBeDefined();
@@ -270,24 +269,24 @@ function describeFirestoreQueryDriverTests(f) {
                                         else {
                                             mockUserItemsVisited.add(key);
                                         }
-                                    }),
+                                    },
                                     documentAccessor,
                                     queryFactory: f.instance.mockItemUserCollectionGroup,
                                     constraintsFactory: [] // no constraints
                                 });
                                 expect(result.totalSnapshotsVisited).toBe(0);
                                 expect(mockUserItemsVisited.size).toBe(0);
-                            }));
+                            });
                         });
                     });
                     describe('iterateFirestoreDocumentSnapshots()', () => {
-                        it('should iterate across all mock users by each snapshot.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should iterate across all mock users by each snapshot.', async () => {
                             const documentAccessor = f.instance.mockItemUserCollectionGroup.documentAccessor();
                             const mockUserItemsVisited = new Set();
                             const batchSize = 2;
-                            const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshots)({
+                            const result = await (0, firebase_1.iterateFirestoreDocumentSnapshots)({
                                 batchSize,
-                                iterateSnapshot: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                iterateSnapshot: async (x) => {
                                     const key = x.ref.path;
                                     if (mockUserItemsVisited.has(key)) {
                                         throw new Error('encountered repeat key');
@@ -295,145 +294,145 @@ function describeFirestoreQueryDriverTests(f) {
                                     else {
                                         mockUserItemsVisited.add(key);
                                     }
-                                }),
-                                useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                },
+                                useCheckpointResult: async (x) => {
                                     if (x.docSnapshots.length > 0) {
                                         expect(x.results[0].snapshots.length).toBeLessThanOrEqual(batchSize);
                                     }
-                                }),
+                                },
                                 queryFactory: f.instance.mockItemUserCollectionGroup,
                                 constraintsFactory: [] // no constraints
                             });
                             expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
                             expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
-                        }));
+                        });
                     });
                     describe('iterateFirestoreDocumentSnapshotPairBatches()', () => {
-                        it('should iterate batches of snapshot pairs.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should iterate batches of snapshot pairs.', async () => {
                             const documentAccessor = f.instance.mockItemUserCollectionGroup.documentAccessor();
                             const mockUserItemsVisited = new Set();
                             const batchSize = 2;
-                            const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotPairBatches)({
+                            const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotPairBatches)({
                                 documentAccessor,
                                 batchSize,
-                                iterateSnapshotPairsBatch: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                iterateSnapshotPairsBatch: async (x) => {
                                     expect(x.length).toBeLessThanOrEqual(batchSize);
                                     const pair = x[0];
                                     expect(pair.data).toBeDefined();
                                     expect(pair.snapshot).toBeDefined();
                                     expect(pair.document).toBeDefined();
-                                }),
-                                useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                },
+                                useCheckpointResult: async (x) => {
                                     x.docSnapshots.forEach((y) => mockUserItemsVisited.add(y.ref.path));
-                                }),
+                                },
                                 queryFactory: f.instance.mockItemUserCollectionGroup,
                                 constraintsFactory: [] // no constraints
                             });
                             expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
                             expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
-                        }));
+                        });
                     });
                     describe('iterateFirestoreDocumentSnapshotBatches()', () => {
-                        it('should iterate batches of snapshots.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should iterate batches of snapshots.', async () => {
                             const mockUserItemsVisited = new Set();
                             const batchSize = 2;
-                            const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
+                            const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
                                 batchSize,
-                                iterateSnapshotBatch: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                iterateSnapshotBatch: async (x) => {
                                     expect(x.length).toBeLessThanOrEqual(batchSize);
-                                }),
-                                useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                },
+                                useCheckpointResult: async (x) => {
                                     x.docSnapshots.forEach((y) => mockUserItemsVisited.add(y.ref.path));
-                                }),
+                                },
                                 queryFactory: f.instance.mockItemUserCollectionGroup,
                                 constraintsFactory: [] // no constraints
                             });
                             expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
                             expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
-                        }));
+                        });
                         describe('limitPerCheckpoint', () => {
                             describe('limitPerCheckpoint = 0', () => {
-                                it('should not iterate any batches', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
+                                it('should not iterate any batches', async () => {
+                                    const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
                                         limitPerCheckpoint: 0,
-                                        iterateSnapshotBatch: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                        iterateSnapshotBatch: async (x) => {
                                             expect(x.length).toBe(0);
-                                        }),
-                                        useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                        },
+                                        useCheckpointResult: async (x) => {
                                             expect(x.docSnapshots.length).toBe(0);
-                                        }),
+                                        },
                                         queryFactory: f.instance.mockItemUserCollectionGroup,
                                         constraintsFactory: [] // no constraints
                                     });
                                     expect(result.totalSnapshotsVisited).toBe(0);
                                     expect(result.totalSnapshotsLimitReached).toBe(true);
-                                }));
+                                });
                             });
                         });
                         describe('maxParallelCheckpoints>1', () => {
-                            it('should process the checkpoints in parallel.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            it('should process the checkpoints in parallel.', async () => {
                                 const mockUserItemsVisited = new Set();
                                 const batchSize = 1;
                                 const maxParallelCheckpoints = 4;
                                 let currentRunningTasks = 0;
                                 let maxRunningTasks = 0;
-                                const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
+                                const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
                                     batchSize,
                                     limitPerCheckpoint: 1,
                                     maxParallelCheckpoints,
-                                    iterateSnapshotBatch: (x, batchIndex) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                    iterateSnapshotBatch: async (x, batchIndex) => {
                                         currentRunningTasks += 1;
-                                        yield (0, util_1.waitForMs)(1000);
+                                        await (0, util_1.waitForMs)(1000);
                                         maxRunningTasks = Math.max(maxRunningTasks, currentRunningTasks);
                                         currentRunningTasks -= 1;
-                                    }),
-                                    useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                    },
+                                    useCheckpointResult: async (x) => {
                                         x.docSnapshots.forEach((y) => mockUserItemsVisited.add(y.ref.path));
-                                    }),
+                                    },
                                     queryFactory: f.instance.mockItemUserCollectionGroup,
                                     constraintsFactory: [] // no constraints
                                 });
                                 expect(maxRunningTasks).toBe(maxParallelCheckpoints);
                                 expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
                                 expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
-                            }));
+                            });
                         });
                         describe('batchSize=null', () => {
-                            it('should iterate with a single batch', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            it('should iterate with a single batch', async () => {
                                 const mockUserItemsVisited = new Set();
                                 const batchSize = null;
-                                const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
+                                const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
                                     batchSize,
-                                    iterateSnapshotBatch: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                    iterateSnapshotBatch: async (x) => {
                                         expect(x.length).toBe(allMockUserItems.length);
-                                    }),
-                                    useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                    },
+                                    useCheckpointResult: async (x) => {
                                         x.docSnapshots.forEach((y) => mockUserItemsVisited.add(y.ref.path));
-                                    }),
+                                    },
                                     queryFactory: f.instance.mockItemUserCollectionGroup,
                                     constraintsFactory: [] // no constraints
                                 });
                                 expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
                                 expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
-                            }));
+                            });
                         });
                         describe('batchSizeForSnapshots: () => null', () => {
-                            it('should iterate with a single batch', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            it('should iterate with a single batch', async () => {
                                 const mockUserItemsVisited = new Set();
-                                const result = yield (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
+                                const result = await (0, firebase_1.iterateFirestoreDocumentSnapshotBatches)({
                                     batchSizeForSnapshots: () => null,
-                                    iterateSnapshotBatch: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                    iterateSnapshotBatch: async (x) => {
                                         expect(x.length).toBe(allMockUserItems.length);
-                                    }),
-                                    useCheckpointResult: (x) => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                    },
+                                    useCheckpointResult: async (x) => {
                                         x.docSnapshots.forEach((y) => mockUserItemsVisited.add(y.ref.path));
-                                    }),
+                                    },
                                     queryFactory: f.instance.mockItemUserCollectionGroup,
                                     constraintsFactory: [] // no constraints
                                 });
                                 expect(result.totalSnapshotsVisited).toBe(allMockUserItems.length);
                                 expect(mockUserItemsVisited.size).toBe(allMockUserItems.length);
-                            }));
+                            });
                         });
                     });
                 });
@@ -442,13 +441,13 @@ function describeFirestoreQueryDriverTests(f) {
                 describe('query', () => {
                     describe('constraints', () => {
                         describe('where', () => {
-                            it('should return the documents matching the input uid', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                const result = yield f.instance.mockItemUserCollectionGroup.query((0, firebase_1.where)('uid', '==', testUserId)).getDocs();
+                            it('should return the documents matching the input uid', async () => {
+                                const result = await f.instance.mockItemUserCollectionGroup.query((0, firebase_1.where)('uid', '==', testUserId)).getDocs();
                                 expect(result.docs.length).toBe(testDocumentCount);
                                 result.docs.forEach((x) => {
                                     expect(x.data().uid).toBe(testUserId);
                                 });
-                            }));
+                            });
                         });
                     });
                 });
@@ -460,10 +459,10 @@ function describeFirestoreQueryDriverTests(f) {
             let parentA;
             let querySubItems;
             let allSubItems;
-            beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            beforeEach(async () => {
                 querySubItems = f.instance.mockItemSubItemCollectionGroup.query;
                 parentA = items[0];
-                const results = yield Promise.all(items.map((parent) => (0, firebase_1.makeDocuments)(f.instance.mockItemSubItemCollection(parent).documentAccessor(), {
+                const results = await Promise.all(items.map((parent) => (0, firebase_1.makeDocuments)(f.instance.mockItemSubItemCollection(parent).documentAccessor(), {
                     count: subItemCountPerItem,
                     init: (i) => {
                         return {
@@ -472,7 +471,7 @@ function describeFirestoreQueryDriverTests(f) {
                     }
                 })));
                 allSubItems = results.flat();
-            }));
+            });
             describe('sub sub item', () => {
                 const deepSubItemCountPerItem = 1;
                 const totalDeepSubItemsCount = deepSubItemCountPerItem * totalSubItemsCount;
@@ -480,10 +479,10 @@ function describeFirestoreQueryDriverTests(f) {
                 let deepSubItemParentA;
                 let queryDeepSubItems;
                 let allDeepSubItems;
-                beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                beforeEach(async () => {
                     queryDeepSubItems = f.instance.mockItemSubItemDeepCollectionGroup.query;
                     deepSubItemParentA = allSubItems[0];
-                    const results = yield Promise.all(allSubItems.map((parent) => (0, firebase_1.makeDocuments)(f.instance.mockItemSubItemDeepCollection(parent).documentAccessor(), {
+                    const results = await Promise.all(allSubItems.map((parent) => (0, firebase_1.makeDocuments)(f.instance.mockItemSubItemDeepCollection(parent).documentAccessor(), {
                         count: deepSubItemCountPerItem,
                         init: (i) => {
                             return {
@@ -492,36 +491,36 @@ function describeFirestoreQueryDriverTests(f) {
                         }
                     })));
                     allDeepSubItems = results.flat();
-                }));
+                });
                 // tests querying for all nested items under a parent
-                it('querying for only items belonging to mock item parentA', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const result = yield queryDeepSubItems((0, mock_1.allChildMockItemSubItemDeepsWithinMockItem)(parentA.documentRef)).getDocs();
+                it('querying for only items belonging to mock item parentA', async () => {
+                    const result = await queryDeepSubItems((0, mock_1.allChildMockItemSubItemDeepsWithinMockItem)(parentA.documentRef)).getDocs();
                     expect(result.docs.length).toBe(totalDeepSubItemsPerMockItem);
-                    result.docs.forEach((x) => { var _a, _b, _c, _d; return expect((_d = (_c = (_b = (_a = x.ref.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.parent) === null || _c === void 0 ? void 0 : _c.parent) === null || _d === void 0 ? void 0 : _d.path).toBe(parentA.documentRef.path); });
-                }));
-                // TODO: Add tests for allChildDocumentsUnderRelativePath
+                    result.docs.forEach((x) => expect(x.ref.parent?.parent?.parent?.parent?.path).toBe(parentA.documentRef.path));
+                });
+                // TODO(TEST): Add tests for allChildDocumentsUnderRelativePath
             });
             describe('sub item', () => {
                 describe('collection group', () => {
                     describe('query', () => {
-                        it('should return sub items', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                            const result = yield querySubItems().getDocs();
+                        it('should return sub items', async () => {
+                            const result = await querySubItems().getDocs();
                             expect(result.docs.length).toBe(totalSubItemsCount);
-                        }));
+                        });
                         describe('constraints', () => {
                             describe('where', () => {
-                                it('should return the documents matching the query.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                it('should return the documents matching the query.', async () => {
                                     const value = 0;
-                                    const result = yield querySubItems((0, firebase_1.where)('value', '==', value)).getDocs();
+                                    const result = await querySubItems((0, firebase_1.where)('value', '==', value)).getDocs();
                                     expect(result.docs.length).toBe(testDocumentCount);
                                     expect(result.docs[0].data().value).toBe(value);
                                     const ref = result.docs[0].ref;
                                     expect(ref).toBeDefined();
                                     expect(ref.parent).toBeDefined();
-                                }));
+                                });
                             });
                             describe('whereDocumentId', () => {
-                                (0, test_1.itShouldFail)('to query on collection groups.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                                (0, test_1.itShouldFail)('to query on collection groups.', async () => {
                                     // https://stackoverflow.com/questions/56149601/firestore-collection-group-query-on-documentid
                                     const targetId = 'targetid';
                                     /*
@@ -539,8 +538,8 @@ function describeFirestoreQueryDriverTests(f) {
                                       )
                                     );
                                     */
-                                    yield (0, test_1.expectFail)(() => querySubItems((0, firebase_1.whereDocumentId)('==', targetId)).getDocs());
-                                }));
+                                    await (0, test_1.expectFail)(() => querySubItems((0, firebase_1.whereDocumentId)('==', targetId)).getDocs());
+                                });
                             });
                         });
                         describe('streamDocs()', () => {
@@ -614,17 +613,16 @@ function describeFirestoreQueryDriverTests(f) {
         });
         describe('queryDocument', () => {
             let queryDocument;
-            beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            beforeEach(async () => {
                 queryDocument = f.instance.firestoreCollection.queryDocument;
-            }));
+            });
             describe('filter()', () => {
-                it('should apply the filter to the query', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const results = (yield queryDocument().filter((0, firebase_1.where)('tags', 'array-contains', EVEN_TAG)).getDocSnapshotDataPairs());
+                it('should apply the filter to the query', async () => {
+                    const results = (await queryDocument().filter((0, firebase_1.where)('tags', 'array-contains', EVEN_TAG)).getDocSnapshotDataPairs());
                     expect(results).toBeDefined();
                     results.forEach((result) => {
-                        var _a;
                         expect(result.data).toBeDefined();
-                        expect((_a = result.data) === null || _a === void 0 ? void 0 : _a.tags).toContain(EVEN_TAG);
+                        expect(result.data?.tags).toContain(EVEN_TAG);
                         expect(result.document).toBeDefined();
                         expect(result.document instanceof mock_1.MockItemDocument).toBe(true);
                         expect(result.snapshot).toBeDefined();
@@ -632,16 +630,15 @@ function describeFirestoreQueryDriverTests(f) {
                         expect(result.snapshot.ref).toBeDefined();
                         expect(result.snapshot.id).toBe(result.document.id);
                     });
-                }));
-                it('should add more filters to the existing query', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const results = (yield queryDocument().filter((0, firebase_1.where)('tags', 'array-contains', EVEN_TAG)).filter((0, firebase_1.where)('number', '>=', 4)).getDocSnapshotDataPairs());
+                });
+                it('should add more filters to the existing query', async () => {
+                    const results = (await queryDocument().filter((0, firebase_1.where)('tags', 'array-contains', EVEN_TAG)).filter((0, firebase_1.where)('number', '>=', 4)).getDocSnapshotDataPairs());
                     expect(results).toBeDefined();
                     expect(results.length).toBe(1);
                     results.forEach((result) => {
-                        var _a, _b;
                         expect(result.data).toBeDefined();
-                        expect((_a = result.data) === null || _a === void 0 ? void 0 : _a.tags).toContain(EVEN_TAG);
-                        expect((_b = result.data) === null || _b === void 0 ? void 0 : _b.number).toBeGreaterThanOrEqual(4);
+                        expect(result.data?.tags).toContain(EVEN_TAG);
+                        expect(result.data?.number).toBeGreaterThanOrEqual(4);
                         expect(result.document).toBeDefined();
                         expect(result.document instanceof mock_1.MockItemDocument).toBe(true);
                         expect(result.snapshot).toBeDefined();
@@ -649,15 +646,15 @@ function describeFirestoreQueryDriverTests(f) {
                         expect(result.snapshot.ref).toBeDefined();
                         expect(result.snapshot.id).toBe(result.document.id);
                     });
-                }));
+                });
             });
             describe('getFirstDocSnapshotDataPair()', () => {
-                it('should return undefined if the query contains nothing', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const result = (yield queryDocument((0, firebase_1.where)('value', '==', '_DOES_NOT_EXIST_')).getFirstDocSnapshotDataPair());
+                it('should return undefined if the query contains nothing', async () => {
+                    const result = (await queryDocument((0, firebase_1.where)('value', '==', '_DOES_NOT_EXIST_')).getFirstDocSnapshotDataPair());
                     expect(result).not.toBeDefined();
-                }));
-                it('should return the first doc that matches if it exists', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const result = (yield queryDocument().getFirstDocSnapshotDataPair());
+                });
+                it('should return the first doc that matches if it exists', async () => {
+                    const result = (await queryDocument().getFirstDocSnapshotDataPair());
                     expect(result).toBeDefined();
                     expect(result.data).toBeDefined();
                     expect(result.document).toBeDefined();
@@ -666,16 +663,16 @@ function describeFirestoreQueryDriverTests(f) {
                     expect(result.snapshot.data()).toBeDefined();
                     expect(result.snapshot.ref).toBeDefined();
                     expect(result.snapshot.id).toBe(result.document.id);
-                }));
+                });
             });
             describe('getDocSnapshotDataPairs()', () => {
-                it('should return an empty array if the query returns nothing', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const result = yield queryDocument((0, firebase_1.where)('value', '==', '_DOES_NOT_EXIST_')).getDocSnapshotDataPairs();
+                it('should return an empty array if the query returns nothing', async () => {
+                    const result = await queryDocument((0, firebase_1.where)('value', '==', '_DOES_NOT_EXIST_')).getDocSnapshotDataPairs();
                     expect(result).toBeDefined();
                     expect(result.length).toBe(0);
-                }));
-                it('should return the matching results', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                    const results = yield queryDocument().getDocSnapshotDataPairs();
+                });
+                it('should return the matching results', async () => {
+                    const results = await queryDocument().getDocSnapshotDataPairs();
                     expect(results).toBeDefined();
                     expect(results.length).toBeGreaterThan(0);
                     results.forEach((result) => {
@@ -688,7 +685,7 @@ function describeFirestoreQueryDriverTests(f) {
                         expect(result.snapshot.ref).toBeDefined();
                         expect(result.snapshot.id).toBe(result.document.id);
                     });
-                }));
+                });
             });
             describe('streamDocs()', () => {
                 let sub;
@@ -835,9 +832,9 @@ function describeFirestoreQueryDriverTests(f) {
         });
         describe('query', () => {
             let query;
-            beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
+            beforeEach(async () => {
                 query = f.instance.firestoreCollection.query;
-            }));
+            });
             describe('streamDocs()', () => {
                 let sub;
                 beforeEach(() => {
@@ -906,13 +903,13 @@ function describeFirestoreQueryDriverTests(f) {
             });
             describe('constraint', () => {
                 describe('limit', () => {
-                    it('should limit the number of items returned.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should limit the number of items returned.', async () => {
                         const limitCount = 2;
-                        const unlimited = yield query().getDocs();
+                        const unlimited = await query().getDocs();
                         expect(unlimited.docs.length).toBe(testDocumentCount);
-                        const result = yield query((0, firebase_1.limit)(limitCount)).getDocs();
+                        const result = await query((0, firebase_1.limit)(limitCount)).getDocs();
                         expect(result.docs.length).toBe(limitCount);
-                    }));
+                    });
                     it('should limit the streamed results.', (done) => {
                         const limitCount = 2;
                         const resultObs = query((0, firebase_1.limit)(limitCount)).streamDocs();
@@ -923,35 +920,35 @@ function describeFirestoreQueryDriverTests(f) {
                             done();
                         });
                     });
-                    it('should limit the number of items counted.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should limit the number of items counted.', async () => {
                         const limitCount = 2;
-                        const unlimited = yield query().countDocs();
+                        const unlimited = await query().countDocs();
                         expect(unlimited).toBe(testDocumentCount);
-                        const result = yield query((0, firebase_1.limit)(limitCount)).countDocs();
+                        const result = await query((0, firebase_1.limit)(limitCount)).countDocs();
                         expect(result).toBe(limitCount);
-                    }));
+                    });
                 });
                 describe('limitToLast', () => {
-                    it('should limit the number of items returned.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should limit the number of items returned.', async () => {
                         const limitCount = 2;
-                        const unlimited = yield query().getDocs();
+                        const unlimited = await query().getDocs();
                         expect(unlimited.docs.length).toBe(testDocumentCount);
-                        const result = yield query((0, firebase_1.orderBy)('value'), (0, firebase_1.limitToLast)(limitCount)).getDocs();
+                        const result = await query((0, firebase_1.orderBy)('value'), (0, firebase_1.limitToLast)(limitCount)).getDocs();
                         expect(result.docs.length).toBe(limitCount);
-                    }));
-                    it('the results should be returned from the end of the list. The results are still in the same order as requested.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    });
+                    it('the results should be returned from the end of the list. The results are still in the same order as requested.', async () => {
                         const limitCount = 2;
-                        const result = yield query((0, firebase_1.orderBy)('value', 'asc'), (0, firebase_1.limitToLast)(limitCount)).getDocs();
+                        const result = await query((0, firebase_1.orderBy)('value', 'asc'), (0, firebase_1.limitToLast)(limitCount)).getDocs();
                         expect(result.docs.length).toBe(limitCount);
                         expect(result.docs[0].data().value).toBe('3');
                         expect(result.docs[1].data().value).toBe('4');
-                    }));
-                    (0, test_1.itShouldFail)('if orderby is not provided.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    });
+                    (0, test_1.itShouldFail)('if orderby is not provided.', async () => {
                         const limitCount = 2;
-                        const unlimited = yield query().getDocs();
+                        const unlimited = await query().getDocs();
                         expect(unlimited.docs.length).toBe(testDocumentCount);
-                        yield (0, test_1.expectFail)(() => query((0, firebase_1.limitToLast)(limitCount)).getDocs());
-                    }));
+                        await (0, test_1.expectFail)(() => query((0, firebase_1.limitToLast)(limitCount)).getDocs());
+                    });
                     it('should stream results.', (done) => {
                         const limitCount = 2;
                         const resultObs = query((0, firebase_1.orderBy)('value'), (0, firebase_1.limitToLast)(limitCount)).streamDocs();
@@ -962,58 +959,58 @@ function describeFirestoreQueryDriverTests(f) {
                             done();
                         });
                     });
-                    it('should limit the number of items counted.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should limit the number of items counted.', async () => {
                         const limitCount = 2;
-                        const unlimited = yield query().countDocs();
+                        const unlimited = await query().countDocs();
                         expect(unlimited).toBe(testDocumentCount);
-                        const result = yield query((0, firebase_1.orderBy)('value'), (0, firebase_1.limitToLast)(limitCount)).countDocs();
+                        const result = await query((0, firebase_1.orderBy)('value'), (0, firebase_1.limitToLast)(limitCount)).countDocs();
                         expect(result).toBe(limitCount);
-                    }));
+                    });
                 });
                 describe('orderBy', () => {
-                    it('should return values sorted in ascending order.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        const results = yield query((0, firebase_1.orderBy)('value', 'asc')).getDocs();
+                    it('should return values sorted in ascending order.', async () => {
+                        const results = await query((0, firebase_1.orderBy)('value', 'asc')).getDocs();
                         expect(results.docs[0].data().value).toBe('0');
-                    }));
-                    it('should return values sorted in descending order.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                        const results = yield query((0, firebase_1.orderBy)('value', 'desc')).getDocs();
+                    });
+                    it('should return values sorted in descending order.', async () => {
+                        const results = await query((0, firebase_1.orderBy)('value', 'desc')).getDocs();
                         expect(results.docs[0].data().value).toBe(`${items.length - 1}`);
-                    }));
+                    });
                 });
                 describe('where', () => {
                     describe('==', () => {
-                        it('should return the documents matching the query.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should return the documents matching the query.', async () => {
                             const value = '0';
-                            const result = yield query((0, firebase_1.where)('value', '==', value)).getDocs();
+                            const result = await query((0, firebase_1.where)('value', '==', value)).getDocs();
                             expect(result.docs.length).toBe(1);
                             expect(result.docs[0].data().value).toBe(value);
-                        }));
-                        it('should return the count of the documents matching the query.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        });
+                        it('should return the count of the documents matching the query.', async () => {
                             const value = '0';
-                            const result = yield query((0, firebase_1.where)('value', '==', value)).countDocs();
+                            const result = await query((0, firebase_1.where)('value', '==', value)).countDocs();
                             expect(result).toBe(1);
-                        }));
+                        });
                     });
                     describe('in', () => {
-                        it('should return the documents with any of the input values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should return the documents with any of the input values.', async () => {
                             const targetValue = ['0', '1', '2'];
-                            const result = yield query((0, firebase_1.where)('value', 'in', targetValue)).getDocs();
+                            const result = await query((0, firebase_1.where)('value', 'in', targetValue)).getDocs();
                             expect(result.docs.length).toBe(3);
                             const values = result.docs.map((x) => x.data().value);
                             expect(values).toContain('0');
                             expect(values).toContain('1');
                             expect(values).toContain('2');
-                        }));
-                        it('should return the count of documents with any of the input values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        });
+                        it('should return the count of documents with any of the input values.', async () => {
                             const targetValue = ['0', '1', '2'];
-                            const result = yield query((0, firebase_1.where)('value', 'in', targetValue)).countDocs();
+                            const result = await query((0, firebase_1.where)('value', 'in', targetValue)).countDocs();
                             expect(result).toBe(3);
-                        }));
+                        });
                     });
                     describe('not-in', () => {
-                        it('should return the documents that do not contain any of the input values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        it('should return the documents that do not contain any of the input values.', async () => {
                             const targetValue = ['0', '1', '2'];
-                            const result = yield query((0, firebase_1.where)('value', 'not-in', targetValue)).getDocs();
+                            const result = await query((0, firebase_1.where)('value', 'not-in', targetValue)).getDocs();
                             expect(result.docs.length).toBe(2);
                             const values = result.docs.map((x) => x.data().value);
                             expect(values).not.toContain('0');
@@ -1021,63 +1018,63 @@ function describeFirestoreQueryDriverTests(f) {
                             expect(values).not.toContain('2');
                             expect(values).toContain('3');
                             expect(values).toContain('4');
-                        }));
-                        it('should return the count of documents that do not contain any of the input values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                        });
+                        it('should return the count of documents that do not contain any of the input values.', async () => {
                             const targetValue = ['0', '1', '2'];
-                            const result = yield query((0, firebase_1.where)('value', 'not-in', targetValue)).countDocs();
+                            const result = await query((0, firebase_1.where)('value', 'not-in', targetValue)).countDocs();
                             expect(result).toBe(2);
-                        }));
+                        });
                     });
                     describe('searching array values', () => {
                         describe('in', () => {
-                            it('should return the documents with arrays that only have the given values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            it('should return the documents with arrays that only have the given values.', async () => {
                                 // NOTE: we pass an array to match exactly
                                 const targetValue = [['0', 'even']];
-                                const result = yield query((0, firebase_1.where)('tags', 'in', targetValue)).getDocs();
+                                const result = await query((0, firebase_1.where)('tags', 'in', targetValue)).getDocs();
                                 expect(result.docs.length).toBe(1);
                                 expect(result.docs[0].data().value).toBe('0');
-                            }));
-                            it('should not return the document with arrays that have more than the requested values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            });
+                            it('should not return the document with arrays that have more than the requested values.', async () => {
                                 const targetValue = [['0']];
-                                const result = yield query((0, firebase_1.where)('tags', 'in', targetValue)).getDocs();
+                                const result = await query((0, firebase_1.where)('tags', 'in', targetValue)).getDocs();
                                 expect(result.docs.length).toBe(0);
-                            }));
-                            it('should return the count of documents with arrays that only have the given values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            });
+                            it('should return the count of documents with arrays that only have the given values.', async () => {
                                 // NOTE: we pass an array to match exactly
                                 const targetValue = [['0', 'even']];
-                                const result = yield query((0, firebase_1.where)('tags', 'in', targetValue)).countDocs();
+                                const result = await query((0, firebase_1.where)('tags', 'in', targetValue)).countDocs();
                                 expect(result).toBe(1);
-                            }));
+                            });
                         });
                         describe('array-contains', () => {
-                            it('should return the documents that contain the given value.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            it('should return the documents that contain the given value.', async () => {
                                 const targetValue = '0';
-                                const result = yield query((0, firebase_1.where)('tags', 'array-contains', targetValue)).getDocs();
+                                const result = await query((0, firebase_1.where)('tags', 'array-contains', targetValue)).getDocs();
                                 expect(result.docs.length).toBe(1);
                                 expect(result.docs[0].data().value).toBe('0');
-                            }));
-                            (0, test_1.itShouldFail)('if an array is passed to where with array-contains', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            });
+                            (0, test_1.itShouldFail)('if an array is passed to where with array-contains', async () => {
                                 const targetValues = ['0', 'even'];
-                                yield (0, test_1.expectFail)(() => query((0, firebase_1.where)('tags', 'array-contains', targetValues)).getDocs());
-                            }));
+                                await (0, test_1.expectFail)(() => query((0, firebase_1.where)('tags', 'array-contains', targetValues)).getDocs());
+                            });
                         });
                         describe('array-contains-any', () => {
-                            it('should return the documents that contain the given value, even if it is not passed as an array.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            it('should return the documents that contain the given value, even if it is not passed as an array.', async () => {
                                 const targetValues = 'even';
-                                const result = yield query((0, firebase_1.where)('tags', 'array-contains-any', targetValues)).getDocs();
+                                const result = await query((0, firebase_1.where)('tags', 'array-contains-any', targetValues)).getDocs();
                                 expect(result.docs.length).toBe(Math.floor(testDocumentCount / 2) + 1);
                                 result.docs.forEach((x) => {
                                     expect((0, util_1.isEvenNumber)(Number(x.data().value)));
                                 });
-                            }));
-                            it('should return the documents that contain any of the given values.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                            });
+                            it('should return the documents that contain any of the given values.', async () => {
                                 const targetValues = ['0', 'even'];
-                                const result = yield query((0, firebase_1.where)('tags', 'array-contains-any', targetValues)).getDocs();
+                                const result = await query((0, firebase_1.where)('tags', 'array-contains-any', targetValues)).getDocs();
                                 expect(result.docs.length).toBe(Math.floor(testDocumentCount / 2) + 1);
                                 result.docs.forEach((x) => {
                                     expect((0, util_1.isEvenNumber)(Number(x.data().value)));
                                 });
-                            }));
+                            });
                         });
                     });
                     describe('Compound Queries', () => {
@@ -1088,8 +1085,8 @@ function describeFirestoreQueryDriverTests(f) {
                             const evenPrefix = mock_1.mockItemIdentity.collectionType + '/';
                             const oddPrefix = mock_1.mockItemIdentity.collectionType + 'd' + '/'; // similar, but not quite the same
                             const expectedNumberOfEvenValues = Math.ceil(testDocumentCount / 2);
-                            beforeEach(() => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                items = yield (0, firebase_1.makeDocuments)(f.instance.firestoreCollection.documentAccessor(), {
+                            beforeEach(async () => {
+                                items = await (0, firebase_1.makeDocuments)(f.instance.firestoreCollection.documentAccessor(), {
                                     count: testDocumentCount,
                                     init: (i) => {
                                         const isEven = (0, util_1.isEvenNumber)(i);
@@ -1102,30 +1099,30 @@ function describeFirestoreQueryDriverTests(f) {
                                         };
                                     }
                                 });
-                            }));
+                            });
                             describe('whereStringHasRootIdentityModelKey()', () => {
-                                it('should return only models with searched prefix', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    const result = yield query((0, firebase_1.whereStringHasRootIdentityModelKey)('value', mock_1.mockItemIdentity)).getDocs();
+                                it('should return only models with searched prefix', async () => {
+                                    const result = await query((0, firebase_1.whereStringHasRootIdentityModelKey)('value', mock_1.mockItemIdentity)).getDocs();
                                     const values = result.docs.map((x) => x.data().value);
                                     values.forEach((x) => {
                                         expect(x.startsWith(evenPrefix));
                                     });
                                     expect(result.docs.length).toBe(expectedNumberOfEvenValues);
-                                }));
-                                it('should return the count of only models with searched prefix', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    const result = yield query((0, firebase_1.whereStringHasRootIdentityModelKey)('value', mock_1.mockItemIdentity)).countDocs();
+                                });
+                                it('should return the count of only models with searched prefix', async () => {
+                                    const result = await query((0, firebase_1.whereStringHasRootIdentityModelKey)('value', mock_1.mockItemIdentity)).countDocs();
                                     expect(result).toBe(expectedNumberOfEvenValues);
-                                }));
+                                });
                             });
                             describe('whereStringValueHasPrefix()', () => {
-                                it('should return only models with searched prefix', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    const result = yield query((0, firebase_1.whereStringValueHasPrefix)('value', evenPrefix)).getDocs();
+                                it('should return only models with searched prefix', async () => {
+                                    const result = await query((0, firebase_1.whereStringValueHasPrefix)('value', evenPrefix)).getDocs();
                                     const values = result.docs.map((x) => x.data().value);
                                     values.forEach((x) => {
                                         expect(x.startsWith(evenPrefix));
                                     });
                                     expect(result.docs.length).toBe(expectedNumberOfEvenValues);
-                                }));
+                                });
                             });
                         });
                         /**
@@ -1133,130 +1130,119 @@ function describeFirestoreQueryDriverTests(f) {
                          */
                         describe('Searching Date Strings', () => {
                             describe('whereDateIsAfterWithSort()', () => {
-                                it('should return models with dates after the input.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _a, _b;
+                                it('should return models with dates after the input.', async () => {
                                     const startHoursLater = 2;
                                     const start = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsAfterWithSort)('date', start)).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsAfterWithSort)('date', start)).getDocs();
                                     expect(result.docs.length).toBe(startHoursLater);
                                     // ascending order by default
-                                    expect((_a = result.docs[0].data().date) === null || _a === void 0 ? void 0 : _a.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
-                                    expect((_b = result.docs[1].data().date) === null || _b === void 0 ? void 0 : _b.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
-                                }));
-                                it('should return models with dates after the input in descending order.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _c, _d;
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
+                                });
+                                it('should return models with dates after the input in descending order.', async () => {
                                     const startHoursLater = 2;
                                     const start = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsAfterWithSort)('date', start, 'desc')).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsAfterWithSort)('date', start, 'desc')).getDocs();
                                     expect(result.docs.length).toBe(startHoursLater);
                                     // check descending order
-                                    expect((_c = result.docs[0].data().date) === null || _c === void 0 ? void 0 : _c.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
-                                    expect((_d = result.docs[1].data().date) === null || _d === void 0 ? void 0 : _d.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
-                                }));
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
+                                });
                             });
                             describe('whereDateIsBeforeWithSort()', () => {
-                                it('should return models with dates before the input.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _a, _b;
+                                it('should return models with dates before the input.', async () => {
                                     const startHoursLater = 2;
                                     const endDate = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsBeforeWithSort)('date', endDate)).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsBeforeWithSort)('date', endDate)).getDocs();
                                     expect(result.docs.length).toBe(startHoursLater);
                                     // descending order by default
-                                    expect((_a = result.docs[0].data().date) === null || _a === void 0 ? void 0 : _a.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
-                                    expect((_b = result.docs[1].data().date) === null || _b === void 0 ? void 0 : _b.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
-                                }));
-                                it('should return models with dates before the input in ascending order.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _c, _d;
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
+                                });
+                                it('should return models with dates before the input in ascending order.', async () => {
                                     const startHoursLater = 2;
                                     const endDate = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsBeforeWithSort)('date', endDate, 'asc')).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsBeforeWithSort)('date', endDate, 'asc')).getDocs();
                                     expect(result.docs.length).toBe(startHoursLater);
                                     // check ascending order
-                                    expect((_c = result.docs[0].data().date) === null || _c === void 0 ? void 0 : _c.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
-                                    expect((_d = result.docs[1].data().date) === null || _d === void 0 ? void 0 : _d.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
-                                }));
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
+                                });
                             });
                             describe('whereDateIsOnOrAfterWithSort()', () => {
-                                it('should return models with dates after the input.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _a, _b, _c;
+                                it('should return models with dates after the input.', async () => {
                                     const startHoursLater = 2;
                                     const start = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsOnOrAfterWithSort)('date', start)).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsOnOrAfterWithSort)('date', start)).getDocs();
                                     expect(result.docs.length).toBe(3);
                                     // ascending order by default
-                                    expect((_a = result.docs[0].data().date) === null || _a === void 0 ? void 0 : _a.toISOString()).toBe((0, date_fns_1.addHours)(start, 0).toISOString());
-                                    expect((_b = result.docs[1].data().date) === null || _b === void 0 ? void 0 : _b.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
-                                    expect((_c = result.docs[2].data().date) === null || _c === void 0 ? void 0 : _c.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
-                                }));
-                                it('should return models with dates after the input in descending order.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _d, _e, _f;
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 0).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
+                                    expect(result.docs[2].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
+                                });
+                                it('should return models with dates after the input in descending order.', async () => {
                                     const startHoursLater = 2;
                                     const start = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsOnOrAfterWithSort)('date', start, 'desc')).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsOnOrAfterWithSort)('date', start, 'desc')).getDocs();
                                     expect(result.docs.length).toBe(3);
                                     // check descending order
-                                    expect((_d = result.docs[0].data().date) === null || _d === void 0 ? void 0 : _d.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
-                                    expect((_e = result.docs[1].data().date) === null || _e === void 0 ? void 0 : _e.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
-                                    expect((_f = result.docs[2].data().date) === null || _f === void 0 ? void 0 : _f.toISOString()).toBe((0, date_fns_1.addHours)(start, 0).toISOString());
-                                }));
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 2).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
+                                    expect(result.docs[2].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 0).toISOString());
+                                });
                             });
                             describe('whereDateIsOnOrBeforeWithSort()', () => {
-                                it('should return models with dates before the input.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _a, _b, _c;
+                                it('should return models with dates before the input.', async () => {
                                     const startHoursLater = 2;
                                     const endDate = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsOnOrBeforeWithSort)('date', endDate)).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsOnOrBeforeWithSort)('date', endDate)).getDocs();
                                     expect(result.docs.length).toBe(3);
                                     // descending order by default
-                                    expect((_a = result.docs[0].data().date) === null || _a === void 0 ? void 0 : _a.toISOString()).toBe((0, date_fns_1.addHours)(endDate, 0).toISOString());
-                                    expect((_b = result.docs[1].data().date) === null || _b === void 0 ? void 0 : _b.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
-                                    expect((_c = result.docs[2].data().date) === null || _c === void 0 ? void 0 : _c.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
-                                }));
-                                it('should return models with dates before the input in ascending order.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _d, _e, _f;
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, 0).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
+                                    expect(result.docs[2].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
+                                });
+                                it('should return models with dates before the input in ascending order.', async () => {
                                     const startHoursLater = 2;
                                     const endDate = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsOnOrBeforeWithSort)('date', endDate, 'asc')).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsOnOrBeforeWithSort)('date', endDate, 'asc')).getDocs();
                                     expect(result.docs.length).toBe(3);
                                     // check ascending order
-                                    expect((_d = result.docs[0].data().date) === null || _d === void 0 ? void 0 : _d.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
-                                    expect((_e = result.docs[1].data().date) === null || _e === void 0 ? void 0 : _e.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
-                                    expect((_f = result.docs[2].data().date) === null || _f === void 0 ? void 0 : _f.toISOString()).toBe((0, date_fns_1.addHours)(endDate, 0).toISOString());
-                                }));
+                                    expect(result.docs[0].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -2).toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, -1).toISOString());
+                                    expect(result.docs[2].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(endDate, 0).toISOString());
+                                });
                             });
                             describe('whereDateIsInRange()', () => {
-                                it('should return the date values within the given range.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _a, _b;
+                                it('should return the date values within the given range.', async () => {
                                     const startHoursLater = 1;
                                     const totalHoursInRange = 2;
                                     const start = (0, date_fns_1.addHours)(startDate, startHoursLater);
-                                    const result = yield query((0, firebase_1.whereDateIsInRange)('date', { date: start, distance: totalHoursInRange - 1, type: date_1.DateRangeType.HOURS_RANGE })).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsInRange)('date', { date: start, distance: totalHoursInRange - 1, type: date_1.DateRangeType.HOURS_RANGE })).getDocs();
                                     expect(result.docs.length).toBe(totalHoursInRange);
-                                    expect((_a = result.docs[0].data().date) === null || _a === void 0 ? void 0 : _a.toISOString()).toBe(start.toISOString());
-                                    expect((_b = result.docs[1].data().date) === null || _b === void 0 ? void 0 : _b.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
-                                }));
+                                    expect(result.docs[0].data().date?.toISOString()).toBe(start.toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
+                                });
                             });
                             describe('whereDateIsBetween()', () => {
-                                it('should return the date values within the given range.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                    var _a, _b;
+                                it('should return the date values within the given range.', async () => {
                                     const startHoursLater = 1;
                                     const hoursRange = 2;
                                     const start = (0, date_fns_1.addHours)(startDate, startHoursLater);
                                     const end = (0, date_fns_1.addHours)(start, hoursRange);
-                                    const result = yield query((0, firebase_1.whereDateIsBetween)('date', { start, end })).getDocs();
+                                    const result = await query((0, firebase_1.whereDateIsBetween)('date', { start, end })).getDocs();
                                     expect(result.docs.length).toBe(hoursRange);
-                                    expect((_a = result.docs[0].data().date) === null || _a === void 0 ? void 0 : _a.toISOString()).toBe(start.toISOString());
-                                    expect((_b = result.docs[1].data().date) === null || _b === void 0 ? void 0 : _b.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
-                                }));
+                                    expect(result.docs[0].data().date?.toISOString()).toBe(start.toISOString());
+                                    expect(result.docs[1].data().date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
+                                });
                                 describe('with searching array value', () => {
-                                    it('should search the date range and values that are tagged even.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
-                                        var _a;
+                                    it('should search the date range and values that are tagged even.', async () => {
                                         const targetTag = 'even';
                                         const startHoursLater = 1;
                                         const hoursRange = 2;
                                         const start = (0, date_fns_1.addHours)(startDate, startHoursLater);
                                         const end = (0, date_fns_1.addHours)(start, hoursRange);
-                                        const result = yield query([
+                                        const result = await query([
                                             // filter by dates first
                                             ...(0, firebase_1.whereDateIsBetween)('date', { start, end }),
                                             // only allow even items
@@ -1264,104 +1250,104 @@ function describeFirestoreQueryDriverTests(f) {
                                         ]).getDocs();
                                         expect(result.docs.length).toBe(1);
                                         const onlyResultData = result.docs[0].data();
-                                        expect((_a = onlyResultData.date) === null || _a === void 0 ? void 0 : _a.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
+                                        expect(onlyResultData.date?.toISOString()).toBe((0, date_fns_1.addHours)(start, 1).toISOString());
                                         expect(onlyResultData.tags).toContain(targetTag);
-                                    }));
+                                    });
                                 });
                             });
                         });
                     });
                 });
                 describe('whereDocumentId', () => {
-                    it('should return the documents matching the query.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should return the documents matching the query.', async () => {
                         const targetId = items[0].id;
-                        const result = yield query((0, firebase_1.whereDocumentId)('==', targetId)).getDocs();
+                        const result = await query((0, firebase_1.whereDocumentId)('==', targetId)).getDocs();
                         expect(result.docs.length).toBe(1);
                         expect(result.docs[0].id).toBe(targetId);
-                    }));
+                    });
                 });
                 describe('startAt', () => {
-                    it('should return values starting from the specified startAt document.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should return values starting from the specified startAt document.', async () => {
                         const limitCount = 2;
                         const firstQuery = query((0, firebase_1.limit)(limitCount));
-                        const first = yield firstQuery.getDocs();
+                        const first = await firstQuery.getDocs();
                         expect(first.docs.length).toBe(limitCount);
-                        const second = yield firstQuery.filter((0, firebase_1.startAt)(first.docs[1])).getDocs();
+                        const second = await firstQuery.filter((0, firebase_1.startAt)(first.docs[1])).getDocs();
                         expect(second.docs.length).toBe(limitCount);
                         expect(second.docs[0].id).toBe(first.docs[1].id);
-                    }));
-                    it('should return the count of values starting from the specified startAt document.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    });
+                    it('should return the count of values starting from the specified startAt document.', async () => {
                         const limitCount = 2;
                         const firstQuery = query((0, firebase_1.limit)(limitCount));
-                        const first = yield firstQuery.getDocs();
+                        const first = await firstQuery.getDocs();
                         expect(first.docs.length).toBe(limitCount);
                         // NOTE: startAt with count requires an orderBy to be set.
-                        const secondCount = yield firstQuery.filter((0, firebase_1.orderByDocumentId)(), (0, firebase_1.startAt)(first.docs[1])).countDocs();
+                        const secondCount = await firstQuery.filter((0, firebase_1.orderByDocumentId)(), (0, firebase_1.startAt)(first.docs[1])).countDocs();
                         expect(secondCount).toBe(limitCount);
-                    }));
+                    });
                 });
                 describe('startAtValue', () => {
-                    it('should return values starting from the specified startAt path.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should return values starting from the specified startAt path.', async () => {
                         const limitCount = testDocumentCount;
                         const firstQuery = query((0, firebase_1.orderBy)('value'), (0, firebase_1.limit)(limitCount));
-                        const first = yield firstQuery.getDocs();
+                        const first = await firstQuery.getDocs();
                         expect(first.docs.length).toBe(limitCount);
                         const indexToStartAt = 3;
                         const docToStartAt = first.docs[indexToStartAt];
                         const docToStartAtValue = docToStartAt.data().value;
-                        const second = yield firstQuery.filter((0, firebase_1.startAtValue)(docToStartAtValue)).getDocs();
+                        const second = await firstQuery.filter((0, firebase_1.startAtValue)(docToStartAtValue)).getDocs();
                         expect(second.docs.length).toBe(limitCount - indexToStartAt);
                         expect(second.docs[0].id).toBe(docToStartAt.id);
-                    }));
+                    });
                 });
                 describe('startAfter', () => {
-                    it('should return values starting after the specified startAt point.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should return values starting after the specified startAt point.', async () => {
                         const limitCount = 3;
                         const firstQuery = query((0, firebase_1.limit)(limitCount));
-                        const first = yield firstQuery.getDocs();
+                        const first = await firstQuery.getDocs();
                         expect(first.docs.length).toBe(limitCount);
                         const startAfterDoc = first.docs[1];
                         const expectedFirstDoc = first.docs[2];
-                        const second = yield firstQuery.filter((0, firebase_1.startAfter)(startAfterDoc)).getDocs();
+                        const second = await firstQuery.filter((0, firebase_1.startAfter)(startAfterDoc)).getDocs();
                         expect(second.docs.length).toBe(limitCount);
                         expect(second.docs[0].id).toBe(expectedFirstDoc.id);
-                    }));
+                    });
                 });
                 describe('endAt', () => {
-                    it('should return values ending with the specified endAt point (inclusive).', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should return values ending with the specified endAt point (inclusive).', async () => {
                         const limitCount = 2;
                         const firstQuery = query((0, firebase_1.limit)(limitCount));
-                        const first = yield firstQuery.getDocs();
+                        const first = await firstQuery.getDocs();
                         expect(first.docs.length).toBe(limitCount);
-                        const second = yield firstQuery.filter((0, firebase_1.endAt)(first.docs[0])).getDocs();
+                        const second = await firstQuery.filter((0, firebase_1.endAt)(first.docs[0])).getDocs();
                         expect(second.docs.length).toBe(limitCount - 1);
                         expect(second.docs[0].id).toBe(first.docs[0].id);
-                    }));
+                    });
                 });
                 describe('endAtValue', () => {
-                    it('should return values starting from the specified startAt path.', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should return values starting from the specified startAt path.', async () => {
                         const limitCount = testDocumentCount;
                         const firstQuery = query((0, firebase_1.orderBy)('value'), (0, firebase_1.limit)(limitCount));
-                        const first = yield firstQuery.getDocs();
+                        const first = await firstQuery.getDocs();
                         expect(first.docs.length).toBe(limitCount);
                         const indexToEndAt = 2;
                         const docToEndAt = first.docs[indexToEndAt];
                         const docToEndAtValue = docToEndAt.data().value;
-                        const second = yield firstQuery.filter((0, firebase_1.endAtValue)(docToEndAtValue)).getDocs();
+                        const second = await firstQuery.filter((0, firebase_1.endAtValue)(docToEndAtValue)).getDocs();
                         expect(second.docs.length).toBe(indexToEndAt + 1);
                         expect(second.docs[second.docs.length - 1].id).toBe(docToEndAt.id);
-                    }));
+                    });
                 });
                 describe('endBefore', () => {
-                    it('should return values ending with the specified endBefore point (exclusive).', () => tslib_1.__awaiter(this, void 0, void 0, function* () {
+                    it('should return values ending with the specified endBefore point (exclusive).', async () => {
                         const limitCount = 2;
                         const firstQuery = query((0, firebase_1.limit)(limitCount));
-                        const first = yield firstQuery.getDocs();
+                        const first = await firstQuery.getDocs();
                         expect(first.docs.length).toBe(limitCount);
-                        const second = yield firstQuery.filter((0, firebase_1.endBefore)(first.docs[1])).getDocs();
+                        const second = await firstQuery.filter((0, firebase_1.endBefore)(first.docs[1])).getDocs();
                         expect(second.docs.length).toBe(limitCount - 1);
                         expect(second.docs[0].id).toBe(first.docs[0].id);
-                    }));
+                    });
                 });
             });
         });