Revert "chore(package): bump dependencies and lint rules"

This reverts commit 21ad4734fa.

package.json

@@ -6,44 +6,45 @@
   "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
   "license": "MIT",
   "devDependencies": {
-    "@angular/compiler": "5.2.9",
+    "@angular/compiler": "4.4.4",
-    "@angular/compiler-cli": "5.2.9",
+    "@angular/compiler-cli": "4.4.4",
-    "@angular/core": "5.2.9",
+    "@angular/core": "4.4.4",
     "@types/cordova": "0.0.34",
-    "@types/jasmine": "^2.8.6",
+    "@types/jasmine": "^2.6.3",
-    "@types/node": "^8.9.5",
+    "@types/node": "^8.0.50",
     "canonical-path": "0.0.2",
     "child-process-promise": "2.2.1",
-    "conventional-changelog-cli": "^1.3.16",
+    "conventional-changelog-cli": "1.3.4",
-    "cpr": "^3.0.1",
+    "cpr": "2.0.0",
-    "cz-conventional-changelog": "^2.1.0",
+    "cz-conventional-changelog": "2.0.0",
-    "decamelize": "^2.0.0",
+    "decamelize": "1.2.0",
-    "dgeni": "^0.4.9",
+    "dgeni": "0.4.7",
     "dgeni-packages": "0.16.10",
-    "fs-extra": "^5.0.0",
+    "fs-extra": "2.0.0",
+    "fs-extra-promise": "0.4.1",
     "gulp": "3.9.1",
     "gulp-rename": "1.2.2",
-    "gulp-replace": "^0.6.1",
+    "gulp-replace": "0.5.4",
-    "gulp-tslint": "^8.1.3",
+    "gulp-tslint": "6.1.2",
-    "jasmine-core": "^3.1.0",
+    "jasmine-core": "^2.6.1",
-    "karma": "^2.0.0",
+    "karma": "^1.7.0",
     "karma-cli": "^1.0.1",
-    "karma-jasmine": "^1.1.1",
+    "karma-jasmine": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.4",
-    "karma-typescript": "^3.0.12",
+    "karma-typescript": "^3.0.1",
-    "karma-typescript-es6-transform": "^1.0.4",
+    "karma-typescript-es6-transform": "^1.0.0",
-    "lodash": "^4.17.5",
+    "lodash": "4.17.4",
     "minimist": "1.2.0",
     "node-html-encoder": "0.0.2",
-    "q": "^1.5.1",
+    "q": "1.5.0",
-    "queue": "^4.4.2",
+    "queue": "4.2.1",
-    "rimraf": "^2.6.2",
+    "rimraf": "2.6.1",
-    "rxjs": "^5.5.7",
+    "rxjs": "5.5.2",
-    "semver": "^5.5.0",
+    "semver": "5.3.0",
-    "tslint": "^5.9.1",
+    "tslint": "3.15.1",
-    "tslint-ionic-rules": "0.0.9",
+    "tslint-ionic-rules": "0.0.8",
-    "typescript": "~2.6.2",
+    "typescript": "~2.4.2",
-    "zone.js": "0.8.20"
+    "zone.js": "0.8.18"
   },
   "scripts": {
     "start": "npm run test:watch",

scripts/build/build.js

@@ -1,6 +1,6 @@
-'use strict';
+"use strict";
 // Node module dependencies
-const fs = require('fs-extra'),
+const fs = require('fs-extra-promise').useFs(require('fs-extra')),
   queue = require('queue'),
   path = require('path'),
   exec = require('child_process').exec;
@@ -15,6 +15,7 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native
   BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/@ionic-native'), // dist directory root path
   BUILD_CORE_DIST = path.resolve(BUILD_DIST_ROOT, 'core'); // core dist directory path
 
+
 // dependency versions
 const ANGULAR_VERSION = '*',
   RXJS_VERSION = '^5.0.1',
@@ -23,13 +24,13 @@ const ANGULAR_VERSION = '*',
 
 // package dependencies
 const CORE_PEER_DEPS = {
-  rxjs: RXJS_VERSION
+  'rxjs': RXJS_VERSION
 };
 
 const PLUGIN_PEER_DEPS = {
   '@ionic-native/core': MIN_CORE_VERSION,
   '@angular/core': ANGULAR_VERSION,
-  rxjs: RXJS_VERSION
+  'rxjs': RXJS_VERSION
 };
 
 // set peer dependencies for all plugins
@@ -43,10 +44,8 @@ fs.mkdirpSync(BUILD_TMP);
 console.log('Preparing core module package.json');
 CORE_PACKAGE_JSON.version = IONIC_NATIVE_VERSION;
 CORE_PACKAGE_JSON.peerDependencies = CORE_PEER_DEPS;
-fs.writeJsonSync(
+fs.writeJsonSync(path.resolve(BUILD_CORE_DIST, 'package.json'), CORE_PACKAGE_JSON);
-  path.resolve(BUILD_CORE_DIST, 'package.json'),
+
-  CORE_PACKAGE_JSON
-);
 
 // Fetch a list of the plugins
 const PLUGINS = fs.readdirSync(PLUGINS_PATH);
@@ -60,9 +59,7 @@ const index = pluginsToBuild.indexOf('ignore-errors');
 if (index > -1) {
   ignoreErrors = true;
   pluginsToBuild.splice(index, 1);
-  console.log(
+  console.log('Build will continue even if errors were thrown. Errors will be printed when build finishes.');
-    'Build will continue even if errors were thrown. Errors will be printed when build finishes.'
-  );
 }
 
 if (!pluginsToBuild.length) {
@@ -74,9 +71,12 @@ const QUEUE = queue({
   concurrency: require('os').cpus().length
 });
 
+
 // Function to process a single plugin
 const addPluginToQueue = pluginName => {
-  QUEUE.push(callback => {
+
+  QUEUE.push((callback) => {
+
     console.log(`Building plugin: ${pluginName}`);
 
     const PLUGIN_BUILD_DIR = path.resolve(BUILD_TMP, 'plugins', pluginName),
@@ -84,10 +84,10 @@ const addPluginToQueue = pluginName => {
 
     let tsConfigPath;
 
-    fs
+    fs.mkdirpAsync(PLUGIN_BUILD_DIR) // create tmp build dir
-      .mkdirs(PLUGIN_BUILD_DIR) // create tmp build dir
+      .then(() => fs.mkdirpAsync(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
-      .then(() => fs.mkdirs(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
       .then(() => {
+
         // Write tsconfig.json
         const tsConfig = JSON.parse(JSON.stringify(PLUGIN_TS_CONFIG));
         tsConfig.files = [PLUGIN_SRC_PATH];
@@ -95,7 +95,7 @@ const addPluginToQueue = pluginName => {
 
         tsConfigPath = path.resolve(PLUGIN_BUILD_DIR, 'tsconfig.json');
 
-        return fs.writeJson(tsConfigPath, tsConfig);
+        return fs.writeJsonAsync(tsConfigPath, tsConfig);
       })
       .then(() => {
         // clone package.json
@@ -104,39 +104,42 @@ const addPluginToQueue = pluginName => {
         packageJson.name = `@ionic-native/${pluginName}`;
         packageJson.version = IONIC_NATIVE_VERSION;
 
-        return fs.writeJson(
+        return fs.writeJsonAsync(path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson);
-          path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'),
-          packageJson
-        );
       })
       .then(() => {
+
         // compile the plugin
-        exec(
+        exec(`${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`, (err, stdout, stderr) => {
-          `${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`,
+
-          (err, stdout, stderr) => {
+          if (err) {
-            if (err) {
+
-              if (!ignoreErrors) {
+            if (!ignoreErrors) {
-                // oops! something went wrong.
+              // oops! something went wrong.
-                console.log(err);
+              console.log(err);
-                callback(`\n\nBuilding ${pluginName} failed.`);
+              callback(`\n\nBuilding ${pluginName} failed.`);
-                return;
+              return;
-              } else {
+            } else {
-                errors.push(err);
+              errors.push(err);
-              }
             }
 
-            // we're done with this plugin!
-            callback();
           }
-        );
+
+          // we're done with this plugin!
+          callback();
+
+        });
+
       })
       .catch(callback);
+
   }); // QUEUE.push end
+
 };
 
 pluginsToBuild.forEach(addPluginToQueue);
 
-QUEUE.start(err => {
+QUEUE.start((err) => {
+
   if (err) {
     console.log('Error building plugins.');
     console.log(err);
@@ -152,4 +155,5 @@ QUEUE.start(err => {
   } else {
     console.log('Done processing plugins!');
   }
+
 });

scripts/build/publish.js

@@ -1,10 +1,11 @@
-'use strict';
+"use strict";
 // Node module dependencies
-const fs = require('fs-extra'),
+const fs = require('fs-extra-promise').useFs(require('fs-extra')),
   queue = require('queue'),
   path = require('path'),
   exec = require('child-process-promise').exec;
 
+
 const ROOT = path.resolve(path.join(__dirname, '../../')),
   DIST = path.resolve(ROOT, 'dist', '@ionic-native');
 
@@ -19,16 +20,15 @@ const QUEUE = queue({
 });
 
 PACKAGES.forEach(packageName => {
+
   QUEUE.push(done => {
+
     console.log(`Publishing @ionic-native/${packageName}`);
     const packagePath = path.resolve(DIST, packageName);
     exec(`npm publish ${packagePath} ${FLAGS}`)
       .then(() => done())
-      .catch(e => {
+      .catch((e) => {
-        if (
+        if (e.stderr && e.stderr.indexOf('previously published version') === -1) {
-          e.stderr &&
-          e.stderr.indexOf('previously published version') === -1
-        ) {
           failedPackages.push({
             cmd: e.cmd,
             stderr: e.stderr
@@ -36,10 +36,13 @@ PACKAGES.forEach(packageName => {
         }
         done();
       });
+
   });
+
 });
 
-QUEUE.start(err => {
+QUEUE.start((err) => {
+
   if (err) {
     console.log('Error publishing ionic-native. ', err);
   } else if (failedPackages.length > 0) {
@@ -48,4 +51,8 @@ QUEUE.start(err => {
   } else {
     console.log('Done publishing ionic-native!');
   }
+
+
+
 });
+

scripts/docs/gulp-tasks.js

@@ -1,40 +1,39 @@
-'use strict';
+"use strict";
 const config = require('../config.json'),
   projectPackage = require('../../package.json'),
   path = require('path'),
-  fs = require('fs-extra'),
+  fs = require('fs-extra-promise').useFs(require('fs-extra')),
   Dgeni = require('dgeni');
 
 module.exports = gulp => {
   gulp.task('docs', [], () => {
+
     try {
+
       const ionicPackage = require('./dgeni-config')(projectPackage.version),
         dgeni = new Dgeni([ionicPackage]);
 
-      return dgeni
+      return dgeni.generate().then(docs => console.log(docs.length + ' docs generated'));
-        .generate()
+
-        .then(docs => console.log(docs.length + ' docs generated'));
     } catch (err) {
       console.log(err.stack);
     }
+
   });
 
   gulp.task('readmes', [], function() {
-    fs.copySync(
+
-      path.resolve(__dirname, '..', '..', 'README.md'),
+    fs.copySync(path.resolve(__dirname, '..', '..', 'README.md'), path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md'));
-      path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md')
-    );
 
     try {
-      const ionicPackage = require('./dgeni-readmes-config')(
+
-          projectPackage.version
+      const ionicPackage = require('./dgeni-readmes-config')(projectPackage.version),
-        ),
         dgeni = new Dgeni([ionicPackage]);
-      return dgeni
+      return dgeni.generate().then(docs => console.log(docs.length + ' README files generated'));
-        .generate()
+
-        .then(docs => console.log(docs.length + ' README files generated'));
     } catch (err) {
       console.log(err.stack);
     }
+
   });
 };

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

@@ -9,17 +9,13 @@ export function checkReady() {
 
   let didFireReady = false;
   document.addEventListener('deviceready', () => {
-    console.log(
+    console.log(`Ionic Native: deviceready event fired after ${(Date.now() - before)} ms`);
-      `Ionic Native: deviceready event fired after ${Date.now() - before} ms`
-    );
     didFireReady = true;
   });
 
   setTimeout(() => {
     if (!didFireReady && !!window.cordova) {
-      console.warn(
+      console.warn(`Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`);
-        `Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`
-      );
     }
   }, DEVICE_READY_TIMEOUT);
 }

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

@@ -1,34 +1,24 @@
 import 'core-js';
-
+import { Plugin, Cordova, CordovaProperty, CordovaCheck, CordovaInstance, InstanceProperty } from './decorators';
-import { Observable } from 'rxjs/Observable';
-
-import {
-  Cordova,
-  CordovaCheck,
-  CordovaInstance,
-  CordovaProperty,
-  InstanceProperty,
-  Plugin
-} from './decorators';
 import { IonicNativePlugin } from './ionic-native-plugin';
 import { ERR_CORDOVA_NOT_AVAILABLE, ERR_PLUGIN_NOT_INSTALLED } from './plugin';
+import { Observable } from 'rxjs/Observable';
 
 declare const window: any;
 
 class TestObject {
+
   constructor(public _objectInstance: any) {}
 
-  @InstanceProperty name: string;
+  @InstanceProperty
+  name: string;
 
   @CordovaInstance({ sync: true })
-  pingSync(): string {
+  pingSync(): string { return; }
-    return;
-  }
 
   @CordovaInstance()
-  ping(): Promise<any> {
+  ping(): Promise<any> { return; }
-    return;
+
-  }
 }
 
 @Plugin({
@@ -39,17 +29,15 @@ class TestObject {
   platforms: ['Android', 'iOS']
 })
 class TestPlugin extends IonicNativePlugin {
-  @CordovaProperty name: string;
+
+  @CordovaProperty
+  name: string;
 
   @Cordova({ sync: true })
-  pingSync(): string {
+  pingSync(): string { return; }
-    return;
-  }
 
   @Cordova()
-  ping(): Promise<string> {
+  ping(): Promise<string> { return; }
-    return;
-  }
 
   @CordovaCheck()
   customPing(): Promise<string> {
@@ -63,17 +51,14 @@ class TestPlugin extends IonicNativePlugin {
   @Cordova({
     destruct: true
   })
-  destructPromise(): Promise<any> {
+  destructPromise(): Promise<any> { return; }
-    return;
-  }
 
   @Cordova({
     destruct: true,
     observable: true
   })
-  destructObservable(): Observable<any> {
+  destructObservable(): Observable<any> { return; }
-    return;
+
-  }
 }
 
 function definePlugin() {
@@ -93,6 +78,7 @@ function definePlugin() {
 }
 
 describe('Regular Decorators', () => {
+
   let plugin: TestPlugin;
 
   beforeEach(() => {
@@ -101,6 +87,7 @@ describe('Regular Decorators', () => {
   });
 
   describe('Plugin', () => {
+
     it('should set pluginName', () => {
       expect(TestPlugin.getPluginName()).toEqual('TestPlugin');
     });
@@ -116,16 +103,17 @@ describe('Regular Decorators', () => {
     it('should return supported platforms', () => {
       expect(TestPlugin.getSupportedPlatforms()).toEqual(['Android', 'iOS']);
     });
+
   });
 
   describe('Cordova', () => {
+
     it('should do a sync function', () => {
       expect(plugin.pingSync()).toEqual('pong');
     });
 
     it('should do an async function', (done: Function) => {
-      plugin
+      plugin.ping()
-        .ping()
         .then(res => {
           expect(res).toEqual('pong');
           done();
@@ -137,31 +125,39 @@ describe('Regular Decorators', () => {
     });
 
     it('should throw plugin_not_installed error', (done: Function) => {
+
       delete window.testPlugin;
       window.cordova = true;
 
       expect(<any>plugin.pingSync()).toEqual(ERR_PLUGIN_NOT_INSTALLED);
 
-      plugin.ping().catch(e => {
+      plugin.ping()
-        expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+        .catch(e => {
-        delete window.cordova;
+          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
-        done();
+          delete window.cordova;
-      });
+          done();
+        });
+
     });
 
     it('should throw cordova_not_available error', (done: Function) => {
+
       delete window.testPlugin;
 
       expect(<any>plugin.pingSync()).toEqual(ERR_CORDOVA_NOT_AVAILABLE);
 
-      plugin.ping().catch(e => {
+      plugin.ping()
-        expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
+        .catch(e => {
-        done();
+          expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
-      });
+          done();
+        });
+
     });
+
   });
 
   describe('CordovaProperty', () => {
+
     it('should return property value', () => {
       expect(plugin.name).toEqual('John Smith');
     });
@@ -170,47 +166,61 @@ describe('Regular Decorators', () => {
       plugin.name = 'value2';
       expect(plugin.name).toEqual('value2');
     });
+
   });
 
   describe('CordovaCheck', () => {
-    it('should run the method when plugin exists', done => {
+
-      plugin.customPing().then(res => {
+    it('should run the method when plugin exists', (done) => {
-        expect(res).toEqual('pong');
+      plugin.customPing()
-        done();
+        .then(res => {
-      });
+          expect(res).toEqual('pong');
+          done();
+        });
     });
 
-    it('shouldnt run the method when plugin doesnt exist', done => {
+    it('shouldnt run the method when plugin doesnt exist', (done) => {
       delete window.testPlugin;
       window.cordova = true;
-      plugin.customPing().catch(e => {
+      plugin.customPing()
-        expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+        .catch(e => {
-        done();
+          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
-      });
+          done();
+        });
     });
+
   });
 
   describe('CordovaOptions', () => {
+
     describe('destruct', () => {
-      it('should destruct values returned by a Promise', done => {
+
-        plugin.destructPromise().then((args: any[]) => {
+      it('should destruct values returned by a Promise', (done) => {
-          expect(args).toEqual(['hello', 'world']);
+        plugin.destructPromise()
-          done();
+          .then((args: any[]) => {
-        });
+            expect(args).toEqual(['hello', 'world']);
+            done();
+          });
       });
 
-      it('should destruct values returned by an Observable', done => {
+      it('should destruct values returned by an Observable', (done) => {
-        plugin.destructObservable().subscribe((args: any[]) => {
+        plugin.destructObservable()
-          expect(args).toEqual(['hello', 'world']);
+          .subscribe((args: any[]) => {
-          done();
+            expect(args).toEqual(['hello', 'world']);
-        });
+            done();
+          });
       });
+
     });
+
   });
+
 });
 
 describe('Instance Decorators', () => {
-  let instance: TestObject, plugin: TestPlugin;
+
+  let instance: TestObject,
+    plugin: TestPlugin;
 
   beforeEach(() => {
     definePlugin();
@@ -218,14 +228,20 @@ describe('Instance Decorators', () => {
     instance = plugin.create();
   });
 
-  describe('Instance plugin', () => {});
+  describe('Instance plugin', () => {
+
+
+
+  });
 
   describe('CordovaInstance', () => {
-    it('should call instance async method', done => {
+
-      instance.ping().then(r => {
+    it('should call instance async method', (done) => {
-        expect(r).toEqual('pong');
+      instance.ping()
-        done();
+        .then(r => {
-      });
+          expect(r).toEqual('pong');
+          done();
+        });
     });
 
     it('should call instance sync method', () => {
@@ -233,16 +249,18 @@ describe('Instance Decorators', () => {
     });
 
     it('shouldnt call instance method when _objectInstance is undefined', () => {
+
       delete instance._objectInstance;
-      instance
+      instance.ping()
-        .ping()
         .then(r => {
           expect(r).toBeUndefined();
         })
         .catch(e => {
           expect(e).toBeUndefined();
         });
+
     });
+
   });
 
   describe('InstanceProperty', () => {
@@ -255,4 +273,5 @@ describe('Instance Decorators', () => {
       expect(instance.name).toEqual('John Cena');
     });
   });
+
 });

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

@@ -1,15 +1,7 @@
-import 'rxjs/observable/throw';
+import { instanceAvailability, checkAvailability, wrap, wrapInstance, overrideFunction } from './plugin';
-
-import { Observable } from 'rxjs/Observable';
-
-import {
-  checkAvailability,
-  instanceAvailability,
-  overrideFunction,
-  wrap,
-  wrapInstance
-} from './plugin';
 import { getPlugin, getPromise } from './util';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/observable/throw';
 
 export interface PluginConfig {
   /**
@@ -117,23 +109,21 @@ export interface CordovaCheckOptions {
  * @private
  */
 export function InstanceCheck(opts: CordovaCheckOptions = {}) {
-  return (
+  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
-    pluginObj: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ): TypedPropertyDescriptor<any> => {
     return {
       value: function(...args: any[]): any {
         if (instanceAvailability(this)) {
           return descriptor.value.apply(this, args);
         } else {
+
           if (opts.sync) {
             return;
           } else if (opts.observable) {
-            return new Observable<any>(() => {});
+            return new Observable<any>(() => { });
           }
 
-          return getPromise(() => {});
+          return getPromise(() => { });
+
         }
       },
       enumerable: true
@@ -146,11 +136,7 @@ export function InstanceCheck(opts: CordovaCheckOptions = {}) {
  * @private
  */
 export function CordovaCheck(opts: CordovaCheckOptions = {}) {
-  return (
+  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
-    pluginObj: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ): TypedPropertyDescriptor<any> => {
     return {
       value: function(...args: any[]): any {
         const check = checkAvailability(pluginObj);
@@ -191,6 +177,7 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) {
  */
 export function Plugin(config: PluginConfig): ClassDecorator {
   return function(cls: any) {
+
     // Add these fields to the class
     for (let prop in config) {
       cls[prop] = config[prop];
@@ -239,11 +226,7 @@ export function Plugin(config: PluginConfig): ClassDecorator {
  * and the required plugin are installed.
  */
 export function Cordova(opts: CordovaOptions = {}) {
-  return (
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
-    target: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ) => {
     return {
       value: function(...args: any[]) {
         return wrap(this, methodName, opts).apply(this, args);
@@ -285,7 +268,7 @@ export function CordovaProperty(target: any, key: string) {
         return null;
       }
     },
-    set: value => {
+    set: (value) => {
       if (checkAvailability(target, key) === true) {
         getPlugin(target.constructor.getPluginRef())[key] = value;
       }
@@ -318,11 +301,7 @@ export function InstanceProperty(target: any, key: string) {
  * and the required plugin are installed.
  */
 export function CordovaFunctionOverride(opts: any = {}) {
-  return (
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
-    target: Object,
-    methodName: string,
-    descriptor: TypedPropertyDescriptor<any>
-  ) => {
     return {
       value: function(...args: any[]) {
         return overrideFunction(this, methodName, opts);
@@ -331,3 +310,4 @@ export function CordovaFunctionOverride(opts: any = {}) {
     };
   };
 }
+

src/@ionic-native/core/ionic-native-plugin.spec.ts

@@ -1,7 +1,8 @@
 // This is to verify that new (FileTransfer.getPlugin)() works
-import { CordovaInstance, Plugin } from './decorators';
+
-import { IonicNativePlugin } from './ionic-native-plugin';
+import { Plugin, CordovaInstance } from './decorators';
 import { checkAvailability } from './plugin';
+import { IonicNativePlugin } from './ionic-native-plugin';
 
 class FT {
   hello(): string {
@@ -20,13 +21,7 @@ class FT {
 export class FileTransfer extends IonicNativePlugin {
   create(): FileTransferObject {
     let instance: any;
-    if (
+    if (checkAvailability(FileTransfer.getPluginRef(), null, FileTransfer.getPluginName()) === true) {
-      checkAvailability(
-        FileTransfer.getPluginRef(),
-        null,
-        FileTransfer.getPluginName()
-      ) === true
-    ) {
       instance = new (FileTransfer.getPlugin())();
     }
     return new FileTransferObject(instance);
@@ -34,21 +29,20 @@ export class FileTransfer extends IonicNativePlugin {
 }
 
 export class FileTransferObject {
+
   constructor(public _objectInstance: any) {
-    console.info(
+    console.info('Creating a new FileTransferObject with instance: ', _objectInstance);
-      'Creating a new FileTransferObject with instance: ',
-      _objectInstance
-    );
   }
 
   @CordovaInstance({ sync: true })
-  hello(): string {
+  hello(): string { return; }
-    return;
+
-  }
 }
 
 describe('Mock FileTransfer Plugin', () => {
-  let plugin: FileTransfer, instance: FileTransferObject;
+
+  let plugin: FileTransfer,
+    instance: FileTransferObject;
 
   beforeAll(() => {
     plugin = new FileTransfer();
@@ -71,4 +65,5 @@ describe('Mock FileTransfer Plugin', () => {
     console.info('instance hello is', instance.hello());
     expect(instance.hello()).toEqual('world');
   });
+
 });

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

@@ -1,4 +1,5 @@
 export class IonicNativePlugin {
+
   static pluginName: string;
 
   static pluginRef: string;
@@ -15,40 +16,31 @@ export class IonicNativePlugin {
    * Returns a boolean that indicates whether the plugin is installed
    * @return {boolean}
    */
-  static installed(): boolean {
+  static installed(): boolean { return false; }
-    return false;
-  }
 
   /**
    * Returns the original plugin object
    */
-  static getPlugin(): any {}
+  static getPlugin(): any { }
 
   /**
    * Returns the plugin's name
    */
-  static getPluginName(): string {
+  static getPluginName(): string { return; }
-    return;
-  }
 
   /**
    * Returns the plugin's reference
    */
-  static getPluginRef(): string {
+  static getPluginRef(): string { return; }
-    return;
-  }
 
   /**
    * Returns the plugin's install name
    */
-  static getPluginInstallName(): string {
+  static getPluginInstallName(): string { return; }
-    return;
-  }
 
   /**
    * Returns the plugin's supported platforms
    */
-  static getSupportedPlatforms(): string[] {
+  static getSupportedPlatforms(): string[] { return; }
-    return;
+
-  }
 }

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

@@ -1,10 +1,9 @@
-import 'rxjs/add/observable/fromEvent';
+import { getPlugin, getPromise, cordovaWarn, pluginWarn } from './util';
-
-import { Observable } from 'rxjs/Observable';
-
 import { checkReady } from './bootstrap';
 import { CordovaOptions } from './decorators';
-import { cordovaWarn, getPlugin, getPromise, pluginWarn } from './util';
+
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromEvent';
 
 checkReady();
 
@@ -14,26 +13,16 @@ checkReady();
 export const ERR_CORDOVA_NOT_AVAILABLE = { error: 'cordova_not_available' };
 export const ERR_PLUGIN_NOT_INSTALLED = { error: 'plugin_not_installed' };
 
+
 /**
  * Checks if plugin/cordova is available
  * @return {boolean | { error: string } }
  * @private
  */
-export function checkAvailability(
+export function checkAvailability(pluginRef: string, methodName?: string, pluginName?: string): boolean | { error: string };
-  pluginRef: string,
+export function checkAvailability(pluginObj: any, methodName?: string, pluginName?: string): boolean | { error: string };
-  methodName?: string,
+export function checkAvailability(plugin: any, methodName?: string, pluginName?: string): boolean | { error: string } {
-  pluginName?: string
+
-): boolean | { error: string };
-export function checkAvailability(
-  pluginObj: any,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string };
-export function checkAvailability(
-  plugin: any,
-  methodName?: string,
-  pluginName?: string
-): boolean | { error: string } {
   let pluginRef, pluginInstance, pluginPackage;
 
   if (typeof plugin === 'string') {
@@ -46,10 +35,7 @@ export function checkAvailability(
 
   pluginInstance = getPlugin(pluginRef);
 
-  if (
+  if (!pluginInstance || (!!methodName && typeof pluginInstance[methodName] === 'undefined')) {
-    !pluginInstance ||
-    (!!methodName && typeof pluginInstance[methodName] === 'undefined')
-  ) {
     if (!window.cordova) {
       cordovaWarn(pluginName, methodName);
       return ERR_CORDOVA_NOT_AVAILABLE;
@@ -66,23 +52,11 @@ export function checkAvailability(
  * Checks if _objectInstance exists and has the method/property
  * @private
  */
-export function instanceAvailability(
+export function instanceAvailability(pluginObj: any, methodName?: string): boolean {
-  pluginObj: any,
+  return pluginObj._objectInstance && (!methodName || typeof pluginObj._objectInstance[methodName] !== 'undefined');
-  methodName?: string
-): boolean {
-  return (
-    pluginObj._objectInstance &&
-    (!methodName ||
-      typeof pluginObj._objectInstance[methodName] !== 'undefined')
-  );
 }
 
-function setIndex(
+function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Function): any {
-  args: any[],
-  opts: any = {},
-  resolve?: Function,
-  reject?: Function
-): any {
   // ignore resolve and reject in case sync
   if (opts.sync) {
     return args;
@@ -101,19 +75,12 @@ function setIndex(
         resolve(result);
       }
     });
-  } else if (
+  } else if (opts.callbackStyle === 'object' && opts.successName && opts.errorName) {
-    opts.callbackStyle === 'object' &&
-    opts.successName &&
-    opts.errorName
-  ) {
     let obj: any = {};
     obj[opts.successName] = resolve;
     obj[opts.errorName] = reject;
     args.push(obj);
-  } else if (
+  } else if (typeof opts.successIndex !== 'undefined' || typeof opts.errorIndex !== 'undefined') {
-    typeof opts.successIndex !== 'undefined' ||
-    typeof opts.errorIndex !== 'undefined'
-  ) {
     const setSuccessIndex = () => {
       // If we've specified a success/error index
       if (opts.successIndex > args.length) {
@@ -139,6 +106,8 @@ function setIndex(
       setSuccessIndex();
       setErrorIndex();
     }
+
+
   } else {
     // Otherwise, let's tack them on to the end of the argument list
     // which is 90% of cases
@@ -148,14 +117,7 @@ function setIndex(
   return args;
 }
 
-function callCordovaPlugin(
+function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts: any = {}, resolve?: Function, reject?: Function) {
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {},
-  resolve?: Function,
-  reject?: Function
-) {
   // Try to figure out where the success/error callbacks need to be bound
   // to our promise resolve/reject handlers.
   args = setIndex(args, opts, resolve, reject);
@@ -168,34 +130,16 @@ function callCordovaPlugin(
   } else {
     return availabilityCheck;
   }
+
 }
 
-function wrapPromise(
+function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-) {
   let pluginResult: any, rej: Function;
   const p = getPromise((resolve: Function, reject: Function) => {
     if (opts.destruct) {
-      pluginResult = callCordovaPlugin(
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        (...args: any[]) => resolve(args),
-        (...args: any[]) => reject(args)
-      );
     } else {
-      pluginResult = callCordovaPlugin(
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        resolve,
-        reject
-      );
     }
     rej = reject;
   });
@@ -203,18 +147,13 @@ function wrapPromise(
   // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
   // to error
   if (pluginResult && pluginResult.error) {
-    p.catch(() => {});
+    p.catch(() => { });
     typeof rej === 'function' && rej(pluginResult.error);
   }
   return p;
 }
 
-function wrapOtherPromise(
+function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-) {
   return getPromise((resolve: Function, reject: Function) => {
     const pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
     if (pluginResult) {
@@ -229,33 +168,14 @@ function wrapOtherPromise(
   });
 }
 
-function wrapObservable(
+function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-) {
   return new Observable(observer => {
     let pluginResult;
 
     if (opts.destruct) {
-      pluginResult = callCordovaPlugin(
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        (...args: any[]) => observer.next(args),
-        (...args: any[]) => observer.error(args)
-      );
     } else {
-      pluginResult = callCordovaPlugin(
+      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
-        pluginObj,
-        methodName,
-        args,
-        opts,
-        observer.next.bind(observer),
-        observer.error.bind(observer)
-      );
     }
 
     if (pluginResult && pluginResult.error) {
@@ -266,45 +186,26 @@ function wrapObservable(
       try {
         if (opts.clearFunction) {
           if (opts.clearWithArgs) {
-            return callCordovaPlugin(
+            return callCordovaPlugin(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
-              pluginObj,
-              opts.clearFunction,
-              args,
-              opts,
-              observer.next.bind(observer),
-              observer.error.bind(observer)
-            );
           }
           return callCordovaPlugin(pluginObj, opts.clearFunction, []);
         }
       } catch (e) {
-        console.warn(
+        console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-          'Unable to clear the previous observable watch for',
-          pluginObj.constructor.getPluginName(),
-          methodName
-        );
         console.warn(e);
       }
     };
   });
 }
 
-function callInstance(
+function callInstance(pluginObj: any, methodName: string, args: any[], opts: any = {}, resolve?: Function, reject?: Function) {
-  pluginObj: any,
+
-  methodName: string,
-  args: any[],
-  opts: any = {},
-  resolve?: Function,
-  reject?: Function
-) {
   args = setIndex(args, opts, resolve, reject);
 
   if (instanceAvailability(pluginObj, methodName)) {
-    return pluginObj._objectInstance[methodName].apply(
+    return pluginObj._objectInstance[methodName].apply(pluginObj._objectInstance, args);
-      pluginObj._objectInstance,
-      args
-    );
   }
+
 }
 
 /**
@@ -314,10 +215,7 @@ function callInstance(
  * @param element The element to attach the event listener to
  * @returns {Observable}
  */
-export function wrapEventObservable(
+export function wrapEventObservable(event: string, element: any = window): Observable<any> {
-  event: string,
-  element: any = window
-): Observable<any> {
   return Observable.fromEvent(element, event);
 }
 
@@ -329,38 +227,28 @@ export function wrapEventObservable(
  * does just this.
  * @private
  */
-export function overrideFunction(
+export function overrideFunction(pluginObj: any, methodName: string, args: any[], opts: any = {}): Observable<any> {
-  pluginObj: any,
-  methodName: string,
-  args: any[],
-  opts: any = {}
-): Observable<any> {
   return new Observable(observer => {
-    const availabilityCheck = checkAvailability(
+
-      pluginObj,
+    const availabilityCheck = checkAvailability(pluginObj, null, pluginObj.constructor.getPluginName());
-      null,
-      pluginObj.constructor.getPluginName()
-    );
 
     if (availabilityCheck === true) {
       const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
       pluginInstance[methodName] = observer.next.bind(observer);
-      return () => (pluginInstance[methodName] = () => {});
+      return () => pluginInstance[methodName] = () => { };
     } else {
       observer.error(availabilityCheck);
       observer.complete();
     }
+
   });
 }
 
+
 /**
  * @private
  */
-export const wrap = function(
+export const wrap = function(pluginObj: any, methodName: string, opts: CordovaOptions = {}) {
-  pluginObj: any,
-  methodName: string,
-  opts: CordovaOptions = {}
-) {
   return (...args: any[]) => {
     if (opts.sync) {
       // Sync doesn't wrap the plugin with a promise or observable, it returns the result as-is
@@ -380,36 +268,22 @@ export const wrap = function(
 /**
  * @private
  */
-export function wrapInstance(
+export function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
-  pluginObj: any,
-  methodName: string,
-  opts: any = {}
-) {
   return (...args: any[]) => {
     if (opts.sync) {
+
       return callInstance(pluginObj, methodName, args, opts);
+
     } else if (opts.observable) {
+
       return new Observable(observer => {
+
         let pluginResult;
 
         if (opts.destruct) {
-          pluginResult = callInstance(
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            (...args: any[]) => observer.next(args),
-            (...args: any[]) => observer.error(args)
-          );
         } else {
-          pluginResult = callInstance(
+          pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            observer.next.bind(observer),
-            observer.error.bind(observer)
-          );
         }
 
         if (pluginResult && pluginResult.error) {
@@ -420,47 +294,23 @@ export function wrapInstance(
         return () => {
           try {
             if (opts.clearWithArgs) {
-              return callInstance(
+              return callInstance(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
-                pluginObj,
-                opts.clearFunction,
-                args,
-                opts,
-                observer.next.bind(observer),
-                observer.error.bind(observer)
-              );
             }
             return callInstance(pluginObj, opts.clearFunction, []);
           } catch (e) {
-            console.warn(
+            console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-              'Unable to clear the previous observable watch for',
-              pluginObj.constructor.getPluginName(),
-              methodName
-            );
             console.warn(e);
           }
         };
       });
+
     } else if (opts.otherPromise) {
       return getPromise((resolve: Function, reject: Function) => {
         let result;
         if (opts.destruct) {
-          result = callInstance(
+          result = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            (...args: any[]) => resolve(args),
-            (...args: any[]) => reject(args)
-          );
         } else {
-          result = callInstance(
+          result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            resolve,
-            reject
-          );
         }
         if (result && !!result.then) {
           result.then(resolve, reject);
@@ -468,27 +318,14 @@ export function wrapInstance(
           reject();
         }
       });
+
     } else {
       let pluginResult: any, rej: Function;
       const p = getPromise((resolve: Function, reject: Function) => {
         if (opts.destruct) {
-          pluginResult = callInstance(
+          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            (...args: any[]) => resolve(args),
-            (...args: any[]) => reject(args)
-          );
         } else {
-          pluginResult = callInstance(
+          pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
-            pluginObj,
-            methodName,
-            args,
-            opts,
-            resolve,
-            reject
-          );
         }
         rej = reject;
       });
@@ -496,10 +333,12 @@ export function wrapInstance(
       // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
       // to error
       if (pluginResult && pluginResult.error) {
-        p.catch(() => {});
+        p.catch(() => { });
         typeof rej === 'function' && rej(pluginResult.error);
       }
       return p;
+
+
     }
   };
 }

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

@@ -7,27 +7,25 @@ export const get = (element: Element | Window, path: string): any => {
   const paths: string[] = path.split('.');
   let obj: any = element;
   for (let i: number = 0; i < paths.length; i++) {
-    if (!obj) {
+    if (!obj) { return null; }
-      return null;
-    }
     obj = obj[paths[i]];
   }
   return obj;
 };
 
+
 /**
  * @private
  */
 export const getPromise = (callback: Function): Promise<any> => {
+
   const tryNativePromise = () => {
     if (window.Promise) {
       return new Promise((resolve, reject) => {
         callback(resolve, reject);
       });
     } else {
-      console.error(
+      console.error('No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular or on a recent browser.');
-        'No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular or on a recent browser.'
-      );
     }
   };
 
@@ -46,24 +44,14 @@ export const getPlugin = (pluginRef: string): any => {
 /**
  * @private
  */
-export const pluginWarn = (
+export const pluginWarn = (pluginName: string, plugin?: string, method?: string): void => {
-  pluginName: string,
-  plugin?: string,
-  method?: string
-): void => {
   if (method) {
-    console.warn(
+    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
-      `Native: tried calling ${pluginName}.${method}, but the ${pluginName} plugin is not installed.`
-    );
   } else {
-    console.warn(
+    console.warn('Native: tried accessing the ' + pluginName + ' plugin but it\'s not installed.');
-      `Native: tried accessing the ${pluginName} plugin but it's not installed.`
-    );
   }
   if (plugin) {
-    console.warn(
+    console.warn('Install the ' + pluginName + ' plugin: \'ionic cordova plugin add ' + plugin + '\'');
-      `Install the ${pluginName} plugin: 'ionic cordova plugin add ${plugin}'`
-    );
   }
 };
 
@@ -74,12 +62,8 @@ export const pluginWarn = (
  */
 export const cordovaWarn = (pluginName: string, method?: string): void => {
   if (method) {
-    console.warn(
+    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
-      `Native: tried calling ${pluginName}.${method}, but Cordova is not available. Make sure to include cordova.js or run in a device/simulator`
-    );
   } else {
-    console.warn(
+    console.warn('Native: tried accessing the ' + pluginName + ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
-      `Native: tried accessing the ${pluginName} plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator`
-    );
   }
 };

src/@ionic-native/plugins/action-sheet/index.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ActionSheetOptions {
+
   /**
    * The labels for the buttons. Uses the index x
    */
@@ -97,6 +98,7 @@ export interface ActionSheetOptions {
 })
 @Injectable()
 export class ActionSheet extends IonicNativePlugin {
+
   /**
    * Convenience property to select an Android theme value
    */
@@ -121,16 +123,13 @@ export class ActionSheet extends IonicNativePlugin {
    *   button pressed (1 based, so 1, 2, 3, etc.)
    */
   @Cordova()
-  show(options?: ActionSheetOptions): Promise<number> {
+  show(options?: ActionSheetOptions): Promise<number> { return; }
-    return;
+
-  }
 
   /**
    * Progamtically hide the native ActionSheet
    * @returns {Promise<any>} Returns a Promise that resolves when the actionsheet is closed
    */
   @Cordova()
-  hide(options?: any): Promise<any> {
+  hide(options?: any): Promise<any> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/admob-free/index.ts

@@ -1,8 +1,7 @@
-import 'rxjs/add/observable/fromEvent';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
-
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/fromEvent';
 
 export interface AdMobFreeBannerConfig {
   /**
@@ -115,6 +114,7 @@ export interface AdMobFreeRewardVideoConfig {
 })
 @Injectable()
 export class AdMobFree extends IonicNativePlugin {
+
   /**
    * Convenience object to get event names
    * @type {Object}
@@ -167,6 +167,7 @@ export class AdMobFree extends IonicNativePlugin {
    * @type {AdMobFreeRewardVideo}
    */
   rewardVideo: AdMobFreeRewardVideo = new AdMobFreeRewardVideo();
+
 }
 
 /**
@@ -175,54 +176,46 @@ export class AdMobFree extends IonicNativePlugin {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.banner'
+  pluginRef: 'admob.banner',
 })
 export class AdMobFreeBanner {
+
   /**
    * Update config.
    * @param options
    * @return {AdMobFreeBannerConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig {
+  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig { return; }
-    return;
-  }
 
   /**
    * Hide the banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  hide(): Promise<any> {
+  hide(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Create banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  prepare(): Promise<any> {
+  prepare(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Remove the banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  remove(): Promise<any> {
+  remove(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show the banner.
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  show(): Promise<any> {
+  show(): Promise<any> { return; }
-    return;
+
-  }
 }
 
 /**
@@ -231,45 +224,39 @@ export class AdMobFreeBanner {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.interstitial'
+  pluginRef: 'admob.interstitial',
 })
 export class AdMobFreeInterstitial {
+
   /**
    * Update config.
    * @param options
    * @return {AdMobFreeInterstitialConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig {
+  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig { return; }
-    return;
-  }
 
   /**
    * Check if interstitial is ready
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  isReady(): Promise<any> {
+  isReady(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Prepare interstitial
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  prepare(): Promise<any> {
+  prepare(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show the interstitial
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  show(): Promise<any> {
+  show(): Promise<any> { return; }
-    return;
+
-  }
 }
 
 /**
@@ -278,43 +265,37 @@ export class AdMobFreeInterstitial {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.rewardvideo'
+  pluginRef: 'admob.rewardvideo',
 })
 export class AdMobFreeRewardVideo {
+
   /**
    * Update config.
    * @param options
    * @return {AdMobFreeRewardVideoConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig {
+  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig { return; }
-    return;
-  }
 
   /**
    * Check if reward video is ready
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  isReady(): Promise<any> {
+  isReady(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Prepare reward video
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  prepare(): Promise<any> {
+  prepare(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show the reward video
    * @return {Promise<any>}
    */
   @Cordova({ otherPromise: true })
-  show(): Promise<any> {
+  show(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/admob-pro/index.ts

@@ -1,17 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
-export type AdSize =
+export type AdSize = 'SMART_BANNER' | 'BANNER' | 'MEDIUM_RECTANGLE' | 'FULL_BANNER' | 'LEADERBOARD' | 'SKYSCRAPER' | 'CUSTOM';
-  | 'SMART_BANNER'
-  | 'BANNER'
-  | 'MEDIUM_RECTANGLE'
-  | 'FULL_BANNER'
-  | 'LEADERBOARD'
-  | 'SKYSCRAPER'
-  | 'CUSTOM';
 
 export interface AdMobOptions {
+
   /**
    * Banner ad ID
    */
@@ -76,9 +70,11 @@ export interface AdMobOptions {
    * License key for the plugin
    */
   license?: any;
+
 }
 
 export interface AdExtras {
+
   color_bg: string;
 
   color_bg_top: string;
@@ -90,6 +86,7 @@ export interface AdExtras {
   color_text: string;
 
   color_url: string;
+
 }
 
 /**
@@ -137,6 +134,7 @@ export interface AdExtras {
 })
 @Injectable()
 export class AdMobPro extends IonicNativePlugin {
+
   AD_POSITION: {
     NO_CHANGE: number;
     TOP_LEFT: number;
@@ -169,9 +167,7 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when the banner is created
    */
   @Cordova()
-  createBanner(adIdOrOptions: string | AdMobOptions): Promise<any> {
+  createBanner(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Destroy the banner, remove it from screen.
@@ -179,7 +175,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  removeBanner(): void {}
+  removeBanner(): void { }
 
   /**
    * Show banner at position
@@ -188,7 +184,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showBanner(position: number): void {}
+  showBanner(position: number): void { }
 
   /**
    * Show banner at custom position
@@ -198,7 +194,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showBannerAtXY(x: number, y: number): void {}
+  showBannerAtXY(x: number, y: number): void { }
 
   /**
    * Hide the banner, remove it from screen, but can show it later
@@ -206,7 +202,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  hideBanner(): void {}
+  hideBanner(): void { }
 
   /**
    * Prepare interstitial banner
@@ -214,9 +210,7 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when interstitial is prepared
    */
   @Cordova()
-  prepareInterstitial(adIdOrOptions: string | AdMobOptions): Promise<any> {
+  prepareInterstitial(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show interstitial ad when it's ready
@@ -224,7 +218,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showInterstitial(): void {}
+  showInterstitial(): void { }
 
   /**
    * Prepare a reward video ad
@@ -232,9 +226,7 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when the ad is prepared
    */
   @Cordova()
-  prepareRewardVideoAd(adIdOrOptions: string | AdMobOptions): Promise<any> {
+  prepareRewardVideoAd(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show a reward video ad
@@ -242,7 +234,7 @@ export class AdMobPro extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  showRewardVideoAd(): void {}
+  showRewardVideoAd(): void { }
 
   /**
    * Sets the values for configuration and targeting
@@ -250,18 +242,14 @@ export class AdMobPro extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves when the options have been set
    */
   @Cordova()
-  setOptions(options: AdMobOptions): Promise<any> {
+  setOptions(options: AdMobOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get user ad settings
    * @returns {Promise<any>} Returns a promise that resolves with the ad settings
    */
   @Cordova()
-  getAdSettings(): Promise<any> {
+  getAdSettings(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Triggered when failed to receive Ad
@@ -272,9 +260,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdFailLoad',
     element: document
   })
-  onAdFailLoad(): Observable<any> {
+  onAdFailLoad(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Triggered when Ad received
@@ -285,9 +271,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdLoaded',
     element: document
   })
-  onAdLoaded(): Observable<any> {
+  onAdLoaded(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Triggered when Ad will be showed on screen
@@ -298,9 +282,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdPresent',
     element: document
   })
-  onAdPresent(): Observable<any> {
+  onAdPresent(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Triggered when user click the Ad, and will jump out of your App
@@ -311,9 +293,7 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdLeaveApp',
     element: document
   })
-  onAdLeaveApp(): Observable<any> {
+  onAdLeaveApp(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Triggered when dismiss the Ad and back to your App
@@ -324,7 +304,6 @@ export class AdMobPro extends IonicNativePlugin {
     event: 'onAdDismiss',
     element: document
   })
-  onAdDismiss(): Observable<any> {
+  onAdDismiss(): Observable<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/alipay/index.ts

@@ -1,5 +1,7 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+
 
 export interface AlipayOrder {
   /**
@@ -99,8 +101,7 @@ export interface AlipayOrder {
   plugin: 'cordova-alipay-base',
   pluginRef: 'Alipay.Base',
   repo: 'https://github.com/xueron/cordova-alipay-base',
-  install:
+  install: 'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
-    'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
   installVariables: ['ALI_PID'],
   platforms: ['Android', 'iOS']
 })
@@ -112,7 +113,5 @@ export class Alipay extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the success return, or rejects with an error.
    */
   @Cordova()
-  pay(order: AlipayOrder | string): Promise<any> {
+  pay(order: AlipayOrder | string): Promise<any> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/android-exoplayer/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export type AndroidExoPlayerAspectRatio = 'FILL_SCREEN' | 'FIT_SCREEN';
@@ -187,16 +187,14 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @param parameters {AndroidExoPlayerParams} Parameters
    * @return {Observable<AndroidExoplayerState>}
    */
-  @Cordova({
+   @Cordova({
-    observable: true,
+     observable: true,
-    clearFunction: 'close',
+     clearFunction: 'close',
-    clearWithArgs: false,
+     clearWithArgs: false,
-    successIndex: 1,
+     successIndex: 1,
-    errorIndex: 2
+     errorIndex: 2
-  })
+   })
-  show(parameters: AndroidExoPlayerParams): Observable<AndroidExoplayerState> {
+  show(parameters: AndroidExoPlayerParams): Observable<AndroidExoplayerState> { return; }
-    return;
-  }
 
   /**
    * Switch stream without disposing of the player.
@@ -205,30 +203,21 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  setStream(
+  setStream(url: string, controller: AndroidExoPlayerControllerConfig): Promise<void> { return; }
-    url: string,
-    controller: AndroidExoPlayerControllerConfig
-  ): Promise<void> {
-    return;
-  }
 
   /**
    * Will pause if playing and play if paused
    * @return {Promise<void>}
    */
   @Cordova()
-  playPause(): Promise<void> {
+  playPause(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Stop playing.
    * @return {Promise<void>}
    */
   @Cordova()
-  stop(): Promise<void> {
+  stop(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Jump to a particular position.
@@ -236,9 +225,7 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  seekTo(milliseconds: number): Promise<void> {
+  seekTo(milliseconds: number): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Jump to a particular time relative to the current position.
@@ -246,36 +233,28 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  seekBy(milliseconds: number): Promise<void> {
+  seekBy(milliseconds: number): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Get the current player state.
    * @return {Promise<AndroidExoplayerState>}
    */
   @Cordova()
-  getState(): Promise<AndroidExoplayerState> {
+  getState(): Promise<AndroidExoplayerState> { return; }
-    return;
-  }
 
   /**
    * Show the controller.
    * @return {Promise<void>}
    */
   @Cordova()
-  showController(): Promise<void> {
+  showController(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Hide the controller.
    * @return {Promise<void>}
    */
   @Cordova()
-  hideController(): Promise<void> {
+  hideController(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Update the controller configuration.
@@ -283,16 +262,12 @@ export class AndroidExoplayer extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  setController(controller: AndroidExoPlayerControllerConfig): Promise<void> {
+  setController(controller: AndroidExoPlayerControllerConfig): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Close and dispose of player, call before destroy.
    * @return {Promise<void>}
    */
   @Cordova()
-  close(): Promise<void> {
+  close(): Promise<void> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/android-fingerprint-auth/index.ts

@@ -1,7 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface AFAAuthOptions {
+
   /**
    * Required
    * Used as the alias for your key in the Android Key Store.
@@ -60,6 +62,7 @@ export interface AFAAuthOptions {
    * Set the hint displayed by the fingerprint icon on the fingerprint authentication dialog.
    */
   dialogHint?: string;
+
 }
 
 export interface AFADecryptOptions {
@@ -146,25 +149,26 @@ export interface AFAEncryptResponse {
 })
 @Injectable()
 export class AndroidFingerprintAuth extends IonicNativePlugin {
+
   ERRORS: {
-    BAD_PADDING_EXCEPTION: 'BAD_PADDING_EXCEPTION';
+    BAD_PADDING_EXCEPTION: 'BAD_PADDING_EXCEPTION',
-    CERTIFICATE_EXCEPTION: 'CERTIFICATE_EXCEPTION';
+    CERTIFICATE_EXCEPTION: 'CERTIFICATE_EXCEPTION',
-    FINGERPRINT_CANCELLED: 'FINGERPRINT_CANCELLED';
+    FINGERPRINT_CANCELLED: 'FINGERPRINT_CANCELLED',
-    FINGERPRINT_DATA_NOT_DELETED: 'FINGERPRINT_DATA_NOT_DELETED';
+    FINGERPRINT_DATA_NOT_DELETED: 'FINGERPRINT_DATA_NOT_DELETED',
-    FINGERPRINT_ERROR: 'FINGERPRINT_ERROR';
+    FINGERPRINT_ERROR: 'FINGERPRINT_ERROR',
-    FINGERPRINT_NOT_AVAILABLE: 'FINGERPRINT_NOT_AVAILABLE';
+    FINGERPRINT_NOT_AVAILABLE: 'FINGERPRINT_NOT_AVAILABLE',
-    FINGERPRINT_PERMISSION_DENIED: 'FINGERPRINT_PERMISSION_DENIED';
+    FINGERPRINT_PERMISSION_DENIED: 'FINGERPRINT_PERMISSION_DENIED',
-    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: 'FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST';
+    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: 'FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST',
-    ILLEGAL_BLOCK_SIZE_EXCEPTION: 'ILLEGAL_BLOCK_SIZE_EXCEPTION';
+    ILLEGAL_BLOCK_SIZE_EXCEPTION: 'ILLEGAL_BLOCK_SIZE_EXCEPTION',
-    INIT_CIPHER_FAILED: 'INIT_CIPHER_FAILED';
+    INIT_CIPHER_FAILED: 'INIT_CIPHER_FAILED',
-    INVALID_ALGORITHM_PARAMETER_EXCEPTION: 'INVALID_ALGORITHM_PARAMETER_EXCEPTION';
+    INVALID_ALGORITHM_PARAMETER_EXCEPTION: 'INVALID_ALGORITHM_PARAMETER_EXCEPTION',
-    IO_EXCEPTION: 'IO_EXCEPTION';
+    IO_EXCEPTION: 'IO_EXCEPTION',
-    JSON_EXCEPTION: 'JSON_EXCEPTION';
+    JSON_EXCEPTION: 'JSON_EXCEPTION',
-    MINIMUM_SDK: 'MINIMUM_SDK';
+    MINIMUM_SDK: 'MINIMUM_SDK',
-    MISSING_ACTION_PARAMETERS: 'MISSING_ACTION_PARAMETERS';
+    MISSING_ACTION_PARAMETERS: 'MISSING_ACTION_PARAMETERS',
-    MISSING_PARAMETERS: 'MISSING_PARAMETERS';
+    MISSING_PARAMETERS: 'MISSING_PARAMETERS',
-    NO_SUCH_ALGORITHM_EXCEPTION: 'NO_SUCH_ALGORITHM_EXCEPTION';
+    NO_SUCH_ALGORITHM_EXCEPTION: 'NO_SUCH_ALGORITHM_EXCEPTION',
-    SECURITY_EXCEPTION: 'SECURITY_EXCEPTION';
+    SECURITY_EXCEPTION: 'SECURITY_EXCEPTION'
   };
 
   /**
@@ -173,9 +177,7 @@ export class AndroidFingerprintAuth extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> {
+  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> { return; }
-    return;
-  }
 
   /**
    * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
@@ -183,32 +185,19 @@ export class AndroidFingerprintAuth extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> {
+  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> { return; }
-    return;
-  }
 
   /**
    * Check if service is available
    * @returns {Promise<any>} Returns a Promise that resolves if fingerprint auth is available on the device
    */
   @Cordova()
-  isAvailable(): Promise<{
+  isAvailable(): Promise<{ isAvailable: boolean, isHardwareDetected: boolean, hasEnrolledFingerprints: boolean }> { return; }
-    isAvailable: boolean;
-    isHardwareDetected: boolean;
-    hasEnrolledFingerprints: boolean;
-  }> {
-    return;
-  }
 
   /**
    * Delete the cipher used for encryption and decryption by username
    * @returns {Promise<any>} Returns a Promise that resolves if the cipher was successfully deleted
    */
   @Cordova()
-  delete(options: {
+  delete(options: { clientId: string; username: string; }): Promise<{ deleted: boolean }> { return; }
-    clientId: string;
-    username: string;
-  }): Promise<{ deleted: boolean }> {
-    return;
-  }
 }

src/@ionic-native/plugins/android-full-screen/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * Bit flag values for setSystemUiVisibility()
@@ -62,81 +62,63 @@ export class AndroidFullScreen extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  isSupported(): Promise<void> {
+  isSupported(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Is immersive mode supported?
    * @return {Promise<void>}
    */
   @Cordova()
-  isImmersiveModeSupported(): Promise<void> {
+  isImmersiveModeSupported(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * The width of the screen in immersive mode.
    * @return {Promise<number>}
    */
   @Cordova()
-  immersiveWidth(): Promise<number> {
+  immersiveWidth(): Promise<number> { return; }
-    return;
-  }
 
   /**
    * The height of the screen in immersive mode.
    * @return {Promise<number>}
    */
   @Cordova()
-  immersiveHeight(): Promise<number> {
+  immersiveHeight(): Promise<number> { return; }
-    return;
-  }
 
   /**
    * Hide system UI until user interacts.
    * @return {Promise<void>}
    */
   @Cordova()
-  leanMode(): Promise<void> {
+  leanMode(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Show system UI.
    * @return {Promise<void>}
    */
   @Cordova()
-  showSystemUI(): Promise<void> {
+  showSystemUI(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Extend your app underneath the status bar (Android 4.4+ only).
    * @return {Promise<void>}
    */
   @Cordova()
-  showUnderStatusBar(): Promise<void> {
+  showUnderStatusBar(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Extend your app underneath the system UI (Android 4.4+ only).
    * @return {Promise<void>}
    */
   @Cordova()
-  showUnderSystemUI(): Promise<void> {
+  showUnderSystemUI(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Hide system UI and keep it hidden (Android 4.4+ only).
    * @return {Promise<void>}
    */
   @Cordova()
-  immersiveMode(): Promise<void> {
+  immersiveMode(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Manually set the the system UI to a custom mode. This mirrors the Android method of the same name. (Android 4.4+ only).
@@ -145,7 +127,5 @@ export class AndroidFullScreen extends IonicNativePlugin {
    * @return {Promise<void>}
    */
   @Cordova()
-  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> {
+  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/android-permissions/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Android Permissions
@@ -37,12 +37,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AndroidPermissions extends IonicNativePlugin {
+
   PERMISSION: any = {
     ACCESS_CHECKIN_PROPERTIES: 'android.permission.ACCESS_CHECKIN_PROPERTIES',
     ACCESS_COARSE_LOCATION: 'android.permission.ACCESS_COARSE_LOCATION',
     ACCESS_FINE_LOCATION: 'android.permission.ACCESS_FINE_LOCATION',
-    ACCESS_LOCATION_EXTRA_COMMANDS:
+    ACCESS_LOCATION_EXTRA_COMMANDS: 'android.permission.ACCESS_LOCATION_EXTRA_COMMANDS',
-      'android.permission.ACCESS_LOCATION_EXTRA_COMMANDS',
     ACCESS_MOCK_LOCATION: 'android.permission.ACCESS_MOCK_LOCATION',
     ACCESS_NETWORK_STATE: 'android.permission.ACCESS_NETWORK_STATE',
     ACCESS_SURFACE_FLINGER: 'android.permission.ACCESS_SURFACE_FLINGER',
@@ -53,14 +53,12 @@ export class AndroidPermissions extends IonicNativePlugin {
     BATTERY_STATS: 'android.permission.BATTERY_STATS',
     BIND_ACCESSIBILITY_SERVICE: 'android.permission.BIND_ACCESSIBILITY_SERVICE',
     BIND_APPWIDGET: 'android.permission.BIND_APPWIDGET',
-    BIND_CARRIER_MESSAGING_SERVICE:
+    BIND_CARRIER_MESSAGING_SERVICE: 'android.permission.BIND_CARRIER_MESSAGING_SERVICE',
-      'android.permission.BIND_CARRIER_MESSAGING_SERVICE',
     BIND_DEVICE_ADMIN: 'android.permission.BIND_DEVICE_ADMIN',
     BIND_DREAM_SERVICE: 'android.permission.BIND_DREAM_SERVICE',
     BIND_INPUT_METHOD: 'android.permission.BIND_INPUT_METHOD',
     BIND_NFC_SERVICE: 'android.permission.BIND_NFC_SERVICE',
-    BIND_NOTIFICATION_LISTENER_SERVICE:
+    BIND_NOTIFICATION_LISTENER_SERVICE: 'android.permission.BIND_NOTIFICATION_LISTENER_SERVICE',
-      'android.permission.BIND_NOTIFICATION_LISTENER_SERVICE',
     BIND_PRINT_SERVICE: 'android.permission.BIND_PRINT_SERVICE',
     BIND_REMOTEVIEWS: 'android.permission.BIND_REMOTEVIEWS',
     BIND_TEXT_SERVICE: 'android.permission.BIND_TEXT_SERVICE',
@@ -81,15 +79,12 @@ export class AndroidPermissions extends IonicNativePlugin {
     CALL_PRIVILEGED: 'android.permission.CALL_PRIVILEGED',
     CAMERA: 'android.permission.CAMERA',
     CAPTURE_AUDIO_OUTPUT: 'android.permission.CAPTURE_AUDIO_OUTPUT',
-    CAPTURE_SECURE_VIDEO_OUTPUT:
+    CAPTURE_SECURE_VIDEO_OUTPUT: 'android.permission.CAPTURE_SECURE_VIDEO_OUTPUT',
-      'android.permission.CAPTURE_SECURE_VIDEO_OUTPUT',
     CAPTURE_VIDEO_OUTPUT: 'android.permission.CAPTURE_VIDEO_OUTPUT',
-    CHANGE_COMPONENT_ENABLED_STATE:
+    CHANGE_COMPONENT_ENABLED_STATE: 'android.permission.CHANGE_COMPONENT_ENABLED_STATE',
-      'android.permission.CHANGE_COMPONENT_ENABLED_STATE',
     CHANGE_CONFIGURATION: 'android.permission.CHANGE_CONFIGURATION',
     CHANGE_NETWORK_STATE: 'android.permission.CHANGE_NETWORK_STATE',
-    CHANGE_WIFI_MULTICAST_STATE:
+    CHANGE_WIFI_MULTICAST_STATE: 'android.permission.CHANGE_WIFI_MULTICAST_STATE',
-      'android.permission.CHANGE_WIFI_MULTICAST_STATE',
     CHANGE_WIFI_STATE: 'android.permission.CHANGE_WIFI_STATE',
     CLEAR_APP_CACHE: 'android.permission.CLEAR_APP_CACHE',
     CLEAR_APP_USER_DATA: 'android.permission.CLEAR_APP_USER_DATA',
@@ -135,8 +130,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     READ_CONTACTS: 'android.permission.READ_CONTACTS',
     READ_EXTERNAL_STORAGE: 'android.permission.READ_EXTERNAL_STORAGE',
     READ_FRAME_BUFFER: 'android.permission.READ_FRAME_BUFFER',
-    READ_HISTORY_BOOKMARKS:
+    READ_HISTORY_BOOKMARKS: 'com.android.browser.permission.READ_HISTORY_BOOKMARKS',
-      'com.android.browser.permission.READ_HISTORY_BOOKMARKS',
     READ_INPUT_STATE: 'android.permission.READ_INPUT_STATE',
     READ_LOGS: 'android.permission.READ_LOGS',
     READ_PHONE_STATE: 'android.permission.READ_PHONE_STATE',
@@ -170,8 +164,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     SET_TIME_ZONE: 'android.permission.SET_TIME_ZONE',
     SET_WALLPAPER: 'android.permission.SET_WALLPAPER',
     SET_WALLPAPER_HINTS: 'android.permission.SET_WALLPAPER_HINTS',
-    SIGNAL_PERSISTENT_PROCESSES:
+    SIGNAL_PERSISTENT_PROCESSES: 'android.permission.SIGNAL_PERSISTENT_PROCESSES',
-      'android.permission.SIGNAL_PERSISTENT_PROCESSES',
     STATUS_BAR: 'android.permission.STATUS_BAR',
     SUBSCRIBED_FEEDS_READ: 'android.permission.SUBSCRIBED_FEEDS_READ',
     SUBSCRIBED_FEEDS_WRITE: 'android.permission.SUBSCRIBED_FEEDS_WRITE',
@@ -189,8 +182,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     WRITE_CONTACTS: 'android.permission.WRITE_CONTACTS',
     WRITE_EXTERNAL_STORAGE: 'android.permission.WRITE_EXTERNAL_STORAGE',
     WRITE_GSERVICES: 'android.permission.WRITE_GSERVICES',
-    WRITE_HISTORY_BOOKMARKS:
+    WRITE_HISTORY_BOOKMARKS: 'com.android.browser.permission.WRITE_HISTORY_BOOKMARKS',
-      'com.android.browser.permission.WRITE_HISTORY_BOOKMARKS',
     WRITE_PROFILE: 'android.permission.WRITE_PROFILE',
     WRITE_SECURE_SETTINGS: 'android.permission.WRITE_SECURE_SETTINGS',
     WRITE_SETTINGS: 'android.permission.WRITE_SETTINGS',
@@ -198,7 +190,7 @@ export class AndroidPermissions extends IonicNativePlugin {
     WRITE_SOCIAL_STREAM: 'android.permission.WRITE_SOCIAL_STREAM',
     WRITE_SYNC_SETTINGS: 'android.permission.WRITE_SYNC_SETTINGS',
     WRITE_USER_DICTIONARY: 'android.permission.WRITE_USER_DICTIONARY',
-    WRITE_VOICEMAIL: 'com.android.voicemail.permission.WRITE_VOICEMAIL'
+    WRITE_VOICEMAIL: 'com.android.voicemail.permission.WRITE_VOICEMAIL',
   };
 
   /**
@@ -207,9 +199,7 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  checkPermission(permission: string): Promise<any> {
+  checkPermission(permission: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Request permission
@@ -217,9 +207,7 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  requestPermission(permission: string): Promise<any> {
+  requestPermission(permission: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Request permissions
@@ -227,9 +215,7 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  requestPermissions(permissions: string[]): Promise<any> {
+  requestPermissions(permissions: string[]): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This function still works now, will not support in the future.
@@ -237,7 +223,6 @@ export class AndroidPermissions extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  hasPermission(permission: string): Promise<any> {
+  hasPermission(permission: string): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/app-availability/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name App Availability
@@ -41,13 +41,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AppAvailability extends IonicNativePlugin {
+
   /**
    * Checks if an app is available on device
    * @param {string} app Package name on android, or URI scheme on iOS
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  check(app: string): Promise<boolean> {
+  check(app: string): Promise<boolean> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/app-minimize/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name App Minimize
@@ -31,12 +31,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AppMinimize extends IonicNativePlugin {
+
   /**
    * Minimizes the application
    * @return {Promise<any>}
    */
   @Cordova()
-  minimize(): Promise<any> {
+  minimize(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/app-preferences/index.ts

@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
 
 /**
  * @name App Preferences
@@ -25,18 +25,11 @@ import { Observable } from 'rxjs/Observable';
   plugin: 'cordova-plugin-app-preferences',
   pluginRef: 'plugins.appPreferences',
   repo: 'https://github.com/apla/me.apla.cordova.app-preferences',
-  platforms: [
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'macOS', 'Windows 8', 'Windows Phone']
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'iOS',
-    'macOS',
-    'Windows 8',
-    'Windows Phone'
-  ]
 })
 @Injectable()
 export class AppPreferences extends IonicNativePlugin {
+
   /**
    * Get a preference value
    *
@@ -47,9 +40,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  fetch(dict: string, key?: string): Promise<any> {
+  fetch(dict: string, key?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set a preference value
@@ -76,9 +67,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  remove(dict: string, key?: string): Promise<any> {
+  remove(dict: string, key?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Clear preferences
@@ -88,9 +77,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  clearAll(): Promise<any> {
+  clearAll(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show native preferences interface
@@ -100,9 +87,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  show(): Promise<any> {
+  show(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show native preferences interface
@@ -113,9 +98,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  watch(subscribe: boolean): Observable<any> {
+  watch(subscribe: boolean): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Return named configuration context
@@ -128,17 +111,13 @@ export class AppPreferences extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  suite(suiteName: string): any {
+  suite(suiteName: string): any { return; }
-    return;
-  }
 
   @Cordova({
     platforms: ['iOS'],
     sync: true
   })
-  iosSuite(suiteName: string): any {
+  iosSuite(suiteName: string): any { return; }
-    return;
-  }
 
   /**
    * Return cloud synchronized configuration context
@@ -148,9 +127,7 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Windows', 'Windows Phone 8']
   })
-  cloudSync(): Object {
+  cloudSync(): Object { return; }
-    return;
-  }
 
   /**
    * Return default configuration context
@@ -160,7 +137,6 @@ export class AppPreferences extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS', 'Windows', 'Windows Phone 8']
   })
-  defaults(): Object {
+  defaults(): Object { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/app-rate/index.ts

@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
+import { Cordova, CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 export interface AppRatePreferences {
   /**

src/@ionic-native/plugins/app-version/index.ts

@@ -1,5 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+
 
 /**
  * @name App Version
@@ -33,39 +35,33 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class AppVersion extends IonicNativePlugin {
+
   /**
    * Returns the name of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getAppName(): Promise<string> {
+  getAppName(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Returns the package name of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getPackageName(): Promise<string> {
+  getPackageName(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Returns the build identifier of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getVersionCode(): Promise<string> {
+  getVersionCode(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Returns the version of the app
    * @returns {Promise<string>}
    */
   @Cordova()
-  getVersionNumber(): Promise<string> {
+  getVersionNumber(): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/apple-pay/index.ts

@@ -1,32 +1,17 @@
-import { Injectable } from '@angular/core';
+import {Injectable} from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import {Observable} from 'rxjs/Observable';
-import { Observable } from 'rxjs/Observable';
+import {
+  Plugin,
+  Cordova,
+  IonicNativePlugin
+} from '@ionic-native/core';
 
-export type IMakePayments =
+export type IMakePayments = 'This device can make payments and has a supported card' | 'This device cannot make payments.' | 'This device can make payments but has no supported cards';
-  | 'This device can make payments and has a supported card'
-  | 'This device cannot make payments.'
-  | 'This device can make payments but has no supported cards';
 export type IShippingType = 'shipping' | 'delivery' | 'store' | 'service';
-export type IBillingRequirement =
+export type IBillingRequirement =  'none' | 'all' | 'postcode' | 'name' | 'email' | 'phone';
-  | 'none'
+export type ITransactionStatus = 'success' | 'failure' | 'invalid-billing-address' | 'invalid-shipping-address' | 'invalid-shipping-contact' | 'require-pin' | 'incorrect-pin' | 'locked-pin';
-  | 'all'
-  | 'postcode'
-  | 'name'
-  | 'email'
-  | 'phone';
-export type ITransactionStatus =
-  | 'success'
-  | 'failure'
-  | 'invalid-billing-address'
-  | 'invalid-shipping-address'
-  | 'invalid-shipping-contact'
-  | 'require-pin'
-  | 'incorrect-pin'
-  | 'locked-pin';
 export type ICompleteTransaction = 'Payment status applied.';
-export type IUpdateItemsAndShippingStatus =
+export type IUpdateItemsAndShippingStatus = 'Updated List Info' | 'Did you make a payment request?';
-  | 'Updated List Info'
-  | 'Did you make a payment request?';
 
 export interface IPaymentResponse {
   billingNameFirst?: string;
@@ -65,7 +50,7 @@ export interface IOrderItem {
   label: string;
   amount: number;
 }
-export interface IShippingMethod {
+export interface  IShippingMethod {
   identifier: string;
   label: string;
   detail: string;
@@ -150,10 +135,11 @@ export interface ISelectedShippingContact {
   plugin: 'cordova-plugin-applepay',
   pluginRef: 'ApplePay',
   repo: 'https://github.com/samkelleher/cordova-plugin-applepay',
-  platforms: ['iOS']
+  platforms: ['iOS'],
 })
 @Injectable()
 export class ApplePay extends IonicNativePlugin {
+
   /**
    * Detects if the current device supports Apple Pay and has any capable cards registered.
    * @return {Promise<IMakePayments>} Returns a promise
@@ -188,9 +174,7 @@ export class ApplePay extends IonicNativePlugin {
     observable: true,
     clearFunction: 'stopListeningForShippingContactSelection'
   })
-  startListeningForShippingContactSelection(): Observable<
+  startListeningForShippingContactSelection(): Observable<ISelectedShippingContact> {
-    ISelectedShippingContact
-  > {
     return;
   }
 
@@ -244,9 +228,7 @@ export class ApplePay extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  updateItemsAndShippingMethods(
+  updateItemsAndShippingMethods(list: IOrderItemsAndShippingMethods): Promise<IUpdateItemsAndShippingStatus> {
-    list: IOrderItemsAndShippingMethods
-  ): Promise<IUpdateItemsAndShippingStatus> {
     return;
   }
 
@@ -339,9 +321,7 @@ export class ApplePay extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  completeLastTransaction(
+  completeLastTransaction(complete: ITransactionStatus): Promise<ICompleteTransaction> {
-    complete: ITransactionStatus
-  ): Promise<ICompleteTransaction> {
     return;
   }
 }

src/@ionic-native/plugins/appodeal/index.ts

@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs';
+import { Injectable } from '@angular/core';
 
 /**
  * @name Appodeal
@@ -46,16 +46,14 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} adType
    */
   @Cordova()
-  initialize(appKey: string, adType: number): void {}
+  initialize(appKey: string, adType: number): void { };
 
   /**
    * check if SDK has been initialized
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isInitialized(): Promise<any> {
+  isInitialized(): Promise<any> { return; };
-    return;
-  }
 
   /**
    * show ad of specified type
@@ -63,9 +61,7 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  show(adType: number): Promise<any> {
+  show(adType: number): Promise<any> { return; };
-    return;
-  }
 
   /**
    * show ad of specified type with placement options
@@ -74,23 +70,24 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  showWithPlacement(adType: number, placement: any): Promise<any> {
+  showWithPlacement(
-    return;
+    adType: number,
-  }
+    placement: any
+    ): Promise<any> { return; };
 
   /**
    * hide ad of specified type
    * @param {number} adType
    */
   @Cordova()
-  hide(adType: number): void {}
+  hide(adType: number): void { };
 
   /**
    * confirm use of ads of specified type
    * @param {number} adType
    */
   @Cordova()
-  confirm(adType: number): void {}
+  confirm(adType: number): void { };
 
   /**
    * check if ad of specified type has been loaded
@@ -98,9 +95,7 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isLoaded(adType: number): Promise<any> {
+  isLoaded(adType: number): Promise<any> { return; };
-    return;
-  }
 
   /**
    * check if ad of specified
@@ -108,9 +103,7 @@ export class Appodeal extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isPrecache(adType: number): Promise<any> {
+  isPrecache(adType: number): Promise<any> { return; };
-    return;
-  }
 
   /**
    *
@@ -118,77 +111,75 @@ export class Appodeal extends IonicNativePlugin {
    * @param autoCache
    */
   @Cordova()
-  setAutoCache(adType: number, autoCache: any): void {}
+  setAutoCache(adType: number, autoCache: any): void { };
 
   /**
    * forcefully cache an ad by type
    * @param {number} adType
    */
   @Cordova()
-  cache(adType: number): void {}
+  cache(adType: number): void { };
 
   /**
    *
    * @param {boolean} set
    */
   @Cordova()
-  setOnLoadedTriggerBoth(set: boolean): void {}
+  setOnLoadedTriggerBoth(set: boolean): void { };
 
   /**
    * enable or disable Smart Banners
    * @param {boolean} enabled
    */
   @Cordova()
-  setSmartBanners(enabled: boolean): void {}
+  setSmartBanners(enabled: boolean): void { };
 
   /**
    * enable or disable banner backgrounds
    * @param {boolean} enabled
    */
   @Cordova()
-  setBannerBackground(enabled: boolean): void {}
+  setBannerBackground(enabled: boolean): void { };
 
   /**
    * enable or disable banner animations
    * @param {boolean} enabled
    */
   @Cordova()
-  setBannerAnimation(enabled: boolean): void {}
+  setBannerAnimation(enabled: boolean): void { };
 
   /**
    *
    * @param value
    */
   @Cordova()
-  set728x90Banners(value: any): void {}
+  set728x90Banners(value: any): void { };
 
   /**
    * enable or disable logging
    * @param {boolean} logging
    */
   @Cordova()
-  setLogging(logging: boolean): void {}
+  setLogging(logging: boolean): void { };
 
   /**
    * enable or disable testing mode
    * @param {boolean} testing
    */
   @Cordova()
-  setTesting(testing: boolean): void {}
+  setTesting(testing: boolean): void { };
 
   /**
    * reset device ID
    */
   @Cordova()
-  resetUUID(): void {}
+  resetUUID(): void { };
 
   /**
    * get version of Appdeal SDK
    */
   @Cordova()
-  getVersion(): Promise<any> {
+  getVersion(): Promise<any> { return; };
-    return;
-  }
 
   /**
    *
@@ -196,7 +187,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} adType
    */
   @Cordova()
-  disableNetwork(network?: string, adType?: number): void {}
+  disableNetwork(network?: string, adType?: number): void { };
 
   /**
    *
@@ -204,54 +195,54 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} adType
    */
   @Cordova()
-  disableNetworkType(network?: string, adType?: number): void {}
+  disableNetworkType(network?: string, adType?: number): void { };
 
   /**
    * disable Location permissions for Appodeal SDK
    */
   @Cordova()
-  disableLocationPermissionCheck(): void {}
+  disableLocationPermissionCheck(): void { };
 
   /**
    * disable Storage permissions for Appodeal SDK
    */
   @Cordova()
-  disableWriteExternalStoragePermissionCheck(): void {}
+  disableWriteExternalStoragePermissionCheck(): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableInterstitialCallbacks(enabled: boolean): void {}
+  enableInterstitialCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableSkippableVideoCallbacks(enabled: boolean): void {}
+  enableSkippableVideoCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableNonSkippableVideoCallbacks(enabled: boolean): void {}
+  enableNonSkippableVideoCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableBannerCallbacks(enabled: boolean): void {}
+  enableBannerCallbacks(enabled: boolean): void { };
 
   /**
    * enable event listeners
    * @param {boolean} enabled
    */
   @Cordova()
-  enableRewardedVideoCallbacks(enabled: boolean): void {}
+  enableRewardedVideoCallbacks(enabled: boolean): void { };
 
   /**
    *
@@ -259,7 +250,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {boolean} value
    */
   @Cordova()
-  setCustomBooleanRule(name: string, value: boolean): void {}
+  setCustomBooleanRule(name: string, value: boolean): void { };
 
   /**
    *
@@ -267,7 +258,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} value
    */
   @Cordova()
-  setCustomIntegerRule(name: string, value: number): void {}
+  setCustomIntegerRule(name: string, value: number): void { };
 
   /**
    * set rule with float value
@@ -275,7 +266,7 @@ export class Appodeal extends IonicNativePlugin {
    * @param {number} value
    */
   @Cordova()
-  setCustomDoubleRule(name: string, value: number): void {}
+  setCustomDoubleRule(name: string, value: number): void { };
 
   /**
    * set rule with string value
@@ -283,291 +274,243 @@ export class Appodeal extends IonicNativePlugin {
    * @param {string} value
    */
   @Cordova()
-  setCustomStringRule(name: string, value: string): void {}
+  setCustomStringRule(name: string, value: string): void { };
 
   /**
    * set ID preference in Appodeal for current user
    * @param id
    */
   @Cordova()
-  setUserId(id: any): void {}
+  setUserId(id: any): void { };
 
   /**
    * set Email preference in Appodeal for current user
    * @param email
    */
   @Cordova()
-  setEmail(email: any): void {}
+  setEmail(email: any): void { };
 
   /**
    * set Birthday preference in Appodeal for current user
    * @param birthday
    */
   @Cordova()
-  setBirthday(birthday: any): void {}
+  setBirthday(birthday: any): void { };
 
   /**
    * et Age preference in Appodeal for current user
    * @param age
    */
   @Cordova()
-  setAge(age: any): void {}
+  setAge(age: any): void { };
 
   /**
    * set Gender preference in Appodeal for current user
    * @param gender
    */
   @Cordova()
-  setGender(gender: any): void {}
+  setGender(gender: any): void { };
 
   /**
    * set Occupation preference in Appodeal for current user
    * @param occupation
    */
   @Cordova()
-  setOccupation(occupation: any): void {}
+  setOccupation(occupation: any): void { };
 
   /**
    * set Relation preference in Appodeal for current user
    * @param relation
    */
   @Cordova()
-  setRelation(relation: any): void {}
+  setRelation(relation: any): void { };
 
   /**
    * set Smoking preference in Appodeal for current user
    * @param smoking
    */
   @Cordova()
-  setSmoking(smoking: any): void {}
+  setSmoking(smoking: any): void { };
 
   /**
    * set Alcohol preference in Appodeal for current user
    * @param alcohol
    */
   @Cordova()
-  setAlcohol(alcohol: any): void {}
+  setAlcohol(alcohol: any): void { };
 
   /**
    * set Interests preference in Appodeal for current user
    * @param interests
    */
   @Cordova()
-  setInterests(interests: any): void {}
+  setInterests(interests: any): void { };
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialLoaded',
     element: document
   })
-  onInterstitialLoaded(): Observable<any> {
+  onInterstitialLoaded(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialFailedToLoad',
     element: document
   })
-  onInterstitialFailedToLoad(): Observable<any> {
+  onInterstitialFailedToLoad(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialShown',
     element: document
   })
-  onInterstitialShown(): Observable<any> {
+  onInterstitialShown(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClicked',
     element: document
   })
-  onInterstitialClicked(): Observable<any> {
+  onInterstitialClicked(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClosed',
     element: document
   })
-  onInterstitialClosed(): Observable<any> {
+  onInterstitialClosed(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoLoaded',
     element: document
   })
-  onSkippableVideoLoaded(): Observable<any> {
+  onSkippableVideoLoaded(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFailedToLoad',
     element: document
   })
-  onSkippableVideoFailedToLoad(): Observable<any> {
+  onSkippableVideoFailedToLoad(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoShown',
     element: document
   })
-  onSkippableVideoShown(): Observable<any> {
+  onSkippableVideoShown(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFinished',
     element: document
   })
-  onSkippableVideoFinished(): Observable<any> {
+  onSkippableVideoFinished(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoClosed',
     element: document
   })
-  onSkippableVideoClosed(): Observable<any> {
+  onSkippableVideoClosed(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoLoaded',
     element: document
   })
-  onRewardedVideoLoaded(): Observable<any> {
+  onRewardedVideoLoaded(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFailedToLoad',
     element: document
   })
-  onRewardedVideoFailedToLoad(): Observable<any> {
+  onRewardedVideoFailedToLoad(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoShown',
     element: document
   })
-  onRewardedVideoShown(): Observable<any> {
+  onRewardedVideoShown(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFinished',
     element: document
   })
-  onRewardedVideoFinished(): Observable<any> {
+  onRewardedVideoFinished(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoClosed',
     element: document
   })
-  onRewardedVideoClosed(): Observable<any> {
+  onRewardedVideoClosed(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoLoaded',
     element: document
   })
-  onNonSkippableVideoLoaded(): Observable<any> {
+  onNonSkippableVideoLoaded(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFailedToLoad',
     element: document
   })
-  onNonSkippableVideoFailedToLoad(): Observable<any> {
+  onNonSkippableVideoFailedToLoad(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoShown',
     element: document
   })
-  onNonSkippableVideoShown(): Observable<any> {
+  onNonSkippableVideoShown(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFinished',
     element: document
   })
-  onNonSkippableVideoFinished(): Observable<any> {
+  onNonSkippableVideoFinished(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoClosed',
     element: document
   })
-  onNonSkippableVideoClosed(): Observable<any> {
+  onNonSkippableVideoClosed(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerClicked',
     element: document
   })
-  onBannerClicked(): Observable<any> {
+  onBannerClicked(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerFailedToLoad',
     element: document
   })
-  onBannerFailedToLoad(): Observable<any> {
+  onBannerFailedToLoad(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerLoaded',
     element: document
   })
-  onBannerLoaded(): Observable<any> {
+  onBannerLoaded(): Observable<any> { return; }
-    return;
-  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerShown',
     element: document
   })
-  onBannerShown(): Observable<any> {
+  onBannerShown(): Observable<any> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/autostart/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Autostart
@@ -31,15 +31,17 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Autostart extends IonicNativePlugin {
+
   /**
    * Enable the automatic startup after the boot
    */
   @Cordova({ sync: true })
-  enable(): void {}
+  enable(): void { }
 
   /**
    * Disable the automatic startup after the boot
    */
   @Cordova({ sync: true })
-  disable(): void {}
+  disable(): void { }
+
 }

src/@ionic-native/plugins/background-fetch/index.ts

@@ -1,13 +1,15 @@
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface BackgroundFetchConfig {
+
   /**
    * Set true to cease background-fetch from operating after user "closes" the app. Defaults to true.
    */
   stopOnTerminate?: boolean;
 }
 
+
 /**
  * @name Background Fetch
  * @description
@@ -59,6 +61,8 @@ export interface BackgroundFetchConfig {
 })
 @Injectable()
 export class BackgroundFetch extends IonicNativePlugin {
+
+
   /**
    * Configures the plugin's fetch callbackFn
    *
@@ -68,9 +72,7 @@ export class BackgroundFetch extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  configure(config: BackgroundFetchConfig): Promise<any> {
+  configure(config: BackgroundFetchConfig): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Start the background-fetch API.
@@ -78,18 +80,14 @@ export class BackgroundFetch extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  start(): Promise<any> {
+  start(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Stop the background-fetch API from firing fetch events. Your callbackFn provided to #configure will no longer be executed.
    * @returns {Promise<any>}
    */
   @Cordova()
-  stop(): Promise<any> {
+  stop(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * You MUST call this method in your fetch callbackFn provided to #configure in order to signal to iOS that your fetch action is complete. iOS provides only 30s of background-time for a fetch-event -- if you exceed this 30s, iOS will kill your app.
@@ -97,14 +95,13 @@ export class BackgroundFetch extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  finish(): void {}
+  finish(): void { }
 
   /**
    * Return the status of the background-fetch
    * @returns {Promise<any>}
    */
   @Cordova()
-  status(): Promise<any> {
+  status(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/background-geolocation/index.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface BackgroundGeolocationResponse {
+
   /**
    * ID of location as stored in DB (or null)
    */
@@ -49,8 +50,8 @@ export interface BackgroundGeolocationResponse {
   altitude: number;
 
   /**
-   * accuracy of the altitude if available.
+    * accuracy of the altitude if available.
-   */
+    */
   altitudeAccuracy: number;
 
   /**
@@ -70,6 +71,7 @@ export interface BackgroundGeolocationResponse {
 }
 
 export interface BackgroundGeolocationConfig {
+
   /**
    * Desired accuracy in meters. Possible values [0, 10, 100, 1000]. The lower
    * the number, the more power devoted to GeoLocation resulting in higher
@@ -106,19 +108,19 @@ export interface BackgroundGeolocationConfig {
    */
   stopOnTerminate?: boolean;
 
-  /**
+  /**

-   * ANDROID ONLY
+   * ANDROID ONLY

-   * Start background service on device boot.
+   * Start background service on device boot.

    *
-   * Defaults to false
+   * Defaults to false

    */
   startOnBoot?: boolean;
 
-  /**
+  /**

-   * ANDROID ONLY
+   * ANDROID ONLY

    * If false location service will not be started in foreground and no notification will be shown.
    *
-   * Defaults to true
+   * Defaults to true

    */
   startForeground?: boolean;
 
@@ -153,17 +155,17 @@ export interface BackgroundGeolocationConfig {
    */
   notificationIconColor?: string;
 
-  /**
+  /**

-   * ANDROID ONLY
+   * ANDROID ONLY

-   * The filename of a custom notification icon. See android quirks.
+   * The filename of a custom notification icon. See android quirks.

-   * NOTE: Only available for API Level >=21.
+   * NOTE: Only available for API Level >=21.

    */
   notificationIconLarge?: string;
 
-  /**
+  /**

-   * ANDROID ONLY
+   * ANDROID ONLY

-   * The filename of a custom notification icon. See android quirks.
+   * The filename of a custom notification icon. See android quirks.

-   * NOTE: Only available for API Level >=21.
+   * NOTE: Only available for API Level >=21.

    */
   notificationIconSmall?: string;
 
@@ -181,50 +183,50 @@ export interface BackgroundGeolocationConfig {
    */
   activityType?: string;
 
-  /**
+  /**

-   * IOS ONLY
+   * IOS ONLY

-   * Pauses location updates when app is paused
+   * Pauses location updates when app is paused

    *
-   * Defaults to true
+   * Defaults to true

    */
   pauseLocationUpdates?: boolean;
 
-  /**
+  /**

-   * Server url where to send HTTP POST with recorded locations
+   * Server url where to send HTTP POST with recorded locations

-   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting
+   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting

    */
   url?: string;
 
-  /**
+  /**

-   * Server url where to send fail to post locations
+   * Server url where to send fail to post locations

-   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting
+   * @see https://github.com/mauron85/cordova-plugin-background-geolocation#http-locations-posting

    */
   syncUrl?: string;
 
   /**
-   * Specifies how many previously failed locations will be sent to server at once
+   * Specifies how many previously failed locations will be sent to server at once

    *
-   * Defaults to 100
+   * Defaults to 100

    */
   syncThreshold?: number;
 
-  /**
+  /**

-   * Optional HTTP headers sent along in HTTP request
+   * Optional HTTP headers sent along in HTTP request

    */
   httpHeaders?: any;
 
   /**
-   * IOS ONLY
+   * IOS ONLY

    * Switch to less accurate significant changes and region monitory when in background (default)
    *
-   * Defaults to 100
+   * Defaults to 100

    */
   saveBatteryOnBackground?: boolean;
 
-  /**
+  /**

-   * Limit maximum number of locations stored into db
+   * Limit maximum number of locations stored into db

    *
-   * Defaults to 10000
+   * Defaults to 10000

    */
   maxLocations?: number;
 
@@ -308,14 +310,15 @@ export interface BackgroundGeolocationConfig {
 })
 @Injectable()
 export class BackgroundGeolocation extends IonicNativePlugin {
-  /**
+
-   * Set location service provider @see https://github.com/mauron85/cordova-plugin-background-geolocation/wiki/Android-providers
+  /**

+   * Set location service provider @see https://github.com/mauron85/cordova-plugin-background-geolocation/wiki/Android-providers

    *
    * Possible values:
-   *  ANDROID_DISTANCE_FILTER_PROVIDER: 0,
+   *  ANDROID_DISTANCE_FILTER_PROVIDER: 0,

-   *  ANDROID_ACTIVITY_PROVIDER: 1
+   *  ANDROID_ACTIVITY_PROVIDER: 1

    *
-   * @enum {number}
+   * @enum {number}

    */
   LocationProvider: any = {
     ANDROID_DISTANCE_FILTER_PROVIDER: 0,
@@ -323,17 +326,17 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   };
 
   /**
-   * Desired accuracy in meters. Possible values [0, 10, 100, 1000].
+   * Desired accuracy in meters. Possible values [0, 10, 100, 1000].

-   * The lower the number, the more power devoted to GeoLocation resulting in higher accuracy readings.
+   * The lower the number, the more power devoted to GeoLocation resulting in higher accuracy readings.

-   * 1000 results in lowest power drain and least accurate readings.
+   * 1000 results in lowest power drain and least accurate readings.

    *
    * Possible values:
-   *  HIGH: 0
+   *  HIGH: 0

-   *  MEDIUM: 10
+   *  MEDIUM: 10

-   *  LOW: 100
+   *  LOW: 100

    *  PASSIVE: 1000
    *
-   * enum {number}
+   * enum {number}

    */
   Accuracy: any = {
     HIGH: 0,
@@ -342,14 +345,14 @@ export class BackgroundGeolocation extends IonicNativePlugin {
     PASSIVE: 1000
   };
 
-  /**
+  /**

-   * Used in the switchMode function
+   * Used in the switchMode function

    *
    * Possible values:
    *  BACKGROUND: 0
-   *  FOREGROUND: 1
+   *  FOREGROUND: 1

    *
-   * @enum {number}
+   * @enum {number}

    */
   Mode: any = {
     BACKGROUND: 0,
@@ -366,11 +369,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
     callbackOrder: 'reverse',
     observable: true
   })
-  configure(
+  configure(options: BackgroundGeolocationConfig): Observable<BackgroundGeolocationResponse> { return; }
-    options: BackgroundGeolocationConfig
-  ): Observable<BackgroundGeolocationResponse> {
-    return;
-  }
 
   /**
    * Turn ON the background-geolocation system.
@@ -378,18 +377,14 @@ export class BackgroundGeolocation extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  start(): Promise<any> {
+  start(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Turn OFF background-tracking
    * @returns {Promise<any>}
    */
   @Cordova()
-  stop(): Promise<any> {
+  stop(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Inform the native plugin that you're finished, the background-task may be completed
@@ -398,9 +393,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  finish(): Promise<any> {
+  finish(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Force the plugin to enter "moving" or "stationary" state
@@ -410,9 +403,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  changePace(isMoving: boolean): Promise<any> {
+  changePace(isMoving: boolean): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Setup configuration
@@ -422,9 +413,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  setConfig(options: BackgroundGeolocationConfig): Promise<any> {
+  setConfig(options: BackgroundGeolocationConfig): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns current stationaryLocation if available. null if not
@@ -433,9 +422,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  getStationaryLocation(): Promise<BackgroundGeolocationResponse> {
+  getStationaryLocation(): Promise<BackgroundGeolocationResponse> { return; }
-    return;
-  }
 
   /**
    * Add a stationary-region listener. Whenever the devices enters "stationary-mode",
@@ -445,9 +432,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  onStationary(): Promise<any> {
+  onStationary(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Check if location is enabled on the device
@@ -456,21 +441,19 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  isLocationEnabled(): Promise<number> {
+  isLocationEnabled(): Promise<number> { return; }
-    return;
-  }
 
   /**
    * Display app settings to change permissions
    */
   @Cordova({ sync: true })
-  showAppSettings(): void {}
+  showAppSettings(): void { }
 
   /**
    * Display device location settings
    */
   @Cordova({ sync: true })
-  showLocationSettings(): void {}
+  showLocationSettings(): void { }
 
   /**
    * Method can be used to detect user changes in location services settings.
@@ -481,9 +464,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  watchLocationMode(): Promise<boolean> {
+  watchLocationMode(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Stop watching for location mode changes.
@@ -492,9 +473,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  stopWatchingLocationMode(): Promise<any> {
+  stopWatchingLocationMode(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Method will return all stored locations.
@@ -508,18 +487,14 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  getLocations(): Promise<any> {
+  getLocations(): Promise<any> { return; }
-    return;
-  }
 
-  /**
+  /**

-   * Method will return locations, which has not been yet posted to server. NOTE: Locations does contain locationId.
+   * Method will return locations, which has not been yet posted to server. NOTE: Locations does contain locationId.

    * @returns {Promise<any>}
    */
   @Cordova()
-  getValidLocations(): Promise<any> {
+  getValidLocations(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Delete stored location by given locationId.
@@ -529,9 +504,7 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  deleteLocation(locationId: number): Promise<any> {
+  deleteLocation(locationId: number): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Delete all stored locations.
@@ -540,19 +513,17 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  deleteAllLocations(): Promise<any> {
+  deleteAllLocations(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Normally plugin will handle switching between BACKGROUND and FOREGROUND mode itself.
    * Calling switchMode you can override plugin behavior and force plugin to switch into other mode.
    *
    * In FOREGROUND mode plugin uses iOS local manager to receive locations and behavior is affected by option.desiredAccuracy and option.distanceFilter.
-   * In BACKGROUND mode plugin uses significant changes and region monitoring to receive locations and uses option.stationaryRadius only.
+   * In BACKGROUND mode plugin uses significant changes and region monitoring to receive locations and uses option.stationaryRadius only.

    *
    * BackgroundGeolocation.Mode.FOREGROUND
-   * BackgroundGeolocation.Mode.BACKGROUND
+   * BackgroundGeolocation.Mode.BACKGROUND

    **
    * @param modeId {number}
    * @returns {Promise<any>}
@@ -560,19 +531,16 @@ export class BackgroundGeolocation extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  switchMode(modeId: number): Promise<any> {
+  switchMode(modeId: number): Promise<any> { return; }
-    return;
-  }
 
-  /**
+  /**

-   * Return all logged events. Useful for plugin debugging. Parameter limit limits number of returned entries.
+   * Return all logged events. Useful for plugin debugging. Parameter limit limits number of returned entries.

-   * @see https://github.com/mauron85/cordova-plugin-background-geolocation/tree/v2.2.1#debugging for more information.
+   * @see https://github.com/mauron85/cordova-plugin-background-geolocation/tree/v2.2.1#debugging for more information.

    *
-   * @param limit {number} Limits the number of entries
+   * @param limit {number} Limits the number of entries

    * @returns {Promise<any>}
    */
   @Cordova()
-  getLogEntries(limit: number): Promise<any> {
+  getLogEntries(limit: number): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/background-mode/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**

src/@ionic-native/plugins/backlight/index.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @beta
@@ -32,21 +33,19 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Backlight extends IonicNativePlugin {
+
   /**
    * This function turns backlight on
    * @return {Promise<any>} Returns a promise that resolves when the backlight is on
    */
   @Cordova()
-  on(): Promise<any> {
+  on(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This function turns backlight off
    * @return {Promise<any>} Returns a promise that resolves when the backlight is off
    */
   @Cordova()
-  off(): Promise<any> {
+  off(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/badge/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Badge

src/@ionic-native/plugins/base64/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -33,13 +33,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Base64 extends IonicNativePlugin {
+
   /**
    * This function encodes base64 of any file
    * @param {string} filePath Absolute file path
    * @return {Promise<string>} Returns a promise that resolves when the file is successfully encoded
    */
   @Cordova()
-  encodeFile(filePath: string): Promise<string> {
+  encodeFile(filePath: string): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/bluetooth-serial/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -39,6 +39,7 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class BluetoothSerial extends IonicNativePlugin {
+
   /**
    * Connect to a Bluetooth device
    * @param {string} macAddress_or_uuid Identifier of the remote device
@@ -49,9 +50,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'disconnect'
   })
-  connect(macAddress_or_uuid: string): Observable<any> {
+  connect(macAddress_or_uuid: string): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Connect insecurely to a Bluetooth device
@@ -63,18 +62,14 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'disconnect'
   })
-  connectInsecure(macAddress: string): Observable<any> {
+  connectInsecure(macAddress: string): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Disconnect from the connected device
    * @returns {Promise<any>}
    */
   @Cordova()
-  disconnect(): Promise<any> {
+  disconnect(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Writes data to the serial port
@@ -84,9 +79,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  write(data: any): Promise<any> {
+  write(data: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Gets the number of bytes of data available
@@ -94,10 +87,7 @@ export class BluetoothSerial extends IonicNativePlugin {
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
-  })
+  }) available(): Promise<any> { return; }
-  available(): Promise<any> {
-    return;
-  }
 
   /**
    * Reads data from the buffer
@@ -106,9 +96,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  read(): Promise<any> {
+  read(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Reads data from the buffer until it reaches a delimiter
@@ -118,9 +106,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  readUntil(delimiter: string): Promise<any> {
+  readUntil(delimiter: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Subscribe to be notified when data is received
@@ -132,9 +118,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'unsubscribe'
   })
-  subscribe(delimiter: string): Observable<any> {
+  subscribe(delimiter: string): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Subscribe to be notified when data is received
@@ -145,9 +129,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'unsubscribeRawData'
   })
-  subscribeRawData(): Observable<any> {
+  subscribeRawData(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Clears data in buffer
@@ -156,9 +138,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  clear(): Promise<any> {
+  clear(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Lists bonded devices
@@ -167,9 +147,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  list(): Promise<any> {
+  list(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Reports if bluetooth is enabled
@@ -178,9 +156,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  isEnabled(): Promise<any> {
+  isEnabled(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Reports the connection status
@@ -189,9 +165,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  isConnected(): Promise<any> {
+  isConnected(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Reads the RSSI from the connected peripheral
@@ -200,9 +174,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  readRSSI(): Promise<any> {
+  readRSSI(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show the Bluetooth settings on the device
@@ -211,9 +183,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  showBluetoothSettings(): Promise<any> {
+  showBluetoothSettings(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Enable Bluetooth on the device
@@ -222,9 +192,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  enable(): Promise<any> {
+  enable(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Discover unpaired devices
@@ -233,9 +201,7 @@ export class BluetoothSerial extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
   })
-  discoverUnpaired(): Promise<any> {
+  discoverUnpaired(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Subscribe to be notified on Bluetooth device discovery. Discovery process must be initiated with the `discoverUnpaired` function.
@@ -246,9 +212,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     observable: true,
     clearFunction: 'clearDeviceDiscoveredListener'
   })
-  setDeviceDiscoveredListener(): Observable<any> {
+  setDeviceDiscoveredListener(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Sets the human readable device name that is broadcasted to other devices
@@ -258,7 +222,7 @@ export class BluetoothSerial extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  setName(newName: string): void {}
+  setName(newName: string): void { }
 
   /**
    * Makes the device discoverable by other devices
@@ -268,5 +232,6 @@ export class BluetoothSerial extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  setDiscoverable(discoverableDuration: number): void {}
+  setDiscoverable(discoverableDuration: number): void { }
+
 }

src/@ionic-native/plugins/braintree/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * Options for the setupApplePay method.
@@ -116,7 +116,8 @@ export interface PaymentUIResult {
   /**
    * Information about the Apple Pay card used to complete a payment (if Apple Pay was used).
    */
-  applePaycard: {};
+  applePaycard: {
+  };
 
   /**
    * Information about 3D Secure card used to complete a payment (if 3D Secure was used).
@@ -200,12 +201,12 @@ export interface PaymentUIResult {
   pluginRef: 'BraintreePlugin',
   repo: 'https://github.com/taracque/cordova-plugin-braintree',
   platforms: ['Android', 'iOS'],
-  install:
+  install: 'ionic cordova plugin add https://github.com/taracque/cordova-plugin-braintree',
-    'ionic cordova plugin add https://github.com/taracque/cordova-plugin-braintree',
+  installVariables: [],
-  installVariables: []
 })
 @Injectable()
 export class Braintree extends IonicNativePlugin {
+
   /**
    * Used to initialize the Braintree client. This function must be called before other methods can be used.
    *  As the initialize code is async, be sure you call all Braintree related methods after the initialize promise has resolved.
@@ -214,11 +215,9 @@ export class Braintree extends IonicNativePlugin {
    * @return {Promise<undefined | string>} Returns a promise that resolves with undefined on successful initialization, or rejects with a string message describing the failure.
    */
   @Cordova({
-    platforms: ['Android', 'iOS']
+    platforms: ['Android', 'iOS'],
   })
-  initialize(token: string): Promise<undefined | string> {
+  initialize(token: string): Promise<undefined | string> { return; }
-    return;
-  }
 
   /**
    * Used to configure Apple Pay on iOS.
@@ -233,11 +232,9 @@ export class Braintree extends IonicNativePlugin {
    * @return {Promise<undefined | string>} Returns a promise that resolves with undefined on successful initialization, or rejects with a string message describing the failure.
    */
   @Cordova({
-    platforms: ['iOS']
+    platforms: ['iOS'],
   })
-  setupApplePay(options: ApplePayOptions): Promise<undefined | string> {
+  setupApplePay(options: ApplePayOptions): Promise<undefined | string> { return; }
-    return;
-  }
 
   /**
    * Shows Braintree's Drop-In Payments UI.
@@ -247,11 +244,7 @@ export class Braintree extends IonicNativePlugin {
    * @return {Promise<PaymentUIResult | string>} Returns a promise that resolves with a PaymentUIResult object on successful payment (or the user cancels), or rejects with a string message describing the failure.
    */
   @Cordova({
-    platforms: ['Android', 'iOS']
+    platforms: ['Android', 'iOS'],
   })
-  presentDropInPaymentUI(
+  presentDropInPaymentUI(options?: PaymentUIOptions): Promise<PaymentUIResult | string> { return; }
-    options?: PaymentUIOptions
-  ): Promise<PaymentUIResult | string> {
-    return;
-  }
 }

src/@ionic-native/plugins/broadcaster/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -32,6 +32,7 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class Broadcaster extends IonicNativePlugin {
+
   /**
    * This function listen to an event sent from the native code
    * @param eventName {string}
@@ -42,9 +43,7 @@ export class Broadcaster extends IonicNativePlugin {
     clearFunction: 'removeEventListener',
     clearWithArgs: true
   })
-  addEventListener(eventName: string): Observable<any> {
+  addEventListener(eventName: string): Observable<any> { return; }
-    return;
-  }
 
   /**
    * This function sends data to the native code
@@ -53,7 +52,6 @@ export class Broadcaster extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when an event is successfully fired
    */
   @Cordova()
-  fireNativeEvent(eventName: string, eventData: any): Promise<any> {
+  fireNativeEvent(eventName: string, eventData: any): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/browser-tab/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Browser Tab
@@ -41,14 +41,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class BrowserTab extends IonicNativePlugin {
+
   /**
    * Check if BrowserTab option is available
    * @return {Promise<any>} Returns a promise that resolves when check is successful and returns true or false
    */
   @Cordova()
-  isAvailable(): Promise<any> {
+  isAvailable(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Opens the provided URL using a browser tab
@@ -56,16 +55,12 @@ export class BrowserTab extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when check open was successful
    */
   @Cordova()
-  openUrl(url: string): Promise<any> {
+  openUrl(url: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Closes browser tab
    * @return {Promise<any>} Returns a promise that resolves when close was finished
    */
   @Cordova()
-  close(): Promise<any> {
+  close(): Promise<any> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/camera-preview/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CameraPreviewDimensions {
   /** The width of the camera preview, default to window.screen.width */
@@ -131,12 +131,12 @@ export interface CameraPreviewPictureOptions {
   pluginName: 'CameraPreview',
   plugin: 'cordova-plugin-camera-preview',
   pluginRef: 'CameraPreview',
-  repo:
+  repo: 'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
-    'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class CameraPreview extends IonicNativePlugin {
+
   FOCUS_MODE = {
     FIXED: 'fixed',
     AUTO: 'auto',
@@ -189,45 +189,35 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  startCamera(options: CameraPreviewOptions): Promise<any> {
+  startCamera(options: CameraPreviewOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Stops the camera preview instance. (iOS & Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  stopCamera(): Promise<any> {
+  stopCamera(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Switch from the rear camera and front camera, if available.
    * @return {Promise<any>}
    */
   @Cordova()
-  switchCamera(): Promise<any> {
+  switchCamera(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Hide the camera preview box.
    * @return {Promise<any>}
    */
   @Cordova()
-  hide(): Promise<any> {
+  hide(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show the camera preview box.
    * @return {Promise<any>}
    */
   @Cordova()
-  show(): Promise<any> {
+  show(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Take the picture (base64)
@@ -238,9 +228,7 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  takePicture(options?: CameraPreviewPictureOptions): Promise<any> {
+  takePicture(options?: CameraPreviewPictureOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -253,9 +241,7 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setColorEffect(effect: string): Promise<any> {
+  setColorEffect(effect: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set the zoom (Android)
@@ -266,27 +252,21 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setZoom(zoom?: number): Promise<any> {
+  setZoom(zoom?: number): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Get the maximum zoom (Android)
+     * Get the maximum zoom (Android)
-   * @return {Promise<any>}
+     * @return {Promise<any>}
-   */
+     */
   @Cordova()
-  getMaxZoom(): Promise<any> {
+  getMaxZoom(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get current zoom (Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  getZoom(): Promise<any> {
+  getZoom(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set the preview Size
@@ -297,18 +277,14 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> {
+  setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get focus mode
    * @return {Promise<any>}
    */
   @Cordova()
-  getFocusMode(): Promise<any> {
+  getFocusMode(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set the focus mode
@@ -319,27 +295,21 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setFocusMode(focusMode?: string): Promise<any> {
+  setFocusMode(focusMode?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get supported focus modes
    * @return {Promise<any>}
    */
   @Cordova()
-  getSupportedFocusModes(): Promise<any> {
+  getSupportedFocusModes(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get the current flash mode
    * @return {Promise<any>}
    */
   @Cordova()
-  getFlashMode(): Promise<any> {
+  getFlashMode(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set the flashmode
@@ -350,45 +320,35 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setFlashMode(flashMode?: string): Promise<any> {
+  setFlashMode(flashMode?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get supported flash modes
    * @return {Promise<any>}
    */
   @Cordova()
-  getSupportedFlashModes(): Promise<any> {
+  getSupportedFlashModes(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get supported picture sizes
    * @return {Promise<any>}
    */
   @Cordova()
-  getSupportedPictureSizes(): Promise<any> {
+  getSupportedPictureSizes(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get exposure mode
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureMode(): Promise<any> {
+  getExposureMode(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get exposure modes
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureModes(): Promise<any> {
+  getExposureModes(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set exposure mode
@@ -399,18 +359,14 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setExposureMode(lock?: string): Promise<any> {
+  setExposureMode(lock?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get exposure compensation (Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureCompensation(): Promise<any> {
+  getExposureCompensation(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set exposure compensation (Android)
@@ -421,18 +377,14 @@ export class CameraPreview extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  setExposureCompensation(exposureCompensation?: number): Promise<any> {
+  setExposureCompensation(exposureCompensation?: number): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get exposure compensation range (Android)
    * @return {Promise<any>}
    */
   @Cordova()
-  getExposureCompensationRange(): Promise<any> {
+  getExposureCompensationRange(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Set specific focus point. Note, this assumes the camera is full-screen.
@@ -441,7 +393,6 @@ export class CameraPreview extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  tapToFocus(xPoint: number, yPoint: number): Promise<any> {
+  tapToFocus(xPoint: number, yPoint: number): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/camera/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CameraOptions {
   /** Picture quality in range 0-100. Default is 50 */
@@ -33,7 +33,7 @@ export interface CameraOptions {
   /**
    * Width in pixels to scale image. Must be used with targetHeight.
    * Aspect ratio remains constant.
-   */
+  */
   targetWidth?: number;
   /**
    * Height in pixels to scale image. Must be used with targetWidth.
@@ -165,6 +165,7 @@ export enum Direction {
 })
 @Injectable()
 export class Camera extends IonicNativePlugin {
+
   /**
    * Constant for possible destination types
    */
@@ -199,6 +200,7 @@ export class Camera extends IonicNativePlugin {
     ALLMEDIA: 2
   };
 
+
   /**
    * Convenience constant
    */
@@ -211,6 +213,7 @@ export class Camera extends IonicNativePlugin {
     SAVEDPHOTOALBUM: 2
   };
 
+
   /**
    * Convenience constant
    */
@@ -240,9 +243,7 @@ export class Camera extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getPicture(options?: CameraOptions): Promise<any> {
+  getPicture(options?: CameraOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Remove intermediate image files that are kept in temporary storage after calling camera.getPicture.
@@ -252,7 +253,6 @@ export class Camera extends IonicNativePlugin {
   @Cordova({
     platforms: ['iOS']
   })
-  cleanup(): Promise<any> {
+  cleanup(): Promise<any> { return; };
-    return;
+
-  }
 }

src/@ionic-native/plugins/card-io/index.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CardIOOptions {
+
   /**
    * Set to true to require expiry date
    */
@@ -81,9 +82,11 @@ export interface CardIOOptions {
    * Once a card image has been captured but before it has been processed, this value will determine whether to continue processing as usual.
    */
   supressScan?: boolean;
+
 }
 
 export interface CardIOResponse {
+
   /**
    * Card type
    */
@@ -123,6 +126,7 @@ export interface CardIOResponse {
    * Cardholder name
    */
   cardholderName: string;
+
 }
 
 /**
@@ -169,6 +173,7 @@ export interface CardIOResponse {
 })
 @Injectable()
 export class CardIO extends IonicNativePlugin {
+
   /**
    * Check whether card scanning is currently available. (May vary by
    * device, OS version, network connectivity, etc.)
@@ -176,9 +181,7 @@ export class CardIO extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  canScan(): Promise<boolean> {
+  canScan(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Scan a credit card with card.io.
@@ -186,16 +189,13 @@ export class CardIO extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  scan(options?: CardIOOptions): Promise<CardIOResponse> {
+  scan(options?: CardIOOptions): Promise<CardIOResponse> { return; }
-    return;
-  }
 
   /**
    * Retrieve the version of the card.io library. Useful when contacting support.
    * @returns {Promise<string>}
    */
   @Cordova()
-  version(): Promise<string> {
+  version(): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/clipboard/index.ts

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
-
 /**
  * @name Clipboard
  * @description
@@ -37,22 +36,20 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Clipboard extends IonicNativePlugin {
+
   /**
    * Copies the given text
    * @param {string} text Text that gets copied on the system clipboard
    * @returns {Promise<any>} Returns a promise after the text has been copied
    */
   @Cordova()
-  copy(text: string): Promise<any> {
+  copy(text: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Pastes the text stored in clipboard
    * @returns {Promise<any>} Returns a promise after the text has been pasted
    */
   @Cordova()
-  paste(): Promise<any> {
+  paste(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/code-push/index.ts

@@ -1,18 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
-
 namespace Http {
   export const enum Verb {
-    GET,
+    GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH
-    HEAD,
-    POST,
-    PUT,
-    DELETE,
-    TRACE,
-    OPTIONS,
-    CONNECT,
-    PATCH
   }
 
   export interface Response {
@@ -22,12 +13,7 @@ namespace Http {
 
   export interface Requester {
     request(verb: Verb, url: string, callback: Callback<Response>): void;
-    request(
+    request(verb: Verb, url: string, requestBody: string, callback: Callback<Response>): void;
-      verb: Verb,
-      url: string,
-      requestBody: string,
-      callback: Callback<Response>
-    ): void;
   }
 }
 
@@ -64,11 +50,7 @@ export interface IRemotePackage extends IPackage {
    * @param downloadError Optional callback invoked in case of an error.
    * @param downloadProgress Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
    */
-  download(
+  download(downloadSuccess: SuccessCallback<ILocalPackage>, downloadError?: ErrorCallback, downloadProgress?: SuccessCallback<DownloadProgress>): void;
-    downloadSuccess: SuccessCallback<ILocalPackage>,
-    downloadError?: ErrorCallback,
-    downloadProgress?: SuccessCallback<DownloadProgress>
-  ): void;
 
   /**
    * Aborts the current download session, previously started with download().
@@ -76,10 +58,7 @@ export interface IRemotePackage extends IPackage {
    * @param abortSuccess Optional callback invoked if the abort operation succeeded.
    * @param abortError Optional callback invoked in case of an error.
    */
-  abortDownload(
+  abortDownload(abortSuccess?: SuccessCallback<void>, abortError?: ErrorCallback): void;
-    abortSuccess?: SuccessCallback<void>,
-    abortError?: ErrorCallback
-  ): void;
 }
 
 /**
@@ -107,11 +86,7 @@ export interface ILocalPackage extends IPackage {
    * @param installError Optional callback inovoked in case of an error.
    * @param installOptions Optional parameter used for customizing the installation behavior.
    */
-  install(
+  install(installSuccess: SuccessCallback<InstallMode>, errorCallback?: ErrorCallback, installOptions?: InstallOptions): void;
-    installSuccess: SuccessCallback<InstallMode>,
-    errorCallback?: ErrorCallback,
-    installOptions?: InstallOptions
-  ): void;
 }
 
 /**
@@ -148,19 +123,13 @@ interface IPackageInfoMetadata extends ILocalPackage {
 }
 
 interface NativeUpdateNotification {
-  updateAppVersion: boolean; // Always true
+  updateAppVersion: boolean;   // Always true
   appVersion: string;
 }
 
-export interface Callback<T> {
+export interface Callback<T> { (error: Error, parameter: T): void; }
-  (error: Error, parameter: T): void;
+export interface SuccessCallback<T> { (result?: T): void; }
-}
+export interface ErrorCallback { (error?: Error): void; }
-export interface SuccessCallback<T> {
-  (result?: T): void;
-}
-export interface ErrorCallback {
-  (error?: Error): void;
-}
 
 interface Configuration {
   appVersion: string;
@@ -177,40 +146,26 @@ declare class AcquisitionStatus {
 
 declare class AcquisitionManager {
   constructor(httpRequester: Http.Requester, configuration: Configuration);
-  public queryUpdateWithCurrentPackage(
+  public queryUpdateWithCurrentPackage(currentPackage: IPackage, callback?: Callback<IRemotePackage | NativeUpdateNotification>): void;
-    currentPackage: IPackage,
+  public reportStatusDeploy(pkg?: IPackage, status?: string, previousLabelOrAppVersion?: string, previousDeploymentKey?: string, callback?: Callback<void>): void;
-    callback?: Callback<IRemotePackage | NativeUpdateNotification>
-  ): void;
-  public reportStatusDeploy(
-    pkg?: IPackage,
-    status?: string,
-    previousLabelOrAppVersion?: string,
-    previousDeploymentKey?: string,
-    callback?: Callback<void>
-  ): void;
   public reportStatusDownload(pkg: IPackage, callback?: Callback<void>): void;
 }
 
 interface CodePushCordovaPlugin {
+
   /**
    * Get the current package information.
    *
    * @param packageSuccess Callback invoked with the currently deployed package information.
    * @param packageError Optional callback invoked in case of an error.
    */
-  getCurrentPackage(
+  getCurrentPackage(packageSuccess: SuccessCallback<ILocalPackage>, packageError?: ErrorCallback): void;
-    packageSuccess: SuccessCallback<ILocalPackage>,
-    packageError?: ErrorCallback
-  ): void;
 
   /**
    * Gets the pending package information, if any. A pending package is one that has been installed but the application still runs the old code.
    * This happends only after a package has been installed using ON_NEXT_RESTART or ON_NEXT_RESUME mode, but the application was not restarted/resumed yet.
    */
-  getPendingPackage(
+  getPendingPackage(packageSuccess: SuccessCallback<ILocalPackage>, packageError?: ErrorCallback): void;
-    packageSuccess: SuccessCallback<ILocalPackage>,
-    packageError?: ErrorCallback
-  ): void;
 
   /**
    * Checks with the CodePush server if an update package is available for download.
@@ -221,11 +176,7 @@ interface CodePushCordovaPlugin {
    * @param queryError Optional callback invoked in case of an error.
    * @param deploymentKey Optional deployment key that overrides the config.xml setting.
    */
-  checkForUpdate(
+  checkForUpdate(querySuccess: SuccessCallback<IRemotePackage>, queryError?: ErrorCallback, deploymentKey?: string): void;
-    querySuccess: SuccessCallback<IRemotePackage>,
-    queryError?: ErrorCallback,
-    deploymentKey?: string
-  ): void;
 
   /**
    * Notifies the plugin that the update operation succeeded and that the application is ready.
@@ -235,19 +186,13 @@ interface CodePushCordovaPlugin {
    * @param notifySucceeded Optional callback invoked if the plugin was successfully notified.
    * @param notifyFailed Optional callback invoked in case of an error during notifying the plugin.
    */
-  notifyApplicationReady(
+  notifyApplicationReady(notifySucceeded?: SuccessCallback<void>, notifyFailed?: ErrorCallback): void;
-    notifySucceeded?: SuccessCallback<void>,
-    notifyFailed?: ErrorCallback
-  ): void;
 
   /**
    * Reloads the application. If there is a pending update package installed using ON_NEXT_RESTART or ON_NEXT_RESUME modes, the update
    * will be immediately visible to the user. Otherwise, calling this function will simply reload the current version of the application.
    */
-  restartApplication(
+  restartApplication(installSuccess: SuccessCallback<void>, errorCallback?: ErrorCallback): void;
-    installSuccess: SuccessCallback<void>,
-    errorCallback?: ErrorCallback
-  ): void;
 
   /**
    * Convenience method for installing updates in one method call.
@@ -270,11 +215,7 @@ interface CodePushCordovaPlugin {
    * @param downloadProgress Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
    *
    */
-  sync(
+  sync(syncCallback?: SuccessCallback<SyncStatus>, syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): void;
-    syncCallback?: SuccessCallback<SyncStatus>,
-    syncOptions?: SyncOptions,
-    downloadProgress?: SuccessCallback<DownloadProgress>
-  ): void;
 }
 
 /**
@@ -487,6 +428,7 @@ export interface DownloadProgress {
 })
 @Injectable()
 export class CodePush extends IonicNativePlugin {
+
   /**
    * Get the current package information.
    *
@@ -576,10 +518,8 @@ export class CodePush extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 3 // we don't need this, so we set it to a value higher than # of args
   })
-  sync(
+  sync(syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): Observable<SyncStatus> {
-    syncOptions?: SyncOptions,
-    downloadProgress?: SuccessCallback<DownloadProgress>
-  ): Observable<SyncStatus> {
     return;
   }
+
 }

src/@ionic-native/plugins/contacts/index.ts

@@ -1,47 +1,12 @@
-import {
+import { CordovaInstance, InstanceProperty, Plugin, getPromise, InstanceCheck, checkAvailability, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
-  checkAvailability,
-  CordovaCheck,
-  CordovaInstance,
-  getPromise,
-  InstanceCheck,
-  InstanceProperty,
-  IonicNativePlugin,
-  Plugin,
-} from '@ionic-native/core';
 
-declare const window: any, navigator: any;
+declare const window: any,
+  navigator: any;
 
-export type ContactFieldType =
+export type ContactFieldType = '*' | 'addresses' | 'birthday' | 'categories' | 'country' | 'department' | 'displayName' | 'emails' | 'name.familyName' | 'name.formatted' | 'name.givenName' | 'name.honorificPrefix' | 'name.honorificSuffix' | 'id' | 'ims' | 'locality' | 'name.middleName' | 'name' | 'nickname' | 'note' | 'organizations' | 'phoneNumbers' | 'photos' | 'postalCode' | 'region' | 'streetAddress' | 'title' | 'urls';
-  | '*'
-  | 'addresses'
-  | 'birthday'
-  | 'categories'
-  | 'country'
-  | 'department'
-  | 'displayName'
-  | 'emails'
-  | 'name.familyName'
-  | 'name.formatted'
-  | 'name.givenName'
-  | 'name.honorificPrefix'
-  | 'name.honorificSuffix'
-  | 'id'
-  | 'ims'
-  | 'locality'
-  | 'name.middleName'
-  | 'name'
-  | 'nickname'
-  | 'note'
-  | 'organizations'
-  | 'phoneNumbers'
-  | 'photos'
-  | 'postalCode'
-  | 'region'
-  | 'streetAddress'
-  | 'title'
-  | 'urls';
 
 export interface IContactProperties {
+
   /** A globally unique identifier. */
   id?: string;
 
@@ -83,6 +48,7 @@ export interface IContactProperties {
 
   /** An array of web pages associated with the contact. */
   urls?: IContactField[];
+
 }
 
 /**
@@ -108,9 +74,7 @@ export class Contact implements IContactProperties {
   [key: string]: any;
 
   constructor() {
-    if (
+    if (checkAvailability('navigator.contacts', 'create', 'Contacts') === true) {
-      checkAvailability('navigator.contacts', 'create', 'Contacts') === true
-    ) {
       this._objectInstance = navigator.contacts.create();
     }
   }
@@ -126,9 +90,7 @@ export class Contact implements IContactProperties {
   }
 
   @CordovaInstance()
-  remove(): Promise<any> {
+  remove(): Promise<any> { return; }
-    return;
-  }
 
   @InstanceCheck()
   save(): Promise<any> {
@@ -162,7 +124,7 @@ export declare const ContactError: {
   PENDING_OPERATION_ERROR: number;
   IO_ERROR: number;
   NOT_SUPPORTED_ERROR: number;
-  PERMISSION_DENIED_ERROR: number;
+  PERMISSION_DENIED_ERROR: number
 };
 
 export interface IContactName {
@@ -184,14 +146,12 @@ export interface IContactName {
  * @hidden
  */
 export class ContactName implements IContactName {
-  constructor(
+  constructor(public formatted?: string,
-    public formatted?: string,
     public familyName?: string,
     public givenName?: string,
     public middleName?: string,
     public honorificPrefix?: string,
-    public honorificSuffix?: string
+    public honorificSuffix?: string) { }
-  ) {}
 }
 
 export interface IContactField {
@@ -207,11 +167,9 @@ export interface IContactField {
  * @hidden
  */
 export class ContactField implements IContactField {
-  constructor(
+  constructor(public type?: string,
-    public type?: string,
     public value?: string,
-    public pref?: boolean
+    public pref?: boolean) { }
-  ) {}
 }
 
 export interface IContactAddress {
@@ -237,16 +195,14 @@ export interface IContactAddress {
  * @hidden
  */
 export class ContactAddress implements IContactAddress {
-  constructor(
+  constructor(public pref?: boolean,
-    public pref?: boolean,
     public type?: string,
     public formatted?: string,
     public streetAddress?: string,
     public locality?: string,
     public region?: string,
     public postalCode?: string,
-    public country?: string
+    public country?: string) { }
-  ) {}
 }
 
 export interface IContactOrganization {
@@ -272,7 +228,7 @@ export class ContactOrganization implements IContactOrganization {
     public department?: string,
     public title?: string,
     public pref?: boolean
-  ) {}
+  ) { }
 }
 
 /** Search options to filter navigator.contacts.  */
@@ -293,12 +249,10 @@ export interface IContactFindOptions {
  * @hidden
  */
 export class ContactFindOptions implements IContactFindOptions {
-  constructor(
+  constructor(public filter?: string,
-    public filter?: string,
     public multiple?: boolean,
     public desiredFields?: string[],
-    public hasPhoneNumber?: boolean
+    public hasPhoneNumber?: boolean) { }
-  ) {}
 }
 
 /**
@@ -339,19 +293,10 @@ export class ContactFindOptions implements IContactFindOptions {
   plugin: 'cordova-plugin-contacts',
   pluginRef: 'navigator.contacts',
   repo: 'https://github.com/apache/cordova-plugin-contacts',
-  platforms: [
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows 8', 'Windows Phone']
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Ubuntu',
-    'Windows',
-    'Windows 8',
-    'Windows Phone'
-  ]
 })
 export class Contacts extends IonicNativePlugin {
+
   /**
    * Create a single contact.
    * @returns {Contact} Returns a Contact object
@@ -367,19 +312,11 @@ export class Contacts extends IonicNativePlugin {
    * @returns {Promise<Contact[]>} Returns a Promise that resolves with the search results (an array of Contact objects)
    */
   @CordovaCheck()
-  find(
+  find(fields: ContactFieldType[], options?: IContactFindOptions): Promise<Contact[]> {
-    fields: ContactFieldType[],
-    options?: IContactFindOptions
-  ): Promise<Contact[]> {
     return getPromise((resolve: Function, reject: Function) => {
-      navigator.contacts.find(
+      navigator.contacts.find(fields, (contacts: any[]) => {
-        fields,
+        resolve(contacts.map(processContact));
-        (contacts: any[]) => {
+      }, reject, options);
-          resolve(contacts.map(processContact));
-        },
-        reject,
-        options
-      );
     });
   }
 
@@ -390,12 +327,10 @@ export class Contacts extends IonicNativePlugin {
   @CordovaCheck()
   pickContact(): Promise<Contact> {
     return getPromise((resolve: Function, reject: Function) => {
-      navigator.contacts.pickContact(
+      navigator.contacts.pickContact((contact: any) => resolve(processContact(contact)), reject);
-        (contact: any) => resolve(processContact(contact)),
-        reject
-      );
     });
   }
+
 }
 
 /**

src/@ionic-native/plugins/couchbase-lite/index.ts

@@ -1,5 +1,6 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
 
 /**
  * @name Couchbase Lite
@@ -120,6 +121,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class CouchbaseLite extends IonicNativePlugin {
+
   /**
    * Get the database url
    * @return {Promise<any>} Returns a promise that resolves with the local database url
@@ -127,7 +129,6 @@ export class CouchbaseLite extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  getURL(): Promise<any> {
+  getURL(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/crop/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface CropOptions {
   quality?: number;

src/@ionic-native/plugins/deeplinks/index.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeeplinkMatch {
+
   /**
    * The route info for the matched route
    */
@@ -19,6 +20,7 @@ export interface DeeplinkMatch {
    * the route was matched (for example, Facebook sometimes adds extra data)
    */
   $link: any;
+
 }
 
 export interface DeeplinkOptions {
@@ -83,18 +85,13 @@ export interface DeeplinkOptions {
   plugin: 'ionic-plugin-deeplinks',
   pluginRef: 'IonicDeeplink',
   repo: 'https://github.com/ionic-team/ionic-plugin-deeplinks',
-  install:
+  install: 'ionic cordova plugin add ionic-plugin-deeplinks --variable URL_SCHEME=myapp --variable DEEPLINK_SCHEME=https --variable DEEPLINK_HOST=example.com --variable ANDROID_PATH_PREFIX=/',
-    'ionic cordova plugin add ionic-plugin-deeplinks --variable URL_SCHEME=myapp --variable DEEPLINK_SCHEME=https --variable DEEPLINK_HOST=example.com --variable ANDROID_PATH_PREFIX=/',
+  installVariables: ['URL_SCHEME', 'DEEPLINK_SCHEME', 'DEEPLINK_HOST', 'ANDROID_PATH_PREFIX'],
-  installVariables: [
-    'URL_SCHEME',
-    'DEEPLINK_SCHEME',
-    'DEEPLINK_HOST',
-    'ANDROID_PATH_PREFIX'
-  ],
   platforms: ['Android', 'Browser', 'iOS']
 })
 @Injectable()
 export class Deeplinks extends IonicNativePlugin {
+
   /**
    * Define a set of paths to match against incoming deeplinks.
    *
@@ -108,9 +105,7 @@ export class Deeplinks extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  route(paths: any): Observable<DeeplinkMatch> {
+  route(paths: any): Observable<DeeplinkMatch> { return; }
-    return;
-  }
 
   /**
    *
@@ -137,11 +132,6 @@ export class Deeplinks extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  routeWithNavController(
+  routeWithNavController(navController: any, paths: any, options?: DeeplinkOptions): Observable<DeeplinkMatch> { return; }
-    navController: any,
+
-    paths: any,
-    options?: DeeplinkOptions
-  ): Observable<DeeplinkMatch> {
-    return;
-  }
 }

src/@ionic-native/plugins/device-motion/index.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeviceMotionAccelerationData {
+
   /**
    * Amount of acceleration on the x-axis. (in m/s^2)
    */
@@ -22,13 +23,16 @@ export interface DeviceMotionAccelerationData {
    * Creation timestamp in milliseconds.
    */
   timestamp: any;
+
 }
 
 export interface DeviceMotionAccelerometerOptions {
+
   /**
    * Requested period of calls to accelerometerSuccess with acceleration data in Milliseconds. Default: 10000
    */
   frequency?: number;
+
 }
 
 /**
@@ -68,28 +72,17 @@ export interface DeviceMotionAccelerometerOptions {
   plugin: 'cordova-plugin-device-motion',
   pluginRef: 'navigator.accelerometer',
   repo: 'https://github.com/apache/cordova-plugin-device-motion',
-  platforms: [
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone 8']
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Tizen',
-    'Ubuntu',
-    'Windows',
-    'Windows Phone 8'
-  ]
 })
 @Injectable()
 export class DeviceMotion extends IonicNativePlugin {
+
   /**
    * Get the current acceleration along the x, y, and z axes.
    * @returns {Promise<DeviceMotionAccelerationData>} Returns object with x, y, z, and timestamp properties
    */
   @Cordova()
-  getCurrentAcceleration(): Promise<DeviceMotionAccelerationData> {
+  getCurrentAcceleration(): Promise<DeviceMotionAccelerationData> { return; }
-    return;
-  }
 
   /**
    * Watch the device acceleration. Clear the watch by unsubscribing from the observable.
@@ -101,9 +94,6 @@ export class DeviceMotion extends IonicNativePlugin {
     observable: true,
     clearFunction: 'clearWatch'
   })
-  watchAcceleration(
+  watchAcceleration(options?: DeviceMotionAccelerometerOptions): Observable<DeviceMotionAccelerationData> { return; }
-    options?: DeviceMotionAccelerometerOptions
+
-  ): Observable<DeviceMotionAccelerationData> {
-    return;
-  }
 }

src/@ionic-native/plugins/device-orientation/index.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeviceOrientationCompassHeading {
+
   /**
    * The heading in degrees from 0-359.99 at a single moment in time. (Number)
    */
@@ -22,9 +23,11 @@ export interface DeviceOrientationCompassHeading {
    * The time at which this heading was determined. (DOMTimeStamp)
    */
   timestamp: number;
+
 }
 
 export interface DeviceOrientationCompassOptions {
+
   /**
    * How often to retrieve the compass heading in milliseconds. (Number) (Default: 100)
    */
@@ -34,6 +37,7 @@ export interface DeviceOrientationCompassOptions {
    * The change in degrees required to initiate a watchHeading success callback. When this value is set, frequency is ignored. (Number)
    */
   filter?: number;
+
 }
 
 /**
@@ -73,29 +77,17 @@ export interface DeviceOrientationCompassOptions {
   plugin: 'cordova-plugin-device-orientation',
   pluginRef: 'navigator.compass',
   repo: 'https://github.com/apache/cordova-plugin-device-orientation',
-  platforms: [
+  platforms: ['Amazon Fire OS', 'Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
-    'Amazon Fire OS',
-    'Android',
-    'BlackBerry 10',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Tizen',
-    'Ubuntu',
-    'Windows',
-    'Windows Phone'
-  ]
 })
 @Injectable()
 export class DeviceOrientation extends IonicNativePlugin {
+
   /**
    * Get the current compass heading.
    * @returns {Promise<DeviceOrientationCompassHeading>}
    */
   @Cordova()
-  getCurrentHeading(): Promise<DeviceOrientationCompassHeading> {
+  getCurrentHeading(): Promise<DeviceOrientationCompassHeading> { return; }
-    return;
-  }
 
   /**
    * Get the device current heading at a regular interval
@@ -109,9 +101,6 @@ export class DeviceOrientation extends IonicNativePlugin {
     observable: true,
     clearFunction: 'clearWatch'
   })
-  watchHeading(
+  watchHeading(options?: DeviceOrientationCompassOptions): Observable<DeviceOrientationCompassHeading> { return; }
-    options?: DeviceOrientationCompassOptions
+
-  ): Observable<DeviceOrientationCompassHeading> {
-    return;
-  }
 }

src/@ionic-native/plugins/device/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 declare const window: any;
 
@@ -28,30 +28,40 @@ declare const window: any;
 })
 @Injectable()
 export class Device extends IonicNativePlugin {
+
   /** Get the version of Cordova running on the device. */
-  @CordovaProperty cordova: string;
+  @CordovaProperty
+  cordova: string;
 
   /**
    * The device.model returns the name of the device's model or product. The value is set
    * by the device manufacturer and may be different across versions of the same product.
    */
-  @CordovaProperty model: string;
+  @CordovaProperty
+  model: string;
 
   /** Get the device's operating system name. */
-  @CordovaProperty platform: string;
+  @CordovaProperty
+  platform: string;
 
   /** Get the device's Universally Unique Identifier (UUID). */
-  @CordovaProperty uuid: string;
+  @CordovaProperty
+  uuid: string;
 
   /** Get the operating system version. */
-  @CordovaProperty version: string;
+  @CordovaProperty
+  version: string;
 
   /** Get the device's manufacturer. */
-  @CordovaProperty manufacturer: string;
+  @CordovaProperty
+  manufacturer: string;
 
   /** Whether the device is running on a simulator. */
-  @CordovaProperty isVirtual: boolean;
+  @CordovaProperty
+  isVirtual: boolean;
 
   /** Get the device hardware serial number. */
-  @CordovaProperty serial: string;
+  @CordovaProperty
+  serial: string;
+
 }

src/@ionic-native/plugins/diagnostic/index.ts

@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
+import { Cordova, Plugin, CordovaProperty, IonicNativePlugin } from '@ionic-native/core';
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 /**
  * @name Diagnostic
@@ -48,6 +43,7 @@ import {
 })
 @Injectable()
 export class Diagnostic extends IonicNativePlugin {
+
   permission = {
     READ_CALENDAR: 'READ_CALENDAR',
     WRITE_CALENDAR: 'WRITE_CALENDAR',
@@ -96,23 +92,9 @@ export class Diagnostic extends IonicNativePlugin {
     CONTACTS: ['READ_CONTACTS', 'WRITE_CONTACTS', 'GET_ACCOUNTS'],
     LOCATION: ['ACCESS_FINE_LOCATION', 'ACCESS_COARSE_LOCATION'],
     MICROPHONE: ['RECORD_AUDIO'],
-    PHONE: [
+    PHONE: ['READ_PHONE_STATE', 'CALL_PHONE', 'ADD_VOICEMAIL', 'USE_SIP', 'PROCESS_OUTGOING_CALLS', 'READ_CALL_LOG', 'WRITE_CALL_LOG'],
-      'READ_PHONE_STATE',
-      'CALL_PHONE',
-      'ADD_VOICEMAIL',
-      'USE_SIP',
-      'PROCESS_OUTGOING_CALLS',
-      'READ_CALL_LOG',
-      'WRITE_CALL_LOG'
-    ],
     SENSORS: ['BODY_SENSORS'],
-    SMS: [
+    SMS: ['SEND_SMS', 'RECEIVE_SMS', 'READ_SMS', 'RECEIVE_WAP_PUSH', 'RECEIVE_MMS'],
-      'SEND_SMS',
-      'RECEIVE_SMS',
-      'READ_SMS',
-      'RECEIVE_WAP_PUSH',
-      'RECEIVE_MMS'
-    ],
     STORAGE: ['READ_EXTERNAL_STORAGE', 'WRITE_EXTERNAL_STORAGE']
   };
 
@@ -159,9 +141,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isLocationAvailable(): Promise<any> {
+  isLocationAvailable(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if Wifi is connected/enabled. On iOS this returns true if the device is connected to a network by WiFi. On Android and Windows 10 Mobile this returns true if the WiFi setting is set to enabled.
@@ -169,9 +149,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isWifiAvailable(): Promise<any> {
+  isWifiAvailable(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the device has a camera. On Android this returns true if the device has a camera. On iOS this returns true if both the device has a camera AND the application is authorized to use it. On Windows 10 Mobile this returns true if both the device has a rear-facing camera AND the
@@ -181,9 +159,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse' })
-  isCameraAvailable(externalStorage?: boolean): Promise<any> {
+  isCameraAvailable( externalStorage?: boolean ): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the device has Bluetooth capabilities and if so that Bluetooth is switched on (same on Android, iOS and Windows 10 Mobile)
@@ -191,42 +167,38 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isBluetoothAvailable(): Promise<any> {
+  isBluetoothAvailable(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Displays the device location settings to allow user to enable location services/change location mode.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10', 'iOS'] })
-  switchToLocationSettings(): void {}
+  switchToLocationSettings(): void { }
 
   /**
    * Displays mobile settings to allow user to enable mobile data.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  switchToMobileDataSettings(): void {}
+  switchToMobileDataSettings(): void { }
 
   /**
    * Displays Bluetooth settings to allow user to enable Bluetooth.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  switchToBluetoothSettings(): void {}
+  switchToBluetoothSettings(): void { }
 
   /**
    * Displays WiFi settings to allow user to enable WiFi.
    */
   @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  switchToWifiSettings(): void {}
+  switchToWifiSettings(): void { }
 
   /**
    * Returns true if the WiFi setting is set to enabled, and is the same as `isWifiAvailable()`
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'Windows 10'] })
-  isWifiEnabled(): Promise<boolean> {
+  isWifiEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Enables/disables WiFi on the device.
@@ -235,9 +207,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  setWifiState(state: boolean): Promise<any> {
+  setWifiState(state: boolean): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Enables/disables Bluetooth on the device.
@@ -246,9 +216,8 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  setBluetoothState(state: boolean): Promise<any> {
+  setBluetoothState(state: boolean): Promise<any> { return; }
-    return;
+
-  }
 
   // ANDROID AND IOS ONLY
 
@@ -257,9 +226,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isLocationEnabled(): Promise<boolean> {
+  isLocationEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized to use location.
@@ -267,18 +234,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isLocationAuthorized(): Promise<any> {
+  isLocationAuthorized(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns the location authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getLocationAuthorizationStatus(): Promise<any> {
+  getLocationAuthorizationStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns the location authorization status for the application.
@@ -288,18 +251,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  requestLocationAuthorization(mode?: string): Promise<any> {
+  requestLocationAuthorization(mode?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if camera hardware is present on device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isCameraPresent(): Promise<any> {
+  isCameraPresent(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized to use the camera.
@@ -309,9 +268,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  isCameraAuthorized(externalStorage?: boolean): Promise<any> {
+  isCameraAuthorized( externalStorage?: boolean ): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns the camera authorization status for the application.
@@ -320,9 +277,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  getCameraAuthorizationStatus(externalStorage?: boolean): Promise<any> {
+  getCameraAuthorizationStatus( externalStorage?: boolean ): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests camera authorization for the application.
@@ -331,63 +286,49 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  requestCameraAuthorization(externalStorage?: boolean): Promise<any> {
+  requestCameraAuthorization( externalStorage?: boolean ): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized to use the microphone.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isMicrophoneAuthorized(): Promise<boolean> {
+  isMicrophoneAuthorized(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Returns the microphone authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getMicrophoneAuthorizationStatus(): Promise<any> {
+  getMicrophoneAuthorizationStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests microphone authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestMicrophoneAuthorization(): Promise<any> {
+  requestMicrophoneAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized to use contacts (address book).
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isContactsAuthorized(): Promise<boolean> {
+  isContactsAuthorized(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Returns the contacts authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getContactsAuthorizationStatus(): Promise<any> {
+  getContactsAuthorizationStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests contacts authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestContactsAuthorization(): Promise<any> {
+  requestContactsAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized to use the calendar.
@@ -400,9 +341,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isCalendarAuthorized(): Promise<boolean> {
+  isCalendarAuthorized(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Returns the calendar authorization status for the application.
@@ -416,9 +355,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getCalendarAuthorizationStatus(): Promise<any> {
+  getCalendarAuthorizationStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests calendar authorization for the application.
@@ -435,9 +372,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestCalendarAuthorization(): Promise<any> {
+  requestCalendarAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Opens settings page for this app.
@@ -446,32 +381,29 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  switchToSettings(): Promise<any> {
+  switchToSettings(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns the state of Bluetooth on the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getBluetoothState(): Promise<any> {
+  getBluetoothState(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Registers a function to be called when a change in Bluetooth state occurs.
    * @param handler
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  registerBluetoothStateChangeHandler(handler: Function): void {}
+  registerBluetoothStateChangeHandler(handler: Function): void { }
 
   /**
    * Registers a function to be called when a change in Location state occurs.
    * @param handler
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  registerLocationStateChangeHandler(handler: Function): void {}
+  registerLocationStateChangeHandler(handler: Function): void { }
+
 
   // ANDROID ONLY
 
@@ -481,9 +413,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isGpsLocationAvailable(): Promise<boolean> {
+  isGpsLocationAvailable(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if location mode is set to return high-accuracy locations from GPS hardware.
@@ -493,9 +423,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isGpsLocationEnabled(): Promise<any> {
+  isGpsLocationEnabled(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if low-accuracy locations are available to the app from network triangulation/WiFi access points.
@@ -503,9 +431,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNetworkLocationAvailable(): Promise<any> {
+  isNetworkLocationAvailable(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if location mode is set to return low-accuracy locations from network triangulation/WiFi access points.
@@ -515,18 +441,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNetworkLocationEnabled(): Promise<any> {
+  isNetworkLocationEnabled(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns the current location mode setting for the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  getLocationMode(): Promise<any> {
+  getLocationMode(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns the current authorisation status for a given permission.
@@ -535,9 +457,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  getPermissionAuthorizationStatus(permission: any): Promise<any> {
+  getPermissionAuthorizationStatus(permission: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns the current authorisation status for multiple permissions.
@@ -546,9 +466,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> {
+  getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests app to be granted authorisation for a runtime permission.
@@ -557,9 +475,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  requestRuntimePermission(permission: any): Promise<any> {
+  requestRuntimePermission(permission: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests app to be granted authorisation for multiple runtime permissions.
@@ -568,9 +484,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  requestRuntimePermissions(permissions: any[]): Promise<any> {
+  requestRuntimePermissions(permissions: any[]): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Indicates if the plugin is currently requesting a runtime permission via the native API.
@@ -580,9 +494,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  isRequestingPermission(): boolean {
+  isRequestingPermission(): boolean { return; }
-    return;
-  }
 
   /**
    * Registers a function to be called when a runtime permission request has completed.
@@ -590,9 +502,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @param handler {Function}
    */
   @Cordova({ sync: true })
-  registerPermissionRequestCompleteHandler(handler: Function): void {
+  registerPermissionRequestCompleteHandler(handler: Function): void { return; }
-    return;
-  }
 
   /**
    * Checks if the device setting for Bluetooth is switched on.
@@ -600,63 +510,49 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isBluetoothEnabled(): Promise<boolean> {
+  isBluetoothEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the device has Bluetooth capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothSupport(): Promise<boolean> {
+  hasBluetoothSupport(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the device has Bluetooth Low Energy (LE) capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothLESupport(): Promise<boolean> {
+  hasBluetoothLESupport(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the device supports Bluetooth Low Energy (LE) Peripheral mode.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothLEPeripheralSupport(): Promise<boolean> {
+  hasBluetoothLEPeripheralSupport(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized to use external storage.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isExternalStorageAuthorized(): Promise<boolean> {
+  isExternalStorageAuthorized(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * CReturns the external storage authorization status for the application.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  getExternalStorageAuthorizationStatus(): Promise<any> {
+  getExternalStorageAuthorizationStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests external storage authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  requestExternalStorageAuthorization(): Promise<any> {
+  requestExternalStorageAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Returns details of external SD card(s): absolute path, is writable, free space.
@@ -669,9 +565,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  getExternalSdCardDetails(): Promise<any> {
+  getExternalSdCardDetails(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Switches to the wireless settings page in the Settings app. Allows configuration of wireless controls such as Wi-Fi, Bluetooth and Mobile networks.
@@ -680,7 +574,7 @@ export class Diagnostic extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  switchToWirelessSettings(): void {}
+  switchToWirelessSettings(): void { }
 
   /**
    * Displays NFC settings to allow user to enable NFC.
@@ -689,16 +583,14 @@ export class Diagnostic extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  switchToNFCSettings(): void {}
+  switchToNFCSettings(): void { }
 
   /**
    * Checks if NFC hardware is present on device.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCPresent(): Promise<boolean> {
+  isNFCPresent(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the device setting for NFC is switched on.
@@ -706,9 +598,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCEnabled(): Promise<boolean> {
+  isNFCEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if NFC is available to the app. Returns true if the device has NFC capabilities AND if NFC setting is switched on.
@@ -716,9 +606,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCAvailable(): Promise<boolean> {
+  isNFCAvailable(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Registers a function to be called when a change in NFC state occurs. Pass in a falsey value to de-register the currently registered function.
@@ -729,34 +617,28 @@ export class Diagnostic extends IonicNativePlugin {
     platforms: ['Android'],
     sync: true
   })
-  registerNFCStateChangeHandler(handler: Function): void {}
+  registerNFCStateChangeHandler(handler: Function): void { }
 
   /**
    * Checks if the device data roaming setting is enabled.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isDataRoamingEnabled(): Promise<boolean> {
+  isDataRoamingEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the device setting for ADB(debug) is switched on.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isADBModeEnabled(): Promise<boolean> {
+  isADBModeEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the device is rooted.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isDeviceRooted(): Promise<boolean> {
+  isDeviceRooted(): Promise<boolean> { return; }
-    return;
-  }
 
   // IOS ONLY
 
@@ -765,18 +647,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isCameraRollAuthorized(): Promise<boolean> {
+  isCameraRollAuthorized(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Returns the authorization status for the application to use the Camera Roll in Photos app.
    * @returns {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getCameraRollAuthorizationStatus(): Promise<string> {
+  getCameraRollAuthorizationStatus(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Requests camera roll authorization for the application.
@@ -785,27 +663,21 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestCameraRollAuthorization(): Promise<any> {
+  requestCameraRollAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if remote (push) notifications are enabled.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS', 'Android'] })
-  isRemoteNotificationsEnabled(): Promise<boolean> {
+  isRemoteNotificationsEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Indicates if the app is registered for remote (push) notifications on the device.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isRegisteredForRemoteNotifications(): Promise<boolean> {
+  isRegisteredForRemoteNotifications(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Returns the authorization status for the application to use Remote Notifications.
@@ -813,9 +685,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemoteNotificationsAuthorizationStatus(): Promise<string> {
+  getRemoteNotificationsAuthorizationStatus(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Indicates the current setting of notification types for the app in the Settings app.
@@ -823,54 +693,42 @@ export class Diagnostic extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemoteNotificationTypes(): Promise<any> {
+  getRemoteNotificationTypes(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized to use reminders.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isRemindersAuthorized(): Promise<boolean> {
+  isRemindersAuthorized(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Returns the reminders authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemindersAuthorizationStatus(): Promise<any> {
+  getRemindersAuthorizationStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests reminders authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestRemindersAuthorization(): Promise<any> {
+  requestRemindersAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if the application is authorized for background refresh.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isBackgroundRefreshAuthorized(): Promise<boolean> {
+  isBackgroundRefreshAuthorized(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Returns the background refresh authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getBackgroundRefreshStatus(): Promise<any> {
+  getBackgroundRefreshStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests Bluetooth authorization for the application.
@@ -879,18 +737,14 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestBluetoothAuthorization(): Promise<any> {
+  requestBluetoothAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if motion tracking is available on the current device.
    * @return {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isMotionAvailable(): Promise<boolean> {
+  isMotionAvailable(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if it's possible to determine the outcome of a motion authorization request on the current device.
@@ -900,9 +754,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isMotionRequestOutcomeAvailable(): Promise<boolean> {
+  isMotionRequestOutcomeAvailable(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Requests motion tracking authorization for the application.
@@ -912,9 +764,7 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestMotionAuthorization(): Promise<string> {
+  requestMotionAuthorization(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Checks motion authorization status for the application.
@@ -924,7 +774,6 @@ export class Diagnostic extends IonicNativePlugin {
    * @return {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getMotionAuthorizationStatus(): Promise<string> {
+  getMotionAuthorizationStatus(): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/dialogs/index.ts

@@ -1,7 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface DialogsPromptCallback {
+
   /**
    * The index of the pressed button. (Number) Note that the index uses one-based indexing, so the value is 1, 2, 3, etc.
    */
@@ -11,8 +13,10 @@ export interface DialogsPromptCallback {
    * The text entered in the prompt dialog box. (String)
    */
   input1: string;
+
 }
 
+
 /**
  * @name Dialogs
  * @description
@@ -46,6 +50,7 @@ export interface DialogsPromptCallback {
 })
 @Injectable()
 export class Dialogs extends IonicNativePlugin {
+
   /**
    * Shows a custom alert or dialog box.
    * @param {string} message Dialog message.
@@ -57,9 +62,7 @@ export class Dialogs extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 4
   })
-  alert(message: string, title?: string, buttonName?: string): Promise<any> {
+  alert(message: string, title?: string, buttonName?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Displays a customizable confirmation dialog box.
@@ -72,13 +75,7 @@ export class Dialogs extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 4
   })
-  confirm(
+  confirm(message: string, title?: string, buttonLabels?: string[]): Promise<number> { return; }
-    message: string,
-    title?: string,
-    buttonLabels?: string[]
-  ): Promise<number> {
-    return;
-  }
 
   /**
    * Displays a native dialog box that is more customizable than the browser's prompt function.
@@ -92,14 +89,8 @@ export class Dialogs extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 5
   })
-  prompt(
+  prompt(message?: string, title?: string, buttonLabels?: string[], defaultText?: string): Promise<DialogsPromptCallback> { return; }
-    message?: string,
+
-    title?: string,
-    buttonLabels?: string[],
-    defaultText?: string
-  ): Promise<DialogsPromptCallback> {
-    return;
-  }
 
   /**
    * The device plays a beep sound.
@@ -108,5 +99,6 @@ export class Dialogs extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  beep(times: number): void {}
+  beep(times: number): void { }
+
 }

src/@ionic-native/plugins/dns/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name DNS
@@ -36,7 +36,5 @@ export class DNS extends IonicNativePlugin {
    * @returns {Promise<string>} Returns a promise that resolves with the resolution.
    */
   @Cordova()
-  resolve(hostname: string): Promise<string> {
+  resolve(hostname: string): Promise<string> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/document-viewer/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface DocumentViewerOptions {
   title?: string;
@@ -62,15 +62,14 @@ export interface DocumentViewerOptions {
 })
 @Injectable()
 export class DocumentViewer extends IonicNativePlugin {
+
   /**
    * Displays the email composer pre-filled with data.
    *
    * @returns {Promise<any>} Resolves promise when the EmailComposer has been opened
    */
   @Cordova()
-  getSupportInfo(): Promise<any> {
+  getSupportInfo(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Check if the document can be shown
@@ -84,15 +83,7 @@ export class DocumentViewer extends IonicNativePlugin {
    * @param [onError] {Function}
    */
   @Cordova({ sync: true })
-  canViewDocument(
+  canViewDocument(url: string, contentType: string, options: DocumentViewerOptions, onPossible?: Function, onMissingApp?: Function, onImpossible?: Function, onError?: Function): void { }
-    url: string,
-    contentType: string,
-    options: DocumentViewerOptions,
-    onPossible?: Function,
-    onMissingApp?: Function,
-    onImpossible?: Function,
-    onError?: Function
-  ): void {}
 
   /**
    * Opens the file
@@ -106,13 +97,6 @@ export class DocumentViewer extends IonicNativePlugin {
    * @param [onError] {Function}
    */
   @Cordova({ sync: true })
-  viewDocument(
+  viewDocument(url: string, contentType: string, options: DocumentViewerOptions, onShow?: Function, onClose?: Function, onMissingApp?: Function, onError?: Function): void { }
-    url: string,
+
-    contentType: string,
-    options: DocumentViewerOptions,
-    onShow?: Function,
-    onClose?: Function,
-    onMissingApp?: Function,
-    onError?: Function
-  ): void {}
 }

src/@ionic-native/plugins/email-composer/index.ts

@@ -1,12 +1,8 @@
 import { Injectable } from '@angular/core';
-import {
+import { Cordova, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
-  Cordova,
-  CordovaCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 export interface EmailComposerOptions {
+
   /**
    * App to send the email with
    */
@@ -46,8 +42,10 @@ export interface EmailComposerOptions {
    * Indicates if the body is HTML or plain text
    */
   isHtml?: boolean;
+
 }
 
+
 /**
  * @name Email Composer
  * @description
@@ -112,6 +110,7 @@ export interface EmailComposerOptions {
 })
 @Injectable()
 export class EmailComposer extends IonicNativePlugin {
+
   /**
    * Verifies if sending emails is supported on the device.
    *
@@ -149,9 +148,7 @@ export class EmailComposer extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  requestPermission(): Promise<boolean> {
+  requestPermission(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if the app has a permission to access email accounts information
@@ -161,9 +158,7 @@ export class EmailComposer extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  hasPermission(): Promise<boolean> {
+  hasPermission(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Adds a new mail app alias.
@@ -172,7 +167,7 @@ export class EmailComposer extends IonicNativePlugin {
    * @param packageName {string} The package name
    */
   @Cordova()
-  addAlias(alias: string, packageName: string): void {}
+  addAlias(alias: string, packageName: string): void { }
 
   /**
    * Displays the email composer pre-filled with data.
@@ -185,7 +180,6 @@ export class EmailComposer extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 3
   })
-  open(options: EmailComposerOptions, scope?: any): Promise<any> {
+  open(options: EmailComposerOptions, scope?: any): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/estimote-beacons/index.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface EstimoteBeaconRegion {
+
   state?: string;
 
   major: number;
@@ -12,6 +13,7 @@ export interface EstimoteBeaconRegion {
   identifier?: string;
 
   uuid: string;
+
 }
 
 /**
@@ -46,6 +48,7 @@ export interface EstimoteBeaconRegion {
 })
 @Injectable()
 export class EstimoteBeacons extends IonicNativePlugin {
+
   /** Proximity value */
   ProximityUnknown = 0;
 
@@ -121,9 +124,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestWhenInUseAuthorization(): Promise<any> {
+  requestWhenInUseAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Ask the user for permission to use location services
@@ -144,9 +145,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestAlwaysAuthorization(): Promise<any> {
+  requestAlwaysAuthorization(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get the current location authorization status.
@@ -165,9 +164,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  authorizationStatus(): Promise<any> {
+  authorizationStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Start advertising as a beacon.
@@ -189,14 +186,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
   @Cordova({
     clearFunction: 'stopAdvertisingAsBeacon'
   })
-  startAdvertisingAsBeacon(
+  startAdvertisingAsBeacon(uuid: string, major: number, minor: number, regionId: string): Promise<any> { return; }
-    uuid: string,
-    major: number,
-    minor: number,
-    regionId: string
-  ): Promise<any> {
-    return;
-  }
 
   /**
    * Stop advertising as a beacon.
@@ -212,9 +202,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopAdvertisingAsBeacon(): Promise<any> {
+  stopAdvertisingAsBeacon(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Enable analytics.
@@ -229,14 +217,12 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  enableAnalytics(enable: boolean): Promise<any> {
+  enableAnalytics(enable: boolean): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Test if analytics is enabled.
+  * Test if analytics is enabled.
-   *
+  *
-   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -245,14 +231,12 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isAnalyticsEnabled(): Promise<any> {
+  isAnalyticsEnabled(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Test if App ID and App Token is set.
+  * Test if App ID and App Token is set.
-   *
+  *
-   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -261,14 +245,12 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isAuthorized(): Promise<any> {
+  isAuthorized(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Set App ID and App Token.
+  * Set App ID and App Token.
-   *
+  *
-   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -279,9 +261,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> {
+  setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Start scanning for all nearby beacons using CoreBluetooth (no region object is used).
@@ -302,9 +282,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     observable: true,
     clearFunction: 'stopEstimoteBeaconDiscovery'
   })
-  startEstimoteBeaconDiscovery(): Observable<any> {
+  startEstimoteBeaconDiscovery(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Stop CoreBluetooth scan. Available on iOS.
@@ -321,9 +299,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopEstimoteBeaconDiscovery(): Promise<any> {
+  stopEstimoteBeaconDiscovery(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Start ranging beacons. Available on iOS and Android.
@@ -346,9 +322,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     clearFunction: 'stopRangingBeaconsInRegion',
     clearWithArgs: true
   })
-  startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> {
+  startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Stop ranging beacons. Available on iOS and Android.
@@ -367,9 +341,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> {
+  stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Start ranging secure beacons. Available on iOS.
@@ -384,11 +356,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     clearFunction: 'stopRangingSecureBeaconsInRegion',
     clearWithArgs: true
   })
-  startRangingSecureBeaconsInRegion(
+  startRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
-    region: EstimoteBeaconRegion
-  ): Observable<any> {
-    return;
-  }
 
   /**
    * Stop ranging secure beacons. Available on iOS.
@@ -397,9 +365,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> {
+  stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Start monitoring beacons. Available on iOS and Android.
@@ -425,12 +391,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  startMonitoringForRegion(
+  startMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
-    region: EstimoteBeaconRegion,
-    notifyEntryStateOnDisplay: boolean
-  ): Observable<any> {
-    return;
-  }
 
   /**
    * Stop monitoring beacons. Available on iOS and Android.
@@ -444,9 +405,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> {
+  stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Start monitoring secure beacons. Available on iOS.
@@ -466,24 +425,17 @@ export class EstimoteBeacons extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  startSecureMonitoringForRegion(
+  startSecureMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
-    region: EstimoteBeaconRegion,
-    notifyEntryStateOnDisplay: boolean
-  ): Observable<any> {
-    return;
-  }
 
   /**
-   * Stop monitoring secure beacons. Available on iOS.
+  * Stop monitoring secure beacons. Available on iOS.
-   * This function has the same parameters/behaviour as
+  * This function has the same parameters/behaviour as
-   * {@link EstimoteBeacons.stopMonitoringForRegion}.
+  * {@link EstimoteBeacons.stopMonitoringForRegion}.
-   * @param region {EstimoteBeaconRegion} Region
+  * @param region {EstimoteBeaconRegion} Region
-   * @returns {Promise<any>}
+  * @returns {Promise<any>}
-   */
+  */
   @Cordova()
-  stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> {
+  stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Connect to Estimote Beacon. Available on Android.
@@ -503,9 +455,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  connectToBeacon(beacon: any): Promise<any> {
+  connectToBeacon(beacon: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Disconnect from connected Estimote Beacon. Available on Android.
@@ -517,9 +467,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  disconnectConnectedBeacon(): Promise<any> {
+  disconnectConnectedBeacon(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Write proximity UUID to connected Estimote Beacon. Available on Android.
@@ -533,9 +481,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedProximityUUID(uuid: any): Promise<any> {
+  writeConnectedProximityUUID(uuid: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Write major to connected Estimote Beacon. Available on Android.
@@ -549,9 +495,7 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedMajor(major: number): Promise<any> {
+  writeConnectedMajor(major: number): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Write minor to connected Estimote Beacon. Available on Android.
@@ -565,7 +509,6 @@ export class EstimoteBeacons extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedMinor(minor: number): Promise<any> {
+  writeConnectedMinor(minor: number): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/extended-device-information/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Extended Device Information
@@ -22,24 +22,28 @@ import { CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
   pluginName: 'ExtendedDeviceInformation',
   plugin: 'cordova-plugin-extended-device-information',
   pluginRef: 'extended-device-information',
-  repo:
+  repo: 'https://github.com/danielehrhardt/cordova-plugin-extended-device-information',
-    'https://github.com/danielehrhardt/cordova-plugin-extended-device-information',
   platforms: ['Android']
 })
 @Injectable()
 export class ExtendedDeviceInformation extends IonicNativePlugin {
+
   /**
    * Get the device's memory size
    */
-  @CordovaProperty memory: number;
+  @CordovaProperty
+  memory: number;
 
   /**
    * Get the device's CPU mhz
    */
-  @CordovaProperty cpumhz: string;
+  @CordovaProperty
+  cpumhz: string;
 
   /**
    * Get the total storage
    */
-  @CordovaProperty totalstorage: string;
+  @CordovaProperty
+  totalstorage: string;
+
 }

src/@ionic-native/plugins/facebook/index.ts

@@ -2,9 +2,11 @@ import { Injectable } from '@angular/core';
 import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface FacebookLoginResponse {
+
   status: string;
 
   authResponse: {
+
     session_key: boolean;
 
     accessToken: string;
@@ -16,7 +18,9 @@ export interface FacebookLoginResponse {
     secret: string;
 
     userID: string;
+
   };
+
 }
 
 /**
@@ -110,46 +114,46 @@ export interface FacebookLoginResponse {
   plugin: 'cordova-plugin-facebook4',
   pluginRef: 'facebookConnectPlugin',
   repo: 'https://github.com/jeduan/cordova-plugin-facebook4',
-  install:
+  install: 'ionic cordova plugin add cordova-plugin-facebook4 --variable APP_ID="123456789" --variable APP_NAME="myApplication"',
-    'ionic cordova plugin add cordova-plugin-facebook4 --variable APP_ID="123456789" --variable APP_NAME="myApplication"',
   installVariables: ['APP_ID', 'APP_NAME'],
   platforms: ['Android', 'iOS', 'Browser']
 })
 @Injectable()
 export class Facebook extends IonicNativePlugin {
+
   EVENTS: {
-    EVENT_NAME_ACTIVATED_APP: 'fb_mobile_activate_app';
+    EVENT_NAME_ACTIVATED_APP: 'fb_mobile_activate_app',
-    EVENT_NAME_DEACTIVATED_APP: 'fb_mobile_deactivate_app';
+    EVENT_NAME_DEACTIVATED_APP: 'fb_mobile_deactivate_app',
-    EVENT_NAME_SESSION_INTERRUPTIONS: 'fb_mobile_app_interruptions';
+    EVENT_NAME_SESSION_INTERRUPTIONS: 'fb_mobile_app_interruptions',
-    EVENT_NAME_TIME_BETWEEN_SESSIONS: 'fb_mobile_time_between_sessions';
+    EVENT_NAME_TIME_BETWEEN_SESSIONS: 'fb_mobile_time_between_sessions',
-    EVENT_NAME_COMPLETED_REGISTRATION: 'fb_mobile_complete_registration';
+    EVENT_NAME_COMPLETED_REGISTRATION: 'fb_mobile_complete_registration',
-    EVENT_NAME_VIEWED_CONTENT: 'fb_mobile_content_view';
+    EVENT_NAME_VIEWED_CONTENT: 'fb_mobile_content_view',
-    EVENT_NAME_SEARCHED: 'fb_mobile_search';
+    EVENT_NAME_SEARCHED: 'fb_mobile_search',
-    EVENT_NAME_RATED: 'fb_mobile_rate';
+    EVENT_NAME_RATED: 'fb_mobile_rate',
-    EVENT_NAME_COMPLETED_TUTORIAL: 'fb_mobile_tutorial_completion';
+    EVENT_NAME_COMPLETED_TUTORIAL: 'fb_mobile_tutorial_completion',
-    EVENT_NAME_PUSH_TOKEN_OBTAINED: 'fb_mobile_obtain_push_token';
+    EVENT_NAME_PUSH_TOKEN_OBTAINED: 'fb_mobile_obtain_push_token',
-    EVENT_NAME_ADDED_TO_CART: 'fb_mobile_add_to_cart';
+    EVENT_NAME_ADDED_TO_CART: 'fb_mobile_add_to_cart',
-    EVENT_NAME_ADDED_TO_WISHLIST: 'fb_mobile_add_to_wishlist';
+    EVENT_NAME_ADDED_TO_WISHLIST: 'fb_mobile_add_to_wishlist',
-    EVENT_NAME_INITIATED_CHECKOUT: 'fb_mobile_initiated_checkout';
+    EVENT_NAME_INITIATED_CHECKOUT: 'fb_mobile_initiated_checkout',
-    EVENT_NAME_ADDED_PAYMENT_INFO: 'fb_mobile_add_payment_info';
+    EVENT_NAME_ADDED_PAYMENT_INFO: 'fb_mobile_add_payment_info',
-    EVENT_NAME_PURCHASED: 'fb_mobile_purchase';
+    EVENT_NAME_PURCHASED: 'fb_mobile_purchase',
-    EVENT_NAME_ACHIEVED_LEVEL: 'fb_mobile_level_achieved';
+    EVENT_NAME_ACHIEVED_LEVEL: 'fb_mobile_level_achieved',
-    EVENT_NAME_UNLOCKED_ACHIEVEMENT: 'fb_mobile_achievement_unlocked';
+    EVENT_NAME_UNLOCKED_ACHIEVEMENT: 'fb_mobile_achievement_unlocked',
-    EVENT_NAME_SPENT_CREDITS: 'fb_mobile_spent_credits';
+    EVENT_NAME_SPENT_CREDITS: 'fb_mobile_spent_credits',
-    EVENT_PARAM_CURRENCY: 'fb_currency';
+    EVENT_PARAM_CURRENCY: 'fb_currency',
-    EVENT_PARAM_REGISTRATION_METHOD: 'fb_registration_method';
+    EVENT_PARAM_REGISTRATION_METHOD: 'fb_registration_method',
-    EVENT_PARAM_CONTENT_TYPE: 'fb_content_type';
+    EVENT_PARAM_CONTENT_TYPE: 'fb_content_type',
-    EVENT_PARAM_CONTENT_ID: 'fb_content_id';
+    EVENT_PARAM_CONTENT_ID: 'fb_content_id',
-    EVENT_PARAM_SEARCH_STRING: 'fb_search_string';
+    EVENT_PARAM_SEARCH_STRING: 'fb_search_string',
-    EVENT_PARAM_SUCCESS: 'fb_success';
+    EVENT_PARAM_SUCCESS: 'fb_success',
-    EVENT_PARAM_MAX_RATING_VALUE: 'fb_max_rating_value';
+    EVENT_PARAM_MAX_RATING_VALUE: 'fb_max_rating_value',
-    EVENT_PARAM_PAYMENT_INFO_AVAILABLE: 'fb_payment_info_available';
+    EVENT_PARAM_PAYMENT_INFO_AVAILABLE: 'fb_payment_info_available',
-    EVENT_PARAM_NUM_ITEMS: 'fb_num_items';
+    EVENT_PARAM_NUM_ITEMS: 'fb_num_items',
-    EVENT_PARAM_LEVEL: 'fb_level';
+    EVENT_PARAM_LEVEL: 'fb_level',
-    EVENT_PARAM_DESCRIPTION: 'fb_description';
+    EVENT_PARAM_DESCRIPTION: 'fb_description',
-    EVENT_PARAM_SOURCE_APPLICATION: 'fb_mobile_launch_source';
+    EVENT_PARAM_SOURCE_APPLICATION: 'fb_mobile_launch_source',
-    EVENT_PARAM_VALUE_YES: '1';
+    EVENT_PARAM_VALUE_YES: '1',
-    EVENT_PARAM_VALUE_NO: '0';
+    EVENT_PARAM_VALUE_NO: '0'
   };
 
   /**
@@ -185,9 +189,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<FacebookLoginResponse>} Returns a Promise that resolves with a status object if login succeeds, and rejects if login fails.
    */
   @Cordova()
-  login(permissions: string[]): Promise<FacebookLoginResponse> {
+  login(permissions: string[]): Promise<FacebookLoginResponse> { return; }
-    return;
-  }
 
   /**
    * Logout of Facebook.
@@ -196,9 +198,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves on a successful logout, and rejects if logout fails.
    */
   @Cordova()
-  logout(): Promise<any> {
+  logout(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Determine if a user is logged in to Facebook and has authenticated your app.  There are three possible states for a user:
@@ -227,9 +227,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with a status, or rejects with an error
    */
   @Cordova()
-  getLoginStatus(): Promise<any> {
+  getLoginStatus(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get a Facebook access token for using Facebook services.
@@ -237,9 +235,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<string>} Returns a Promise that resolves with an access token, or rejects with an error
    */
   @Cordova()
-  getAccessToken(): Promise<string> {
+  getAccessToken(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Show one of various Facebook dialogs. Example of options for a Share dialog:
@@ -259,9 +255,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with success data, or rejects with an error
    */
   @Cordova()
-  showDialog(options: any): Promise<any> {
+  showDialog(options: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Make a call to Facebook Graph API. Can take additional permissions beyond those granted on login.
@@ -277,9 +271,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the result of the request, or rejects with an error
    */
   @Cordova()
-  api(requestPath: string, permissions: string[]): Promise<any> {
+  api(requestPath: string, permissions: string[]): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Log an event.  For more information see the Events section above.
@@ -293,9 +285,7 @@ export class Facebook extends IonicNativePlugin {
     successIndex: 3,
     errorIndex: 4
   })
-  logEvent(name: string, params?: Object, valueToSum?: number): Promise<any> {
+  logEvent(name: string, params?: Object, valueToSum?: number): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Log a purchase. For more information see the Events section above.
@@ -305,9 +295,7 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  logPurchase(value: number, currency: string): Promise<any> {
+  logPurchase(value: number, currency: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Open App Invite dialog. Does not require login.
@@ -324,7 +312,9 @@ export class Facebook extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the result data, or rejects with an error
    */
   @Cordova()
-  appInvite(options: { url: string; picture: string }): Promise<any> {
+  appInvite(options: {
-    return;
+    url: string,
-  }
+    picture: string
+  }): Promise<any> { return; }
+
 }

src/@ionic-native/plugins/fcm/index.ts

@@ -1,8 +1,9 @@
+import { Plugin, IonicNativePlugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface NotificationData {
+
   /**
    * Determines whether the notification was pressed or not
    */
@@ -14,6 +15,7 @@ export interface NotificationData {
    */
 
   [name: string]: any;
+
 }
 
 /**
@@ -62,15 +64,14 @@ export interface NotificationData {
 })
 @Injectable()
 export class FCM extends IonicNativePlugin {
+
   /**
    * Get's device's current registration id
    *
    * @returns {Promise<string>} Returns a Promise that resolves with the registration id token
    */
   @Cordova()
-  getToken(): Promise<string> {
+  getToken(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Event firing on the token refresh
@@ -80,9 +81,7 @@ export class FCM extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  onTokenRefresh(): Observable<string> {
+  onTokenRefresh(): Observable<string> { return; }
-    return;
-  }
 
   /**
    * Subscribes you to a [topic](https://firebase.google.com/docs/notifications/android/console-topics)
@@ -92,9 +91,7 @@ export class FCM extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise resolving in result of subscribing to a topic
    */
   @Cordova()
-  subscribeToTopic(topic: string): Promise<any> {
+  subscribeToTopic(topic: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Unubscribes you from a [topic](https://firebase.google.com/docs/notifications/android/console-topics)
@@ -104,9 +101,7 @@ export class FCM extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a promise resolving in result of unsubscribing from a topic
    */
   @Cordova()
-  unsubscribeFromTopic(topic: string): Promise<any> {
+  unsubscribeFromTopic(topic: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Watch for incoming notifications
@@ -118,7 +113,6 @@ export class FCM extends IonicNativePlugin {
     successIndex: 0,
     errorIndex: 2
   })
-  onNotification(): Observable<NotificationData> {
+  onNotification(): Observable<NotificationData> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/file-chooser/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name File Chooser
@@ -30,12 +30,12 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FileChooser extends IonicNativePlugin {
+
   /**
    * Open a file
    * @returns {Promise<string>}
    */
   @Cordova()
-  open(): Promise<string> {
+  open(): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/file-encryption/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name File Encryption
@@ -30,6 +30,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FileEncryption extends IonicNativePlugin {
+
   /**
    * Enrcypt a file
    * @param file {string} A string representing a local URI
@@ -37,9 +38,7 @@ export class FileEncryption extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  encrypt(file: string, key: string): Promise<any> {
+  encrypt(file: string, key: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Decrypt a file
@@ -48,7 +47,6 @@ export class FileEncryption extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova()
-  decrypt(file: string, key: string): Promise<any> {
+  decrypt(file: string, key: string): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/file-opener/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name File Opener
@@ -29,6 +29,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FileOpener extends IonicNativePlugin {
+
   /**
    * Open an file
    * @param filePath {string} File Path
@@ -40,9 +41,7 @@ export class FileOpener extends IonicNativePlugin {
     successName: 'success',
     errorName: 'error'
   })
-  open(filePath: string, fileMIMEType: string): Promise<any> {
+  open(filePath: string, fileMIMEType: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Uninstalls a package
@@ -54,9 +53,7 @@ export class FileOpener extends IonicNativePlugin {
     successName: 'success',
     errorName: 'error'
   })
-  uninstall(packageId: string): Promise<any> {
+  uninstall(packageId: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Check if an app is already installed
@@ -68,7 +65,6 @@ export class FileOpener extends IonicNativePlugin {
     successName: 'success',
     errorName: 'error'
   })
-  appIsInstalled(packageId: string): Promise<any> {
+  appIsInstalled(packageId: string): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/file-path/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 declare const window: any;
 
@@ -32,13 +32,13 @@ declare const window: any;
 })
 @Injectable()
 export class FilePath extends IonicNativePlugin {
+
   /**
    * Resolve native path for given content URL/path.
    * @param {String} path  Content URL/path.
    * @returns {Promise<string>}
    */
   @Cordova()
-  resolveNativePath(path: string): Promise<string> {
+  resolveNativePath(path: string): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/file-transfer/index.ts

@@ -1,13 +1,8 @@
 import { Injectable } from '@angular/core';
-import {
+import { CordovaInstance, Plugin, InstanceCheck, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
-  checkAvailability,
-  CordovaInstance,
-  InstanceCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 export interface FileUploadOptions {
+
   /**
    * The name of the form element.
    * Defaults to 'file'.
@@ -35,7 +30,7 @@ export interface FileUploadOptions {
   /**
    * A set of optional key/value pairs to pass in the HTTP request.
    */
-  params?: { [s: string]: any };
+  params?: { [s: string]: any; };
 
   /**
    * Whether to upload the data in chunked streaming mode.
@@ -48,10 +43,12 @@ export interface FileUploadOptions {
    * than one value. On iOS, FireOS, and Android, if a header named
    * Content-Type is present, multipart form data will NOT be used.
    */
-  headers?: { [s: string]: any };
+  headers?: { [s: string]: any; };
+
 }
 
 export interface FileUploadResult {
+
   /**
    * The number of bytes sent to the server as part of the upload.
    */
@@ -70,10 +67,12 @@ export interface FileUploadResult {
   /**
    * The HTTP response headers by the server.
    */
-  headers: { [s: string]: any };
+  headers: { [s: string]: any; };
+
 }
 
 export interface FileTransferError {
+
   /**
    * One of the predefined error codes listed below.
    */
@@ -104,6 +103,7 @@ export interface FileTransferError {
    * Either e.getMessage or e.toString.
    */
   exception: string;
+
 }
 
 /**
@@ -179,18 +179,11 @@ export interface FileTransferError {
   plugin: 'cordova-plugin-file-transfer',
   pluginRef: 'FileTransfer',
   repo: 'https://github.com/apache/cordova-plugin-file-transfer',
-  platforms: [
+  platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
-    'Amazon Fire OS',
-    'Android',
-    'Browser',
-    'iOS',
-    'Ubuntu',
-    'Windows',
-    'Windows Phone'
-  ]
 })
 @Injectable()
 export class FileTransfer extends IonicNativePlugin {
+
   /**
    * Error code rejected from upload with FileTransferError
    * Defined in FileTransferError.
@@ -216,6 +209,7 @@ export class FileTransfer extends IonicNativePlugin {
   create(): FileTransferObject {
     return new FileTransferObject();
   }
+
 }
 
 /**
@@ -229,13 +223,7 @@ export class FileTransferObject {
   private _objectInstance: any;
 
   constructor() {
-    if (
+    if (checkAvailability(FileTransfer.getPluginRef(), null, FileTransfer.getPluginName()) === true) {
-      checkAvailability(
-        FileTransfer.getPluginRef(),
-        null,
-        FileTransfer.getPluginName()
-      ) === true
-    ) {
       this._objectInstance = new (FileTransfer.getPlugin())();
     }
   }
@@ -253,14 +241,7 @@ export class FileTransferObject {
     successIndex: 2,
     errorIndex: 3
   })
-  upload(
+  upload(fileUrl: string, url: string, options?: FileUploadOptions, trustAllHosts?: boolean): Promise<FileUploadResult> { return; }
-    fileUrl: string,
-    url: string,
-    options?: FileUploadOptions,
-    trustAllHosts?: boolean
-  ): Promise<FileUploadResult> {
-    return;
-  }
 
   /**
    * Downloads a file from server.
@@ -275,14 +256,7 @@ export class FileTransferObject {
     successIndex: 2,
     errorIndex: 3
   })
-  download(
+  download(source: string, target: string, trustAllHosts?: boolean, options?: { [s: string]: any; }): Promise<any> { return; }
-    source: string,
-    target: string,
-    trustAllHosts?: boolean,
-    options?: { [s: string]: any }
-  ): Promise<any> {
-    return;
-  }
 
   /**
    * Registers a listener that gets called whenever a new chunk of data is transferred.

src/@ionic-native/plugins/fingerprint-aio/index.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface FingerprintOptions {
   /**
@@ -65,14 +66,13 @@ export interface FingerprintOptions {
 })
 @Injectable()
 export class FingerprintAIO extends IonicNativePlugin {
+
   /**
    * Check if fingerprint authentication is available
    * @return {Promise<any>} Returns a promise with result
    */
   @Cordova()
-  isAvailable(): Promise<any> {
+  isAvailable(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Show authentication dialogue
@@ -80,7 +80,6 @@ export class FingerprintAIO extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when authentication was successfull
    */
   @Cordova()
-  show(options: FingerprintOptions): Promise<any> {
+  show(options: FingerprintOptions): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/firebase-analytics/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -35,6 +35,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class FirebaseAnalytics extends IonicNativePlugin {
+
   /**
    * Logs an app event.
    * Be aware of automatically collected events.
@@ -43,9 +44,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  logEvent(name: string, params: any): Promise<any> {
+  logEvent(name: string, params: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Sets the user ID property.
@@ -54,9 +53,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setUserId(id: string): Promise<any> {
+  setUserId(id: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This feature must be used in accordance with Google's Privacy Policy.
@@ -66,9 +63,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setUserProperty(name: string, value: string): Promise<any> {
+  setUserProperty(name: string, value: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Sets whether analytics collection is enabled for this app on this device.
@@ -76,9 +71,7 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setEnabled(enabled: boolean): Promise<any> {
+  setEnabled(enabled: boolean): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Sets the current screen name, which specifies the current visual context in your app.
@@ -87,7 +80,6 @@ export class FirebaseAnalytics extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({ sync: true })
-  setCurrentScreen(name: string): Promise<any> {
+  setCurrentScreen(name: string): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/firebase-dynamic-links/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface DynamicLinksOptions {
   title: string;
@@ -66,21 +66,19 @@ export interface DynamicLinksOptions {
   plugin: ' cordova-plugin-firebase-dynamiclinks',
   pluginRef: 'cordova.plugins.firebase.dynamiclinks',
   repo: 'https://github.com/chemerisuk/cordova-plugin-firebase-dynamiclinks',
-  install:
+  install: 'ionic cordova plugin add cordova-plugin-firebase-dynamiclinks --save --variable APP_DOMAIN="example.com" --variable APP_PATH="/"',
-    'ionic cordova plugin add cordova-plugin-firebase-dynamiclinks --save --variable APP_DOMAIN="example.com" --variable APP_PATH="/"',
   installVariables: ['APP_DOMAIN', 'APP_PATH'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class FirebaseDynamicLinks extends IonicNativePlugin {
+
   /**
    * Registers callback that is triggered on each dynamic link click.
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  onDynamicLink(): Promise<any> {
+  onDynamicLink(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Display invitation dialog.
@@ -88,7 +86,6 @@ export class FirebaseDynamicLinks extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  sendInvitation(options: DynamicLinksOptions): Promise<any> {
+  sendInvitation(options: DynamicLinksOptions): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/firebase/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -30,7 +30,7 @@ import { Observable } from 'rxjs/Observable';
   plugin: 'cordova-plugin-firebase',
   pluginRef: 'FirebasePlugin',
   repo: 'https://github.com/arnesson/cordova-plugin-firebase',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS'],
 })
 @Injectable()
 export class Firebase extends IonicNativePlugin {
@@ -297,10 +297,7 @@ export class Firebase extends IonicNativePlugin {
     successIndex: 2,
     errorIndex: 3
   })
-  verifyPhoneNumber(
+  verifyPhoneNumber(phoneNumber: string, timeoutDuration: number): Promise<any> {
-    phoneNumber: string,
-    timeoutDuration: number
-  ): Promise<any> {
     return;
   }
 

src/@ionic-native/plugins/flashlight/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Flashlight
@@ -28,41 +28,35 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Flashlight extends IonicNativePlugin {
+
   /**
    * Checks if the flashlight is available
    * @returns {Promise<boolean>} Returns a promise that resolves with a boolean stating if the flashlight is available.
    */
   @Cordova()
-  available(): Promise<boolean> {
+  available(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Switches the flashlight on
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  switchOn(): Promise<boolean> {
+  switchOn(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Switches the flashlight off
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  switchOff(): Promise<boolean> {
+  switchOff(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Toggles the flashlight
    * @returns {Promise<any>}
    */
   @Cordova()
-  toggle(): Promise<any> {
+  toggle(): Promise<any> { return; }
-    return;
+
-  }
 
   /**
    * Checks if the flashlight is turned on.
@@ -71,7 +65,6 @@ export class Flashlight extends IonicNativePlugin {
   @Cordova({
     sync: true
   })
-  isSwitchedOn(): boolean {
+  isSwitchedOn(): boolean { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/flurry-analytics/index.ts

@@ -1,10 +1,5 @@
+import { Plugin, CordovaInstance, checkAvailability, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import {
-  checkAvailability,
-  CordovaInstance,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 export interface FlurryAnalyticsOptions {
   /** Flurry API key is required */
@@ -78,10 +73,11 @@ export interface FlurryAnalyticsLocation {
 }
 
 /**
- * @hidden
+* @hidden
- */
+*/
 export class FlurryAnalyticsObject {
-  constructor(private _objectInstance: any) {}
+
+  constructor(private _objectInstance: any) { }
 
   /**
    * This function set the Event
@@ -153,10 +149,7 @@ export class FlurryAnalyticsObject {
    * @return {Promise<any>}
    */
   @CordovaInstance()
-  setLocation(
+  setLocation(location: FlurryAnalyticsLocation, message: string): Promise<any> {
-    location: FlurryAnalyticsLocation,
-    message: string
-  ): Promise<any> {
     return;
   }
 
@@ -179,6 +172,7 @@ export class FlurryAnalyticsObject {
   endSession(): Promise<any> {
     return;
   }
+
 }
 
 /**
@@ -222,24 +216,22 @@ export class FlurryAnalyticsObject {
 })
 @Injectable()
 export class FlurryAnalytics extends IonicNativePlugin {
+
   /**
    * Creates a new instance of FlurryAnalyticsObject
    * @param options {FlurryAnalyticsOptions} options
    * @return {FlurryAnalyticsObject}
    */
   create(options: FlurryAnalyticsOptions): FlurryAnalyticsObject {
+
     let instance: any;
 
-    if (
+    if (checkAvailability(FlurryAnalytics.pluginRef, null, FlurryAnalytics.pluginName) === true) {
-      checkAvailability(
-        FlurryAnalytics.pluginRef,
-        null,
-        FlurryAnalytics.pluginName
-      ) === true
-    ) {
       instance = new (window as any).FlurryAnalytics(options);
     }
 
     return new FlurryAnalyticsObject(instance);
+
   }
+
 }

src/@ionic-native/plugins/ftp/index.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
 
 /**
  * @name FTP
@@ -32,19 +32,18 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class FTP extends IonicNativePlugin {
+
   /**
-   * Connect to one ftp server.
+  * Connect to one ftp server.
-   *
+  *
-   * Just need to init the connection once. If success, you can do any ftp actions later.
+  * Just need to init the connection once. If success, you can do any ftp actions later.
-   * @param hostname {string} The ftp server url. Like ip without protocol prefix, e.g. "192.168.1.1".
+  * @param hostname {string} The ftp server url. Like ip without protocol prefix, e.g. "192.168.1.1".
-   * @param username {string} The ftp login username. If it and `password` are all blank/undefined, the default username "anonymous" is used.
+  * @param username {string} The ftp login username. If it and `password` are all blank/undefined, the default username "anonymous" is used.
-   * @param password {string} The ftp login password. If it and `username` are all blank/undefined, the default password "anonymous@" is used.
+  * @param password {string} The ftp login password. If it and `username` are all blank/undefined, the default password "anonymous@" is used.
-   * @return {Promise<any>} The success callback. Notice: For iOS, if triggered, means `init` success, but NOT means the later action, e.g. `ls`... `download` will success!
+  * @return {Promise<any>} The success callback. Notice: For iOS, if triggered, means `init` success, but NOT means the later action, e.g. `ls`... `download` will success!
-   */
+  */
   @Cordova()
-  connect(hostname: string, username: string, password: string): Promise<any> {
+  connect(hostname: string, username: string, password: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * List files (with info of `name`, `type`, `link`, `size`, `modifiedDate`) under one directory on the ftp server.
@@ -61,9 +60,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  ls(path: string): Promise<any> {
+  ls(path: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Create one directory on the ftp server.
@@ -72,9 +69,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  mkdir(path: string): Promise<any> {
+  mkdir(path: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Delete one directory on the ftp server.
@@ -85,9 +80,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  rmdir(path: string): Promise<any> {
+  rmdir(path: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Delete one file on the ftp server.
@@ -96,9 +89,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  rm(file: string): Promise<any> {
+  rm(file: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Upload one local file to the ftp server.
@@ -112,9 +103,7 @@ export class FTP extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  upload(localFile: string, remoteFile: string): Observable<any> {
+  upload(localFile: string, remoteFile: string): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Download one remote file on the ftp server to local path.
@@ -128,9 +117,7 @@ export class FTP extends IonicNativePlugin {
   @Cordova({
     observable: true
   })
-  download(localFile: string, remoteFile: string): Observable<any> {
+  download(localFile: string, remoteFile: string): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Cancel all requests. Always success.
@@ -138,9 +125,7 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  cancel(): Promise<any> {
+  cancel(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Disconnect from ftp server.
@@ -148,7 +133,6 @@ export class FTP extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  disconnect(): Promise<any> {
+  disconnect(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/geofence/index.ts

@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
+import { Cordova, Plugin, CordovaFunctionOverride, IonicNativePlugin } from '@ionic-native/core';
-  Cordova,
-  CordovaFunctionOverride,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const window: any;
@@ -89,6 +84,7 @@ declare const window: any;
 })
 @Injectable()
 export class Geofence extends IonicNativePlugin {
+
   TransitionType = {
     ENTER: 1,
     EXIT: 2,
@@ -100,9 +96,7 @@ export class Geofence extends IonicNativePlugin {
    * @return {Observable<any>}
    */
   @CordovaFunctionOverride()
-  onTransitionReceived(): Observable<any> {
+  onTransitionReceived(): Observable<any> { return; };
-    return;
-  }
 
   /**
    * Initializes the plugin. User will be prompted to allow the app to use location and notifications.
@@ -110,9 +104,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  initialize(): Promise<void> {
+  initialize(): Promise<void> { return; };
-    return;
-  }
 
   /**
    * Adds a new geofence or array of geofences. For geofence object, see above.
@@ -120,9 +112,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  addOrUpdate(geofences: Object | Array<Object>): Promise<void> {
+  addOrUpdate(geofences: Object | Array<Object>): Promise<void> { return; };
-    return;
-  }
 
   /**
    * Removes a geofence or array of geofences. `geofenceID` corresponds to one or more IDs specified when the
@@ -131,9 +121,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  remove(geofenceId: string | Array<string>): Promise<void> {
+  remove(geofenceId: string | Array<string>): Promise<void> { return; };
-    return;
-  }
 
   /**
    * Removes all geofences.
@@ -141,9 +129,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<void>}
    */
   @Cordova()
-  removeAll(): Promise<void> {
+  removeAll(): Promise<void> { return; };
-    return;
-  }
 
   /**
    * Returns an array of geofences currently being monitored.
@@ -151,9 +137,7 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Promise<Array<string>>}
    */
   @Cordova()
-  getWatched(): Promise<string> {
+  getWatched(): Promise<string> { return; };
-    return;
-  }
 
   /**
    * Called when the user clicks a geofence notification. iOS and Android only.
@@ -161,11 +145,12 @@ export class Geofence extends IonicNativePlugin {
    * @returns {Observable<any>}
    */
   onNotificationClicked(): Observable<any> {
-    return new Observable<any>(observer => {
+
-      window &&
+    return new Observable<any>((observer) => {
-        window.geofence &&
+      window && window.geofence && (window.geofence.onNotificationClicked = observer.next.bind(observer));
-        (window.geofence.onNotificationClicked = observer.next.bind(observer));
+      return () => window.geofence.onNotificationClicked = () => { };
-      return () => (window.geofence.onNotificationClicked = () => {});
     });
+
   }
+
 }

src/@ionic-native/plugins/geolocation/index.ts

@@ -1,10 +1,11 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const navigator: any;
 
 export interface Coordinates {
+
   /**
    * a double representing the position's latitude in decimal degrees.
    */
@@ -48,6 +49,7 @@ export interface Coordinates {
    * This value can be null.
    */
   speed: number;
+
 }
 
 export interface Geoposition {
@@ -63,6 +65,7 @@ export interface Geoposition {
 }
 
 export interface PositionError {
+
   /**
    * A code that indicates the error that occurred
    */
@@ -72,9 +75,11 @@ export interface PositionError {
    * A message that can describe the error that occurred
    */
   message: string;
+
 }
 
 export interface GeolocationOptions {
+
   /**
    * Is a positive long value indicating the maximum age in milliseconds of a
    * possible cached position that is acceptable to return. If set to 0, it
@@ -102,6 +107,7 @@ export interface GeolocationOptions {
    * @type {boolean}
    */
   enableHighAccuracy?: boolean;
+
 }
 
 /**
@@ -147,13 +153,13 @@ export interface GeolocationOptions {
   plugin: 'cordova-plugin-geolocation',
   pluginRef: 'navigator.geolocation',
   repo: 'https://github.com/apache/cordova-plugin-geolocation',
-  install:
+  install: 'ionic cordova plugin add cordova-plugin-geolocation --variable GEOLOCATION_USAGE_DESCRIPTION="To locate you"',
-    'ionic cordova plugin add cordova-plugin-geolocation --variable GEOLOCATION_USAGE_DESCRIPTION="To locate you"',
   installVariables: ['GEOLOCATION_USAGE_DESCRIPTION'],
   platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Windows']
 })
 @Injectable()
 export class Geolocation extends IonicNativePlugin {
+
   /**
    * Get the device's current position.
    *
@@ -163,9 +169,7 @@ export class Geolocation extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> {
+  getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return; }
-    return;
-  }
 
   /**
    * Watch the current device's position.  Clear the watch by unsubscribing from
@@ -186,13 +190,12 @@ export class Geolocation extends IonicNativePlugin {
    * @returns {Observable<Geoposition>} Returns an Observable that notifies with the [position](https://developer.mozilla.org/en-US/docs/Web/API/Position) of the device, or errors.
    */
   watchPosition(options?: GeolocationOptions): Observable<Geoposition> {
-    return new Observable<Geoposition>((observer: any) => {
+    return new Observable<Geoposition>(
-      let watchId = navigator.geolocation.watchPosition(
+      (observer: any) => {
-        observer.next.bind(observer),
+        let watchId = navigator.geolocation.watchPosition(observer.next.bind(observer), observer.next.bind(observer), options);
-        observer.next.bind(observer),
+        return () => navigator.geolocation.clearWatch(watchId);
-        options
+      }
-      );
+    );
-      return () => navigator.geolocation.clearWatch(watchId);
-    });
   }
+
 }

src/@ionic-native/plugins/globalization/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Globalization
@@ -36,23 +36,20 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Globalization extends IonicNativePlugin {
+
   /**
    * Returns the BCP-47 compliant language identifier tag to the successCallback with a properties object as a parameter. That object should have a value property with a String value.
    * @returns {Promise<{value: string}>}
    */
   @Cordova()
-  getPreferredLanguage(): Promise<{ value: string }> {
+  getPreferredLanguage(): Promise<{ value: string }> { return; }
-    return;
-  }
 
   /**
    * Returns the BCP 47 compliant locale identifier string to the successCallback with a properties object as a parameter.
    * @returns {Promise<{value: string}>}
    */
   @Cordova()
-  getLocaleName(): Promise<{ value: string }> {
+  getLocaleName(): Promise<{ value: string }> { return; }
-    return;
-  }
 
   /**
    * Converts date to string
@@ -64,12 +61,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  dateToString(
+  dateToString(date: Date, options: { formatLength: string, selector: string }): Promise<{ value: string }> { return; }
-    date: Date,
-    options: { formatLength: string; selector: string }
-  ): Promise<{ value: string }> {
-    return;
-  }
 
   /**
    * Parses a date formatted as a string, according to the client's user preferences and calendar using the time zone of the client, and returns the corresponding date object.
@@ -81,20 +73,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  stringToDate(
+  stringToDate(dateString: string, options: { formatLength: string, selector: string }): Promise<{ year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number }> { return; }
-    dateString: string,
-    options: { formatLength: string; selector: string }
-  ): Promise<{
-    year: number;
-    month: number;
-    day: number;
-    hour: number;
-    minute: number;
-    second: number;
-    millisecond: number;
-  }> {
-    return;
-  }
 
   /**
    * Returns a pattern string to format and parse dates according to the client's user preferences.
@@ -104,17 +83,7 @@ export class Globalization extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getDatePattern(options: {
+  getDatePattern(options: { formatLength: string, selector: string }): Promise<{ pattern: string, timezone: string, utf_offset: number, dst_offset: number }> { return; }
-    formatLength: string;
-    selector: string;
-  }): Promise<{
-    pattern: string;
-    timezone: string;
-    utf_offset: number;
-    dst_offset: number;
-  }> {
-    return;
-  }
 
   /**
    * Returns an array of the names of the months or days of the week, depending on the client's user preferences and calendar.
@@ -124,12 +93,7 @@ export class Globalization extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getDateNames(options: {
+  getDateNames(options: { type: string, item: string }): Promise<{ value: Array<string> }> { return; }
-    type: string;
-    item: string;
-  }): Promise<{ value: Array<string> }> {
-    return;
-  }
 
   /**
    * Indicates whether daylight savings time is in effect for a given date using the client's time zone and calendar.
@@ -137,18 +101,14 @@ export class Globalization extends IonicNativePlugin {
    * @returns {Promise<{dst: string}>} reutrns a promise with the value
    */
   @Cordova()
-  isDayLightSavingsTime(date: Date): Promise<{ dst: string }> {
+  isDayLightSavingsTime(date: Date): Promise<{ dst: string }> { return; }
-    return;
-  }
 
   /**
    * Returns the first day of the week according to the client's user preferences and calendar.
    * @returns {Promise<{value: string}>} returns a promise with the value
    */
   @Cordova()
-  getFirstDayOfWeek(): Promise<{ value: string }> {
+  getFirstDayOfWeek(): Promise<{ value: string }> { return; }
-    return;
-  }
 
   /**
    * Returns a number formatted as a string according to the client's user preferences.
@@ -159,12 +119,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  numberToString(
+  numberToString(numberToConvert: number, options: { type: string }): Promise<{ value: string }> { return; }
-    numberToConvert: number,
-    options: { type: string }
-  ): Promise<{ value: string }> {
-    return;
-  }
 
   /**
    *
@@ -176,12 +131,7 @@ export class Globalization extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  stringToNumber(
+  stringToNumber(stringToConvert: string, options: { type: string }): Promise<{ value: number | string }> { return; }
-    stringToConvert: string,
-    options: { type: string }
-  ): Promise<{ value: number | string }> {
-    return;
-  }
 
   /**
    * Returns a pattern string to format and parse numbers according to the client's user preferences.
@@ -191,20 +141,7 @@ export class Globalization extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getNumberPattern(options: {
+  getNumberPattern(options: { type: string }): Promise<{ pattern: string, symbol: string, fraction: number, rounding: number, positive: string, negative: string, decimal: string, grouping: string }> { return; }
-    type: string;
-  }): Promise<{
-    pattern: string;
-    symbol: string;
-    fraction: number;
-    rounding: number;
-    positive: string;
-    negative: string;
-    decimal: string;
-    grouping: string;
-  }> {
-    return;
-  }
 
   /**
    * Returns a pattern string to format and parse currency values according to the client's user preferences and ISO 4217 currency code.
@@ -212,16 +149,6 @@ export class Globalization extends IonicNativePlugin {
    * @returns {Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }>}
    */
   @Cordova()
-  getCurrencyPattern(
+  getCurrencyPattern(currencyCode: string): Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }> { return; }
-    currencyCode: string
+
-  ): Promise<{
-    pattern: string;
-    code: string;
-    fraction: number;
-    rounding: number;
-    decimal: number;
-    grouping: string;
-  }> {
-    return;
-  }
 }

src/@ionic-native/plugins/google-analytics/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Google Analytics

src/@ionic-native/plugins/google-play-games-services/index.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ScoreData {
+
   /**
    * The score to submit.
    */
@@ -11,37 +12,47 @@ export interface ScoreData {
    * The leaderboard ID from Google Play Developer console.
    */
   leaderboardId: string;
+
 }
 
 export interface LeaderboardData {
+
   /**
    * The leaderboard ID from Goole Play Developer console.
    */
   leaderboardId: string;
+
 }
 
 export interface AchievementData {
+
   /**
    * The achievement ID from Google Play Developer console.
    */
   achievementId: string;
+
 }
 
 export interface IncrementableAchievementData extends AchievementData {
+
   /**
    * The amount to increment the achievement by.
    */
   numSteps: number;
+
 }
 
 export interface SignedInResponse {
+
   /**
    * True or false is the use is signed in.
    */
   isSignedIn: boolean;
+
 }
 
 export interface Player {
+
   /**
    * The players display name.
    */
@@ -56,7 +67,7 @@ export interface Player {
    * The title of the player based on their gameplay activity. Not
    * all players have this and it may change over time.
    */
-  title: string | null;
+  title: string|null;
 
   /**
    * Retrieves the URI for loading this player's icon-size profile image. 
@@ -69,6 +80,7 @@ export interface Player {
    * null if the player has no profile image.
    */
   hiResIconImageUrl: string;
+
 }
 
 /**
@@ -146,11 +158,11 @@ export interface Player {
   pluginRef: 'plugins.playGamesServices',
   repo: 'https://github.com/artberri/cordova-plugin-play-games-services',
   platforms: ['Android'],
-  install:
+  install: 'ionic cordova plugin add cordova-plugin-play-games-service --variable APP_ID="YOUR_APP_ID',
-    'ionic cordova plugin add cordova-plugin-play-games-service --variable APP_ID="YOUR_APP_ID'
 })
 @Injectable()
 export class GooglePlayGamesServices extends IonicNativePlugin {
+
   /**
    * Initialise native Play Games Service login procedure.
    * 
@@ -158,9 +170,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * is authenticated with Play Games Services.
    */
   @Cordova()
-  auth(): Promise<any> {
+  auth(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Sign out of Google Play Games Services.
@@ -169,9 +179,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * successfully signs out.
    */
   @Cordova()
-  signOut(): Promise<any> {
+  signOut(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Check if the user is signed in.
@@ -180,9 +188,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * the signed in response.
    */
   @Cordova()
-  isSignedIn(): Promise<SignedInResponse> {
+  isSignedIn(): Promise<SignedInResponse> { return; }
-    return;
-  }
 
   /**
    * Show the currently authenticated player.
@@ -191,9 +197,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * Games Services returns the authenticated player.
    */
   @Cordova()
-  showPlayer(): Promise<Player> {
+  showPlayer(): Promise<Player> { return; }
-    return;
-  }
 
   /**
    * Submit a score to a leaderboard. You should ensure that you have a
@@ -204,9 +208,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * score is submitted.
    */
   @Cordova()
-  submitScore(data: ScoreData): Promise<string> {
+  submitScore(data: ScoreData): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Launches the native Play Games leaderboard view controller to show all the
@@ -216,9 +218,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * leaderboards window opens.
    */
   @Cordova()
-  showAllLeaderboards(): Promise<any> {
+  showAllLeaderboards(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Launches the native Play Games leaderboard view controll to show the
@@ -229,9 +229,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * leaderboard window opens.
    */
   @Cordova()
-  showLeaderboard(data: LeaderboardData): Promise<any> {
+  showLeaderboard(data: LeaderboardData): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Unlock an achievement.
@@ -241,9 +239,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * achievement is unlocked.
    */
   @Cordova()
-  unlockAchievement(data: AchievementData): Promise<string> {
+  unlockAchievement(data: AchievementData): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Increment an achievement.
@@ -253,9 +249,7 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * achievement is incremented.
    */
   @Cordova()
-  incrementAchievement(data: IncrementableAchievementData): Promise<string> {
+  incrementAchievement(data: IncrementableAchievementData): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Lauches the native Play Games achievements view controller to show
@@ -265,7 +259,6 @@ export class GooglePlayGamesServices extends IonicNativePlugin {
    * achievement window opens.
    */
   @Cordova()
-  showAchievements(): Promise<any> {
+  showAchievements(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/google-plus/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Google Plus
@@ -23,13 +23,13 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-googleplus',
   pluginRef: 'window.plugins.googleplus',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-googleplus',
-  install:
+  install: 'ionic cordova plugin add cordova-plugin-googleplus --variable REVERSED_CLIENT_ID=myreversedclientid',
-    'ionic cordova plugin add cordova-plugin-googleplus --variable REVERSED_CLIENT_ID=myreversedclientid',
   installVariables: ['REVERSED_CLIENT_ID'],
   platforms: ['Android', 'iOS']
 })
 @Injectable()
 export class GooglePlus extends IonicNativePlugin {
+
   /**
    * The login function walks the user through the Google Auth process.
    * @param options
@@ -39,9 +39,7 @@ export class GooglePlus extends IonicNativePlugin {
     successIndex: 1,
     errorIndex: 2
   })
-  login(options?: any): Promise<any> {
+  login(options?: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * You can call trySilentLogin to check if they're already signed in to the app and sign them in silently if they are.
@@ -49,34 +47,27 @@ export class GooglePlus extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  trySilentLogin(options?: any): Promise<any> {
+  trySilentLogin(options?: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This will clear the OAuth2 token.
    * @returns {Promise<any>}
    */
   @Cordova()
-  logout(): Promise<any> {
+  logout(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This will clear the OAuth2 token, forget which account was used to login, and disconnect that account from the app. This will require the user to allow the app access again next time they sign in. Be aware that this effect is not always instantaneous. It can take time to completely disconnect.
    * @returns {Promise<any>}
    */
   @Cordova()
-  disconnect(): Promise<any> {
+  disconnect(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This will retrieve the Android signing certificate fingerprint which is required in the Google Developer Console.
    * @returns {Promise<any>}
    */
   @Cordova()
-  getSigningCertificateFingerprint(): Promise<any> {
+  getSigningCertificateFingerprint(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/gyroscope/index.ts

@@ -1,6 +1,6 @@
-import { Injectable } from '@angular/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
 
 declare const navigator: any;
 
@@ -82,20 +82,19 @@ export interface GyroscopeOptions {
 })
 @Injectable()
 export class Gyroscope extends IonicNativePlugin {
+
   /**
    * Watching for gyroscope sensor changes
    * @param {GyroscopeOptions} [options]
    * @return {Observable<GyroscopeOrientation>} Returns an Observable that resolves GyroscopeOrientation
    */
   watch(options?: GyroscopeOptions): Observable<GyroscopeOrientation> {
-    return new Observable<GyroscopeOrientation>((observer: any) => {
+    return new Observable<GyroscopeOrientation>(
-      let watchId = navigator.gyroscope.watch(
+      (observer: any) => {
-        observer.next.bind(observer),
+        let watchId = navigator.gyroscope.watch(observer.next.bind(observer), observer.next.bind(observer), options);
-        observer.next.bind(observer),
+        return () => navigator.gyroscope.clearWatch(watchId);
-        options
+      }
-      );
+    );
-      return () => navigator.gyroscope.clearWatch(watchId);
-    });
   }
 
   /**
@@ -106,7 +105,5 @@ export class Gyroscope extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getCurrent(options?: GyroscopeOptions): Promise<GyroscopeOrientation> {
+  getCurrent(options?: GyroscopeOptions): Promise<GyroscopeOrientation> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/header-color/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Header Color
@@ -26,6 +26,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class HeaderColor extends IonicNativePlugin {
+
   /**
    * Set a color to the task header
    * @param color {string} The hex value of the color
@@ -36,7 +37,6 @@ export class HeaderColor extends IonicNativePlugin {
     successName: 'success',
     errorName: 'failure'
   })
-  tint(color: string): Promise<any> {
+  tint(color: string): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/health-kit/index.ts

@@ -1,116 +1,116 @@
+import { Plugin, Cordova, IonicNativePlugin  } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface HealthKitOptions {
   /**
-   * HKWorkoutActivityType constant
+  * HKWorkoutActivityType constant
-   * Read more here: https://developer.apple.com/library/ios/documentation/HealthKit/Reference/HKWorkout_Class/#//apple_ref/c/tdef/HKWorkoutActivityType
+  * Read more here: https://developer.apple.com/library/ios/documentation/HealthKit/Reference/HKWorkout_Class/#//apple_ref/c/tdef/HKWorkoutActivityType
-   */
+  */
   activityType?: string; //
 
   /**
-   * 'hour', 'week', 'year' or 'day', default 'day'
+  * 'hour', 'week', 'year' or 'day', default 'day'
-   */
+  */
   aggregation?: string;
 
   /**
-   *
+  *
-   */
+  */
   amount?: number;
 
   /**
-   *
+  *
-   */
+  */
   correlationType?: string;
 
   /**
-   *
+  *
-   */
+  */
   date?: any;
 
   /**
-   *
+  *
-   */
+  */
   distance?: number;
 
   /**
-   * probably useful with the former param
+  * probably useful with the former param
-   */
+  */
   distanceUnit?: string;
 
   /**
-   * in seconds, optional, use either this or endDate
+  * in seconds, optional, use either this or endDate
-   */
+  */
   duration?: number;
 
   /**
-   *
+  *
-   */
+  */
   endDate?: any;
 
   /**
-   *
+  *
-   */
+  */
   energy?: number;
 
   /**
-   * J|cal|kcal
+  * J|cal|kcal
-   */
+  */
   energyUnit?: string;
 
   /**
-   *
+  *
-   */
+  */
   extraData?: any;
 
   /**
-   *
+  *
-   */
+  */
   metadata?: any;
 
   /**
-   *
+  *
-   */
+  */
   quantityType?: string;
 
   /**
-   *
+  *
-   */
+  */
   readTypes?: any;
 
   /**
-   *
+  *
-   */
+  */
   requestWritePermission?: boolean;
 
   /**
-   *
+  *
-   */
+  */
   samples?: any;
 
   /**
-   *
+  *
-   */
+  */
   sampleType?: string;
 
   /**
-   *
+  *
-   */
+  */
   startDate?: any;
 
   /**
-   * m|cm|mm|in|ft
+  * m|cm|mm|in|ft
-   */
+  */
   unit?: string;
 
   /**
-   *
+  *
-   */
+  */
   requestReadPermission?: boolean;
 
   /**
-   *
+  *
-   */
+  */
   writeTypes?: any;
 }
 
@@ -142,207 +142,168 @@ export interface HealthKitOptions {
 })
 @Injectable()
 export class HealthKit extends IonicNativePlugin {
-  /**
-   * Check if HealthKit is supported (iOS8+, not on iPad)
-   * @returns {Promise<any>}
-   */
-  @Cordova()
-  available(): Promise<any> {
-    return;
-  }
 
   /**
-   * Pass in a type and get back on of undetermined | denied | authorized
+ * Check if HealthKit is supported (iOS8+, not on iPad)
-   * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
-   * @returns {Promise<any>}
+ */
-   */
   @Cordova()
-  checkAuthStatus(options: HealthKitOptions): Promise<any> {
+  available(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Ask some or all permissions up front
+ * Pass in a type and get back on of undetermined | denied | authorized
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  requestAuthorization(options: HealthKitOptions): Promise<any> {
+  checkAuthStatus(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Formatted as yyyy-MM-dd
+ * Ask some or all permissions up front
-   * @returns {Promise<any>}
+ * @param options {HealthKitOptions}
-   */
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  readDateOfBirth(): Promise<any> {
+  requestAuthorization(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Output = male|female|other|unknown
+ * Formatted as yyyy-MM-dd
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  readGender(): Promise<any> {
+  readDateOfBirth(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Output = A+|A-|B+|B-|AB+|AB-|O+|O-|unknown
+ * Output = male|female|other|unknown
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  readBloodType(): Promise<any> {
+  readGender(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Output = I|II|III|IV|V|VI|unknown
+ * Output = A+|A-|B+|B-|AB+|AB-|O+|O-|unknown
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  readFitzpatrickSkinType(): Promise<any> {
+  readBloodType(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone) and amount
+ * Output = I|II|III|IV|V|VI|unknown
-   * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
-   * @returns {Promise<any>}
+ */
-   */
   @Cordova()
-  saveWeight(options: HealthKitOptions): Promise<any> {
+  readFitzpatrickSkinType(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone)
+ * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone) and amount
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  readWeight(options: HealthKitOptions): Promise<any> {
+  saveWeight(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot) and amount
+ * Pass in unit (g=gram, kg=kilogram, oz=ounce, lb=pound, st=stone)
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  saveHeight(options: HealthKitOptions): Promise<any> {
+  readWeight(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot)
+ * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot) and amount
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  readHeight(options: HealthKitOptions): Promise<any> {
+  saveHeight(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   * no params yet, so this will return all workouts ever of any type
+ * Pass in unit (mm=millimeter, cm=centimeter, m=meter, in=inch, ft=foot)
-   * @returns {Promise<any>}
+ * @param options {HealthKitOptions}
-   */
+ * @returns {Promise<any>}
+ */
   @Cordova()
-  findWorkouts(): Promise<any> {
+  readHeight(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ * no params yet, so this will return all workouts ever of any type
-   * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
-   * @returns {Promise<any>}
+ */
-   */
   @Cordova()
-  saveWorkout(options: HealthKitOptions): Promise<any> {
+  findWorkouts(): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  querySampleType(options: HealthKitOptions): Promise<any> {
+  saveWorkout(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  querySampleTypeAggregated(options: HealthKitOptions): Promise<any> {
+  querySampleType(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  deleteSamples(options: HealthKitOptions): Promise<any> {
+  querySampleTypeAggregated(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  monitorSampleType(options: HealthKitOptions): Promise<any> {
+  deleteSamples(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  sumQuantityType(options: HealthKitOptions): Promise<any> {
+  monitorSampleType(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  saveQuantitySample(options: HealthKitOptions): Promise<any> {
+  sumQuantityType(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  saveCorrelation(options: HealthKitOptions): Promise<any> {
+  saveQuantitySample(options: HealthKitOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
-   *
+ *
-   * @param options {HealthKitOptions}
+ * @param options {HealthKitOptions}
-   * @returns {Promise<any>}
+ * @returns {Promise<any>}
-   */
+ */
   @Cordova()
-  queryCorrelationType(options: HealthKitOptions): Promise<any> {
+  saveCorrelation(options: HealthKitOptions): Promise<any> { return; }
-    return;
+
-  }
+  /**
+ *
+ * @param options {HealthKitOptions}
+ * @returns {Promise<any>}
+ */
+  @Cordova()
+  queryCorrelationType(options: HealthKitOptions): Promise<any> { return; }
+
+
 }

src/@ionic-native/plugins/health/index.ts

@@ -1,18 +1,18 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @hidden
  */
 export interface HealthDataType {
   /**
-   * Read only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
+  * Read only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
-   */
+  */
   read?: string[];
 
   /**
-   * Write only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
+  * Write only date types (see https://github.com/dariosalvi78/cordova-plugin-health#supported-data-types)
-   */
+  */
   write?: string[];
 }
 
@@ -201,6 +201,7 @@ export interface HealthData {
 })
 @Injectable()
 export class Health extends IonicNativePlugin {
+
   /**
    * Tells if either Google Fit or HealthKit are available.
    *
@@ -209,9 +210,7 @@ export class Health extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  isAvailable(): Promise<boolean> {
+  isAvailable(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if recent Google Play Services and Google Fit are installed. If the play services are not installed,
@@ -227,9 +226,7 @@ export class Health extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  promptInstallFit(): Promise<any> {
+  promptInstallFit(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Requests read and/or write access to a set of data types. It is recommendable to always explain why the app
@@ -251,11 +248,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  requestAuthorization(
+  requestAuthorization(datatypes: Array<string | HealthDataType>): Promise<any> { return; }
-    datatypes: Array<string | HealthDataType>
-  ): Promise<any> {
-    return;
-  }
 
   /**
    * Check if the app has authorization to read/write a set of datatypes.
@@ -269,9 +262,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<boolean>} Returns a promise that resolves with a boolean that indicates the authorization status
    */
   @Cordova()
-  isAuthorized(datatypes: Array<string | HealthDataType>): Promise<boolean> {
+  isAuthorized(datatypes: Array<string | HealthDataType>): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Gets all the data points of a certain data type within a certain time window.
@@ -305,9 +296,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<HealthData>}
    */
   @Cordova()
-  query(queryOptions: HealthQueryOptions): Promise<HealthData> {
+  query(queryOptions: HealthQueryOptions): Promise<HealthData> { return; }
-    return;
-  }
 
   /**
    * Gets aggregated data in a certain time window. Usually the sum is returned for the given quantity.
@@ -331,11 +320,7 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<HealthData[]>}
    */
   @Cordova()
-  queryAggregated(
+  queryAggregated(queryOptionsAggregated: HealthQueryOptionsAggregated): Promise<HealthData[]> { return; }
-    queryOptionsAggregated: HealthQueryOptionsAggregated
-  ): Promise<HealthData[]> {
-    return;
-  }
 
   /**
    * Stores a data point.
@@ -352,7 +337,6 @@ export class Health extends IonicNativePlugin {
    * @return {Promise<any>}
    */
   @Cordova()
-  store(storeOptions: HealthStoreOptions): Promise<any> {
+  store(storeOptions: HealthStoreOptions): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/hotspot/index.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface HotspotConnectionInfo {
+
   /**
    *      The service set identifier (SSID) of the current 802.11 network.
    */
@@ -26,9 +27,11 @@ export interface HotspotConnectionInfo {
    *      Each configured network has a unique small integer ID, used to identify the network when performing operations on the supplicant.
    */
   networkID: string;
+
 }
 
 export interface HotspotNetwork {
+
   /**
    *      Human readable network name
    */
@@ -58,8 +61,10 @@ export interface HotspotNetwork {
    *      Describes the authentication, key management, and encryption schemes supported by the access point.
    */
   capabilities: string;
+
 }
 export interface HotspotNetworkConfig {
+
   /**
    *   Device IP Address
    */
@@ -79,9 +84,11 @@ export interface HotspotNetworkConfig {
    *   Gateway MAC Address
    */
   gatewayMacAddress: string;
+
 }
 
 export interface HotspotDevice {
+
   /**
    *      Hotspot IP Address
    */
@@ -91,6 +98,7 @@ export interface HotspotDevice {
    *      Hotspot MAC Address
    */
   mac: string;
+
 }
 
 /**
@@ -126,21 +134,18 @@ export interface HotspotDevice {
 })
 @Injectable()
 export class Hotspot extends IonicNativePlugin {
-  /**
-   * @returns {Promise<boolean>}
-   */
-  @Cordova()
-  isAvailable(): Promise<boolean> {
-    return;
-  }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  toggleWifi(): Promise<boolean> {
+  isAvailable(): Promise<boolean> { return; }
-    return;
+
-  }
+  /**
+   * @returns {Promise<boolean>}
+   */
+  @Cordova()
+  toggleWifi(): Promise<boolean> { return; }
 
   /**
    * Configures and starts hotspot with SSID and Password
@@ -152,9 +157,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<void>}        - Promise to call once hotspot is started, or reject upon failure
    */
   @Cordova()
-  createHotspot(ssid: string, mode: string, password: string): Promise<void> {
+  createHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Turns on Access Point
@@ -162,9 +165,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - true if AP is started
    */
   @Cordova()
-  startHotspot(): Promise<boolean> {
+  startHotspot(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Configures hotspot with SSID and Password
@@ -176,13 +177,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<void>}        - Promise to call when hotspot is configured, or reject upon failure
    */
   @Cordova()
-  configureHotspot(
+  configureHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
-    ssid: string,
-    mode: string,
-    password: string
-  ): Promise<void> {
-    return;
-  }
 
   /**
    * Turns off Access Point
@@ -190,9 +185,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - Promise to turn off the hotspot, true on success, false on failure
    */
   @Cordova()
-  stopHotspot(): Promise<boolean> {
+  stopHotspot(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if hotspot is enabled
@@ -200,17 +193,13 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<void>}    - Promise that hotspot is enabled, rejected if it is not enabled
    */
   @Cordova()
-  isHotspotEnabled(): Promise<void> {
+  isHotspotEnabled(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<Array<HotspotDevice>>}
    */
   @Cordova()
-  getAllHotspotDevices(): Promise<Array<HotspotDevice>> {
+  getAllHotspotDevices(): Promise<Array<HotspotDevice>> { return; }
-    return;
-  }
 
   /**
    * Connect to a WiFi network
@@ -224,9 +213,7 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  connectToWifi(ssid: string, password: string): Promise<void> {
+  connectToWifi(ssid: string, password: string): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Connect to a WiFi network
@@ -244,14 +231,7 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  connectToWifiAuthEncrypt(
+  connectToWifiAuthEncrypt(ssid: string, password: string, authentication: string, encryption: Array<string>): Promise<void> { return; }
-    ssid: string,
-    password: string,
-    authentication: string,
-    encryption: Array<string>
-  ): Promise<void> {
-    return;
-  }
 
   /**
    * Add a WiFi network
@@ -267,9 +247,7 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that adding the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  addWifiNetwork(ssid: string, mode: string, password: string): Promise<void> {
+  addWifiNetwork(ssid: string, mode: string, password: string): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Remove a WiFi network
@@ -281,105 +259,79 @@ export class Hotspot extends IonicNativePlugin {
    *      Promise that removing the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
-  removeWifiNetwork(ssid: string): Promise<void> {
+  removeWifiNetwork(ssid: string): Promise<void> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isConnectedToInternet(): Promise<boolean> {
+  isConnectedToInternet(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isConnectedToInternetViaWifi(): Promise<boolean> {
+  isConnectedToInternetViaWifi(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isWifiOn(): Promise<boolean> {
+  isWifiOn(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isWifiSupported(): Promise<boolean> {
+  isWifiSupported(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isWifiDirectSupported(): Promise<boolean> {
+  isWifiDirectSupported(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<Array<HotspotNetwork>>}
    */
   @Cordova()
-  scanWifi(): Promise<Array<HotspotNetwork>> {
+  scanWifi(): Promise<Array<HotspotNetwork>> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<Array<HotspotNetwork>>}
    */
   @Cordova()
-  scanWifiByLevel(): Promise<Array<HotspotNetwork>> {
+  scanWifiByLevel(): Promise<Array<HotspotNetwork>> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> {
+  startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopWifiPeriodicallyScan(): Promise<any> {
+  stopWifiPeriodicallyScan(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<HotspotNetworkConfig>}
    */
   @Cordova()
-  getNetConfig(): Promise<HotspotNetworkConfig> {
+  getNetConfig(): Promise<HotspotNetworkConfig> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<HotspotConnectionInfo>}
    */
   @Cordova()
-  getConnectionInfo(): Promise<HotspotConnectionInfo> {
+  getConnectionInfo(): Promise<HotspotConnectionInfo> { return; }
-    return;
-  }
 
   /**
    * @returns {Promise<string>}
    */
   @Cordova()
-  pingHost(ip: string): Promise<string> {
+  pingHost(ip: string): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Gets MAC Address associated with IP Address from ARP File
@@ -389,9 +341,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<string>}  - A Promise for the MAC Address
    */
   @Cordova()
-  getMacAddressOfHost(ip: string): Promise<string> {
+  getMacAddressOfHost(ip: string): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Checks if IP is live using DNS
@@ -401,9 +351,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
-  isDnsLive(ip: string): Promise<boolean> {
+  isDnsLive(ip: string): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if IP is live using socket And PORT
@@ -413,9 +361,7 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
-  isPortLive(ip: string): Promise<boolean> {
+  isPortLive(ip: string): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Checks if device is rooted
@@ -423,7 +369,6 @@ export class Hotspot extends IonicNativePlugin {
    * @returns {Promise<boolean>} - A Promise for whether the device is rooted
    */
   @Cordova()
-  isRooted(): Promise<boolean> {
+  isRooted(): Promise<boolean> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/http/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 export interface HTTPResponse {
   /**
@@ -66,6 +66,7 @@ export interface HTTPResponse {
 })
 @Injectable()
 export class HTTP extends IonicNativePlugin {
+
   /**
    * This returns an object representing a basic HTTP Authorization header of the form.
    * @param username {string} Username
@@ -73,12 +74,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Object} an object representing a basic HTTP Authorization header of the form {'Authorization': 'Basic base64encodedusernameandpassword'}
    */
   @Cordova({ sync: true })
-  getBasicAuthHeader(
+  getBasicAuthHeader(username: string, password: string): { Authorization: string; } { return; }
-    username: string,
-    password: string
-  ): { Authorization: string } {
-    return;
-  }
 
   /**
    * This sets up all future requests to use Basic HTTP authentication with the given username and password.
@@ -86,7 +82,7 @@ export class HTTP extends IonicNativePlugin {
    * @param password {string} Password
    */
   @Cordova({ sync: true })
-  useBasicAuth(username: string, password: string): void {}
+  useBasicAuth(username: string, password: string): void { }
 
   /**
    * Set a header for all future requests. Takes a header and a value.
@@ -94,20 +90,20 @@ export class HTTP extends IonicNativePlugin {
    * @param value {string} The value of the header
    */
   @Cordova({ sync: true })
-  setHeader(header: string, value: string): void {}
+  setHeader(header: string, value: string): void { }
 
   /**
    * Set the data serializer which will be used for all future POST and PUT requests. Takes a string representing the name of the serializer.
    * @param serializer {string} The name of the serializer. Can be urlencoded or json
    */
   @Cordova({ sync: true })
-  setDataSerializer(serializer: string): void {}
+  setDataSerializer(serializer: string): void { }
 
   /**
    * Clear all cookies
    */
   @Cordova({ sync: true })
-  clearCookies(): void {}
+  clearCookies(): void { }
 
   /**
    * Remove cookies
@@ -115,21 +111,21 @@ export class HTTP extends IonicNativePlugin {
    * @param cb
    */
   @Cordova({ sync: true })
-  removeCookies(url: string, cb: () => void): void {}
+  removeCookies(url: string, cb: () => void): void { }
 
   /**
    * Disable following redirects automatically
    * @param disable {boolean} Set to true to disable following redirects automatically
    */
   @Cordova({ sync: true })
-  disableRedirect(disable: boolean): void {}
+  disableRedirect(disable: boolean): void { }
 
   /**
    * Set request timeout
    * @param timeout {number} The timeout in seconds. Default 60
    */
   @Cordova({ sync: true })
-  setRequestTimeout(timeout: number): void {}
+  setRequestTimeout(timeout: number): void { }
 
   /**
    * Enable or disable SSL Pinning. This defaults to false.
@@ -141,9 +137,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
-  enableSSLPinning(enable: boolean): Promise<void> {
+  enableSSLPinning(enable: boolean): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Accept all SSL certificates. Or disabled accepting all certificates. Defaults to false.
@@ -151,9 +145,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
-  acceptAllCerts(accept: boolean): Promise<void> {
+  acceptAllCerts(accept: boolean): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Make a POST request
@@ -163,9 +155,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  post(url: string, body: any, headers: any): Promise<HTTPResponse> {
+  post(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
-    return;
-  }
 
   /**
    * Make a GET request
@@ -175,9 +165,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  get(url: string, parameters: any, headers: any): Promise<HTTPResponse> {
+  get(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
-    return;
-  }
 
   /**
    * Make a PUT request
@@ -187,9 +175,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  put(url: string, body: any, headers: any): Promise<HTTPResponse> {
+  put(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
-    return;
-  }
 
   /**
    * Make a PATCH request
@@ -199,9 +185,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  patch(url: string, body: any, headers: any): Promise<HTTPResponse> {
+  patch(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
-    return;
-  }
 
   /**
    * Make a DELETE request
@@ -211,9 +195,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  delete(url: string, parameters: any, headers: any): Promise<HTTPResponse> {
+  delete(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
-    return;
-  }
 
   /**
    * Make a HEAD request
@@ -223,9 +205,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  head(url: string, parameters: any, headers: any): Promise<HTTPResponse> {
+  head(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
-    return;
-  }
 
   /**
    *
@@ -237,15 +217,7 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  uploadFile(
+  uploadFile(url: string, body: any, headers: any, filePath: string, name: string): Promise<HTTPResponse> { return; }
-    url: string,
-    body: any,
-    headers: any,
-    filePath: string,
-    name: string
-  ): Promise<HTTPResponse> {
-    return;
-  }
 
   /**
    *
@@ -256,12 +228,5 @@ export class HTTP extends IonicNativePlugin {
    * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
-  downloadFile(
+  downloadFile(url: string, body: any, headers: any, filePath: string): Promise<HTTPResponse> { return; }
-    url: string,
-    body: any,
-    headers: any,
-    filePath: string
-  ): Promise<HTTPResponse> {
-    return;
-  }
 }

src/@ionic-native/plugins/httpd/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface HttpdOptions {
@@ -56,6 +56,7 @@ export interface HttpdOptions {
 })
 @Injectable()
 export class Httpd extends IonicNativePlugin {
+
   /**
    * Starts a web server.
    * @param options {HttpdOptions}
@@ -65,25 +66,20 @@ export class Httpd extends IonicNativePlugin {
     observable: true,
     clearFunction: 'stopServer'
   })
-  startServer(options?: HttpdOptions): Observable<string> {
+  startServer(options?: HttpdOptions): Observable<string> { return; }
-    return;
-  }
 
   /**
    * Gets the URL of the running server
    * @returns {Promise<string>} Returns a promise that resolves with the URL of the web server.
    */
   @Cordova()
-  getUrl(): Promise<string> {
+  getUrl(): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Get the local path of the running webserver
    * @returns {Promise<string>} Returns a promise that resolves with the local path of the web server.
-   */
+    */
   @Cordova()
-  getLocalPath(): Promise<string> {
+  getLocalPath(): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/hyper-track/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @beta
@@ -75,9 +75,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the result text (which is the same as the given text) if successful, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  helloWorld(text: String): Promise<String> {
+  helloWorld(text: String): Promise<String> { return; }
-    return;
-  }
 
   /**
    * Create a new user to identify the current device or get a user from a lookup id.
@@ -88,14 +86,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the User's JSON, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  getOrCreateUser(
+  getOrCreateUser(name: String, phone: String, photo: String, lookupId: String): Promise<any> { return; }
-    name: String,
-    phone: String,
-    photo: String,
-    lookupId: String
-  ): Promise<any> {
-    return;
-  }
 
   /**
    * Set UserId for the SDK created using HyperTrack APIs. This is useful if you already have a user previously created.
@@ -103,18 +94,14 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred. An "OK" response doesn't necessarily mean that the userId was found. It just means that it was set correctly.
    */
   @Cordova()
-  setUserId(userId: String): Promise<any> {
+  setUserId(userId: String): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Enable the SDK and start tracking. This will fail if there is no user set.
    * @returns {Promise<any>} Returns a Promise that resolves with the userId (String) of the User being tracked if successful, or it gets rejected if an error ocurred. One example of an error is not setting a User with getOrCreateUser() or setUserId() before calling this function.
    */
   @Cordova()
-  startTracking(): Promise<any> {
+  startTracking(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Create and assign an action to the current user using specified parameters
@@ -126,15 +113,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the Action's JSON, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  createAndAssignAction(
+  createAndAssignAction(type: String, lookupId: String, expectedPlaceAddress: String, expectedPlaceLatitude: Number, expectedPlaceLongitude: Number): Promise<any> { return; }
-    type: String,
-    lookupId: String,
-    expectedPlaceAddress: String,
-    expectedPlaceLatitude: Number,
-    expectedPlaceLongitude: Number
-  ): Promise<any> {
-    return;
-  }
 
   /**
    * Complete an action from the SDK by its ID
@@ -142,9 +121,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  completeAction(actionId: String): Promise<any> {
+  completeAction(actionId: String): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Complete an action from the SDK using Action's lookupId as parameter
@@ -152,9 +129,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with an "OK" string if successful, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  completeActionWithLookupId(lookupId: String): Promise<any> {
+  completeActionWithLookupId(lookupId: String): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Disable the SDK and stop tracking.
@@ -162,18 +137,14 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the an "OK" string if successful, or it gets rejected if an error ocurred. One example of an error is not setting a User with getOrCreateUser() or setUserId() before calling this function.
    */
   @Cordova()
-  stopTracking(): Promise<any> {
+  stopTracking(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get user's current location from the SDK
    * @returns {Promise<any>} Returns a Promise that resolves with a string representation of the Location's JSON, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  getCurrentLocation(): Promise<any> {
+  getCurrentLocation(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Check if Location permission has been granted to the app (for Android).
@@ -181,9 +152,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if location permission was granted, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  checkLocationPermission(): Promise<any> {
+  checkLocationPermission(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Request user to grant Location access to the app (for Anrdoid).
@@ -191,9 +160,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if Location access was given to the app, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  requestPermissions(): Promise<any> {
+  requestPermissions(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Check if Location services are enabled on the device (for Android).
@@ -201,9 +168,7 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if location services are enabled, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  checkLocationServices(): Promise<any> {
+  checkLocationServices(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Request user to enable Location services on the device.
@@ -211,7 +176,5 @@ export class HyperTrack extends IonicNativePlugin {
    * @returns {Promise<any>} Returns a Promise that resolves with the a string that can be "true" or "false", depending if Location services were enabled, or it gets rejected if an error ocurred.
    */
   @Cordova()
-  requestLocationServices(): Promise<any> {
+  requestLocationServices(): Promise<any> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/ibeacon/index.ts

@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
+import { Cordova, Plugin, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
-  Cordova,
-  CordovaCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const cordova: any;
@@ -34,11 +29,7 @@ export interface Beacon {
    * ProximityFar
    * ProximityUnknown
    */
-  proximity:
+  proximity: 'ProximityImmediate' | 'ProximityNear' | 'ProximityFar' | 'ProximityUnknown';
-    | 'ProximityImmediate'
-    | 'ProximityNear'
-    | 'ProximityFar'
-    | 'ProximityUnknown';
 
   /**
    * Transmission Power of the beacon. A constant emitted by the beacon which indicates what's the expected RSSI at a distance of 1 meter to the beacon.
@@ -55,6 +46,7 @@ export interface Beacon {
    * The accuracy of the ranging.
    */
   accuracy: number;
+
 }
 
 export interface BeaconRegion {
@@ -112,6 +104,7 @@ export interface CircularRegion {
 export type Region = BeaconRegion | CircularRegion;
 
 export interface IBeaconPluginResult {
+
   /**
    * The name of the delegate function that produced the PluginResult object.
    */
@@ -294,6 +287,7 @@ export interface IBeaconDelegate {
 })
 @Injectable()
 export class IBeacon extends IonicNativePlugin {
+
   /**
    * Instances of this class are delegates between the {@link LocationManager} and
    * the code that consumes the messages generated on in the native layer.
@@ -304,79 +298,85 @@ export class IBeacon extends IonicNativePlugin {
   Delegate(): IBeaconDelegate {
     let delegate = new cordova.plugins.locationManager.Delegate();
 
-    delegate.didChangeAuthorizationStatus = (
+    delegate.didChangeAuthorizationStatus = (pluginResult?: IBeaconPluginResult) => {
-      pluginResult?: IBeaconPluginResult
+      return new Observable<IBeaconPluginResult>(
-    ) => {
+        (observer: any) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didChangeAuthorizationStatus = cb;
-        return (delegate.didChangeAuthorizationStatus = cb);
+        }
-      });
+      );
     };
 
-    delegate.didDetermineStateForRegion = (
+    delegate.didDetermineStateForRegion = (pluginResult?: IBeaconPluginResult) => {
-      pluginResult?: IBeaconPluginResult
+      return new Observable<IBeaconPluginResult>(
-    ) => {
+        (observer: any) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didDetermineStateForRegion = cb;
-        return (delegate.didDetermineStateForRegion = cb);
+        }
-      });
+      );
     };
 
     delegate.didEnterRegion = (pluginResult?: IBeaconPluginResult) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+      return new Observable<IBeaconPluginResult>(
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+        (observer: any) => {
-        return (delegate.didEnterRegion = cb);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-      });
+          return delegate.didEnterRegion = cb;
+        }
+      );
     };
 
     delegate.didExitRegion = (pluginResult?: IBeaconPluginResult) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+      return new Observable<IBeaconPluginResult>(
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+        (observer: any) => {
-        return (delegate.didExitRegion = cb);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-      });
+          return delegate.didExitRegion = cb;
+        }
+      );
     };
 
     delegate.didRangeBeaconsInRegion = (pluginResult?: IBeaconPluginResult) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+      return new Observable<IBeaconPluginResult>(
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+        (observer: any) => {
-        return (delegate.didRangeBeaconsInRegion = cb);
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-      });
+          return delegate.didRangeBeaconsInRegion = cb;
+        }
+      );
     };
 
-    delegate.didStartMonitoringForRegion = (
+    delegate.didStartMonitoringForRegion = (pluginResult?: IBeaconPluginResult) => {
-      pluginResult?: IBeaconPluginResult
+      return new Observable<IBeaconPluginResult>(
-    ) => {
+        (observer: any) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.didStartMonitoringForRegion = cb;
-        return (delegate.didStartMonitoringForRegion = cb);
+        }
-      });
+      );
     };
 
-    delegate.monitoringDidFailForRegionWithError = (
+    delegate.monitoringDidFailForRegionWithError = (pluginResult?: IBeaconPluginResult) => {
-      pluginResult?: IBeaconPluginResult
+      return new Observable<IBeaconPluginResult>(
-    ) => {
+        (observer: any) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.monitoringDidFailForRegionWithError = cb;
-        return (delegate.monitoringDidFailForRegionWithError = cb);
+        }
-      });
+      );
     };
 
-    delegate.peripheralManagerDidStartAdvertising = (
+    delegate.peripheralManagerDidStartAdvertising = (pluginResult?: IBeaconPluginResult) => {
-      pluginResult?: IBeaconPluginResult
+      return new Observable<IBeaconPluginResult>(
-    ) => {
+        (observer: any) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.peripheralManagerDidStartAdvertising = cb;
-        return (delegate.peripheralManagerDidStartAdvertising = cb);
+        }
-      });
+      );
     };
 
-    delegate.peripheralManagerDidUpdateState = (
+    delegate.peripheralManagerDidUpdateState = (pluginResult?: IBeaconPluginResult) => {
-      pluginResult?: IBeaconPluginResult
+      return new Observable<IBeaconPluginResult>(
-    ) => {
+        (observer: any) => {
-      return new Observable<IBeaconPluginResult>((observer: any) => {
+          let cb = (data: IBeaconPluginResult) => observer.next(data);
-        const cb = (data: IBeaconPluginResult) => observer.next(data);
+          return delegate.peripheralManagerDidUpdateState = cb;
-        return (delegate.peripheralManagerDidUpdateState = cb);
+        }
-      });
+      );
     };
 
     cordova.plugins.locationManager.setDelegate(delegate);
@@ -396,29 +396,15 @@ export class IBeacon extends IonicNativePlugin {
    * @returns {BeaconRegion} Returns the BeaconRegion that was created
    */
   @CordovaCheck({ sync: true })
-  BeaconRegion(
+  BeaconRegion(identifer: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion {
-    identifer: string,
+    return new cordova.plugins.locationManager.BeaconRegion(identifer, uuid, major, minor, notifyEntryStateOnDisplay);
-    uuid: string,
-    major?: number,
-    minor?: number,
-    notifyEntryStateOnDisplay?: boolean
-  ): BeaconRegion {
-    return new cordova.plugins.locationManager.BeaconRegion(
-      identifer,
-      uuid,
-      major,
-      minor,
-      notifyEntryStateOnDisplay
-    );
   }
 
   /**
    * @returns {IBeaconDelegate} Returns the IBeaconDelegate
    */
   @Cordova()
-  getDelegate(): IBeaconDelegate {
+  getDelegate(): IBeaconDelegate { return; }
-    return;
-  }
 
   /**
    * @param {IBeaconDelegate} delegate An instance of a delegate to register with the native layer.
@@ -426,9 +412,7 @@ export class IBeacon extends IonicNativePlugin {
    * @returns {IBeaconDelegate} Returns the IBeaconDelegate
    */
   @Cordova()
-  setDelegate(delegate: IBeaconDelegate): IBeaconDelegate {
+  setDelegate(delegate: IBeaconDelegate): IBeaconDelegate { return; }
-    return;
-  }
 
   /**
    * Signals the native layer that the client side is ready to consume messages.
@@ -451,9 +435,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the request and started to send events.
    */
   @Cordova({ otherPromise: true })
-  onDomDelegateReady(): Promise<void> {
+  onDomDelegateReady(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Determines if bluetooth is switched on, according to the native layer.
@@ -461,9 +443,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether bluetooth is active.
    */
   @Cordova({ otherPromise: true })
-  isBluetoothEnabled(): Promise<boolean> {
+  isBluetoothEnabled(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Enables Bluetooth using the native Layer. (ANDROID ONLY)
@@ -472,9 +452,7 @@ export class IBeacon extends IonicNativePlugin {
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({ otherPromise: true })
-  enableBluetooth(): Promise<void> {
+  enableBluetooth(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Disables Bluetooth using the native Layer. (ANDROID ONLY)
@@ -483,9 +461,7 @@ export class IBeacon extends IonicNativePlugin {
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({ otherPromise: true })
-  disableBluetooth(): Promise<void> {
+  disableBluetooth(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Start monitoring the specified region.
@@ -505,9 +481,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({ otherPromise: true })
-  startMonitoringForRegion(region: BeaconRegion): Promise<string> {
+  startMonitoringForRegion(region: BeaconRegion): Promise<string> { return; }
-    return;
-  }
 
   /**
    * Stop monitoring the specified region.  It is valid to call
@@ -524,9 +498,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({ otherPromise: true })
-  stopMonitoringForRegion(region: BeaconRegion): Promise<void> {
+  stopMonitoringForRegion(region: BeaconRegion): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Request state the for specified region. When result is ready
@@ -542,9 +514,8 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({ otherPromise: true })
-  requestStateForRegion(region: Region): Promise<void> {
+  requestStateForRegion(region: Region): Promise<void> { return; }
-    return;
+
-  }
 
   /**
    * Start ranging the specified beacon region.
@@ -561,9 +532,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({ otherPromise: true })
-  startRangingBeaconsInRegion(region: BeaconRegion): Promise<void> {
+  startRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Stop ranging the specified region.  It is valid to call
@@ -580,9 +549,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({ otherPromise: true })
-  stopRangingBeaconsInRegion(region: BeaconRegion): Promise<void> {
+  stopRangingBeaconsInRegion(region: BeaconRegion): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Queries the native layer to determine the current authorization in effect.
@@ -591,9 +558,7 @@ export class IBeacon extends IonicNativePlugin {
    * requested authorization status.
    */
   @Cordova({ otherPromise: true })
-  getAuthorizationStatus(): Promise<IBeaconPluginResult> {
+  getAuthorizationStatus(): Promise<IBeaconPluginResult> { return; }
-    return;
-  }
 
   /**
    * For iOS 8 and above only. The permission model has changed by Apple in iOS 8, making it necessary for apps to
@@ -605,9 +570,8 @@ export class IBeacon extends IonicNativePlugin {
    * @returns {Promise<void>} Returns a promise that is resolved when the request dialog is shown.
    */
   @Cordova({ otherPromise: true })
-  requestWhenInUseAuthorization(): Promise<void> {
+  requestWhenInUseAuthorization(): Promise<void> { return; }
-    return;
+
-  }
 
   /**
    * See the documentation of {@code requestWhenInUseAuthorization} for further details.
@@ -616,9 +580,7 @@ export class IBeacon extends IonicNativePlugin {
    * shows the request dialog.
    */
   @Cordova({ otherPromise: true })
-  requestAlwaysAuthorization(): Promise<void> {
+  requestAlwaysAuthorization(): Promise<void> { return; }
-    return;
-  }
 
   /**
    *
@@ -626,9 +588,7 @@ export class IBeacon extends IonicNativePlugin {
    * of {Region} instances that are being monitored by the native layer.
    */
   @Cordova({ otherPromise: true })
-  getMonitoredRegions(): Promise<Region[]> {
+  getMonitoredRegions(): Promise<Region[]> { return; }
-    return;
-  }
 
   /**
    *
@@ -636,9 +596,7 @@ export class IBeacon extends IonicNativePlugin {
    * of {Region} instances that are being ranged by the native layer.
    */
   @Cordova({ otherPromise: true })
-  getRangedRegions(): Promise<Region[]> {
+  getRangedRegions(): Promise<Region[]> { return; }
-    return;
-  }
 
   /**
    * Determines if ranging is available or not, according to the native layer.
@@ -646,9 +604,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether ranging is available or not.
    */
   @Cordova({ otherPromise: true })
-  isRangingAvailable(): Promise<boolean> {
+  isRangingAvailable(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Determines if region type is supported or not, according to the native layer.
@@ -660,9 +616,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether the region type is supported or not.
    */
   @Cordova({ otherPromise: true })
-  isMonitoringAvailableForClass(region: Region): Promise<boolean> {
+  isMonitoringAvailableForClass(region: Region): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Start advertising the specified region.
@@ -682,9 +636,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the advertising request.
    */
   @Cordova({ otherPromise: true })
-  startAdvertising(region: Region, measuredPower?: number): Promise<void> {
+  startAdvertising(region: Region, measuredPower?: number): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Stop advertising as a beacon.
@@ -695,9 +647,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer acknowledged the dispatch of the request to stop advertising.
    */
   @Cordova({ otherPromise: true })
-  stopAdvertising(region: Region): Promise<void> {
+  stopAdvertising(region: Region): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Determines if advertising is available or not, according to the native layer.
@@ -705,9 +655,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether advertising is available or not.
    */
   @Cordova({ otherPromise: true })
-  isAdvertisingAvailable(): Promise<boolean> {
+  isAdvertisingAvailable(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Determines if advertising is currently active, according to the native layer.
@@ -715,9 +663,7 @@ export class IBeacon extends IonicNativePlugin {
    * indicating whether advertising is active.
    */
   @Cordova({ otherPromise: true })
-  isAdvertising(): Promise<boolean> {
+  isAdvertising(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Disables debug logging in the native layer. Use this method if you want
@@ -727,9 +673,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the logging level accordingly.
    */
   @Cordova({ otherPromise: true })
-  disableDebugLogs(): Promise<void> {
+  disableDebugLogs(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Enables the posting of debug notifications in the native layer. Use this method if you want
@@ -740,9 +684,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the flag to enabled.
    */
   @Cordova({ otherPromise: true })
-  enableDebugNotifications(): Promise<void> {
+  enableDebugNotifications(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Disables the posting of debug notifications in the native layer. Use this method if you want
@@ -752,9 +694,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the flag to disabled.
    */
   @Cordova({ otherPromise: true })
-  disableDebugNotifications(): Promise<void> {
+  disableDebugNotifications(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Enables debug logging in the native layer. Use this method if you want
@@ -764,9 +704,7 @@ export class IBeacon extends IonicNativePlugin {
    * native layer has set the logging level accordingly.
    */
   @Cordova({ otherPromise: true })
-  enableDebugLogs(): Promise<void> {
+  enableDebugLogs(): Promise<void> { return; }
-    return;
-  }
 
   /**
    * Appends the provided [message] to the device logs.
@@ -779,7 +717,6 @@ export class IBeacon extends IonicNativePlugin {
    * is expected to be equivalent to the one provided in the original call.
    */
   @Cordova({ otherPromise: true })
-  appendToDeviceLog(message: string): Promise<void> {
+  appendToDeviceLog(message: string): Promise<void> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/image-picker/index.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 export interface ImagePickerOptions {
   /**
@@ -59,8 +60,7 @@ export interface ImagePickerOptions {
   plugin: 'cordova-plugin-telerik-imagepicker',
   pluginRef: 'window.imagePicker',
   repo: 'https://github.com/Telerik-Verified-Plugins/ImagePicker',
-  install:
+  install: 'ionic cordova plugin add cordova-plugin-telerik-imagepicker --variable PHOTO_LIBRARY_USAGE_DESCRIPTION="your usage message"',
-    'ionic cordova plugin add cordova-plugin-telerik-imagepicker --variable PHOTO_LIBRARY_USAGE_DESCRIPTION="your usage message"',
   installVariables: ['PHOTO_LIBRARY_USAGE_DESCRIPTION'],
   platforms: ['Android', 'iOS']
 })
@@ -75,9 +75,7 @@ export class ImagePicker extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  getPictures(options: ImagePickerOptions): Promise<any> {
+  getPictures(options: ImagePickerOptions): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Check if we have permission to read images
@@ -86,9 +84,7 @@ export class ImagePicker extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  hasReadPermission(): Promise<boolean> {
+  hasReadPermission(): Promise<boolean> { return; }
-    return;
-  }
 
   /**
    * Request permission to read images
@@ -97,7 +93,6 @@ export class ImagePicker extends IonicNativePlugin {
   @Cordova({
     platforms: ['Android']
   })
-  requestReadPermission(): Promise<any> {
+  requestReadPermission(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/image-resizer/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 export interface ImageResizerOptions {
   /**
@@ -80,7 +80,5 @@ export class ImageResizer extends IonicNativePlugin {
    * @returns {Promise<any>}
    */
   @Cordova()
-  resize(options: ImageResizerOptions): Promise<any> {
+  resize(options: ImageResizerOptions): Promise<any> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/in-app-browser/index.ts

@@ -1,22 +1,15 @@
 import { Injectable } from '@angular/core';
-import {
+import { Plugin, CordovaInstance, InstanceCheck, IonicNativePlugin } from '@ionic-native/core';
-  CordovaInstance,
-  InstanceCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 
-declare const cordova: Cordova & { InAppBrowser: any };
+declare const cordova: Cordova & { InAppBrowser: any; };
 
 export interface InAppBrowserOptions {
   /** Set to yes or no to turn the InAppBrowser's location bar on or off. */
   location?: 'yes' | 'no';
-  /**
+  /** Set to yes to create the browser and load the page, but not show it. The loadstop event fires when loading is complete.
-   * Set to yes to create the browser and load the page, but not show it. The loadstop event fires when loading is complete.
+   * Omit or set to no (default) to have the browser open and load normally. */
-   * Omit or set to no (default) to have the browser open and load normally.
-   **/
   hidden?: 'yes' | 'no';
   /** Set to yes to have the browser's cookie cache cleared before the new window is opened. */
   clearcache?: 'yes';
@@ -24,10 +17,8 @@ export interface InAppBrowserOptions {
   clearsessioncache?: 'yes';
   /** (Android Only) set to yes to show Android browser's zoom controls, set to no to hide them. Default value is yes. */
   zoom?: 'yes' | 'no';
-  /**
+  /** Set to yes to use the hardware back button to navigate backwards through the InAppBrowser's history.
-   * Set to yes to use the hardware back button to navigate backwards through the InAppBrowser's history.
+   * If there is no previous page, the InAppBrowser will close. The default value is yes, so you must set it to no if you want the back button to simply close the InAppBrowser. */
-   * If there is no previous page, the InAppBrowser will close. The default value is yes, so you must set it to no if you want the back button to simply close the InAppBrowser.
-   **/
   hardwareback?: 'yes' | 'no';
   /** Set to yes to prevent HTML5 audio or video from autoplaying (defaults to no). */
   mediaPlaybackRequiresUserAction?: 'yes' | 'no';
@@ -54,10 +45,8 @@ export interface InAppBrowserOptions {
   transitionstyle?: 'fliphorizontal' | 'crossdissolve' | 'coververtical';
   /** (iOS Only) Set to top or bottom (default is bottom). Causes the toolbar to be at the top or bottom of the window. */
   toolbarposition?: 'top' | 'bottom';
-  /**
+  /** (Windows only) Set to yes to create the browser control without a border around it.
-   * (Windows only) Set to yes to create the browser control without a border around it.
+   * Please note that if location=no is also specified, there will be no control presented to user to close IAB window. */
-   * Please note that if location=no is also specified, there will be no control presented to user to close IAB window.
-   **/
   fullscreen?: 'yes';
 
   /**
@@ -80,6 +69,7 @@ export interface InAppBrowserEvent extends Event {
  * @hidden
  */
 export class InAppBrowserObject {
+
   private _objectInstance: any;
 
   /**
@@ -93,24 +83,20 @@ export class InAppBrowserObject {
    *                 The options string must not contain any blank space, and each feature's
    *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
    */
-  constructor(
+  constructor(url: string, target?: string, options?: string | InAppBrowserOptions) {
-    url: string,
-    target?: string,
-    options?: string | InAppBrowserOptions
-  ) {
     try {
+
       if (options && typeof options !== 'string') {
-        options = Object.keys(options)
+        options = Object.keys(options).map((key: string) => `${key}=${(<InAppBrowserOptions>options)[key]}`).join(',');
-          .map((key: string) => `${key}=${(<InAppBrowserOptions>options)[key]}`)
-          .join(',');
       }
 
       this._objectInstance = cordova.InAppBrowser.open(url, target, options);
+
     } catch (e) {
+
       window.open(url, target);
-      console.warn(
+      console.warn('Native: InAppBrowser is not installed or you are running on a browser. Falling back to window.open.');
-        'Native: InAppBrowser is not installed or you are running on a browser. Falling back to window.open.'
+
-      );
     }
   }
 
@@ -119,20 +105,20 @@ export class InAppBrowserObject {
    * if the InAppBrowser was already visible.
    */
   @CordovaInstance({ sync: true })
-  show(): void {}
+  show(): void { }
 
   /**
    * Closes the InAppBrowser window.
    */
   @CordovaInstance({ sync: true })
-  close(): void {}
+  close(): void { }
 
   /**
    * Hides an InAppBrowser window that is currently shown. Calling this has no effect
    * if the InAppBrowser was already hidden.
    */
   @CordovaInstance({ sync: true })
-  hide(): void {}
+  hide(): void { }
 
   /**
    * Injects JavaScript code into the InAppBrowser window.
@@ -140,9 +126,7 @@ export class InAppBrowserObject {
    * @returns {Promise<any>}
    */
   @CordovaInstance()
-  executeScript(script: { file?: string; code?: string }): Promise<any> {
+  executeScript(script: { file?: string, code?: string }): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Injects CSS into the InAppBrowser window.
@@ -150,9 +134,7 @@ export class InAppBrowserObject {
    * @returns {Promise<any>}
    */
   @CordovaInstance()
-  insertCSS(css: { file?: string; code?: string }): Promise<any> {
+  insertCSS(css: { file?: string, code?: string }): Promise<any> { return; }
-    return;
-  }
 
   /**
    * A method that allows you to listen to events happening in the browser.
@@ -161,19 +143,10 @@ export class InAppBrowserObject {
    */
   @InstanceCheck()
   on(event: string): Observable<InAppBrowserEvent> {
-    return new Observable<InAppBrowserEvent>(
+    return new Observable<InAppBrowserEvent>((observer: Observer<InAppBrowserEvent>) => {
-      (observer: Observer<InAppBrowserEvent>) => {
+      this._objectInstance.addEventListener(event, observer.next.bind(observer));
-        this._objectInstance.addEventListener(
+      return () => this._objectInstance.removeEventListener(event, observer.next.bind(observer));
-          event,
+    });
-          observer.next.bind(observer)
-        );
-        return () =>
-          this._objectInstance.removeEventListener(
-            event,
-            observer.next.bind(observer)
-          );
-      }
-    );
   }
 }
 
@@ -212,6 +185,7 @@ export class InAppBrowserObject {
 })
 @Injectable()
 export class InAppBrowser extends IonicNativePlugin {
+
   /**
    * Opens a URL in a new InAppBrowser instance, the current browser instance, or the system browser.
    * @param  url {string}     The URL to load.
@@ -221,11 +195,8 @@ export class InAppBrowser extends IonicNativePlugin {
    *                 name/value pairs must be separated by a comma. Feature names are case insensitive.
    * @returns {InAppBrowserObject}
    */
-  create(
+  create(url: string, target?: string, options?: string | InAppBrowserOptions): InAppBrowserObject {
-    url: string,
-    target?: string,
-    options?: string | InAppBrowserOptions
-  ): InAppBrowserObject {
     return new InAppBrowserObject(url, target, options);
   }
+
 }

src/@ionic-native/plugins/in-app-purchase-2/index.ts

@@ -1,10 +1,5 @@
+import { Plugin, IonicNativePlugin, Cordova, CordovaProperty } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import {
-  Cordova,
-  CordovaProperty,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 
 /**
  * @name In App Purchase 2
@@ -86,22 +81,21 @@ export type IAPProducts = Array<IAPProduct> & {
   /**
    * Get product by ID
    */
-  byId: { [id: string]: IAPProduct };
+  byId: { [id: string]: IAPProduct; };
   /**
    * Get product by alias
    */
-  byAlias: { [alias: string]: IAPProduct };
+  byAlias: { [alias: string]: IAPProduct; };
   /**
    * Remove all products (for testing only).
    */
   reset: () => {};
 };
 
-export type IAPQueryCallback =
+export type IAPQueryCallback = ((product: IAPProduct) => void) | ((error: IAPError) => void);
-  | ((product: IAPProduct) => void)
-  | ((error: IAPError) => void);
 
 export interface IAPProduct {
+
   id: string;
 
   alias: string;
@@ -151,6 +145,7 @@ export interface IAPProduct {
   off(callback: Function): void;
 
   trigger(action: string, args: any): void;
+
 }
 
 export interface IAPProductEvents {
@@ -170,11 +165,7 @@ export interface IAPProductEvents {
   verified: (callback: IAPQueryCallback) => void;
   unverified: (callback: IAPQueryCallback) => void;
   expired: (callback: IAPQueryCallback) => void;
-  downloading: (
+  downloading: (product: IAPProduct, progress: any, time_remaining: any) => void;
-    product: IAPProduct,
-    progress: any,
-    time_remaining: any
-  ) => void;
   downloaded: (callback: IAPQueryCallback) => void;
 }
 
@@ -208,115 +199,163 @@ export class IAPError {
   pluginRef: 'store',
   repo: 'https://github.com/j3k0/cordova-plugin-purchase',
   platforms: ['iOS', 'Android', 'Windows'],
-  install:
+  install: 'ionic cordova plugin add cc.fovea.cordova.purchase --variable BILLING_KEY="<ANDROID_BILLING_KEY>"'
-    'ionic cordova plugin add cc.fovea.cordova.purchase --variable BILLING_KEY="<ANDROID_BILLING_KEY>"'
 })
 @Injectable()
 export class InAppPurchase2 extends IonicNativePlugin {
-  @CordovaProperty QUIET: number;
 
-  @CordovaProperty ERROR: number;
+  @CordovaProperty
+  QUIET: number;
 
-  @CordovaProperty WARNING: number;
+  @CordovaProperty
+  ERROR: number;
 
-  @CordovaProperty INFO: number;
+  @CordovaProperty
+  WARNING: number;
 
-  @CordovaProperty DEBUG: number;
+  @CordovaProperty
+  INFO: number;
+
+  @CordovaProperty
+  DEBUG: number;
 
   /**
    * Debug level. Use QUIET, ERROR, WARNING, INFO or DEBUG constants
    */
-  @CordovaProperty verbosity: number;
+  @CordovaProperty
+  verbosity: number;
 
   /**
    * Set to true to invoke the platform purchase sandbox. (Windows only)
    */
-  @CordovaProperty sandbox: boolean;
+  @CordovaProperty
-
+  sandbox: boolean;
-  @CordovaProperty FREE_SUBSCRIPTION: string;
-
-  @CordovaProperty PAID_SUBSCRIPTION: string;
-
-  @CordovaProperty NON_RENEWING_SUBSCRIPTION: string;
-
-  @CordovaProperty CONSUMABLE: string;
-
-  @CordovaProperty NON_CONSUMABLE: string;
-
-  @CordovaProperty ERR_SETUP: number;
-
-  @CordovaProperty ERR_LOAD: number;
-
-  @CordovaProperty ERR_PURCHASE: number;
-
-  @CordovaProperty ERR_LOAD_RECEIPTS: number;
-
-  @CordovaProperty ERR_CLIENT_INVALID: number;
-
-  @CordovaProperty ERR_PAYMENT_CANCELLED: number;
-
-  @CordovaProperty ERR_PAYMENT_INVALID: number;
-
-  @CordovaProperty ERR_PAYMENT_NOT_ALLOWED: number;
-
-  @CordovaProperty ERR_UNKNOWN: number;
-
-  @CordovaProperty ERR_REFRESH_RECEIPTS: number;
-
-  @CordovaProperty ERR_INVALID_PRODUCT_ID: number;
-
-  @CordovaProperty ERR_FINISH: number;
-
-  @CordovaProperty ERR_COMMUNICATION: number;
-
-  @CordovaProperty ERR_SUBSCRIPTIONS_NOT_AVAILABLE: number;
-
-  @CordovaProperty ERR_MISSING_TOKEN: number;
-
-  @CordovaProperty ERR_VERIFICATION_FAILED: number;
-
-  @CordovaProperty ERR_BAD_RESPONSE: number;
-
-  @CordovaProperty ERR_REFRESH: number;
-
-  @CordovaProperty ERR_PAYMENT_EXPIRED: number;
-
-  @CordovaProperty ERR_DOWNLOAD: number;
-
-  @CordovaProperty ERR_SUBSCRIPTION_UPDATE_NOT_AVAILABLE: number;
-
-  @CordovaProperty REGISTERED: string;
-
-  @CordovaProperty INVALID: string;
-
-  @CordovaProperty VALID: string;
-
-  @CordovaProperty REQUESTED: string;
-
-  @CordovaProperty INITIATED: string;
-
-  @CordovaProperty APPROVED: string;
-
-  @CordovaProperty FINISHED: string;
-
-  @CordovaProperty OWNED: string;
-
-  @CordovaProperty DOWNLOADING: string;
-
-  @CordovaProperty DOWNLOADED: string;
-
-  @CordovaProperty INVALID_PAYLOAD: number;
-
-  @CordovaProperty CONNECTION_FAILED: number;
-
-  @CordovaProperty PURCHASE_EXPIRED: number;
-
-  @CordovaProperty products: IAPProducts;
 
   @CordovaProperty
-  validator:
+  FREE_SUBSCRIPTION: string;
-    | string
+
-    | ((product: string | IAPProduct, callback: Function) => void);
+  @CordovaProperty
+  PAID_SUBSCRIPTION: string;
+
+  @CordovaProperty
+  NON_RENEWING_SUBSCRIPTION: string;
+
+  @CordovaProperty
+  CONSUMABLE: string;
+
+  @CordovaProperty
+  NON_CONSUMABLE: string;
+
+
+  @CordovaProperty
+  ERR_SETUP: number;
+
+  @CordovaProperty
+  ERR_LOAD: number;
+
+  @CordovaProperty
+  ERR_PURCHASE: number;
+
+  @CordovaProperty
+  ERR_LOAD_RECEIPTS: number;
+
+  @CordovaProperty
+  ERR_CLIENT_INVALID: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_CANCELLED: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_INVALID: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_NOT_ALLOWED: number;
+
+  @CordovaProperty
+  ERR_UNKNOWN: number;
+
+  @CordovaProperty
+  ERR_REFRESH_RECEIPTS: number;
+
+  @CordovaProperty
+  ERR_INVALID_PRODUCT_ID: number;
+
+  @CordovaProperty
+  ERR_FINISH: number;
+
+  @CordovaProperty
+  ERR_COMMUNICATION: number;
+
+  @CordovaProperty
+  ERR_SUBSCRIPTIONS_NOT_AVAILABLE: number;
+
+  @CordovaProperty
+  ERR_MISSING_TOKEN: number;
+
+  @CordovaProperty
+  ERR_VERIFICATION_FAILED: number;
+
+  @CordovaProperty
+  ERR_BAD_RESPONSE: number;
+
+  @CordovaProperty
+  ERR_REFRESH: number;
+
+  @CordovaProperty
+  ERR_PAYMENT_EXPIRED: number;
+
+  @CordovaProperty
+  ERR_DOWNLOAD: number;
+
+  @CordovaProperty
+  ERR_SUBSCRIPTION_UPDATE_NOT_AVAILABLE: number;
+
+
+  @CordovaProperty
+  REGISTERED: string;
+
+  @CordovaProperty
+  INVALID: string;
+
+  @CordovaProperty
+  VALID: string;
+
+  @CordovaProperty
+  REQUESTED: string;
+
+  @CordovaProperty
+  INITIATED: string;
+
+  @CordovaProperty
+  APPROVED: string;
+
+  @CordovaProperty
+  FINISHED: string;
+
+  @CordovaProperty
+  OWNED: string;
+
+  @CordovaProperty
+  DOWNLOADING: string;
+
+  @CordovaProperty
+  DOWNLOADED: string;
+
+
+  @CordovaProperty
+  INVALID_PAYLOAD: number;
+
+  @CordovaProperty
+  CONNECTION_FAILED: number;
+
+  @CordovaProperty
+  PURCHASE_EXPIRED: number;
+
+  @CordovaProperty
+  products: IAPProducts;
+
+  @CordovaProperty
+  validator: string | ((product: string | IAPProduct, callback: Function) => void);
 
   @CordovaProperty
   log: {
@@ -331,9 +370,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * @param idOrAlias
    */
   @Cordova({ sync: true })
-  get(idOrAlias: string): IAPProduct {
+  get(idOrAlias: string): IAPProduct { return; }
-    return;
-  }
 
   /**
    * Register error handler
@@ -346,7 +383,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * Add or register a product
    * @param product {IAPProductOptions}
    */
-  @Cordova({ sync: true })
+  @Cordova({ sync: true})
   register(product: IAPProductOptions): void {}
 
   /**
@@ -357,13 +394,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * @return {IAPProductEvents}
    */
   @Cordova({ sync: true })
-  when(
+  when(query: string | IAPProduct, event?: string, callback?: IAPQueryCallback): IAPProductEvents { return; }
-    query: string | IAPProduct,
-    event?: string,
-    callback?: IAPQueryCallback
-  ): IAPProductEvents {
-    return;
-  }
 
   /**
    * Identical to `when`, but the callback will be called only once. After being called, the callback will be unregistered.
@@ -373,13 +404,7 @@ export class InAppPurchase2 extends IonicNativePlugin {
    * @return {IAPProductEvents}
    */
   @Cordova({ sync: true })
-  once(
+  once(query: string | IAPProduct, event?: string, callback?: IAPQueryCallback): IAPProductEvents { return; }
-    query: string | IAPProduct,
-    event?: string,
-    callback?: IAPQueryCallback
-  ): IAPProductEvents {
-    return;
-  }
 
   /**
    * Unregister a callback. Works for callbacks registered with ready, when, once and error.
@@ -389,22 +414,16 @@ export class InAppPurchase2 extends IonicNativePlugin {
   off(callback: Function): void {}
 
   @Cordova({ sync: true })
-  order(
+  order(product: string | IAPProduct, additionalData?: any): { then: Function; error: Function; } { return; }
-    product: string | IAPProduct,
-    additionalData?: any
-  ): { then: Function; error: Function } {
-    return;
-  }
 
   /**
    *
    * @return {Promise<any>} returns a promise that resolves when the store is ready
    */
   @Cordova()
-  ready(): Promise<void> {
+  ready(): Promise<void> { return; }
-    return;
-  }
 
   @Cordova({ sync: true })
   refresh(): void {}
+
 }

src/@ionic-native/plugins/in-app-purchase/index.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name In App Purchase
@@ -61,6 +62,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class InAppPurchase extends IonicNativePlugin {
+
   /**
    * Retrieves a list of full product data from Apple/Google. This method must be called before making purchases.
    * @param {array<string>} productId an array of product ids.
@@ -69,9 +71,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  getProducts(productId: string[]): Promise<any> {
+  getProducts(productId: string[]): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Buy a product that matches the productId.
@@ -81,16 +81,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  buy(
+  buy(productId: string): Promise<{ transactionId: string, receipt: string, signature: string, productType: string }> { return; }
-    productId: string
-  ): Promise<{
-    transactionId: string;
-    receipt: string;
-    signature: string;
-    productType: string;
-  }> {
-    return;
-  }
 
   /**
    * Same as buy, but for subscription based products.
@@ -100,16 +91,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  subscribe(
+  subscribe(productId: string): Promise<{ transactionId: string, receipt: string, signature: string, productType: string }> { return; }
-    productId: string
-  ): Promise<{
-    transactionId: string;
-    receipt: string;
-    signature: string;
-    productType: string;
-  }> {
-    return;
-  }
 
   /**
    * Call this function after purchasing a "consumable" product to mark it as consumed. On Android, you must consume products that you want to let the user purchase multiple times. If you will not consume the product after a purchase, the next time you will attempt to purchase it you will get the error message:
@@ -121,13 +103,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  consume(
+  consume(productType: string, receipt: string, signature: string): Promise<any> { return; }
-    productType: string,
-    receipt: string,
-    signature: string
-  ): Promise<any> {
-    return;
-  }
 
   /**
    * Restore all purchases from the store
@@ -136,9 +112,7 @@ export class InAppPurchase extends IonicNativePlugin {
   @Cordova({
     otherPromise: true
   })
-  restorePurchases(): Promise<any> {
+  restorePurchases(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Get the receipt.
@@ -148,7 +122,6 @@ export class InAppPurchase extends IonicNativePlugin {
     otherPromise: true,
     platforms: ['iOS']
   })
-  getReceipt(): Promise<string> {
+  getReceipt(): Promise<string> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/insomnia/index.ts

@@ -1,5 +1,6 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
 
 /**
  * @name Insomnia
@@ -33,32 +34,23 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-insomnia',
   pluginRef: 'plugins.insomnia',
   repo: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin',
-  platforms: [
+  platforms: ['Android', 'Browser', 'Firefox OS', 'iOS', 'Windows', 'Windows Phone 8']
-    'Android',
-    'Browser',
-    'Firefox OS',
-    'iOS',
-    'Windows',
-    'Windows Phone 8'
-  ]
 })
 @Injectable()
 export class Insomnia extends IonicNativePlugin {
+
   /**
    * Keeps awake the application
    * @returns {Promise<any>}
    */
   @Cordova()
-  keepAwake(): Promise<any> {
+  keepAwake(): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Allows the application to sleep again
    * @returns {Promise<any>}
    */
   @Cordova()
-  allowSleepAgain(): Promise<any> {
+  allowSleepAgain(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/instagram/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Instagram
@@ -28,6 +28,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class Instagram extends IonicNativePlugin {
+
   /**
    * Detect if the Instagram application is installed on the device.
    *
@@ -36,9 +37,7 @@ export class Instagram extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  isInstalled(): Promise<boolean | string> {
+  isInstalled(): Promise<boolean | string> { return; }
-    return;
-  }
 
   /**
    * Share an image on Instagram
@@ -51,9 +50,7 @@ export class Instagram extends IonicNativePlugin {
   @Cordova({
     callbackStyle: 'node'
   })
-  share(canvasIdOrDataUrl: string, caption?: string): Promise<any> {
+  share(canvasIdOrDataUrl: string, caption?: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Share a library asset or video
@@ -63,7 +60,6 @@ export class Instagram extends IonicNativePlugin {
   @Cordova({
     callbackOrder: 'reverse'
   })
-  shareAsset(assetLocalIdentifier: string): Promise<any> {
+  shareAsset(assetLocalIdentifier: string): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/intel-security/index.ts

@@ -76,6 +76,7 @@ export interface IntelSecurityDataOptions {
 })
 @Injectable()
 export class IntelSecurity extends IonicNativePlugin {
+
   /**
    * returns an IntelSecurityStorage object
    * @type {IntelSecurityStorage}
@@ -87,6 +88,7 @@ export class IntelSecurity extends IonicNativePlugin {
    * @type {IntelSecurityData}
    */
   data: IntelSecurityData = new IntelSecurityData();
+
 }
 
 /**
@@ -98,15 +100,14 @@ export class IntelSecurity extends IonicNativePlugin {
   pluginRef: 'intel.security.secureData'
 })
 export class IntelSecurityData {
+
   /**
-   * This creates a new instance of secure data using plain-text data.
+  * This creates a new instance of secure data using plain-text data.
-   * @param options {IntelSecurityDataOptions}
+  * @param options {IntelSecurityDataOptions}
-   * @returns {Promise<any>} Returns a Promise that resolves with the instanceID of the created data instance, or rejects with an error.
+  * @returns {Promise<any>} Returns a Promise that resolves with the instanceID of the created data instance, or rejects with an error.
-   */
+  */
   @Cordova({ otherPromise: true })
-  createFromData(options: IntelSecurityDataOptions): Promise<Number> {
+  createFromData(options: IntelSecurityDataOptions): Promise<Number> { return; }
-    return;
-  }
 
   /**
    * This creates a new instance of secure data (using sealed data)
@@ -115,9 +116,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a Promise that resolves with the instanceID of the created data instance, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  createFromSealedData(options: { sealedData: string }): Promise<Number> {
+  createFromSealedData(options: { sealedData: string }): Promise<Number> { return; }
-    return;
-  }
 
   /**
    * This returns the plain-text data of the secure data instance.
@@ -125,9 +124,7 @@ export class IntelSecurityData {
    * @returns {Promise<string>} Returns a Promise that resolves to the data as plain-text, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getData(instanceID: Number): Promise<string> {
+  getData(instanceID: Number): Promise<string> { return; }
-    return;
-  }
 
   /**
    * This returns the sealed chunk of a secure data instance.
@@ -135,9 +132,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a Promise that resolves to the sealed data, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getSealedData(instanceID: any): Promise<any> {
+  getSealedData(instanceID: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This returns the tag of the secure data instance.
@@ -145,9 +140,7 @@ export class IntelSecurityData {
    * @returns {Promise<string>} Returns a Promise that resolves to the tag, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getTag(instanceID: any): Promise<string> {
+  getTag(instanceID: any): Promise<string> { return; }
-    return;
-  }
 
   /**
    * This returns the data policy of the secure data instance.
@@ -155,9 +148,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a promise that resolves to the policy object, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getPolicy(instanceID: any): Promise<any> {
+  getPolicy(instanceID: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This returns an array of the data owners unique IDs.
@@ -165,9 +156,7 @@ export class IntelSecurityData {
    * @returns {Promise<Array>} Returns a promise that resolves to an array of owners' unique IDs, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getOwners(instanceID: any): Promise<Array<any>> {
+  getOwners(instanceID: any): Promise<Array<any>> { return; }
-    return;
-  }
 
   /**
    * This returns the data creator unique ID.
@@ -175,9 +164,7 @@ export class IntelSecurityData {
    * @returns {Promise<Number>} Returns a promsie that resolves to the creator's unique ID, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getCreator(instanceID: any): Promise<Number> {
+  getCreator(instanceID: any): Promise<Number> { return; }
-    return;
-  }
 
   /**
    * This returns an array of the trusted web domains of the secure data instance.
@@ -185,9 +172,7 @@ export class IntelSecurityData {
    * @returns {Promise<Array>} Returns a promise that resolves to a list of web owners, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  getWebOwners(instanceID: any): Promise<Array<any>> {
+  getWebOwners(instanceID: any): Promise<Array<any>> { return; }
-    return;
-  }
 
   /**
    * This changes the extra key of a secure data instance. To successfully replace the extra key, the calling application must have sufficient access to the plain-text data.
@@ -197,9 +182,7 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a promise that resolves with no parameters, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  changeExtraKey(options: any): Promise<any> {
+  changeExtraKey(options: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This releases a secure data instance.
@@ -207,9 +190,8 @@ export class IntelSecurityData {
    * @returns {Promise<any>} Returns a promise that resovles with no parameters, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  destroy(instanceID: any): Promise<any> {
+  destroy(instanceID: any): Promise<any> { return; }
-    return;
+
-  }
 }
 
 /**
@@ -221,6 +203,7 @@ export class IntelSecurityData {
   pluginRef: 'intel.security.secureStorage'
 })
 export class IntelSecurityStorage {
+
   /**
    * This deletes a secure storage resource (indicated by id).
    * @param options {Object}
@@ -229,9 +212,10 @@ export class IntelSecurityStorage {
    * @returns {Promise<any>} Returns a Promise that resolves with no parameters, or rejects with an error.
    */
   @Cordova({ otherPromise: true })
-  delete(options: { id: string; storageType?: Number }): Promise<any> {
+  delete(options: {
-    return;
+    id: string,
-  }
+    storageType?: Number
+  }): Promise<any> { return; }
 
   /**
    * This reads the data from secure storage (indicated by id) and creates a new secure data instance.
@@ -243,12 +227,10 @@ export class IntelSecurityStorage {
    */
   @Cordova({ otherPromise: true })
   read(options: {
-    id: string;
+    id: string,
-    storageType?: Number;
+    storageType?: Number,
-    extraKey?: Number;
+    extraKey?: Number
-  }): Promise<Number> {
+  }): Promise<Number> { return; }
-    return;
-  }
 
   /**
    * This writes the data contained in a secure data instance into secure storage.
@@ -260,10 +242,9 @@ export class IntelSecurityStorage {
    */
   @Cordova({ otherPromise: true })
   write(options: {
-    id: String;
+    id: String,
-    instanceID: Number;
+    instanceID: Number,
-    storageType?: Number;
+    storageType?: Number
-  }): Promise<any> {
+  }): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/intercom/index.ts

@@ -1,5 +1,5 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Intercom
@@ -27,19 +27,18 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-intercom',
   pluginRef: 'intercom',
   repo: 'https://github.com/intercom/intercom-cordova',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS'],
 })
 @Injectable()
 export class Intercom extends IonicNativePlugin {
+
   /**
    * Register a identified user
    * @param options {any} Options
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  registerIdentifiedUser(options: any): Promise<any> {
+  registerIdentifiedUser(options: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Register a unidentified user
@@ -47,18 +46,14 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  registerUnidentifiedUser(options: any): Promise<any> {
+  registerUnidentifiedUser(options: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    * This resets the Intercom integration's cache of your user's identity and wipes the slate clean.
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  reset(): Promise<any> {
+  reset(): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -67,9 +62,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setSecureMode(secureHash: string, secureData: any): Promise<any> {
+  setSecureMode(secureHash: string, secureData: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -77,9 +70,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setUserHash(secureHash: string): Promise<any> {
+  setUserHash(secureHash: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -87,9 +78,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  updateUser(attributes: any): Promise<any> {
+  updateUser(attributes: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -98,27 +87,21 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  logEvent(eventName: string, metaData: any): Promise<any> {
+  logEvent(eventName: string, metaData: any): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayMessenger(): Promise<any> {
+  displayMessenger(): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayMessageComposer(): Promise<any> {
+  displayMessageComposer(): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -126,29 +109,21 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayMessageComposerWithInitialMessage(
+  displayMessageComposerWithInitialMessage(initialMessage: string): Promise<any> { return; }
-    initialMessage: string
-  ): Promise<any> {
-    return;
-  }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  displayConversationsList(): Promise<any> {
+  displayConversationsList(): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  unreadConversationCount(): Promise<any> {
+  unreadConversationCount(): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -156,9 +131,7 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setLauncherVisibility(visibility: string): Promise<any> {
+  setLauncherVisibility(visibility: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
@@ -166,25 +139,20 @@ export class Intercom extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  setInAppMessageVisibility(visibility: string): Promise<any> {
+  setInAppMessageVisibility(visibility: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  hideMessenger(): Promise<any> {
+  hideMessenger(): Promise<any> { return; }
-    return;
-  }
 
   /**
    *
    * @return {Promise<any>} Returns a promise
    */
   @Cordova()
-  registerForPush(): Promise<any> {
+  registerForPush(): Promise<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/jins-meme/index.ts

@@ -1,10 +1,5 @@
 import { Injectable } from '@angular/core';
-import {
+import { Plugin, Cordova, CordovaCheck, IonicNativePlugin } from '@ionic-native/core';
-  Cordova,
-  CordovaCheck,
-  IonicNativePlugin,
-  Plugin
-} from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 declare const cordova: any;
@@ -54,9 +49,7 @@ export class JinsMeme extends IonicNativePlugin {
    *@returns {Promise<any>}
    */
   @Cordova()
-  setAppClientID(appClientId: string, clientSecret: string): Promise<any> {
+  setAppClientID(appClientId: string, clientSecret: string): Promise<any> { return; }
-    return;
-  }
   /**
    * Starts scanning for JINS MEME.
    * @returns {Observable<any>}
@@ -66,17 +59,13 @@ export class JinsMeme extends IonicNativePlugin {
     clearFunction: 'stopScan',
     clearWithArgs: true
   })
-  startScan(): Observable<any> {
+  startScan(): Observable<any> { return; }
-    return;
-  }
   /**
    * Stops scanning JINS MEME.
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopScan(): Promise<any> {
+  stopScan(): Promise<any> { return; }
-    return;
-  }
   /**
    * Establishes connection to JINS MEME.
    * @param {string} target
@@ -87,12 +76,7 @@ export class JinsMeme extends IonicNativePlugin {
   })
   connect(target: string): Observable<any> {
     return new Observable<any>((observer: any) => {
-      let data = cordova.plugins.JinsMemePlugin.connect(
+      let data = cordova.plugins.JinsMemePlugin.connect(target, observer.next.bind(observer), observer.complete.bind(observer), observer.error.bind(observer));
-        target,
-        observer.next.bind(observer),
-        observer.complete.bind(observer),
-        observer.error.bind(observer)
-      );
       return () => console.log(data);
     });
   }
@@ -102,25 +86,19 @@ export class JinsMeme extends IonicNativePlugin {
    *@returns {Promise<any>}
    */
   @Cordova()
-  setAutoConnect(flag: boolean): Promise<any> {
+  setAutoConnect(flag: boolean): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns whether a connection to JINS MEME has been established.
    *@returns {Promise<any>}
    */
   @Cordova()
-  isConnected(): Promise<any> {
+  isConnected(): Promise<any> { return; }
-    return;
-  }
   /**
    * Disconnects from JINS MEME.
    *@returns {Promise<any>}
    */
   @Cordova()
-  disconnect(): Promise<any> {
+  disconnect(): Promise<any> { return; }
-    return;
-  }
   /**
    * Starts receiving realtime data.
    * @returns {Observable<any>}
@@ -130,80 +108,60 @@ export class JinsMeme extends IonicNativePlugin {
     clearFunction: 'stopDataReport',
     clearWithArgs: true
   })
-  startDataReport(): Observable<any> {
+  startDataReport(): Observable<any> { return; }
-    return;
-  }
   /**
-   * Stops receiving data.
+  * Stops receiving data.
-   *@returns {Promise<any>}
+  *@returns {Promise<any>}
-   */
+  */
   @Cordova()
-  stopDataReport(): Promise<any> {
+  stopDataReport(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns SDK version.
    *
    *@returns {Promise<any>}
    */
   @Cordova()
-  getSDKVersion(): Promise<any> {
+  getSDKVersion(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns JINS MEME connected with other apps.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getConnectedByOthers(): Promise<any> {
+  getConnectedByOthers(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns calibration status
    *@returns {Promise<any>}
    */
   @Cordova()
-  isCalibrated(): Promise<any> {
+  isCalibrated(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns device type.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getConnectedDeviceType(): Promise<any> {
+  getConnectedDeviceType(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns hardware version.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getConnectedDeviceSubType(): Promise<any> {
+  getConnectedDeviceSubType(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns FW Version.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getFWVersion(): Promise<any> {
+  getFWVersion(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns HW Version.
    *@returns {Promise<any>}
    */
   @Cordova()
-  getHWVersion(): Promise<any> {
+  getHWVersion(): Promise<any> { return; }
-    return;
-  }
   /**
    * Returns response about whether data was received or not.
    *@returns {Promise<any>}
    */
   @Cordova()
-  isDataReceiving(): Promise<any> {
+  isDataReceiving(): Promise<any> { return; }
-    return;
-  }
 }

src/@ionic-native/plugins/keyboard/index.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
+
 /**
  * @name Keyboard
  * @description
@@ -28,12 +29,13 @@ import { Observable } from 'rxjs/Observable';
 })
 @Injectable()
 export class Keyboard extends IonicNativePlugin {
+
   /**
    * Hide the keyboard accessory bar with the next, previous and done buttons.
    * @param hide {boolean}
    */
   @Cordova({ sync: true })
-  hideKeyboardAccessoryBar(hide: boolean): void {}
+  hideKeyboardAccessoryBar(hide: boolean): void { }
 
   /**
    * Force keyboard to be shown.
@@ -42,7 +44,7 @@ export class Keyboard extends IonicNativePlugin {
     sync: true,
     platforms: ['Android', 'BlackBerry 10', 'Windows']
   })
-  show(): void {}
+  show(): void { }
 
   /**
    * Close the keyboard if open.
@@ -51,7 +53,7 @@ export class Keyboard extends IonicNativePlugin {
     sync: true,
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  close(): void {}
+  close(): void { }
 
   /**
    * Prevents the native UIScrollView from moving when an input is focused.
@@ -61,7 +63,7 @@ export class Keyboard extends IonicNativePlugin {
     sync: true,
     platforms: ['iOS', 'Windows']
   })
-  disableScroll(disable: boolean): void {}
+  disableScroll(disable: boolean): void { }
 
   /**
    * Creates an observable that notifies you when the keyboard is shown. Unsubscribe to observable to cancel event watch.
@@ -72,9 +74,7 @@ export class Keyboard extends IonicNativePlugin {
     event: 'native.keyboardshow',
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  onKeyboardShow(): Observable<any> {
+  onKeyboardShow(): Observable<any> { return; }
-    return;
-  }
 
   /**
    * Creates an observable that notifies you when the keyboard is hidden. Unsubscribe to observable to cancel event watch.
@@ -85,7 +85,6 @@ export class Keyboard extends IonicNativePlugin {
     event: 'native.keyboardhide',
     platforms: ['iOS', 'Android', 'BlackBerry 10', 'Windows']
   })
-  onKeyboardHide(): Observable<any> {
+  onKeyboardHide(): Observable<any> { return; }
-    return;
+
-  }
 }

src/@ionic-native/plugins/keychain-touch-id/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Keychain Touch Id
@@ -32,6 +32,7 @@ import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 })
 @Injectable()
 export class KeychainTouchId extends IonicNativePlugin {
+
   /**
    * Check if Touch ID / Fingerprint is supported by the device
    * @return {Promise<any>} Returns a promise that resolves when there is hardware support
@@ -49,9 +50,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when there is a result
    */
   @Cordova()
-  save(key: string, password: string): Promise<any> {
+  save(key: string, password: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Opens the fingerprint dialog, for the given key, showing an additional message. Promise will resolve
@@ -61,9 +60,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves when the key value is successfully retrieved or an error
    */
   @Cordova()
-  verify(key: string, message: string): Promise<any> {
+  verify(key: string, message: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Checks if there is a password stored within the keychain for the given key.
@@ -71,9 +68,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves with success if the key is available or failure if key is not.
    */
   @Cordova()
-  has(key: string): Promise<any> {
+  has(key: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Deletes the password stored under given key from the keychain.
@@ -81,9 +76,7 @@ export class KeychainTouchId extends IonicNativePlugin {
    * @return {Promise<any>} Returns a promise that resolves with success if the key is deleted or failure if key is not
    */
   @Cordova()
-  delete(key: string): Promise<any> {
+  delete(key: string): Promise<any> { return; }
-    return;
-  }
 
   /**
    * Sets the language of the fingerprint dialog
@@ -91,4 +84,5 @@ export class KeychainTouchId extends IonicNativePlugin {
    */
   @Cordova()
   setLocale(locale: string): void {}
+
 }