Merge branch 'ts-database/final' into ts-database/migrate-test-harness

Author: jshcrowthe

src/database/api/DataSnapshot.ts

@@ -139,17 +139,8 @@ export class DataSnapshot {
       return !this.node_.isEmpty();
   }
 
-  /**
-   * @return {?string} The key of the location this snapshot's data came from.
-   */
-  getKey(): string | null {
-    validateArgCount('DataSnapshot.key', 0, 0, arguments.length);
-
-    return this.ref_.getKey();
-  }
-
   get key() {
-    return this.getKey();
+    return this.ref_.getKey();
   }
 
   /**

src/database/api/Database.ts

@@ -6,19 +6,18 @@ 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";
 
 /**
  * Class representing a firebase database.
  * @implements {firebase.Service}
  */
 export class Database {
-  /** @type {Repo} */
-  repo_;
-  /** @type {Firebase} */
-  root_;
+  repo_: Repo;
+  root_: Reference;
   INTERNAL;
-
+  
   static ServerValue = {
     'TIMESTAMP': {
       '.sv' : 'timestamp'
@@ -43,7 +42,9 @@ export class Database {
     this.INTERNAL = new DatabaseInternals(this);
   }
 
-  app: null
+  get app(): FirebaseApp {
+    return this.repo_.app;
+  }
 
   /**
    * Returns a reference to the root or the path specified in opt_pathString.
@@ -83,9 +84,8 @@ export class Database {
 
   /**
    * @param {string} apiName
-   * @private
    */
-  checkDeleted_(apiName) {
+  private checkDeleted_(apiName) {
     if (this.repo_ === null) {
       fatal("Cannot call " + apiName + " on a deleted database.");
     }
@@ -105,21 +105,10 @@ export class Database {
   }
 };
 
-// Note: This is an un-minfied property of the Database only.
-Object.defineProperty(Database.prototype, 'app', {
-  /**
-   * @this {!Database}
-   * @return {!firebase.app.App}
-   */
-  get() {
-    return this.repo_.app;
-  }
-});
-
-Object.defineProperty(Repo.prototype, 'database', {
-  get() {
-    return this.__database || (this.__database = new Database(this));
-  }
+Object.defineProperty(Repo.prototype, 'database', {		
+  get() {		
+    return this.__database || (this.__database = new Database(this));		
+  }		
 });
 
 class DatabaseInternals {

src/database/api/Query.ts

@@ -22,6 +22,10 @@ import { DataSnapshot } from './DataSnapshot';
 
 let __referenceConstructor: new(repo: Repo, path: Path) => Query;
 
+export interface SnapshotCallback {
+  (a: DataSnapshot, b?: string): any
+}
+
 /**
  * A Query represents a filter to be applied to a firebase location.  This object purely represents the
  * query expression (and exposes our public API to build the query).  The actual query logic is in ViewBase.js.
@@ -143,8 +147,8 @@ export class Query {
    * @param {Object=} context
    * @return {!function(DataSnapshot, string=)}
    */
-  on(eventType: string, callback: (a: DataSnapshot, b?: string) => any,
-     cancelCallbackOrContext?: ((a: Error) => any) | Object, context?: Object): (a: DataSnapshot, b?: string) => any {
+  on(eventType: string, callback: SnapshotCallback,
+     cancelCallbackOrContext?: ((a: Error) => any) | Object, context?: Object): SnapshotCallback {
     validateArgCount('Query.on', 2, 4, arguments.length);
     validateEventType('Query.on', 1, eventType, false);
     validateCallback('Query.on', 2, callback, false);
@@ -177,7 +181,7 @@ export class Query {
    * @param {?function(Error)} cancelCallback
    * @param {?Object} context
    */
-  onChildEvent(callbacks: { [k: string]: (a: DataSnapshot, b: string | null) => any },
+  onChildEvent(callbacks: { [k: string]: SnapshotCallback },
                cancelCallback: ((a: Error) => any) | null, context: Object | null) {
     const container = new ChildEventRegistration(callbacks, cancelCallback, context);
     this.repo.addEventCallbackForQuery(this, container);
@@ -188,7 +192,7 @@ export class Query {
    * @param {(function(!DataSnapshot, ?string=))=} callback
    * @param {Object=} context
    */
-  off(eventType?: string, callback?: (a: DataSnapshot, b?: string | null) => any, context?: Object) {
+  off(eventType?: string, callback?: SnapshotCallback, context?: Object) {
     validateArgCount('Query.off', 0, 3, arguments.length);
     validateEventType('Query.off', 1, eventType, true);
     validateCallback('Query.off', 2, callback, true);
@@ -218,9 +222,8 @@ export class Query {
    * @return {!firebase.Promise}
    */
   once(eventType: string, 
-       userCallback?: (a: DataSnapshot, b?: string) => any,
-       cancelOrContext?, 
-       context?: Object): Promise<DataSnapshot> {
+       userCallback?: SnapshotCallback,
+       cancelOrContext?, context?: Object): Promise<DataSnapshot> {
     validateArgCount('Query.once', 1, 4, arguments.length);
     validateEventType('Query.once', 1, eventType, false);
     validateCallback('Query.once', 2, userCallback, true);
@@ -378,7 +381,7 @@ export class Query {
     }
 
     // Calling with no params tells us to start at the beginning.
-    if (value == null) {
+    if (value === undefined) {
       value = null;
       name = null;
     }

src/database/api/TransactionResult.ts

@@ -6,14 +6,5 @@ export class TransactionResult {
    * @param {boolean} committed
    * @param {fb.api.DataSnapshot} snapshot
    */
-  constructor(committed, snapshot) {
-    /**
-    * @type {boolean}
-    */
-    this['committed'] = committed;
-    /**
-    * @type {fb.api.DataSnapshot}
-    */
-    this['snapshot'] = snapshot;
-  }
+  constructor(public committed, public snapshot) {}
 }

src/database/core/Repo.ts

@@ -37,7 +37,7 @@ export class Repo {
   dataUpdateCount;
   serverSyncTree_: SyncTree;
 
-  private repoInfo_;
+  public repoInfo_;
   private stats_;
   private statsListener_;
   private eventQueue_;
@@ -84,7 +84,7 @@ export class Repo {
       const authOverride = app.options['databaseAuthVariableOverride'];
       // Validate authOverride
       if (typeof authOverride !== 'undefined' && authOverride !== null) {
-        if (authOverride !== 'object') {
+        if (typeof authOverride !== 'object') {
           throw new Error('Only objects are supported for option databaseAuthVariableOverride');
         }
         try {

tests/config/project.json

@@ -0,0 +1 @@
+{"apiKey":"AIzaSyBNHCyZ-bpv-WA-HpXTmigJm2aq3z1kaH8","authDomain":"jscore-sandbox-141b5.firebaseapp.com","databaseURL":"https://jscore-sandbox-141b5.firebaseio.com","projectId":"jscore-sandbox-141b5","storageBucket":"jscore-sandbox-141b5.appspot.com","messagingSenderId":"280127633210"}