WIP: fixes after rebasing

Author: jsayol

src/database/core/Repo.ts

@@ -34,8 +34,6 @@ const INTERRUPT_REASON = 'repo_interrupt';
  * A connection to a single data repository.
  */
 export class Repo {
-  /** @type {!Database} */
-  database: Database;
   dataUpdateCount = 0;
   private infoSyncTree_: SyncTree;
   private serverSyncTree_: SyncTree;
@@ -51,6 +49,7 @@ export class Repo {
   private abortTransactions_: (path: Path) => Path;
   private rerunTransactions_: (changedPath: Path) => Path;
   private interceptServerDataCallback_: ((a: string, b: any) => void) | null = null;
+  private __database: Database;
 
   // A list of data pieces and paths to be set when this client disconnects.
   private onDisconnect_ = new SparseSnapshotTree();
@@ -553,5 +552,9 @@ export class Repo {
       });
     }
   }
+
+  get database(): Database {
+    return this.__database || (this.__database = new Database(this));
+  }
 }
 

src/database/core/WriteTree.ts

@@ -385,8 +385,8 @@ export class WriteTree {
     if (!toIterate.isEmpty() && !toIterate.isLeafNode()) {
       const nodes = [];
       const cmp = index.getCompare();
-      const iter = reverse ? (toIterateas ChildrenNode).getReverseIteratorFrom(startPost, index) :
-          (toIterateas ChildrenNode).getIteratorFrom(startPost, index);
+      const iter = reverse ? (toIterate as ChildrenNode).getReverseIteratorFrom(startPost, index) :
+          (toIterate as ChildrenNode).getIteratorFrom(startPost, index);
       let next = iter.getNext();
       while (next && nodes.length < count) {
         if (cmp(next, startPost) !== 0) {

src/database/core/util/SortedMap.ts

@@ -303,7 +303,7 @@ export class LLRBNode<K, V> {
         } else {
           smallest = (n.right as LLRBNode<K,V>).min_();
           n = n.copy(smallest.key, smallest.value, null, null,
-                     (n.rightas LLRBNode<K,V>).removeMin_());
+                     (n.right as LLRBNode<K,V>).removeMin_());
         }
       }
       n = n.copy(null, null, null, null, n.right.remove(key, comparator));