Try downlevelIteration

Author: schmidt-sebastian

packages/firestore/src/core/sync_engine.ts

@@ -398,7 +398,7 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
     try {
       const changes = await this.localStore.applyRemoteEvent(remoteEvent);
       // Update `receivedDocument` as appropriate for any limbo targets.
-      remoteEvent.targetChanges.forEach((targetChange, targetId) => {
+      for (const [targetId, targetChange] of remoteEvent.targetChanges) {
         const limboResolution = this.limboResolutionsByTarget.get(targetId);
         if (limboResolution) {
           // Since this is a limbo resolution lookup, it's for a single document
@@ -427,7 +427,7 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
             // This was probably just a CURRENT targetChange or similar.
           }
         }
-      });
+      }
       await this.emitNewSnapsAndNotifyLocalStore(changes, remoteEvent);
     } catch (error) {
       await ignoreIfPrimaryLeaseLoss(error);
@@ -643,11 +643,11 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
 
   /** Reject all outstanding callbacks waiting for pending writes to complete. */
   private rejectOutstandingPendingWritesCallbacks(errorMessage: string): void {
-    this.pendingWritesCallbacks.forEach(callbacks => {
-      callbacks.forEach(callback => {
+    for (const [_, callbacks] of this.pendingWritesCallbacks) {
+      for (const callback of callbacks) {
         callback.reject(new FirestoreError(Code.CANCELLED, errorMessage));
-      });
-    });
+      }
+    }
 
     this.pendingWritesCallbacks.clear();
   }
@@ -913,22 +913,18 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
 
       const activeTargets: TargetId[] = [];
 
-      let p = Promise.resolve();
-      this.queriesByTarget.forEach((_, targetId) => {
+      for (const [targetId] of this.queriesByTarget) {
         if (this.sharedClientState.isLocalQueryTarget(targetId)) {
           activeTargets.push(targetId);
         } else {
-          p = p.then(() => {
-            this.removeAndCleanupTarget(targetId);
-            return this.localStore.releaseTarget(
-              targetId,
-              /*keepPersistedTargetData=*/ true
-            );
-          });
+          await this.removeAndCleanupTarget(targetId);
+          await this.localStore.releaseTarget(
+            targetId,
+            /*keepPersistedTargetData=*/ true
+          );
         }
         this.remoteStore.unlisten(targetId);
-      });
-      await p;
+      }
 
       await this.synchronizeQueryViewsAndRaiseSnapshots(activeTargets);
       this.resetLimboDocuments();
@@ -938,9 +934,9 @@ export class SyncEngine implements RemoteSyncer, SharedClientStateSyncer {
 
   // PORTING NOTE: Multi-tab only.
   private resetLimboDocuments(): void {
-    this.limboResolutionsByTarget.forEach((_, targetId) => {
+    for (const [targetId] of this.limboResolutionsByTarget) {
       this.remoteStore.unlisten(targetId);
-    });
+    }
     this.limboDocumentRefs.removeAllReferences();
     this.limboResolutionsByTarget = new Map<TargetId, LimboResolution>();
     this.limboTargetsByKey = new SortedMap<DocumentKey, TargetId>(

packages/firestore/src/local/local_store.ts

@@ -519,10 +519,10 @@ export class LocalStore {
         newTargetDataByTargetMap = this.targetDataByTarget;
 
         const promises = [] as Array<PersistencePromise<void>>;
-        remoteEvent.targetChanges.forEach((change, targetId) => {
+        for (const [targetId, change] of remoteEvent.targetChanges) {
           const oldTargetData = newTargetDataByTargetMap.get(targetId);
           if (!oldTargetData) {
-            return;
+            continue;
           }
 
           // Only update the remote keys if the target is still active. This
@@ -565,7 +565,7 @@ export class LocalStore {
               );
             }
           }
-        });
+        }
 
         let changedDocs = maybeDocumentMap();
         let updatedKeys = documentKeySet();

packages/firestore/src/model/field_value.ts

@@ -256,7 +256,7 @@ export class ObjectValueBuilder {
         { ...existingValue.mapValue.fields }
       : {};
 
-    currentOverlays.forEach((value, pathSegment) => {
+    for (const [pathSegment, value] of currentOverlays) {
       if (value instanceof Map) {
         const nested = this.applyOverlay(currentPath.child(pathSegment), value);
         if (nested != null) {
@@ -270,7 +270,7 @@ export class ObjectValueBuilder {
         delete resultAtPath[pathSegment];
         modified = true;
       }
-    });
+    }
 
     return modified ? { mapValue: { fields: resultAtPath } } : null;
   }

packages/firestore/src/remote/remote_store.ts

@@ -343,9 +343,9 @@ export class RemoteStore implements TargetMetadataProvider {
   }
 
   private async onWatchStreamOpen(): Promise<void> {
-    this.listenTargets.forEach((targetData, targetId) => {
+    for (const [_, targetData] of this.listenTargets) {
       this.sendWatchRequest(targetData);
-    });
+    }
   }
 
   private async onWatchStreamClose(error?: FirestoreError): Promise<void> {
@@ -428,7 +428,7 @@ export class RemoteStore implements TargetMetadataProvider {
 
     // Update in-memory resume tokens. LocalStore will update the
     // persistent view of these when applying the completed RemoteEvent.
-    remoteEvent.targetChanges.forEach((change, targetId) => {
+    for (const [targetId, change] of remoteEvent.targetChanges) {
       if (change.resumeToken.approximateByteSize() > 0) {
         const targetData = this.listenTargets.get(targetId);
         // A watched target might have been removed already.
@@ -439,7 +439,7 @@ export class RemoteStore implements TargetMetadataProvider {
           );
         }
       }
-    });
+    }
 
     // Re-establish listens for the targets that have been invalidated by
     // existence filter mismatches.

packages/firestore/src/remote/watch_change.ts

@@ -422,7 +422,7 @@ export class WatchChangeAggregator {
   createRemoteEvent(snapshotVersion: SnapshotVersion): RemoteEvent {
     const targetChanges = new Map<TargetId, TargetChange>();
 
-    this.targetStates.forEach((targetState, targetId) => {
+    for (const [targetId, targetState] of this.targetStates) {
       const targetData = this.targetDataForActiveTarget(targetId);
       if (targetData) {
         if (targetState.current && targetData.target.isDocumentQuery()) {
@@ -453,7 +453,7 @@ export class WatchChangeAggregator {
           targetState.clearPendingChanges();
         }
       }
-    });
+    }
 
     let resolvedLimboDocuments = documentKeySet();
 

packages/firestore/tsconfig.json

@@ -1,7 +1,9 @@
 {
   "extends": "../../config/tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "dist"
+    "outDir": "dist",
+    "downlevelIteration": true,
+    "importHelpers": true
   },
   "exclude": [
     "dist/**/*"