Merge remote-tracking branch 'upstream/database-ts' into db-classes

Author: jsayol

src/database.ts

@@ -21,10 +21,12 @@ import { Query } from "./database/api/Query";
 import { Reference } from "./database/api/Reference";
 import { enableLogging } from "./database/core/util/util";
 import { RepoManager } from "./database/core/RepoManager";
+import * as INTERNAL from './database/api/internal';
+import * as TEST_ACCESS from './database/api/test_access';
 
 export function registerDatabase(instance) {
   // Register the Database Service with the 'firebase' namespace.
-  firebase.INTERNAL.registerService(
+  instance.INTERNAL.registerService(
     'database',
     app => RepoManager.getInstance().databaseFromApp(app),
     // firebase.database namespace properties
@@ -33,7 +35,9 @@ export function registerDatabase(instance) {
       Query,
       Database,
       enableLogging,
+      INTERNAL,
       ServerValue: Database.ServerValue,
+      TEST_ACCESS
     }
   );
 }

src/database/api/Database.ts

@@ -19,11 +19,9 @@ export class Database {
   root_;
   INTERNAL;
 
-  static get ServerValue() {
-    return {
-      'TIMESTAMP': {
-        '.sv' : 'timestamp'
-      }
+  static ServerValue = {
+    'TIMESTAMP': {
+      '.sv' : 'timestamp'
     }
   }
 

src/database/core/CompoundWrite.ts

@@ -1,7 +1,7 @@
 import { ImmutableTree } from "./util/ImmutableTree";
 import { Path } from "./util/Path";
 import { forEach } from "../../utils/obj";
-import { NamedNode } from "./snap/Node";
+import { Node, NamedNode } from "./snap/Node";
 import { PRIORITY_INDEX } from "./snap/indexes/PriorityIndex";
 import { assert } from "../../utils/assert";
 
@@ -15,32 +15,25 @@ import { assert } from "../../utils/assert";
  * @param {!ImmutableTree.<!Node>} writeTree
  */
 export class CompoundWrite {
-  writeTree_;
-  constructor(writeTree) {
-    /**
-     * @type {!ImmutableTree.<!Node>}
-     * @private
-     */
-    this.writeTree_ = writeTree;
-  };
+  constructor(private writeTree_: ImmutableTree) {};
   /**
    * @type {!CompoundWrite}
    */
-  static Empty = new CompoundWrite(
-      /** @type {!ImmutableTree.<!Node>} */ (new ImmutableTree(null))
-  );
+  static Empty = new CompoundWrite(new ImmutableTree(null));
+  
   /**
    * @param {!Path} path
    * @param {!Node} node
    * @return {!CompoundWrite}
    */
-  addWrite(path, node) {
+  addWrite(path: Path, node: Node): CompoundWrite {
     if (path.isEmpty()) {
       return new CompoundWrite(new ImmutableTree(node));
     } else {
       var rootmost = this.writeTree_.findRootMostValueAndPath(path);
       if (rootmost != null) {
-        var rootMostPath = rootmost.path, value = rootmost.value;
+        var rootMostPath = rootmost.path
+        var value = rootmost.value;
         var relativePath = Path.relativePath(rootMostPath, path);
         value = value.updateChild(relativePath, node);
         return new CompoundWrite(this.writeTree_.set(rootMostPath, value));
@@ -57,8 +50,8 @@ export class CompoundWrite {
    * @param {!Object.<string, !Node>} updates
    * @return {!CompoundWrite}
    */
-  addWrites(path, updates) {
-    var newWrite = <any>this;
+  addWrites(path: Path, updates: { [name: string]: Node }): CompoundWrite {
+    var newWrite = <CompoundWrite>this;
     forEach(updates, function(childKey, node) {
       newWrite = newWrite.addWrite(path.child(childKey), node);
     });
@@ -72,7 +65,7 @@ export class CompoundWrite {
    * @param {!Path} path The path at which a write and all deeper writes should be removed
    * @return {!CompoundWrite} The new CompoundWrite with the removed path
    */
-  removeWrite(path) {
+  removeWrite(path: Path): CompoundWrite {
     if (path.isEmpty()) {
       return CompoundWrite.Empty;
     } else {
@@ -88,7 +81,7 @@ export class CompoundWrite {
    * @param {!Path} path The path to check for
    * @return {boolean} Whether there is a complete write at that path
    */
-  hasCompleteWrite(path) {
+  hasCompleteWrite(path: Path): boolean {
     return this.getCompleteNode(path) != null;
   };
 
@@ -99,11 +92,10 @@ export class CompoundWrite {
    * @param {!Path} path The path to get a complete write
    * @return {?Node} The node if complete at that path, or null otherwise.
    */
-  getCompleteNode(path) {
+  getCompleteNode(path: Path): Node {
     var rootmost = this.writeTree_.findRootMostValueAndPath(path);
     if (rootmost != null) {
-      return this.writeTree_.get(rootmost.path).getChild(
-          Path.relativePath(rootmost.path, path));
+      return this.writeTree_.get(rootmost.path).getChild(Path.relativePath(rootmost.path, path));
     } else {
       return null;
     }
@@ -114,7 +106,7 @@ export class CompoundWrite {
    *
    * @return {!Array.<NamedNode>} A list of all complete children.
    */
-  getCompleteChildren() {
+  getCompleteChildren(): Array<NamedNode> {
     var children = [];
     var node = this.writeTree_.value;
     if (node != null) {
@@ -139,7 +131,7 @@ export class CompoundWrite {
    * @param {!Path} path
    * @return {!CompoundWrite}
    */
-  childCompoundWrite(path) {
+  childCompoundWrite(path: Path) {
     if (path.isEmpty()) {
       return this;
     } else {
@@ -166,7 +158,7 @@ export class CompoundWrite {
    * @param {!Node} node The node to apply this CompoundWrite to
    * @return {!Node} The node with all writes applied
    */
-  apply(node) {
+  apply(node: Node) {
     return CompoundWrite.applySubtreeWrite_(Path.Empty, this.writeTree_, node);
   };
 
@@ -177,7 +169,7 @@ export class CompoundWrite {
    * @return {!Node}
    * @private
    */
-  static applySubtreeWrite_ = function(relativePath, writeTree, node) {
+  static applySubtreeWrite_ = function(relativePath: Path, writeTree: ImmutableTree, node: Node) {
     if (writeTree.value != null) {
       // Since there a write is always a leaf, we're done here
       return node.updateChild(relativePath, writeTree.value);
@@ -195,8 +187,7 @@ export class CompoundWrite {
       });
       // If there was a priority write, we only apply it if the node is not empty
       if (!node.getChild(relativePath).isEmpty() && priorityWrite !== null) {
-        node = node.updateChild(relativePath.child('.priority'),
-            /** @type {!Node} */ (priorityWrite));
+        node = node.updateChild(relativePath.child('.priority'), priorityWrite);
       }
       return node;
     }

src/database/core/PersistentConnection.ts

@@ -1,5 +1,5 @@
 import firebase from "../../app";
-import { forEach, contains, isEmpty, getCount } from "../../utils/obj";
+import { forEach, contains, isEmpty, getCount, safeGet } from "../../utils/obj";
 import { stringify } from "../../utils/json";
 import { assert } from '../../utils/assert';
 import { error, log, logWrapper, warn, ObjectToUniqueKey } from "./util/util";
@@ -243,7 +243,7 @@ export class PersistentConnection {
    */
   warnOnListenWarnings_(payload, query) {
     if (payload && typeof payload === 'object' && contains(payload, 'w')) {
-      var warnings = payload['w'];
+      var warnings = safeGet(payload, 'w');
       if (Array.isArray(warnings) && ~warnings.indexOf('no_index')) {
         var indexSpec = '".indexOn": "' + query.getQueryParams().getIndex().toString() + '"';
         var indexPath = query.path.toString();

src/database/core/ReadonlyRestClient.ts

@@ -1,6 +1,7 @@
 import { assert } from "../../utils/assert";
 import { logWrapper, warn } from "./util/util";
 import { jsonEval } from "../../utils/json";
+import { safeGet } from "../../utils/obj";
 import { querystring } from "../../utils/util";
 
 /**
@@ -35,9 +36,9 @@ export class ReadonlyRestClient {
    * @return {string}
    * @private
    */
-  static getListenId_(query, opt_tag) {
-    if (opt_tag !== undefined) {
-      return 'tag$' + opt_tag;
+  static getListenId_(query, tag?) {
+    if (tag !== undefined) {
+      return 'tag$' + tag;
     } else {
       assert(query.getQueryParams().isDefault(), "should have a tag if it's not a default query.");
       return query.path.toString();
@@ -81,7 +82,7 @@ export class ReadonlyRestClient {
         self.onDataUpdate_(pathString, data, /*isMerge=*/false, tag);
       }
 
-      if (self.listens_[listenId] === thisListen) {
+      if (safeGet(self.listens_, listenId) === thisListen) {
         var status;
         if (!error) {
           status = 'ok';

src/database/core/RepoManager.ts

@@ -1,4 +1,5 @@
 import { FirebaseApp } from "../../app/firebase_app";
+import { safeGet } from "../../utils/obj";
 import { Repo } from "./Repo";
 import { fatal } from "./util/util";
 import { parseRepoInfo } from "./util/libs/parser";
@@ -8,28 +9,30 @@ import "./Repo_transaction";
 /** @const {string} */
 var DATABASE_URL_OPTION = 'databaseURL';
 
+let _staticInstance;
+
 /**
  * Creates and caches Repo instances.
  */
 export class RepoManager {
   /**
    * @private {!Object.<string, !Repo>}
    */
-  private repos_;
+  private repos_: {
+    [name: string]: Repo
+  } = {};
 
   /**
    * If true, new Repos will be created to use ReadonlyRestClient (for testing purposes).
    * @private {boolean}
    */
-  private useRestClient_;
+  private useRestClient_: boolean = false;
 
   static getInstance() {
-    return new RepoManager();
-  }
-
-  constructor() {
-    this.repos_ = { };
-    this.useRestClient_ = false;
+    if (!_staticInstance) {
+      _staticInstance = new RepoManager();
+    }
+    return _staticInstance;
   }
 
   // TODO(koss): Remove these functions unless used in tests?
@@ -79,8 +82,9 @@ export class RepoManager {
    * @param {!Repo} repo
    */
   deleteRepo(repo) {
+    
     // This should never happen...
-    if (this.repos_[repo.app.name] !== repo) {
+    if (safeGet(this.repos_, repo.app.name) !== repo) {
       fatal("Database " + repo.app.name + " has already been deleted.");
     }
     repo.interrupt();
@@ -96,7 +100,7 @@ export class RepoManager {
    * @return {!Repo} The Repo object for the specified server / repoName.
    */
   createRepo(repoInfo, app: FirebaseApp): Repo {
-    var repo = this.repos_[app.name];
+    var repo = safeGet(this.repos_, app.name);
     if (repo) {
       fatal('FIREBASE INTERNAL ERROR: Database initialized multiple times.');
     }