chore(build): database build

davideast · davideast · commit 9db873e2daf7 · 2017-08-04T09:39:22.000-06:00
diff --git a/src/auth/auth.spec.ts b/src/auth/auth.spec.ts
@@ -7,10 +7,10 @@ import { TestBed, inject } from '@angular/core/testing';
 import { _do } from 'rxjs/operator/do';
 import { take } from 'rxjs/operator/take';
 import { skip } from 'rxjs/operator/skip';
-import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '../core';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
 import { AngularFireAuth } from './auth';
 import { AngularFireAuthModule } from './auth.module';
-import { COMMON_CONFIG } from '../test-config';
+import { COMMON_CONFIG } from './test-config';
 
 function authTake(auth: Observable<any>, count: number): Observable<any> {
   return take.call(auth, 1);
diff --git a/src/auth/test-config.ts b/src/auth/test-config.ts
diff --git a/src/core/angularfire2.spec.ts b/src/core/angularfire2.spec.ts
@@ -3,7 +3,7 @@ import { TestBed, inject, withModule, async } from '@angular/core/testing';
 import { ReflectiveInjector, Provider, PlatformRef, NgModule, Compiler, ApplicationRef, CompilerFactory } from '@angular/core';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from './angularfire2';
 import { Subscription } from 'rxjs/Subscription';
-import { COMMON_CONFIG } from '../test-config';
+import { COMMON_CONFIG } from './test-config';
 import { BrowserModule } from '@angular/platform-browser';
 
 describe('angularfire', () => {
diff --git a/src/core/test-config.ts b/src/core/test-config.ts
@@ -0,0 +1,7 @@
+
+export const COMMON_CONFIG = {
+  apiKey: "AIzaSyBVSy3YpkVGiKXbbxeK0qBnu3-MNZ9UIjA",
+  authDomain: "angularfire2-test.firebaseapp.com",
+  databaseURL: "https://angularfire2-test.firebaseio.com",
+  storageBucket: "angularfire2-test.appspot.com",
+};
diff --git a/src/database/database.module.ts b/src/database/database.module.ts
@@ -1,7 +1,7 @@
 import { NgModule } from '@angular/core';
 import * as firebase from 'firebase/app';
 import 'firebase/database';
-import { AngularFireModule, FirebaseApp } from '../core';
+import { AngularFireModule, FirebaseApp } from 'angularfire2';
 import { AngularFireDatabase } from './database';
 
 export function _getAngularFireDatabase(app: FirebaseApp) {
diff --git a/src/database/database.ts b/src/database/database.ts
@@ -1,13 +1,13 @@
 import * as firebase from 'firebase/app';
 import 'firebase/database';
 import { Inject, Injectable } from '@angular/core';
-import { FirebaseAppConfigToken, FirebaseAppConfig, FirebaseApp } from '../core';
+import { FirebaseAppConfigToken, FirebaseAppConfig, FirebaseApp } from 'angularfire2';
 import { FirebaseListFactory } from './firebase_list_factory';
 import { FirebaseListObservable } from './firebase_list_observable';
-import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts, PathReference } from '../interfaces';
+import { FirebaseListFactoryOpts, FirebaseObjectFactoryOpts, PathReference } from './interfaces';
 import { FirebaseObjectFactory } from './firebase_object_factory';
 import { FirebaseObjectObservable } from './firebase_object_observable';
-import * as utils from '../utils';
+import * as utils from './utils';
 
 @Injectable()
 export class AngularFireDatabase {
diff --git a/src/database/firebase_list_factory.spec.ts b/src/database/firebase_list_factory.spec.ts
@@ -4,12 +4,12 @@ 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 { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2';
 import { TestBed, inject } from '@angular/core/testing';
-import * as utils from '../utils';
-import { Query, AFUnwrappedDataSnapshot } from '../interfaces';
+import * as utils from './utils';
+import { Query, AFUnwrappedDataSnapshot } from './interfaces';
 import { Subscription, Observable, Subject } from 'rxjs';
-import { COMMON_CONFIG } from '../test-config';
+import { COMMON_CONFIG } from './test-config';
 import { _do } from 'rxjs/operator/do';
 import { map } from 'rxjs/operator/map';
 import { skip } from 'rxjs/operator/skip';
diff --git a/src/database/firebase_list_factory.ts b/src/database/firebase_list_factory.ts
@@ -1,12 +1,13 @@
 import * as firebase from 'firebase/app';
-import * as utils from '../utils';
+import { ZoneScheduler } from 'angularfire2';
+import * as utils from './utils';
 import 'firebase/database';
-import { AFUnwrappedDataSnapshot } from '../interfaces';
+import { AFUnwrappedDataSnapshot } from './interfaces';
 import { FirebaseListObservable } from './firebase_list_observable';
 import { Observer } from 'rxjs/Observer';
 import { observeOn } from 'rxjs/operator/observeOn';
 import { observeQuery } from './query_observable';
-import { Query, FirebaseListFactoryOpts, DatabaseReference, DatabaseQuery, DatabaseSnapshot } from '../interfaces';
+import { Query, FirebaseListFactoryOpts, DatabaseReference, DatabaseQuery, DatabaseSnapshot } from './interfaces';
 import { switchMap } from 'rxjs/operator/switchMap';
 import { map } from 'rxjs/operator/map';
 
@@ -186,7 +187,7 @@ function firebaseListObservable(ref: firebase.database.Reference | DatabaseQuery
   });
 
   // TODO: should be in the subscription zone instead
-  return observeOn.call(listObs, new utils.ZoneScheduler(Zone.current));
+  return observeOn.call(listObs, new ZoneScheduler(Zone.current));
 }
 
 export function onChildAdded(arr:any[], child:any, toKey:(element:any)=>string, prevKey:string): any[] {
diff --git a/src/database/firebase_list_observable.spec.ts b/src/database/firebase_list_observable.spec.ts
@@ -5,10 +5,10 @@ import { FirebaseObjectFactory } from './firebase_object_factory';
 import { Observer } from 'rxjs/Observer';
 import { map } from 'rxjs/operator/map';
 import * as firebase from 'firebase/app';
-import { unwrapMapFn } from '../utils';
-import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from '../angularfire2';
+import { unwrapMapFn } from './utils';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule} from 'angularfire2';
 import { TestBed, inject } from '@angular/core/testing';
-import { COMMON_CONFIG } from '../test-config';
+import { COMMON_CONFIG } from './test-config';
 
 describe('FirebaseListObservable', () => {
   let O: FirebaseListObservable<any>;
diff --git a/src/database/firebase_list_observable.ts b/src/database/firebase_list_observable.ts
@@ -4,8 +4,8 @@ import { Subscriber } from 'rxjs/Subscriber';
 import { Subscription } from 'rxjs/Subscription';
 import * as firebase from 'firebase/app';
 import 'firebase/database';
-import * as utils from '../utils';
-import { AFUnwrappedDataSnapshot, FirebaseOperationCases, QueryReference, DatabaseSnapshot, DatabaseReference } from '../interfaces';
+import * as utils from './utils';
+import { AFUnwrappedDataSnapshot, FirebaseOperationCases, QueryReference, DatabaseSnapshot, DatabaseReference } from './interfaces';
 
 export type FirebaseOperation = string | firebase.database.Reference | firebase.database.DataSnapshot | AFUnwrappedDataSnapshot;
 
diff --git a/src/database/firebase_object_factory.spec.ts b/src/database/firebase_object_factory.spec.ts
@@ -5,8 +5,8 @@ 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';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
+import { COMMON_CONFIG } from './test-config';
 
 describe('FirebaseObjectFactory', () => {
   let i = 0;
diff --git a/src/database/firebase_object_factory.ts b/src/database/firebase_object_factory.ts
@@ -1,10 +1,11 @@
 import { FirebaseObjectObservable } from './firebase_object_observable';
+import { ZoneScheduler } from 'angularfire2';
 import { Observer } from 'rxjs/Observer';
 import { observeOn } from 'rxjs/operator/observeOn';
 import * as firebase from 'firebase/app';
 import 'firebase/database';
-import * as utils from '../utils';
-import { FirebaseObjectFactoryOpts, DatabaseReference } from '../interfaces';
+import * as utils from './utils';
+import { FirebaseObjectFactoryOpts, DatabaseReference } from './interfaces';
 
 export function FirebaseObjectFactory (
   ref: DatabaseReference,
@@ -21,5 +22,5 @@ export function FirebaseObjectFactory (
   }, ref);
 
   // TODO: should be in the subscription zone instead
-  return observeOn.call(objectObservable, new utils.ZoneScheduler(Zone.current));
+  return observeOn.call(objectObservable, new ZoneScheduler(Zone.current));
 }
diff --git a/src/database/firebase_object_observable.spec.ts b/src/database/firebase_object_observable.spec.ts
@@ -1,6 +1,6 @@
 import { TestBed, inject } from '@angular/core/testing';
-import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from '../angularfire2';
-import { COMMON_CONFIG } from '../test-config';
+import { FirebaseApp, FirebaseAppConfig, AngularFireModule } from 'angularfire2';
+import { COMMON_CONFIG } from './test-config';
 import { AngularFireDatabase } from './database';
 import { AngularFireDatabaseModule } from './database.module';
 import { FirebaseObjectObservable } from './firebase_object_observable';
diff --git a/src/database/interfaces.ts b/src/database/interfaces.ts
diff --git a/src/database/package.json b/src/database/package.json
@@ -1 +1,30 @@
-{ "main": "../bundles/angularfire2.umd.js" }
+{
+  "name": "angularfire2/database",
+  "version": "ANGULARFIRE2_VERSION",
+  "description": "The database module",
+  "main": "../bundles/database.umd.js",
+  "module": "index.js",
+  "es2015": "./es2015/index.js",
+  "keywords": [
+    "angular",
+    "firebase",
+    "rxjs"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/angular/angularfire2.git"
+  },
+  "author": "angular,firebase",
+  "license": "MIT",
+  "peerDependencies": {
+    "angularfire2": "ANGULARFIRE2_VERSION",
+    "@angular/common": "ANGULAR_VERSION",
+    "@angular/core": "ANGULAR_VERSION",
+    "@angular/platform-browser": "ANGULAR_VERSION",
+    "@angular/platform-browser-dynamic": "ANGULAR_VERSION",
+    "firebase": "FIREBASE_VERSION",
+    "rxjs": "RXJS_VERSION",
+    "zone.js": "ZONEJS_VERSION"
+  },
+  "typings": "index.d.ts"
+}
diff --git a/src/database/query_observable.spec.ts b/src/database/query_observable.spec.ts
@@ -1,7 +1,7 @@
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { Subject } from 'rxjs/Subject';
-import { Query, ScalarQuery } from '../interfaces';
+import { Query, ScalarQuery } from './interfaces';
 import { getOrderObservables, observeQuery } from './query_observable';
 
 function scalarQueryTest(query: ScalarQuery, done: any) {
diff --git a/src/database/query_observable.ts b/src/database/query_observable.ts
@@ -6,8 +6,8 @@ import { combineLatest } from 'rxjs/operator/combineLatest';
 import { merge } from 'rxjs/operator/merge';
 import { map } from 'rxjs/operator/map';
 import { auditTime } from 'rxjs/operator/auditTime';
-import { Query, ScalarQuery, OrderByOptions, OrderBySelection, LimitToOptions, LimitToSelection, Primitive } from '../interfaces';
-import { hasKey, isNil } from '../utils';
+import { Query, ScalarQuery, OrderByOptions, OrderBySelection, LimitToOptions, LimitToSelection, Primitive } from './interfaces';
+import { hasKey, isNil } from './utils';
 
 export function observeQuery(query: Query, audit: boolean = true): Observable<ScalarQuery> {
   if (isNil(query)) {
diff --git a/src/database/test-config.ts b/src/database/test-config.ts
@@ -0,0 +1,7 @@
+
+export const COMMON_CONFIG = {
+  apiKey: "AIzaSyBVSy3YpkVGiKXbbxeK0qBnu3-MNZ9UIjA",
+  authDomain: "angularfire2-test.firebaseapp.com",
+  databaseURL: "https://angularfire2-test.firebaseio.com",
+  storageBucket: "angularfire2-test.appspot.com",
+};
diff --git a/src/database/tsconfig-build.json b/src/database/tsconfig-build.json
@@ -0,0 +1,36 @@
+{
+  "compilerOptions": {
+    "baseUrl": ".",
+    "experimentalDecorators": true,
+    "emitDecoratorMetadata": true,
+    "module": "es2015",
+    "target": "es2015",
+    "noImplicitAny": false,
+    "outDir": "../../dist/packages-dist/database/es2015",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "declaration": false,
+    "removeComments": true,
+    "strictNullChecks": true,
+    "lib": [
+      "es2015",
+      "dom"
+    ],
+    "skipLibCheck": true,
+    "moduleResolution": "node",
+    "paths": {
+      "angularfire2": ["../../dist/packages-dist"]
+    }
+  },
+  "files": [
+    "index.ts",
+    "../../node_modules/zone.js/dist/zone.js.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "strictMetadataEmit": true,
+    "enableSummariesForJit": false
+  }
+}
+
diff --git a/src/database/tsconfig-esm.json b/src/database/tsconfig-esm.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig-build.json",
+  "compilerOptions": {
+    "target": "es5",
+    "outDir": "../../dist/packages-dist/database",
+    "declaration": true
+  }
+}
diff --git a/src/database/utils.ts b/src/database/utils.ts
@@ -3,7 +3,7 @@ import { Subscription } from 'rxjs/Subscription';
 import { Scheduler } from 'rxjs/Scheduler';
 import { queue } from 'rxjs/scheduler/queue';
 import { AFUnwrappedDataSnapshot, PathReference, DatabaseReference } from './interfaces';
-import { FirebaseApp } from './app/index';
+import { FirebaseApp } from 'angularfire2';
 
 const REGEX_ABSOLUTE_URL = /^[a-z]+:\/\/.*/;
 
diff --git a/src/test-root.ts b/src/test-root.ts
@@ -5,4 +5,3 @@ import './database/firebase_list_observable.spec';
 import './database/firebase_object_observable.spec';
 import './database/query_observable.spec';
 import './auth/auth.spec';
-
diff --git a/tools/build.js b/tools/build.js
@@ -12,6 +12,12 @@ const GLOBALS = {
   'rxjs/observable/merge': 'Rx.Observable',
   'rxjs/operator/share': 'Rx.Observable.prototype',
   'rxjs/operator/observeOn': 'Rx.Observable.prototype',
+  'rxjs/observable/of': 'Rx.Observable.prototype',
+  'rxjs/operator/combineLatest': 'Rx.Observable.prototype',
+  'rxjs/operator/merge': 'Rx.Observable.prototype',
+  'rxjs/operator/map': 'Rx.Observable.prototype',
+  'rxjs/operator/auditTime': 'Rx.Observable.prototype',
+  'rxjs/operator/switchMap': 'Rx.Observable.prototype',
   'rxjs/operator': 'Rx.Observable.prototype',
   '@angular/core': 'ng.core',
   '@angular/compiler': 'ng.compiler',
@@ -102,9 +108,11 @@ function buildModule(name, globals) {
 function buildLibrary(globals) {
   const core$ = buildModule('core', globals);
   const auth$ = buildModule('auth', globals);
+  const db$ = buildModule('database', globals);
   return Observable
     .forkJoin(core$)
-    .switchMapTo(auth$);
+    .switchMapTo(auth$)
+    .switchMapTo(db$);
 }
 
 const $lib = buildLibrary(GLOBALS).subscribe(
