chore(modules): Organize barrels for tree-shaking

Author: davideast

package.json

@@ -20,9 +20,9 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 1"
   },
   "keywords": [
-    "angular2",
     "angular",
-    "firebase"
+    "firebase",
+    "rxjs"
   ],
   "repository": {
     "type": "git",

src/auth.ts

@@ -0,0 +1,2 @@
+export * from './auth/auth';
+export * from './auth/auth.module';

src/auth/auth.module.ts

@@ -3,7 +3,7 @@ import * as firebase from 'firebase/app';
 import 'firebase/auth';
 import { FirebaseApp } from '../app/index';
 import { AngularFireModule } from '../angularfire2';
-import { AngularFireAuth } from './index';
+import { AngularFireAuth } from './auth';
 
 export function _getAngularFireAuth(app: FirebaseApp) {
   return new AngularFireAuth(app);

src/auth/auth.spec.ts

@@ -8,7 +8,8 @@ import { _do } from 'rxjs/operator/do';
 import { take } from 'rxjs/operator/take';
 import { skip } from 'rxjs/operator/skip';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '../angularfire2';
-import { AngularFireAuth, AngularFireAuthModule } from './index';
+import { AngularFireAuth } from './auth';
+import { AngularFireAuthModule } from './auth.module';
 import { COMMON_CONFIG } from '../test-config';
 
 function authTake(auth: Observable<any>, count: number): Observable<any> {
@@ -45,7 +46,7 @@ describe('AngularFireAuth', () => {
       app = app_;
       afAuth = _auth;
       authData = null;
-      authCb = null;      
+      authCb = null;
     })();
 
     mockAuthState = new Subject<firebase.User>();

src/auth/index.ts

@@ -0,0 +1,7 @@
+export * from './database/database';
+export * from './database/firebase_list_factory';
+export * from './database/firebase_list_observable';
+export * from './database/firebase_object_factory';
+export * from './database/firebase_object_observable';
+export * from './database/query_observable';
+export * from './database/database.module';

src/database.ts

@@ -2,16 +2,18 @@ import * as firebase from 'firebase/app';
 import 'firebase/database';
 import { Inject, Injectable } from '@angular/core';
 import { FirebaseAppConfigToken, FirebaseAppConfig, FirebaseApp } from '../angularfire2';
-import { FirebaseListFactory } from './index';
+import { FirebaseListFactory } from './firebase_list_factory';
+import { FirebaseListObservable } from './firebase_list_observable';
 import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts, PathReference } from '../interfaces';
+import { FirebaseObjectFactory } from './firebase_object_factory';
+import { FirebaseObjectObservable } from './firebase_object_observable';
 import * as utils from '../utils';
-import { FirebaseListObservable, FirebaseObjectObservable, FirebaseObjectFactory } from './index';
 
 @Injectable()
 export class AngularFireDatabase {
-  
+
   constructor(public app: FirebaseApp) {}
-  
+
   list(pathOrRef: PathReference, opts?:FirebaseListFactoryOpts):FirebaseListObservable<any[]> {
     const ref = utils.getRef(this.app, pathOrRef);
     return FirebaseListFactory(utils.getRef(this.app, ref), opts);
@@ -25,4 +27,3 @@ export class AngularFireDatabase {
   }
 
 }
-

src/database/database.ts

@@ -1,5 +1,9 @@
 import * as firebase from 'firebase/app';
-import { FirebaseListFactory, FirebaseListObservable, FirebaseObjectFactory, onChildAdded, onChildChanged, onChildRemoved, onChildUpdated, AngularFireDatabase, AngularFireDatabaseModule } from './index';
+import { AngularFireDatabase } from './database';
+import { AngularFireDatabaseModule } from './database.module';
+import { FirebaseListObservable } from './firebase_list_observable';
+import { FirebaseListFactory, onChildAdded, onChildChanged, onChildRemoved, onChildUpdated } from './firebase_list_factory';
+import { FirebaseObjectFactory } from './firebase_object_factory';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from '../angularfire2';
 import { TestBed, inject } from '@angular/core/testing';
 import * as utils from '../utils';

src/database/firebase_list_factory.spec.ts

@@ -1,4 +1,7 @@
-import { FirebaseListObservable, AngularFireDatabase, AngularFireDatabaseModule } from './index';
+import { AngularFireDatabase } from './database';
+import { AngularFireDatabaseModule } from './database.module';
+import { FirebaseListObservable } from './firebase_list_observable';
+import { FirebaseObjectFactory } from './firebase_object_factory';
 import { Observer } from 'rxjs/Observer';
 import { map } from 'rxjs/operator/map';
 import * as firebase from 'firebase/app';

src/database/firebase_list_observable.spec.ts

@@ -1,6 +1,9 @@
 import * as firebase from 'firebase/app';
 import { Subscription } from 'rxjs';
-import { FirebaseObjectFactory, FirebaseObjectObservable, AngularFireDatabaseModule, AngularFireDatabase } from './index';
+import { AngularFireDatabase } from './database';
+import { AngularFireDatabaseModule } from './database.module';
+import { FirebaseObjectObservable } from './firebase_object_observable';
+import { FirebaseObjectFactory } from './firebase_object_factory';
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '../angularfire2';
 import { COMMON_CONFIG } from '../test-config';