WIP: fixes after rebasing

Author: jsayol

src/database/api/Database.ts

@@ -6,7 +6,6 @@ import { Reference } from './Reference';
 import { Repo } from '../core/Repo';
 import { RepoManager } from '../core/RepoManager';
 import { validateArgCount } from '../../utils/validation';
-import { FirebaseApp } from "../../app/firebase_app";
 import { validateUrl } from '../core/util/validation';
 import { FirebaseApp, FirebaseService } from '../../app/firebase_app';
 import { RepoInfo } from '../core/RepoInfo';
@@ -16,13 +15,9 @@ import { RepoInfo } from '../core/RepoInfo';
  * @implements {FirebaseService}
  */
 export class Database implements FirebaseService {
-  /** @type {Reference} */
-  private root_: Reference;
-
-  /** @type {DatabaseInternals} */
   INTERNAL: DatabaseInternals;
 
-  app: FirebaseApp | null;
+  private root_: Reference;
 
   static readonly ServerValue = {
     'TIMESTAMP': {
@@ -45,6 +40,10 @@ export class Database implements FirebaseService {
     this.INTERNAL = new DatabaseInternals(this);
   }
 
+  get app(): FirebaseApp {
+    return this.repo_.app;
+  }
+
   /**
    * Returns a reference to the root or the path specified in opt_pathString.
    * @param {string=} pathString
@@ -105,8 +104,7 @@ export class Database implements FirebaseService {
   }
 }
 
-class DatabaseInternals {
-  database
+export class DatabaseInternals {
   /** @param {!Database} database */
   constructor(public database: Database) {
   }

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();
@@ -279,7 +278,8 @@ export class Repo {
    * @param {number|string|null} newPriority
    * @param {?function(?Error, *=)} onComplete
    */
-  setWithPriority(path: Path, newVal: any, newPriority: number | string | null,
+  setWithPriority(path: Path, newVal: any,
+                  newPriority: number | string | null,
                   onComplete: ((status: Error | null, errorReason?: string) => void) | null) {
     this.log_('set', {path: path.toString(), value: newVal, priority: newPriority});
 
@@ -552,5 +552,9 @@ export class Repo {
       });
     }
   }
+
+  get database(): Database {
+    return this.__database || (this.__database = new Database(this));
+  }
 }