Enable strictBindCallApply.

packages/firestore/src/local/persistence_promise.ts

@@ -224,10 +224,18 @@ export class PersistencePromise<T> {
    * to resolve.
    */
   static forEach<R, S>(
-    collection: { forEach: (cb: (r: R, s?: S) => void) => void },
+    collection: { forEach: (cb: (r: R, s: S) => void) => void },
     f:
       | ((r: R, s: S) => PersistencePromise<void>)
       | ((r: R) => PersistencePromise<void>)
+  ): PersistencePromise<void>;
+  static forEach<R>(
+    collection: { forEach: (cb: (r: R) => void) => void },
+    f: (r: R) => PersistencePromise<void>
+  ): PersistencePromise<void>;
+  static forEach<R, S>(
+    collection: { forEach: (cb: (r: R, s?: S) => void) => void },
+    f: (r: R, s?: S) => PersistencePromise<void>
   ): PersistencePromise<void> {
     const promises: Array<PersistencePromise<void>> = [];
     collection.forEach((r, s) => {

packages/firestore/src/util/async_queue.ts

@@ -326,14 +326,15 @@ export class AsyncQueue {
       `Attempted to schedule multiple operations with timer id ${timerId}.`
     );
 
-    const delayedOp = DelayedOperation.createAndSchedule<unknown>(
+    const delayedOp = DelayedOperation.createAndSchedule<T>(
       this,
       timerId,
       delayMs,
       op,
-      op => this.removeDelayedOperation(op)
+      removedOp =>
+        this.removeDelayedOperation(removedOp as DelayedOperation<unknown>)
     );
-    this.delayedOperations.push(delayedOp);
+    this.delayedOperations.push(delayedOp as DelayedOperation<unknown>);
 
     return delayedOp;
   }

packages/firestore/test/integration/browser/webchannel.test.ts

@@ -42,7 +42,7 @@ describeFn('WebChannel', () => {
     const makeUrl = conn.makeUrl.bind(conn);
 
     it('includes project ID and database ID', () => {
-      const url = makeUrl('Commit', {});
+      const url = makeUrl('Commit');
       expect(url).to.equal(
         'http://example.com/v1/projects/testproject/' +
           'databases/(default)/documents:commit'

packages/firestore/test/integration/util/helpers.ts

@@ -89,15 +89,11 @@ export function isRunningAgainstEmulator(): boolean {
 }
 
 /**
- * A wrapper around Jasmine's describe method that allows for it to be run with
+ * A wrapper around Mocha's describe method that allows for it to be run with
  * persistence both disabled and enabled (if the browser is supported).
  */
-export const apiDescribe = apiDescribeInternal.bind(null, describe);
-apiDescribe.skip = apiDescribeInternal.bind(null, describe.skip);
-apiDescribe.only = apiDescribeInternal.bind(null, describe.only);
-
 function apiDescribeInternal(
-  describeFn: Mocha.IContextDefinition,
+  describeFn: Mocha.PendingSuiteFunction,
   message: string,
   testSuite: (persistence: boolean) => void
 ): void {
@@ -111,6 +107,23 @@ function apiDescribeInternal(
   }
 }
 
+type ApiSuiteFunction = (
+  message: string,
+  testSuite: (persistence: boolean) => void
+) => void;
+interface ApiDescribe {
+  (message: string, testSuite: (persistence: boolean) => void): void;
+  skip: ApiSuiteFunction;
+  only: ApiSuiteFunction;
+}
+
+export const apiDescribe = apiDescribeInternal.bind(
+  null,
+  describe
+) as ApiDescribe;
+apiDescribe.skip = apiDescribeInternal.bind(null, describe.skip);
+apiDescribe.only = apiDescribeInternal.bind(null, describe.only);
+
 /** Converts the documents in a QuerySnapshot to an array with the data of each document. */
 export function toDataArray(
   docSet: firestore.QuerySnapshot

packages/firestore/test/util/equality_matcher.ts

@@ -87,9 +87,8 @@ export function addEqualityMatcher(): void {
       // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
       const assertEql = (_super: (r: unknown, l: unknown) => boolean) => {
         originalFunction = originalFunction || _super;
-        return function(this: unknown, ...args: unknown[]): void {
+        return function(this: unknown, expected?: unknown, msg?: unknown): void {
           if (isActive) {
-            const [expected, msg] = args;
             utils.flag(this, 'message', msg);
             const actual = utils.flag(this, 'object');
 
@@ -106,7 +105,7 @@ export function addEqualityMatcher(): void {
               /*showDiff=*/ true
             );
           } else if (originalFunction) {
-            originalFunction.apply(this, args);
+            originalFunction.call(this, expected, msg);
           }
         };
       };

packages/firestore/tsconfig.json

@@ -2,7 +2,6 @@
   "extends": "../../config/tsconfig.base.json",
   "compilerOptions": {
     "outDir": "dist",
-    "strictBindCallApply": false,
     "strictPropertyInitialization": false
   },
   "exclude": [