Fix build issue

package.json

@@ -6,16 +6,16 @@
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
   "license": "MIT",
   "devDependencies": {
-    "@angular/compiler": "5.0.0",
-    "@angular/compiler-cli": "5.0.0",
-    "@angular/core": "5.0.0",
+    "@angular/compiler": "5.0.1",
+    "@angular/compiler-cli": "5.0.1",
+    "@angular/core": "5.0.1",
     "@types/cordova": "0.0.34",
-    "@types/jasmine": "^2.5.51",
-    "@types/node": "^8.0.47",
+    "@types/jasmine": "^2.6.3",
+    "@types/node": "^8.0.50",
     "canonical-path": "0.0.2",
     "child-process-promise": "2.2.1",
-    "conventional-changelog-cli": "1.3.1",
-    "cpr": "2.0.2",
+    "conventional-changelog-cli": "1.3.4",
+    "cpr": "2.0.0",
     "cz-conventional-changelog": "2.0.0",
     "decamelize": "1.2.0",
     "dgeni": "0.4.7",
@@ -43,7 +43,7 @@
     "semver": "5.3.0",
     "tslint": "3.15.1",
     "tslint-ionic-rules": "0.0.8",
-    "typescript": "~2.4.2",
+    "typescript": "2.4.2",
     "zone.js": "0.8.18"
   },
   "scripts": {

src/@ionic-native/core/decorators.ts

@@ -105,17 +105,6 @@ export interface CordovaCheckOptions {
   observable?: boolean;
 }
 
-export interface CordovaFiniteObservableOptions extends CordovaOptions {
-  /**
-   * Function that gets a result returned from plugin's success callback, and decides whether it is last value and observable should complete.
-   */
-  resultFinalPredicate?: (result: any) => boolean;
-  /**
-   * Function that gets called after resultFinalPredicate, and removes service data that indicates end of stream from the result.
-   */
-  resultTransform?: (result: any) => any;
-}
-
 /**
  * @private
  */
@@ -167,7 +156,6 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) {
   };
 }
 
-
 /**
  * @private
  *
@@ -323,39 +311,3 @@ export function CordovaFunctionOverride(opts: any = {}) {
   };
 }
 
-
-/**
- * @private
- *
- * Wraps method that returns an observable that can be completed. Provided opts.resultFinalPredicate dictates when the observable completes.
- *
- */
-export function CordovaFiniteObservable(opts: CordovaFiniteObservableOptions = {}) {
-  if (opts.observable === false) {
-    throw new Error('CordovaFiniteObservable decorator can only be used on methods that returns observable. Please provide correct option.');
-  }
-  opts.observable = true;
-  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
-    return {
-      value: function(...args: any[]) {
-        let wrappedObservable: Observable<any> = wrap(this, methodName, opts).apply(this, args);
-        return new Observable<any>((observer) => {
-          let wrappedSubscription = wrappedObservable.subscribe({
-            next: (x) => {
-              observer.next(opts.resultTransform ? opts.resultTransform(x) : x);
-              if (opts.resultFinalPredicate && opts.resultFinalPredicate(x)) {
-                observer.complete();
-              }
-            },
-            error: (err) => { observer.error(err); },
-            complete: () => { observer.complete(); }
-          });
-          return () => {
-            wrappedSubscription.unsubscribe();
-          };
-        });
-      },
-      enumerable: true
-    };
-  };
-}

src/@ionic-native/plugins/photo-library/index.ts

@@ -1,7 +1,52 @@
-import { Plugin, Cordova, CordovaFiniteObservable, IonicNativePlugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin, CordovaOptions, wrap } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
 import { Injectable } from '@angular/core';
 
+export interface CordovaFiniteObservableOptions extends CordovaOptions {
+  /**
+   * Function that gets a result returned from plugin's success callback, and decides whether it is last value and observable should complete.
+   */
+  resultFinalPredicate?: string;
+  /**
+   * Function that gets called after resultFinalPredicate, and removes service data that indicates end of stream from the result.
+   */
+  resultTransform?: string;
+}
+
+/**
+ * @private
+ *
+ * Wraps method that returns an observable that can be completed. Provided opts.resultFinalPredicate dictates when the observable completes.
+ *
+ */
+export function CordovaFiniteObservable(opts: CordovaFiniteObservableOptions = {}) {
+  opts.observable = true;
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
+    return {
+      value: function(...args: any[]) {
+        const wrappedObservable: Observable<any> = wrap(this, methodName, opts).apply(this, args);
+        return new Observable<any>((observer: Observer<any>) => {
+          const wrappedSubscription = wrappedObservable.subscribe({
+            next: (x: any) => {
+              observer.next(opts.resultTransform ? x[opts.resultTransform] : x);
+              if (opts.resultFinalPredicate && x[opts.resultFinalPredicate]) {
+                observer.complete();
+              }
+            },
+            error: (err: any) => { observer.error(err); },
+            complete: () => { observer.complete(); }
+          });
+          return () => {
+            wrappedSubscription.unsubscribe();
+          };
+        });
+      },
+      enumerable: true
+    };
+  };
+}
+
 /**
  * @name Photo Library
  * @description
@@ -58,8 +103,8 @@ export class PhotoLibrary extends IonicNativePlugin {
    */
   @CordovaFiniteObservable({
     callbackOrder: 'reverse',
-    resultFinalPredicate: (result: { isLastChunk: boolean }) => { return result.isLastChunk; },
-    resultTransform: (result: { library: LibraryItem[] }) => { return result.library; },
+    resultFinalPredicate: 'isLastChunk',
+    resultTransform: 'library'
   })
   getLibrary(options?: GetLibraryOptions): Observable<LibraryItem[]> { return; }
 
@@ -69,7 +114,7 @@ export class PhotoLibrary extends IonicNativePlugin {
    * @return { Promise<void>} Returns a promise that resolves when permissions are granted, and fails when not.
    */
   @Cordova({
-    callbackOrder: 'reverse',
+    callbackOrder: 'reverse'
   })
   requestAuthorization(options?: RequestAuthorizationOptions): Promise<void> { return; }
 
@@ -78,7 +123,7 @@ export class PhotoLibrary extends IonicNativePlugin {
    * @return {Promise<AlbumItem[]>} Resolves to list of albums.
    */
   @Cordova({
-    callbackOrder: 'reverse',
+    callbackOrder: 'reverse'
   })
   getAlbums(): Promise<AlbumItem[]> { return; }