Revert DB changes

mmermerkaya · mmermerkaya · commit b7e7310b9347 · 2019-06-25T15:31:03.000+01:00
diff --git a/packages/database/src/core/CompoundWrite.ts b/packages/database/src/core/CompoundWrite.ts
@@ -21,6 +21,7 @@ import { Node, NamedNode } from './snap/Node';
 import { PRIORITY_INDEX } from './snap/indexes/PriorityIndex';
 import { assert } from '@firebase/util';
 import { ChildrenNode } from './snap/ChildrenNode';
+import { each } from './util/util';
 
 /**
  * This class holds a collection of writes that can be applied to nodes in unison. It abstracts away the logic with
@@ -69,9 +70,9 @@ export class CompoundWrite {
    */
   addWrites(path: Path, updates: { [name: string]: Node }): CompoundWrite {
     let newWrite = this as CompoundWrite;
-    for (const [childKey, node] of Object.entries(updates)) {
+    each(updates, function(childKey: string, node: Node) {
       newWrite = newWrite.addWrite(path.child(childKey), node);
-    }
+    });
     return newWrite;
   }
 
diff --git a/packages/database/src/core/Repo.ts b/packages/database/src/core/Repo.ts
@@ -403,14 +403,14 @@ export class Repo {
     let empty = true;
     const serverValues = this.generateServerValues();
     const changedChildren: { [k: string]: Node } = {};
-    for (const [changedKey, changedValue] of Object.entries(childrenToMerge)) {
+    each(childrenToMerge, (changedKey: string, changedValue: any) => {
       empty = false;
       const newNodeUnresolved = nodeFromJSON(changedValue);
       changedChildren[changedKey] = resolveDeferredValueSnapshot(
         newNodeUnresolved,
         serverValues
       );
-    }
+    });
 
     if (!empty) {
       const writeId = this.getNextWriteId_();
@@ -440,10 +440,10 @@ export class Repo {
         }
       );
 
-      for (const changedPath of Object.keys(childrenToMerge)) {
+      each(childrenToMerge, (changedPath: string) => {
         const affectedPath = this.abortTransactions_(path.child(changedPath));
         this.rerunTransactions_(affectedPath);
-      }
+      });
 
       // We queued the events above, so just flush the queue here
       this.eventQueue_.raiseEventsForChangedPath(path, []);
@@ -566,12 +566,10 @@ export class Repo {
       childrenToMerge,
       (status, errorReason) => {
         if (status === 'ok') {
-          for (const [childName, childNode] of Object.entries(
-            childrenToMerge
-          )) {
+          each(childrenToMerge, (childName: string, childNode: any) => {
             const newChildNode = nodeFromJSON(childNode);
             this.onDisconnect_.remember(path.child(childName), newChildNode);
-          }
+          });
         }
         this.callOnCompleteCallback(onComplete, status, errorReason);
       }
@@ -653,14 +651,14 @@ export class Repo {
       0
     );
 
-    for (const [stat, value] of Object.entries(stats)) {
+    each(stats, (stat: string, value: any) => {
       let paddedStat = stat;
       // pad stat names to be the same length (plus 2 extra spaces).
       for (let i = stat.length; i < longestName + 2; i++) {
         paddedStat += ' ';
       }
       console.log(paddedStat + value);
-    }
+    });
   }
 
   statsIncrementCounter(metric: string) {
diff --git a/packages/database/src/core/RepoInfo.ts b/packages/database/src/core/RepoInfo.ts
@@ -18,6 +18,7 @@
 import { assert } from '@firebase/util';
 import { PersistentStorage } from './storage/storage';
 import { LONG_POLLING, WEBSOCKET } from '../realtime/Constants';
+import { each } from './util/util';
 
 /**
  * A class that holds metadata about a Repo object
@@ -101,9 +102,9 @@ export class RepoInfo {
 
     const pairs: string[] = [];
 
-    for (const [key, value] of Object.entries(params)) {
+    each(params, (key: string, value: string) => {
       pairs.push(key + '=' + value);
-    }
+    });
 
     return connURL + pairs.join('&');
   }
diff --git a/packages/database/src/core/SyncPoint.ts b/packages/database/src/core/SyncPoint.ts
@@ -223,13 +223,18 @@ export class SyncPoint {
   }
 
   getQueryViews(): View[] {
-    return Array.from(this.views.values()).filter(
-      view =>
+    const result = [];
+    for (const view of this.views.values()) {
+      if (
         !view
           .getQuery()
           .getQueryParams()
           .loadsAllData()
-    );
+      ) {
+        result.push(view);
+      }
+    }
+    return result;
   }
 
   /**
diff --git a/packages/database/src/core/SyncTree.ts b/packages/database/src/core/SyncTree.ts
@@ -16,7 +16,7 @@
  */
 
 import { assert } from '@firebase/util';
-import { errorForServerCode } from './util/util';
+import { errorForServerCode, each } from './util/util';
 import { AckUserWrite } from './operation/AckUserWrite';
 import { ChildrenNode } from './snap/ChildrenNode';
 import { ImmutableTree } from './util/ImmutableTree';
@@ -158,9 +158,9 @@ export class SyncTree {
         // overwrite
         affectedTree = affectedTree.set(Path.Empty, true);
       } else {
-        for (const [pathString, node] of Object.entries(write.children)) {
+        each(write.children, function(pathString: string, node: Node) {
           affectedTree = affectedTree.set(new Path(pathString), node);
-        }
+        });
       }
       return this.applyOperationToSyncPoints_(
         new AckUserWrite(write.path, affectedTree, revert)
@@ -524,9 +524,9 @@ export class SyncTree {
           if (maybeChildSyncPoint) {
             views = maybeChildSyncPoint.getQueryViews();
           }
-          for (const childViews of Object.values(childMap)) {
+          each(childMap, function(_key: string, childViews: View[]) {
             views = views.concat(childViews);
-          }
+          });
           return views;
         }
       }
@@ -611,9 +611,9 @@ export class SyncTree {
               maybeChildSyncPoint.getQueryViews().map(view => view.getQuery())
             );
           }
-          for (const childQueries of Object.values(childMap)) {
+          each(childMap, function(_key: string, childQueries: Query[]) {
             queries = queries.concat(childQueries);
-          }
+          });
           return queries;
         }
       });
diff --git a/packages/database/src/core/WriteTree.ts b/packages/database/src/core/WriteTree.ts
@@ -24,6 +24,7 @@ import { ChildrenNode } from './snap/ChildrenNode';
 import { NamedNode, Node } from './snap/Node';
 import { CacheNode } from './view/CacheNode';
 import { Index } from './snap/indexes/Index';
+import { each } from './util/util';
 
 /**
  * Defines a single user-initiated write operation. May be the result of a set(), transaction(), or update() call. In
@@ -203,11 +204,11 @@ export class WriteTree {
         );
       } else {
         const children = writeToRemove.children;
-        for (const childName of Object.keys(children)) {
+        each(children, (childName: string) => {
           this.visibleWrites_ = this.visibleWrites_.removeWrite(
             writeToRemove.path.child(childName)
           );
-        }
+        });
       }
       return true;
     }
diff --git a/packages/database/src/core/snap/nodeFromJSON.ts b/packages/database/src/core/snap/nodeFromJSON.ts
@@ -25,6 +25,7 @@ import { NAME_COMPARATOR, NAME_ONLY_COMPARATOR } from './comparators';
 import { IndexMap } from './IndexMap';
 import { PRIORITY_INDEX, setNodeFromJSON } from './indexes/PriorityIndex';
 import { SortedMap } from '../util/SortedMap';
+import { each } from '../util/util';
 
 const USE_HINZE = true;
 
@@ -68,9 +69,9 @@ export function nodeFromJSON(
   if (!(json instanceof Array) && USE_HINZE) {
     const children: NamedNode[] = [];
     let childrenHavePriority = false;
-    const hinzeJsonObj: { [k: string]: any } = json as object;
-    for (const [key, child] of Object.entries(hinzeJsonObj)) {
-      if (key.substring(0, 1) !== '.') {
+    const hinzeJsonObj: { [k: string]: any } = json;
+    each(hinzeJsonObj, (key: string, child: any) => {
+      if (typeof key !== 'string' || key.substring(0, 1) !== '.') {
         // Ignore metadata nodes
         const childNode = nodeFromJSON(child);
         if (!childNode.isEmpty()) {
@@ -79,7 +80,7 @@ export function nodeFromJSON(
           children.push(new NamedNode(key, childNode));
         }
       }
-    }
+    });
 
     if (children.length == 0) {
       return ChildrenNode.EMPTY_NODE;
@@ -113,7 +114,7 @@ export function nodeFromJSON(
     }
   } else {
     let node: Node = ChildrenNode.EMPTY_NODE;
-    for (const [key, childData] of Object.entries(json)) {
+    each(json, (key: string, childData: any) => {
       if (contains(json, key)) {
         if (key.substring(0, 1) !== '.') {
           // ignore metadata nodes.
@@ -122,7 +123,7 @@ export function nodeFromJSON(
             node = node.updateImmediateChild(key, childNode);
         }
       }
-    }
+    });
 
     return node.updatePriority(nodeFromJSON(priority));
   }
diff --git a/packages/database/src/core/stats/StatsListener.ts b/packages/database/src/core/stats/StatsListener.ts
@@ -16,6 +16,7 @@
  */
 
 import { StatsCollection } from './StatsCollection';
+import { each } from '../util/util';
 
 /**
  * Returns the delta from the previous call to get stats.
@@ -33,9 +34,9 @@ export class StatsListener {
 
     const delta = { ...newStats };
     if (this.last_) {
-      for (const [stat, value] of Object.entries(this.last_)) {
+      each(this.last_, (stat: string, value: number) => {
         delta[stat] = delta[stat] - value;
-      }
+      });
     }
     this.last_ = newStats;
 
diff --git a/packages/database/src/core/stats/StatsReporter.ts b/packages/database/src/core/stats/StatsReporter.ts
@@ -16,7 +16,7 @@
  */
 
 import { contains } from '@firebase/util';
-import { setTimeoutNonBlocking } from '../util/util';
+import { setTimeoutNonBlocking, each } from '../util/util';
 import { StatsListener } from './StatsListener';
 import { StatsCollection } from './StatsCollection';
 import { ServerActions } from '../ServerActions';
@@ -59,12 +59,12 @@ export class StatsReporter {
     const reportedStats: typeof stats = {};
     let haveStatsToReport = false;
 
-    for (const [stat, value] of Object.entries(stats)) {
+    each(stats, (stat: string, value: number) => {
       if (value > 0 && contains(this.statsToReport_, stat)) {
         reportedStats[stat] = value;
         haveStatsToReport = true;
       }
-    }
+    });
 
     if (haveStatsToReport) {
       this.server_.reportStats(reportedStats);
diff --git a/packages/database/src/core/util/ImmutableTree.ts b/packages/database/src/core/util/ImmutableTree.ts
@@ -17,7 +17,7 @@
 
 import { SortedMap } from './SortedMap';
 import { Path } from './Path';
-import { stringCompare } from './util';
+import { stringCompare, each } from './util';
 
 let emptyChildrenSingleton: SortedMap<string, ImmutableTree<null>>;
 
@@ -49,9 +49,9 @@ export class ImmutableTree<T> {
    */
   static fromObject<T>(obj: { [k: string]: T }): ImmutableTree<T> {
     let tree: ImmutableTree<T> = ImmutableTree.Empty;
-    for (const [childPath, childSnap] of Object.entries(obj)) {
+    each(obj, (childPath: string, childSnap: T) => {
       tree = tree.set(new Path(childPath), childSnap);
-    }
+    });
     return tree;
   }
 
diff --git a/packages/database/src/core/util/Tree.ts b/packages/database/src/core/util/Tree.ts
@@ -18,6 +18,7 @@
 import { assert } from '@firebase/util';
 import { Path } from './Path';
 import { contains, safeGet } from '@firebase/util';
+import { each } from './util';
 
 /**
  * Node in a Tree.
@@ -118,9 +119,9 @@ export class Tree<T> {
    * @param {function(!Tree.<T>)} action Action to be called for each child.
    */
   forEachChild(action: (tree: Tree<T>) => void) {
-    for (const [child, childTree] of Object.entries(this.node_.children)) {
+    each(this.node_.children, (child: string, childTree: TreeNode<T>) => {
       action(new Tree<T>(child, this, childTree));
-    }
+    });
   }
 
   /**
diff --git a/packages/database/src/core/util/validation.ts b/packages/database/src/core/util/validation.ts
@@ -17,7 +17,7 @@
 
 import { Path, ValidationPath } from './Path';
 import { contains, safeGet } from '@firebase/util';
-import { isInvalidJSONNumber } from './util';
+import { isInvalidJSONNumber, each } from './util';
 import { errorPrefix as errorPrefixFxn } from '@firebase/util';
 import { stringLength } from '@firebase/util';
 import { RepoInfo } from '../RepoInfo';
@@ -171,9 +171,9 @@ export const validateFirebaseData = function(
   // TODO = Perf = Consider combining the recursive validation of keys into NodeFromJSON
   // to save extra walking of large objects.
   if (data && typeof data === 'object') {
-    let hasDotValue = false,
-      hasActualChild = false;
-    for (const [key, value] of Object.entries(data)) {
+    let hasDotValue = false;
+    let hasActualChild = false;
+    each(data, function(key: string, value: any) {
       if (key === '.value') {
         hasDotValue = true;
       } else if (key !== '.priority' && key !== '.sv') {
@@ -194,7 +194,7 @@ export const validateFirebaseData = function(
       path.push(key);
       validateFirebaseData(errorPrefix, value, path);
       path.pop();
-    }
+    });
 
     if (hasDotValue && hasActualChild) {
       throw new Error(
@@ -286,7 +286,7 @@ export const validateFirebaseMergeDataArg = function(
   }
 
   const mergePaths: Path[] = [];
-  for (const [key, value] of Object.entries(data)) {
+  each(data, function(key: string, value: any) {
     const curPath = new Path(key);
     validateFirebaseData(errorPrefix, value, path.child(curPath));
     if (curPath.getBack() === '.priority') {
@@ -301,7 +301,7 @@ export const validateFirebaseMergeDataArg = function(
       }
     }
     mergePaths.push(curPath);
-  }
+  });
   validateFirebaseMergePaths(errorPrefix, mergePaths);
 };
 
diff --git a/packages/database/src/core/view/EventRegistration.ts b/packages/database/src/core/view/EventRegistration.ts
