chore(modules): Organize utils

src/angularfire2.spec.ts

@@ -19,7 +19,7 @@ import {
   FirebaseConfig,
   FirebaseApp,
   defaultFirebase,
-  FirebaseDatabase,
+  AngularFireDatabase,
   FirebaseAppConfig
 } from './angularfire2';
 import {Subscription} from 'rxjs';
@@ -78,7 +78,7 @@ describe('angularfire', () => {
 
   describe('.database', () => {
     it('should be an instance of Database', inject([AngularFire], (af:AngularFire) => {
-      expect(af.database).toBeAnInstanceOf(FirebaseDatabase);
+      expect(af.database).toBeAnInstanceOf(AngularFireDatabase);
     }));
   });
 

src/angularfire2.ts

@@ -1,38 +1,39 @@
 import { initializeApp } from 'firebase';
-import * as utils from './utils/utils';
+import * as utils from './utils';
 import { FirebaseAppConfig } from './interfaces';
-import { 
-  FirebaseListFactoryOpts, 
+import {
+  FirebaseListFactoryOpts,
   FirebaseObjectFactoryOpts,
 } from './interfaces';
 import {
   FirebaseConfig,
   FirebaseApp,
   WindowLocation
 } from './tokens';
-import { 
-  APP_INITIALIZER, 
-  Inject, 
-  Injectable, 
-  OpaqueToken, 
-  provide, 
-  Provider 
+import {
+  APP_INITIALIZER,
+  Inject,
+  Injectable,
+  OpaqueToken,
+  provide,
+  Provider
 } from '@angular/core';
-import { 
+import {
   FirebaseSdkAuthBackend,
-  AngularFireAuth, 
-  firebaseAuthConfig, 
+  AngularFireAuth,
+  firebaseAuthConfig,
   FirebaseAuth,
   AuthBackend,
   AuthMethods,
   AuthProviders,
-  FirebaseAuthState    
+  FirebaseAuthState
 } from './auth/index';
 import {
   FirebaseListObservable,
   FirebaseObjectObservable,
   FirebaseListFactory,
   FirebaseObjectFactory,
+  AngularFireDatabase,
   FirebaseDatabase
 } from './database/index';
 
@@ -41,7 +42,7 @@ export class AngularFire {
   constructor(
     @Inject(FirebaseConfig) private fbUrl:string,
     public auth: AngularFireAuth,
-    public database: FirebaseDatabase) {}
+    public database: AngularFireDatabase) {}
 }
 
 export const COMMON_PROVIDERS: any[] = [
@@ -56,7 +57,7 @@ export const COMMON_PROVIDERS: any[] = [
   },
   AngularFireAuth,
   AngularFire,
-  FirebaseDatabase
+  AngularFireDatabase,
 ];
 
 function _getFirebase(config: FirebaseAppConfig): firebase.app.App {
@@ -94,8 +95,10 @@ export const defaultFirebase = (config: FirebaseAppConfig): Provider => {
 
 export {
   AngularFireAuth,
+  AngularFireDatabase,
   // TODO: Deprecate
   FirebaseAuth,
+  // TODO: Deprecate
   FirebaseDatabase,
   FirebaseListObservable,
   FirebaseObjectObservable,

src/auth/auth.ts

@@ -3,8 +3,7 @@ import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { ReplaySubject } from 'rxjs/ReplaySubject';
 import { FirebaseApp, FirebaseAuthConfig, WindowLocation } from '../tokens';
-import { isPresent } from '../utils/utils';
-import * as utils from '../utils/utils';
+import * as utils from '../utils';
 import {
   authDataToAuthState,
   AuthBackend,
@@ -84,12 +83,12 @@ export class AngularFireAuth extends ReplaySubject<FirebaseAuthState> {
     }
     config = this._mergeConfigs(config);
 
-    if (!isPresent(config.method)) {
+    if (!utils.isPresent(config.method)) {
       return this._reject('You must provide a login method');
     }
     let providerMethods = [AuthMethods.Popup, AuthMethods.Redirect, AuthMethods.OAuthToken];
     if (providerMethods.indexOf(config.method) != -1) {
-      if (!isPresent(config.provider)) {
+      if (!utils.isPresent(config.provider)) {
         return this._reject('You must include a provider to use this auth method.');
       }
     }

src/auth/firebase_sdk_auth_backend.ts

@@ -2,7 +2,7 @@ import { Injectable, Inject } from '@angular/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { FirebaseApp } from '../tokens';
-import { isPresent } from '../utils/utils';
+import { isPresent } from '../utils';
 import { auth } from 'firebase';
 import {
   authDataToAuthState,

src/database/database.ts

@@ -3,15 +3,15 @@ import { FirebaseConfig } from '../tokens';
 import { FirebaseAppConfig } from '../angularfire2';
 import { FirebaseListFactory } from './index';
 import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts } from '../interfaces';
-import * as utils from '../utils/utils';
+import * as utils from '../utils';
 import { 
   FirebaseListObservable,
   FirebaseObjectObservable,
   FirebaseObjectFactory
 } from './index';
 
 @Injectable()
-export class FirebaseDatabase {
+export class AngularFireDatabase {
   constructor(@Inject(FirebaseConfig) private fbConfig:FirebaseAppConfig) {}
   list (urlOrRef:string | firebase.database.Reference, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {
     return utils.checkForUrlOrFirebaseRef(urlOrRef, {
@@ -27,6 +27,9 @@ export class FirebaseDatabase {
   }
 }
 
+// TODO: Deprecate
+export class FirebaseDatabase extends AngularFireDatabase {}
+
 function getAbsUrl (root:FirebaseAppConfig, url:string) {
   if (!(/^[a-z]+:\/\/.*/.test(url))) {
     // Provided url is relative.

src/database/firebase_list_factory.spec.ts

@@ -25,7 +25,7 @@ import {
   beforeEachProviders,
   inject
 } from '@angular/core/testing';
-import * as utils from '../utils/utils';
+import * as utils from '../utils';
 import {Query} from '../interfaces';
 import {Subscription, Observable, Subject} from 'rxjs';
 import 'rxjs/add/operator/do';

src/database/firebase_list_factory.ts

@@ -4,7 +4,7 @@ import { Observer } from 'rxjs/Observer';
 import { database } from 'firebase';
 import { observeQuery } from './query_observable';
 import { Query, FirebaseListFactoryOpts } from '../interfaces';
-import * as utils from '../utils/utils';
+import * as utils from '../utils';
 import 'rxjs/add/operator/mergeMap';
 import 'rxjs/add/operator/map';
 

src/database/firebase_list_observable.spec.ts

@@ -3,7 +3,7 @@ import { Observer } from 'rxjs/Observer';
 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/operator/map';
 import { database } from 'firebase';
-import { unwrapMapFn } from '../utils/utils';
+import { unwrapMapFn } from '../utils';
 import {
   FIREBASE_PROVIDERS,
   defaultFirebase,

src/database/firebase_list_observable.ts

@@ -2,7 +2,7 @@ import { Observable } from 'rxjs/Observable';
 import { Operator } from 'rxjs/Operator';
 import { Subscriber } from 'rxjs/Subscriber';
 import { Subscription } from 'rxjs/Subscription';
-import * as utils from '../utils/utils';
+import * as utils from '../utils';
 import { 
   AFUnwrappedDataSnapshot, 
   FirebaseOperationCases 

src/database/firebase_object_factory.ts

@@ -1,7 +1,7 @@
 import { FirebaseObjectObservable } from './index';
 import { Observer } from 'rxjs/Observer';
 import { database } from 'firebase';
-import * as utils from '../utils/utils';
+import * as utils from '../utils';
 import { Query } from '../interfaces';
 import { observeQuery } from './query_observable';
 import { FirebaseObjectFactoryOpts } from '../interfaces';

src/utils/utils.ts → src/utils.ts

@@ -1,4 +1,4 @@
-import { AFUnwrappedDataSnapshot} from '../interfaces';
+import { AFUnwrappedDataSnapshot} from './interfaces';
 
 export function isPresent(obj: any): boolean {
   return obj !== undefined && obj !== null;

src/worker/auth/worker/auth.ts

@@ -22,7 +22,7 @@ import {
   OAuth2Credentials,
   OAuthCredentials
 } from '../../auth_backend';
-import {isPresent} from '../../../utils/utils';
+import {isPresent} from '../../../utils';
 import * as firebase from 'firebase';
 
 @Injectable()