chore(): update changelog

feat(plugin): Add google nearby plugin

.github/CONTRIBUTING.md

@@ -4,8 +4,8 @@
 #### There are no rules, but here are a few things to consider:
 ###### Before you submit an issue:
 * Do a quick search to see if there are similar issues
-* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic 2, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/api/platform/Platform/#ready).
-* **Check that you are using the latest version of** `ionic-native`, you can install the latest version by running `npm i --save ionic-native@latest`
+* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/api/platform/Platform/#ready).
+* **Check that you are using the latest version of** `ionic-native`, you can install the latest version by running `npm i --save @ionic-native/core@latest`
 
 ###### Still having problems? submit an issue with the following details:
 * Short description of the issue
@@ -16,4 +16,4 @@
 ## Feature request?
 Have a plugin you'd like to see supported? Since Ionic Native is a thin wrapper around existing Cordova plugins, adding support for new plugins is as easy as creating a new wrapper for whatever plugin you'd like to add.
 
-Take a look at our [Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.
+Take a look at our [Developer Guide](https://github.com/ionic-team/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,28 @@
+**I'm submitting a ...**  (check one with "x")
+[ ] bug report
+[ ] feature request
+[ ] support request => Please do not submit support requests here, use one of these channels: https://forum.ionicframework.com/ or https://ionicworldwide.herokuapp.com/
+
+**Current behavior:**
+<!-- Describe how the bug manifests. -->
+
+**Expected behavior:**
+<!-- Describe what the behavior would be without the bug. -->
+
+**Steps to reproduce:**
+<!-- If you are able to illustrate the bug or feature request with an example, please provide steps to reproduce. -->
+
+**Related code:**
+
+```
+insert any relevant code here
+```
+
+**Other information:**
+<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
+
+**Ionic info:** (run `ionic info` from a terminal/cmd prompt and paste output below):
+
+```
+insert the output from ionic info here
+```

.gitignore

@@ -3,5 +3,5 @@ node_modules/
 .idea
 .tmp
 aot/
-dist/
 scripts/ionic-native-bower
+dist/

CODE_OF_CONDUCT.md

@@ -0,0 +1,11 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of the Ionic project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
+
+Communication through any of Ionic's channels (GitHub, Slack, Forum, IRC, mailing lists, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Ionic project to do the same.
+
+If any member of the community violates this code of conduct, the maintainers of the Ionic project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
+
+If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [hi@ionicframework.com](mailto:hi@ionicframework.com).

DEVELOPER.md

@@ -103,7 +103,7 @@ Next, let's look at the `watchPosition` method.
 
 The `@Cordova` decorator has a few more options now.
 
-`observable` indicates that this method may call its callbacks multiple times, so `@Cordova` wraps it in an [`Observable`](https://github.com/driftyco/ionic-native#promises-and-observables) instead of a Promise.
+`observable` indicates that this method may call its callbacks multiple times, so `@Cordova` wraps it in an [`Observable`](https://github.com/ionic-team/ionic-native#promises-and-observables) instead of a Promise.
 
 `callbackOrder` refers to the method signature of the underlying Cordova plugin, and tells Ionic Native which arguments are the callbacks to map to the wrapping Promise or Observable.  In this case, the signature is [`watchPosition(success, error, options)`](https://github.com/apache/cordova-plugin-geolocation#navigatorgeolocationwatchposition), so we need to tell `@Cordova` that the callbacks are the first arguments, not the last arguments.  For rare cases, you can also specify the options `successIndex` and `errorIndex` to indicate where in the argument list the callbacks are located.
 
@@ -209,4 +209,13 @@ Example:
 someMethod(): Promise<any> {
   // anything here will only run if the plugin is available
 }
+```
+
+#### CordovaFunctionOverride
+Wrap a stub function in a call to a Cordova plugin, checking if both Cordova and the required plugin are installed.
+
+Example:
+```ts
+@CordovaFunctionOverride()
+someMethod(): Observable<any> { return; }
 ```

README.md

@@ -1,24 +1,24 @@
-[![Circle CI](https://circleci.com/gh/driftyco/ionic-native.svg?style=shield)](https://circleci.com/gh/driftyco/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) ![](https://img.shields.io/npm/v/@ionic-native/core.svg)
+[![Circle CI](https://circleci.com/gh/ionic-team/ionic-native.svg?style=shield)](https://circleci.com/gh/ionic-team/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) ![](https://img.shields.io/npm/v/@ionic-native/core.svg)
 
 
 # Ionic Native
 
-Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic 2](http://ionicframework.com/) mobile app easy.
+Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic](https://ionicframework.com/) mobile app easy.
 
 Ionic Native wraps plugin callbacks in a Promise or Observable, providing a common interface for all plugins and making it easy to use plugins with Angular change detection.
 
 ## Installation
 
 Run following command to install Ionic Native in your project.
-```
+```bash
 npm install @ionic-native/core --save
 ```
 
-You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](http://ionicframework.com/docs/native/) for complete instructions on how to add and use the plugins.
+You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](https://ionicframework.com/docs/native/) for complete instructions on how to add and use the plugins.
 
 ## Documentation
 
-For the full Ionic Native documentation, please visit [http://ionicframework.com/docs/native/](http://ionicframework.com/docs/native/).
+For the full Ionic Native documentation, please visit [https://ionicframework.com/docs/native/](https://ionicframework.com/docs/native/).
 
 ### Basic Usage
 
@@ -52,38 +52,28 @@ import { NgZone } from '@angular/core';
 @Component({ ... })
 export class MyComponent {
 
-  constructor(private geolocation: Geolocation, private platform: Platform, private ngZone: NgZone) {
+  constructor(private geolocation: Geolocation, private platform: Platform) {
 
     platform.ready().then(() => {
 
       // get position
       geolocation.getCurrentPosition().then(pos => {
-
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-
       });
 
 
       // watch position
       const watch = geolocation.watchPosition().subscribe(pos => {
-
         console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-
-        // Currently, observables from Ionic Native plugins
-        // need to run inside of zone to trigger change detection
-        ngZone.run(() => {
-          this.position = pos;
-        })
-
+        this.position = pos;
       });
 
       // to stop watching
       watch.unsubscribe();
-
     });
-
+    
   }
-
+  
 }
 ```
 
@@ -95,13 +85,13 @@ To do this, you need to provide a mock implementation of the plugins you wish to
 
 First import the `Camera` class in your `src/app/app.module.ts` file:
 
-```ts
+```typescript
 import { Camera } from '@ionic-native/camera';
 ```
 
 Then create a new class that extends the `Camera` class with a mock implementation:
 
-```ts
+```typescript
 class CameraMock extends Camera {
   getPicture(options) {
     return new Promise((resolve, reject) => {
@@ -113,7 +103,7 @@ class CameraMock extends Camera {
 
 Finally, override the previous `Camera` class in your `providers` for this module:
 
-```ts
+```typescript
 providers: [
   { provide: Camera, useClass: CameraMock }
 ]
@@ -121,8 +111,9 @@ providers: [
 
 Here's the full example:
 
-```ts
+```typescript
 import { NgModule, ErrorHandler } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
 import { MyApp } from './app.component';
 import { HomePage } from '../pages/home/home';
@@ -143,6 +134,7 @@ class CameraMock extends Camera {
     HomePage
   ],
   imports: [
+    BrowserModule,
     IonicModule.forRoot(MyApp)
   ],
   bootstrap: [IonicApp],
@@ -163,24 +155,24 @@ export class AppModule {}
 
 Spent way too long diagnosing an issue only to realize a plugin wasn't firing or installed? Ionic Native lets you know what the issue is and how you can resolve it.
 
-![img](http://ionic-io-assets.s3.amazonaws.com/ionic-native-console.png)
+![img](https://ionic-io-assets.s3.amazonaws.com/ionic-native-console.png)
 
 
 ## Plugin Missing?
-Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:
+Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/ionic-team/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:
 
-## Ionic 1/Angular 1 support
+## Ionic v1 (AngularJS, Angular 1.x) support
 
-Ionic Native 3.x supports Ionic 2.x and above. For Ionic/Angular 1 support, please use version 2 of Ionic Native. See the [2.x README](https://github.com/driftyco/ionic-native/blob/8cd648db5cddd7bdbe2bd78839b19c620cc8c04c/README.md) for usage information.
+For Ionic v1 (AngularJS, Angular 1.x) support, please use version 2 of Ionic Native. See the [2.x README](https://github.com/ionic-team/ionic-native/blob/v2.x/README.md) for usage information.
 
 # Credits
 
-Ibby Hadeed - [@ihadeed](http://github.com/ihadeed)
+Ibby Hadeed - [@ihadeed](https://github.com/ihadeed)
 
-Tim Lancina - [@timlancina](http://twitter.com/timlancina)
+Tim Lancina - [@timlancina](https://twitter.com/timlancina)
 
 Mike Hartington - [@mhartington](https://twitter.com/mhartington)
 
-Max Lynch - [@maxlynch](http://twitter.com/maxlynch)
+Max Lynch - [@maxlynch](https://twitter.com/maxlynch)
 
 Rob Wormald - [@robwormald](https://twitter.com/robwormald)

circle.yml

@@ -7,12 +7,15 @@ jobs:
     steps:
       - checkout
       - restore_cache:
-         key: ionic-site
+         key: ionic-site-{{ checksum "package.json" }}
       - run:
          name: Prepare ionic-site repo
-         command: ./scripts/docs/prepare.sh
+         command: |
+           if [ "${CIRCLE_BRANCH}" == "master" ]; then
+             ./scripts/docs/prepare.sh
+           fi
       - save_cache:
-         key: ionic-site
+         key: ionic-site-{{ checksum "package.json" }}
          paths:
          - ~/ionic-site/
       - restore_cache:
@@ -27,6 +30,16 @@ jobs:
       - run:
           name: Run tslint
           command: npm run lint
+      - run: bash ./scripts/git/config.sh
+      - run:
+          name: Build Ionic Native
+          command: npm run build:core && ./node_modules/.bin/tsc
+      - run:
+          name: Generate README files to ensure docs are valid
+          command: npm run readmes
+      - run:
+          name: Run tests
+          command: npm test
       - add_ssh_keys
       - deploy:
           name: Update docs

gulpfile.js

@@ -34,14 +34,16 @@ gulp.task('plugin:create', () => {
 
     const src = flags.m ? './scripts/templates/wrap-min.tmpl':'./scripts/templates/wrap.tmpl',
       pluginName = flags.n,
-      pluginNameSpaced = pluginName.replace(/(?!^)([A-Z])/g, ' $1');
+      spaced = pluginName.replace(/(?!^)([A-Z])/g, ' $1'),
+      kebabCase = _.kebabCase(pluginName);
 
     return gulp.src(src)
-      .pipe(replace('$PluginName', pluginName))
-      .pipe(replace('$Plugin_Name', pluginNameSpaced))
-      .pipe(replace('$pluginName', _.lowerFirst(pluginName)))
+      .pipe(replace('{{ PluginName }}', pluginName))
+      .pipe(replace('{{ Plugin_Name }}', spaced))
+      .pipe(replace('{{ pluginName }}', _.lowerFirst(pluginName)))
+      .pipe(replace('{{ plugin-name }}', kebabCase))
       .pipe(rename('index.ts'))
-      .pipe(gulp.dest('./src/@ionic-native/plugins/' + _.kebabCase(pluginName)));
+      .pipe(gulp.dest('./src/@ionic-native/plugins/' + kebabCase));
 
   } else {
     console.log("Usage is: gulp plugin:create -n PluginName");

karma.conf.js

@@ -0,0 +1,55 @@
+"use strict";
+
+module.exports = config => {
+
+  const conf = {
+    frameworks: [
+      'jasmine',
+      'karma-typescript'
+    ],
+
+    plugins: [
+      'karma-typescript',
+      'karma-jasmine',
+      'karma-phantomjs-launcher'
+    ],
+
+    preprocessors: {
+      'src/**/*.ts': ['karma-typescript']
+    },
+
+    karmaTypescriptConfig: {
+      bundlerOptions: {
+        entrypoints: /\.spec\.ts$/,
+        transforms: [
+          require("karma-typescript-es6-transform")()
+        ]
+      },
+      compilerOptions: {
+        lib: ['es2015', 'dom'],
+        paths: {
+          "@ionic-native/core": ["./src/@ionic-native/core"]
+        },
+        baseUrl: '.'
+      }
+    },
+
+    files: [
+      { pattern: 'src/**/*.ts', included: true, watched: true }
+    ],
+
+    reporters: ['progress'],
+
+    port: 9876,
+    colors: true,
+    logLevel: config.INFO,
+    autoWatch: true,
+    browsers: [
+      'PhantomJS'
+    ],
+    singleRun: false
+  };
+
+  config.set(conf);
+
+};

package.json

@@ -1,17 +1,22 @@
 {
   "name": "ionic-native",
-  "version": "3.4.3",
+  "version": "4.7.0",
   "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
+  "homepage": "https://ionicframework.com/",
+  "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
   "license": "MIT",
   "devDependencies": {
-    "@angular/compiler": "2.4.8",
-    "@angular/compiler-cli": "2.4.8",
-    "@angular/core": "2.4.8",
+    "@angular/compiler": "4.4.4",
+    "@angular/compiler-cli": "4.4.4",
+    "@angular/core": "4.4.4",
+    "@types/cordova": "0.0.34",
+    "@types/jasmine": "^2.6.3",
+    "@types/node": "^8.0.50",
     "canonical-path": "0.0.2",
-    "child-process-promise": "2.2.0",
-    "conventional-changelog-cli": "1.2.0",
-    "cpr": "2.0.2",
-    "cz-conventional-changelog": "1.2.0",
+    "child-process-promise": "2.2.1",
+    "conventional-changelog-cli": "1.3.4",
+    "cpr": "2.0.0",
+    "cz-conventional-changelog": "2.0.0",
     "decamelize": "1.2.0",
     "dgeni": "0.4.7",
     "dgeni-packages": "0.16.10",
@@ -21,18 +26,25 @@
     "gulp-rename": "1.2.2",
     "gulp-replace": "0.5.4",
     "gulp-tslint": "6.1.2",
+    "jasmine-core": "^2.6.1",
+    "karma": "^1.7.0",
+    "karma-cli": "^1.0.1",
+    "karma-jasmine": "^1.1.0",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "karma-typescript": "^3.0.1",
+    "karma-typescript-es6-transform": "^1.0.0",
     "lodash": "4.17.4",
-    "minimist": "1.1.3",
+    "minimist": "1.2.0",
     "node-html-encoder": "0.0.2",
-    "q": "1.4.1",
+    "q": "1.5.0",
     "queue": "4.2.1",
-    "rimraf": "2.5.4",
-    "rxjs": "5.0.1",
+    "rimraf": "2.6.1",
+    "rxjs": "5.5.2",
     "semver": "5.3.0",
     "tslint": "3.15.1",
-    "tslint-ionic-rules": "0.0.7",
-    "typescript": "2.0.09",
-    "zone.js": "0.7.2"
+    "tslint-ionic-rules": "0.0.8",
+    "typescript": "~2.4.2",
+    "zone.js": "0.8.18"
   },
   "scripts": {
     "start": "npm run test:watch",
@@ -44,7 +56,17 @@
     "shipit": "npm run build && gulp readmes && npm run npmpub",
     "npmpub": "node scripts/build/publish.js",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "postchangelog": "git commit -am \"chore(): update changelog\""
+    "postchangelog": "git commit -am \"chore(): update changelog\"",
+    "test": "karma start karma.conf.js --single-run",
+    "test:watch": "karma start karma.conf.js",
+    "readmes": "gulp readmes"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ionic-team/ionic-native.git"
+  },
+  "bugs": {
+    "url": "https://github.com/ionic-team/ionic-native/issues"
   },
   "config": {
     "commitizen": {

scripts/build/build.js

@@ -19,7 +19,7 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native
 // dependency versions
 const ANGULAR_VERSION = '*',
   RXJS_VERSION = '^5.0.1',
-  MIN_CORE_VERSION = '^3.1.0',
+  MIN_CORE_VERSION = '^4.2.0',
   IONIC_NATIVE_VERSION = require(path.resolve(ROOT, 'package.json')).version;
 
 // package dependencies
@@ -40,7 +40,6 @@ PLUGIN_PACKAGE_JSON.peerDependencies = PLUGIN_PEER_DEPS;
 console.log('Making new TMP directory');
 fs.mkdirpSync(BUILD_TMP);
 
-
 // Prepare and copy the core module's package.json
 console.log('Preparing core module package.json');
 CORE_PACKAGE_JSON.version = IONIC_NATIVE_VERSION;
@@ -51,6 +50,21 @@ fs.writeJsonSync(path.resolve(BUILD_CORE_DIST, 'package.json'), CORE_PACKAGE_JSO
 // Fetch a list of the plugins
 const PLUGINS = fs.readdirSync(PLUGINS_PATH);
 
+// Build specific list of plugins to build from arguments, if any
+let pluginsToBuild = process.argv.slice(2);
+let ignoreErrors = false;
+let errors = [];
+
+const index = pluginsToBuild.indexOf('ignore-errors');
+if (index > -1) {
+  ignoreErrors = true;
+  pluginsToBuild.splice(index, 1);
+  console.log('Build will continue even if errors were thrown. Errors will be printed when build finishes.');
+}
+
+if (!pluginsToBuild.length) {
+  pluginsToBuild = PLUGINS;
+}
 
 // Create a queue to process tasks
 const QUEUE = queue({
@@ -98,10 +112,16 @@ const addPluginToQueue = pluginName => {
         exec(`${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`, (err, stdout, stderr) => {
 
           if (err) {
-            // oops! something went wrong.
-            callback(`\n\nBuilding ${pluginName} failed.`);
-            console.log(err);
-            return;
+
+            if (!ignoreErrors) {
+              // oops! something went wrong.
+              console.log(err);
+              callback(`\n\nBuilding ${pluginName} failed.`);
+              return;
+            } else {
+              errors.push(err);
+            }
+
           }
 
           // we're done with this plugin!
@@ -116,12 +136,22 @@ const addPluginToQueue = pluginName => {
 
 };
 
-PLUGINS.forEach(addPluginToQueue);
+pluginsToBuild.forEach(addPluginToQueue);
 
 QUEUE.start((err) => {
 
   if (err) {
-    console.log('Error building plugins. ', err);
+    console.log('Error building plugins.');
+    console.log(err);
+    process.stderr.write(err);
+    process.exit(1);
+  } else if (errors.length) {
+    errors.forEach(e => {
+      console.log(e.message) && console.log('\n');
+      process.stderr.write(err);
+    });
+    console.log('Build complete with errors');
+    process.exit(1);
   } else {
     console.log('Done processing plugins!');
   }

scripts/build/core-package.json

@@ -9,6 +9,6 @@
   "peerDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/driftyco/ionic-native.git"
+    "url": "https://github.com/ionic-team/ionic-native.git"
   }
 }

scripts/build/plugin-package.json

@@ -9,6 +9,6 @@
   "peerDependencies": {},
   "repository": {
     "type": "git",
-    "url": "https://github.com/driftyco/ionic-native.git"
+    "url": "https://github.com/ionic-team/ionic-native.git"
   }
 }

scripts/build/tsconfig-core.json

@@ -13,7 +13,8 @@
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     "sourceMap": true,
-    "inlineSources": true
+    "inlineSources": true,
+    "noImplicitAny": true
   },
   "files": [
     "../../src/@ionic-native/core/index.ts"

scripts/build/tsconfig-plugin.json

@@ -16,7 +16,8 @@
     "skipLibCheck": true,
     "lib": ["es2015", "dom"],
     "sourceMap": true,
-    "inlineSources": true
+    "inlineSources": true,
+    "noImplicitAny": true
   },
   "files": []
 }

scripts/ci-tests.js

@@ -0,0 +1,65 @@
+const exec = require('child-process-promise').exec;
+let diff;
+exec(`git branch | grep \\* | cut -d ' ' -f2`)
+  .then(output => {
+    if (output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    const branch = output.stdout.trim();
+
+    if (branch !== 'master') {
+
+      console.log('Merging master branch in ...');
+      // not on master branch
+      // let's test the changes that were made
+      return exec(`git merge origin master`);
+    }
+  })
+  .then((output) => {
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+    console.log('Checking for differences ...');
+    return exec(`git diff --name-status origin master`)
+  })
+  .then((output) => {
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    diff = output.stdout;
+    diff = diff.replace(/A\s+/g, '');
+    diff = diff.match(/src\/@ionic-native\/plugins\/([a-zA-Z0-9\-]+)\/index\.ts/g);
+
+    if (!diff) process.exit();
+
+    console.log(`${ diff.length } plugins were modified. We will now build them to verify they still work.`);
+
+    return exec('npm run build:core --silent');
+  })
+  .then((output) => {
+
+    if (output && output.stderr) {
+      return Promise.reject(output.stderr);
+    }
+
+    console.log('Built core library successfully ...');
+    console.log('Building plugins ...');
+
+    diff = diff.map(text => text.replace('src/@ionic-native/plugins/', '').replace('/index.ts', ''));
+
+    return exec(`npm run build:modules ${diff.join(' ')} --silent`);
+  })
+  .then((output) => {
+    if (output && output.stderr) {
+      console.log(output.stderr);
+      process.exit(1);
+    }
+    console.log(output.stdout);
+    process.exit();
+  })
+  .catch(e => {
+    console.log(e.message || e);
+    process.exit(1);
+  });

scripts/docs/dgeni-readmes-config.js

@@ -41,7 +41,7 @@ module.exports = currentVersion => {
         docTypes: ['class'],
         getOutputPath: doc => doc.originalModule.replace(config.pluginDir + '/', '')
           .replace('/plugins', '')
-          .replace('/index', '/README.md')
+          .replace(/\/index$/, '/README.md')
       }];
 
     })

scripts/docs/processors/jekyll.js

@@ -22,8 +22,24 @@ module.exports = function jekyll(renderDocsProcessor) {
         doc.URL = doc.outputPath.replace('docs//', 'docs/')
           .replace('/index.md', '')
           .replace('content/', '');
+        // add trailing slash to plugin pages
+        if(!doc.URL.endsWith("/") && !doc.URL.endsWith(".html")) {
+          doc.URL = doc.URL+'/'; 
+        }
       });
 
+      const betaDocs = [];
+
+      docs = docs.filter(doc => {
+        if (doc.beta === true) {
+          betaDocs.push(doc);
+          return false;
+        }
+        return true;
+      });
+
+      docs = docs.concat(betaDocs);
+
       // add side menu
       docs.push({
         docType: 'nativeMenu',

scripts/docs/tag-defs/tag-defs.js

@@ -6,5 +6,6 @@ module.exports = [
   {'name': 'usage'},
   {'name': 'hidden'}, // hide from docs
   {'name': 'classes'}, // related classes
-  {'name': 'interfaces'} // related interfaces
+  {'name': 'interfaces'}, // related interfaces
+  {'name': 'paid', transforms: (doc, tag, value) => typeof value !== 'undefined'} // paid plugin, set value to true
 ];

scripts/docs/templates/common.template.html

@@ -44,7 +44,7 @@ docType: "<$ doc.docType $>"
 <@- endmacro -@>
 
 <@- macro githubViewLink(doc) -@>
-<a href="https://github.com/driftyco/ionic-native/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
+<a href="https://github.com/ionic-team/ionic-native/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
 <@- endmacro -@>
 
 <@- macro paramTable(params, isDirective) -@>
@@ -127,7 +127,7 @@ docType: "<$ doc.docType $>"
 
 <@- macro documentClass(doc) @>
 <@- if doc.statics.length -@>
-<h2>Static Members</h2>
+<h2><a class="anchor" name="static-members" href="#static-members"></a>Static Members</h2>
 <@ for method in doc.statics -@>
 <$ documentMethod(method) $>
 <@ endfor -@>
@@ -136,7 +136,7 @@ docType: "<$ doc.docType $>"
 <# --- methods in class --- #>
 <@- if doc.members and doc.members.length @>
 
-<h2>Instance Members</h2>
+<h2><a class="anchor" name="instance-members" href="#instance-members"></a>Instance Members</h2>
 <@ for method in doc.members -@>
 <$ documentMethod(method) $>
 <@- endfor @>
@@ -147,9 +147,12 @@ docType: "<$ doc.docType $>"
   <@- if doc.beta == true -@>
     <span class="beta" title="beta">&beta;</span>
   <@- endif -@>
+  <@- if doc.paid == true -@>
+    <span class="paid" title="paid">Paid</span>
+  <@- endif -@>
 </h1>
 
-<a class="improve-v2-docs" href="http://github.com/driftyco/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
+<a class="improve-v2-docs" href="http://github.com/ionic-team/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
   Improve this doc
 </a>
 
@@ -163,23 +166,36 @@ docType: "<$ doc.docType $>"
   href="<$ prop.repo $>/issues">plugin repo</a>.
 </p>
 <@ endif @>
+<@ if doc.paid == true @>
+<p class="paid-notice">
+  This plugin might require a paid license, or might take a share of your app's earnings.
+  Check the <a target="_blank" rel="nofollow" href="<$ prop.repo $>">plugin's repo</a> for more information.
+</p>
+<@ endif @>
+
+<# --- Plugin description --- #>
+<$ doc.description | marked $>
 
-<# --- Install commands --- #>
-<pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plugin $><@ endif @>
-$ npm install --save @ionic-native/<$ doc.npmId $>
-</code></pre>
 <p>Repo:
   <a href="<$ prop.repo $>">
     <$ prop.repo $>
   </a>
 </p>
 
-<# --- Plugin description --- #>
-<$ doc.description | marked $>
+<# --- Install commands --- #>
+<h2><a class="anchor" name="installation" href="#installation"></a>Installation</h2>
+<ol class="installation">
+  <li>Install the Cordova and Ionic Native plugins:<br>
+    <pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install | replace('<', '&lt;').replace('>', '&gt;') $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
+$ npm install --save @ionic-native/<$ doc.npmId $>
+</code></pre>
+  </li>
+  <li><a href="https://ionicframework.com/docs/native/#Add_Plugins_to_Your_App_Module">Add this plugin to your app's module</a></li>
+</ol>
 
 <# --- Plugin supported platforms --- #>
 <@ if prop.platforms @>
-<h2>Supported platforms</h2>
+<h2><a class="anchor" name="platforms" href="#platforms"></a>Supported platforms</h2>
 <ul>
   <@ for platform in prop.platforms -@>
   <li><$ platform $></li>
@@ -191,13 +207,13 @@ $ npm install --save @ionic-native/<$ doc.npmId $>
 
 <# --- Plugin usage --- #>
 <@ if doc.usage @>
-<h2>Usage</h2>
+<h2><a class="anchor" name="usage" href="#usage"></a>Usage</h2>
 <$ doc.usage | marked $>
 <@ endif @>
 
 <# --- Plugin attributes --- #>
 <@- if doc.properties -@>
-<h2>Attributes:</h2>
+<h2><a class="anchor" name="attributes" href="#attributes"></a>Attributes:</h2>
 <table class="table" style="margin:0;">
   <thead>
   <tr>

scripts/docs/templates/native_menu.template.html

@@ -4,11 +4,7 @@
 <li class="capitalize {% if page.id == 'mocking' %}active{% endif %}">
   <a href="/docs/native/browser.html">Browser Usage</a>
 </li>
-<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
+<@- for doc in docs @><@ if doc.URL and doc.private != true @>
 <li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
-  <a href="/<$ doc.URL $>"><$ doc.name $></a>
-</li><@ endif @><@ endfor @>
-<@- for doc in docs @><@ if doc.URL and doc.private != true and doc.beta == true @>
-<li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
-  <a href="/<$ doc.URL $>"><$ doc.name $> <span class="beta">&beta;</span></a>
+  <a href="/<$ doc.URL $>"><$ doc.name $><@ if doc.paid == true @> <span class="paid">Paid</span><@ endif @><@ if doc.beta == true @> <span class="beta">&beta;</span><@ endif @></a>
 </li><@ endif @><@ endfor @>

scripts/docs/templates/readme.template.md

@@ -1,4 +1,4 @@
-<a style="float:right;font-size:12px;" href="http://github.com/driftyco/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
+<a style="float:right;font-size:12px;" href="http://github.com/ionic-team/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
   Improve this doc
 </a>
 
@@ -16,7 +16,7 @@
 <@ for prop in doc.decorators[0].argumentInfo @>
 
 ```
-$ <@ if prop.install @><$ prop.install $><@ else @>ionic plugin add <$ prop.plugin $><@ endif @>
+$ <@ if prop.install @><$ prop.install $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
 $ npm install --save @ionic-native/<$ doc.npmId $>
 ```
 

scripts/docs/update_docs.sh

@@ -31,11 +31,11 @@ function run {
   if [ $CHANGED -eq 0 ];
   then
     echo "-- No changes detected for the following commit, docs not updated."
-    echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
+    echo "https://github.com/ionic-team/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
   else
     git config --global user.email "hi@ionicframework.com"
     git config --global user.name "Ionitron"
-    git commit -am "Automated build of native docs driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
+    git commit -am "Automated build of native docs ionic-team/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
     # in case a different commit was pushed to ionic-site during doc/demo gen,
     # try to rebase around it before pushing
     git fetch

scripts/docs/update_readmes.sh

@@ -18,12 +18,12 @@ function run {
   if [ -z "$CHANGED" ];
   then
     echo "-- No changes detected for the following commit, docs not updated."
-    echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
+    echo "https://github.com/ionic-team/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
   else
     git config --global user.email "hi@ionicframework.com"
     git config --global user.name "Ionitron"
     git add -A
-    git commit -am "Automated build of native readmes for driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
+    git commit -am "Automated build of native readmes for ionic-team/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
     # in case a different commit was pushed to ionic-site during doc/demo gen,
     # try to rebase around it before pushing
     git fetch

scripts/git/clone.sh

@@ -21,7 +21,7 @@ function run {
   git config --global user.email "hi@ionicframework.com"
   git config --global user.name "Ionitron"
 
-  git clone git@github.com:driftyco/$REPOSITORY.git $DIRECTORY $ARGS
+  git clone git@github.com:ionic-team/$REPOSITORY.git $DIRECTORY $ARGS
   cd $DIRECTORY
   git fetch origin --tags
   cd ../

scripts/git/config.sh

@@ -0,0 +1,2 @@
+git config --global user.email "hi@ionicframework.com"
+git config --global user.name "Ionitron"

scripts/templates/wrap-min.tmpl

@@ -1,30 +1,61 @@
-import { Plugin } from '@ionic-native/core';
+/**
+ * This is a template for new plugin wrappers
+ *
+ * TODO:
+ * - Add/Change information below
+ * - Document usage (importing, executing main functionality)
+ * - Remove any imports that you are not using
+ * - Add this file to /src/index.ts (follow style of other plugins)
+ * - Remove all the comments included in this template, EXCEPT the @Plugin wrapper docs and any other docs you added
+ * - Remove this note
+ *
+ */
 import { Injectable } from '@angular/core';
+import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
 
 /**
- * @name $Plugin_Name
+ * @name {{ Plugin_Name }}
  * @description
+ * This plugin does something
  *
  * @usage
- * ```
- * import { $PluginName } from 'ionic-native';
+ * ```typescript
+ * import { {{ PluginName }} } from '@ionic-native/{{ plugin-name }}';
  *
  *
- * constructor(private $pluginName: $PluginName) { }
+ * constructor(private {{ pluginName }}: {{ PluginName }}) { }
  *
  * ...
  *
  *
+ * this.{{ pluginName }}.functionName('Hello', 123)
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
  * ```
  */
 @Plugin({
-  pluginName: '$PluginName',
-  plugin: '',
-  pluginRef: '',
-  repo: '',
-  platforms: []
+  pluginName: '{{ PluginName }}',
+  plugin: '', // npm package name, example: cordova-plugin-camera
+  pluginRef: '', // the variable reference to call the plugin, example: navigator.geolocation
+  repo: '', // the github repository URL for the plugin
+  install: '', // OPTIONAL install command, in case the plugin requires variables
+  installVariables: [], // OPTIONAL the plugin requires variables
+  platforms: [] // Array of platforms supported, example: ['Android', 'iOS']
 })
 @Injectable()
-export class $PluginName {
+export class {{ PluginName }} extends IonicNativePlugin {
+
+  /**
+   * This function does something
+   * @param arg1 {string} Some param to configure something
+   * @param arg2 {number} Another param to configure something
+   * @return {Promise<any>} Returns a promise that resolves when something happens
+   */
+  @Cordova()
+  functionName(arg1: string, arg2: number): Promise<any> {
+    return; // We add return; here to avoid any IDE / Compiler errors
+  }
 
 }

scripts/templates/wrap.tmpl

@@ -10,41 +10,42 @@
  * - Remove this note
  *
  */
-import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
+import { Plugin, Cordova, CordovaProperty, CordovaInstance, InstanceProperty, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
- * @name $Plugin_Name
+ * @name {{ Plugin_Name }}
  * @description
  * This plugin does something
  *
  * @usage
- * ```
- * import { $PluginName } from 'ionic-native';
+ * ```typescript
+ * import { {{ PluginName }} } from '@ionic-native/{{ plugin-name }}';
  *
  *
- * constructor(private $pluginName: $PluginName) { }
+ * constructor(private {{ pluginName }}: {{ PluginName }}) { }
  *
  * ...
  *
  *
- * this.$pluginName.functionName('Hello', 123)
+ * this.{{ pluginName }}.functionName('Hello', 123)
  *   .then((res: any) => console.log(res))
  *   .catch((error: any) => console.error(error));
  *
  * ```
  */
 @Plugin({
-  pluginName: '$PluginName',
+  pluginName: '{{ PluginName }}',
   plugin: '', // npm package name, example: cordova-plugin-camera
   pluginRef: '', // the variable reference to call the plugin, example: navigator.geolocation
   repo: '', // the github repository URL for the plugin
-  platforms: [], // Array of platforms supported, example: ['Android', 'iOS']
   install: '', // OPTIONAL install command, in case the plugin requires variables
+  installVariables: [], // OPTIONAL the plugin requires variables
+  platforms: [] // Array of platforms supported, example: ['Android', 'iOS']
 })
 @Injectable()
-export class $PluginName {
+export class {{ PluginName }} extends IonicNativePlugin {
 
   /**
    * This function does something

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

@@ -1,5 +1,3 @@
-declare var window;
-
 export function checkReady() {
   const DEVICE_READY_TIMEOUT = 5000;
 
@@ -11,13 +9,17 @@ export function checkReady() {
 
   let didFireReady = false;
   document.addEventListener('deviceready', () => {
-    console.log(`Ionic Native: deviceready event fired after ${(Date.now() - before)} ms`);
+    console.log(
+      `Ionic Native: deviceready event fired after ${Date.now() - before} ms`
+    );
     didFireReady = true;
   });
 
   setTimeout(() => {
-    if (!didFireReady && window.cordova) {
-      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.`);
+    if (!didFireReady && !!window.cordova) {
+      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.`
+      );
     }
   }, DEVICE_READY_TIMEOUT);
 }

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

@@ -0,0 +1,258 @@
+import 'core-js';
+
+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';
+
+declare const window: any;
+
+class TestObject {
+  constructor(public _objectInstance: any) {}
+
+  @InstanceProperty name: string;
+
+  @CordovaInstance({ sync: true })
+  pingSync(): string {
+    return;
+  }
+
+  @CordovaInstance()
+  ping(): Promise<any> {
+    return;
+  }
+}
+
+@Plugin({
+  pluginName: 'TestPlugin',
+  pluginRef: 'testPlugin',
+  repo: '',
+  plugin: 'cordova-plugin-my-plugin',
+  platforms: ['Android', 'iOS']
+})
+class TestPlugin extends IonicNativePlugin {
+  @CordovaProperty name: string;
+
+  @Cordova({ sync: true })
+  pingSync(): string {
+    return;
+  }
+
+  @Cordova()
+  ping(): Promise<string> {
+    return;
+  }
+
+  @CordovaCheck()
+  customPing(): Promise<string> {
+    return Promise.resolve('pong');
+  }
+
+  create(): TestObject {
+    return new TestObject(TestPlugin.getPlugin().create());
+  }
+
+  @Cordova({
+    destruct: true
+  })
+  destructPromise(): Promise<any> {
+    return;
+  }
+
+  @Cordova({
+    destruct: true,
+    observable: true
+  })
+  destructObservable(): Observable<any> {
+    return;
+  }
+}
+
+function definePlugin() {
+  (window as any).testPlugin = {
+    name: 'John Smith',
+    ping: (success: Function, error: Function) => success('pong'),
+    pingSync: () => 'pong',
+    create: function TestObject() {
+      this.pingSync = () => 'pong';
+      this.ping = (success: Function, error: Function) => success('pong');
+      this.name = 'John Smith';
+      return this;
+    },
+    destructPromise: (success: Function) => success('hello', 'world'),
+    destructObservable: (success: Function) => success('hello', 'world')
+  };
+}
+
+describe('Regular Decorators', () => {
+  let plugin: TestPlugin;
+
+  beforeEach(() => {
+    plugin = new TestPlugin();
+    definePlugin();
+  });
+
+  describe('Plugin', () => {
+    it('should set pluginName', () => {
+      expect(TestPlugin.getPluginName()).toEqual('TestPlugin');
+    });
+
+    it('should set pluginRef', () => {
+      expect(TestPlugin.getPluginRef()).toEqual('testPlugin');
+    });
+
+    it('should return original plugin object', () => {
+      expect(TestPlugin.getPlugin()).toEqual(window.testPlugin);
+    });
+
+    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
+        .ping()
+        .then(res => {
+          expect(res).toEqual('pong');
+          done();
+        })
+        .catch(e => {
+          expect(e).toBeUndefined();
+          done('Method should have resolved');
+        });
+    });
+
+    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 => {
+        expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
+        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 => {
+        expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
+        done();
+      });
+    });
+  });
+
+  describe('CordovaProperty', () => {
+    it('should return property value', () => {
+      expect(plugin.name).toEqual('John Smith');
+    });
+
+    it('should set property value', () => {
+      plugin.name = 'value2';
+      expect(plugin.name).toEqual('value2');
+    });
+  });
+
+  describe('CordovaCheck', () => {
+    it('should run the method when plugin exists', done => {
+      plugin.customPing().then(res => {
+        expect(res).toEqual('pong');
+        done();
+      });
+    });
+
+    it('shouldnt run the method when plugin doesnt exist', done => {
+      delete window.testPlugin;
+      window.cordova = true;
+      plugin.customPing().catch(e => {
+        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[]) => {
+          expect(args).toEqual(['hello', 'world']);
+          done();
+        });
+      });
+
+      it('should destruct values returned by an Observable', done => {
+        plugin.destructObservable().subscribe((args: any[]) => {
+          expect(args).toEqual(['hello', 'world']);
+          done();
+        });
+      });
+    });
+  });
+});
+
+describe('Instance Decorators', () => {
+  let instance: TestObject, plugin: TestPlugin;
+
+  beforeEach(() => {
+    definePlugin();
+    plugin = new TestPlugin();
+    instance = plugin.create();
+  });
+
+  describe('Instance plugin', () => {});
+
+  describe('CordovaInstance', () => {
+    it('should call instance async method', done => {
+      instance.ping().then(r => {
+        expect(r).toEqual('pong');
+        done();
+      });
+    });
+
+    it('should call instance sync method', () => {
+      expect(instance.pingSync()).toEqual('pong');
+    });
+
+    it('shouldnt call instance method when _objectInstance is undefined', () => {
+      delete instance._objectInstance;
+      instance
+        .ping()
+        .then(r => {
+          expect(r).toBeUndefined();
+        })
+        .catch(e => {
+          expect(e).toBeUndefined();
+        });
+    });
+  });
+
+  describe('InstanceProperty', () => {
+    it('should return property value', () => {
+      expect(instance.name).toEqual('John Smith');
+    });
+
+    it('should set property value', () => {
+      instance.name = 'John Cena';
+      expect(instance.name).toEqual('John Cena');
+    });
+  });
+});

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

@@ -1,8 +1,16 @@
-import { instanceAvailability, checkAvailability, wrap, wrapInstance, overrideFunction } from './plugin';
-import { getPlugin, getPromise } from './util';
-import { Observable } from 'rxjs/Observable';
 import 'rxjs/observable/throw';
 
+import { Observable } from 'rxjs/Observable';
+
+import {
+  checkAvailability,
+  instanceAvailability,
+  overrideFunction,
+  wrap,
+  wrapInstance
+} from './plugin';
+import { getPlugin, getPromise } from './util';
+
 export interface PluginConfig {
   /**
    * Plugin name, this should match the class name
@@ -32,9 +40,12 @@ export interface PluginConfig {
    * Supported platforms
    */
   platforms?: string[];
+
+  [key: string]: any;
 }
 
 export interface CordovaOptions {
+  destruct?: boolean;
   /**
    * Set to true if the wrapped method is a sync function
    */
@@ -102,28 +113,20 @@ export interface CordovaCheckOptions {
   observable?: boolean;
 }
 
-export interface CordovaFiniteObservableOptions extends CordovaOptions {
-  /**
-   * Function that gets a result returned from plugin's success callback, and decides whether it is last value and observable should complete.
-   */
-  resultFinalPredicate?: (result: any) => boolean;
-  /**
-   * Function that gets called after resultFinalPredicate, and removes service data that indicates end of stream from the result.
-   */
-  resultTransform?: (result: any) => any;
-}
-
 /**
  * @private
  */
 export function InstanceCheck(opts: CordovaCheckOptions = {}) {
-  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
+  return (
+    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) {
@@ -131,9 +134,9 @@ export function InstanceCheck(opts: CordovaCheckOptions = {}) {
           }
 
           return getPromise(() => {});
-
         }
-      }
+      },
+      enumerable: true
     };
   };
 }
@@ -143,7 +146,11 @@ export function InstanceCheck(opts: CordovaCheckOptions = {}) {
  * @private
  */
 export function CordovaCheck(opts: CordovaCheckOptions = {}) {
-  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
+  return (
+    pluginObj: Object,
+    methodName: string,
+    descriptor: TypedPropertyDescriptor<any>
+  ): TypedPropertyDescriptor<any> => {
     return {
       value: function(...args: any[]): any {
         const check = checkAvailability(pluginObj);
@@ -157,12 +164,12 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) {
           }
           return Promise.reject(check && check.error);
         }
-      }
+      },
+      enumerable: true
     };
   };
 }
 
-
 /**
  * @private
  *
@@ -182,12 +189,11 @@ export function CordovaCheck(opts: CordovaCheckOptions = {}) {
  *  }
  * ```
  */
-export function Plugin(config: PluginConfig) {
-  return function(cls) {
-
+export function Plugin(config: PluginConfig): ClassDecorator {
+  return function(cls: any) {
     // Add these fields to the class
-    for (let k in config) {
-      cls[k] = config[k];
+    for (let prop in config) {
+      cls[prop] = config[prop];
     }
 
     cls['installed'] = function(printWarning?: boolean) {
@@ -233,11 +239,16 @@ export function Plugin(config: PluginConfig) {
  * and the required plugin are installed.
  */
 export function Cordova(opts: CordovaOptions = {}) {
-  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
+  return (
+    target: Object,
+    methodName: string,
+    descriptor: TypedPropertyDescriptor<any>
+  ) => {
     return {
       value: function(...args: any[]) {
         return wrap(this, methodName, opts).apply(this, args);
-      }
+      },
+      enumerable: true
     };
   };
 }
@@ -247,12 +258,13 @@ export function Cordova(opts: CordovaOptions = {}) {
  *
  * Wrap an instance method
  */
-export function CordovaInstance(opts: any = {}) {
+export function CordovaInstance(opts: CordovaOptions = {}) {
   return (target: Object, methodName: string) => {
     return {
       value: function(...args: any[]) {
         return wrapInstance(this, methodName, opts).apply(this, args);
-      }
+      },
+      enumerable: true
     };
   };
 }
@@ -273,7 +285,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;
       }
@@ -290,10 +302,10 @@ export function CordovaProperty(target: any, key: string) {
 export function InstanceProperty(target: any, key: string) {
   Object.defineProperty(target, key, {
     enumerable: true,
-    get: function(){
+    get: function() {
       return this._objectInstance[key];
     },
-    set: function(value){
+    set: function(value) {
       this._objectInstance[key] = value;
     }
   });
@@ -306,47 +318,16 @@ export function InstanceProperty(target: any, key: string) {
  * and the required plugin are installed.
  */
 export function CordovaFunctionOverride(opts: any = {}) {
-  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
+  return (
+    target: Object,
+    methodName: string,
+    descriptor: TypedPropertyDescriptor<any>
+  ) => {
     return {
       value: function(...args: any[]) {
         return overrideFunction(this, methodName, opts);
-      }
-    };
-  };
-}
-
-
-/**
- * @private
- *
- * Wraps method that returns an observable that can be completed. Provided opts.resultFinalPredicate dictates when the observable completes.
- *
- */
-export function CordovaFiniteObservable(opts: CordovaFiniteObservableOptions = {}) {
-  if (opts.observable === false) {
-    throw new Error('CordovaFiniteObservable decorator can only be used on methods that returns observable. Please provide correct option.');
-  }
-  opts.observable = true;
-  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
-    return {
-      value: function(...args: any[]) {
-        let wrappedObservable: Observable<any> = wrap(this, methodName, opts).apply(this, args);
-        return new Observable<any>((observer) => {
-          let wrappedSubscription = wrappedObservable.subscribe({
-            next: (x) => {
-              observer.next(opts.resultTransform ? opts.resultTransform(x) : x);
-              if (opts.resultFinalPredicate && opts.resultFinalPredicate(x)) {
-                observer.complete();
-              }
-            },
-            error: (err) => { observer.error(err); },
-            complete: () => { observer.complete(); }
-          });
-          return () => {
-            wrappedSubscription.unsubscribe();
-          };
-        });
-      }
+      },
+      enumerable: true
     };
   };
 }

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

@@ -1,3 +1,4 @@
 export * from './plugin';
 export * from './decorators';
 export * from './util';
+export * from './ionic-native-plugin';

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

@@ -0,0 +1,74 @@
+// This is to verify that new (FileTransfer.getPlugin)() works
+import { CordovaInstance, Plugin } from './decorators';
+import { IonicNativePlugin } from './ionic-native-plugin';
+import { checkAvailability } from './plugin';
+
+class FT {
+  hello(): string {
+    return 'world';
+  }
+}
+
+(window as any).FileTransfer = () => new FT();
+
+@Plugin({
+  plugin: 'cordova-plugin-file-transfer',
+  pluginRef: 'FileTransfer',
+  repo: '',
+  pluginName: 'FileTransfer'
+})
+export class FileTransfer extends IonicNativePlugin {
+  create(): FileTransferObject {
+    let instance: any;
+    if (
+      checkAvailability(
+        FileTransfer.getPluginRef(),
+        null,
+        FileTransfer.getPluginName()
+      ) === true
+    ) {
+      instance = new (FileTransfer.getPlugin())();
+    }
+    return new FileTransferObject(instance);
+  }
+}
+
+export class FileTransferObject {
+  constructor(public _objectInstance: any) {
+    console.info(
+      'Creating a new FileTransferObject with instance: ',
+      _objectInstance
+    );
+  }
+
+  @CordovaInstance({ sync: true })
+  hello(): string {
+    return;
+  }
+}
+
+describe('Mock FileTransfer Plugin', () => {
+  let plugin: FileTransfer, instance: FileTransferObject;
+
+  beforeAll(() => {
+    plugin = new FileTransfer();
+    instance = plugin.create();
+  });
+
+  it('should create a new FileTransfer plugin instance', () => {
+    expect(plugin instanceof FileTransfer).toBeTruthy();
+  });
+
+  it('should create new FileTransferObject instance', () => {
+    expect(instance instanceof FileTransferObject).toBeTruthy();
+  });
+
+  it('FileTransferObject instance should have _objectInstance property', () => {
+    expect(instance._objectInstance).toBeDefined();
+  });
+
+  it('FileTransferObject.hello should return world', () => {
+    console.info('instance hello is', instance.hello());
+    expect(instance.hello()).toEqual('world');
+  });
+});

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

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

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

@@ -1,25 +1,39 @@
-import { get, getPlugin, getPromise, cordovaWarn, pluginWarn } from './util';
-import { checkReady } from './bootstrap';
-import { CordovaOptions } from './decorators';
+import 'rxjs/add/observable/fromEvent';
 
 import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/fromEvent';
+
+import { checkReady } from './bootstrap';
+import { CordovaOptions } from './decorators';
+import { cordovaWarn, getPlugin, getPromise, pluginWarn } from './util';
 
 checkReady();
 
-declare var window;
-declare var Promise;
+// declare const window;
+// declare var Promise;
 
+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(pluginRef: string, methodName?: string, pluginName?: string);
-export function checkAvailability(pluginObj: any, methodName?: string, pluginName?: string);
-export function checkAvailability(plugin: any, methodName?: string, pluginName?: string): boolean | { error: string } {
-
+export function checkAvailability(
+  pluginRef: string,
+  methodName?: 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') {
@@ -32,18 +46,17 @@ export function checkAvailability(plugin: any, methodName?: string, pluginName?:
 
   pluginInstance = getPlugin(pluginRef);
 
-  if (!pluginInstance || (!!methodName && pluginInstance[methodName] === 'undefined')) {
+  if (
+    !pluginInstance ||
+    (!!methodName && typeof pluginInstance[methodName] === 'undefined')
+  ) {
     if (!window.cordova) {
       cordovaWarn(pluginName, methodName);
-      return {
-        error: 'cordova_not_available'
-      };
+      return ERR_CORDOVA_NOT_AVAILABLE;
     }
 
     pluginWarn(pluginName, pluginPackage, methodName);
-    return {
-      error: 'plugin_not_installed'
-    };
+    return ERR_PLUGIN_NOT_INSTALLED;
   }
 
   return true;
@@ -53,11 +66,23 @@ export function checkAvailability(plugin: any, methodName?: string, pluginName?:
  * Checks if _objectInstance exists and has the method/property
  * @private
  */
-export function instanceAvailability(pluginObj: any, methodName?: string): boolean {
-  return pluginObj._objectInstance && (!methodName || pluginObj._objectInstance[methodName] !== 'undefined');
+export function instanceAvailability(
+  pluginObj: any,
+  methodName?: string
+): boolean {
+  return (
+    pluginObj._objectInstance &&
+    (!methodName ||
+      typeof pluginObj._objectInstance[methodName] !== 'undefined')
+  );
 }
 
-function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Function): any {
+function setIndex(
+  args: any[],
+  opts: any = {},
+  resolve?: Function,
+  reject?: Function
+): any {
   // ignore resolve and reject in case sync
   if (opts.sync) {
     return args;
@@ -69,19 +94,26 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
     args.unshift(reject);
     args.unshift(resolve);
   } else if (opts.callbackStyle === 'node') {
-    args.push((err, result) => {
+    args.push((err: any, result: any) => {
       if (err) {
         reject(err);
       } else {
         resolve(result);
       }
     });
-  } else if (opts.callbackStyle === 'object' && opts.successName && opts.errorName) {
+  } else if (
+    opts.callbackStyle === 'object' &&
+    opts.successName &&
+    opts.errorName
+  ) {
     let obj: any = {};
     obj[opts.successName] = resolve;
     obj[opts.errorName] = reject;
     args.push(obj);
-  } else if (typeof opts.successIndex !== 'undefined' || typeof opts.errorIndex !== 'undefined') {
+  } else if (
+    typeof opts.successIndex !== 'undefined' ||
+    typeof opts.errorIndex !== 'undefined'
+  ) {
     const setSuccessIndex = () => {
       // If we've specified a success/error index
       if (opts.successIndex > args.length) {
@@ -107,8 +139,6 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
       setSuccessIndex();
       setErrorIndex();
     }
-
-
   } else {
     // Otherwise, let's tack them on to the end of the argument list
     // which is 90% of cases
@@ -118,7 +148,14 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
   return args;
 }
 
-function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts: any = {}, resolve?: Function, reject?: Function) {
+function callCordovaPlugin(
+  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);
@@ -131,27 +168,54 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts
   } else {
     return availabilityCheck;
   }
-
 }
 
-function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
-  let pluginResult, rej;
-  const p = getPromise((resolve, reject) => {
-    pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
+function wrapPromise(
+  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(
+        pluginObj,
+        methodName,
+        args,
+        opts,
+        (...args: any[]) => resolve(args),
+        (...args: any[]) => reject(args)
+      );
+    } else {
+      pluginResult = callCordovaPlugin(
+        pluginObj,
+        methodName,
+        args,
+        opts,
+        resolve,
+        reject
+      );
+    }
     rej = reject;
   });
   // Angular throws an error on unhandled rejection, but in this case we have already printed
   // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
   // to error
   if (pluginResult && pluginResult.error) {
-    p.catch(() => { });
-    rej(pluginResult.error);
+    p.catch(() => {});
+    typeof rej === 'function' && rej(pluginResult.error);
   }
   return p;
 }
 
-function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any= {}) {
-  return getPromise((resolve, reject) => {
+function wrapOtherPromise(
+  pluginObj: any,
+  methodName: string,
+  args: any[],
+  opts: any = {}
+) {
+  return getPromise((resolve: Function, reject: Function) => {
     const pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
     if (pluginResult) {
       if (pluginResult.error) {
@@ -165,9 +229,35 @@ function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts:
   });
 }
 
-function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
+function wrapObservable(
+  pluginObj: any,
+  methodName: string,
+  args: any[],
+  opts: any = {}
+) {
   return new Observable(observer => {
-    let pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+    let pluginResult;
+
+    if (opts.destruct) {
+      pluginResult = callCordovaPlugin(
+        pluginObj,
+        methodName,
+        args,
+        opts,
+        (...args: any[]) => observer.next(args),
+        (...args: any[]) => observer.error(args)
+      );
+    } else {
+      pluginResult = callCordovaPlugin(
+        pluginObj,
+        methodName,
+        args,
+        opts,
+        observer.next.bind(observer),
+        observer.error.bind(observer)
+      );
+    }
+
     if (pluginResult && pluginResult.error) {
       observer.error(pluginResult.error);
       observer.complete();
@@ -176,26 +266,45 @@ function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: a
       try {
         if (opts.clearFunction) {
           if (opts.clearWithArgs) {
-            return callCordovaPlugin(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+            return callCordovaPlugin(
+              pluginObj,
+              opts.clearFunction,
+              args,
+              opts,
+              observer.next.bind(observer),
+              observer.error.bind(observer)
+            );
           }
-          return get(window, pluginObj.constructor.getPluginRef())[opts.clearFunction].call(pluginObj, pluginResult);
+          return callCordovaPlugin(pluginObj, opts.clearFunction, []);
         }
       } catch (e) {
-        console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-        console.error(e);
+        console.warn(
+          'Unable to clear the previous observable watch for',
+          pluginObj.constructor.getPluginName(),
+          methodName
+        );
+        console.warn(e);
       }
     };
   });
 }
 
-function callInstance(pluginObj: any, methodName: string, args: any[], opts: any = {}, resolve?: Function, reject?: Function) {
-
+function callInstance(
+  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(pluginObj._objectInstance, args);
+    return pluginObj._objectInstance[methodName].apply(
+      pluginObj._objectInstance,
+      args
+    );
   }
-
 }
 
 /**
@@ -205,7 +314,10 @@ function callInstance(pluginObj: any, methodName: string, args: any[], opts: any
  * @param element The element to attach the event listener to
  * @returns {Observable}
  */
-export function wrapEventObservable(event: string, element: any = window): Observable<any> {
+export function wrapEventObservable(
+  event: string,
+  element: any = window
+): Observable<any> {
   return Observable.fromEvent(element, event);
 }
 
@@ -217,29 +329,39 @@ export function wrapEventObservable(event: string, element: any = window): Obser
  * does just this.
  * @private
  */
-export function overrideFunction(pluginObj: any, methodName: string, args: any[], opts: any = {}): Observable<any> {
+export function overrideFunction(
+  pluginObj: any,
+  methodName: string,
+  args: any[],
+  opts: any = {}
+): Observable<any> {
   return new Observable(observer => {
-
-    const availabilityCheck = checkAvailability(pluginObj, methodName);
+    const availabilityCheck = checkAvailability(
+      pluginObj,
+      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(pluginObj: any, methodName: string, opts: CordovaOptions = {}) {
-  return (...args) => {
+export const wrap = function(
+  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
       return callCordovaPlugin(pluginObj, methodName, args, opts);
@@ -258,16 +380,37 @@ export const wrap = function(pluginObj: any, methodName: string, opts: CordovaOp
 /**
  * @private
  */
-export function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
-  return (...args) => {
+export function wrapInstance(
+  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 = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+        let pluginResult;
+
+        if (opts.destruct) {
+          pluginResult = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            (...args: any[]) => observer.next(args),
+            (...args: any[]) => observer.error(args)
+          );
+        } else {
+          pluginResult = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            observer.next.bind(observer),
+            observer.error.bind(observer)
+          );
+        }
 
         if (pluginResult && pluginResult.error) {
           observer.error(pluginResult.error);
@@ -277,38 +420,86 @@ export function wrapInstance(pluginObj: any, methodName: string, opts: any = {})
         return () => {
           try {
             if (opts.clearWithArgs) {
-              return pluginObj._objectInstance[opts.clearFunction].apply(pluginObj._objectInstance, args);
+              return callInstance(
+                pluginObj,
+                opts.clearFunction,
+                args,
+                opts,
+                observer.next.bind(observer),
+                observer.error.bind(observer)
+              );
             }
-            return pluginObj._objectInstance[opts.clearFunction].call(pluginObj, pluginResult);
+            return callInstance(pluginObj, opts.clearFunction, []);
           } catch (e) {
-            console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-            console.error(e);
+            console.warn(
+              'Unable to clear the previous observable watch for',
+              pluginObj.constructor.getPluginName(),
+              methodName
+            );
+            console.warn(e);
           }
         };
       });
-
     } else if (opts.otherPromise) {
-
-      return getPromise((resolve, reject) => {
-        let result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
-        if (result && !result.error) {
+      return getPromise((resolve: Function, reject: Function) => {
+        let result;
+        if (opts.destruct) {
+          result = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            (...args: any[]) => resolve(args),
+            (...args: any[]) => reject(args)
+          );
+        } else {
+          result = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            resolve,
+            reject
+          );
+        }
+        if (result && !!result.then) {
           result.then(resolve, reject);
+        } else {
+          reject();
         }
       });
-
     } else {
-
-      let pluginResult, rej;
-      const p = getPromise((resolve, reject) => {
-        pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+      let pluginResult: any, rej: Function;
+      const p = getPromise((resolve: Function, reject: Function) => {
+        if (opts.destruct) {
+          pluginResult = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            (...args: any[]) => resolve(args),
+            (...args: any[]) => reject(args)
+          );
+        } else {
+          pluginResult = callInstance(
+            pluginObj,
+            methodName,
+            args,
+            opts,
+            resolve,
+            reject
+          );
+        }
         rej = reject;
       });
+      // Angular throws an error on unhandled rejection, but in this case we have already printed
+      // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
+      // to error
       if (pluginResult && pluginResult.error) {
-        p.catch(() => { });
-        rej(pluginResult.error);
+        p.catch(() => {});
+        typeof rej === 'function' && rej(pluginResult.error);
       }
       return p;
-
     }
   };
 }

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

@@ -1,56 +1,75 @@
-declare var window: any;
+declare const window: any;
 
 /**
  * @private
  */
-export function get(obj, path) {
-  path = path.split('.');
-  for (let i = 0; i < path.length; i++) {
-    if (!obj) { return null; }
-    obj = obj[path[i]];
+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) {
+      return null;
+    }
+    obj = obj[paths[i]];
   }
   return obj;
-}
-
+};
 
 /**
  * @private
  */
-export function getPromise(cb) {
-
+export const getPromise = (callback: Function): Promise<any> => {
   const tryNativePromise = () => {
     if (window.Promise) {
       return new Promise((resolve, reject) => {
-        cb(resolve, reject);
+        callback(resolve, reject);
       });
     } else {
-      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 2 or on a recent browser.');
+      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.'
+      );
     }
   };
 
   return tryNativePromise();
-}
+};
 
 /**
  * @private
  * @param pluginRef
  * @returns {null|*}
  */
-export function getPlugin(pluginRef: string): any {
+export const getPlugin = (pluginRef: string): any => {
   return get(window, pluginRef);
 };
 
 /**
  * @private
  */
-export const pluginWarn = function(pluginName: string, plugin?: string, method?: string) {
+export const pluginWarn = (
+  pluginName: string,
+  plugin?: string,
+  method?: string
+): void => {
   if (method) {
-    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
+    console.warn(
+      'Native: tried calling ' +
+        pluginName +
+        '.' +
+        method +
+        ', but the ' +
+        pluginName +
+        ' plugin is not installed.'
+    );
   } else {
-    console.warn('Native: tried accessing the ' + pluginName + ' plugin but it\'s not installed.');
+    console.warn(
+      `'Native: tried accessing the ${pluginName} plugin but it's not installed.`
+    );
   }
   if (plugin) {
-    console.warn('Install the ' + pluginName + ' plugin: \'ionic plugin add ' + plugin + '\'');
+    console.warn(
+      `Install the ${pluginName}  plugin: 'ionic cordova plugin add ${plugin}'`
+    );
   }
 };
 
@@ -59,10 +78,20 @@ export const pluginWarn = function(pluginName: string, plugin?: string, method?:
  * @param pluginName
  * @param method
  */
-export const cordovaWarn = function(pluginName: string, method?: string) {
+export const cordovaWarn = (pluginName: string, method?: string): void => {
   if (method) {
-    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
+    console.warn(
+      '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('Native: tried accessing the ' + pluginName + ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
+    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'
+    );
   }
 };

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

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, CordovaProperty } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface ActionSheetOptions {
-
   /**
    * The labels for the buttons. Uses the index x
    */
@@ -13,10 +12,15 @@ export interface ActionSheetOptions {
    */
   title?: string;
 
+  /**
+   * The subtitle for the actionsheet (IOS only)
+   */
+  subtitle?: string;
+
   /**
    * Theme to be used on Android
    */
-  androidTheme?: number;
+  androidTheme?: 1 | 2 | 3 | 4 | 5;
 
   /**
    * Enable a cancel on Android
@@ -41,8 +45,12 @@ export interface ActionSheetOptions {
   /**
    * On an iPad, set the X,Y position
    */
-  position?: number[];
+  position?: [number, number];
 
+  /**
+   * Choose if destructive button will be the last
+   */
+  destructiveButtonLast?: boolean;
 }
 
 /**
@@ -65,10 +73,12 @@ export interface ActionSheetOptions {
  *
  * const options: ActionSheetOptions = {
  *   title: 'What do you want with this image?',
+ *   subtitle: 'Choose an action',
  *   buttonLabels: buttonLabels,
  *   addCancelButtonWithLabel: 'Cancel',
  *   addDestructiveButtonWithLabel: 'Delete',
- *   androidTheme: this.actionSheet.ANDROID_THEMES.THEME_HOLO_DARK
+ *   androidTheme: this.actionSheet.ANDROID_THEMES.THEME_HOLO_DARK,
+ *   destructiveButtonLast: true
  * };
  *
  * this.actionSheet.show(options).then((buttonIndex: number) => {
@@ -83,34 +93,45 @@ export interface ActionSheetOptions {
   plugin: 'cordova-plugin-actionsheet',
   pluginRef: 'plugins.actionsheet',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-actionsheet',
-  platforms: ['Android', 'iOS', 'Windows Phone 8']
+  platforms: ['Android', 'Browser', 'iOS', 'Windows', 'Windows Phone 8']
 })
 @Injectable()
-export class ActionSheet {
-
-  @CordovaProperty
+export class ActionSheet extends IonicNativePlugin {
+  /**
+   * Convenience property to select an Android theme value
+   */
   ANDROID_THEMES: {
     THEME_TRADITIONAL: number;
     THEME_HOLO_DARK: number;
     THEME_HOLO_LIGHT: number;
     THEME_DEVICE_DEFAULT_DARK: number;
     THEME_DEVICE_DEFAULT_LIGHT: number;
+  } = {
+    THEME_TRADITIONAL: 1,
+    THEME_HOLO_DARK: 2,
+    THEME_HOLO_LIGHT: 3,
+    THEME_DEVICE_DEFAULT_DARK: 4,
+    THEME_DEVICE_DEFAULT_LIGHT: 5
   };
 
   /**
    * Show a native ActionSheet component. See below for options.
-   * @param options {ActionSheetOptions} Options See table below
+   * @param {ActionSheetOptions} [options] Options See table below
    * @returns {Promise<any>} Returns a Promise that resolves with the index of the
    *   button pressed (1 based, so 1, 2, 3, etc.)
    */
   @Cordova()
-  show(options?: ActionSheetOptions): Promise<any> { return; }
-
+  show(options?: ActionSheetOptions): Promise<number> {
+    return;
+  }
 
   /**
-   * Progamtically hide the native ActionSheet
+   * Programmatically hide the native ActionSheet
+   * @param  {ActionSheetOptions} [options] Options See table below
    * @returns {Promise<any>} Returns a Promise that resolves when the actionsheet is closed
    */
   @Cordova()
-  hide(options?: any): Promise<any> { return; }
+  hide(options?: ActionSheetOptions): Promise<any> {
+    return;
+  }
 }

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

@@ -1,8 +1,9 @@
-import { Plugin, Cordova } from '@ionic-native/core';
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';
 
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
+
 export interface AdMobFreeBannerConfig {
   /**
    * Ad Unit ID
@@ -65,11 +66,11 @@ export interface AdMobFreeRewardVideoConfig {
 }
 
 /**
- * @name AdbMobFree
+ * @name AdMob Free
  * @description
  *
  * @usage
- * ```
+ * ```typescript
  * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
  *
  *
@@ -96,6 +97,14 @@ export interface AdMobFreeRewardVideoConfig {
  *
  *
  * ```
+ * @interfaces
+ * AdMobFreeBannerConfig
+ * AdMobFreeInterstitialConfig
+ * AdMobFreeRewardVideoConfig
+ * @classes
+ * AdMobFreeBanner
+ * AdMobFreeInterstitial
+ * AdMobFreeRewardVideo
  */
 @Plugin({
   pluginName: 'AdMobFree',
@@ -105,10 +114,10 @@ export interface AdMobFreeRewardVideoConfig {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class AdMobFree {
-
+export class AdMobFree extends IonicNativePlugin {
   /**
-   * Convenience constructor to get event names
+   * Convenience object to get event names
+   * @type {Object}
    */
   events = {
     BANNER_LOAD: 'admob.banner.events.LOAD',
@@ -142,23 +151,22 @@ export class AdMobFree {
   }
 
   /**
-   *
+   * Returns the AdMobFreeBanner object
    * @type {AdMobFreeBanner}
    */
   banner: AdMobFreeBanner = new AdMobFreeBanner();
 
   /**
-   *
+   * Returns the AdMobFreeInterstitial object
    * @type {AdMobFreeInterstitial}
    */
   interstitial: AdMobFreeInterstitial = new AdMobFreeInterstitial();
 
   /**
-   *
+   * Returns the AdMobFreeRewardVideo object
    * @type {AdMobFreeRewardVideo}
    */
   rewardVideo: AdMobFreeRewardVideo = new AdMobFreeRewardVideo();
-
 }
 
 /**
@@ -167,48 +175,54 @@ export class AdMobFree {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.banner',
+  pluginRef: 'admob.banner'
 })
 export class AdMobFreeBanner {
-
-
-
   /**
-   * Update config.
+   * Update config
    * @param options
    * @return {AdMobFreeBannerConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig { return; }
+  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig {
+    return;
+  }
 
   /**
-   * Hide the banner.
+   * Hide the banner
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  hide(): Promise<any> { return; }
+  @Cordova({ otherPromise: true })
+  hide(): Promise<any> {
+    return;
+  }
 
   /**
-   * Create banner.
+   * Create banner
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  prepare(): Promise<any> { return; }
+  @Cordova({ otherPromise: true })
+  prepare(): Promise<any> {
+    return;
+  }
 
   /**
-   * Remove the banner.
+   * Remove the banner
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  remove(): Promise<any> { return; }
+  @Cordova({ otherPromise: true })
+  remove(): Promise<any> {
+    return;
+  }
 
   /**
-   * Show the banner.
+   * Show the banner
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  show(): Promise<any> { return; }
-
+  @Cordova({ otherPromise: true })
+  show(): Promise<any> {
+    return;
+  }
 }
 
 /**
@@ -217,39 +231,45 @@ export class AdMobFreeBanner {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.interstitial',
+  pluginRef: 'admob.interstitial'
 })
 export class AdMobFreeInterstitial {
-
   /**
-   * Update config.
+   * Update config
    * @param options
    * @return {AdMobFreeInterstitialConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig { return; }
+  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig {
+    return;
+  }
 
   /**
    * Check if interstitial is ready
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  isReady(): Promise<any> { return; }
+  @Cordova({ otherPromise: true })
+  isReady(): Promise<any> {
+    return;
+  }
 
   /**
    * Prepare interstitial
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  prepare(): Promise<any> { return; }
+  @Cordova({ otherPromise: true })
+  prepare(): Promise<any> {
+    return;
+  }
 
   /**
    * Show the interstitial
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  show(): Promise<any> { return; }
-
+  @Cordova({ otherPromise: true })
+  show(): Promise<any> {
+    return;
+  }
 }
 
 /**
@@ -258,37 +278,43 @@ export class AdMobFreeInterstitial {
 @Plugin({
   pluginName: 'AdMobFree',
   plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.rewardvideo',
+  pluginRef: 'admob.rewardvideo'
 })
 export class AdMobFreeRewardVideo {
-
   /**
-   * Update config.
-   * @param options
+   * Update config
+   * @param {AdMobFreeRewardVideoConfig} options Admob reward config
    * @return {AdMobFreeRewardVideoConfig}
    */
   @Cordova({ sync: true })
-  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig { return; }
+  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig {
+    return;
+  }
 
   /**
    * Check if reward video is ready
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  isReady(): Promise<any> { return; }
+  @Cordova({ otherPromise: true })
+  isReady(): Promise<any> {
+    return;
+  }
 
   /**
    * Prepare reward video
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  prepare(): Promise<any> { return; }
+  @Cordova({ otherPromise: true })
+  prepare(): Promise<any> {
+    return;
+  }
 
   /**
    * Show the reward video
    * @return {Promise<any>}
    */
-  @Cordova({ sync: true })
-  show(): Promise<any> { return; }
-
+  @Cordova({ otherPromise: true })
+  show(): Promise<any> {
+    return;
+  }
 }

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

@@ -1,11 +1,17 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
-export type AdSize = 'SMART_BANNER' | 'BANNER' | 'MEDIUM_RECTANGLE' | 'FULL_BANNER' | 'LEADERBOARD' | 'SKYSCRAPER' | 'CUSTOM';
+export type AdSize =
+  | 'SMART_BANNER'
+  | 'BANNER'
+  | 'MEDIUM_RECTANGLE'
+  | 'FULL_BANNER'
+  | 'LEADERBOARD'
+  | 'SKYSCRAPER'
+  | 'CUSTOM';
 
 export interface AdMobOptions {
-
   /**
    * Banner ad ID
    */
@@ -32,7 +38,7 @@ export interface AdMobOptions {
   overlap?: boolean;
 
   /**
-   * Position of banner ad. Defaults to `TOP_CENTER`. You can use the `AdMob.AD_POSITION` property to select other values.
+   * Position of banner ad. Defaults to `TOP_CENTER`. You can use the `AdMobPro.AD_POSITION` property to select other values.
    */
   position?: number;
 
@@ -71,10 +77,13 @@ export interface AdMobOptions {
    */
   license?: any;
 
+  /**
+   * Set offset
+   */
+  offsetTopBar?: boolean;
 }
 
 export interface AdExtras {
-
   color_bg: string;
 
   color_bg_top: string;
@@ -86,18 +95,21 @@ export interface AdExtras {
   color_text: string;
 
   color_url: string;
-
 }
 
 /**
- * @name AdMob
+ * @paid
+ * @name AdMob Pro
  * @description
- * Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
+ * Plugin for Google Ads, including AdMob / DFP (DoubleClick for publisher) and mediations to other Ad networks.
+ *
+ * IMPORTANT NOTICE: this plugin takes a percentage out of your earnings if you profit more than $1,000. Read more about this on the plugin's repo. For a completely free alternative, see [AdMobPro Free](../admob-free).
  * @usage
  * ```typescript
- * import { AdMob, AdMobOptions, AdSize, AdExtras } from '@ionic-native/ad-mob';
+ * import { AdMobPro } from '@ionic-native/admob-pro';
+ * import { Platform } from 'ionic-angular';
  *
- * constructor(private admob: AdMob){}
+ * constructor(private admob: AdMobPro, private platform: Platform ) { }
  *
  * ionViewDidLoad() {
  *   this.admob.onAdDismiss()
@@ -105,7 +117,13 @@ export interface AdExtras {
  * }
  *
  * onClick() {
- *   this.admob.prepareInterstitial('YOUR_ADID')
+ *   let adId;
+ *   if(this.platform.is('android')) {
+ *     adId = 'YOUR_ADID_ANDROID';
+ *   } else if (this.platform.is('ios')) {
+ *     adId = 'YOUR_ADID_IOS';
+ *   }
+ *   this.admob.prepareInterstitial({adId: adId})
  *     .then(() => { this.admob.showInterstitial(); });
  * }
  *
@@ -116,15 +134,14 @@ export interface AdExtras {
  * AdExtras
  */
 @Plugin({
-  pluginName: 'AdMob',
+  pluginName: 'AdMob Pro',
   plugin: 'cordova-plugin-admobpro',
   pluginRef: 'AdMob',
   repo: 'https://github.com/floatinghotpot/cordova-admob-pro',
   platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class AdMob {
-
+export class AdMobPro extends IonicNativePlugin {
   AD_POSITION: {
     NO_CHANGE: number;
     TOP_LEFT: number;
@@ -153,11 +170,13 @@ export class AdMob {
 
   /**
    * Create a banner
-   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
+   * @param {string | AdMobOptions} adIdOrOptions Ad ID or Options
    * @returns {Promise<any>} Returns a Promise that resolves when the banner is created
    */
   @Cordova()
-  createBanner(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
+  createBanner(adIdOrOptions: string | AdMobOptions): Promise<any> {
+    return;
+  }
 
   /**
    * Destroy the banner, remove it from screen.
@@ -165,26 +184,26 @@ export class AdMob {
   @Cordova({
     sync: true
   })
-  removeBanner(): void { }
+  removeBanner(): void {}
 
   /**
    * Show banner at position
-   * @param position {number} Position. Use `AdMob.AD_POSITION` to set values.
+   * @param {number} position Position. Use `AdMobPro.AD_POSITION` to set values.
    */
   @Cordova({
     sync: true
   })
-  showBanner(position: number): void { }
+  showBanner(position: number): void {}
 
   /**
    * Show banner at custom position
-   * @param x {number} Offset from screen left.
-   * @param y {number} Offset from screen top.
+   * @param {number} x Offset from screen left.
+   * @param {number} y Offset from screen top.
    */
   @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
@@ -192,15 +211,17 @@ export class AdMob {
   @Cordova({
     sync: true
   })
-  hideBanner(): void { }
+  hideBanner(): void {}
 
   /**
    * Prepare interstitial banner
-   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
+   * @param {string | AdMobOptions} adIdOrOptions Ad ID or Options
    * @returns {Promise<any>} Returns a Promise that resolves when interstitial is prepared
    */
   @Cordova()
-  prepareInterstitial(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
+  prepareInterstitial(adIdOrOptions: string | AdMobOptions): Promise<any> {
+    return;
+  }
 
   /**
    * Show interstitial ad when it's ready
@@ -208,15 +229,17 @@ export class AdMob {
   @Cordova({
     sync: true
   })
-  showInterstitial(): void { }
+  showInterstitial(): void {}
 
   /**
    * Prepare a reward video ad
-   * @param adIdOrOptions {string | AdMobOptions} Ad ID or Options
+   * @param {string | AdMobOptions} adIdOrOptions Ad ID or Options
    * @returns {Promise<any>} Returns a Promise that resolves when the ad is prepared
    */
   @Cordova()
-  prepareRewardVideoAd(adIdOrOptions: string | AdMobOptions): Promise<any> { return; }
+  prepareRewardVideoAd(adIdOrOptions: string | AdMobOptions): Promise<any> {
+    return;
+  }
 
   /**
    * Show a reward video ad
@@ -224,22 +247,26 @@ export class AdMob {
   @Cordova({
     sync: true
   })
-  showRewardVideoAd(): void { }
+  showRewardVideoAd(): void {}
 
   /**
    * Sets the values for configuration and targeting
-   * @param options {AdMobOptions} Options
+   * @param {AdMobOptions} options Options
    * @returns {Promise<any>} Returns a Promise that resolves when the options have been set
    */
   @Cordova()
-  setOptions(options: AdMobOptions): Promise<any> { return; }
+  setOptions(options: AdMobOptions): Promise<any> {
+    return;
+  }
 
   /**
    * Get user ad settings
    * @returns {Promise<any>} Returns a promise that resolves with the ad settings
    */
   @Cordova()
-  getAdSettings(): Promise<any> { return; }
+  getAdSettings(): Promise<any> {
+    return;
+  }
 
   /**
    * Triggered when failed to receive Ad
@@ -250,7 +277,9 @@ export class AdMob {
     event: 'onAdFailLoad',
     element: document
   })
-  onAdFailLoad(): Observable<any> { return; }
+  onAdFailLoad(): Observable<any> {
+    return;
+  }
 
   /**
    * Triggered when Ad received
@@ -261,7 +290,9 @@ export class AdMob {
     event: 'onAdLoaded',
     element: document
   })
-  onAdLoaded(): Observable<any> { return; }
+  onAdLoaded(): Observable<any> {
+    return;
+  }
 
   /**
    * Triggered when Ad will be showed on screen
@@ -272,7 +303,9 @@ export class AdMob {
     event: 'onAdPresent',
     element: document
   })
-  onAdPresent(): Observable<any> { return; }
+  onAdPresent(): Observable<any> {
+    return;
+  }
 
   /**
    * Triggered when user click the Ad, and will jump out of your App
@@ -283,7 +316,9 @@ export class AdMob {
     event: 'onAdLeaveApp',
     element: document
   })
-  onAdLeaveApp(): Observable<any> { return; }
+  onAdLeaveApp(): Observable<any> {
+    return;
+  }
 
   /**
    * Triggered when dismiss the Ad and back to your App
@@ -294,6 +329,7 @@ export class AdMob {
     event: 'onAdDismiss',
     element: document
   })
-  onAdDismiss(): Observable<any> { return; }
-
+  onAdDismiss(): Observable<any> {
+    return;
+  }
 }

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

@@ -1,5 +1,5 @@
-import { Plugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface AlipayOrder {
   /**
@@ -67,7 +67,7 @@ export interface AlipayOrder {
  * Requires Cordova plugin: `cordova-alipay-base`. For more info, please see the [Alipay plugin docs](https://github.com/xueron/cordova-alipay-base).
  *
  * @usage
- * ```
+ * ```typescript
  * import { Alipay, AlipayOrder } from '@ionic-native/alipay';
  *
  * constructor(private alipay: Alipay) {
@@ -99,17 +99,20 @@ export interface AlipayOrder {
   plugin: 'cordova-alipay-base',
   pluginRef: 'Alipay.Base',
   repo: 'https://github.com/xueron/cordova-alipay-base',
-  platforms: ['Android', 'iOS'],
-  install: 'ionic plugin add https://github.com/xueron/cordova-alipay-base --variable APP_ID=your_app_id'
+  install:
+    'ionic cordova plugin add cordova-alipay-base --variable ALI_PID=your_app_id',
+  installVariables: ['ALI_PID'],
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Alipay {
+export class Alipay extends IonicNativePlugin {
   /**
    * Open Alipay to perform App pay
-   * @param order { AlipayOrder } alipay options
+   * @param { AlipayOrder | string } order alipay options
    * @returns {Promise<any>} Returns a Promise that resolves with the success return, or rejects with an error.
    */
   @Cordova()
-  pay(order: AlipayOrder): Promise<any> { return; }
+  pay(order: AlipayOrder | string): Promise<any> {
+    return;
+  }
 }
-

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

@@ -0,0 +1,298 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
+
+export type AndroidExoPlayerAspectRatio = 'FILL_SCREEN' | 'FIT_SCREEN';
+
+export interface AndroidExoPlayerParams {
+  /**
+   * Url of the video to play.
+   */
+  url: string;
+
+  /**
+   * Set the user agent. Default is `ExoPlayerPlugin`
+   */
+  userAgent?: string;
+
+  /**
+   * Set the player aspect ratio.
+   */
+  aspectRatio?: AndroidExoPlayerAspectRatio;
+
+  /**
+   * Hide controls after this many milliseconds, default is `5000`.
+   */
+  hideTimeout?: number;
+
+  /**
+   * When set to false stream will not automatically start.
+   */
+  autoPlay?: boolean;
+
+  /**
+   * Start playback at this many milliseconds into video, default is `0`.
+   */
+  seekTo?: number;
+
+  /**
+   * Amount of time in milliseconds to use when skipping forward, default is `1000`.
+   */
+  forwardTime?: number;
+
+  /**
+   * Amount of time in milliseconds to use when skipping backward, default is `1000`.
+   */
+  rewindTime?: number;
+
+  /**
+   * Only play audio in the backgroud, default is `false`.
+   * If you pass in `audioOnly: true`, make sure to manually close the player on some event (like escape button) since the plugin won't be detecting keypresses when playing audio in the background.
+   */
+  audioOnly?: true;
+
+  /**
+   * Optional subtitle url to display over the video.
+   * We currently support .srt and .vtt subtitle formats. Subtitles are not supported on all stream types, as ExoPlayer has requirement that both video and subtitle "must have the same number of periods, and must not have any dynamic windows", which means for simple mp4s it should work, but on more complex HLS/Dash setups it might not.
+   */
+  subtitleUrl?: string;
+
+  /**
+   * okhttp connect timeout in milliseconds (default is `0`)
+   */
+  connectTimeout?: number;
+
+  /**
+   * okhttp read timeout in milliseconds (default is `0`)
+   */
+  readTimeout?: number;
+
+  /**
+   * okhttp write timeout in milliseconds (default is `0`)
+   */
+  writeTimeout?: number;
+
+  /**
+   * okhttp socket ping interval in milliseconds (default is `0` or disabled)
+   */
+  pingInterval?: number;
+
+  /**
+   * Number of times datasource will retry the stream before giving up (default is `3`)
+   */
+  retryCount?: number;
+
+  /**
+   * If this object is not present controller will not be visible.
+   */
+  controller?: AndroidExoPlayerControllerConfig;
+}
+
+export interface AndroidExoplayerState {
+  [s: string]: string;
+}
+
+export interface AndroidExoPlayerControllerConfig {
+  /**
+   * Image in the controller.
+   */
+  streamImage: string;
+
+  /**
+   *
+   */
+  streamTitle: string;
+
+  /**
+   *
+   */
+  streamDescription: string;
+
+  /**
+   * Hide entire progress bar.
+   */
+  hideProgress?: true;
+
+  /**
+   * If progress bar is visible hide current position from it
+   */
+  hidePosition: false;
+
+  /**
+   * If progress bar is visible Hide stream duration from it
+   */
+  hideDuration: false;
+
+  /**
+   * Override the player control button icons.
+   */
+  controlIcons?: {
+    /**
+     * Rewind button icon.
+     */
+    exo_rew: string;
+
+    /**
+     * Play button icon.
+     */
+    exo_play: string;
+
+    /**
+     * Pause button icon.
+     */
+    exo_pause: string;
+
+    /**
+     * Fast forward button icon.
+     */
+    exo_ffwd: string;
+  };
+}
+
+/**
+ * @name Android ExoPlayer
+ * @description
+ * Cordova media player plugin using Google's ExoPlayer framework.
+ *
+ * https://github.com/google/ExoPlayer
+ *
+ * @usage
+ * ```typescript
+ * import { AndroidExoPlayer } from '@ionic-native/android-exoplayer';
+ *
+ * constructor(private androidExoPlayer: AndroidExoPlayer) { }
+ *
+ * ...
+ *
+ * this.androidExoPlayer.show({url: 'http://www.youtube.com/api/manifest/dash/id/bf5bb2419360daf1/source/youtube'});
+ *
+ * ```
+ *
+ * @interfaces
+ * AndroidExoPlayerParams
+ * AndroidExoplayerState
+ * AndroidExoPlayerControllerConfig
+ */
+@Plugin({
+  pluginName: 'AndroidExoPlayer',
+  plugin: 'cordova-plugin-exoplayer',
+  pluginRef: 'ExoPlayer',
+  repo: 'https://github.com/frontyard/cordova-plugin-exoplayer',
+  platforms: ['Android']
+})
+@Injectable()
+export class AndroidExoplayer extends IonicNativePlugin {
+  /**
+   * Show the player.
+   * @param {AndroidExoPlayerParams} parameters Parameters
+   * @return {Observable<AndroidExoplayerState>}
+   */
+  @Cordova({
+    observable: true,
+    clearFunction: 'close',
+    clearWithArgs: false,
+    successIndex: 1,
+    errorIndex: 2
+  })
+  show(parameters: AndroidExoPlayerParams): Observable<AndroidExoplayerState> {
+    return;
+  }
+
+  /**
+   * Switch stream without disposing of the player.
+   * @param {string} url The url of the new stream.
+   * @param {AndroidExoPlayerControllerConfig} controller Configuration of the controller.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  setStream(
+    url: string,
+    controller: AndroidExoPlayerControllerConfig
+  ): Promise<void> {
+    return;
+  }
+
+  /**
+   * Will pause if playing and play if paused
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  playPause(): Promise<void> {
+    return;
+  }
+
+  /**
+   * Stop playing.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  stop(): Promise<void> {
+    return;
+  }
+
+  /**
+   * Jump to a particular position.
+   * @param {number} milliseconds Position in stream in milliseconds
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  seekTo(milliseconds: number): Promise<void> {
+    return;
+  }
+
+  /**
+   * Jump to a particular time relative to the current position.
+   * @param {number} milliseconds Time in milliseconds
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  seekBy(milliseconds: number): Promise<void> {
+    return;
+  }
+
+  /**
+   * Get the current player state.
+   * @return {Promise<AndroidExoplayerState>}
+   */
+  @Cordova()
+  getState(): Promise<AndroidExoplayerState> {
+    return;
+  }
+
+  /**
+   * Show the controller.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  showController(): Promise<void> {
+    return;
+  }
+
+  /**
+   * Hide the controller.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  hideController(): Promise<void> {
+    return;
+  }
+
+  /**
+   * Update the controller configuration.
+   * @param {AndroidExoPlayerControllerConfig} controller Configuration of the controller.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  setController(controller: AndroidExoPlayerControllerConfig): Promise<void> {
+    return;
+  }
+
+  /**
+   * Close and dispose of player, call before destroy.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  close(): Promise<void> {
+    return;
+  }
+}

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

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
-
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface AFAAuthOptions {
-
   /**
    * Required
    * Used as the alias for your key in the Android Key Store.
@@ -62,7 +60,6 @@ export interface AFAAuthOptions {
    * Set the hint displayed by the fingerprint icon on the fingerprint authentication dialog.
    */
   dialogHint?: string;
-
 }
 
 export interface AFADecryptOptions {
@@ -96,13 +93,24 @@ export interface AFAEncryptResponse {
   token: string;
 }
 
+export interface AFAAvailableResponse {
+  isAvailable: boolean;
+  isHardwareDetected: boolean;
+  hasEnrolledFingerprints: boolean;
+}
+
+export interface AFADeleteOptions {
+  clientId: string;
+  username: string;
+}
+
 /**
  * @name Android Fingerprint Auth
  * @description
  * This plugin will open a native dialog fragment prompting the user to authenticate using their fingerprint. If the device has a secure lockscreen (pattern, PIN, or password), the user may opt to authenticate using that method as a backup.
  * @usage
  * ```typescript
- * import { AndroidFingerprintAuth, AFAAuthOptions } from '@ionic-native/android-fingerprint-auth';
+ * import { AndroidFingerprintAuth } from '@ionic-native/android-fingerprint-auth';
  *
  * constructor(private androidFingerprintAuth: AndroidFingerprintAuth) { }
  *
@@ -114,18 +122,18 @@ export interface AFAEncryptResponse {
  *     if(result.isAvailable){
  *       // it is available
  *
- *       this.androidFingerprintAuth.encrypt({ clientId: "myAppName", username: "myUsername", password: "myPassword" })
+ *       this.androidFingerprintAuth.encrypt({ clientId: 'myAppName', username: 'myUsername', password: 'myPassword' })
  *         .then(result => {
  *            if (result.withFingerprint) {
- *                console.log("Successfully encrypted credentials.");
- *                console.log("Encrypted credentials: " + result.token);
+ *                console.log('Successfully encrypted credentials.');
+ *                console.log('Encrypted credentials: ' + result.token);
  *            } else if (result.withBackup) {
  *              console.log('Successfully authenticated with backup password!');
  *            } else console.log('Didn\'t authenticate!');
  *         })
  *         .catch(error => {
- *            if (error === "Cancelled") {
- *              console.log("Fingerprint authentication cancelled");
+ *            if (error === this.androidFingerprintAuth.ERRORS.FINGERPRINT_CANCELLED) {
+ *              console.log('Fingerprint authentication cancelled');
  *            } else console.error(error)
  *         });
  *
@@ -139,6 +147,8 @@ export interface AFAEncryptResponse {
  * AFAAuthOptions
  * AFAEncryptResponse
  * AFADecryptOptions
+ * AFAAvailableResponse
+ * AFADeleteOptions
  */
 @Plugin({
   pluginName: 'AndroidFingerprintAuth',
@@ -148,35 +158,64 @@ export interface AFAEncryptResponse {
   platforms: ['Android']
 })
 @Injectable()
-export class AndroidFingerprintAuth {
+export class AndroidFingerprintAuth extends IonicNativePlugin {
+  ERRORS: {
+    BAD_PADDING_EXCEPTION: 'BAD_PADDING_EXCEPTION';
+    CERTIFICATE_EXCEPTION: 'CERTIFICATE_EXCEPTION';
+    FINGERPRINT_CANCELLED: 'FINGERPRINT_CANCELLED';
+    FINGERPRINT_DATA_NOT_DELETED: 'FINGERPRINT_DATA_NOT_DELETED';
+    FINGERPRINT_ERROR: 'FINGERPRINT_ERROR';
+    FINGERPRINT_NOT_AVAILABLE: 'FINGERPRINT_NOT_AVAILABLE';
+    FINGERPRINT_PERMISSION_DENIED: 'FINGERPRINT_PERMISSION_DENIED';
+    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: 'FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST';
+    ILLEGAL_BLOCK_SIZE_EXCEPTION: 'ILLEGAL_BLOCK_SIZE_EXCEPTION';
+    INIT_CIPHER_FAILED: 'INIT_CIPHER_FAILED';
+    INVALID_ALGORITHM_PARAMETER_EXCEPTION: 'INVALID_ALGORITHM_PARAMETER_EXCEPTION';
+    IO_EXCEPTION: 'IO_EXCEPTION';
+    JSON_EXCEPTION: 'JSON_EXCEPTION';
+    MINIMUM_SDK: 'MINIMUM_SDK';
+    MISSING_ACTION_PARAMETERS: 'MISSING_ACTION_PARAMETERS';
+    MISSING_PARAMETERS: 'MISSING_PARAMETERS';
+    NO_SUCH_ALGORITHM_EXCEPTION: 'NO_SUCH_ALGORITHM_EXCEPTION';
+    SECURITY_EXCEPTION: 'SECURITY_EXCEPTION';
+  };
 
   /**
    * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
-   * @param options {AFAAuthOptions} Options
-   * @returns {Promise<any>}
+   * @param {AFAAuthOptions} options Options
+   * @returns {Promise<AFAEncryptResponse>}
    */
   @Cordova()
-  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> {return; }
+  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> {
+    return;
+  }
 
   /**
    * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
-   * @param options {AFAAuthOptions} Options
-   * @returns {Promise<any>}
+   * @param {AFAAuthOptions} options Options
+   * @returns {Promise<AFADecryptOptions>}
    */
   @Cordova()
-  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> {return; }
+  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> {
+    return;
+  }
 
   /**
    * Check if service is available
-   * @returns {Promise<any>} Returns a Promise that resolves if fingerprint auth is available on the device
+   * @returns {Promise<AFAAvailableResponse>} Returns a Promise that resolves if fingerprint auth is available on the device
    */
   @Cordova()
-  isAvailable(): Promise<{isAvailable: boolean}> { return; }
+  isAvailable(): Promise<AFAAvailableResponse> {
+    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
+   * @param {AFADeleteOptions} options Options
+   * @returns {Promise<{ deleted: boolean }>} Returns a Promise that resolves if the cipher was successfully deleted
    */
   @Cordova()
-  delete(options: {clientId: string; username: string; }): Promise<{deleted: boolean}> { return; }
+  delete(options: AFADeleteOptions): Promise<{ deleted: boolean }> {
+    return;
+  }
 }

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

@@ -1,5 +1,32 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * Bit flag values for setSystemUiVisibility()
+ * @see	https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)
+ */
+export enum AndroidSystemUiFlags {
+  /** View has requested the system UI (status bar) to be visible (the default). SYSTEM_UI_FLAG_VISIBLE */
+  Visible = 0,
+  /** View has requested the system UI to enter an unobtrusive "low profile" mode. SYSTEM_UI_FLAG_LOW_PROFILE */
+  LowProfile = 1,
+  /** View has requested that the system navigation be temporarily hidden. SYSTEM_UI_FLAG_HIDE_NAVIGATION */
+  HideNavigation = 2,
+  /** View has requested to go into the normal fullscreen mode so that its content can take over the screen while still allowing the user to interact with the application. SYSTEM_UI_FLAG_FULLSCREEN */
+  Fullscreen = 4,
+  /** When using other layout flags, we would like a stable view of the content insets given to fitSystemWindows(Rect). SYSTEM_UI_FLAG_LAYOUT_STABLE */
+  LayoutStable = 256,
+  /** View would like its window to be laid out as if it has requested SYSTEM_UI_FLAG_HIDE_NAVIGATION, even if it currently hasn't. SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION */
+  LayoutHideNavigation = 512,
+  /** View would like its window to be laid out as if it has requested SYSTEM_UI_FLAG_FULLSCREEN, even if it currently hasn't. SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN */
+  LayoutFullscreen = 1024,
+  /** View would like to remain interactive when hiding the navigation bar with SYSTEM_UI_FLAG_HIDE_NAVIGATION. SYSTEM_UI_FLAG_IMMERSIVE */
+  Immersive = 2048,
+  /** View would like to remain interactive when hiding the status bar with SYSTEM_UI_FLAG_FULLSCREEN and/or hiding the navigation bar with SYSTEM_UI_FLAG_HIDE_NAVIGATION. SYSTEM_UI_FLAG_IMMERSIVE_STICKY */
+  ImmersiveSticky = 4096,
+  /** Requests the status bar to draw in a mode that is compatible with light status bar backgrounds. SYSTEM_UI_FLAG_LIGHT_STATUS_BAR */
+  LightStatusBar = 8192
+}
 
 /**
  * @name Android Full Screen
@@ -16,8 +43,8 @@ import { Cordova, Plugin } from '@ionic-native/core';
  * ...
  *
  * this.androidFullScreen.isImmersiveModeSupported()
- *   .then(() => this.androidFullScreen.immersiveMode())
- *   .catch((error: any) => console.log(error));
+ *   .then(() => console.log('Immersive mode supported'))
+ *   .catch(err => console.log(error));
  *
  * ```
  */
@@ -29,7 +56,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class AndroidFullScreen {
+export class AndroidFullScreen extends IonicNativePlugin {
   /**
    * Is this plugin supported?
    * @return {Promise<void>}
@@ -92,4 +119,13 @@ export class AndroidFullScreen {
    */
   @Cordova()
   immersiveMode(): Promise<void> { return; }
+
+  /**
+   * Manually set the the system UI to a custom mode. This mirrors the Android method of the same name. (Android 4.4+ only).
+   * @see https://developer.android.com/reference/android/view/View.html#setSystemUiVisibility(int)
+   * @param {AndroidSystemUiFlags} visibility Bitwise-OR of flags in AndroidSystemUiFlags
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  setSystemUiVisibility(visibility: AndroidSystemUiFlags): Promise<void> { return; }
 }

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

@@ -0,0 +1,243 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+/**
+ * @name Android Permissions
+ * @description
+ * This plugin is designed to support Android new permissions checking mechanism.
+ *
+ * You can find all permissions here: https://developer.android.com/reference/android/Manifest.permission.html
+ *
+ * @usage
+ * ```
+ * import { AndroidPermissions } from '@ionic-native/android-permissions';
+ *
+ *
+ * constructor(private androidPermissions: AndroidPermissions) { }
+ *
+ * ...
+ *
+ * this.androidPermissions.checkPermission(this.androidPermissions.PERMISSION.CAMERA).then(
+ *   result => console.log('Has permission?',result.hasPermission),
+ *   err => this.androidPermissions.requestPermission(this.androidPermissions.PERMISSION.CAMERA)
+ * );
+ *
+ * this.androidPermissions.requestPermissions([this.androidPermissions.PERMISSION.CAMERA, this.androidPermissions.PERMISSION.GET_ACCOUNTS]);
+ *
+ * ```
+ *
+ * Android 26 and above: due to Android 26's changes to permissions handling (permissions are requested at time of use rather than at runtime,) if your app does not include any functions (eg. other Ionic Native plugins) that utilize a particular permission, then `requestPermission()` and `requestPermissions()` will resolve immediately with no prompt shown to the user.  Thus, you must include a function utilizing the feature you would like to use before requesting permission for it.
+ */
+@Plugin({
+  pluginName: 'AndroidPermissions',
+  plugin: 'cordova-plugin-android-permissions',
+  pluginRef: 'cordova.plugins.permissions',
+  repo: 'https://github.com/NeoLSN/cordova-plugin-android-permissions',
+  platforms: ['Android']
+})
+@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:
+      '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',
+    ACCESS_WIFI_STATE: 'android.permission.ACCESS_WIFI_STATE',
+    ACCOUNT_MANAGER: 'android.permission.ACCOUNT_MANAGER',
+    ADD_VOICEMAIL: 'com.android.voicemail.permission.ADD_VOICEMAIL',
+    AUTHENTICATE_ACCOUNTS: 'android.permission.AUTHENTICATE_ACCOUNTS',
+    BATTERY_STATS: 'android.permission.BATTERY_STATS',
+    BIND_ACCESSIBILITY_SERVICE: 'android.permission.BIND_ACCESSIBILITY_SERVICE',
+    BIND_APPWIDGET: 'android.permission.BIND_APPWIDGET',
+    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:
+      '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',
+    BIND_TV_INPUT: 'android.permission.BIND_TV_INPUT',
+    BIND_VOICE_INTERACTION: 'android.permission.BIND_VOICE_INTERACTION',
+    BIND_VPN_SERVICE: 'android.permission.BIND_VPN_SERVICE',
+    BIND_WALLPAPER: 'android.permission.BIND_WALLPAPER',
+    BLUETOOTH: 'android.permission.BLUETOOTH',
+    BLUETOOTH_ADMIN: 'android.permission.BLUETOOTH_ADMIN',
+    BLUETOOTH_PRIVILEGED: 'android.permission.BLUETOOTH_PRIVILEGED',
+    BODY_SENSORS: 'android.permission.BODY_SENSORS',
+    BRICK: 'android.permission.BRICK',
+    BROADCAST_PACKAGE_REMOVED: 'android.permission.BROADCAST_PACKAGE_REMOVED',
+    BROADCAST_SMS: 'android.permission.BROADCAST_SMS',
+    BROADCAST_STICKY: 'android.permission.BROADCAST_STICKY',
+    BROADCAST_WAP_PUSH: 'android.permission.BROADCAST_WAP_PUSH',
+    CALL_PHONE: 'android.permission.CALL_PHONE',
+    CALL_PRIVILEGED: 'android.permission.CALL_PRIVILEGED',
+    CAMERA: 'android.permission.CAMERA',
+    CAPTURE_AUDIO_OUTPUT: 'android.permission.CAPTURE_AUDIO_OUTPUT',
+    CAPTURE_SECURE_VIDEO_OUTPUT:
+      'android.permission.CAPTURE_SECURE_VIDEO_OUTPUT',
+    CAPTURE_VIDEO_OUTPUT: 'android.permission.CAPTURE_VIDEO_OUTPUT',
+    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:
+      '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',
+    CONTROL_LOCATION_UPDATES: 'android.permission.CONTROL_LOCATION_UPDATES',
+    DELETE_CACHE_FILES: 'android.permission.DELETE_CACHE_FILES',
+    DELETE_PACKAGES: 'android.permission.DELETE_PACKAGES',
+    DEVICE_POWER: 'android.permission.DEVICE_POWER',
+    DIAGNOSTIC: 'android.permission.DIAGNOSTIC',
+    DISABLE_KEYGUARD: 'android.permission.DISABLE_KEYGUARD',
+    DUMP: 'android.permission.DUMP',
+    EXPAND_STATUS_BAR: 'android.permission.EXPAND_STATUS_BAR',
+    FACTORY_TEST: 'android.permission.FACTORY_TEST',
+    FLASHLIGHT: 'android.permission.FLASHLIGHT',
+    FORCE_BACK: 'android.permission.FORCE_BACK',
+    GET_ACCOUNTS: 'android.permission.GET_ACCOUNTS',
+    GET_PACKAGE_SIZE: 'android.permission.GET_PACKAGE_SIZE',
+    GET_TASKS: 'android.permission.GET_TASKS',
+    GET_TOP_ACTIVITY_INFO: 'android.permission.GET_TOP_ACTIVITY_INFO',
+    GLOBAL_SEARCH: 'android.permission.GLOBAL_SEARCH',
+    HARDWARE_TEST: 'android.permission.HARDWARE_TEST',
+    INJECT_EVENTS: 'android.permission.INJECT_EVENTS',
+    INSTALL_LOCATION_PROVIDER: 'android.permission.INSTALL_LOCATION_PROVIDER',
+    INSTALL_PACKAGES: 'android.permission.INSTALL_PACKAGES',
+    INSTALL_SHORTCUT: 'com.android.launcher.permission.INSTALL_SHORTCUT',
+    INTERNAL_SYSTEM_WINDOW: 'android.permission.INTERNAL_SYSTEM_WINDOW',
+    INTERNET: 'android.permission.INTERNET',
+    KILL_BACKGROUND_PROCESSES: 'android.permission.KILL_BACKGROUND_PROCESSES',
+    LOCATION_HARDWARE: 'android.permission.LOCATION_HARDWARE',
+    MANAGE_ACCOUNTS: 'android.permission.MANAGE_ACCOUNTS',
+    MANAGE_APP_TOKENS: 'android.permission.MANAGE_APP_TOKENS',
+    MANAGE_DOCUMENTS: 'android.permission.MANAGE_DOCUMENTS',
+    MASTER_CLEAR: 'android.permission.MASTER_CLEAR',
+    MEDIA_CONTENT_CONTROL: 'android.permission.MEDIA_CONTENT_CONTROL',
+    MODIFY_AUDIO_SETTINGS: 'android.permission.MODIFY_AUDIO_SETTINGS',
+    MODIFY_PHONE_STATE: 'android.permission.MODIFY_PHONE_STATE',
+    MOUNT_FORMAT_FILESYSTEMS: 'android.permission.MOUNT_FORMAT_FILESYSTEMS',
+    MOUNT_UNMOUNT_FILESYSTEMS: 'android.permission.MOUNT_UNMOUNT_FILESYSTEMS',
+    NFC: 'android.permission.NFC',
+    PERSISTENT_ACTIVITY: 'android.permission.PERSISTENT_ACTIVITY',
+    PROCESS_OUTGOING_CALLS: 'android.permission.PROCESS_OUTGOING_CALLS',
+    READ_CALENDAR: 'android.permission.READ_CALENDAR',
+    READ_CALL_LOG: 'android.permission.READ_CALL_LOG',
+    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:
+      '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',
+    READ_PROFILE: 'android.permission.READ_PROFILE',
+    READ_SMS: 'android.permission.READ_SMS',
+    READ_SOCIAL_STREAM: 'android.permission.READ_SOCIAL_STREAM',
+    READ_SYNC_SETTINGS: 'android.permission.READ_SYNC_SETTINGS',
+    READ_SYNC_STATS: 'android.permission.READ_SYNC_STATS',
+    READ_USER_DICTIONARY: 'android.permission.READ_USER_DICTIONARY',
+    READ_VOICEMAIL: 'com.android.voicemail.permission.READ_VOICEMAIL',
+    REBOOT: 'android.permission.REBOOT',
+    RECEIVE_BOOT_COMPLETED: 'android.permission.RECEIVE_BOOT_COMPLETED',
+    RECEIVE_MMS: 'android.permission.RECEIVE_MMS',
+    RECEIVE_SMS: 'android.permission.RECEIVE_SMS',
+    RECEIVE_WAP_PUSH: 'android.permission.RECEIVE_WAP_PUSH',
+    RECORD_AUDIO: 'android.permission.RECORD_AUDIO',
+    REORDER_TASKS: 'android.permission.REORDER_TASKS',
+    RESTART_PACKAGES: 'android.permission.RESTART_PACKAGES',
+    SEND_RESPOND_VIA_MESSAGE: 'android.permission.SEND_RESPOND_VIA_MESSAGE',
+    SEND_SMS: 'android.permission.SEND_SMS',
+    SET_ACTIVITY_WATCHER: 'android.permission.SET_ACTIVITY_WATCHER',
+    SET_ALARM: 'com.android.alarm.permission.SET_ALARM',
+    SET_ALWAYS_FINISH: 'android.permission.SET_ALWAYS_FINISH',
+    SET_ANIMATION_SCALE: 'android.permission.SET_ANIMATION_SCALE',
+    SET_DEBUG_APP: 'android.permission.SET_DEBUG_APP',
+    SET_ORIENTATION: 'android.permission.SET_ORIENTATION',
+    SET_POINTER_SPEED: 'android.permission.SET_POINTER_SPEED',
+    SET_PREFERRED_APPLICATIONS: 'android.permission.SET_PREFERRED_APPLICATIONS',
+    SET_PROCESS_LIMIT: 'android.permission.SET_PROCESS_LIMIT',
+    SET_TIME: 'android.permission.SET_TIME',
+    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:
+      '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',
+    SYSTEM_ALERT_WINDOW: 'android.permission.SYSTEM_ALERT_WINDOW',
+    TRANSMIT_IR: 'android.permission.TRANSMIT_IR',
+    UNINSTALL_SHORTCUT: 'com.android.launcher.permission.UNINSTALL_SHORTCUT',
+    UPDATE_DEVICE_STATS: 'android.permission.UPDATE_DEVICE_STATS',
+    USE_CREDENTIALS: 'android.permission.USE_CREDENTIALS',
+    USE_SIP: 'android.permission.USE_SIP',
+    VIBRATE: 'android.permission.VIBRATE',
+    WAKE_LOCK: 'android.permission.WAKE_LOCK',
+    WRITE_APN_SETTINGS: 'android.permission.WRITE_APN_SETTINGS',
+    WRITE_CALENDAR: 'android.permission.WRITE_CALENDAR',
+    WRITE_CALL_LOG: 'android.permission.WRITE_CALL_LOG',
+    WRITE_CONTACTS: 'android.permission.WRITE_CONTACTS',
+    WRITE_EXTERNAL_STORAGE: 'android.permission.WRITE_EXTERNAL_STORAGE',
+    WRITE_GSERVICES: 'android.permission.WRITE_GSERVICES',
+    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',
+    WRITE_SMS: 'android.permission.WRITE_SMS',
+    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'
+  };
+
+  /**
+   * Check permission
+   * @param {string} permission The name of the permission
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  checkPermission(permission: string): Promise<any> {
+    return;
+  }
+
+  /**
+   * Request permission
+   * @param {string} permission The name of the permission to request
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  requestPermission(permission: string): Promise<any> {
+    return;
+  }
+
+  /**
+   * Request permissions
+   * @param {Array<string>} permissions An array with permissions
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  requestPermissions(permissions: string[]): Promise<any> {
+    return;
+  }
+
+  /**
+   * This function still works now, will not support in the future.
+   * @param {string} permission The name of the permission
+   * @return {Promise<any>} Returns a promise
+   */
+  @Cordova()
+  hasPermission(permission: string): Promise<any> {
+    return;
+  }
+}

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name App Availability
@@ -27,8 +27,8 @@ import { Cordova, Plugin } from '@ionic-native/core';
  *
  * this.appAvailability.check(app)
  *   .then(
- *     (yes: string) => console.log(app + ' is available'),
- *     (no: string) => console.log(app + ' is NOT available')
+ *     (yes: boolean) => console.log(app + ' is available'),
+ *     (no: boolean) => console.log(app + ' is NOT available')
  *   );
  * ```
  */
@@ -40,7 +40,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class AppAvailability {
+export class AppAvailability extends IonicNativePlugin {
 
   /**
    * Checks if an app is available on device

src/@ionic-native/plugins/app-center-analytics/index.ts

@@ -0,0 +1,78 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+export interface StringMap {
+  [s: string]: string;
+}
+
+/**
+ * @name App Center Analytics
+ * @description
+ * App Center Analytics helps you understand user behavior and customer engagement to improve your app.
+ * The SDK automatically captures session count and device properties like model, OS version, etc.
+ * You can define your own custom events to measure things that matter to you.
+ * All the information captured is available in the App Center portal for you to analyze the data.
+ *
+ * For more info, please see https://docs.microsoft.com/en-us/appcenter/sdk/analytics/cordova
+ *
+ * @usage
+ * ```typescript
+ * import { AppCenterAnalytics } from '@ionic-native/app-center-analytics';
+ *
+ *
+ * constructor(private appCenterAnalytics: AppCenterAnalytics) { }
+ *
+ * ...
+ *
+ * this.appCenterAnalytics.setEnabled(true).then(() => {
+ *    this.appCenterAnalytics.trackEvent('My Event', { TEST: 'HELLO_WORLD' }).then(() => {
+ *        console.log('Custom event tracked');
+ *    });
+ * });
+ *
+ * ```
+ * @interfaces
+ * StringMap
+ */
+@Plugin({
+  pluginName: 'AppCenterAnalytics',
+  plugin: 'cordova-plugin-appcenter-analytics',
+  pluginRef: 'AppCenter.Analytics',
+  repo:
+    'https://github.com/Microsoft/appcenter-sdk-cordova/tree/master/cordova-plugin-appcenter-analytics',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class AppCenterAnalytics extends IonicNativePlugin {
+  /**
+   * Tracks an custom event.
+   * You can send up to 200 distinct event names. Also, there is a maximum limit of 256 characters per event name
+   * and 64 characters per event property name and event property value.
+   * @param  {string} eventName Event name
+   * @param  {StringMap} properties Event properties
+   * @returns {Promise<void>}
+   */
+  @Cordova()
+  trackEvent(eventName: string, properties: StringMap): Promise<void> {
+    return;
+  }
+
+  /**
+   * Check if App Center Analytics is enabled
+   * @returns {Promise<boolean>}
+   */
+  @Cordova()
+  isEnabled(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Enable or disable App Center Analytics at runtime
+   * @param  {boolean} shouldEnable Set value
+   * @returns {Promise<void>}
+   */
+  @Cordova()
+  setEnabled(shouldEnable: boolean): Promise<void> {
+    return;
+  }
+}

src/@ionic-native/plugins/app-center-crashes/index.ts

@@ -0,0 +1,115 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+export interface AppCenterCrashReport {
+  id: string;
+  device: AppCenterCrashReportDevice;
+  appStartTime: number;
+  appErrorTime: number;
+  signal: string;
+  appProcessIdentifier: number;
+}
+
+export interface AppCenterCrashReportDevice {
+  oem_name: string;
+  os_name: string;
+  app_version: string;
+  time_zone_offset: number;
+  carrier_name: string;
+  screen_size: string;
+  locale: string;
+  sdk_version: string;
+  carrier_country: string;
+  os_build: string;
+  app_namespace: string;
+  os_version: string;
+  sdk_name: string;
+  model: string;
+  app_build: string;
+}
+
+/**
+ * @name App Center Crashes
+ * @description
+ * App Center Analytics helps you understand user behavior and customer engagement to improve your app.
+ * The SDK automatically captures session count and device properties like model, OS version, etc.
+ * You can define your own custom events to measure things that matter to you.
+ * All the information captured is available in the App Center portal for you to analyze the data.
+ *
+ * For more info, please see https://docs.microsoft.com/en-us/appcenter/sdk/crashes/cordova
+ *
+ * @usage
+ * ```typescript
+ * import { AppCenterCrashes } from '@ionic-native/app-center-crashes';
+ *
+ *
+ * constructor(private AppCenterCrashes: AppCenterCrashes) { }
+ *
+ * ...
+ *
+ * this.AppCenterCrashes.setEnabled(true).then(() => {
+ *    this.AppCenterCrashes.lastSessionCrashReport().then(report => {
+ *        console.log('Crash report', report);
+ *    });
+ * });
+ *
+ * ```
+ * @interfaces
+ * AppCenterCrashReport
+ * AppCenterCrashReportDevice
+ */
+@Plugin({
+  pluginName: 'AppCenterCrashes',
+  plugin: 'cordova-plugin-appcenter-crashes',
+  pluginRef: 'AppCenter.Crashes',
+  repo:
+    'https://github.com/Microsoft/appcenter-sdk-cordova/tree/master/cordova-plugin-appcenter-crashes',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class AppCenterCrashes extends IonicNativePlugin {
+  /**
+   * App Center Crashes provides you with an API to generate a test crash for easy testing of the SDK.
+   * This API can only be used in test/beta apps and won't do anything in production apps.
+   * @returns void
+   */
+  @Cordova()
+  generateTestCrash(): void {}
+
+  /**
+   * At any time after starting the SDK, you can check if the app crashed in the previous launch
+   * @returns {Promise<boolean>}
+   */
+  @Cordova()
+  hasCrashedInLastSession(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Details about the last crash
+   * @returns {Promise<AppCenterCrashReport>}
+   */
+  @Cordova()
+  lastSessionCrashReport(): Promise<AppCenterCrashReport> {
+    return;
+  }
+
+  /**
+   * Check if App Center Crashes is enabled
+   * @returns {Promise<boolean>}
+   */
+  @Cordova()
+  isEnabled(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Enable or disable App Center Crashes at runtime
+   * @param  {boolean} shouldEnable Set value
+   * @returns {Promise<void>}
+   */
+  @Cordova()
+  setEnabled(shouldEnable: boolean): Promise<void> {
+    return;
+  }
+}

src/@ionic-native/plugins/app-center-push/index.ts

@@ -0,0 +1,68 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
+
+/**
+ * @name App Center Push
+ * @description
+ *
+ * For more info, please see https://docs.microsoft.com/en-us/appcenter/sdk/push/cordova
+ *
+ * @usage
+ * ```typescript
+ * import { AppCenterPush } from '@ionic-native/app-center-push';
+ *
+ *
+ * constructor(private appCenterPush: AppCenterPush) { }
+ *
+ * ...
+ *
+ * this.appCenterPush.setEnabled(true).then(() => {
+ *    this.appCenterPush.addEventListener('My Event').subscribe(pushNotification => {
+ *        console.log('Recived push notification', pushNotification);
+ *    });
+ * });
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'AppCenterPush',
+  plugin: 'cordova-plugin-appcenter-push',
+  pluginRef: 'AppCenter.Push',
+  repo:
+    'https://github.com/Microsoft/appcenter-sdk-cordova/tree/master/cordova-plugin-appcenter-push',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class AppCenterPush extends IonicNativePlugin {
+  /**
+   * Subscribe to an event
+   * @param  {string} eventName Event name
+   * @returns {Observable<any>}
+   */
+  @Cordova({
+    observable: true,
+    clearFunction: 'removeEventListener'
+  })
+  addEventListener(eventName: string): Observable<any> {
+    return;
+  }
+  /**
+   * Check if App Center Push is enabled
+   * @returns {Promise<boolean>}
+   */
+  @Cordova()
+  isEnabled(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Enable or disable App Center Push at runtime
+   * @param  {boolean} shouldEnable Set value
+   * @returns {Promise<void>}
+   */
+  @Cordova()
+  setEnabled(shouldEnable: boolean): Promise<void> {
+    return;
+  }
+}

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

@@ -0,0 +1,42 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name App Minimize
+ * @description
+ * AppMinimize is a plugin to minimize the application on android devices
+ *
+ * @usage
+ * ```typescript
+ * import { Platfrom } from 'ionic-angular';
+ * import { AppMinimize } from '@ionic-native/app-minimize';
+ *
+ *
+ * constructor(private platform: Platform, private appMinimize: AppMinimize) { }
+ *
+ * ...
+ *
+ * this.platform.registerBackButtonAction(() => {
+ *    this.appMinimize.minimize();
+ * });
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'AppMinimize',
+  plugin: 'cordova-plugin-appminimize',
+  pluginRef: 'plugins.appMinimize',
+  repo: 'https://github.com/tomloprod/cordova-plugin-appminimize',
+  platforms: ['Android']
+})
+@Injectable()
+export class AppMinimize extends IonicNativePlugin {
+
+  /**
+   * Minimizes the application
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  minimize(): Promise<any> { return; }
+
+}

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

@@ -1,4 +1,4 @@
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 import { Injectable } from '@angular/core';
 
@@ -11,11 +11,12 @@ import { Injectable } from '@angular/core';
  * ```typescript
  * import { AppPreferences } from '@ionic-native/app-preferences';
  *
- * constructor(private appPreferences: AppPreferences) {
+ * constructor(private appPreferences: AppPreferences) { }
  *
- *   this.appPreferences.fetch('key').then((res) => { console.log(res); });
+ * ...
+ *
+ * this.appPreferences.fetch('key').then((res) => { console.log(res); });
  *
- * }
  * ```
  *
  */
@@ -24,10 +25,10 @@ import { Injectable } from '@angular/core';
   plugin: 'cordova-plugin-app-preferences',
   pluginRef: 'plugins.appPreferences',
   repo: 'https://github.com/apla/me.apla.cordova.app-preferences',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'OS X', 'Windows 8', 'Windows Phone']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'macOS', 'Windows 8', 'Windows Phone']
 })
 @Injectable()
-export class AppPreferences {
+export class AppPreferences extends IonicNativePlugin {
 
   /**
    * Get a preference value
@@ -46,13 +47,13 @@ export class AppPreferences {
    *
    * @param {string} dict Dictionary for key (OPTIONAL)
    * @param {string} key Key
-   * @param {string} value Value
+   * @param {any} value Value
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({
     callbackOrder: 'reverse'
   })
-  store(dict: string, key: string, value?: string): Promise<any> {
+  store(dict: string, key: string, value?: any): Promise<any> {
     return;
   }
 
@@ -107,14 +108,16 @@ export class AppPreferences {
    * @returns {Object} Custom object, bound to that suite
    */
   @Cordova({
-    platforms: ['Android']
+    platforms: ['Android'],
+    sync: true
   })
-  suite(suiteName: string): Object { return; }
+  suite(suiteName: string): any { return; }
 
   @Cordova({
-    platforms: ['iOS']
+    platforms: ['iOS'],
+    sync: true
   })
-  iosSuite(suiteName: string): Object { return; }
+  iosSuite(suiteName: string): any { return; }
 
   /**
    * Return cloud synchronized configuration context

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

@@ -1,11 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, CordovaProperty, Plugin } from '@ionic-native/core';
-
-
-declare var window;
+import { Cordova, CordovaProperty, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface AppRatePreferences {
-
   /**
    * Custom BCP 47 language tag
    */
@@ -26,10 +22,15 @@ export interface AppRatePreferences {
    */
   usesUntilPrompt?: number;
 
+  /**
+   * Simple Mode to display the rate dialog directly and bypass negative feedback filtering flow
+   */
+  simpleMode?: boolean;
+
   /**
    * leave app or no when application page opened in app store (now supported only for iOS). Defaults to `false`
    */
-  openStoreInApp?: boolean;
+  inAppReview?: boolean;
 
   /**
    * use custom view for rate dialog. Defaults to `false`
@@ -39,7 +40,7 @@ export interface AppRatePreferences {
   /**
    * Custom locale object
    */
-  customLocale?: any;
+  customLocale?: AppRateCustomLocale;
 
   /**
    * Callbacks for events
@@ -50,11 +51,38 @@ export interface AppRatePreferences {
    * App Store URLS
    */
   storeAppURL?: AppUrls;
+}
 
+export interface AppRateCustomLocale {
+  /** Title */
+  title?: string;
+
+  /** Message */
+  message?: string;
+
+  /** Cancel button label */
+  cancelButtonLabel?: string;
+
+  /** Later button label */
+  laterButtonLabel?: string;
+
+  /** Rate button label */
+  rateButtonLabel?: string;
+
+  /** Yes button label */
+  yesButtonLabel?: string;
+
+  /** No button label */
+  noButtonLabel?: string;
+
+  /** App rate promt title */
+  appRatePromptTitle?: string;
+
+  /** Feedback prompt title */
+  feedbackPromptTitle?: string;
 }
 
 export interface AppRateCallbacks {
-
   /**
    * call back function. called when user clicked on rate-dialog buttons
    */
@@ -64,11 +92,13 @@ export interface AppRateCallbacks {
    * call back function. called when rate-dialog showing
    */
   onRateDialogShow?: Function;
-
+  /**
+   * call back function. called when user clicked on negative feedback
+   */
+  handleNegativeFeedback?: Function;
 }
 
 export interface AppUrls {
-
   /**
    * application id in AppStore
    */
@@ -93,7 +123,6 @@ export interface AppUrls {
    * application URL in WindowsStore
    */
   windows8?: string;
-
 }
 
 /**
@@ -110,12 +139,24 @@ export interface AppUrls {
  * constructor(private appRate: AppRate) { }
  *
  * ...
+ * // set certain preferences
+ * this.appRate.preferences.storeAppURL = {
+ *   ios: '<app_id>',
+ *   android: 'market://details?id=<package_name>',
+ *   windows: 'ms-windows-store://review/?ProductId=<store_id>'
+ * };
  *
- *  this.appRate.preferences.storeAppURL = {
- *    ios: '<my_app_id>',
+ * this.appRate.promptForRating(true);
+ *
+ * // or, override the whole preferences object
+ * this.appRate.preferences = {
+ *   usesUntilPrompt: 3,
+ *   storeAppURL: {
+ *    ios: '<app_id>',
  *    android: 'market://details?id=<package_name>',
- *    windows: 'ms-windows-store://review/?ProductId=<Store_ID>'
- *  };
+ *    windows: 'ms-windows-store://review/?ProductId=<store_id>'
+ *   }
+ * };
  *
  * this.appRate.promptForRating(false);
  * ```
@@ -124,6 +165,7 @@ export interface AppUrls {
  * AppRatePreferences
  * AppUrls
  * AppRateCallbacks
+ * AppRateCustomLocal
  *
  */
 @Plugin({
@@ -131,23 +173,26 @@ export interface AppUrls {
   plugin: 'cordova-plugin-apprate',
   pluginRef: 'AppRate',
   repo: 'https://github.com/pushandplay/cordova-plugin-apprate',
-  platforms: ['Android', 'iOS', 'Windows (experimental)']
+  platforms: ['Android', 'BlackBerry 10', 'iOS', 'Windows']
 })
 @Injectable()
-export class AppRate {
-
+export class AppRate extends IonicNativePlugin {
   /**
    * Configure various settings for the Rating View.
    * See table below for options
    */
-  @CordovaProperty
-  preferences: AppRatePreferences;
+  @CordovaProperty preferences: AppRatePreferences;
 
   /**
    * Prompts the user for rating
    * @param {boolean} immediately  Show the rating prompt immediately.
    */
   @Cordova()
-  promptForRating(immediately: boolean): void { };
+  promptForRating(immediately: boolean): void {}
 
+  /**
+   * Immediately send the user to the app store rating page
+   */
+  @Cordova()
+  navigateToAppStore(): void {}
 }

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

@@ -1,5 +1,11 @@
-import { Plugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+export interface AppUpdateOptions {
+  authType: string;
+  username?: string;
+  password?: string;
+}
 
 /**
  * @name App Update
@@ -19,20 +25,20 @@ import { Injectable } from '@angular/core';
  *
  * Then use the following code:
  *
- * ```
+ * ```typescript
  * import { AppUpdate } from '@ionic-native/app-update';
  *
  * constructor(private appUpdate: AppUpdate) {
  *
- *    const updateUrl = 'http://your-remote-api.com/update.xml';
- *    this.appUpdate.checkAppUpdate(updateUrl);
+ *    const updateUrl = 'https://your-remote-api.com/update.xml';
+ *    this.appUpdate.checkAppUpdate(updateUrl).then(() => { console.log('Update available') });
  *
  * }
- *
- *
  * ```
  *
  * The plugin will compare the app version and update it automatically if the API has a newer version to install.
+ * @interfaces
+ * AppUpdateOptions
  */
 @Plugin({
   pluginName: 'AppUpdate',
@@ -42,15 +48,17 @@ import { Injectable } from '@angular/core';
   platforms: ['Android']
 })
 @Injectable()
-export class AppUpdate {
+export class AppUpdate extends IonicNativePlugin {
   /**
    * Check and update
-   * @param updateUrl {string} update api url
+   * @param {string} updateUrl update api url
+   * @param {AppUpdateOptions} [options] options
    * @return {Promise<any>} Returns a promise that resolves when something happens
    */
   @Cordova({
     callbackOrder: 'reverse'
   })
-  checkAppUpdate(updateUrl: string): Promise<any> { return; }
+  checkAppUpdate(updateUrl: string, options?: AppUpdateOptions): Promise<any> {
+    return;
+  }
 }
-

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 
 
@@ -31,37 +31,37 @@ import { Cordova, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-app-version',
   pluginRef: 'cordova.getAppVersion',
   repo: 'https://github.com/whiteoctober/cordova-plugin-app-version',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS', 'Windows']
 })
 @Injectable()
-export class AppVersion {
+export class AppVersion extends IonicNativePlugin {
 
   /**
    * Returns the name of the app
-   * @returns {Promise<any>}
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getAppName(): Promise<any> { return; }
+  getAppName(): Promise<string> { return; }
 
   /**
    * Returns the package name of the app
-   * @returns {Promise<any>}
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getPackageName(): Promise<any> { return; }
+  getPackageName(): Promise<string> { return; }
 
   /**
    * Returns the build identifier of the app
-   * @returns {Promise<any>}
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getVersionCode(): Promise<any> { return; }
+  getVersionCode(): Promise<string> { return; }
 
   /**
    * Returns the version of the app
-   * @returns {Promise<any>}
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getVersionNumber(): Promise<any> { return; }
+  getVersionNumber(): Promise<string> { return; }
 
 }

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

@@ -0,0 +1,347 @@
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
+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';
+export type IShippingType = 'shipping' | 'delivery' | 'store' | 'service';
+export type IBillingRequirement =
+  | 'none'
+  | '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 =
+  | 'Updated List Info'
+  | 'Did you make a payment request?';
+
+export interface IPaymentResponse {
+  billingNameFirst?: string;
+  billingNameMiddle?: string;
+  billingNameLast?: string;
+  billingEmailAddress?: string;
+  billingSupplementarySubLocality?: string;
+  billingAddressStreet?: string;
+  billingAddressCity?: string;
+  billingAddressState?: string;
+  billingPostalCode?: string;
+  billingCountry?: string;
+  billingISOCountryCode?: string;
+
+  shippingNameFirst?: string;
+  shippingNameMiddle?: string;
+  shippingNameLast?: string;
+  shippingEmailAddress?: string;
+  shippingPhoneNumber?: string;
+  shippingSupplementarySubLocality?: string;
+  shippingAddressStreet?: string;
+  shippingAddressCity?: string;
+  shippingAddressState?: string;
+  shippingPostalCode?: string;
+  shippingCountry?: string;
+  shippingISOCountryCode?: string;
+
+  paymentData: string;
+  transactionIdentifier: string;
+  paymentMethodDisplayName?: string;
+  paymentMethodNetwork?: string;
+  paymentMethodTypeCard?: string;
+}
+
+export interface IOrderItem {
+  label: string;
+  amount: number;
+}
+export interface IShippingMethod {
+  identifier: string;
+  label: string;
+  detail: string;
+  amount: number;
+}
+export interface IOrderItemsAndShippingMethods {
+  items: IOrderItem[];
+  shippingMethods?: IShippingMethod[];
+}
+
+export interface IOrder extends IOrderItemsAndShippingMethods {
+  merchantIdentifier: string;
+  currencyCode: string;
+  countryCode: string;
+  billingAddressRequirement?: IBillingRequirement | IBillingRequirement[];
+  shippingAddressRequirement?: IBillingRequirement | IBillingRequirement[];
+  shippingType?: IShippingType;
+}
+
+export interface ISelectedShippingContact {
+  shippingAddressCity: string;
+  shippingAddressState: string;
+  shippingPostalCode: string;
+  shippingISOCountryCode: string;
+}
+
+/**
+ * @name Apple Pay
+ * @description
+ * A dependency free Cordova plugin to provide Apple Pay functionality.
+ *
+ * @usage
+ * ```typescript
+ * import { ApplePay } from '@ionic-native/apple-pay';
+ *
+ *
+ * constructor(private applePay: ApplePay) { }
+ *
+ * ...
+ * async applePay() {
+ *   // This block is optional -- only if you need to update order items/shipping
+ *   // methods in response to shipping method selections
+ *   this.applePay.startListeningForShippingContactSelection()
+ *     .subscribe(async selection => {
+ *       try {
+ *         await this.applePay.updateItemsAndShippingMethods({
+ *           items: getFromSelection(selection),
+ *           shippingMethods: getFromSelection(selection),
+ *         });
+ *       }
+ *       catch {
+ *         // handle update items error
+ *       }
+ *     });
+ *
+ *   try {
+ *     const applePayTransaction = await this.applePay.makePaymentRequest({
+ *       items,
+ *       shippingMethods,
+ *       merchantIdentifier,
+ *       currencyCode,
+ *       countryCode,
+ *       billingAddressRequirement: ['name', 'email', 'phone'],
+ *       shippingAddressRequirement: 'none',
+ *       shippingType: 'shipping'
+ *     });
+ *
+ *     const transactionStatus = await completeTransactionWithMerchant(applePayTransaction);
+ *     await this.applePay.completeLastTransaction(transactionStatus);
+ *   } catch {
+ *     // handle payment request error
+ *     // Can also handle stop complete transaction but these should normally not occur
+ *   }
+ *
+ *   // only if you started listening before
+ *   await this.applePay.stopListeningForShippingContactSelection();
+ * }
+ * ```
+ */
+@Plugin({
+  pluginName: 'ApplePay',
+  plugin: 'cordova-plugin-applepay',
+  pluginRef: 'ApplePay',
+  repo: 'https://github.com/samkelleher/cordova-plugin-applepay',
+  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
+   *
+   * @usage
+   * try {
+   *   const message = await this.applePay.canMakePayments();
+   *   // Apple Pay is enabled and a supported card is setup. Expect:
+   *   // 'This device can make payments and has a supported card'
+   * } catch (message) {
+   *   // There is an issue, examine the message to see the details, will be:
+   *   // 'This device cannot make payments.''
+   *   // 'This device can make payments but has no supported cards'
+   * }
+   */
+  @Cordova({
+    otherPromise: true
+  })
+  canMakePayments(): Promise<IMakePayments> {
+    return;
+  }
+
+  /**
+   * Starts listening for shipping contact selection changes
+   * Any time the user selects shipping contact, this callback will fire.
+   * You *must* call `updateItemsAndShippingMethods` in response or else the
+   * user will not be able to process payment.
+   * @return {Observable<ISelectedShippingContact>} emits with shipping contact information on
+   *   shipping contact selection changes
+   */
+  @Cordova({
+    observable: true,
+    clearFunction: 'stopListeningForShippingContactSelection'
+  })
+  startListeningForShippingContactSelection(): Observable<
+    ISelectedShippingContact
+  > {
+    return;
+  }
+
+  /**
+   * Stops listening for shipping contact selection changes
+   * @return {Promise} whether stop listening was successful. This should
+   *   really only fail if this is called without starting listening
+   */
+  @Cordova({
+    otherPromise: true
+  })
+  stopListeningForShippingContactSelection(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Update the list of pay sheet items and shipping methods in response to
+   * a shipping contact selection event. This *must* be called in response to
+   * any shipping contact selection event or else the user will not be able
+   * to complete a transaction on the pay sheet. Do not call without
+   * subscribing to shipping contact selection events first
+   *
+   * @param {IOrderItemsAndShippingMethods} list `items` and `shippingMethods` properties.
+   * @returns {Promise<IUpdateItemsAndShippingStatus>}
+   *
+   * @usage
+   * this.applePay.startListeningForShippingContactSelection().pluck('shippingAddressState').subscribe(shippingAddressState => {
+   *   let shippingMethods;
+   *   if ('AK' === shippingAddressState) {
+   *     shippingMethods = [{
+   *         identifier: 'Alaska',
+   *         label: 'Alaska',
+   *         detail: 'For shipping to Alaska',
+   *         amount: 9.99
+   *     },];
+   *   } else {
+   *     shippingMethods = [{
+   *         identifier: 'Continental',
+   *         label: 'Continental',
+   *         detail: 'For shipping Continentally',
+   *         amount: 5.99
+   *     }];
+   *   }
+   *   this.paySheetItems.shippingCost = {
+   *      label: 'Shipping Cost',
+   *      amount: shippingMethod[0].amount
+   *   };
+   *   this.applePay.updateItemsAndShippingMethods(this.paySheetItems, shippingMethods);
+   * });
+   */
+  @Cordova({
+    otherPromise: true
+  })
+  updateItemsAndShippingMethods(
+    list: IOrderItemsAndShippingMethods
+  ): Promise<IUpdateItemsAndShippingStatus> {
+    return;
+  }
+
+  /**
+   * Request a payment with Apple Pay
+   *
+   * @param {IOrder} order
+   * @return {Promise<IPaymentResponse>} Returns a promise that resolves when something happens
+   *
+   * @usage
+   * try {
+   *   const paymentResponse = this.applePay.makePaymentRequest({
+   *     items: [
+   *       {
+   *         label: '3 x Basket Items',
+   *         amount: 49.99
+   *       },
+   *       {
+   *         label: 'Next Day Delivery',
+   *         amount: 3.99
+   *       },
+   *       {
+   *         label: 'My Fashion Company',
+   *         amount: 53.98
+   *       }
+   *     ],
+   *     shippingMethods: [
+   *       {
+   *         identifier: 'NextDay',
+   *         label: 'NextDay',
+   *         detail: 'Arrives tomorrow by 5pm.',
+   *         amount: 3.99
+   *       },
+   *       {
+   *         identifier: 'Standard',
+   *         label: 'Standard',
+   *         detail: 'Arrive by Friday.',
+   *         amount: 4.99
+   *       },
+   *       {
+   *         identifier: 'SaturdayDelivery',
+   *         label: 'Saturday',
+   *         detail: 'Arrive by 5pm this Saturday.',
+   *         amount: 6.99
+   *       }
+   *     ],
+   *     merchantIdentifier: 'merchant.apple.test',
+   *     currencyCode: 'GBP',
+   *     countryCode: 'GB',
+   *     billingAddressRequirement: 'none',
+   *     shippingAddressRequirement: 'none',
+   *     shippingType: 'shipping',
+   *   });
+   *
+   *   // The user has authorized the payment.
+   *
+   *   // Handle the token, asynchronously, i.e. pass to your merchant bank to
+   *   // action the payment, then once finished, depending on the outcome:
+   *
+   *   // Here is an example implementation:
+   *
+   *   const captureStatus = await MyPaymentProvider.authorizeApplePayToken(paymentResponse.paymentData);
+   *   await this.applePay.completeLastTransaction('success');
+   * }
+   * catch (err) {
+   *   if (isPaymentAuthError(err)) {
+   *     this.completeLastTransaction('failure');
+   *   }
+   *   else {
+   *     // Failed to open pay sheet or user canceled payment
+   *   }
+   * }
+   */
+  @Cordova({
+    otherPromise: true
+  })
+  makePaymentRequest(order: IOrder): Promise<IPaymentResponse> {
+    return;
+  }
+
+  /**
+   * Once the makePaymentRequest has been resolved successfully, the device will be waiting for a completion event.
+   * This means, that the application must proceed with the token authorization and return a success, failure,
+   * or other validation error. Once this has been passed back, the Apple Pay sheet will be dismissed via an animation.
+   *
+   * @param {ITransactionStatus} complete
+   * @return {Promise<ICompleteTransaction>} Returns a promise that resolves after confirmation of payment authorization completion
+   *
+   */
+  @Cordova({
+    otherPromise: true
+  })
+  completeLastTransaction(
+    complete: ITransactionStatus
+  ): Promise<ICompleteTransaction> {
+    return;
+  }
+}

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

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
 
@@ -8,7 +8,7 @@ import { Injectable } from '@angular/core';
  * Plugin to serve ads through native Appodeal SDKs
  *
  * @usage
- * ```
+ * ```typescript
  * import { Appodeal } from '@ionic-native/appodeal';
  *
  * constructor(private appodeal: Appodeal) {
@@ -18,20 +18,17 @@ import { Injectable } from '@angular/core';
  *    appodeal.show(appodeal.AD_TYPES.REWARDED_VIDEO);
  *
  * }
- *
- *
- *
  * ```
  */
 @Plugin({
   pluginName: 'Appodeal',
-  plugin: 'https://github.com/appodeal/appodeal-cordova-plugin',
+  plugin: 'https://github.com/appodeal/appodeal-cordova-plugin.git',
   pluginRef: 'Appodeal',
-  repo: 'https://github.com/appodeal/appodeal-cordova-plugin.git',
-  platforms: [ 'iOS', 'Android' ]
+  repo: 'https://github.com/appodeal/appodeal-cordova-plugin',
+  platforms: ['iOS', 'Android']
 })
 @Injectable()
-export class Appodeal {
+export class Appodeal extends IonicNativePlugin {
   // available types of advertisements
   readonly AD_TYPES = {
     INTERSTITIAL: 1,
@@ -49,14 +46,16 @@ export class Appodeal {
    * @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> { return; };
+  isInitialized(): Promise<any> {
+    return;
+  }
 
   /**
    * show ad of specified type
@@ -64,7 +63,9 @@ export class Appodeal {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  show(adType: number): Promise<any> { return; };
+  show(adType: number): Promise<any> {
+    return;
+  }
 
   /**
    * show ad of specified type with placement options
@@ -73,24 +74,26 @@ export class Appodeal {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  showWithPlacement(
-    adType: number,
-    placement: any
-  ): Promise<any> { return; };
+  showWithPlacement(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
+   * @returns {Promise<any>}
    */
   @Cordova()
-  confirm(adType: number): void {};
+  canShow(adType: number): Promise<any> {
+    return;
+  }
 
   /**
    * check if ad of specified type has been loaded
@@ -98,7 +101,9 @@ export class Appodeal {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isLoaded(adType: number): Promise<any> { return; };
+  isLoaded(adType: number): Promise<any> {
+    return;
+  }
 
   /**
    * check if ad of specified
@@ -106,7 +111,9 @@ export class Appodeal {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  isPrecache(adType: number): Promise<any> { return; };
+  isPrecache(adType: number): Promise<any> {
+    return;
+  }
 
   /**
    *
@@ -114,75 +121,77 @@ export class Appodeal {
    * @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 {};
+  setTriggerOnLoadedOnPrecache(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 {};
+  setLogLevel(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> { return; };
+  getVersion(): Promise<any> {
+    return;
+  }
 
   /**
    *
@@ -190,7 +199,7 @@ export class Appodeal {
    * @param {number} adType
    */
   @Cordova()
-  disableNetwork(network?: string, adType?: number): void {};
+  disableNetwork(network?: string, adType?: number): void {}
 
   /**
    *
@@ -198,54 +207,54 @@ export class Appodeal {
    * @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 {}
 
   /**
    *
@@ -253,7 +262,7 @@ export class Appodeal {
    * @param {boolean} value
    */
   @Cordova()
-  setCustomBooleanRule(name: string, value: boolean): void {};
+  setCustomBooleanRule(name: string, value: boolean): void {}
 
   /**
    *
@@ -261,7 +270,7 @@ export class Appodeal {
    * @param {number} value
    */
   @Cordova()
-  setCustomIntegerRule(name: string, value: number): void {};
+  setCustomIntegerRule(name: string, value: number): void {}
 
   /**
    * set rule with float value
@@ -269,7 +278,7 @@ export class Appodeal {
    * @param {number} value
    */
   @Cordova()
-  setCustomDoubleRule(name: string, value: number): void {};
+  setCustomDoubleRule(name: string, value: number): void {}
 
   /**
    * set rule with string value
@@ -277,243 +286,321 @@ export class Appodeal {
    * @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> { return; }
+  onInterstitialLoaded(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialFailedToLoad',
     element: document
   })
-  onInterstitialFailedToLoad(): Observable<any> { return; }
+  onInterstitialFailedToLoad(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialShown',
     element: document
   })
-  onInterstitialShown(): Observable<any> { return; }
+  onInterstitialShown(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClicked',
     element: document
   })
-  onInterstitialClicked(): Observable<any> { return; }
+  onInterstitialClicked(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onInterstitialClosed',
     element: document
   })
-  onInterstitialClosed(): Observable<any> { return; }
+  onInterstitialClosed(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoLoaded',
     element: document
   })
-  onSkippableVideoLoaded(): Observable<any> { return; }
+  onSkippableVideoLoaded(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFailedToLoad',
     element: document
   })
-  onSkippableVideoFailedToLoad(): Observable<any> { return; }
+  onSkippableVideoFailedToLoad(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoShown',
     element: document
   })
-  onSkippableVideoShown(): Observable<any> { return; }
+  onSkippableVideoShown(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoFinished',
     element: document
   })
-  onSkippableVideoFinished(): Observable<any> { return; }
+  onSkippableVideoFinished(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onSkippableVideoClosed',
     element: document
   })
-  onSkippableVideoClosed(): Observable<any> { return; }
+  onSkippableVideoClosed(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoLoaded',
     element: document
   })
-  onRewardedVideoLoaded(): Observable<any> { return; }
+  onRewardedVideoLoaded(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFailedToLoad',
     element: document
   })
-  onRewardedVideoFailedToLoad(): Observable<any> { return; }
+  onRewardedVideoFailedToLoad(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoShown',
     element: document
   })
-  onRewardedVideoShown(): Observable<any> { return; }
+  onRewardedVideoShown(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoFinished',
     element: document
   })
-  onRewardedVideoFinished(): Observable<any> { return; }
+  onRewardedVideoFinished(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onRewardedVideoClosed',
     element: document
   })
-  onRewardedVideoClosed(): Observable<any> { return; }
+  onRewardedVideoClosed(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoLoaded',
     element: document
   })
-  onNonSkippableVideoLoaded(): Observable<any> { return; }
+  onNonSkippableVideoLoaded(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFailedToLoad',
     element: document
   })
-  onNonSkippableVideoFailedToLoad(): Observable<any> { return; }
+  onNonSkippableVideoFailedToLoad(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoShown',
     element: document
   })
-  onNonSkippableVideoShown(): Observable<any> { return; }
+  onNonSkippableVideoShown(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoFinished',
     element: document
   })
-  onNonSkippableVideoFinished(): Observable<any> { return; }
+  onNonSkippableVideoFinished(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onNonSkippableVideoClosed',
     element: document
   })
-  onNonSkippableVideoClosed(): Observable<any> { return; }
+  onNonSkippableVideoClosed(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerClicked',
     element: document
   })
-  onBannerClicked(): Observable<any> { return; }
+  onBannerClicked(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerFailedToLoad',
     element: document
   })
-  onBannerFailedToLoad(): Observable<any> { return; }
+  onBannerFailedToLoad(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerLoaded',
     element: document
   })
-  onBannerLoaded(): Observable<any> { return; }
+  onBannerLoaded(): Observable<any> {
+    return;
+  }
 
   @Cordova({
     eventObservable: true,
     event: 'onBannerShown',
     element: document
   })
-  onBannerShown(): Observable<any> { return; }
+  onBannerShown(): Observable<any> {
+    return;
+  }
+
+  @Cordova()
+  getRewardParametersForPlacement(placement: string): Promise<any> {
+    return;
+  }
+
+  @Cordova()
+  getRewardParameters(): Promise<any> {
+    return;
+  }
+
+  @Cordova()
+  canShowWithPlacement(adType: string, placement: string): Promise<any> {
+    return;
+  }
+
+  @Cordova({
+    platforms: ['Android']
+  })
+  showTestScreen(value: any): void {}
+
+  @Cordova()
+  muteVideosIfCallsMuted(value: any): Promise<any> {
+    return;
+  }
+
+  @Cordova()
+  setChildDirectedTreatment(value: boolean): Promise<any> {
+    return;
+  }
 }

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

@@ -0,0 +1,47 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name Autostart
+ * @description
+ * This plugin automatically starts your Android app after every boot or auto-update.
+ * You can enable or disable the autostart function in your app.
+ *
+ * @usage
+ * ```typescript
+ * import { Autostart } from '@ionic-native/autostart';
+ *
+ *
+ * constructor(private autostart: Autostart) { }
+ *
+ * ...
+ *
+ * this.autostart.enable();
+ *
+ * this.autostart.disable();
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Autostart',
+  plugin: 'cordova-plugin-autostart',
+  pluginRef: 'cordova.plugins.autoStart',
+  repo: 'https://github.com/ToniKorin/cordova-plugin-autostart',
+  platforms: ['Android']
+})
+@Injectable()
+export class Autostart extends IonicNativePlugin {
+
+  /**
+   * Enable the automatic startup after the boot
+   */
+  @Cordova({ sync: true })
+  enable(): void { }
+
+  /**
+   * Disable the automatic startup after the boot
+   */
+  @Cordova({ sync: true })
+  disable(): void { }
+
+}

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

@@ -1,9 +1,6 @@
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
-declare var window;
-
-
 export interface BackgroundFetchConfig {
 
   /**
@@ -63,7 +60,7 @@ export interface BackgroundFetchConfig {
   platforms: ['iOS']
 })
 @Injectable()
-export class BackgroundFetch {
+export class BackgroundFetch extends IonicNativePlugin {
 
 
   /**
@@ -100,4 +97,11 @@ export class BackgroundFetch {
   })
   finish(): void { }
 
+  /**
+   * Return the status of the background-fetch
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  status(): Promise<any> { return; }
+
 }

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

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
-declare var window;
-
 export interface BackgroundGeolocationResponse {
 
   /**
@@ -127,7 +125,7 @@ export interface BackgroundGeolocationConfig {
   startForeground?: boolean;
 
   /**
-   * ANDROID, WP8 ONLY
+   * ANDROID ONLY
    * When using BackgroundGeolocation.LocationProvider.ANDROID_DISTANCE_FILTER_PROVIDER:
    * The minimum time interval between location updates in milliseconds.
    * @see Android docs (http://developer.android.com/reference/android/location/LocationManager.html#requestLocationUpdates(long,%20float,%20android.location.Criteria,%20android.app.PendingIntent))
@@ -266,7 +264,7 @@ export interface BackgroundGeolocationConfig {
  * BackgroundGeolocation must be called within app.ts and or before Geolocation. Otherwise the platform will not ask you for background tracking permission.
  *
  * ```typescript
- * import { BackgroundGeolocation, BackgroundGeolocationConfig } from '@ionic-native/background-geolocation';
+ * import { BackgroundGeolocation, BackgroundGeolocationConfig, BackgroundGeolocationResponse } from '@ionic-native/background-geolocation';
  *
  * constructor(private backgroundGeolocation: BackgroundGeolocation) { }
  *
@@ -308,10 +306,10 @@ export interface BackgroundGeolocationConfig {
   plugin: 'cordova-plugin-mauron85-background-geolocation',
   pluginRef: 'backgroundGeolocation',
   repo: 'https://github.com/mauron85/cordova-plugin-background-geolocation',
-  platforms: ['iOS', 'Android', 'Windows Phone 8']
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class BackgroundGeolocation {
+export class BackgroundGeolocation extends IonicNativePlugin {
 
   /**

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

@@ -393,7 +391,7 @@ export class BackgroundGeolocation {
    * @returns {Promise<any>}
    */
   @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
   })
   finish(): Promise<any> { return; }
 
@@ -403,7 +401,7 @@ export class BackgroundGeolocation {
    * @returns {Promise<any>}
    */
   @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
   })
   changePace(isMoving: boolean): Promise<any> { return; }
 
@@ -422,7 +420,7 @@ export class BackgroundGeolocation {
    * @returns {Promise<Location>}
    */
   @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
   })
   getStationaryLocation(): Promise<BackgroundGeolocationResponse> { return; }
 
@@ -432,7 +430,7 @@ export class BackgroundGeolocation {
    * @returns {Promise<any>}
    */
   @Cordova({
-    platforms: ['iOS', 'Windows Phone']
+    platforms: ['iOS']
   })
   onStationary(): Promise<any> { return; }
 
@@ -448,13 +446,13 @@ export class BackgroundGeolocation {
   /**
    * Display app settings to change permissions
    */
-  @Cordova({sync: true})
+  @Cordova({ sync: true })
   showAppSettings(): void { }
 
   /**
    * Display device location settings
    */
-  @Cordova({sync: true})
+  @Cordova({ sync: true })
   showLocationSettings(): void { }
 
   /**

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

@@ -1,56 +1,60 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
-
 /**
  * Configurations items that can be updated.
  */
 export interface BackgroundModeConfiguration {
-
   /**
    * Title of the background task
    */
-  title?: String;
+  title?: string;
 
   /**
    * Description of background task
    */
-  text?: String;
+  text?: string;
 
   /**
-   * This will look for <icon name>.png in platforms/android/res/drawable|mipmap
+   * This will look for `<icon name>.png` in platforms/android/res/drawable|mipmap
    */
   icon?: string;
 
+  /**
+   * Set the background color of the notification circle
+   */
   color?: string;
 
   /**
-   * By default the app will come to foreground when taping on the notification. If false, plugin wont come to foreground when tapped.
+   * By default the app will come to foreground when tapping on the notification. If false, plugin won't come to foreground when tapped.
    */
   resume?: boolean;
 
+  /**
+   * When set to false makes the notifications visible on lock screen (Android 5.0+)
+   */
   hidden?: boolean;
 
+  /** Big text */
   bigText?: boolean;
 
   /**
    * The text that scrolls itself on statusbar
    */
-  ticker?: String;
+  ticker?: string;
 
   /**
    * if true plugin will not display a notification. Default is false.
    */
   silent?: boolean;
-
 }
 
 /**
  * @name Background Mode
  * @description
  * Cordova plugin to prevent the app from going to sleep while in background.
- * Requires Cordova plugin: cordova-plugin-background-mode. For more info about plugin, vist: https://github.com/katzer/cordova-plugin-background-mode
+ * Requires Cordova plugin: cordova-plugin-background-mode. For more info about plugin, visit: https://github.com/katzer/cordova-plugin-background-mode
  *@usage
  * ```typescript
  * import { BackgroundMode } from '@ionic-native/background-mode';
@@ -70,11 +74,10 @@ export interface BackgroundModeConfiguration {
   plugin: 'cordova-plugin-background-mode',
   pluginRef: 'cordova.plugins.backgroundMode',
   repo: 'https://github.com/katzer/cordova-plugin-background-mode',
-  platforms: ['Android', 'iOS', 'Windows Phone 8']
+  platforms: ['AmazonFire OS', 'Android', 'Browser', 'iOS', 'Windows']
 })
 @Injectable()
-export class BackgroundMode {
-
+export class BackgroundMode extends IonicNativePlugin {
   /**
    * Enable the background mode.
    * Once called, prevents the app from being paused while in background.
@@ -82,14 +85,16 @@ export class BackgroundMode {
   @Cordova({
     sync: true
   })
-  enable(): void { }
+  enable(): void {}
 
   /**
    * Disable the background mode.
    * Once the background mode has been disabled, the app will be paused when in background.
    */
   @Cordova()
-  disable(): Promise<any> { return; }
+  disable(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if background mode is enabled or not.
@@ -98,7 +103,9 @@ export class BackgroundMode {
   @Cordova({
     sync: true
   })
-  isEnabled(): boolean { return; }
+  isEnabled(): boolean {
+    return;
+  }
 
   /**
    * Can be used to get the information if the background mode is active.
@@ -107,27 +114,33 @@ export class BackgroundMode {
   @Cordova({
     sync: true
   })
-  isActive(): boolean { return; }
+  isActive(): boolean {
+    return;
+  }
 
   /**
    * Override the default title, ticker and text.
    * Available only for Android platform.
-   * @param {Configure} options List of option to configure. See table below
+   * @param {BackgroundModeConfiguration} options List of option to configure. See table below
+   * @returns {Promise<any>}
    */
   @Cordova({
     platforms: ['Android']
   })
-  setDefaults(options?: BackgroundModeConfiguration): Promise<any> { return; }
+  setDefaults(options?: BackgroundModeConfiguration): Promise<any> {
+    return;
+  }
 
   /**
    * Modify the displayed information.
    * Available only for Android platform.
-   * @param {Configure} options Any options you want to update. See table below.
+   * @param {BackgroundModeConfiguration} [options] Any options you want to update. See table below.
    */
   @Cordova({
-    platforms: ['Android']
+    platforms: ['Android'],
+    sync: true
   })
-  configure(options?: BackgroundModeConfiguration): Promise<any> { return; }
+  configure(options?: BackgroundModeConfiguration): void {}
 
   /**
    * Listen for events that the plugin fires. Available events are `enable`, `disable`, `activate`, `deactivate` and `failure`.
@@ -139,7 +152,9 @@ export class BackgroundMode {
     clearFunction: 'un',
     clearWithArgs: true
   })
-  on(event: string): Observable<any> { return; }
+  on(event: string): Observable<any> {
+    return;
+  }
 
   /**
    * Android allows to programmatically move from foreground to background.
@@ -150,6 +165,15 @@ export class BackgroundMode {
   })
   moveToBackground(): void {}
 
+  /**
+   * Enable GPS-tracking in background (Android).
+   */
+  @Cordova({
+    platforms: ['Android'],
+    sync: true
+  })
+  disableWebViewOptimizations(): void {}
+
   /**
    * Android allows to programmatically move from background to foreground.
    */
@@ -169,7 +193,7 @@ export class BackgroundMode {
   overrideBackButton(): void {}
 
   /**
-   * Exclude the app from the recent task list works on Android 5.0+.
+   * Exclude the app from the recent task list. Works on Android 5.0+.
    */
   @Cordova({
     platforms: ['Android'],
@@ -179,11 +203,14 @@ export class BackgroundMode {
 
   /**
    * The method works async instead of isActive() or isEnabled().
+   * @returns {Promise<boolean>}
    */
   @Cordova({
     platforms: ['Android']
   })
-  isScreenOff(): Promise<boolean> { return; }
+  isScreenOff(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Turn screen on
@@ -202,5 +229,4 @@ export class BackgroundMode {
     sync: true
   })
   unlock(): void {}
-
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 
 
 /**
@@ -9,7 +9,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
  * This plugin adds turning on/off the device backlight.
  *
  * @usage
- * ```
+ * ```typescript
  * import { Backlight } from '@ionic-native/backlight';
  *
  * constructor(private backlight: Backlight) { }
@@ -32,7 +32,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class Backlight {
+export class Backlight extends IonicNativePlugin {
 
   /**
    * This function turns backlight on

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

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
-
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
 /**
  * @name Badge
@@ -27,17 +26,18 @@ import { Cordova, Plugin } from '@ionic-native/core';
   plugin: 'cordova-plugin-badge',
   pluginRef: 'cordova.plugins.notification.badge',
   repo: 'https://github.com/katzer/cordova-plugin-badge',
-  platforms: ['Android', 'iOS', 'Browser', 'Windows', 'Amazon FireOS', 'Windows Phone 8']
+  platforms: ['Android', 'Browser', 'iOS', 'Windows']
 })
 @Injectable()
-export class Badge {
-
+export class Badge extends IonicNativePlugin {
   /**
    * Clear the badge of the app icon.
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  clear(): Promise<boolean> { return; }
+  clear(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Set the badge of the app icon.
@@ -45,14 +45,18 @@ export class Badge {
    * @returns {Promise<any>}
    */
   @Cordova()
-  set(badgeNumber: number): Promise<any> { return; }
+  set(badgeNumber: number): Promise<any> {
+    return;
+  }
 
   /**
    * Get the badge of the app icon.
    * @returns {Promise<any>}
    */
   @Cordova()
-  get(): Promise<any> { return; }
+  get(): Promise<any> {
+    return;
+  }
 
   /**
    * Increase the badge number.
@@ -60,7 +64,9 @@ export class Badge {
    * @returns {Promise<any>}
    */
   @Cordova()
-  increase(increaseBy: number): Promise<any> { return; }
+  increase(increaseBy: number): Promise<any> {
+    return;
+  }
 
   /**
    * Decrease the badge number.
@@ -68,20 +74,34 @@ export class Badge {
    * @returns {Promise<any>}
    */
   @Cordova()
-  decrease(decreaseBy: number): Promise<any> { return; }
+  decrease(decreaseBy: number): Promise<any> {
+    return;
+  }
+
+  /**
+   * Check support to show badges.
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  isSupported(): Promise<any> {
+    return;
+  }
 
   /**
    * Determine if the app has permission to show badges.
    * @returns {Promise<any>}
    */
   @Cordova()
-  hasPermission(): Promise<any> { return; }
+  hasPermission(): Promise<any> {
+    return;
+  }
 
   /**
    * Register permission to set badge notifications
    * @returns {Promise<any>}
    */
   @Cordova()
-  registerPermission(): Promise<any> { return; }
-
+  requestPermission(): Promise<any> {
+    return;
+  }
 }

src/@ionic-native/plugins/barcode-scanner/index.ts

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
-
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface BarcodeScannerOptions {
-
   /**
    * Prefer front camera. Supported on iOS and Android.
    */
@@ -53,7 +51,28 @@ export interface BarcodeScannerOptions {
    * Display scanned text for X ms. 0 suppresses it entirely, default 1500. Supported on Android only.
    */
   resultDisplayDuration?: number;
+}
 
+export interface BarcodeScanResult {
+  format:
+    | 'QR_CODE'
+    | 'DATA_MATRIX'
+    | 'UPC_E'
+    | 'UPC_A'
+    | 'EAN_8'
+    | 'EAN_13'
+    | 'CODE_128'
+    | 'CODE_39'
+    | 'CODE_93'
+    | 'CODABAR'
+    | 'ITF'
+    | 'RSS14'
+    | 'RSS_EXPANDED'
+    | 'PDF417'
+    | 'AZTEC'
+    | 'MSI';
+  cancelled: boolean;
+  text: string;
 }
 
 /**
@@ -72,25 +91,25 @@ export interface BarcodeScannerOptions {
  * ...
  *
  *
- * this.barcodeScanner.scan().then((barcodeData) => {
- *  // Success! Barcode data is here
- * }, (err) => {
- * 	// An error occurred
+ * this.barcodeScanner.scan().then(barcodeData => {
+ *  console.log('Barcode data', barcodeData);
+ * }).catch(err => {
+ * 	console.log('Error', err);
  * });
  * ```
  * @interfaces
  * BarcodeScannerOptions
+ * BarcodeScanResult
  */
 @Plugin({
   pluginName: 'BarcodeScanner',
   plugin: 'phonegap-plugin-barcodescanner',
   pluginRef: 'cordova.plugins.barcodeScanner',
   repo: 'https://github.com/phonegap/phonegap-plugin-barcodescanner',
-  platforms: ['Android', 'iOS', 'Windows Phone 8', 'Windows 10', 'Windows 8', 'BlackBerry 10', 'Browser']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'Windows']
 })
 @Injectable()
-export class BarcodeScanner {
-
+export class BarcodeScanner extends IonicNativePlugin {
   Encode: {
     TEXT_TYPE: string;
     EMAIL_TYPE: string;
@@ -105,22 +124,25 @@ export class BarcodeScanner {
 
   /**
    * Open the barcode scanner.
-   * @param options {BarcodeScannerOptions} Optional options to pass to the scanner
+   * @param {BarcodeScannerOptions} [options] Optional options to pass to the scanner
    * @returns {Promise<any>} Returns a Promise that resolves with scanner data, or rejects with an error.
    */
   @Cordova({
     callbackOrder: 'reverse'
   })
-  scan(options?: BarcodeScannerOptions): Promise<any> { return; }
+  scan(options?: BarcodeScannerOptions): Promise<BarcodeScanResult> {
+    return;
+  }
 
   /**
    * Encodes data into a barcode.
    * NOTE: not well supported on Android
-   * @param type {string} Type of encoding
-   * @param data {any} Data to encode
+   * @param {string} type Type of encoding
+   * @param {any} data Data to encode
    * @returns {Promise<any>}
    */
   @Cordova()
-  encode(type: string, data: any): Promise<any> { return; }
-
+  encode(type: string, data: any): Promise<any> {
+    return;
+  }
 }

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

@@ -1,5 +1,15 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+export interface Base64ToGalleryOptions {
+  /** Saved file name prefix */
+  prefix: string;
+  /**
+   * On Android runs Media Scanner after file creation.
+   * On iOS if true the file will be added to camera roll, otherwise will be saved to a library folder.
+   */
+  mediaScanner: boolean;
+}
 
 /**
  * @name Base64 To Gallery
@@ -19,6 +29,8 @@ import { Cordova, Plugin } from '@ionic-native/core';
  *   err => console.log('Error saving image to gallery ', err)
  * );
  * ```
+ * @interfaces
+ * Base64ToGalleryOptions
  */
 @Plugin({
   pluginName: 'Base64ToGallery',
@@ -28,20 +40,21 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class Base64ToGallery {
-
+export class Base64ToGallery extends IonicNativePlugin {
   /**
    * Converts a base64 string to an image file in the device gallery
    * @param {string} data The actual base64 string that you want to save
-   * @param {any} [options] An object with properties: prefix: string, mediaScanner: boolean. Prefix will be prepended to the filename. If true, mediaScanner runs Media Scanner on Android and saves to Camera Roll on iOS; if false, saves to Library folder on iOS.
+   * @param {any} [options] An object with properties
    * @returns {Promise<any>} returns a promise that resolves when the image is saved.
    */
   @Cordova({
     successIndex: 2,
     errorIndex: 3
   })
-  base64ToGallery(data: string, options?: {prefix?: string; mediaScanner?: boolean}): Promise<any> {
+  base64ToGallery(
+    data: string,
+    options?: Base64ToGalleryOptions
+  ): Promise<any> {
     return;
   }
-
 }

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

@@ -0,0 +1,45 @@
+import { Injectable } from '@angular/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * @beta
+ * @name Base64
+ * @description
+ * This Plugin is used to encode base64 of any file, it uses js code for iOS, but in case of android it uses native code to handle android versions lower than v.3
+ *
+ * @usage
+ * ```typescript
+ * import { Base64 } from '@ionic-native/base64';
+ *
+ * constructor(private base64: Base64) { }
+ *
+ * ...
+ *
+ * let filePath: string = 'file:///...';
+ * this.base64.encodeFile(filePath).then((base64File: string) => {
+ *   console.log(base64File);
+ * }, (err) => {
+ *   console.log(err);
+ * });
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'Base64',
+  plugin: 'com-badrit-base64',
+  pluginRef: 'plugins.Base64',
+  repo: 'https://github.com/hazemhagrass/phonegap-base64',
+  platforms: ['Android', 'iOS']
+})
+@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> { return; }
+
+}

src/@ionic-native/plugins/battery-status/index.ts

@@ -1,9 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface BatteryStatusResponse {
-
   /**
    * The battery charge percentage
    */
@@ -13,7 +12,6 @@ export interface BatteryStatusResponse {
    * A boolean that indicates whether the device is plugged in
    */
   isPlugged: boolean;
-
 }
 
 /**
@@ -31,11 +29,9 @@ export interface BatteryStatusResponse {
  *
  *
  * // watch change in battery status
- * let subscription = this.batteryStatus.onChange().subscribe(
- *  (status: StatusObject) => {
+ * const subscription = this.batteryStatus.onChange().subscribe(status => {
  *    console.log(status.level, status.isPlugged);
- *  }
- * );
+ * });
  *
  * // stop watch
  * subscription.unsubscribe();
@@ -49,11 +45,10 @@ export interface BatteryStatusResponse {
   plugin: 'cordova-plugin-battery-status',
   pluginRef: 'navigator.battery',
   repo: 'https://github.com/apache/cordova-plugin-battery-status',
-  platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser']
+  platforms: ['iOS', 'Android', 'Windows', 'Browser']
 })
 @Injectable()
-export class BatteryStatus {
-
+export class BatteryStatus extends IonicNativePlugin {
   /**
    * Watch the change in battery level
    * @returns {Observable<BatteryStatusResponse>} Returns an observable that pushes a status object
@@ -62,7 +57,9 @@ export class BatteryStatus {
     eventObservable: true,
     event: 'batterystatus'
   })
-  onChange(): Observable<BatteryStatusResponse> { return; }
+  onChange(): Observable<BatteryStatusResponse> {
+    return;
+  }
 
   /**
    * Watch when the battery level goes low
@@ -72,16 +69,19 @@ export class BatteryStatus {
     eventObservable: true,
     event: 'batterylow'
   })
-  onLow(): Observable<BatteryStatusResponse> { return; }
+  onLow(): Observable<BatteryStatusResponse> {
+    return;
+  }
 
   /**
-   * Watch when the battery level goes to critial
+   * Watch when the battery level goes to critical
    * @returns {Observable<BatteryStatusResponse>} Returns an observable that pushes a status object
    */
   @Cordova({
     eventObservable: true,
     event: 'batterycritical'
   })
-  onCritical(): Observable<BatteryStatusResponse> { return; }
-
+  onCritical(): Observable<BatteryStatusResponse> {
+    return;
+  }
 }

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

@@ -1,7 +1,12 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
+export interface BLEScanOptions {
+  /** true if duplicate devices should be reported, false (default) if devices should only be reported once.  */
+  reportDuplicates?: boolean;
+}
+
 /**
  * @name BLE
  * @description
@@ -35,59 +40,59 @@ import { Observable } from 'rxjs/Observable';
  *
  * ```typescript
  *   {
- *       "name": "Battery Demo",
- *       "id": "20:FF:D0:FF:D1:C0",
- *       "advertising": [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
- *       "rssi": -55
+ *       'name': 'Battery Demo',
+ *       'id': '20:FF:D0:FF:D1:C0',
+ *       'advertising': [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
+ *       'rssi': -55
  *   }
  * ```
  * After connecting, the peripheral object also includes service, characteristic and descriptor information.
  *
  * ```typescript
  *   {
- *       "name": "Battery Demo",
- *       "id": "20:FF:D0:FF:D1:C0",
- *       "advertising": [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
- *       "rssi": -55,
- *       "services": [
- *           "1800",
- *           "1801",
- *           "180f"
+ *       'name': 'Battery Demo',
+ *       'id': '20:FF:D0:FF:D1:C0',
+ *       'advertising': [2,1,6,3,3,15,24,8,9,66,97,116,116,101,114,121],
+ *       'rssi': -55,
+ *       'services': [
+ *           '1800',
+ *           '1801',
+ *           '180f'
  *       ],
- *       "characteristics": [
+ *       'characteristics': [
  *           {
- *               "service": "1800",
- *               "characteristic": "2a00",
- *               "properties": [
- *                   "Read"
+ *               'service': '1800',
+ *               'characteristic': '2a00',
+ *               'properties': [
+ *                   'Read'
  *               ]
  *           },
  *           {
- *               "service": "1800",
- *               "characteristic": "2a01",
- *               "properties": [
- *                   "Read"
+ *               'service': '1800',
+ *               'characteristic': '2a01',
+ *               'properties': [
+ *                   'Read'
  *               ]
  *           },
  *           {
- *               "service": "1801",
- *               "characteristic": "2a05",
- *               "properties": [
- *                   "Read"
+ *               'service': '1801',
+ *               'characteristic': '2a05',
+ *               'properties': [
+ *                   'Read'
  *               ]
  *           },
  *           {
- *               "service": "180f",
- *               "characteristic": "2a19",
- *               "properties": [
- *                   "Read"
+ *               'service': '180f',
+ *               'characteristic': '2a19',
+ *               'properties': [
+ *                   'Read'
  *               ],
- *               "descriptors": [
+ *               'descriptors': [
  *                   {
- *                       "uuid": "2901"
+ *                       'uuid': '2901'
  *                   },
  *                   {
- *                       "uuid": "2904"
+ *                       'uuid': '2904'
  *                   }
  *               ]
  *           }
@@ -96,7 +101,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  *
  * ## Advertising Data
- * Bluetooth advertising data is returned in when scanning for devices. The format format varies depending on your platform. On Android advertising data will be the raw advertising bytes. iOS does not allow access to raw advertising data, so a dictionary of data is returned.
+ * Bluetooth advertising data is returned in when scanning for devices. The format varies depending on your platform. On Android advertising data will be the raw advertising bytes. iOS does not allow access to raw advertising data, so a dictionary of data is returned.
  *
  * The advertising information for both Android and iOS appears to be a combination of advertising data and scan response data.
  *
@@ -104,10 +109,10 @@ import { Observable } from 'rxjs/Observable';
  *
  * ```typescript
  *   {
- *       "name": "demo",
- *       "id": "00:1A:7D:DA:71:13",
- *       "advertising": ArrayBuffer,
- *      "rssi": -37
+ *       'name': 'demo',
+ *       'id': '00:1A:7D:DA:71:13',
+ *       'advertising': ArrayBuffer,
+ *      'rssi': -37
  *  }
  * ```
  *
@@ -119,24 +124,24 @@ import { Observable } from 'rxjs/Observable';
  *
  * ```typescript
  *   {
- *       "name": "demo",
- *       "id": "D8479A4F-7517-BCD3-91B5-3302B2F81802",
- *       "advertising": {
- *           "kCBAdvDataChannel": 37,
- *           "kCBAdvDataServiceData": {
- *               "FED8": {
- *                   "byteLength": 7 // data not shown
+ *       'name': 'demo',
+ *       'id': 'D8479A4F-7517-BCD3-91B5-3302B2F81802',
+ *       'advertising': {
+ *           'kCBAdvDataChannel': 37,
+ *           'kCBAdvDataServiceData': {
+ *               'FED8': {
+ *                   'byteLength': 7 // data not shown
  *               }
  *           },
- *           "kCBAdvDataLocalName": "demo",
- *           "kCBAdvDataServiceUUIDs": ["FED8"],
- *           "kCBAdvDataManufacturerData": {
- *               "byteLength": 7  // data not shown
+ *           'kCBAdvDataLocalName': 'demo',
+ *           'kCBAdvDataServiceUUIDs': ['FED8'],
+ *           'kCBAdvDataManufacturerData': {
+ *               'byteLength': 7  // data not shown
  *           },
- *           "kCBAdvDataTxPowerLevel": 32,
- *           "kCBAdvDataIsConnectable": true
+ *           'kCBAdvDataTxPowerLevel': 32,
+ *           'kCBAdvDataIsConnectable': true
  *       },
- *       "rssi": -53
+ *       'rssi': -53
  *   }
  * ```
  *
@@ -167,17 +172,18 @@ import { Observable } from 'rxjs/Observable';
  *
  * UUIDs are always strings and not numbers. Some 16-bit UUIDs, such as '2220' look like integers, but they're not. (The integer 2220 is 0x8AC in hex.) This isn't a problem with 128 bit UUIDs since they look like strings 82b9e6e1-593a-456f-be9b-9215160ebcac. All 16-bit UUIDs should also be passed to methods as strings.
  *
+ * @interfaces
+ * BLEScanOptions
  */
 @Plugin({
   pluginName: 'BLE',
   plugin: 'cordova-plugin-ble-central',
   pluginRef: 'ble',
   repo: 'https://github.com/don/cordova-plugin-ble-central',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class BLE {
-
+export class BLE extends IonicNativePlugin {
   /**
    * Scan and discover BLE peripherals for the specified amount of time.
    *
@@ -194,7 +200,9 @@ export class BLE {
   @Cordova({
     observable: true
   })
-  scan(services: string[], seconds: number): Observable<any> { return; }
+  scan(services: string[], seconds: number): Observable<any> {
+    return;
+  }
 
   /**
    * Scan and discover BLE peripherals until `stopScan` is called.
@@ -217,12 +225,14 @@ export class BLE {
     clearFunction: 'stopScan',
     clearWithArgs: false
   })
-  startScan(services: string[]): Observable<any> { return; }
+  startScan(services: string[]): Observable<any> {
+    return;
+  }
 
   /**
    * Scans for BLE devices. This function operates similarly to the `startScan` function, but allows you to specify extra options (like allowing duplicate device reports).
    * @param {string[]} services  List of service UUIDs to discover, or `[]` to find all devices
-   * @param options {any}
+   * @param {BLEScanOptions} options Options
    * @returns {Observable<any>} Returns an Observable that notifies of each peripheral discovered.
    */
   @Cordova({
@@ -230,7 +240,12 @@ export class BLE {
     clearFunction: 'stopScan',
     clearWithArgs: false
   })
-  startScanWithOptions(services: string[], options: {reportDuplicates?: boolean} | any): Observable<any> { return; }
+  startScanWithOptions(
+    services: string[],
+    options: BLEScanOptions
+  ): Observable<any> {
+    return;
+  }
 
   /**
    * Stop a scan started by `startScan`.
@@ -244,10 +259,12 @@ export class BLE {
    *   BLE.stopScan().then(() => { console.log('scan stopped'); });
    * }, 5000);
    * ```
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
-  stopScan(): Promise<any> { return; }
+  stopScan(): Promise<any> {
+    return;
+  }
 
   /**
    * Connect to a peripheral.
@@ -260,15 +277,17 @@ export class BLE {
    *     console.log('disconnected');
    *   });
    * ```
-   * @param deviceId {string}  UUID or MAC address of the peripheral
-   * @return Returns an Observable that notifies of connect/disconnect.
+   * @param {string} deviceId UUID or MAC address of the peripheral
+   * @return {Observable<any>} Returns an Observable that notifies of connect/disconnect.
    */
   @Cordova({
     observable: true,
     clearFunction: 'disconnect',
     clearWithArgs: true
   })
-  connect(deviceId: string): Observable<any> { return; }
+  connect(deviceId: string): Observable<any> {
+    return;
+  }
 
   /**
    * Disconnect from a peripheral.
@@ -278,11 +297,13 @@ export class BLE {
    *     console.log('Disconnected');
    *   });
    * ```
-   * @param deviceId {string}  UUID or MAC address of the peripheral
-   * @return Returns a Promise
+   * @param {string} deviceId  UUID or MAC address of the peripheral
+   * @return {Promise<any>} Returns a Promise
    */
   @Cordova()
-  disconnect(deviceId: string): Promise<any> { return; }
+  disconnect(deviceId: string): Promise<any> {
+    return;
+  }
 
   /**
    * Read the value of a characteristic.
@@ -290,14 +311,16 @@ export class BLE {
    * @param {string} deviceId  UUID or MAC address of the peripheral
    * @param {string} serviceUUID  UUID of the BLE service
    * @param {string} characteristicUUID  UUID of the BLE characteristic
-   * @return Returns a Promise
+   * @return {Promise<any>} Returns a Promise
    */
   @Cordova()
   read(
     deviceId: string,
     serviceUUID: string,
     characteristicUUID: string
-    ): Promise<any> { return; };
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Write the value of a characteristic.
@@ -306,14 +329,14 @@ export class BLE {
    * // send 1 byte to switch a light on
    * var data = new Uint8Array(1);
    * data[0] = 1;
-   * BLE.write(device_id, "FF10", "FF11", data.buffer);
+   * BLE.write(device_id, 'FF10', 'FF11', data.buffer);
    *
    * // send a 3 byte value with RGB color
    * var data = new Uint8Array(3);
    * data[0] = 0xFF;  // red
    * data[0] = 0x00; // green
    * data[0] = 0xFF; // blue
-   * BLE.write(device_id, "ccc0", "ccc1", data.buffer);
+   * BLE.write(device_id, 'ccc0', 'ccc1', data.buffer);
    *
    * // send a 32 bit integer
    * var data = new Uint32Array(1);
@@ -325,7 +348,7 @@ export class BLE {
    * @param {string} serviceUUID  UUID of the BLE service
    * @param {string} characteristicUUID  UUID of the BLE characteristic
    * @param {ArrayBuffer} value  Data to write to the characteristic, as an ArrayBuffer.
-   * @return Returns a Promise
+   * @return {Promise<any>} Returns a Promise
    */
   @Cordova()
   write(
@@ -333,7 +356,9 @@ export class BLE {
     serviceUUID: string,
     characteristicUUID: string,
     value: ArrayBuffer
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Write the value of a characteristic without waiting for confirmation from the peripheral.
@@ -342,7 +367,7 @@ export class BLE {
    * @param {string} serviceUUID  UUID of the BLE service
    * @param {string} characteristicUUID  UUID of the BLE characteristic
    * @param {ArrayBuffer} value  Data to write to the characteristic, as an ArrayBuffer.
-   * @return Returns a Promise
+   * @return {Promise<any>} Returns a Promise
    */
   @Cordova()
   writeWithoutResponse(
@@ -350,14 +375,16 @@ export class BLE {
     serviceUUID: string,
     characteristicUUID: string,
     value: ArrayBuffer
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Register to be notified when the value of a characteristic changes.
    *
    * @usage
    * ```
-   * BLE.startNotification(device_id, "FF10", "FF11").subscribe(buffer => {
+   * BLE.startNotification(device_id, 'FF10', 'FF11').subscribe(buffer => {
    *   console.log(String.fromCharCode.apply(null, new Uint8Array(buffer));
    * });
    * ```
@@ -365,7 +392,7 @@ export class BLE {
    * @param {string} deviceId  UUID or MAC address of the peripheral
    * @param {string} serviceUUID  UUID of the BLE service
    * @param {string} characteristicUUID  UUID of the BLE characteristic
-   * @return Returns an Observable that notifies of characteristic changes.
+   * @return {Observable<any>} Returns an Observable that notifies of characteristic changes.
    */
   @Cordova({
     observable: true,
@@ -376,7 +403,9 @@ export class BLE {
     deviceId: string,
     serviceUUID: string,
     characteristicUUID: string
-    ): Observable<any> { return; }
+  ): Observable<any> {
+    return;
+  }
 
   /**
    * Stop being notified when the value of a characteristic changes.
@@ -391,7 +420,9 @@ export class BLE {
     deviceId: string,
     serviceUUID: string,
     characteristicUUID: string
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Report the connection status.
@@ -407,7 +438,9 @@ export class BLE {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isConnected(deviceId: string): Promise<any> { return; }
+  isConnected(deviceId: string): Promise<any> {
+    return;
+  }
 
   /**
    * Report if bluetooth is enabled.
@@ -415,7 +448,40 @@ export class BLE {
    * @returns {Promise<void>} Returns a Promise that resolves if Bluetooth is enabled, and rejects if disabled.
    */
   @Cordova()
-  isEnabled(): Promise<void> { return; }
+  isEnabled(): Promise<void> {
+    return;
+  }
+
+  /**
+   * Register to be notified when Bluetooth state changes on the device.
+   *
+   * @usage
+   * ```
+   * BLE.startStateNotifications().subscribe(state => {
+   *   console.log("Bluetooth is " + state);
+   * });
+   * ```
+   *
+   * @return {Observable<any>} Returns an Observable that notifies when the Bluetooth is enabled or disabled on the device.
+   */
+  @Cordova({
+    observable: true,
+    clearFunction: 'stopStateNotifications',
+    clearWithArgs: false
+  })
+  startStateNotifications(): Observable<any> {
+    return;
+  }
+
+  /**
+   * Stop state notifications.
+   *
+   * @returns {Promise<any>}
+   */
+  @Cordova()
+  stopStateNotifications(): Promise<any> {
+    return;
+  }
 
   /**
    * Open System Bluetooth settings (Android only).
@@ -423,7 +489,9 @@ export class BLE {
    * @returns {Promise<any>}
    */
   @Cordova()
-  showBluetoothSettings(): Promise<any> { return; }
+  showBluetoothSettings(): Promise<any> {
+    return;
+  }
 
   /**
    * Enable Bluetooth on the device (Android only).
@@ -431,17 +499,19 @@ export class BLE {
    * @returns {Promise<any>}
    */
   @Cordova()
-  enable(): Promise<any> { return; }
+  enable(): Promise<any> {
+    return;
+  }
 
   /**
    * Read the RSSI value on the device connection.
    *
    * @param {string} deviceId  UUID or MAC address of the peripheral
    *
-   *@returns {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
-  static readRSSI(
-    deviceId: string,
-  ): Promise<any> { return; }
+  readRSSI(deviceId: string): Promise<any> {
+    return;
+  }
 }

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

@@ -0,0 +1,114 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
+import { Injectable } from '@angular/core';
+
+/**
+ * Interface of a blink up options.
+ */
+export interface BlinkUpOptions {
+  apiKey: string;
+  developmentPlanId?: string;
+  isInDevelopment?: boolean;
+  timeoutMs?: number;
+}
+
+/**
+ * Interface of a blink up wifi options.
+ */
+export interface BlinkUpWifiOptions {
+  apiKey: string;
+  timeoutMs?: number;
+  ssid: string;
+  password: string;
+}
+
+/**
+ * Interface of a blink up wps options.
+ */
+export interface BlinkUpWPSOptions {
+  apiKey: string;
+  timeoutMs?: number;
+  wpsPin: string;
+}
+
+/**
+ * @name BlinkUp
+ * @description
+ * Electric Imp BlinkUp ionic plugin.
+ *
+ * @usage
+ * ```typescript
+ * import { BlinkUp } from '@ionic-native/blinkup';
+ *
+ * const options = <BlinkUpWifiOptions>{
+ *    apiKey: 'API_KEY',
+ *    timeoutMs: 60000,
+ *    ssid: 'MY_SSID',
+ *    password: 'MY_PASSWORD'
+ *  }
+ *  BlinkUp.flashWifiBlinkUp(options).subscribe(
+ *     (result) => console.log('Done'),
+ *     (error) => console.log(error)
+ *   )
+ * ```
+ */
+@Plugin({
+  pluginName: 'BlinkUp',
+  plugin: 'cordova-plugin-blinkup',
+  pluginRef: 'blinkup',
+  repo: 'https://github.com/SensorShare/cordova-plugin-blinkup',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class BlinkUp extends IonicNativePlugin {
+  /**
+   * startBlinkUp - starts the blinkup process
+   * @param {module:blinkup.BlinkUpOptions} options BlinkUp Options
+   * @return {Observable<any>} Returns an Observable
+   */
+  @Cordova({
+    callbackOrder: 'reverse',
+    observable: true
+  })
+  startBlinkUp(options: BlinkUpOptions): Observable<any> { return; }
+
+  /**
+   * flashWifiBlinkUp - invokes the flash wifi process
+   * @param {module:blinkup.BlinkUpWifiOptions} options BlinkUp Wifi Options
+   * @return {Observable<any>} Returns an Observable
+   */
+  @Cordova({
+    callbackOrder: 'reverse',
+    observable: true
+  })
+  flashWifiBlinkUp(options: BlinkUpWifiOptions): Observable<any> { return; }
+
+  /**
+   * flashWPSBlinkUp - invokes the flash wps process
+   * @param {module:blinkup.BlinkUpWPSOptions} options BlinkUp WPS Options
+   * @return {Observable<any>} Returns an Observable
+   */
+  @Cordova({
+    callbackOrder: 'reverse',
+    observable: true
+  })
+  flashWPSBlinkUp(options: BlinkUpWPSOptions): Observable<any> { return; }
+
+  /**
+   * abortBlinkUp - abort blinkup process
+   * @return {Observable<any>} Returns an Observable
+   */
+  @Cordova({
+    observable: true
+  })
+  abortBlinkUp(): Observable<any> { return; }
+
+  /**
+   * clearBlinkUpData - clear wifi data
+   * @return {Observable<any>} Returns an Observable
+   */
+  @Cordova({
+    observable: true
+  })
+  clearBlinkUpData(): Observable<any> { return; }
+}

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

@@ -1,10 +1,10 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
  * @name Bluetooth Serial
- * @description This plugin enables serial communication over Bluetooth. It was written for communicating between Android or iOS and an Arduino.
+ * @description This plugin enables serial communication over Bluetooth. It was written for communicating between Android or iOS and an Arduino (not Android to Android or iOS to iOS).
  * @usage
  * ```typescript
  * import { BluetoothSerial } from '@ionic-native/bluetooth-serial';
@@ -13,7 +13,7 @@ import { Observable } from 'rxjs/Observable';
  *
  *
  * // Write a string
- * this.bluetoothSerial.write("hello world").then(success, failure);
+ * this.bluetoothSerial.write('hello world').then(success, failure);
  *
  * // Array of int or bytes
  * this.bluetoothSerial.write([186, 220, 222]).then(success, failure);
@@ -35,10 +35,10 @@ import { Observable } from 'rxjs/Observable';
   repo: 'https://github.com/don/BluetoothSerial',
   plugin: 'cordova-plugin-bluetooth-serial',
   pluginRef: 'bluetoothSerial',
-  platforms: ['Android', 'iOS', 'Windows Phone', 'Browser']
+  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class BluetoothSerial {
+export class BluetoothSerial extends IonicNativePlugin {
 
   /**
    * Connect to a Bluetooth device

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

@@ -0,0 +1,257 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+/**
+ * Options for the setupApplePay method.
+ */
+export interface ApplePayOptions {
+  /**
+   * Apple Merchant ID - can be obtained from the Apple Developer Portal.
+   */
+  merchantId: string;
+
+  /**
+   * The currency in which to receive payment.
+   * This is a 3 letter currency code (ISO-4217) - e.g. "GBP", "USD", "MXN", etc.
+   */
+  currency: string;
+
+  /**
+   * The locale in which payment is accepted.
+   * This is a 2 letter country code (ISO-3166-1) - e.g. "GB", "US", "MX"
+   */
+  country: string;
+}
+
+/**
+ * Options for the presentDropInPaymentUI method.
+ */
+export interface PaymentUIOptions {
+  /**
+   * The amount of the transaction to show in the drop-in UI on the
+   * summary row as well as the call-to-action button, as a string.
+   * If not provided, this value will default to "0.00", e.g. free.
+   * Unless you are simply capturing authorizations, you probably
+   * want to fill this value in!
+   */
+  amount?: string;
+
+  /**
+   * The description of the transaction to show in the drop-in UI on the summary row.
+   * Defaults to empty string.
+   */
+  primaryDescription?: string;
+}
+
+/**
+ * Successful callback result for the presentDropInPaymentUI method.
+ */
+export interface PaymentUIResult {
+  /**
+   * Indicates if the user used the cancel button to close the dialog without
+   * completing the payment.
+   */
+  userCancelled: boolean;
+
+  /**
+   * The nonce returned for the payment transaction (if a payment was completed).
+   */
+  nonce: string;
+
+  /**
+   * The payment type (if a payment was completed) (credit card, check, paypal, etc).
+   */
+  type: string;
+
+  /**
+   * A description of the payment method (if a payment was completed).
+   */
+  localizedDescription: string;
+
+  /**
+   * Information about the credit card used to complete a payment (if a credit card was used).
+   */
+  card: {
+    /**
+     * The last two digits of the credit card used.
+     */
+    lastTwo: string;
+
+    /**
+     * An enumerated value used to indicate the type of credit card used.
+     *
+     * Can be one of the following values:
+     *
+     * BTCardNetworkUnknown
+     * BTCardNetworkAMEX
+     * BTCardNetworkDinersClub
+     * BTCardNetworkDiscover
+     * BTCardNetworkMasterCard
+     * BTCardNetworkVisa
+     * BTCardNetworkJCB
+     * BTCardNetworkLaser
+     * BTCardNetworkMaestro
+     * BTCardNetworkUnionPay
+     * BTCardNetworkSolo
+     * BTCardNetworkSwitch
+     * BTCardNetworkUKMaestro
+     */
+    network: string;
+  };
+
+  /**
+   * Information about the PayPal account used to complete a payment (if a PayPal account was used).
+   */
+  payPalAccount: {
+    email: string;
+    firstName: string;
+    lastName: string;
+    phone: string;
+    billingAddress: string;
+    shippingAddress: string;
+    clientMetadataId: string;
+    payerId: string;
+  };
+
+  /**
+   * Information about the Apple Pay card used to complete a payment (if Apple Pay was used).
+   */
+  applePaycard: {};
+
+  /**
+   * Information about 3D Secure card used to complete a payment (if 3D Secure was used).
+   */
+  threeDSecureCard: {
+    liabilityShifted: boolean;
+    liabilityShiftPossible: boolean;
+  };
+
+  /**
+   * Information about Venmo account used to complete a payment (if a Venmo account was used).
+   */
+  venmoAccount: {
+    username: string;
+  };
+}
+
+/**
+ * @name Braintree
+ * @description
+ * This plugin enables the use of the Braintree Drop-In Payments UI in your Ionic applications on Android and iOS, using the native Drop-In UI for each platform (not the Javascript SDK).
+ *
+ *  Ionic Native utilizes [a maintained fork](https://github.com/taracque/cordova-plugin-braintree) of the original `cordova-plugin-braintree`
+ *
+ *  For information on how to use Apple Pay with this plugin, please refer to the [plugin documentation](https://github.com/Taracque/cordova-plugin-braintree#apple-pay-ios-only)
+ *
+ * **NOTE**: This is not a complete payments solution. All of the Braintree client-side UIs simply generate a payment nonce that must then be processed by your server to complete the payment.
+ * See the [Braintree Node server documentation](https://developers.braintreepayments.com/start/hello-server/node) for details and a [sample Express server](https://github.com/braintree/braintree_express_example) that implements the required functionality.
+ *
+ * @usage
+ * ```typescript
+ * import { Braintree, ApplePayOptions, PaymentUIOptions } from '@ionic-native/braintree';
+ *
+ * constructor(private braintree: Braintree) { }
+ *
+ * ...
+ *
+ * // Your Braintree `Tokenization Key` from the Braintree dashboard.
+ * // Alternatively you can also generate this token server-side
+ * // using a client ID in order to allow users to use stored payment methods.
+ * // See the [Braintree Client Token documentation](https://developers.braintreepayments.com/reference/request/client-token/generate/node#customer_id) for details.
+ * const BRAINTREE_TOKEN = '<YOUR_BRAINTREE_TOKEN>';
+ *
+ * // NOTE: Do not provide this unless you have configured your Apple Developer account
+ * // as well as your Braintree merchant account, otherwise the Braintree module will fail.
+ * const appleOptions: ApplePayOptions = {
+ *   merchantId: '<YOUR MERCHANT ID>',
+ *   currency: 'USD',
+ *   country: 'US'
+ * };
+ *
+ * const paymentOptions: PaymentUIOptions = {
+ *   amount: '14.99',
+ *   primaryDescription: 'Your product or service (per /item, /month, /week, etc)',
+ * };
+ *
+ * this.braintree.initialize(BRAINTREE_TOKEN)
+ *   .then(() => this.braintree.setupApplePay(appleOptions))
+ *   .then(() => this.braintree.presentDropInPaymentUI(paymentOptions))
+ *   .then((result: PaymentUIResult) => {
+ *     if (result.userCancelled) {
+ *       console.log("User cancelled payment dialog.");
+ *     } else {
+ *       console.log("User successfully completed payment!");
+ *       console.log("Payment Nonce: " + result.nonce);
+ *       console.log("Payment Result.", result);
+ *     }
+ *   })
+ *   .catch((error: string) => console.error(error));
+ *
+ * ```
+ *
+ * @interfaces
+ * ApplePayOptions
+ * PaymentUIOptions
+ * PaymentUIResult
+ */
+@Plugin({
+  pluginName: 'Braintree',
+  plugin: 'cordova-plugin-braintree',
+  pluginRef: 'BraintreePlugin',
+  repo: 'https://github.com/taracque/cordova-plugin-braintree',
+  platforms: ['Android', 'iOS'],
+  install:
+    'ionic cordova plugin add https://github.com/taracque/cordova-plugin-braintree',
+  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.
+   *
+   * @param {string} token The client token or tokenization key to use with the Braintree client.
+   * @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']
+  })
+  initialize(token: string): Promise<undefined | string> {
+    return;
+  }
+
+  /**
+   * Used to configure Apple Pay on iOS.
+   *  In order for Apple Pay payments to appear on the Drop-In Payments UI, you must initialize the Apple Pay framework before using the Drop-In Payments UI.
+   *
+   *  Do not turn on Apple Pay in Braintree if you don't have Apple Pay entitlements - the Braintree module will reject the attempt to set up Apple Pay.
+   *  Please refer to the [Braintree Merchant Documentation](https://developers.braintreepayments.com/guides/apple-pay/configuration/ios/v4#apple-pay-certificate-request-and-provisioning) to set up a Merchant Account.
+   *
+   *  Calling this function on Android is a `noop` so you can call it without having to check which cordova platform you are on! :D
+   *
+   * @param {ApplePayOptions}options The options used to configure Apple Pay.
+   * @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']
+  })
+  setupApplePay(options: ApplePayOptions): Promise<undefined | string> {
+    return;
+  }
+
+  /**
+   * Shows Braintree's Drop-In Payments UI.
+   *  Apple Pay is only shown in the Drop In UI if you have previously called `setupApplePay`.
+   *
+   * @param options {PaymentUIOptions} An optional argument used to configure the payment UI; see type definition for parameters. If not provided, the UI will show "0.00" as the price and an empty description.
+   * @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']
+  })
+  presentDropInPaymentUI(
+    options?: PaymentUIOptions
+  ): Promise<PaymentUIResult | string> {
+    return;
+  }
+}

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Brightness
@@ -16,7 +16,7 @@ import { Cordova, Plugin } from '@ionic-native/core';
  *
  * ...
  *
- * let brightnessValue: number = 0.8;
+ * let brightnessValue = 0.8;
  * this.brightness.setBrightness(brightnessValue);
  * ```
  *
@@ -29,16 +29,17 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Brightness {
-
+export class Brightness extends IonicNativePlugin {
   /**
    * Sets the brightness of the display.
    *
-   * @param {value} Floating number between 0 and 1 in which case 1 means 100% brightness and 0 means 0% brightness.
+   * @param {number} value Floating number between 0 and 1 in which case 1 means 100% brightness and 0 means 0% brightness.
    * @returns {Promise<any>} Returns a Promise that resolves if setting brightness was successful.
    */
   @Cordova()
-  setBrightness(value: number): Promise<any> { return; }
+  setBrightness(value: number): Promise<any> {
+    return;
+  }
 
   /**
    * Reads the current brightness of the device display.
@@ -47,12 +48,14 @@ export class Brightness {
    * brightness value of the device display (floating number between 0 and 1).
    */
   @Cordova()
-  getBrightness(): Promise<any> { return; }
+  getBrightness(): Promise<any> {
+    return;
+  }
 
   /**
-  * Keeps the screen on. Prevents the device from setting the screen to sleep.
-  */
+   * Keeps the screen on. Prevents the device from setting the screen to sleep.
+   * @param {boolean} value
+   */
   @Cordova()
-  setKeepScreenOn(value: boolean): void { }
-
+  setKeepScreenOn(value: boolean): void {}
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -8,7 +8,7 @@ import { Observable } from 'rxjs/Observable';
  * This plugin adds exchanging events between native code and your app.
  *
  * @usage
- * ```
+ * ```typescript
  * import { Broadcaster } from '@ionic-native/broadcaster';
  *
  * constructor(private broadcaster: Broadcaster) { }
@@ -16,7 +16,7 @@ import { Observable } from 'rxjs/Observable';
  * ...
  *
  * // Listen to events from Native
- * this.broadcaster.addEventListener('eventName').then((event) => console.log(event));
+ * this.broadcaster.addEventListener('eventName').subscribe((event) => console.log(event));
  *
  * // Send event to Native
  * this.broadcaster.fireNativeEvent('eventName', {}).then(() => console.log('success'));
@@ -28,14 +28,13 @@ import { Observable } from 'rxjs/Observable';
   plugin: 'cordova-plugin-broadcaster',
   pluginRef: 'broadcaster',
   repo: 'https://github.com/bsorrentino/cordova-broadcaster',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS', 'Browser']
 })
 @Injectable()
-export class Broadcaster {
-
+export class Broadcaster extends IonicNativePlugin {
   /**
    * This function listen to an event sent from the native code
-   * @param eventName {string}
+   * @param {string} eventName
    * @return {Observable<any>} Returns an observable to watch when an event is received
    */
   @Cordova({
@@ -43,15 +42,18 @@ export class Broadcaster {
     clearFunction: 'removeEventListener',
     clearWithArgs: true
   })
-  addEventListener(eventName: string): Observable<any> { return; }
+  addEventListener(eventName: string): Observable<any> {
+    return;
+  }
 
   /**
    * This function sends data to the native code
-   * @param eventName {string}
-   * @param eventData {any}
+   * @param {string} eventName
+   * @param {any} eventData
    * @return {Promise<any>} Returns a promise that resolves when an event is successfully fired
    */
   @Cordova()
-  fireNativeEvent(eventName: string, eventData: any): Promise<any> { return; }
-
+  fireNativeEvent(eventName: string, eventData: any): Promise<any> {
+    return;
+  }
 }

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

@@ -1,5 +1,5 @@
-import { Plugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Browser Tab
@@ -7,27 +7,19 @@ import { Injectable } from '@angular/core';
  * This plugin provides an interface to in-app browser tabs that exist on some mobile platforms, specifically [Custom Tabs](http://developer.android.com/tools/support-library/features.html#custom-tabs) on Android (including the [Chrome Custom Tabs](https://developer.chrome.com/multidevice/android/customtabs) implementation), and [SFSafariViewController](https://developer.apple.com/library/ios/documentation/SafariServices/Reference/SFSafariViewController_Ref/) on iOS.
  *
  * @usage
- * ```
+ * ```typescript
  * import { BrowserTab } from '@ionic-native/browser-tab';
  *
  * constructor(private browserTab: BrowserTab) {
  *
  *   browserTab.isAvailable()
- *     .then((isAvailable: boolean) => {
- *
+ *     .then(isAvailable => {
  *       if (isAvailable) {
- *
  *         browserTab.openUrl('https://ionic.io');
- *
  *       } else {
- *
  *         // open URL with InAppBrowser instead or SafariViewController
- *
  *       }
- *
  *     });
- *
- *
  * }
  *
  * ```
@@ -40,14 +32,15 @@ import { Injectable } from '@angular/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class BrowserTab {
-
+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> { return; }
+  isAvailable(): Promise<any> {
+    return;
+  }
 
   /**
    * Opens the provided URL using a browser tab
@@ -55,12 +48,16 @@ export class BrowserTab {
    * @return {Promise<any>} Returns a promise that resolves when check open was successful
    */
   @Cordova()
-  openUrl(url: string): Promise<any> { return; }
+  openUrl(url: string): Promise<any> {
+    return;
+  }
 
   /**
    * Closes browser tab
    * @return {Promise<any>} Returns a promise that resolves when close was finished
    */
   @Cordova()
-  close(): Promise<any> { return; }
+  close(): Promise<any> {
+    return;
+  }
 }

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

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface CalendarOptions {
-
   /**
    * Id
    */
@@ -47,7 +46,14 @@ export interface CalendarOptions {
    * URL
    */
   url?: string;
+}
 
+export interface NameOrOptions {
+  /** Calendar name */
+  calendarName?: string;
+
+  /** Calendar color as a HEX string */
+  calendarColor?: string;
 }
 
 /**
@@ -59,8 +65,8 @@ export interface CalendarOptions {
  *
  *
  * @usage
- * ```
- * import {Calendar} from '@ionic-native/calendar';
+ * ```typescript
+ * import { Calendar } from '@ionic-native/calendar';
  *
  * constructor(private calendar: Calendar) { }
  *
@@ -72,6 +78,7 @@ export interface CalendarOptions {
  * ```
  * @interfaces
  * CalendarOptions
+ * NameOrOptions
  */
 @Plugin({
   pluginName: 'Calendar',
@@ -81,13 +88,12 @@ export interface CalendarOptions {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Calendar {
-
+export class Calendar extends IonicNativePlugin {
   /**
    * This function checks if we have permission to read/write from/to the calendar.
    * The promise will resolve with `true` when:
    * - You're running on iOS, or
-   * - You're targetting API level lower than 23, or
+   * - You're targeting API level lower than 23, or
    * - You're using Android < 6, or
    * - You've already granted permission
    *
@@ -95,51 +101,65 @@ export class Calendar {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  hasReadWritePermission(): Promise<boolean> { return; }
+  hasReadWritePermission(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Check if we have read permission
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  hasReadPermission(): Promise<boolean> { return; }
+  hasReadPermission(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Check if we have write permission
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  hasWritePermission(): Promise<boolean> { return; }
+  hasWritePermission(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Request write permission
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestWritePermission(): Promise<any> { return; }
+  requestWritePermission(): Promise<any> {
+    return;
+  }
 
   /**
    * Request read permission
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestReadPermission(): Promise<any> { return; }
+  requestReadPermission(): Promise<any> {
+    return;
+  }
 
   /**
    * Requests read/write permissions
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestReadWritePermission(): Promise<any> { return; }
+  requestReadWritePermission(): Promise<any> {
+    return;
+  }
 
   /**
    * Create a calendar. (iOS only)
    *
-   * @param {string | Object} nameOrOptions  either a string name or a options object. If string, provide the calendar name. IF an object, provide a calendar name as a string and a calendar color in hex format as a string
+   * @param {string | CalendarOptions} nameOrOptions  either a string name or a options object. If string, provide the calendar name. IF an object, provide a calendar name as a string and a calendar color in hex format as a string
    * @returns {Promise<any>} Returns a Promise
    */
   @Cordova()
-  createCalendar(nameOrOptions: string | any): Promise<any> { return; }
+  createCalendar(nameOrOptions: string | CalendarOptions): Promise<any> {
+    return;
+  }
 
   /**
    * Delete a calendar. (iOS only)
@@ -147,7 +167,9 @@ export class Calendar {
    * @returns {Promise<any>} Returns a Promise
    */
   @Cordova()
-  deleteCalendar(name: string): Promise<any> { return; }
+  deleteCalendar(name: string): Promise<any> {
+    return;
+  }
 
   /**
    * Returns the default calendar options.
@@ -157,7 +179,21 @@ export class Calendar {
   @Cordova({
     sync: true
   })
-  getCalendarOptions(): CalendarOptions { return; }
+  getCalendarOptions(): CalendarOptions {
+    return;
+  }
+
+  /**
+   * Returns options for a custom calender with specific color
+   *
+   * @return {NameOrOptions} Returns an object with the default options
+   */
+  @Cordova({
+    sync: true
+  })
+  getCreateCalendarOptions(): NameOrOptions {
+    return;
+  }
 
   /**
    * Silently create an event.
@@ -175,7 +211,9 @@ export class Calendar {
     notes?: string,
     startDate?: Date,
     endDate?: Date
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Silently create an event with additional options.
@@ -196,7 +234,9 @@ export class Calendar {
     startDate?: Date,
     endDate?: Date,
     options?: CalendarOptions
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Interactively create an event.
@@ -215,7 +255,9 @@ export class Calendar {
     notes?: string,
     startDate?: Date,
     endDate?: Date
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Interactively create an event with additional options.
@@ -236,7 +278,9 @@ export class Calendar {
     startDate?: Date,
     endDate?: Date,
     options?: CalendarOptions
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Find an event.
@@ -255,7 +299,9 @@ export class Calendar {
     notes?: string,
     startDate?: Date,
     endDate?: Date
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Find an event with additional options.
@@ -275,7 +321,9 @@ export class Calendar {
     startDate?: Date,
     endDate?: Date,
     options?: CalendarOptions
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Find a list of events within the specified date range. (Android only)
@@ -287,14 +335,18 @@ export class Calendar {
   @Cordova({
     platforms: ['Android']
   })
-  listEventsInRange(startDate: Date, endDate: Date): Promise<any> { return; }
+  listEventsInRange(startDate: Date, endDate: Date): Promise<any> {
+    return;
+  }
 
   /**
    * Get a list of all calendars.
    * @returns {Promise<any>} A Promise that resolves with the list of calendars, or rejects with an error.
    */
   @Cordova()
-  listCalendars(): Promise<any> { return; }
+  listCalendars(): Promise<any> {
+    return;
+  }
 
   /**
    * Get a list of all future events in the specified calendar. (iOS only)
@@ -303,7 +355,9 @@ export class Calendar {
   @Cordova({
     platforms: ['iOS']
   })
-  findAllEventsInNamedCalendar(calendarName: string): Promise<any> { return; }
+  findAllEventsInNamedCalendar(calendarName: string): Promise<any> {
+    return;
+  }
 
   /**
    * Modify an event. (iOS only)
@@ -334,7 +388,9 @@ export class Calendar {
     newNotes?: string,
     newStartDate?: Date,
     newEndDate?: Date
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Modify an event with additional options. (iOS only)
@@ -369,7 +425,9 @@ export class Calendar {
     newEndDate?: Date,
     filterOptions?: CalendarOptions,
     newOptions?: CalendarOptions
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Delete an event.
@@ -388,7 +446,9 @@ export class Calendar {
     notes?: string,
     startDate?: Date,
     endDate?: Date
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Delete an event from the specified Calendar. (iOS only)
@@ -411,7 +471,9 @@ export class Calendar {
     startDate?: Date,
     endDate?: Date,
     calendarName?: string
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Open the calendar at the specified date.
@@ -419,6 +481,7 @@ export class Calendar {
    * @return {Promise<any>} Promise returns a promise
    */
   @Cordova()
-  openCalendar(date: Date): Promise<any> { return; }
-
+  openCalendar(date: Date): Promise<any> {
+    return;
+  }
 }

src/@ionic-native/plugins/call-log/index.ts

@@ -0,0 +1,67 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+export interface CallLogObject {
+  name: string;
+  value: string | Array<string>;
+  operator: '==' | '!=' | '>' | '>=' | '<' | '<=' | 'like';
+}
+
+/**
+ * @name Call Log
+ * @description
+ * This plugin access the call history on a device and that can be filtered
+ *
+ * @usage
+ * ```typescript
+ * import { CallLog } from '@ionic-native/call-log';
+ *
+ *
+ * constructor(private callLog: CallLog) { }
+ *
+ * ````
+ * @interfaces
+ * CallLogObject
+ *
+ */
+@Plugin({
+  pluginName: 'CallLog',
+  plugin: 'cordova-plugin-calllog',
+  pluginRef: 'plugins.callLog',
+  repo: 'https://github.com/creacore-team/cordova-plugin-calllog',
+  platforms: ['Android']
+})
+@Injectable()
+export class CallLog extends IonicNativePlugin {
+  /**
+   * This function return the call logs
+   * @param {CallLogObject[]} filters array of object to filter the query
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getCallLog(filters: CallLogObject[]): Promise<any> {
+    return;
+  }
+
+  /**
+   * Check permission
+   * @returns {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  hasReadPermission(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Request permission
+   * @returns {Promise<any>}
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  requestReadPermission(): Promise<any> {
+    return;
+  }
+}

src/@ionic-native/plugins/call-number/index.ts

@@ -1,22 +1,24 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
 /**
  * @name Call Number
  * @description
  * Call a number directly from your Cordova/Ionic application.
+ * **NOTE**: The iOS Simulator (and maybe Android Simulators) do not provide access to the phone subsystem.
  *
  * @usage
- * ```
- * import {CallNumber} from '@ionic-native/call-number';
+ * ```typescript
+ * import { CallNumber } from '@ionic-native/call-number';
  *
  * constructor(private callNumber: CallNumber) { }
  *
  * ...
  *
  *
- * this.callNumber.callNumber(18001010101, true)
- *   .then(() => console.log('Launched dialer!'))
- *   .catch(() => console.log('Error launching dialer'));
+ * this.callNumber.callNumber("18001010101", true)
+ *   .then(res => console.log('Launched dialer!', res))
+ *   .catch(err => console.log('Error launching dialer', err));
  *
  * ```
  */
@@ -25,15 +27,14 @@ import { Plugin, Cordova } from '@ionic-native/core';
   plugin: 'call-number',
   pluginRef: 'plugins.CallNumber',
   repo: 'https://github.com/Rohfosho/CordovaCallNumberPlugin',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CallNumber {
-
+export class CallNumber extends IonicNativePlugin {
   /**
    * Calls a phone number
-   * @param numberToCall {string} The phone number to call as a string
-   * @param bypassAppChooser {boolean} Set to true to bypass the app chooser and go directly to dialer
+   * @param {string} numberToCall The phone number to call as a string
+   * @param {boolean} bypassAppChooser Set to true to bypass the app chooser and go directly to dialer
    * @return {Promise<any>}
    */
   @Cordova({
@@ -43,4 +44,14 @@ export class CallNumber {
     return;
   }
 
+  /**
+   * Check if call feature is available
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    callbackOrder: 'reverse'
+  })
+  isCallSupported(): Promise<any> {
+    return;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface CameraPreviewDimensions {
   /** The width of the camera preview, default to window.screen.width */
@@ -36,15 +36,21 @@ export interface CameraPreviewOptions {
 
   /** Alpha channel of the preview box, float, [0,1], default 1 */
   alpha?: number;
+
+  /** Tap to set specific focus point. Note, this assumes the camera is full-screen. default false */
+  tapToFocus?: boolean;
+
+  /** On Android disable automatic rotation of the image and stripping of Exit header. default false */
+  disableExifHeaderStripping?: boolean;
 }
 
 export interface CameraPreviewPictureOptions {
-    /** The width in pixels, default 0 */
-    width?: number;
-    /** The height in pixels, default 0 */
-    height?: number;
-    /** The picture quality, 0 - 100, default 85 */
-    quality?: number;
+  /** The width in pixels, default 0 */
+  width?: number;
+  /** The height in pixels, default 0 */
+  height?: number;
+  /** The picture quality, 0 - 100, default 85 */
+  quality?: number;
 }
 
 /**
@@ -57,7 +63,7 @@ export interface CameraPreviewPictureOptions {
  *
  * @usage
  * ```typescript
- * import { CameraPreview, PictureOptions, CameraPreviewOptions, CameraPreviewDimensions } from '@ionic-native/camera-preview';
+ * import { CameraPreview, CameraPreviewPictureOptions, CameraPreviewOptions, CameraPreviewDimensions } from '@ionic-native/camera-preview';
  *
  * constructor(private cameraPreview: CameraPreview) { }
  *
@@ -93,7 +99,7 @@ export interface CameraPreviewPictureOptions {
  *
  *
  * // picture options
- * const pictureOpts: PictureOptions = {
+ * const pictureOpts: CameraPreviewPictureOptions = {
  *   width: 1280,
  *   height: 1280,
  *   quality: 85
@@ -128,11 +134,54 @@ export interface CameraPreviewPictureOptions {
   pluginName: 'CameraPreview',
   plugin: 'cordova-plugin-camera-preview',
   pluginRef: 'CameraPreview',
-  repo: 'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
+  repo:
+    'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CameraPreview {
+export class CameraPreview extends IonicNativePlugin {
+  FOCUS_MODE = {
+    FIXED: 'fixed',
+    AUTO: 'auto',
+    CONTINUOUS: 'continuous', // IOS Only
+    CONTINUOUS_PICTURE: 'continuous-picture', // Android Only
+    CONTINUOUS_VIDEO: 'continuous-video', // Android Only
+    EDOF: 'edof', // Android Only
+    INFINITY: 'infinity', // Android Only
+    MACRO: 'macro' // Android Only
+  };
+
+  EXPOSURE_MODE = {
+    LOCK: 'lock', // IOS Only
+    AUTO: 'auto', // IOS Only
+    CONTINUOUS: 'continuous',
+    CUSTOM: 'custom'
+  };
+
+  FLASH_MODE = {
+    OFF: 'off',
+    ON: 'on',
+    AUTO: 'auto',
+    RED_EYE: 'red-eye',
+    TORCH: 'torch' // Android Only
+  };
+
+  COLOR_EFFECT = {
+    AQUA: 'aqua', // Android Only
+    BLACKBOARD: 'blackboard', // Android Only
+    MONO: 'mono',
+    NEGATIVE: 'negative',
+    NONE: 'none',
+    POSTERIZE: 'posterize',
+    SEPIA: 'sepia',
+    SOLARIZE: 'solarize', // Android Only
+    WHITEBOARD: 'whiteboard' // Android Only
+  };
+
+  CAMERA_DIRECTION = {
+    BACK: 'back',
+    FRONT: 'front'
+  };
 
   /**
    * Starts the camera preview instance.
@@ -143,58 +192,58 @@ export class CameraPreview {
     successIndex: 1,
     errorIndex: 2
   })
-  startCamera(options: CameraPreviewOptions): Promise<any> { return; }
+  startCamera(options: CameraPreviewOptions): Promise<any> {
+    return;
+  }
 
   /**
    * Stops the camera preview instance. (iOS & Android)
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
-  stopCamera(): Promise<any> { return; }
+  @Cordova()
+  stopCamera(): Promise<any> {
+    return;
+  }
 
   /**
    * Switch from the rear camera and front camera, if available.
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
-  switchCamera(): Promise<any> { return; }
+  @Cordova()
+  switchCamera(): Promise<any> {
+    return;
+  }
 
   /**
    * Hide the camera preview box.
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
-  hide(): Promise<any> { return; }
+  @Cordova()
+  hide(): Promise<any> {
+    return;
+  }
 
   /**
    * Show the camera preview box.
    * @return {Promise<any>}
    */
-  @Cordova({
-    successIndex: 0,
-    errorIndex: 1
-  })
-  show(): Promise<any> { return; }
+  @Cordova()
+  show(): Promise<any> {
+    return;
+  }
 
   /**
    * Take the picture (base64)
-   * @param [options] {CameraPreviewPictureOptions} size and quality of the picture to take
+   * @param {CameraPreviewPictureOptions} [options] size and quality of the picture to take
    * @return {Promise<any>}
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 2
   })
-  takePicture(options?: CameraPreviewPictureOptions): Promise<any> { return; }
+  takePicture(options?: CameraPreviewPictureOptions): Promise<any> {
+    return;
+  }
 
   /**
    *
@@ -207,7 +256,9 @@ export class CameraPreview {
     successIndex: 1,
     errorIndex: 2
   })
-  setColorEffect(effect: string): Promise<any> { return; }
+  setColorEffect(effect: string): Promise<any> {
+    return;
+  }
 
   /**
    * Set the zoom (Android)
@@ -218,30 +269,191 @@ export class CameraPreview {
     successIndex: 1,
     errorIndex: 2
   })
-  setZoom(zoom?: number): Promise<any> { return; }
+  setZoom(zoom?: number): Promise<any> {
+    return;
+  }
 
+  /**
+   * Get the maximum zoom (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getMaxZoom(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get current zoom (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getZoom(): Promise<any> {
+    return;
+  }
 
   /**
    * Set the preview Size
-   * @param [dimensions] {CameraPreviewDimensions}
-   * @return {Promise<any>}
-   */
-  @Cordova({
-    successIndex: 1,
-    errorIndex: 2,
-    platforms: ['Android']
-  })
-  setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> { return; }
-
-  /**
-   * Set the flashmode
-   * @param [flashMode] {string} 'off' (iOS & Android), 'on' (iOS & Android), 'auto' (iOS & Android), 'torch' (Android)
+   * @param {CameraPreviewDimensions} [dimensions]
    * @return {Promise<any>}
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 2
   })
-  setFlashMode(flashMode?: string): Promise<any> { return; }
+  setPreviewSize(dimensions?: CameraPreviewDimensions): Promise<any> {
+    return;
+  }
 
+  /**
+   * Get focus mode
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getFocusMode(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Set the focus mode
+   * @param {string} [focusMode] 'fixed', 'auto', 'continuous-picture', 'continuous-video' (iOS & Android), 'edof', 'infinity', 'macro' (Android Only)
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  setFocusMode(focusMode?: string): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get supported focus modes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getSupportedFocusModes(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get the current flash mode
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getFlashMode(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Set the flash mode
+   * @param {string} [flashMode] 'off' (iOS & Android), 'on' (iOS & Android), 'auto' (iOS & Android), 'torch' (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  setFlashMode(flashMode?: string): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get supported flash modes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getSupportedFlashModes(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get supported picture sizes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getSupportedPictureSizes(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get exposure mode
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureMode(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get exposure modes
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureModes(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Set exposure mode
+   * @param {string} [lock]
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  setExposureMode(lock?: string): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get exposure compensation (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureCompensation(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Set exposure compensation (Android)
+   * @param {number} [exposureCompensation]
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 1,
+    errorIndex: 2
+  })
+  setExposureCompensation(exposureCompensation?: number): Promise<any> {
+    return;
+  }
+
+  /**
+   * Get exposure compensation range (Android)
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  getExposureCompensationRange(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Set specific focus point. Note, this assumes the camera is full-screen.
+   * @param {number} xPoint
+   * @param {number} yPoint
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  tapToFocus(xPoint: number, yPoint: number): Promise<any> {
+    return;
+  }
+
+  /**
+   * Add a listener for the back event for the preview
+   * @return {Promise<any>} if back button pressed
+   */
+  @Cordova()
+  onBackButton(): Promise<any> {
+    return;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, 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 */
@@ -85,12 +85,48 @@ export interface CameraPopoverOptions {
   arrowDir: number;
 }
 
+export enum DestinationType {
+  DATA_URL = 0,
+  FILE_URL,
+  NATIVE_URI
+}
+
+export enum EncodingType {
+  JPEG = 0,
+  PNG
+}
+
+export enum MediaType {
+  PICTURE = 0,
+  VIDEO,
+  ALLMEDIA
+}
+
+export enum PictureSourceType {
+  PHOTOLIBRARY = 0,
+  CAMERA,
+  SAVEDPHOTOALBUM
+}
+
+export enum PopoverArrowDirection {
+  ARROW_UP = 1,
+  ARROW_DOWN,
+  ARROW_LEFT,
+  ARROW_RIGHT,
+  ARROW_ANY
+}
+
+export enum Direction {
+  BACK = 0,
+  FRONT
+}
+
 /**
  * @name Camera
  * @description
  * Take a photo or capture video.
  *
- * Requires and the Cordova plugin: `cordova-plugin-camera`. For more info, please see the [Cordova Camera Plugin Docs](https://github.com/apache/cordova-plugin-camera).
+ * Requires the Cordova plugin: `cordova-plugin-camera`. For more info, please see the [Cordova Camera Plugin Docs](https://github.com/apache/cordova-plugin-camera).
  *
  * @usage
  * ```typescript
@@ -125,10 +161,10 @@ export interface CameraPopoverOptions {
   plugin: 'cordova-plugin-camera',
   pluginRef: 'navigator.camera',
   repo: 'https://github.com/apache/cordova-plugin-camera',
-  platforms: ['Android', 'BlackBerry', 'Browser', 'Firefox', 'FireOS', 'iOS', 'Windows', 'Windows Phone 8', 'Ubuntu']
+  platforms: ['Android', 'Browser', 'iOS', 'Windows']
 })
 @Injectable()
-export class Camera {
+export class Camera extends IonicNativePlugin {
 
   /**
    * Constant for possible destination types

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

@@ -1,8 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface CardIOOptions {
-
   /**
    * Set to true to require expiry date
    */
@@ -21,7 +20,7 @@ export interface CardIOOptions {
   /**
    * 	Removes the keyboard button from the scan screen.
    */
-  supressManual?: boolean;
+  suppressManual?: boolean;
 
   /**
    * The postal code will only collect numeric input. Set this if you know the expected country's postal code has only numeric postal codes.
@@ -82,11 +81,9 @@ 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
    */
@@ -126,14 +123,18 @@ export interface CardIOResponse {
    * Cardholder name
    */
   cardholderName: string;
-
 }
 
 /**
  * @name Card IO
  * @description
  * @usage
- * ```
+ * Note: For use with iOS 10 + When building your app with the iOS 10 SDK +, you have to add some info to the info.plist file. This is due to increased security in iOS 10. Go to your app directory and search for the <your app name>Info.plist file. Add the following lines in the main <dict> element.
+ * ```xml
+ *<key>NSCameraUsageDescription</key>
+ *<string>To scan credit cards.</string>
+ *```
+ * ```typescript
  * import { CardIO } from '@ionic-native/card-io';
  *
  * constructor(private cardIO: CardIO) { }
@@ -147,7 +148,7 @@ export interface CardIOResponse {
  *       if(res){
  *         let options = {
  *           requireExpiry: true,
- *           requireCCV: false,
+ *           requireCVV: false,
  *           requirePostalCode: false
  *         };
  *         CardIO.scan(options);
@@ -164,11 +165,10 @@ export interface CardIOResponse {
   plugin: 'card.io.cordova.mobilesdk',
   pluginRef: 'CardIO',
   repo: 'https://github.com/card-io/card.io-Cordova-Plugin',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CardIO {
-
+export class CardIO extends IonicNativePlugin {
   /**
    * Check whether card scanning is currently available. (May vary by
    * device, OS version, network connectivity, etc.)
@@ -176,21 +176,26 @@ export class CardIO {
    * @returns {Promise<boolean>}
    */
   @Cordova()
-  canScan(): Promise<boolean> { return; }
+  canScan(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Scan a credit card with card.io.
-   * @param {CardIOOptions} options Options for configuring the plugin
+   * @param {CardIOOptions} [options] Options for configuring the plugin
    * @returns {Promise<any>}
    */
   @Cordova()
-  scan(options?: CardIOOptions): Promise<CardIOResponse> { return; }
+  scan(options?: CardIOOptions): Promise<CardIOResponse> {
+    return;
+  }
 
   /**
    * Retrieve the version of the card.io library. Useful when contacting support.
    * @returns {Promise<string>}
    */
   @Cordova()
-  version(): Promise<string> { return; }
-
+  version(): Promise<string> {
+    return;
+  }
 }

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

@@ -1,12 +1,10 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 /**
  * @name Clipboard
  * @description
  * Clipboard management plugin for Cordova that supports iOS, Android, and Windows Phone 8.
  *
- * Requires Cordova plugin: https://github.com/VersoSolutions/CordovaClipboard
- * For more info, please see the [Clipboard plugin docs](https://github.com/VersoSolutions/CordovaClipboard.git).
  *
  * @usage
  * ```typescript
@@ -31,13 +29,13 @@ import { Cordova, Plugin } from '@ionic-native/core';
  */
 @Plugin({
   pluginName: 'Clipboard',
-  plugin: 'https://github.com/VersoSolutions/CordovaClipboard.git',
+  plugin: 'cordova-clipboard',
   pluginRef: 'cordova.plugins.clipboard',
-  repo: 'https://github.com/VersoSolutions/CordovaClipboard',
-  platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser']
+  repo: 'https://github.com/ihadeed/cordova-clipboard',
+  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
 @Injectable()
-export class Clipboard {
+export class Clipboard extends IonicNativePlugin {
 
   /**
    * Copies the given text

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

@@ -1,9 +1,18 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
+
 namespace Http {
   export const enum Verb {
-    GET, HEAD, POST, PUT, DELETE, TRACE, OPTIONS, CONNECT, PATCH
+    GET,
+    HEAD,
+    POST,
+    PUT,
+    DELETE,
+    TRACE,
+    OPTIONS,
+    CONNECT,
+    PATCH
   }
 
   export interface Response {
@@ -13,7 +22,12 @@ namespace Http {
 
   export interface Requester {
     request(verb: Verb, url: string, callback: Callback<Response>): void;
-    request(verb: Verb, url: string, requestBody: string, callback: Callback<Response>): void;
+    request(
+      verb: Verb,
+      url: string,
+      requestBody: string,
+      callback: Callback<Response>
+    ): void;
   }
 }
 
@@ -46,19 +60,26 @@ export interface IRemotePackage extends IPackage {
   /**
    * Downloads the package update from the CodePush service.
    *
-   * @param downloadSuccess Called with one parameter, the downloaded package information, once the download completed successfully.
-   * @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.
+   * @param {SuccessCallback} downloadSuccess Called with one parameter, the downloaded package information, once the download completed successfully.
+   * @param {ErrorCallback} [downloadError] Optional callback invoked in case of an error.
+   * @param {SuccessCallback<DownloadProgress>} [downloadProgress] Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
    */
-  download(downloadSuccess: SuccessCallback<ILocalPackage>, downloadError?: ErrorCallback, downloadProgress?: SuccessCallback<DownloadProgress>): void;
+  download(
+    downloadSuccess: SuccessCallback<ILocalPackage>,
+    downloadError?: ErrorCallback,
+    downloadProgress?: SuccessCallback<DownloadProgress>
+  ): void;
 
   /**
    * Aborts the current download session, previously started with download().
    *
-   * @param abortSuccess Optional callback invoked if the abort operation succeeded.
-   * @param abortError Optional callback invoked in case of an error.
+   * @param {SuccessCallback<void>} [abortSuccess] Optional callback invoked if the abort operation succeeded.
+   * @param {ErrorCallback} [abortError] Optional callback invoked in case of an error.
    */
-  abortDownload(abortSuccess?: SuccessCallback<void>, abortError?: ErrorCallback): void;
+  abortDownload(
+    abortSuccess?: SuccessCallback<void>,
+    abortError?: ErrorCallback
+  ): void;
 }
 
 /**
@@ -82,11 +103,15 @@ export interface ILocalPackage extends IPackage {
    * On the first run after the update, the application will wait for a codePush.notifyApplicationReady() call. Once this call is made, the install operation is considered a success.
    * Otherwise, the install operation will be marked as failed, and the application is reverted to its previous version on the next run.
    *
-   * @param installSuccess Callback invoked if the install operation succeeded.
-   * @param installError Optional callback inovoked in case of an error.
-   * @param installOptions Optional parameter used for customizing the installation behavior.
+   * @param {SuccessCallback<InstallMode>} installSuccess Callback invoked if the install operation succeeded.
+   * @param {ErrorCallback} [installError] Optional callback invoked in case of an error.
+   * @param {InstallOptions} [installOptions] Optional parameter used for customizing the installation behavior.
    */
-  install(installSuccess: SuccessCallback<InstallMode>, errorCallback?: ErrorCallback, installOptions?: InstallOptions): void;
+  install(
+    installSuccess: SuccessCallback<InstallMode>,
+    errorCallback?: ErrorCallback,
+    installOptions?: InstallOptions
+  ): void;
 }
 
 /**
@@ -109,8 +134,8 @@ interface LocalPackage_Static {
 }
 /* tslint:enable */
 
-declare var RemotePackage: RemotePackage_Static;
-declare var LocalPackage: LocalPackage_Static;
+declare const RemotePackage: RemotePackage_Static;
+declare const LocalPackage: LocalPackage_Static;
 
 /**
  * Defines the JSON format of the current package information file.
@@ -123,13 +148,19 @@ interface IPackageInfoMetadata extends ILocalPackage {
 }
 
 interface NativeUpdateNotification {
-  updateAppVersion: boolean;   // Always true
+  updateAppVersion: boolean; // Always true
   appVersion: string;
 }
 
-export interface Callback<T> { (error: Error, parameter: T): void; }
-export interface SuccessCallback<T> { (result?: T): void; }
-export interface ErrorCallback { (error?: Error): void; }
+export interface Callback<T> {
+  (error: Error, parameter: T): void;
+}
+export interface SuccessCallback<T> {
+  (result?: T): void;
+}
+export interface ErrorCallback {
+  (error?: Error): void;
+}
 
 interface Configuration {
   appVersion: string;
@@ -146,53 +177,80 @@ declare class AcquisitionStatus {
 
 declare class AcquisitionManager {
   constructor(httpRequester: Http.Requester, configuration: Configuration);
-  public queryUpdateWithCurrentPackage(currentPackage: IPackage, callback?: Callback<IRemotePackage | NativeUpdateNotification>): void;
-  public reportStatusDeploy(pkg?: IPackage, status?: string, previousLabelOrAppVersion?: string, previousDeploymentKey?: string, callback?: Callback<void>): void;
+  public queryUpdateWithCurrentPackage(
+    currentPackage: IPackage,
+    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(packageSuccess: SuccessCallback<ILocalPackage>, packageError?: ErrorCallback): void;
+  getCurrentPackage(
+    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.
+   * This happens 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(packageSuccess: SuccessCallback<ILocalPackage>, packageError?: ErrorCallback): void;
+  getPendingPackage(
+    packageSuccess: SuccessCallback<ILocalPackage>,
+    packageError?: ErrorCallback
+  ): void;
 
   /**
    * Checks with the CodePush server if an update package is available for download.
    *
-   * @param querySuccess Callback invoked in case of a successful response from the server.
+   * @param {SuccessCallback<IRemotePackage>} querySuccess Callback invoked in case of a successful response from the server.
    *                     The callback takes one RemotePackage parameter. A non-null package is a valid update.
    *                     A null package means the application is up to date for the current native application version.
-   * @param queryError Optional callback invoked in case of an error.
-   * @param deploymentKey Optional deployment key that overrides the config.xml setting.
+   * @param {ErrorCallback} [queryError] Optional callback invoked in case of an error.
+   * @param {string} [deploymentKey] Optional deployment key that overrides the config.xml setting.
    */
-  checkForUpdate(querySuccess: SuccessCallback<IRemotePackage>, queryError?: ErrorCallback, deploymentKey?: string): void;
+  checkForUpdate(
+    querySuccess: SuccessCallback<IRemotePackage>,
+    queryError?: ErrorCallback,
+    deploymentKey?: string
+  ): void;
 
   /**
    * Notifies the plugin that the update operation succeeded and that the application is ready.
    * Calling this function is required on the first run after an update. On every subsequent application run, calling this function is a noop.
    * If using sync API, calling this function is not required since sync calls it internally.
    *
-   * @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.
+   * @param {SuccessCallback<void>} [notifySucceeded] Optional callback invoked if the plugin was successfully notified.
+   * @param {ErrorCallback} [notifyFailed] Optional callback invoked in case of an error during notifying the plugin.
    */
-  notifyApplicationReady(notifySucceeded?: SuccessCallback<void>, notifyFailed?: ErrorCallback): void;
+  notifyApplicationReady(
+    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.
+   *
+   * @param {SuccessCallback<void>} installSuccess
+   * @param {ErrorCallback} [errorCallback]
    */
-  restartApplication(installSuccess: SuccessCallback<void>, errorCallback?: ErrorCallback): void;
+  restartApplication(
+    installSuccess: SuccessCallback<void>,
+    errorCallback?: ErrorCallback
+  ): void;
 
   /**
    * Convenience method for installing updates in one method call.
@@ -209,13 +267,17 @@ interface CodePushCordovaPlugin {
    * - If no update is available on the server, or if a previously rolled back update is available and the ignoreFailedUpdates is set to true, the syncCallback will be invoked with the SyncStatus.UP_TO_DATE.
    * - If an error occurs during checking for update, downloading or installing it, the syncCallback will be invoked with the SyncStatus.ERROR.
    *
-   * @param syncCallback Optional callback to be called with the status of the sync operation.
+   * @param {SuccessCallback<SyncStatus>} [syncCallback] Optional callback to be called with the status of the sync operation.
    *                     The callback will be called only once, and the possible statuses are defined by the SyncStatus enum.
-   * @param syncOptions Optional SyncOptions parameter configuring the behavior of the sync operation.
-   * @param downloadProgress Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
+   * @param {SyncOptions} [syncOptions] Optional SyncOptions parameter configuring the behavior of the sync operation.
+   * @param {SuccessCallback<DownloadProgress>} [downloadProgress] Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
    *
    */
-  sync(syncCallback?: SuccessCallback<SyncStatus>, syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): void;
+  sync(
+    syncCallback?: SuccessCallback<SyncStatus>,
+    syncOptions?: SyncOptions,
+    downloadProgress?: SuccessCallback<DownloadProgress>
+  ): void;
 }
 
 /**
@@ -400,7 +462,7 @@ export interface DownloadProgress {
  * @description
  * CodePush plugin for Cordova by Microsoft that supports iOS and Android.
  *
- * For more info, please see https://github.com/ksachdeva/ionic2-code-push-example
+ * For more info, please see https://github.com/Dellos7/example-cordova-code-push-plugin
  *
  * @usage
  * ```typescript
@@ -427,13 +489,10 @@ export interface DownloadProgress {
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CodePush {
-
+export class CodePush extends IonicNativePlugin {
   /**
    * 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.
    * @returns {Promise<ILocalPackage>}
    */
   @Cordova()
@@ -443,7 +502,7 @@ export class CodePush {
 
   /**
    * 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.
+   * This happens only after a package has been installed using ON_NEXT_RESTART or ON_NEXT_RESUME mode, but the application was not restarted/resumed yet.
    * @returns {Promise<ILocalPackage>}
    */
   @Cordova()
@@ -454,11 +513,7 @@ export class CodePush {
   /**
    * Checks with the CodePush server if an update package is available for download.
    *
-   * @param querySuccess Callback invoked in case of a successful response from the server.
-   *                     The callback takes one RemotePackage parameter. A non-null package is a valid update.
-   *                     A null package means the application is up to date for the current native application version.
-   * @param queryError Optional callback invoked in case of an error.
-   * @param deploymentKey Optional deployment key that overrides the config.xml setting.
+   * @param {string} [deploymentKey] Optional deployment key that overrides the config.xml setting.
    * @returns {Promise<IRemotePackage>}
    */
   @Cordova({
@@ -473,8 +528,6 @@ export class CodePush {
    * Calling this function is required on the first run after an update. On every subsequent application run, calling this function is a noop.
    * If using sync API, calling this function is not required since sync calls it internally.
    *
-   * @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.
    * @returns {Promise<void>}
    */
   @Cordova()
@@ -507,9 +560,8 @@ export class CodePush {
    * - If no update is available on the server, or if a previously rolled back update is available and the ignoreFailedUpdates is set to true, the syncCallback will be invoked with the SyncStatus.UP_TO_DATE.
    * - If an error occurs during checking for update, downloading or installing it, the syncCallback will be invoked with the SyncStatus.ERROR.
    *
-   * @param syncCallback Optional callback to be called with the status of the sync operation.
-   * @param syncOptions Optional SyncOptions parameter configuring the behavior of the sync operation.
-   * @param downloadProgress Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
+   * @param {SyncOptions} [syncOptions] Optional SyncOptions parameter configuring the behavior of the sync operation.
+   * @param {SuccessCallback<DownloadProgress>} [downloadProgress] Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
    * @returns {Observable<SyncStatus>}
    *
    */
@@ -518,8 +570,10 @@ export class CodePush {
     successIndex: 0,
     errorIndex: 3 // we don't need this, so we set it to a value higher than # of args
   })
-  sync(syncOptions?: SyncOptions, downloadProgress?: SuccessCallback<DownloadProgress>): Observable<SyncStatus> {
+  sync(
+    syncOptions?: SyncOptions,
+    downloadProgress?: SuccessCallback<DownloadProgress>
+  ): Observable<SyncStatus> {
     return;
   }
-
 }

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

@@ -1,13 +1,47 @@
-import { Injectable } from '@angular/core';
-import { CordovaInstance, InstanceProperty, Plugin, getPromise, InstanceCheck, checkAvailability, CordovaCheck } from '@ionic-native/core';
+import {
+  checkAvailability,
+  CordovaCheck,
+  CordovaInstance,
+  getPromise,
+  InstanceCheck,
+  InstanceProperty,
+  IonicNativePlugin,
+  Plugin
+} from '@ionic-native/core';
 
-declare var window: any,
-  navigator: any;
+declare const window: any, navigator: any;
 
-export type ContactFieldType = '*' | 'addresses' | 'birthday' | 'categories' | 'country' | 'department' | 'displayName' | 'emails' | 'familyName' | 'formatted' | 'givenName' | 'honorificPrefix' | 'honorificSuffix' | 'id' | 'ims' | 'locality' | 'middleName' | 'name' | 'nickname' | 'note' | 'organizations' | 'phoneNumbers' | 'photos' | 'postalCode' | 'region' | 'streetAddress' | 'title' | 'urls';
+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';
 
 export interface IContactProperties {
-
   /** A globally unique identifier. */
   id?: string;
 
@@ -71,15 +105,19 @@ export class Contact implements IContactProperties {
   @InstanceProperty categories: IContactField[];
   @InstanceProperty urls: IContactField[];
 
+  [key: string]: any;
+
   constructor() {
-    if (checkAvailability('navigator.contacts', 'create', 'Contacts') === true) {
+    if (
+      checkAvailability('navigator.contacts', 'create', 'Contacts') === true
+    ) {
       this._objectInstance = navigator.contacts.create();
     }
   }
 
   @InstanceCheck()
   clone(): Contact {
-    let newContact = new Contact();
+    let newContact: any = new Contact();
     for (let prop in this) {
       if (prop === 'id') return;
       newContact[prop] = this[prop];
@@ -88,12 +126,14 @@ export class Contact implements IContactProperties {
   }
 
   @CordovaInstance()
-  remove(): Promise<any> { return; }
+  remove(): Promise<any> {
+    return;
+  }
 
   @InstanceCheck()
   save(): Promise<any> {
-    return getPromise((resolve, reject) => {
-      this._objectInstance.save((contact) => {
+    return getPromise((resolve: Function, reject: Function) => {
+      this._objectInstance.save((contact: any) => {
         this._objectInstance = contact;
         resolve(this);
       }, reject);
@@ -114,7 +154,7 @@ export interface IContactError {
 /**
  * @hidden
  */
-export declare var ContactError: {
+export declare const ContactError: {
   new (code: number): IContactError;
   UNKNOWN_ERROR: number;
   INVALID_ARGUMENT_ERROR: number;
@@ -122,7 +162,7 @@ export declare var ContactError: {
   PENDING_OPERATION_ERROR: number;
   IO_ERROR: number;
   NOT_SUPPORTED_ERROR: number;
-  PERMISSION_DENIED_ERROR: number
+  PERMISSION_DENIED_ERROR: number;
 };
 
 export interface IContactName {
@@ -144,17 +184,19 @@ export interface IContactName {
  * @hidden
  */
 export class ContactName implements IContactName {
-  constructor(public formatted?: string,
-              public familyName?: string,
-              public givenName?: string,
-              public middleName?: string,
-              public honorificPrefix?: string,
-              public honorificSuffix?: string) {}
+  constructor(
+    public formatted?: string,
+    public familyName?: string,
+    public givenName?: string,
+    public middleName?: string,
+    public honorificPrefix?: string,
+    public honorificSuffix?: string
+  ) {}
 }
 
 export interface IContactField {
   /** A string that indicates what type of field this is, home for example. */
-    type?: string;
+  type?: string;
   /** The value of the field, such as a phone number or email address. */
   value?: string;
   /** Set to true if this ContactField contains the user's preferred value. */
@@ -165,16 +207,18 @@ export interface IContactField {
  * @hidden
  */
 export class ContactField implements IContactField {
-  constructor(public type?: string,
-              public value?: string,
-              public pref?: boolean) {}
+  constructor(
+    public type?: string,
+    public value?: string,
+    public pref?: boolean
+  ) {}
 }
 
 export interface IContactAddress {
   /** Set to true if this ContactAddress contains the user's preferred value. */
   pref?: boolean;
   /** A string indicating what type of field this is, home for example. */
-    type?: string;
+  type?: string;
   /** The full address formatted for display. */
   formatted?: string;
   /** The full street address. */
@@ -193,21 +237,23 @@ export interface IContactAddress {
  * @hidden
  */
 export class ContactAddress implements IContactAddress {
-  constructor(public pref?: boolean,
-              public type?: string,
-              public formatted?: string,
-              public streetAddress?: string,
-              public locality?: string,
-              public region?: string,
-              public postalCode?: string,
-              public country?: string) {}
+  constructor(
+    public pref?: boolean,
+    public type?: string,
+    public formatted?: string,
+    public streetAddress?: string,
+    public locality?: string,
+    public region?: string,
+    public postalCode?: string,
+    public country?: string
+  ) {}
 }
 
 export interface IContactOrganization {
   /** Set to true if this ContactOrganization contains the user's preferred value. */
   pref?: boolean;
   /** A string that indicates what type of field this is, home for example. */
-    type?: string;
+  type?: string;
   /** The name of the organization. */
   name?: string;
   /** The department the contract works for. */
@@ -247,10 +293,12 @@ export interface IContactFindOptions {
  * @hidden
  */
 export class ContactFindOptions implements IContactFindOptions {
-  constructor(public filter?: string,
-              public multiple?: boolean,
-              public desiredFields?: string[],
-              public hasPhoneNumber?: boolean) {}
+  constructor(
+    public filter?: string,
+    public multiple?: boolean,
+    public desiredFields?: string[],
+    public hasPhoneNumber?: boolean
+  ) {}
 }
 
 /**
@@ -291,11 +339,19 @@ export class ContactFindOptions implements IContactFindOptions {
   plugin: 'cordova-plugin-contacts',
   pluginRef: 'navigator.contacts',
   repo: 'https://github.com/apache/cordova-plugin-contacts',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows 8', 'Windows Phone']
+  platforms: [
+    'Android',
+    'BlackBerry 10',
+    'Browser',
+    'Firefox OS',
+    'iOS',
+    'Ubuntu',
+    'Windows',
+    'Windows 8',
+    'Windows Phone'
+  ]
 })
-@Injectable()
-export class Contacts {
-
+export class Contacts extends IonicNativePlugin {
   /**
    * Create a single contact.
    * @returns {Contact} Returns a Contact object
@@ -306,16 +362,24 @@ export class Contacts {
 
   /**
    * Search for contacts in the Contacts list.
-   * @param fields {ContactFieldType[]}  Contact fields to be used as a search qualifier
-   * @param options {IContactFindOptions} Optional options for the query
+   * @param {ContactFieldType[]} fields Contact fields to be used as a search qualifier
+   * @param {IContactFindOptions} [options] Optional options for the query
    * @returns {Promise<Contact[]>} Returns a Promise that resolves with the search results (an array of Contact objects)
    */
   @CordovaCheck()
-  find(fields: ContactFieldType[], options?: IContactFindOptions): Promise<Contact[]> {
-    return getPromise((resolve, reject) => {
-      navigator.contacts.find(fields, (contacts) => {
-        resolve(contacts.map(processContact));
-      }, reject, options);
+  find(
+    fields: ContactFieldType[],
+    options?: IContactFindOptions
+  ): Promise<Contact[]> {
+    return getPromise((resolve: Function, reject: Function) => {
+      navigator.contacts.find(
+        fields,
+        (contacts: any[]) => {
+          resolve(contacts.map(processContact));
+        },
+        reject,
+        options
+      );
     });
   }
 
@@ -325,17 +389,19 @@ export class Contacts {
    */
   @CordovaCheck()
   pickContact(): Promise<Contact> {
-    return getPromise((resolve, reject) => {
-      navigator.contacts.pickContact((contact) => resolve(processContact(contact)), reject);
+    return getPromise((resolve: Function, reject: Function) => {
+      navigator.contacts.pickContact(
+        (contact: any) => resolve(processContact(contact)),
+        reject
+      );
     });
   }
-
 }
 
 /**
  * @hidden
  */
-function processContact(contact) {
+function processContact(contact: any) {
   let newContact = new Contact();
   for (let prop in contact) {
     if (typeof contact[prop] === 'function') continue;

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

@@ -1,4 +1,4 @@
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
 
 
@@ -8,28 +8,119 @@ import { Injectable } from '@angular/core';
  * Plugin to install Couchbase Lite in your PhoneGap app on iOS or Android
  *
  * @usage
- * ```
+ * ```typescript
  * import { CouchbaseLite } from '@ionic-native/couchbase-lite';
- *
- * constructor(private couchbase: CouchbaseLite) {
- *
- *   couchbase.getURL()
- *     .then(url => console.log(url))
- *     .catch(error => console.error(error));
- *
+ * import { Http } from '@angular/http';
+ * import { Observable } from 'rxjs/Observable'
+ * constructor(private couchbase: CouchbaseLite, private platform:Platform,private _http:Http) {
+ *    this.initMethod();
  * }
+ * url:string;
+ * initMethod() {
+ *    this.couchbase.getURL().then((url)=> {
+ *        this.url = url;
+ *    })
+ * }
+ * getUrl() {
+ *      return this.url;
+ * }
+ * // DATABASES //
+ * createDatabase(database_name:string) {
+ *      let url = this.getUrl();
+ *      url = url+database_name;
+ *      return this._http
+ *        .put(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *         })
+ *  }
+ * deleteDatabase(database_name:string) {
+ *      let url = this.getUrl();
+ *      url = url+database_name;
+ *      return this._http
+ *        .delete(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })
+ * }
+ * getAllDbs() {
+ *      let url = this.getUrl();
+ *      url = url+'_all_dbs';
+ *      return this._http
+ *        .get(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })
+ * }
+ * // DOCUMENTS //
+ * getAllDocuments(database_name:string){
+ *      let url = this.getUrl();
+ *      // include_docs=true will include a doc inside response, it is false by default
+ *      url = url + database_name + '/_all_docs?include_docs=true';
+ *      return this._http
+ *        .get(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })        .
+ * }      
+ * createDocument(database_name:string,document){   
+ *      let url = this.getUrl();
+ *      url = url + database_name;
+ *      return this._http
+ *        .post(url,document)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })        .
+ * }
+ * let document = {
+ *    _id:'You can either specify the document ID (must be string) else couchbase generates one for your doc',
+ *    data:{name:'sandman',age:25,city:pune}
+ *  }
+ * createDocument('justbe', document);
+ * // successful response
+ * { "id": "string","rev": "string","ok": true }
+ * updateDocument(database_name:string,document){    
+ *      let url = this.getUrl();
+ *      url = url + database_name + '/' + document._id;     
+ *      return this._http
+ *        .put(url,document)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })        .
+ * }
+ * // for updation of document your document must contain most recent rev(revision) id.
+ * // for each updation of document new rev id is get generated
+ * // successful response
+ * { "id": "string","rev": "string(new revision id)","ok": true }
+ * deleteDocument(database_name:string,document){
+ *      let url = this.getUrl();
+ *      url = url + database_name + '/' + document._id +'?rev='+doc._rev;
+ *      return this._http
+ *        .delete(url)
+ *        .map(data => { this.results = data['results'] })
+ *        .catch((error:any) => {
+ *           return Observable.throw(error.json() || 'Couchbase Lite error');
+ *        })        .
+ * }
+ *
  *
  * ```
  */
 @Plugin({
   pluginName: 'CouchbaseLite',
-  plugin: 'https://github.com/couchbaselabs/Couchbase-Lite-PhoneGap-Plugin',
+  plugin: 'couchbase-lite-phonegap-plugin',
   pluginRef: 'cblite',
   repo: 'https://github.com/couchbaselabs/Couchbase-Lite-PhoneGap-Plugin',
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class CouchbaseLite {
+export class CouchbaseLite extends IonicNativePlugin {
 
   /**
    * Get the database url
@@ -38,6 +129,6 @@ export class CouchbaseLite {
   @Cordova({
     callbackStyle: 'node'
   })
-  getURL(): Promise<any> { return;  }
+  getURL(): Promise<any> { return; }
 
 }

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

@@ -1,12 +1,18 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+export interface CropOptions {
+  quality?: number;
+  targetHeight?: number;
+  targetWidth?: number;
+}
 
 /**
  * @name Crop
  * @description Crops images
  * @usage
- * ```
- * import {Crop} from '@ionic-native/crop';
+ * ```typescript
+ * import { Crop } from '@ionic-native/crop';
  *
  * constructor(private crop: Crop) { }
  *
@@ -14,10 +20,12 @@ import { Cordova, Plugin } from '@ionic-native/core';
  *
  * this.crop.crop('path/to/image.jpg', {quality: 75})
  *   .then(
- *     newImage => console.log("new image path is: " + newImage),
- *     error => console.error("Error cropping image", error)
+ *     newImage => console.log('new image path is: ' + newImage),
+ *     error => console.error('Error cropping image', error)
  *   );
  * ```
+ * @interfaces
+ * CropOptions
  */
 @Plugin({
   pluginName: 'Crop',
@@ -27,17 +35,17 @@ import { Cordova, Plugin } from '@ionic-native/core';
   platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Crop {
-
+export class Crop extends IonicNativePlugin {
   /**
    * Crops an image
-   * @param pathToImage
-   * @param options
+   * @param {string} pathToImage
+   * @param {CropOptions} [options]
    * @returns {Promise<string>} Returns a promise that resolves with the new image path, or rejects if failed to crop.
    */
   @Cordova({
     callbackOrder: 'reverse'
   })
-  crop(pathToImage: string, options?: {quality: number}): Promise<string> { return; }
-
+  crop(pathToImage: string, options?: CropOptions): Promise<string> {
+    return;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import {Cordova, Plugin} from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 export interface DatePickerOptions {
   /**
@@ -21,13 +21,13 @@ export interface DatePickerOptions {
 
   /**
    * Maximum date
-   * Default?: empty String
+   * Default: empty String
    */
   maxDate?: Date | string | number;
 
   /**
    * Label for the dialog title. If empty, uses android default (Set date/Set time).
-   * Default?: empty String
+   * Default: empty String
    */
   titleText?: string;
 
@@ -116,7 +116,6 @@ export interface DatePickerOptions {
    * Force locale for datePicker.
    */
   locale?: string;
-
 }
 
 /**
@@ -154,8 +153,7 @@ export interface DatePickerOptions {
   platforms: ['Android', 'iOS', 'Windows']
 })
 @Injectable()
-export class DatePicker {
-
+export class DatePicker extends IonicNativePlugin {
   /**
    * @hidden
    */
@@ -176,5 +174,4 @@ export class DatePicker {
   show(options: DatePickerOptions): Promise<Date> {
     return;
   }
-
 }

src/@ionic-native/plugins/db-meter/index.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 /**
@@ -21,7 +21,7 @@ import { Observable } from 'rxjs/Observable';
  *
  * // Check if we are listening
  * this.dbMeter.isListening().then(
- *   (isListening: boolean) => console.log(isListening)
+ *   isListening => console.log(isListening)
  * );
  *
  * // Stop listening
@@ -39,11 +39,10 @@ import { Observable } from 'rxjs/Observable';
   plugin: 'cordova-plugin-dbmeter',
   pluginRef: 'DBMeter',
   repo: 'https://github.com/akofman/cordova-plugin-dbmeter',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class DBMeter {
-
+export class DBMeter extends IonicNativePlugin {
   /**
    * Starts listening
    * @returns {Observable<any>} Returns an observable. Subscribe to start listening. Unsubscribe to stop listening.
@@ -52,27 +51,34 @@ export class DBMeter {
     observable: true,
     clearFunction: 'stop'
   })
-  start(): Observable<any> { return; }
+  start(): Observable<any> {
+    return;
+  }
 
   /**
    * Stops listening
    * @hidden
    */
   @Cordova()
-  stop(): Promise<any> { return; }
+  stop(): Promise<any> {
+    return;
+  }
 
   /**
    * Check if the DB Meter is listening
    * @returns {Promise<boolean>} Returns a promise that resolves with a boolean that tells us whether the DB meter is listening
    */
   @Cordova()
-  isListening(): Promise<boolean> { return; }
+  isListening(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Delete the DB Meter instance
    * @returns {Promise<any>} Returns a promise that will resolve if the instance has been deleted, and rejects if errors occur.
    */
   @Cordova()
-  delete(): Promise<any> { return; }
-
+  delete(): Promise<any> {
+    return;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeeplinkMatch {
@@ -23,6 +23,13 @@ export interface DeeplinkMatch {
 
 }
 
+export interface DeeplinkOptions {
+  /**
+   * Set the matched route as root page using `navCtrl.setRoot()` method.
+   */
+  root: boolean;
+}
+
 /**
  * @name Deeplinks
  * @description This plugin handles deeplinks on iOS and Android for both custom URL scheme links
@@ -49,7 +56,7 @@ export interface DeeplinkMatch {
  *    });
  * ```
  *
- * Alternatively, if you're using Ionic 2, there's a convenience method that takes a reference to a `NavController` and handles
+ * Alternatively, if you're using Ionic, there's a convenience method that takes a reference to a `NavController` and handles
  * the actual navigation for you:
  *
  * ```typescript
@@ -67,7 +74,7 @@ export interface DeeplinkMatch {
  *   });
  * ```
  *
- * See the [Ionic 2 Deeplinks Demo](https://github.com/driftyco/ionic2-deeplinks-demo/blob/master/app/app.ts) for an example of how to
+ * See the [Ionic Deeplinks Demo](https://github.com/ionic-team/ionic2-deeplinks-demo/blob/master/app/app.ts) for an example of how to
  * retrieve the `NavController` reference at runtime.
  *
  * @interfaces
@@ -77,18 +84,18 @@ export interface DeeplinkMatch {
   pluginName: 'Deeplinks',
   plugin: 'ionic-plugin-deeplinks',
   pluginRef: 'IonicDeeplink',
-  repo: 'https://github.com/driftyco/ionic-plugin-deeplinks',
-  platforms: ['iOS', 'Android', 'Browser'],
-  install: 'ionic 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']
+  repo: 'https://github.com/ionic-team/ionic-plugin-deeplinks',
+  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=/',
+  installVariables: ['URL_SCHEME', 'DEEPLINK_SCHEME', 'DEEPLINK_HOST', 'ANDROID_PATH_PREFIX'],
+  platforms: ['Android', 'Browser', 'iOS']
 })
 @Injectable()
-export class Deeplinks {
+export class Deeplinks extends IonicNativePlugin {
 
   /**
    * Define a set of paths to match against incoming deeplinks.
    *
-   * @param {paths} Define a set of paths to match against incoming deeplinks.
+   * @param {paths} paths Define a set of paths to match against incoming deeplinks.
    * paths takes an object of the form { 'path': data }. If a deeplink
    * matches the path, the resulting path-data pair will be returned in the
    * promise result which you can then use to navigate in the app as you see fit.
@@ -98,29 +105,33 @@ export class Deeplinks {
   @Cordova({
     observable: true
   })
-  route(paths): Observable<DeeplinkMatch> { return; }
+  route(paths: any): Observable<DeeplinkMatch> { return; }
 
   /**
    *
    * This is a convenience version of `route` that takes a reference to a NavController
-   * from Ionic 2, or a custom class that conforms to this protocol:
+   * from Ionic, or a custom class that conforms to this protocol:
    *
    * NavController.push = function(View, Params){}
    *
    * This handler will automatically navigate when a route matches. If you need finer-grained
    * control over the behavior of a matching deeplink, use the plain `route` method.
    *
-   * @param {paths} Define a set of paths to match against incoming deeplinks.
+   * @param {Nav} navController Define a set of paths to match against incoming deeplinks.
    * paths takes an object of the form { 'path': data }. If a deeplink
    * matches the path, the resulting path-data pair will be returned in the
    * promise result which you can then use to navigate in the app as you see fit.
    *
+   * @param {Object} paths
+   * 
+   * @param {DeeplinkOptions} options
+   *
    * @returns {Observable<DeeplinkMatch>} Returns an Observable that resolves each time a deeplink comes through, and
    * errors if a deeplink comes through that does not match a given path.
    */
   @Cordova({
     observable: true
   })
-  routeWithNavController(navController, paths): Observable<DeeplinkMatch> { return; }
+  routeWithNavController(navController: any, paths: any, options?: DeeplinkOptions): Observable<DeeplinkMatch> { return; }
 
 }

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

@@ -1,5 +1,16 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+export interface AndroidAccount {
+  /** Account creator */
+  CREATOR: AndroidAccount;
+
+  /** Account name */
+  name: string;
+
+  /** Account type */
+  type: string;
+}
 
 /**
  * @name Device Accounts
@@ -19,43 +30,52 @@ import { Cordova, Plugin } from '@ionic-native/core';
  *   .catch(error => console.error(error));
  *
  * ```
+ * @interfaces
+ * AndroidAccount
  */
 @Plugin({
   pluginName: 'DeviceAccounts',
-  plugin: 'https://github.com/loicknuchel/cordova-device-accounts.git',
+  plugin: 'cordova-device-accounts',
   pluginRef: 'plugins.DeviceAccounts',
-  repo: 'https://github.com/loicknuchel/cordova-device-accounts',
+  repo: 'https://github.com/danielsogl/cordova-device-accounts',
   platforms: ['Android']
 })
 @Injectable()
-export class DeviceAccounts {
-
+export class DeviceAccounts extends IonicNativePlugin {
   /**
    *  Gets all accounts registered on the Android Device
-   * @returns {Promise<any>}
+   * @returns {Promise<AndroidAccount[]>}
    */
   @Cordova()
-  get(): Promise<any> { return; }
+  get(): Promise<AndroidAccount[]> {
+    return;
+  }
 
   /**
    *  Get all accounts registered on Android device for requested type
-   * @returns {Promise<any>}
+   * @param {string} type
+   * @returns {Promise<AndroidAccount[]>}
    */
   @Cordova()
-  getByType(type: string): Promise<any> { return; }
+  getByType(type: string): Promise<AndroidAccount[]> {
+    return;
+  }
 
   /**
    *  Get all emails registered on Android device (accounts with 'com.google' type)
-   * @returns {Promise<any>}
+   * @returns {Promise<string[]>}
    */
   @Cordova()
-  getEmails(): Promise<any> { return; }
+  getEmails(): Promise<string[]> {
+    return;
+  }
 
   /**
    *  Get the first email registered on Android device
-   * @returns {Promise<any>}
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getEmail(): Promise<any> { return; }
-
+  getEmail(): Promise<string> {
+    return;
+  }
 }

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

@@ -1,5 +1,14 @@
 import { Injectable } from '@angular/core';
-import { Plugin, Cordova } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+export interface DeviceFeedbackEnabled {
+  /** Haptic Feedback */
+  haptic: boolean;
+
+  /** Acoustic Feedback */
+  acoustic: boolean;
+}
+
 /**
  * @name Device Feedback
  * @description
@@ -7,7 +16,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
  * Plugin that lets you provide haptic or acoustic feedback on Android devices.
  *
  * @usage
- * ```
+ * ```typescript
  * import { DeviceFeedback } from '@ionic-native/device-feedback';
  *
  * constructor(private deviceFeedback: DeviceFeedback) { }
@@ -19,8 +28,7 @@ import { Plugin, Cordova } from '@ionic-native/core';
  *
  * this.deviceFeedback.haptic(0);
  *
- * this.deviceFeedback.isFeedbackEnabled()
- *   .then((feedback) => {
+ * this.deviceFeedback.isFeedbackEnabled().then(feedback => {
  *     console.log(feedback);
  *     // {
  *     //   acoustic: true,
@@ -29,6 +37,8 @@ import { Plugin, Cordova } from '@ionic-native/core';
  *   });
  *
  * ```
+ * @innterfaces
+ * DeviceFeedbackEnabled
  */
 @Plugin({
   pluginName: 'DeviceFeedback',
@@ -38,26 +48,26 @@ import { Plugin, Cordova } from '@ionic-native/core';
   platforms: ['Android']
 })
 @Injectable()
-export class DeviceFeedback {
-
+export class DeviceFeedback extends IonicNativePlugin {
   /**
    * Provide sound feedback to user, nevertheless respect user's settings and current active device profile as native feedback do.
    */
   @Cordova({ sync: true })
-  acoustic(): void { }
+  acoustic(): void {}
 
   /**
    * Provide vibrate feedback to user, nevertheless respect user's tactile feedback setting as native feedback do.
-   * @param type {Number} Specify type of vibration feedback. 0 for long press, 1 for virtual key, or 3 for keyboard tap.
+   * @param {number} type Specify type of vibration feedback. 0 for long press, 1 for virtual key, or 3 for keyboard tap.
    */
   @Cordova({ sync: true })
-  haptic(type: number): void { }
+  haptic(type: number): void {}
 
   /**
    * Check if haptic and acoustic feedback is enabled by user settings.
-   * @returns {Promise<any>}
+   * @returns {Promise<DeviceFeedbackEnabled>}
    */
   @Cordova()
-  isFeedbackEnabled(): Promise<{ haptic: boolean; acoustic: boolean; }> { return; }
-
+  isFeedbackEnabled(): Promise<DeviceFeedbackEnabled> {
+    return;
+  }
 }

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

@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface DeviceMotionAccelerationData {
@@ -72,10 +72,10 @@ export interface DeviceMotionAccelerometerOptions {
   plugin: 'cordova-plugin-device-motion',
   pluginRef: 'navigator.accelerometer',
   repo: 'https://github.com/apache/cordova-plugin-device-motion',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone 8']
 })
 @Injectable()
-export class DeviceMotion {
+export class DeviceMotion extends IonicNativePlugin {
 
   /**
    * Get the current acceleration along the x, y, and z axes.

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

@@ -1,9 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } 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,12 +21,10 @@ export interface DeviceOrientationCompassHeading {
   /**
    * The time at which this heading was determined. (DOMTimeStamp)
    */
-  timestamp: any;
-
+  timestamp: number;
 }
 
 export interface DeviceOrientationCompassOptions {
-
   /**
    * How often to retrieve the compass heading in milliseconds. (Number) (Default: 100)
    */
@@ -37,7 +34,6 @@ 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;
-
 }
 
 /**
@@ -77,23 +73,35 @@ export interface DeviceOrientationCompassOptions {
   plugin: 'cordova-plugin-device-orientation',
   pluginRef: 'navigator.compass',
   repo: 'https://github.com/apache/cordova-plugin-device-orientation',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
+  platforms: [
+    'Amazon Fire OS',
+    'Android',
+    'BlackBerry 10',
+    'Browser',
+    'Firefox OS',
+    'iOS',
+    'Tizen',
+    'Ubuntu',
+    'Windows',
+    'Windows Phone'
+  ]
 })
 @Injectable()
-export class DeviceOrientation {
-
+export class DeviceOrientation extends IonicNativePlugin {
   /**
    * Get the current compass heading.
    * @returns {Promise<DeviceOrientationCompassHeading>}
    */
   @Cordova()
-  getCurrentHeading(): Promise<DeviceOrientationCompassHeading> { return; }
+  getCurrentHeading(): Promise<DeviceOrientationCompassHeading> {
+    return;
+  }
 
   /**
    * Get the device current heading at a regular interval
    *
    * Stop the watch by unsubscribing from the observable
-   * @param {DeviceOrientationCompassOptions} options Options for compass. Frequency and Filter. Optional
+   * @param {DeviceOrientationCompassOptions} [options] Options for compass. Frequency and Filter. Optional
    * @returns {Observable<DeviceOrientationCompassHeading>} Returns an observable that contains the compass heading
    */
   @Cordova({
@@ -101,6 +109,9 @@ export class DeviceOrientation {
     observable: true,
     clearFunction: 'clearWatch'
   })
-  watchHeading(options?: DeviceOrientationCompassOptions): Observable<DeviceOrientationCompassHeading> { return; }
-
+  watchHeading(
+    options?: DeviceOrientationCompassOptions
+  ): Observable<DeviceOrientationCompassHeading> {
+    return;
+  }
 }

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

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
-import { CordovaProperty, Plugin } from '@ionic-native/core';
+import { CordovaProperty, Plugin, IonicNativePlugin } from '@ionic-native/core';
 
-declare var window: any;
+declare const window: any;
 
 /**
  * @name Device
@@ -24,10 +24,10 @@ declare var window: any;
   plugin: 'cordova-plugin-device',
   pluginRef: 'device',
   repo: 'https://github.com/apache/cordova-plugin-device',
-  platforms: ['Android', 'BlackBerry 10', 'Browser', 'Firefox OS', 'iOS', 'OS X', 'Tizen', 'Ubuntu', 'Windows', 'Windows Phone']
+  platforms: ['Android', 'Browser', 'iOS', 'macOS', 'Windows']
 })
 @Injectable()
-export class Device {
+export class Device extends IonicNativePlugin {
 
   /** Get the version of Cordova running on the device. */
   @CordovaProperty

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

@@ -1,5 +1,10 @@
 import { Injectable } from '@angular/core';
-import {Cordova, Plugin, CordovaProperty} from '@ionic-native/core';
+import {
+  Cordova,
+  CordovaProperty,
+  IonicNativePlugin,
+  Plugin
+} from '@ionic-native/core';
 
 /**
  * @name Diagnostic
@@ -42,8 +47,7 @@ import {Cordova, Plugin, CordovaProperty} from '@ionic-native/core';
   platforms: ['Android', 'iOS', 'Windows']
 })
 @Injectable()
-export class Diagnostic {
-
+export class Diagnostic extends IonicNativePlugin {
   permission = {
     READ_CALENDAR: 'READ_CALENDAR',
     WRITE_CALENDAR: 'WRITE_CALENDAR',
@@ -92,9 +96,23 @@ export class Diagnostic {
     CONTACTS: ['READ_CONTACTS', 'WRITE_CONTACTS', 'GET_ACCOUNTS'],
     LOCATION: ['ACCESS_FINE_LOCATION', 'ACCESS_COARSE_LOCATION'],
     MICROPHONE: ['RECORD_AUDIO'],
-    PHONE: ['READ_PHONE_STATE', 'CALL_PHONE', 'ADD_VOICEMAIL', 'USE_SIP', 'PROCESS_OUTGOING_CALLS', 'READ_CALL_LOG', 'WRITE_CALL_LOG'],
+    PHONE: [
+      'READ_PHONE_STATE',
+      'CALL_PHONE',
+      'ADD_VOICEMAIL',
+      'USE_SIP',
+      'PROCESS_OUTGOING_CALLS',
+      'READ_CALL_LOG',
+      'WRITE_CALL_LOG'
+    ],
     SENSORS: ['BODY_SENSORS'],
-    SMS: ['SEND_SMS', 'RECEIVE_SMS', 'READ_SMS', 'RECEIVE_WAP_PUSH', 'RECEIVE_MMS'],
+    SMS: [
+      'SEND_SMS',
+      'RECEIVE_SMS',
+      'READ_SMS',
+      'RECEIVE_WAP_PUSH',
+      'RECEIVE_MMS'
+    ],
     STORAGE: ['READ_EXTERNAL_STORAGE', 'WRITE_EXTERNAL_STORAGE']
   };
 
@@ -125,13 +143,25 @@ export class Diagnostic {
     POWERING_OFF: string;
   };
 
+  @CordovaProperty
+  motionStatus: {
+    NOT_REQUESTED: string;
+    GRANTED: string;
+    DENIED: string;
+    RESTRICTED: string;
+    NOT_AVAILABLE: string;
+    NOT_DETERMINED: string;
+    UNKNOWN: string;
+  };
 
   /**
    * Checks if app is able to access device location.
    * @returns {Promise<any>}
    */
   @Cordova()
-  isLocationAvailable(): Promise<any> { return; }
+  isLocationAvailable(): Promise<any> {
+    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.
@@ -139,15 +169,21 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isWifiAvailable(): Promise<any> { return; }
+  isWifiAvailable(): Promise<any> {
+    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
    * application is authorized to use it.
+   * @param {boolean} [externalStorage] Android only: If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
    * @returns {Promise<any>}
    */
-  @Cordova()
-  isCameraAvailable(): Promise<any> { return; }
+  @Cordova({ callbackOrder: 'reverse' })
+  isCameraAvailable(externalStorage?: boolean): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if the device has Bluetooth capabilities and if so that Bluetooth is switched on (same on Android, iOS and Windows 10 Mobile)
@@ -155,57 +191,64 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isBluetoothAvailable(): Promise<any> { return; }
+  isBluetoothAvailable(): Promise<any> {
+    return;
+  }
 
   /**
    * Displays the device location settings to allow user to enable location services/change location mode.
    */
-  @Cordova({ sync: true, platforms: ['Android', 'Windows 10'] })
-  switchToLocationSettings(): void { }
+  @Cordova({ sync: true, platforms: ['Android', 'Windows 10', 'iOS'] })
+  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> { return; }
+  isWifiEnabled(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Enables/disables WiFi on the device.
    * Requires `ACCESS_WIFI_STATE` and `CHANGE_WIFI_STATE` permissions on Android
-   * @param state {boolean}
+   * @param {boolean} state
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  setWifiState(state: boolean): Promise<any> { return; }
+  setWifiState(state: boolean): Promise<any> {
+    return;
+  }
 
   /**
    * Enables/disables Bluetooth on the device.
    * Requires `BLUETOOTH` and `BLUETOOTH_ADMIN` permissions on Android
-   * @param state {boolean}
+   * @param {boolean} state
    * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
-  setBluetoothState(state: boolean): Promise<any> { return; }
-
+  setBluetoothState(state: boolean): Promise<any> {
+    return;
+  }
 
   // ANDROID AND IOS ONLY
 
@@ -214,7 +257,9 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isLocationEnabled(): Promise<boolean> { return; }
+  isLocationEnabled(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized to use location.
@@ -222,14 +267,18 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isLocationAuthorized(): Promise<any> { return; }
+  isLocationAuthorized(): Promise<any> {
+    return;
+  }
 
   /**
    * Returns the location authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getLocationAuthorizationStatus(): Promise<any> { return; }
+  getLocationAuthorizationStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Returns the location authorization status for the application.
@@ -239,78 +288,106 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
-  requestLocationAuthorization(mode?: string): Promise<any> { return; }
+  requestLocationAuthorization(mode?: string): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if camera hardware is present on device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isCameraPresent(): Promise<any> { return; }
+  isCameraPresent(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized to use the camera.
    * Note for Android: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will always return TRUE as permissions are already granted at installation time.
+   * @param {boolean} [externalStorage] Android only: If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
    * @returns {Promise<any>}
    */
-  @Cordova({ platforms: ['Android', 'iOS'] })
-  isCameraAuthorized(): Promise<any> { return; }
+  @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
+  isCameraAuthorized(externalStorage?: boolean): Promise<any> {
+    return;
+  }
 
   /**
    * Returns the camera authorization status for the application.
+   * @param {boolean} [externalStorage] Android only: If true, checks permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
    * @returns {Promise<any>}
    */
-  @Cordova({ platforms: ['Android', 'iOS'] })
-  getCameraAuthorizationStatus(): Promise<any> { return; }
+  @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
+  getCameraAuthorizationStatus(externalStorage?: boolean): Promise<any> {
+    return;
+  }
 
   /**
    * Requests camera authorization for the application.
+   * @param {boolean} [externalStorage] Android only: If true, requests permission for READ_EXTERNAL_STORAGE in addition to CAMERA run-time permission.
+   *  cordova-plugin-camera@2.2+ requires both of these permissions. Defaults to true.
    * @returns {Promise<any>}
    */
-  @Cordova({ platforms: ['Android', 'iOS'] })
-  requestCameraAuthorization(): Promise<any> { return; }
+  @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
+  requestCameraAuthorization(externalStorage?: boolean): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized to use the microphone.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isMicrophoneAuthorized(): Promise<boolean> { return; }
+  isMicrophoneAuthorized(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Returns the microphone authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getMicrophoneAuthorizationStatus(): Promise<any> { return; }
+  getMicrophoneAuthorizationStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Requests microphone authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestMicrophoneAuthorization(): Promise<any> { return; }
+  requestMicrophoneAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized to use contacts (address book).
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isContactsAuthorized(): Promise<boolean> { return; }
+  isContactsAuthorized(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Returns the contacts authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getContactsAuthorizationStatus(): Promise<any> { return; }
+  getContactsAuthorizationStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Requests contacts authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestContactsAuthorization(): Promise<any> { return; }
+  requestContactsAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized to use the calendar.
@@ -323,7 +400,9 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  isCalendarAuthorized(): Promise<boolean> { return; }
+  isCalendarAuthorized(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Returns the calendar authorization status for the application.
@@ -337,7 +416,9 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getCalendarAuthorizationStatus(): Promise<any> { return; }
+  getCalendarAuthorizationStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Requests calendar authorization for the application.
@@ -354,7 +435,9 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  requestCalendarAuthorization(): Promise<any> { return; }
+  requestCalendarAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Opens settings page for this app.
@@ -363,39 +446,44 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  switchToSettings(): Promise<any> { return; }
+  switchToSettings(): Promise<any> {
+    return;
+  }
 
   /**
    * Returns the state of Bluetooth on the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
-  getBluetoothState(): Promise<any> { return; }
+  getBluetoothState(): Promise<any> {
+    return;
+  }
 
   /**
    * Registers a function to be called when a change in Bluetooth state occurs.
-   * @param handler
+   * @param {Function} 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
+   * @param {Function} handler
    */
   @Cordova({ platforms: ['Android', 'iOS'], sync: true })
-  registerLocationStateChangeHandler(handler: Function): void { }
-
+  registerLocationStateChangeHandler(handler: Function): void {}
 
   // ANDROID ONLY
 
   /**
    * Checks if high-accuracy locations are available to the app from GPS hardware.
-   * Returns true if Location mode is enabled and is set to "Device only" or "High accuracy" AND if the app is authorised to use location.
+   * Returns true if Location mode is enabled and is set to "Device only" or "High accuracy" AND if the app is authorized to use location.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isGpsLocationAvailable(): Promise<boolean> { return; }
+  isGpsLocationAvailable(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if location mode is set to return high-accuracy locations from GPS hardware.
@@ -405,15 +493,19 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isGpsLocationEnabled(): Promise<any> { return; }
+  isGpsLocationEnabled(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if low-accuracy locations are available to the app from network triangulation/WiFi access points.
-   * Returns true if Location mode is enabled and is set to "Battery saving" or "High accuracy" AND if the app is authorised to use location.
+   * Returns true if Location mode is enabled and is set to "Battery saving" or "High accuracy" AND if the app is authorized to use location.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNetworkLocationAvailable(): Promise<any> { return; }
+  isNetworkLocationAvailable(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if location mode is set to return low-accuracy locations from network triangulation/WiFi access points.
@@ -423,50 +515,62 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNetworkLocationEnabled(): Promise<any> { return; }
+  isNetworkLocationEnabled(): Promise<any> {
+    return;
+  }
 
   /**
    * Returns the current location mode setting for the device.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  getLocationMode(): Promise<any> { return; }
+  getLocationMode(): Promise<any> {
+    return;
+  }
 
   /**
-   * Returns the current authorisation status for a given permission.
+   * Returns the current authorization status for a given permission.
    * Note: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will always return GRANTED status as permissions are already granted at installation time.
    * @param permission
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  getPermissionAuthorizationStatus(permission: any): Promise<any> { return; }
+  getPermissionAuthorizationStatus(permission: any): Promise<any> {
+    return;
+  }
 
   /**
-   * Returns the current authorisation status for multiple permissions.
+   * Returns the current authorization status for multiple permissions.
    * Note: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will always return GRANTED status as permissions are already granted at installation time.
-   * @param permissions
+   * @param {any[]} permissions
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> { return; }
+  getPermissionsAuthorizationStatus(permissions: any[]): Promise<any> {
+    return;
+  }
 
   /**
-   * Requests app to be granted authorisation for a runtime permission.
+   * Requests app to be granted authorization for a runtime permission.
    * Note: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will have no effect as the permissions are already granted at installation time.
    * @param permission
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  requestRuntimePermission(permission: any): Promise<any> { return; }
+  requestRuntimePermission(permission: any): Promise<any> {
+    return;
+  }
 
   /**
-   * Requests app to be granted authorisation for multiple runtime permissions.
+   * Requests app to be granted authorization for multiple runtime permissions.
    * Note: this is intended for Android 6 / API 23 and above. Calling on Android 5 / API 22 and below will always return GRANTED status as permissions are already granted at installation time.
-   * @param permissions
+   * @param {any[]} permissions
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
-  requestRuntimePermissions(permissions: any[]): Promise<any> { return; }
+  requestRuntimePermissions(permissions: any[]): Promise<any> {
+    return;
+  }
 
   /**
    * Indicates if the plugin is currently requesting a runtime permission via the native API.
@@ -476,15 +580,19 @@ export class Diagnostic {
    * @returns {boolean}
    */
   @Cordova({ sync: true })
-  isRequestingPermission(): boolean { return; }
+  isRequestingPermission(): boolean {
+    return;
+  }
 
   /**
    * Registers a function to be called when a runtime permission request has completed.
-   * Pass in a falsey value to de-register the currently registered function.
-   * @param handler {Function}
+   * Pass in a falsy value to de-register the currently registered function.
+   * @param {Function} handler
    */
   @Cordova({ sync: true })
-  registerPermissionRequestCompleteHandler(handler: Function): void { return; }
+  registerPermissionRequestCompleteHandler(handler: Function): void {
+    return;
+  }
 
   /**
    * Checks if the device setting for Bluetooth is switched on.
@@ -492,49 +600,63 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isBluetoothEnabled(): Promise<boolean> { return; }
+  isBluetoothEnabled(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if the device has Bluetooth capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothSupport(): Promise<boolean> { return; }
+  hasBluetoothSupport(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if the device has Bluetooth Low Energy (LE) capabilities.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothLESupport(): Promise<boolean> { return; }
+  hasBluetoothLESupport(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if the device supports Bluetooth Low Energy (LE) Peripheral mode.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  hasBluetoothLEPeripheralSupport(): Promise<boolean> { return; }
+  hasBluetoothLEPeripheralSupport(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized to use external storage.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isExternalStorageAuthorized(): Promise<boolean> { return; }
+  isExternalStorageAuthorized(): Promise<boolean> {
+    return;
+  }
 
   /**
    * CReturns the external storage authorization status for the application.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  getExternalStorageAuthorizationStatus(): Promise<any> { return; }
+  getExternalStorageAuthorizationStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Requests external storage authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  requestExternalStorageAuthorization(): Promise<any> { return; }
+  requestExternalStorageAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Returns details of external SD card(s): absolute path, is writable, free space.
@@ -547,7 +669,9 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  getExternalSdCardDetails(): Promise<any> { return; }
+  getExternalSdCardDetails(): Promise<any> {
+    return;
+  }
 
   /**
    * Switches to the wireless settings page in the Settings app. Allows configuration of wireless controls such as Wi-Fi, Bluetooth and Mobile networks.
@@ -556,7 +680,7 @@ export class Diagnostic {
     platforms: ['Android'],
     sync: true
   })
-  switchToWirelessSettings(): void { }
+  switchToWirelessSettings(): void {}
 
   /**
    * Displays NFC settings to allow user to enable NFC.
@@ -565,14 +689,16 @@ export class Diagnostic {
     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> { return; }
+  isNFCPresent(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if the device setting for NFC is switched on.
@@ -580,7 +706,9 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCEnabled(): Promise<boolean> { return; }
+  isNFCEnabled(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if NFC is available to the app. Returns true if the device has NFC capabilities AND if NFC setting is switched on.
@@ -588,20 +716,47 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
-  isNFCAvailable(): Promise<boolean> { return; }
+  isNFCAvailable(): Promise<boolean> {
+    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.
-   * @param hander {Function} callback function to be called when NFC state changes
+   * Registers a function to be called when a change in NFC state occurs. Pass in a falsy value to de-register the currently registered function.
+   * @param {Function} hander callback function to be called when NFC state changes
    * @returns {Promise<any>}
    */
   @Cordova({
     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> {
+    return;
+  }
 
+  /**
+   * Checks if the device setting for ADB(debug) is switched on.
+   * @returns {Promise<boolean>}
+   */
+  @Cordova({ platforms: ['Android'] })
+  isADBModeEnabled(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Checks if the device is rooted.
+   * @returns {Promise<boolean>}
+   */
+  @Cordova({ platforms: ['Android'] })
+  isDeviceRooted(): Promise<boolean> {
+    return;
+  }
 
   // IOS ONLY
 
@@ -610,14 +765,18 @@ export class Diagnostic {
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isCameraRollAuthorized(): Promise<boolean> { return; }
+  isCameraRollAuthorized(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Returns the authorization status for the application to use the Camera Roll in Photos app.
-   * @returns {Promise<boolean>}
+   * @returns {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getCameraRollAuthorizationStatus(): Promise<boolean> { return; }
+  getCameraRollAuthorizationStatus(): Promise<string> {
+    return;
+  }
 
   /**
    * Requests camera roll authorization for the application.
@@ -626,21 +785,37 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestCameraRollAuthorization(): Promise<any> { return; }
+  requestCameraRollAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if remote (push) notifications are enabled.
    * @returns {Promise<boolean>}
    */
-  @Cordova({ platforms: ['iOS'] })
-  isRemoteNotificationsEnabled(): Promise<boolean> { return; }
+  @Cordova({ platforms: ['iOS', 'Android'] })
+  isRemoteNotificationsEnabled(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Indicates if the app is registered for remote (push) notifications on the device.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isRegisteredForRemoteNotifications(): Promise<boolean> { return; }
+  isRegisteredForRemoteNotifications(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Returns the authorization status for the application to use Remote Notifications.
+   * Note: Works on iOS 10+ only (iOS 9 and below will invoke the error callback).
+   * @returns {Promise<string>}
+   */
+  @Cordova({ platforms: ['iOS'] })
+  getRemoteNotificationsAuthorizationStatus(): Promise<string> {
+    return;
+  }
 
   /**
    * Indicates the current setting of notification types for the app in the Settings app.
@@ -648,42 +823,54 @@ export class Diagnostic {
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemoteNotificationTypes(): Promise<any> { return; }
+  getRemoteNotificationTypes(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized to use reminders.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isRemindersAuthorized(): Promise<boolean> { return; }
+  isRemindersAuthorized(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Returns the reminders authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getRemindersAuthorizationStatus(): Promise<any> { return; }
+  getRemindersAuthorizationStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Requests reminders authorization for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestRemindersAuthorization(): Promise<any> { return; }
+  requestRemindersAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if the application is authorized for background refresh.
    * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isBackgroundRefreshAuthorized(): Promise<boolean> { return; }
+  isBackgroundRefreshAuthorized(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Returns the background refresh authorization status for the application.
    * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  getBackgroundRefreshStatus(): Promise<any> { return; }
+  getBackgroundRefreshStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Requests Bluetooth authorization for the application.
@@ -692,14 +879,18 @@ export class Diagnostic {
    * @return {Promise<any>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestBluetoothAuthorization(): Promise<any> { return; }
+  requestBluetoothAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Checks if motion tracking is available on the current device.
    * @return {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isMotionAvailable(): Promise<boolean> { return; }
+  isMotionAvailable(): Promise<boolean> {
+    return;
+  }
 
   /**
    * Checks if it's possible to determine the outcome of a motion authorization request on the current device.
@@ -709,16 +900,31 @@ export class Diagnostic {
    * @return {Promise<boolean>}
    */
   @Cordova({ platforms: ['iOS'] })
-  isMotionRequestOutcomeAvailable(): Promise<boolean> { return; }
+  isMotionRequestOutcomeAvailable(): Promise<boolean> {
+    return;
+  }
 
   /**
-   * Requests and checks motion authorization for the application: there is no way to independently request only or check only, so both must be done in one operation.
+   * Requests motion tracking authorization for the application.
    *
-   * Learn more about this method [here](https://github.com/dpa99c/cordova-diagnostic-plugin#requestandcheckmotionauthorization)
+   * Learn more about this method [here](https://github.com/dpa99c/cordova-diagnostic-plugin#requestmotionauthorization)
    *
-   * @return {Promise<any>}
+   * @return {Promise<string>}
    */
   @Cordova({ platforms: ['iOS'] })
-  requestAndCheckMotionAuthorization(): Promise<any> { return; }
+  requestMotionAuthorization(): Promise<string> {
+    return;
+  }
 
+  /**
+   * Checks motion authorization status for the application.
+   *
+   * Learn more about this method [here](https://github.com/dpa99c/cordova-diagnostic-plugin#getmotionauthorizationstatus)
+   *
+   * @return {Promise<string>}
+   */
+  @Cordova({ platforms: ['iOS'] })
+  getMotionAuthorizationStatus(): Promise<string> {
+    return;
+  }
 }

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

@@ -1,9 +1,7 @@
 import { Injectable } from '@angular/core';
-import { Cordova, 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.
    */
@@ -13,10 +11,8 @@ export interface DialogsPromptCallback {
    * The text entered in the prompt dialog box. (String)
    */
   input1: string;
-
 }
 
-
 /**
  * @name Dialogs
  * @description
@@ -45,52 +41,65 @@ export interface DialogsPromptCallback {
   pluginName: 'Dialogs',
   plugin: 'cordova-plugin-dialogs',
   pluginRef: 'navigator.notification',
-  repo: 'https://github.com/apache/cordova-plugin-dialogs.git',
-  platforms: ['Android', 'BlackBerry 10', 'Firefox OS', 'iOS', 'Ubuntu', 'Windows', 'Windows Phone']
+  repo: 'https://github.com/apache/cordova-plugin-dialogs',
+  platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Windows']
 })
 @Injectable()
-export class Dialogs {
-
+export class Dialogs extends IonicNativePlugin {
   /**
    * Shows a custom alert or dialog box.
    * @param {string} message Dialog message.
-   * @param {string} title Dialog title. (Optional, defaults to Alert)
-   * @param {string} buttonName Button name. (Optional, defaults to OK)
+   * @param {string} [title] Dialog title. (Optional, defaults to Alert)
+   * @param {string} [buttonName] Button name. (Optional, defaults to OK)
    * @returns {Promise<any>} Returns a blank promise once the user has dismissed the alert.
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 4
   })
-  alert(message: string, title?: string, buttonName?: string): Promise<any> { return; }
+  alert(message: string, title?: string, buttonName?: string): Promise<any> {
+    return;
+  }
 
   /**
    * Displays a customizable confirmation dialog box.
    * @param {string} message Dialog message.
-   * @param {string} title Dialog title. (Optional, defaults to Confirm)
-   * @param {Array<string>} buttonLabels Array of strings specifying button labels. (Optional, defaults to [OK,Cancel])
-   * @returns {Promise<number>} Returns a promise that resolves the button index that was clicked. Note that the index use one-based indexing.
+   * @param {string} [title] Dialog title. (Optional, defaults to Confirm)
+   * @param {Array<string>} [buttonLabels] Array of strings specifying button labels. (Optional, defaults to [OK,Cancel])
+   * @returns {Promise<number>} Returns a promise that resolves the button index that was clicked, or 0 if the user has dismissed the dialog by clicking outside the dialog box. Note that the index use one-based indexing.
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 4
   })
-  confirm(message, title?: string, buttonLabels?: string[]): Promise<number> { return; }
+  confirm(
+    message: string,
+    title?: string,
+    buttonLabels?: string[]
+  ): Promise<number> {
+    return;
+  }
 
   /**
    * Displays a native dialog box that is more customizable than the browser's prompt function.
-   * @param {string} message Dialog message.
-   * @param {string} title Dialog title. (Optional, defaults to Prompt)
-   * @param {Array<string>} buttonLabels  Array of strings specifying button labels. (Optional, defaults to ["OK","Cancel"])
-   * @param {string} defaultText Default textbox input value.  (Optional, Default: empty string)
+   * @param {string} [message] Dialog message.
+   * @param {string} [title] Dialog title. (Optional, defaults to Prompt)
+   * @param {Array<string>} [buttonLabels]  Array of strings specifying button labels. (Optional, defaults to ["OK","Cancel"])
+   * @param {string} [defaultText] Default text box input value.  (Optional, Default: empty string)
    * @returns {Promise<DialogsPromptCallback>} Returns a promise that resolves an object with the button index clicked and the text entered
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 5
   })
-  prompt(message?: string, title?: string, buttonLabels?: string[], defaultText?: string): Promise<DialogsPromptCallback> { return; }
-
+  prompt(
+    message?: string,
+    title?: string,
+    buttonLabels?: string[],
+    defaultText?: string
+  ): Promise<DialogsPromptCallback> {
+    return;
+  }
 
   /**
    * The device plays a beep sound.
@@ -99,6 +108,5 @@ export class Dialogs {
   @Cordova({
     sync: true
   })
-  beep(times: number): void { }
-
+  beep(times: number): void {}
 }

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

@@ -0,0 +1,40 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+/**
+ * @name DNS
+ * @description A plugin for Apache Cordova that enables applications to manually resolve hostnames into an underlying network address. This is mostly useful for determining whether there is a problem with the device's DNS server configuration.
+ *
+ * @usage
+ * ```typescript
+ * import { DNS } from '@ionic-native/dns';
+ *
+ *
+ * constructor(private dns: DNS) { }
+ *
+ * ...
+ * this.dns.resolve(hostname)
+ *   .then(
+ *     address => console.log('Resolved ' + hostname + ' to ' + address),
+ *     error => console.log('Failed to resolve ' + hostname + ': ' + error)
+ *   );
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'DNS',
+  plugin: 'cordova-plugin-dns',
+  pluginRef: 'cordova.plugins.dns',
+  repo: 'https://bitbucket.org/zegeba/cordova-plugin-dns',
+  platforms: ['Android']
+})
+@Injectable()
+export class DNS extends IonicNativePlugin {
+  /**
+   * Resolve hostnames into an underlying network address.
+   * @param hostname
+   * @returns {Promise<string>} Returns a promise that resolves with the resolution.
+   */
+  @Cordova()
+  resolve(hostname: string): Promise<string> { return; }
+}

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

@@ -0,0 +1,43 @@
+import { Injectable } from '@angular/core';
+import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+
+/**
+ * @name iOS DocumentPicker
+ * @description
+ *
+ * Opens the file picker on iOS for the user to select a file, returns a file URI.
+ * Allows the user to upload files from iCloud
+ *
+ * @usage
+ * ```typescript
+ * import { IOSDocumentPicker } from '@ionic-native/document-picker';
+ *
+ * constructor(private docPicker: IOSDocumentPicker) { }
+ *
+ * ...
+ *
+ * this.docPicker.getFile('all')
+ *   .then(uri => console.log(uri))
+ *   .catch(e => console.log(e));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'IOSDocumentPicker',
+  plugin: 'cordova-plugin-documentpicker.DocumentPicker',
+  pluginRef: 'DocumentPicker',
+  repo: 'https://github.com/iampossible/Cordova-DocPicker',
+  platforms: ['iOS']
+})
+@Injectable()
+export class DocumentPicker extends IonicNativePlugin {
+  /**
+   * Open a file
+   * @param {string} [option] files between 'image', 'pdf' or 'all'
+   * @returns {Promise<string>}
+   */
+  @Cordova()
+  getFile(option?: string): Promise<string> {
+    return;
+  }
+}

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

@@ -0,0 +1,102 @@
+import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Injectable } from '@angular/core';
+
+export interface DocumentViewerOptions {
+  title?: string;
+  documentView?: {
+    closeLabel: string;
+  };
+  navigationView?: {
+    closeLabel: string;
+  };
+  email?: {
+    enabled: boolean;
+  };
+  print?: {
+    enabled: boolean;
+  };
+  openWith?: {
+    enabled: boolean;
+  };
+  bookmarks?: {
+    enabled: boolean;
+  };
+  search?: {
+    enabled: boolean;
+  };
+  autoClose?: {
+    onPause: boolean;
+  };
+}
+
+/**
+ * @name Document Viewer
+ * @description
+ * This plugin offers a slim API to view PDF files which are either stored in the apps assets folder (/www/*) or in any other file system directory available via the cordova file plugin.
+ *
+ * @usage
+ * ```typescript
+ * import { DocumentViewer } from '@ionic-native/document-viewer';
+ *
+ *
+ * constructor(private document: DocumentViewer) { }
+ *
+ * ...
+ * const options: DocumentViewerOptions = {
+ *   title: 'My PDF'
+ * }
+ *
+ * this.document.viewDocument('assets/myFile.pdf', 'application/pdf', options)
+ *
+ * ```
+ *
+ * @interfaces
+ * DocumentViewerOptions
+ */
+@Plugin({
+  pluginName: 'Document Viewer',
+  plugin: 'cordova-plugin-document-viewer',
+  pluginRef: 'SitewaertsDocumentViewer',
+  repo: 'https://github.com/sitewaerts/cordova-plugin-document-viewer',
+  platforms: ['Android', 'iOS', 'Windows']
+})
+@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> { return; }
+
+  /**
+   * Check if the document can be shown
+   *
+   * @param url {string} Url to the file
+   * @param contentType {string} Content type of the file
+   * @param options {Array<DocumentViewerOptions>} options
+   * @param [onPossible] {Function}
+   * @param [onMissingApp] {Function}
+   * @param [onImpossible] {Function}
+   * @param [onError] {Function}
+   */
+  @Cordova({ sync: true })
+  canViewDocument(url: string, contentType: string, options: DocumentViewerOptions, onPossible?: Function, onMissingApp?: Function, onImpossible?: Function, onError?: Function): void { }
+
+  /**
+   * Opens the file
+   *
+   * @param url {string} Url to the file
+   * @param contentType {string} Content type of the file
+   * @param options {DocumentViewerOptions} options
+   * @param [onShow] {Function}
+   * @param [onClose] {Function}
+   * @param [onMissingApp] {Function}
+   * @param [onError] {Function}
+   */
+  @Cordova({ sync: true })
+  viewDocument(url: string, contentType: string, options: DocumentViewerOptions, onShow?: Function, onClose?: Function, onMissingApp?: Function, onError?: Function): void { }
+
+}

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

@@ -1,38 +1,64 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, CordovaCheck } from '@ionic-native/core';
-
-declare var cordova: any;
+import {
+  Cordova,
+  CordovaCheck,
+  IonicNativePlugin,
+  Plugin
+} from '@ionic-native/core';
 
 export interface EmailComposerOptions {
-
+  /**
+   * App to send the email with
+   */
   app?: string;
 
+  /**
+   * Email address(es) for To field
+   */
   to?: string | Array<string>;
 
+  /**
+   * Email address(es) for CC field
+   */
   cc?: string | Array<string>;
 
+  /**
+   * Email address(es) for BCC field
+   */
   bcc?: string | Array<string>;
 
-  attachments?: Array<any>;
+  /**
+   * File paths or base64 data streams
+   */
+  attachments?: string[];
 
+  /**
+   * Subject of the email
+   */
   subject?: string;
 
+  /**
+   * Email body (for HTML, set isHtml to true)
+   */
   body?: string;
 
+  /**
+   * Indicates if the body is HTML or plain text
+   */
   isHtml?: boolean;
 
+  /**
+   *  Content type of the email (Android only)
+   */
+  type?: string;
 }
 
-
 /**
- * @beta
  * @name Email Composer
  * @description
  *
  * Requires Cordova plugin: cordova-plugin-email-composer. For more info, please see the [Email Composer plugin docs](https://github.com/hypery2k/cordova-email-plugin).
  *
- * DISCLAIMER: This plugin is experiencing issues with the latest versions of Cordova. Use at your own risk. Functionality is not guaranteed. Please stay tuned for a more stable version.
- * A good alternative to this plugin is the social sharing plugin.
  *
  * @usage
  * ```typescript
@@ -66,32 +92,42 @@ export interface EmailComposerOptions {
  *
  * // Send a text message using default options
  * this.emailComposer.open(email);
+ * ```
  *
+ * You can also assign aliases to email apps
+ * ```ts
+ * // add alias
+ * this.email.addAlias('gmail', 'com.google.android.gm');
+ *
+ * // then use alias when sending email
+ * this.email.open({
+ *   app: 'gmail',
+ *   ...
+ * });
  * ```
  * @interfaces
  * EmailComposerOptions
  */
 @Plugin({
   pluginName: 'EmailComposer',
-  plugin: 'cordova-plugin-email',
+  plugin: 'cordova-plugin-email-composer',
   pluginRef: 'cordova.plugins.email',
-  repo: 'https://github.com/hypery2k/cordova-email-plugin',
-  platforms: ['Android', 'iOS']
+  repo: 'https://github.com/katzer/cordova-plugin-email-composer',
+  platforms: ['Amazon Fire OS', 'Android', 'Browser', 'iOS', 'Windows', 'macOS']
 })
 @Injectable()
-export class EmailComposer {
-
+export class EmailComposer extends IonicNativePlugin {
   /**
    * Verifies if sending emails is supported on the device.
    *
-   * @param [app] {string} App id or uri scheme.
+   * @param {string} [app] App id or uri scheme.
    * @returns {Promise<any>} Resolves if available, rejects if not available
    */
   @CordovaCheck()
   isAvailable(app?: string): Promise<any> {
     return new Promise<boolean>((resolve, reject) => {
       if (app) {
-        cordova.plugins.email.isAvailable(app, (isAvailable) => {
+        EmailComposer.getPlugin().isAvailable(app, (isAvailable: boolean) => {
           if (isAvailable) {
             resolve();
           } else {
@@ -99,7 +135,7 @@ export class EmailComposer {
           }
         });
       } else {
-        cordova.plugins.email.isAvailable((isAvailable) => {
+        EmailComposer.getPlugin().isAvailable((isAvailable: boolean) => {
           if (isAvailable) {
             resolve();
           } else {
@@ -110,26 +146,51 @@ export class EmailComposer {
     });
   }
 
+  /**
+   * Request permission to access email accounts information
+   * @return {Promise<boolean>} returns a promise that resolves with a boolean that indicates if the permission was granted
+   */
+  @Cordova({
+    successIndex: 0,
+    errorIndex: 2
+  })
+  requestPermission(): Promise<boolean> {
+    return;
+  }
+
+  /**
+   * Checks if the app has a permission to access email accounts information
+   * @return {Promise<boolean>} returns a promise that resolves with a boolean that indicates if the permission was granted
+   */
+  @Cordova({
+    successIndex: 0,
+    errorIndex: 2
+  })
+  hasPermission(): Promise<boolean> {
+    return;
+  }
+
   /**
    * Adds a new mail app alias.
    *
-   * @param alias {string} The alias name
-   * @param packageName {string} The package name
+   * @param {string} alias The alias name
+   * @param {string} packageName The package name
    */
   @Cordova()
-  addAlias(alias: string, packageName: string): void { }
+  addAlias(alias: string, packageName: string): void {}
 
   /**
    * Displays the email composer pre-filled with data.
    *
-   * @param options {EmailComposerOptions} Email
-   * @param [scope] {any} Scope for the promise
+   * @param {EmailComposerOptions} options Email
+   * @param {any} [scope] Scope for the promise
    * @returns {Promise<any>} Resolves promise when the EmailComposer has been opened
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 3
   })
-  open(options: EmailComposerOptions, scope?: any): Promise<any> { return; }
-
+  open(options: EmailComposerOptions, scope?: any): Promise<any> {
+    return;
+  }
 }

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

@@ -1,9 +1,8 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin } from '@ionic-native/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';
 
 export interface EstimoteBeaconRegion {
-
   state?: string;
 
   major: number;
@@ -13,7 +12,6 @@ export interface EstimoteBeaconRegion {
   identifier?: string;
 
   uuid: string;
-
 }
 
 /**
@@ -44,11 +42,10 @@ export interface EstimoteBeaconRegion {
   plugin: 'cordova-plugin-estimote',
   pluginRef: 'estimote.beacons',
   repo: 'https://github.com/evothings/phonegap-estimotebeacons',
-  platforms: ['iOS', 'Android']
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class EstimoteBeacons {
-
+export class EstimoteBeacons extends IonicNativePlugin {
   /** Proximity value */
   ProximityUnknown = 0;
 
@@ -124,7 +121,9 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestWhenInUseAuthorization(): Promise<any> { return; }
+  requestWhenInUseAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Ask the user for permission to use location services
@@ -145,7 +144,9 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  requestAlwaysAuthorization(): Promise<any> { return; }
+  requestAlwaysAuthorization(): Promise<any> {
+    return;
+  }
 
   /**
    * Get the current location authorization status.
@@ -164,7 +165,9 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  authorizationStatus(): Promise<any> { return; }
+  authorizationStatus(): Promise<any> {
+    return;
+  }
 
   /**
    * Start advertising as a beacon.
@@ -177,16 +180,23 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopAdvertisingAsBeacon().then((result) => { console.log('Beacon stopped'); });
    * }, 5000);
    * ```
-   * @param uuid {string} UUID string the beacon should advertise (mandatory).
-   * @param major {number} Major value to advertise (mandatory).
-   * @param minor {number} Minor value to advertise (mandatory).
-   * @param regionId {string} Identifier of the region used to advertise (mandatory).
+   * @param {string} uuid UUID string the beacon should advertise (mandatory).
+   * @param {number} major Major value to advertise (mandatory).
+   * @param {number} minor Minor value to advertise (mandatory).
+   * @param {string} regionId Identifier of the region used to advertise (mandatory).
    * @returns {Promise<any>}
    */
   @Cordova({
     clearFunction: 'stopAdvertisingAsBeacon'
   })
-  startAdvertisingAsBeacon(uuid: string, major: number, minor: number, regionId: string): Promise<any> { return; }
+  startAdvertisingAsBeacon(
+    uuid: string,
+    major: number,
+    minor: number,
+    regionId: string
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Stop advertising as a beacon.
@@ -202,7 +212,9 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopAdvertisingAsBeacon(): Promise<any> { return; }
+  stopAdvertisingAsBeacon(): Promise<any> {
+    return;
+  }
 
   /**
    * Enable analytics.
@@ -213,16 +225,18 @@ export class EstimoteBeacons {
    * ```
    * EstimoteBeacons.enableAnalytics(true).then(() => { console.log('Analytics enabled'); });
    * ```
-   * @param enable {number} Boolean value to turn analytics on or off (mandatory).
+   * @param {number} enable Boolean value to turn analytics on or off (mandatory).
    * @returns {Promise<any>}
    */
   @Cordova()
-  enableAnalytics(enable: boolean): Promise<any> { return; }
+  enableAnalytics(enable: boolean): Promise<any> {
+    return;
+  }
 
   /**
-  * Test if analytics is enabled.
-  *
-  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+   * Test if analytics is enabled.
+   *
+   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -231,12 +245,14 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isAnalyticsEnabled(): Promise<any> { return; }
+  isAnalyticsEnabled(): Promise<any> {
+    return;
+  }
 
   /**
-  * Test if App ID and App Token is set.
-  *
-  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+   * Test if App ID and App Token is set.
+   *
+   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
@@ -245,23 +261,27 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  isAuthorized(): Promise<any> { return; }
+  isAuthorized(): Promise<any> {
+    return;
+  }
 
   /**
-  * Set App ID and App Token.
-  *
-  * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
+   * Set App ID and App Token.
+   *
+   * @see {@link http://estimote.github.io/iOS-SDK/Classes/ESTConfig.html|Further details}
    *
    * @usage
    * ```
    * EstimoteBeacons.setupAppIDAndAppToken('MyAppID', 'MyAppToken').then(() => { console.log('AppID and AppToken configured!'); });
    * ```
-   * @param appID {string} The App ID (mandatory).
-   * @param appToken {string} The App Token (mandatory).
+   * @param {string} appID The App ID (mandatory).
+   * @param {string} appToken The App Token (mandatory).
    * @returns {Promise<any>}
    */
   @Cordova()
-  setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> { return; }
+  setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> {
+    return;
+  }
 
   /**
    * Start scanning for all nearby beacons using CoreBluetooth (no region object is used).
@@ -282,7 +302,9 @@ export class EstimoteBeacons {
     observable: true,
     clearFunction: 'stopEstimoteBeaconDiscovery'
   })
-  startEstimoteBeaconDiscovery(): Observable<any> { return; }
+  startEstimoteBeaconDiscovery(): Observable<any> {
+    return;
+  }
 
   /**
    * Stop CoreBluetooth scan. Available on iOS.
@@ -299,7 +321,9 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopEstimoteBeaconDiscovery(): Promise<any> { return; }
+  stopEstimoteBeaconDiscovery(): Promise<any> {
+    return;
+  }
 
   /**
    * Start ranging beacons. Available on iOS and Android.
@@ -314,7 +338,7 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopRangingBeaconsInRegion(region).then(() => { console.log('scan stopped'); });
    * }, 5000);
    * ```
-   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
+   * @param {EstimoteBeaconRegion} region Dictionary with region properties (mandatory).
    * @returns {Observable<any>} Returns an Observable that notifies of each beacon discovered.
    */
   @Cordova({
@@ -322,7 +346,9 @@ export class EstimoteBeacons {
     clearFunction: 'stopRangingBeaconsInRegion',
     clearWithArgs: true
   })
-  startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
+  startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> {
+    return;
+  }
 
   /**
    * Stop ranging beacons. Available on iOS and Android.
@@ -337,15 +363,17 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopRangingBeaconsInRegion(region).then(() => { console.log('scan stopped'); });
    * }, 5000);
    * ```
-   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
+   * @param {EstimoteBeaconRegion} region Dictionary with region properties (mandatory).
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> {
+    return;
+  }
 
   /**
    * Start ranging secure beacons. Available on iOS.
-   * This function has the same parameters/behaviour as
+   * This function has the same parameters/behavior as
    * {@link EstimoteBeacons.startRangingBeaconsInRegion}.
    * To use secure beacons set the App ID and App Token using
    * {@link EstimoteBeacons.setupAppIDAndAppToken}.
@@ -356,16 +384,22 @@ export class EstimoteBeacons {
     clearFunction: 'stopRangingSecureBeaconsInRegion',
     clearWithArgs: true
   })
-  startRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
+  startRangingSecureBeaconsInRegion(
+    region: EstimoteBeaconRegion
+  ): Observable<any> {
+    return;
+  }
 
   /**
    * Stop ranging secure beacons. Available on iOS.
-   * This function has the same parameters/behaviour as
+   * This function has the same parameters/behavior as
    * {@link EstimoteBeacons.stopRangingBeaconsInRegion}.
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> {
+    return;
+  }
 
   /**
    * Start monitoring beacons. Available on iOS and Android.
@@ -377,8 +411,8 @@ export class EstimoteBeacons {
    *   console.log('Region state: ' + JSON.stringify(state));
    * });
    * ```
-   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
-   * @param [notifyEntryStateOnDisplay=false] {boolean} Set to true to detect if you
+   * @param {EstimoteBeaconRegion} region Dictionary with region properties (mandatory).
+   * @param {boolean} [notifyEntryStateOnDisplay] Set to true to detect if you
    * are inside a region when the user turns display on, see
    * {@link https://developer.apple.com/library/prerelease/ios/documentation/CoreLocation/Reference/CLBeaconRegion_class/index.html#//apple_ref/occ/instp/CLBeaconRegion/notifyEntryStateOnDisplay|iOS documentation}
    * for further details (iOS only).
@@ -391,7 +425,12 @@ export class EstimoteBeacons {
     successIndex: 1,
     errorIndex: 2
   })
-  startMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
+  startMonitoringForRegion(
+    region: EstimoteBeaconRegion,
+    notifyEntryStateOnDisplay: boolean
+  ): Observable<any> {
+    return;
+  }
 
   /**
    * Stop monitoring beacons. Available on iOS and Android.
@@ -401,21 +440,23 @@ export class EstimoteBeacons {
    * let region: EstimoteBeaconRegion = {} // Empty region matches all beacons.
    * EstimoteBeacons.stopMonitoringForRegion(region).then(() => { console.log('monitoring is stopped'); });
    * ```
-   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
+   * @param {EstimoteBeaconRegion} region Dictionary with region properties (mandatory).
    * @returns {Promise<any>}
    */
   @Cordova()
-  stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> {
+    return;
+  }
 
   /**
    * Start monitoring secure beacons. Available on iOS.
-   * This function has the same parameters/behaviour as
+   * This function has the same parameters/behavior as
    * EstimoteBeacons.startMonitoringForRegion.
    * To use secure beacons set the App ID and App Token using
    * {@link EstimoteBeacons.setupAppIDAndAppToken}.
    * @see {@link EstimoteBeacons.startMonitoringForRegion}
-   * @param region {EstimoteBeaconRegion} Region
-   * @param notifyEntryStateOnDisplay {boolean}
+   * @param {EstimoteBeaconRegion} region Region
+   * @param {boolean} notifyEntryStateOnDisplay
    * @returns {Observable<any>}
    */
   @Cordova({
@@ -425,17 +466,24 @@ export class EstimoteBeacons {
     successIndex: 1,
     errorIndex: 2
   })
-  startSecureMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
+  startSecureMonitoringForRegion(
+    region: EstimoteBeaconRegion,
+    notifyEntryStateOnDisplay: boolean
+  ): Observable<any> {
+    return;
+  }
 
   /**
-  * Stop monitoring secure beacons. Available on iOS.
-  * This function has the same parameters/behaviour as
-  * {@link EstimoteBeacons.stopMonitoringForRegion}.
-  * @param region {EstimoteBeaconRegion} Region
-  * @returns {Promise<any>}
-  */
+   * Stop monitoring secure beacons. Available on iOS.
+   * This function has the same parameters/behavior as
+   * {@link EstimoteBeacons.stopMonitoringForRegion}.
+   * @param {EstimoteBeaconRegion} region Region
+   * @returns {Promise<any>}
+   */
   @Cordova()
-  stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
+  stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> {
+    return;
+  }
 
   /**
    * Connect to Estimote Beacon. Available on Android.
@@ -451,11 +499,13 @@ export class EstimoteBeacons {
    *     minor: 1
    *   });
    * ```
-   * @param beacon {Beacon} Beacon to connect to.
+   * @param {Beacon} beacon Beacon to connect to.
    * @returns {Promise<any>}
    */
   @Cordova()
-  connectToBeacon(beacon: any): Promise<any> { return; }
+  connectToBeacon(beacon: any): Promise<any> {
+    return;
+  }
 
   /**
    * Disconnect from connected Estimote Beacon. Available on Android.
@@ -467,7 +517,9 @@ export class EstimoteBeacons {
    * @returns {Promise<any>}
    */
   @Cordova()
-  disconnectConnectedBeacon(): Promise<any> { return; }
+  disconnectConnectedBeacon(): Promise<any> {
+    return;
+  }
 
   /**
    * Write proximity UUID to connected Estimote Beacon. Available on Android.
@@ -477,11 +529,13 @@ export class EstimoteBeacons {
    * // Example that writes constant ESTIMOTE_PROXIMITY_UUID
    * EstimoteBeacons.writeConnectedProximityUUID(ESTIMOTE_PROXIMITY_UUID);
    *
-   * @param uuid {string} String to write as new UUID
+   * @param {string} uuid String to write as new UUID
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedProximityUUID(uuid: any): Promise<any> { return; }
+  writeConnectedProximityUUID(uuid: any): Promise<any> {
+    return;
+  }
 
   /**
    * Write major to connected Estimote Beacon. Available on Android.
@@ -491,11 +545,13 @@ export class EstimoteBeacons {
    * // Example that writes 1
    * EstimoteBeacons.writeConnectedMajor(1);
    *
-   * @param major {number} number to write as new major
+   * @param {number} major number to write as new major
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedMajor(major: number): Promise<any> { return; }
+  writeConnectedMajor(major: number): Promise<any> {
+    return;
+  }
 
   /**
    * Write minor to connected Estimote Beacon. Available on Android.
@@ -505,11 +561,11 @@ export class EstimoteBeacons {
    * // Example that writes 1
    * EstimoteBeacons.writeConnectedMinor(1);
    *
-   * @param minor {number} number to write as new minor
+   * @param {number} minor number to write as new minor
    * @returns {Promise<any>}
    */
   @Cordova()
-  writeConnectedMinor(minor: number): Promise<any> { return; }
-
+  writeConnectedMinor(minor: number): Promise<any> {
+    return;
+  }
 }
-