Fix more compiler errors.

firebase · Jan 12, 2018 · c0c3c63 · c0c3c63
1 parent 6cdf964
commit c0c3c63
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/packages/firestore/src/remote/persistent_stream.ts b/packages/firestore/src/remote/persistent_stream.ts
@@ -384,7 +384,7 @@ export abstract class PersistentStream<
         this.startStream(token);
       },
       (error: Error) => {
-        this.queue.schedule(() => {
+        this.queue.schedule(async () => {
           if (this.state !== PersistentStreamState.Stopped) {
             // Stream can be stopped while waiting for authorization.
             const rpcError = new FirestoreError(
@@ -415,7 +415,7 @@ export abstract class PersistentStream<
       stream: Stream<SendType, ReceiveType>,
       fn: () => Promise<void>
     ) => {
-      this.queue.schedule(() => {
+      this.queue.schedule(async () => {
         // Only raise events if the stream instance has not changed
         if (this.stream === stream) {
           return fn();

diff --git a/packages/firestore/src/remote/remote_store.ts b/packages/firestore/src/remote/remote_store.ts
@@ -379,7 +379,7 @@ export class RemoteStore {
     }
   }
 
-  private onWatchStreamChange(
+  private async onWatchStreamChange(
     watchChange: WatchChange,
     snapshotVersion: SnapshotVersion
   ): Promise<void> {
@@ -545,7 +545,8 @@ export class RemoteStore {
     const error = watchChange.cause!;
     let promiseChain = Promise.resolve();
     watchChange.targetIds.forEach(targetId => {
-      promiseChain = promiseChain.then(() => {
+      promiseChain = promiseChain.then(async () => {
+        // A watched target might have been removed already.
         if (objUtils.contains(this.listenTargets, targetId)) {
           delete this.listenTargets[targetId];
           return this.syncEngine.rejectListen(targetId, error);
@@ -564,7 +565,7 @@ export class RemoteStore {
    * Notifies that there are new mutations to process in the queue. This is
    * typically called by SyncEngine after it has sent mutations to LocalStore.
    */
-  fillWritePipeline(): Promise<void> {
+  async fillWritePipeline(): Promise<void> {
     if (this.canWriteMutations()) {
       return this.localStore
         .nextMutationBatch(this.lastBatchSeen)
@@ -696,7 +697,7 @@ export class RemoteStore {
     });
   }
 
-  private onWriteStreamClose(error?: FirestoreError): Promise<void> {
+  private async onWriteStreamClose(error?: FirestoreError): Promise<void> {
     assert(
       this.isNetworkEnabled(),
       'onWriteStreamClose() should only be called when the network is enabled'
@@ -732,7 +733,7 @@ export class RemoteStore {
     // No pending writes, nothing to do
   }
 
-  private handleHandshakeError(error: FirestoreError): Promise<void> {
+  private async handleHandshakeError(error: FirestoreError): Promise<void> {
     // Reset the token if it's a permanent error or the error code is
     // ABORTED, signaling the write stream is no longer valid.
     if (isPermanentError(error.code) || error.code === Code.ABORTED) {
@@ -750,7 +751,7 @@ export class RemoteStore {
     // just retry with exponential backoff.
   }
 
-  private handleWriteError(error: FirestoreError): Promise<void> {
+  private async handleWriteError(error: FirestoreError): Promise<void> {
     if (isPermanentError(error.code)) {
       // This was a permanent error, the request itself was the problem
       // so it's not going to succeed if we resend it.

diff --git a/packages/firestore/test/integration/api/server_timestamp.test.ts b/packages/firestore/test/integration/api/server_timestamp.test.ts
@@ -141,7 +141,7 @@ apiDescribe('Server Timestamps', persistence => {
   it('work via transaction set()', () => {
     return withTestSetup(() => {
       return docRef.firestore
-        .runTransaction(txn => {
+        .runTransaction(async txn => {
           txn.set(docRef, setData);
         })
         .then(() => waitForRemoteEvent());
@@ -152,7 +152,7 @@ apiDescribe('Server Timestamps', persistence => {
     return withTestSetup(() => {
       return writeInitialData()
         .then(() =>
-          docRef.firestore.runTransaction(txn => {
+          docRef.firestore.runTransaction(async txn => {
             txn.update(docRef, updateData);
           })
         )
@@ -176,7 +176,7 @@ apiDescribe('Server Timestamps', persistence => {
   it('fail via transaction update() on nonexistent document.', () => {
     return withTestSetup(() => {
       return docRef.firestore
-        .runTransaction(txn => {
+        .runTransaction(async txn => {
           txn.update(docRef, updateData);
         })
         .then(

diff --git a/packages/firestore/test/integration/api/transactions.test.ts b/packages/firestore/test/integration/api/transactions.test.ts
@@ -73,7 +73,7 @@ apiDescribe('Database transactions', persistence => {
         .then(snapshot => {
           expect(snapshot).to.exist;
           expect(snapshot.data()['foo']).to.equal('bar');
-          return db.runTransaction(transaction => {
+          return db.runTransaction(async transaction => {
             transaction.delete(doc);
           });
         })
@@ -185,7 +185,7 @@ apiDescribe('Database transactions', persistence => {
     return integrationHelpers.withTestDb(persistence, db => {
       const doc = db.collection('towns').doc();
       return db
-        .runTransaction(transaction => {
+        .runTransaction(async transaction => {
           transaction.set(doc, { a: 'b' }).set(doc, { c: 'd' });
         })
         .then(() => {
@@ -202,7 +202,7 @@ apiDescribe('Database transactions', persistence => {
     return integrationHelpers.withTestDb(persistence, db => {
       const doc = db.collection('towns').doc();
       return db
-        .runTransaction(transaction => {
+        .runTransaction(async transaction => {
           transaction.set(doc, { a: 'b', nested: { a: 'b' } }).set(
             doc,
             { c: 'd', nested: { c: 'd' } },
@@ -354,7 +354,7 @@ apiDescribe('Database transactions', persistence => {
     return integrationHelpers.withTestDb(persistence, db => {
       const doc = db.collection('counters').doc();
       return db
-        .runTransaction(transaction => {
+        .runTransaction(async transaction => {
           transaction.set(doc, initialData);
           transaction.update(
             doc,
@@ -533,7 +533,7 @@ apiDescribe('Database transactions', persistence => {
 
   it('are successful with no transaction operations', () => {
     return integrationHelpers.withTestDb(persistence, db => {
-      return db.runTransaction(txn => {});
+      return db.runTransaction(async txn => {});
     });
   });
 

diff --git a/packages/firestore/test/integration/api/validation.test.ts b/packages/firestore/test/integration/api/validation.test.ts
@@ -38,7 +38,7 @@ function validationIt(
   testFunction: (db: firestore.FirebaseFirestore) => void | Promise<any>
 ) {
   it(message, () => {
-    return withTestDb(persistence, db => {
+    return withTestDb(persistence, async db => {
       const maybePromise = testFunction(db);
       if (maybePromise) {
         return maybePromise;
@@ -339,7 +339,7 @@ apiDescribe('Validation:', persistence => {
             .commit();
         })
         .then(() => {
-          return ref.firestore.runTransaction(txn => {
+          return ref.firestore.runTransaction(async txn => {
             // Note ref2 does not exist at this point so set that and update ref.
             txn.update(ref, data);
             txn.set(ref2, data);
@@ -462,7 +462,7 @@ apiDescribe('Validation:', persistence => {
         const reason =
           'Provided document reference is from a different Firestore instance.';
         const data = { foo: 1 };
-        return db.runTransaction(txn => {
+        return db.runTransaction(async txn => {
           expect(() => txn.get(badRef)).to.throw(reason);
           expect(() => txn.set(badRef, data)).to.throw(reason);
           expect(() => txn.update(badRef, data)).to.throw(reason);
@@ -750,7 +750,7 @@ function expectWriteToFail(
     );
   }
 
-  return docRef.firestore.runTransaction(txn => {
+  return docRef.firestore.runTransaction(async txn => {
     if (includeSets) {
       expect(() => txn.set(docRef, data)).to.throw(error('Transaction.set'));
     }

diff --git a/packages/firestore/test/unit/specs/spec_test_runner.ts b/packages/firestore/test/unit/specs/spec_test_runner.ts
@@ -728,7 +728,7 @@ abstract class TestRunner {
     });
   }
 
-  private doFailWrite(writeFailure: SpecWriteFailure): Promise<void> {
+  private async doFailWrite(writeFailure: SpecWriteFailure): Promise<void> {
     const specError: SpecError = writeFailure.error;
     const error = new FirestoreError(
       mapCodeFromRpcCode(specError.code),