From promise<void> to void

Author: wu-hui

packages/firestore-types/index.d.ts

@@ -105,7 +105,7 @@ export interface LoadBundleTask {
     next?: (progress: LoadBundleTaskProgress) => any,
     error?: (error: Error) => any,
     complete?: () => void
-  ): Promise<void>;
+  ): void;
 
   then<T, R>(
     onFulfilled?: (a: LoadBundleTaskProgress) => T | PromiseLike<T>,

packages/firestore/src/api/bundle.ts

@@ -24,9 +24,7 @@ export class LoadBundleTask
   implements
     firestore.LoadBundleTask,
     PromiseLike<firestore.LoadBundleTaskProgress> {
-  private _progressResolver = new Deferred<void>();
   private _progressObserver?: PartialObserver<firestore.LoadBundleTaskProgress>;
-
   private _taskCompletionResolver = new Deferred<
     firestore.LoadBundleTaskProgress
   >();
@@ -43,13 +41,12 @@ export class LoadBundleTask
     next?: (progress: firestore.LoadBundleTaskProgress) => unknown,
     error?: (err: Error) => unknown,
     complete?: () => void
-  ): Promise<void> {
+  ): void {
     this._progressObserver = {
       next,
       error,
       complete
     };
-    return this._progressResolver.promise;
   }
 
   catch<R>(
@@ -74,7 +71,6 @@ export class LoadBundleTask
     if (this._progressObserver && this._progressObserver.complete) {
       this._progressObserver.complete();
     }
-    this._progressResolver.resolve();
 
     this._taskCompletionResolver.resolve(progress);
   }
@@ -93,7 +89,6 @@ export class LoadBundleTask
     if (this._progressObserver && this._progressObserver.error) {
       this._progressObserver.error(error);
     }
-    this._progressResolver.reject(error);
 
     this._taskCompletionResolver.reject(error);
   }

packages/firestore/src/core/bundle.ts

@@ -191,7 +191,7 @@ export class BundleLoader {
     } else if (element.payload.document) {
       debugAssert(
         this.documents.length > 0 &&
-          this.documents[this.documents.length - 1].metadata.name ==
+          this.documents[this.documents.length - 1].metadata.name ===
             element.payload.document.name,
         'The document being added does not match the stored metadata.'
       );

packages/firestore/src/core/sync_engine.ts

@@ -1398,7 +1398,7 @@ export function loadBundle(
   const syncEngineImpl = debugCast(syncEngine, SyncEngineImpl);
   syncEngineImpl.assertSubscribed('loadBundle()');
 
-  // tslint:disable-next-line:no-floating-promises
+  // eslint-disable-next-line @typescript-eslint/no-floating-promises
   loadBundleImpl(syncEngineImpl, bundleReader, task);
 }
 
@@ -1435,8 +1435,7 @@ async function loadBundleImpl(
 
     const result = await loader.complete();
     if (result.changedDocs) {
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      syncEngine.emitNewSnapsAndNotifyLocalStore(
+      await syncEngine.emitNewSnapsAndNotifyLocalStore(
         result.changedDocs,
         /* remoteEvent */ undefined,
         /* fromBundle */ true

packages/firestore/test/integration/api_internal/bundle.test.ts

@@ -94,7 +94,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
       const task = db.loadBundle(
         builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
       );
-      await task.onProgress(
+      task.onProgress(
         progress => {
           progressEvents.push(progress);
         },
@@ -103,6 +103,7 @@ apiDescribe('Bundles', (persistence: boolean) => {
           completeCalled = true;
         }
       );
+      await task;
       let fulfillProgress: firestore.LoadBundleTaskProgress;
       await task.then(progress => {
         fulfillProgress = progress;
@@ -150,21 +151,21 @@ apiDescribe('Bundles', (persistence: boolean) => {
 
       let completeCalled = false;
       const progressEvents: firestore.LoadBundleTaskProgress[] = [];
-      await db
-        .loadBundle(
-          encoder.encode(
-            builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
-          )
+      const task = db.loadBundle(
+        encoder.encode(
+          builder.build('test-bundle', { seconds: 1001, nanos: 9999 })
         )
-        .onProgress(
-          progress => {
-            progressEvents.push(progress);
-          },
-          error => {},
-          () => {
-            completeCalled = true;
-          }
-        );
+      );
+      task.onProgress(
+        progress => {
+          progressEvents.push(progress);
+        },
+        error => {},
+        () => {
+          completeCalled = true;
+        }
+      );
+      await task;
 
       expect(completeCalled).to.be.true;
       // No loading actually happened in the second `loadBundle` call only the