(storage) Update to rxjs pipeable operators

src/storage/observable/fromTask.ts

@@ -1,5 +1,5 @@
 import { UploadTask, UploadTaskSnapshot } from '@firebase/storage-types';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 export function fromTask(task: UploadTask) {
   return new Observable<UploadTaskSnapshot>(subscriber => {

src/storage/ref.ts

@@ -1,7 +1,6 @@
 import { SettableMetadata, UploadMetadata, Reference, StringFormat } from '@firebase/storage-types';
 import { createUploadTask, AngularFireUploadTask } from './task';
-import { Observable } from 'rxjs/Observable';
-import { from } from 'rxjs/observable/from';
+import { Observable } from 'rxjs';
 import { FirebaseZoneScheduler } from 'angularfire2';
 
 export interface AngularFireStorageReference {
@@ -23,17 +22,17 @@ export function createStorageRef(ref: Reference, scheduler: FirebaseZoneSchedule
   return {
     getDownloadURL: () => scheduler.keepUnstableUntilFirst(
       scheduler.runOutsideAngular(
-        from(ref.getDownloadURL())
+        Observable.from(ref.getDownloadURL())
       )
     ),
     getMetadata: () => scheduler.keepUnstableUntilFirst(
       scheduler.runOutsideAngular(
-        from(ref.getMetadata())
+        Observable.from(ref.getMetadata())
       )
     ),
-    delete: () => from(ref.delete()),
+    delete: () => Observable.from(ref.delete()),
     child: (path: string) => createStorageRef(ref.child(path), scheduler),
-    updateMetatdata: (meta: SettableMetadata) => from(ref.updateMetadata(meta)),
+    updateMetatdata: (meta: SettableMetadata) => Observable.from(ref.updateMetadata(meta)),
     put: (data: any, metadata?: UploadMetadata) => {
       const task = ref.put(data, metadata);
       return createUploadTask(task);

src/storage/storage.spec.ts

@@ -1,5 +1,5 @@
-import { Observable } from 'rxjs/Observable'
-import { forkJoin } from 'rxjs/observable/forkJoin';
+import { Observable } from 'rxjs'
+import { map, mergeMap, tap } from 'rxjs/operators';
 import { TestBed, inject } from '@angular/core/testing';
 import { FirebaseApp, FirebaseAppConfig, AngularFireModule, FirebaseAppName } from 'angularfire2';
 import { AngularFireStorageModule, AngularFireStorage, AngularFireUploadTask, StorageBucket } from 'angularfire2/storage';
@@ -89,13 +89,15 @@ describe('AngularFireStorage', () => {
       const ref = afStorage.ref('af.json');
       const task = ref.put(blob);
       // Wait for the upload
-      const sub = forkJoin(task.snapshotChanges())
-        // get the url download
-        .mergeMap(() => ref.getDownloadURL())
-        // assert the URL
-        .do(url => expect(url).toBeDefined())
-        // Delete the file
-        .mergeMap(url => ref.delete())
+      const sub = Observable.forkJoin(task.snapshotChanges())
+        .pipe(
+          // get the url download
+          mergeMap(() => ref.getDownloadURL()),
+          // assert the URL
+          tap(url => expect(url).toBeDefined()),
+          // Delete the file
+          mergeMap(url => ref.delete())
+        )
         // finish the test
         .subscribe(done, done.fail);
     });
@@ -106,13 +108,15 @@ describe('AngularFireStorage', () => {
       const ref = afStorage.ref('af.json');
       const task = ref.put(blob, { customMetadata: { blah: 'blah' } });
       // Wait for the upload
-      const sub = forkJoin(task.snapshotChanges())
-        // get the metadata download
-        .mergeMap(() => ref.getMetadata())
-        // assert the URL
-        .do(meta => expect(meta.customMetadata).toEqual({ blah: 'blah' }))
-        // Delete the file
-        .mergeMap(meta => ref.delete())
+      const sub = Observable.forkJoin(task.snapshotChanges())
+        .pipe(
+          // get the metadata download
+          mergeMap(() => ref.getMetadata()),
+          // assert the URL
+          tap(meta => expect(meta.customMetadata).toEqual({ blah: 'blah' })),
+          // Delete the file
+          mergeMap(meta => ref.delete())
+        )
         // finish the test
         .subscribe(done, done.fail);
     });
@@ -179,13 +183,15 @@ describe('AngularFireStorage w/options', () => {
       const ref = afStorage.ref('af.json');
       const task = ref.put(blob);
       // Wait for the upload
-      const sub = forkJoin(task.snapshotChanges())
-        // get the url download
-        .mergeMap(() => ref.getDownloadURL())
-        // assert the URL
-        .do(url => expect(url).toMatch(new RegExp(`https:\\/\\/firebasestorage\\.googleapis\\.com\\/v0\\/b\\/${FIREBASE_STORAGE_BUCKET}\\/o\\/af\\.json`)))
-        // Delete the file
-        .mergeMap(url => ref.delete())
+      const sub = Observable.forkJoin(task.snapshotChanges())
+        .pipe(
+          // get the url download
+          mergeMap(() => ref.getDownloadURL()),
+          // assert the URL
+          tap(url => expect(url).toMatch(new RegExp(`https:\\/\\/firebasestorage\\.googleapis\\.com\\/v0\\/b\\/${FIREBASE_STORAGE_BUCKET}\\/o\\/af\\.json`))),
+          // Delete the file
+          mergeMap(url => ref.delete())
+        )
         // finish the test
         .subscribe(done, done.fail);
     });

src/storage/storage.ts

@@ -2,7 +2,7 @@ import { Injectable, Inject, Optional, InjectionToken, NgZone, PLATFORM_ID } fro
 import { FirebaseStorage, UploadMetadata } from '@firebase/storage-types';
 import { createStorageRef, AngularFireStorageReference } from './ref';
 import { createUploadTask, AngularFireUploadTask } from './task';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { FirebaseAppConfig, FirebaseAppName, FirebaseZoneScheduler, _firebaseAppFactory } from 'angularfire2';
 import { FirebaseOptions } from '@firebase/app-types';
 

src/storage/task.ts

@@ -1,6 +1,6 @@
 import { UploadTaskSnapshot, UploadTask } from '@firebase/storage-types';
 import { fromTask } from './observable/fromTask';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 import { map, filter } from 'rxjs/operators';
 import { from } from 'rxjs/observable/from';