WIP: fixing broken int tests (order_by spec)

Author: jshcrowthe

src/database.ts

@@ -24,7 +24,7 @@ import { RepoManager } from "./database/core/RepoManager";
 
 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

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/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.');
     }

src/database/core/Repo_transaction.ts

@@ -11,7 +11,7 @@ import {
 } from "./util/util";
 import { resolveDeferredValueSnapshot } from "./util/ServerValues";
 import { isValidPriority, validateFirebaseData } from "./util/validation";
-import { contains } from "../../utils/obj";
+import { contains, safeGet } from "../../utils/obj";
 import { nodeFromJSON } from "./snap/nodeFromJSON";
 import { ChildrenNode } from "./snap/ChildrenNode";
 import { Repo } from "./Repo";
@@ -176,7 +176,7 @@ declare module './Repo' {
     // start new transactions from the event callbacks.
     var priorityForNode;
     if (typeof newVal === 'object' && newVal !== null && contains(newVal, '.priority')) {
-      priorityForNode = newVal['.priority'];
+      priorityForNode = safeGet(newVal, '.priority');
       assert(isValidPriority(priorityForNode), 'Invalid priority returned by transaction. ' +
         'Priority must be a valid string, finite number, server value, or null.');
     } else {

src/database/core/SyncPoint.ts

@@ -1,7 +1,7 @@
 import { CacheNode } from "./view/CacheNode";
 import { ChildrenNode } from "./snap/ChildrenNode";
 import { assert } from "../../utils/assert";
-import { isEmpty, forEach, findValue } from "../../utils/obj";
+import { isEmpty, forEach, findValue, safeGet } from "../../utils/obj";
 import { ViewCache } from "./view/ViewCache";
 import { View } from "./view/View";
 
@@ -57,7 +57,7 @@ export class SyncPoint {
   applyOperation(operation, writesCache, optCompleteServerCache) {
     var queryId = operation.source.queryId;
     if (queryId !== null) {
-      var view = this.views_[queryId];
+      var view = safeGet(this.views_, queryId);
       assert(view != null, 'SyncTree gave us an op for an invalid query.');
       return view.applyOperation(operation, writesCache, optCompleteServerCache);
     } else {
@@ -83,7 +83,7 @@ export class SyncPoint {
    */
   addEventRegistration(query, eventRegistration, writesCache, serverCache, serverCacheComplete) {
     var queryId = query.queryIdentifier();
-    var view = this.views_[queryId];
+    var view = safeGet(this.views_, queryId);
     if (!view) {
       // TODO: make writesCache take flag for complete server node
       var eventCache = writesCache.calcCompleteEventCache(serverCacheComplete ? serverCache : null);
@@ -142,7 +142,7 @@ export class SyncPoint {
       });
     } else {
       // remove the callback from the specific view.
-      var view = this.views_[queryId];
+      var view = safeGet(this.views_, queryId);
       if (view) {
         cancelEvents = cancelEvents.concat(view.removeEventRegistration(eventRegistration, cancelError));
         if (view.isEmpty()) {
@@ -198,7 +198,7 @@ export class SyncPoint {
       return this.getCompleteView();
     } else {
       var queryId = query.queryIdentifier();
-      return this.views_[queryId];
+      return safeGet(this.views_, queryId);
     }
   };
 

src/database/core/SyncTree.ts

@@ -2,7 +2,7 @@ import { assert } from '../../utils/assert';
 import { errorForServerCode } from "./util/util";
 import { AckUserWrite } from "./operation/AckUserWrite";
 import { ChildrenNode } from "./snap/ChildrenNode";
-import { forEach } from "../../utils/obj";
+import { forEach, safeGet } from "../../utils/obj";
 import { ImmutableTree } from "./util/ImmutableTree";
 import { ListenComplete } from "./operation/ListenComplete";
 import { Merge } from "./operation/Merge";
@@ -610,7 +610,7 @@ export class SyncTree {
    */
   tagForQuery_(query) {
     var queryKey = this.makeQueryKey_(query);
-    return this.queryToTagMap_[queryKey];
+    return safeGet(this.queryToTagMap_, queryKey);
   };
 
   /**

src/database/core/WriteTree.ts

@@ -1,4 +1,4 @@
-import { findKey, forEach } from "../../utils/obj";
+import { findKey, forEach, safeGet } from "../../utils/obj";
 import { assert, assertionError } from "../../utils/assert";
 import { Path } from "./util/Path";
 import { CompoundWrite } from "./CompoundWrite";
@@ -483,7 +483,7 @@ export class WriteTree {
             if (relativePath.isEmpty()) {
               compoundWrite = compoundWrite.addWrites(Path.Empty, write.children);
             } else {
-              var child = write.children[relativePath.getFront()];
+              var child = safeGet(write.children, relativePath.getFront());
               if (child) {
                 // There exists a child in this node that matches the root path
                 var deepNode = child.getChild(relativePath.popFront());

src/database/core/snap/IndexMap.ts

@@ -1,6 +1,6 @@
 import { assert } from "../../../utils/assert";
 import { buildChildSet } from "./childSet";
-import { contains, clone, map } from "../../../utils/obj";
+import { contains, clone, map, safeGet } from "../../../utils/obj";
 import { NamedNode } from "./Node";
 import { PRIORITY_INDEX } from "./indexes/PriorityIndex";
 import { KEY_INDEX } from "./indexes/KeyIndex";
@@ -42,7 +42,7 @@ export class IndexMap {
    * @return {?SortedMap.<NamedNode, Node>}
    */
   get(indexKey) {
-    var sortedMap = this.indexes_[indexKey];
+    var sortedMap = safeGet(this.indexes_, indexKey);
     if (!sortedMap) throw new Error('No index defined for ' + indexKey);
 
     if (sortedMap === fallbackObject) {
@@ -103,7 +103,7 @@ export class IndexMap {
   addToIndexes(namedNode, existingChildren) {
     var self = this;
     var newIndexes = map(this.indexes_, function(indexedChildren, indexName) {
-      var index = self.indexSet_[indexName];
+      var index = safeGet(self.indexSet_, indexName);
       assert(index, 'Missing index implementation for ' + indexName);
       if (indexedChildren === fallbackObject) {
         // Check to see if we need to index everything

src/database/core/snap/LeafNode.ts

@@ -23,6 +23,13 @@ export class LeafNode implements Node {
   static get __childrenNodeConstructor() {
     return __childrenNodeConstructor;
   }
+  /**
+   * The sort order for comparing leaf nodes of different types. If two leaf nodes have
+   * the same type, the comparison falls back to their value
+   * @type {Array.<!string>}
+   * @const
+   */
+  static VALUE_TYPE_ORDER = ['object', 'boolean', 'number', 'string'];
 
   value_;
   priorityNode_;
@@ -54,16 +61,6 @@ export class LeafNode implements Node {
     this.lazyHash_ = null;
   }
 
-  /**
-   * The sort order for comparing leaf nodes of different types. If two leaf nodes have
-   * the same type, the comparison falls back to their value
-   * @type {Array.<!string>}
-   * @const
-   */
-  static get VALUE_TYPE_ORDER() {
-    return ['object', 'boolean', 'number', 'string'];
-  }
-
   /** @inheritDoc */
   isLeafNode() { 
     return true; 

src/database/core/util/ImmutableTree.ts

@@ -3,6 +3,8 @@ import { Path } from "./Path";
 import { stringCompare } from "./util";
 import { forEach } from "../../../utils/obj";
 
+let emptyChildrenSingleton;
+
 /**
  * A tree with immutable elements.
  */
@@ -20,7 +22,10 @@ export class ImmutableTree {
    * @private
    */
   static get EmptyChildren_() {
-    return new SortedMap(stringCompare)
+    if (!emptyChildrenSingleton) {
+      emptyChildrenSingleton = new SortedMap(stringCompare);
+    }
+    return emptyChildrenSingleton;
   }
 
   /**
@@ -41,7 +46,7 @@ export class ImmutableTree {
    * @param {?T} value
    * @param {SortedMap.<string, !ImmutableTree.<T>>=} opt_children
    */
-  constructor(value, opt_children?) {
+  constructor(value, children?) {
     /**
      * @const
      * @type {?T}
@@ -52,7 +57,7 @@ export class ImmutableTree {
      * @const
      * @type {!SortedMap.<string, !ImmutableTree.<T>>}
      */
-    this.children = opt_children || ImmutableTree.EmptyChildren_;
+    this.children = children || ImmutableTree.EmptyChildren_;
   }
 
   /**

src/database/core/util/Tree.ts

@@ -1,6 +1,6 @@
 import { assert } from "../../../utils/assert";
 import { Path } from "./Path";
-import { forEach, contains } from '../../../utils/obj'
+import { forEach, contains, safeGet } from '../../../utils/obj'
 
 /**
  * Node in a Tree.
@@ -54,7 +54,7 @@ export class Tree {
         pathObj : new Path(pathObj);
     var child = <any>this, next;
     while ((next = path.getFront()) !== null) {
-      var childNode = child.node_.children[next] || new TreeNode();
+      var childNode = safeGet(child.node_.children, next) || new TreeNode();
       child = new Tree(next, child, childNode);
       path = path.popFront();
     }

src/database/core/util/util.ts

@@ -114,7 +114,7 @@ export const buildLogMessage_ = function(var_args) {
  * Use this for all debug messages in Firebase.
  * @type {?function(string)}
  */
-export var logger = null;
+export var logger = console.log.bind(console);
 
 
 /**
@@ -131,8 +131,7 @@ export var firstLog_ = true;
  * @param {boolean=} opt_persistent Whether or not to persist logging settings across refreshes
  */
 export const enableLogging = function(logger, opt_persistent?) {
-  assert(!opt_persistent || (logger === true || logger === false),
-      "Can't turn on custom loggers persistently.");
+  assert(!opt_persistent || (logger === true || logger === false), "Can't turn on custom loggers persistently.");
   if (logger === true) {
     if (typeof console !== 'undefined') {
       if (typeof console.log === 'function') {

src/database/core/util/validation.ts

@@ -1,5 +1,5 @@
 import { Path, ValidationPath } from "./Path";
-import { forEach, contains } from "../../../utils/obj";
+import { forEach, contains, safeGet } from "../../../utils/obj";
 import { isInvalidJSONNumber } from "./util";
 import { errorPrefix as errorPrefixFxn } from "../../../utils/validation";
 import { stringLength } from "../../../utils/utf8";
@@ -362,7 +362,7 @@ export const validateObjectContainsKey = function(fnName, argumentNumber, obj, k
   }
 
   if (opt_type) {
-    var val = obj[key];
+    var val = safeGet(obj, key);
     if ((opt_type === 'number' && !(typeof val === 'number')) ||
         (opt_type === 'string' && !(typeof val === 'string')) ||
         (opt_type === 'boolean' && !(typeof val === 'boolean')) ||

src/database/core/view/ChildChangeAccumulator.ts

@@ -1,4 +1,4 @@
-import { getValues } from '../../../utils/obj';
+import { getValues, safeGet } from '../../../utils/obj';
 import { Change } from "./Change";
 import { assert, assertionError } from "../../../utils/assert";
 
@@ -17,7 +17,7 @@ export class ChildChangeAccumulator {
         type == Change.CHILD_CHANGED ||
         type == Change.CHILD_REMOVED, 'Only child changes supported for tracking');
     assert(childKey !== '.priority', 'Only non-priority child changes can be tracked.');
-    var oldChange = this.changeMap_[childKey];
+    var oldChange = safeGet(this.changeMap_, childKey);
     if (oldChange) {
       var oldType = oldChange.type;
       if (type == Change.CHILD_ADDED && oldType == Change.CHILD_REMOVED) {