chore(): update changelog

This reverts commit 5825932e03.

.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/v2/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,6 @@ 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

@@ -17,6 +17,7 @@ gulp plugin:create -n PluginName
 gulp plugin:create -m -n PluginName
 ```
 
+Running the command above will create a new directory `src/@ionic-native/plugins/plugin-name/` with a single file in there: `index.ts`. This file is where all the plugin definitions should be.
 
 Let's take a look at the existing plugin wrapper for Geolocation to see what goes into an Ionic Native plugin (comments have been removed for clarity):
 
@@ -102,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.
 
@@ -110,15 +111,15 @@ The `@Cordova` decorator has a few more options now.
 
 ### Testing your changes
 
-You need to run `npm run build` in the `ionic-native` project, this will create a `dist` directory. Then, you must go to your ionic application folder and replace your current `node_modules/ionic-native/dist/` with the newly generated one.
+You need to run `npm run build` in the `ionic-native` project, this will create a `dist` directory. The `dist` directory will contain a sub directory `@ionic-native` with all the packages compiled in there. Copy the package(s) you created/modified to your app's node_modules under the `@ionic-native` directory. (e.g. `cp -r dist/@ionic-native/plugin-name ../my-app/node_modules/@ionic-native/`).
 
 ### Cleaning the code
 
-You need to run `npm run lint` to analyze the code and ensure it's consistency with the repository style. Fix any errors before submitting a PR.
+You need to run `npm run lint` to analyze the code and ensure its consistency with the repository style. Fix any errors before submitting a PR.
 
 ### 'Wrapping' Up
 
-That's it! The only thing left to do is rigorously document the plugin and it's usage. Take a look at some of the other plugins for good documentation styles.
+That's it! The only thing left to do is rigorously document the plugin and its usage. Take a look at some of the other plugins for good documentation styles.
 
 ## Commit Message Format
 
@@ -147,4 +148,74 @@ The subject contains succinct description of the change:
 * use the imperative, present tense: "change" not "changed" nor "changes"
 * do not capitalize first letter
 * do not place a period (.) at the end
-* entire length of the commit message must not go over 50 characters
+* entire length of the commit message must not go over 50 characters
+
+
+### Ionic Native Decorators
+
+#### Plugin
+A decorator to wrap the main plugin class, and any other classes that will use `@Cordova` or `@CordovaProperty` decorators. This decorator accepts the following configuration:
+- *pluginName*: Plugin name, this should match the class name
+- *plugin*: The plugin's NPM package, or Github URL if NPM is not available.
+- *pluginRef*: The plugin object reference. Example: 'cordova.file'.
+- *repo*: The plugin's Github Repository URL
+- *install*: (optional) Install command. This is used in case a plugin has a custom install command (takes variables).
+- *platforms*: An array of strings indicating the supported platforms. 
+
+#### Cordova
+Checks if the plugin and the method are available before executing. By default, the decorator will wrap the callbacks of the function and return a Promise. This decorator takes the following configuration options:
+- **observable**: set to true to return an Observable
+- **clearFunction**: an optional name of a method to clear the observable we returned
+- **clearWithArgs**: This can be used if clearFunction is set. Set this to true to call the clearFunction with the same arguments used in the initial function.
+- **sync**: set to true if the method should return the value as-is without wrapping with Observable/Promise
+- **callbackOrder**: set to `reverse` if the success and error callbacks are the first two arguements of the method
+- **callbackStyle**: set to `node` if the plugin has one callback with a node style (e.g: `function(err, result){}`), or set to `object` if the callbacks are part of an object
+- **successName**: Success function property name. This must be set if callbackStyle is set to object.
+- **errorName**: Error function property name. This must be set if callbackStyle is set to object.
+- **successIndex**: Set a custom index for the success callback function. This doesn't work if callbackOrder or callbackStyle are set.
+- **errorIndex**: Set a custom index for the error callback function. This doesn't work if callbackOrder or callbackStyle are set.
+- **eventObservable**: set to true to return an observable that wraps an event listener
+- **event**: Event name, this must be set if eventObservable is set to true
+- **element**: Element to attach the event listener to, this is optional, defaults to `window`
+- **otherPromise**: Set to true if the wrapped method returns a promise
+- **platforms**: array of strings indicating supported platforms. Specify this if the supported platforms doesn't match the plugin's supported platforms.
+
+Example:
+```ts
+@Cordova()
+someMethod(): Promise<any> { return; }
+
+@Cordova({ sync: true })
+syncMethod(): number { }
+```
+
+#### CordovaProperty
+Checks if the plugin and property exist before getting/setting the property's value
+
+Example:
+```ts
+@CordovaProperty
+someProperty: string;
+```
+
+#### CordovaCheck
+Checks if the plugin exists before performing a custom written method. By default, the method will return a promise that will reject with an error if the plugin is not available.  This wrapper accepts two optional configurations:
+- **observable**: set to true to return an empty Observable if the plugin isn't available
+- **sync**: set to true to return nothing if the plugin isn't available
+
+Example:
+```ts
+@CordovaCheck()
+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.
-```
-npm install @ionic-native/core --save
+
+```bash
+npm install @ionic-native/core
 ```
 
-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/v2/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/v2/native/](http://ionicframework.com/docs/v2/native/).
+For the full Ionic Native documentation, please visit [https://ionicframework.com/docs/native/](https://ionicframework.com/docs/native/).
 
 ### Basic Usage
 
@@ -47,39 +47,26 @@ export class AppModule { }
 import { Geolocation } from '@ionic-native/geolocation';
 import { Platform } from 'ionic-angular';
 
-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(() => {
+    this.platform.ready().then(() => {
 
       // get position
-      geolocation.getCurrentPosition().then(pos => {
-
+      this.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;
-        })
-
       });
 
       // to stop watching
       watch.unsubscribe();
-
     });
 
   }
@@ -95,92 +82,84 @@ 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) => {
-      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
-    })
+      resolve('BASE_64_ENCODED_DATA_GOES_HERE');
+    });
   }
 }
 ```
 
 Finally, override the previous `Camera` class in your `providers` for this module:
 
-```ts
-providers: [
-  { provide: Camera, useClass: CameraMock }
-]
+```typescript
+providers: [{ provide: Camera, useClass: CameraMock }];
 ```
 
 Here's the full example:
 
-```ts
-import { NgModule, ErrorHandler } from '@angular/core';
-import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
-import { MyApp } from './app.component';
-import { HomePage } from '../pages/home/home';
-
+```typescript
+import { ErrorHandler, NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 import { Camera } from '@ionic-native/camera';
+import { IonicApp, IonicErrorHandler, IonicModule } from 'ionic-angular';
+
+import { HomePage } from '../pages/home/home';
+import { MyApp } from './app.component';
 
 class CameraMock extends Camera {
   getPicture(options) {
     return new Promise((resolve, reject) => {
-      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
-    })
+      resolve('BASE_64_ENCODED_DATA_GOES_HERE');
+    });
   }
 }
 
 @NgModule({
-  declarations: [
-    MyApp,
-    HomePage
-  ],
-  imports: [
-    IonicModule.forRoot(MyApp)
-  ],
+  declarations: [MyApp, HomePage],
+  imports: [BrowserModule, IonicModule.forRoot(MyApp)],
   bootstrap: [IonicApp],
-  entryComponents: [
-    MyApp,
-    HomePage
-  ],
+  entryComponents: [MyApp, HomePage],
   providers: [
-    {provide: ErrorHandler, useClass: IonicErrorHandler},
+    { provide: ErrorHandler, useClass: IonicErrorHandler },
     { provide: Camera, useClass: CameraMock }
   ]
 })
 export class AppModule {}
 ```
 
-
 ### Runtime Diagnostics
 
 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:
 
-## Ionic 1/Angular 1 support
+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 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.
+## Ionic v1 (AngularJS, Angular 1.x) support
+
+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)
+Daniel Sogl - [@sogldaniel](https://twitter.com/sogldaniel)
+
+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

@@ -1,26 +1,51 @@
-machine:
-  node:
-    version: 5.5.0
-  ruby:
-    version: 2.1.2
-
-general:
-  branches:
-    only:
-      - master # ignore PRs and branches
-
-dependencies:
- pre:
-   - ./scripts/docs/prepare.sh
- cache_directories:
-   - "~/ionic-site" # cache ionic-site
-
-test:
-  override:
-    - echo "No tests to run"
-
-deployment:
- staging:
-   branch: master
-   commands:
-     - ./scripts/docs/update_docs.sh
+version: 2
+jobs:
+  build:
+    working_directory: ~/ionic-native/
+    docker:
+      - image: node:8
+    steps:
+      - checkout
+      - restore_cache:
+         key: ionic-site-{{ checksum "package.json" }}
+      - run:
+         name: Prepare ionic-site repo
+         command: |
+           if [ "${CIRCLE_BRANCH}" == "master" ]; then
+             ./scripts/docs/prepare.sh
+           fi
+      - save_cache:
+         key: ionic-site-{{ checksum "package.json" }}
+         paths:
+         - ~/ionic-site/
+      - restore_cache:
+         key: node_modules_{{ checksum "package.json" }}
+      - run:
+         name: Install node modules
+         command: npm i
+      - save_cache:
+         key: node_modules_{{ checksum "package.json" }}
+         paths:
+         - ~/ionic-native/node_modules/
+      - 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
+          command: |
+            if [ "${CIRCLE_BRANCH}" == "master" ]; then
+              ./scripts/docs/update_docs.sh
+            else
+              echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."
+            fi

gulpfile.js

@@ -1,47 +1,53 @@
-var gulp = require('gulp');
-var minimist = require('minimist');
-var rename = require("gulp-rename");
-var tslint = require('gulp-tslint');
-var decamelize = require('decamelize');
-var replace = require('gulp-replace');
+'use strict';
 
-var flagConfig = {
-  string: ['port', 'version', 'ngVersion', 'animations'],
-  boolean: ['dry-run'],
-  alias: {'p': 'port', 'v': 'version', 'a': 'ngVersion'},
-  default: { port: 8000 }
-};
-var flags = minimist(process.argv.slice(2), flagConfig);
+const gulp = require('gulp'),
+  minimist = require('minimist'),
+  rename = require('gulp-rename'),
+  tslint = require('gulp-tslint'),
+  replace = require('gulp-replace'),
+  _ = require('lodash');
+
+const flagConfig = {
+    string: ['port', 'version', 'ngVersion', 'animations'],
+    boolean: ['dry-run'],
+    alias: { p: 'port', v: 'version', a: 'ngVersion' },
+    default: { port: 8000 }
+  },
+  flags = minimist(process.argv.slice(2), flagConfig);
 
 /* Docs tasks */
 require('./scripts/docs/gulp-tasks')(gulp, flags);
 
-gulp.task('lint', function() {
-  gulp.src('src/**/*.ts')
-    .pipe(tslint({
-      formatter: "verbose",
-      configuration: 'tslint.json'
-    }))
-    .pipe(tslint.report())
+gulp.task('lint', () => {
+  return gulp
+    .src('src/**/*.ts')
+    .pipe(
+      tslint({
+        formatter: 'verbose',
+        configuration: 'tslint.json'
+      })
+    )
+    .pipe(tslint.report());
 });
 
-gulp.task('plugin:create', function(){
-  if(flags.n && flags.n !== ''){
-
-    const src = flags.m?'./scripts/templates/wrap-min.tmpl':'./scripts/templates/wrap.tmpl',
+gulp.task('plugin:create', () => {
+  if (flags.n && flags.n !== '') {
+    const src = flags.m
+        ? './scripts/templates/wrap-min.tmpl'
+        : './scripts/templates/wrap.tmpl',
       pluginName = flags.n,
-      pluginPackageName = decamelize(pluginName, '-'),
-      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))
+    return gulp
+      .src(src)
+      .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/' + pluginPackageName));
-
+      .pipe(gulp.dest('./src/@ionic-native/plugins/' + kebabCase));
   } else {
-
-    console.log("Usage is: gulp plugin:create -n PluginName");
-
+    console.log('Usage is: gulp plugin:create -n PluginName');
   }
 });

karma.conf.js

@@ -0,0 +1,40 @@
+'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,38 +1,48 @@
 {
   "name": "ionic-native",
-  "version": "3.2.1",
+  "version": "4.12.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": "^5.2.11",
+    "@angular/compiler-cli": "^5.2.11",
+    "@angular/core": "^5.2.11",
+    "@types/cordova": "0.0.34",
+    "@types/jasmine": "^2.8.8",
+    "@types/node": "8.10.20",
     "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",
-    "decamelize": "1.2.0",
+    "child-process-promise": "2.2.1",
+    "conventional-changelog-cli": "^2.0.1",
+    "cz-conventional-changelog": "^2.1.0",
     "dgeni": "0.4.7",
     "dgeni-packages": "0.16.10",
     "fs-extra": "2.0.0",
     "fs-extra-promise": "0.4.1",
     "gulp": "3.9.1",
-    "gulp-rename": "1.2.2",
-    "gulp-replace": "0.5.4",
+    "gulp-rename": "^1.4.0",
+    "gulp-replace": "^1.0.0",
     "gulp-tslint": "6.1.2",
-    "lodash": "4.17.4",
-    "minimist": "1.1.3",
+    "jasmine-core": "^3.2.1",
+    "karma": "^2.0.5",
+    "karma-cli": "^1.0.1",
+    "karma-jasmine": "^1.1.2",
+    "karma-phantomjs-launcher": "^1.0.4",
+    "karma-typescript": "^3.0.13",
+    "karma-typescript-es6-transform": "^1.0.4",
+    "lodash": "^4.17.10",
+    "minimist": "1.2.0",
     "node-html-encoder": "0.0.2",
-    "q": "1.4.1",
-    "queue": "4.2.1",
-    "rimraf": "2.5.4",
-    "rxjs": "5.0.1",
-    "semver": "5.3.0",
+    "q": "^1.5.1",
+    "queue": "^4.4.2",
+    "rimraf": "^2.6.2",
+    "rxjs": "^5.5.11",
+    "semver": "^5.5.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.26"
   },
   "scripts": {
     "start": "npm run test:watch",
@@ -43,7 +53,18 @@
     "clean": "rimraf dist .tmp",
     "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"
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
+    "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

@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
 // Node module dependencies
 const fs = require('fs-extra-promise').useFs(require('fs-extra')),
   queue = require('queue'),
@@ -15,22 +15,21 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native
   BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/@ionic-native'), // dist directory root path
   BUILD_CORE_DIST = path.resolve(BUILD_DIST_ROOT, 'core'); // core dist directory path
 
-
 // dependency versions
-const ANGULAR_VERSION = '2.4.8',
-  RXJS_VERSION = '5.0.1',
-  MIN_CORE_VERSION = '^3.1.0',
+const ANGULAR_VERSION = '*',
+  RXJS_VERSION = '^5.5.11',
+  MIN_CORE_VERSION = '^4.11.0',
   IONIC_NATIVE_VERSION = require(path.resolve(ROOT, 'package.json')).version;
 
 // package dependencies
 const CORE_PEER_DEPS = {
-  'rxjs': RXJS_VERSION
+  rxjs: RXJS_VERSION
 };
 
 const PLUGIN_PEER_DEPS = {
   '@ionic-native/core': MIN_CORE_VERSION,
   '@angular/core': ANGULAR_VERSION,
-  'rxjs': RXJS_VERSION
+  rxjs: RXJS_VERSION
 };
 
 // set peer dependencies for all plugins
@@ -40,29 +39,44 @@ 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;
 CORE_PACKAGE_JSON.peerDependencies = CORE_PEER_DEPS;
-fs.writeJsonSync(path.resolve(BUILD_CORE_DIST, 'package.json'), CORE_PACKAGE_JSON);
-
+fs.writeJsonSync(
+  path.resolve(BUILD_CORE_DIST, 'package.json'),
+  CORE_PACKAGE_JSON
+);
 
 // 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({
   concurrency: require('os').cpus().length
 });
 
-
 // Function to process a single plugin
 const addPluginToQueue = pluginName => {
-
-  QUEUE.push((callback) => {
-
+  QUEUE.push(callback => {
     console.log(`Building plugin: ${pluginName}`);
 
     const PLUGIN_BUILD_DIR = path.resolve(BUILD_TMP, 'plugins', pluginName),
@@ -73,7 +87,6 @@ const addPluginToQueue = pluginName => {
     fs.mkdirpAsync(PLUGIN_BUILD_DIR) // create tmp build dir
       .then(() => fs.mkdirpAsync(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
       .then(() => {
-
         // Write tsconfig.json
         const tsConfig = JSON.parse(JSON.stringify(PLUGIN_TS_CONFIG));
         tsConfig.files = [PLUGIN_SRC_PATH];
@@ -90,40 +103,52 @@ const addPluginToQueue = pluginName => {
         packageJson.name = `@ionic-native/${pluginName}`;
         packageJson.version = IONIC_NATIVE_VERSION;
 
-        return fs.writeJsonAsync(path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson);
+        return fs.writeJsonAsync(
+          path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'),
+          packageJson
+        );
       })
       .then(() => {
-
         // compile the plugin
-        exec(`${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`, (err, stdout, stderr) => {
+        exec(
+          `${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`,
+          (err, stdout, stderr) => {
+            if (err) {
+              if (!ignoreErrors) {
+                // oops! something went wrong.
+                console.log(err);
+                callback(`\n\nBuilding ${pluginName} failed.`);
+                return;
+              } else {
+                errors.push(err);
+              }
+            }
 
-          if (err) {
-            // oops! something went wrong.
-            callback(`\n\nBuilding ${pluginName} failed.`);
-            console.log(err);
-            return;
+            // we're done with this plugin!
+            callback();
           }
-
-          // we're done with this plugin!
-          callback();
-
-        });
-
+        );
       })
       .catch(callback);
-
   }); // QUEUE.push end
-
 };
 
-PLUGINS.forEach(addPluginToQueue);
-
-QUEUE.start((err) => {
+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/publish.js

@@ -1,11 +1,10 @@
-"use strict";
+'use strict';
 // Node module dependencies
 const fs = require('fs-extra-promise').useFs(require('fs-extra')),
   queue = require('queue'),
   path = require('path'),
   exec = require('child-process-promise').exec;
 
-
 const ROOT = path.resolve(path.join(__dirname, '../../')),
   DIST = path.resolve(ROOT, 'dist', '@ionic-native');
 
@@ -13,32 +12,40 @@ const FLAGS = '--access public'; // add any flags here if you want... (example:
 
 const PACKAGES = fs.readdirSync(DIST);
 
+const failedPackages = [];
 
 const QUEUE = queue({
   concurrency: 10
 });
 
 PACKAGES.forEach(packageName => {
-
   QUEUE.push(done => {
-
     console.log(`Publishing @ionic-native/${packageName}`);
     const packagePath = path.resolve(DIST, packageName);
     exec(`npm publish ${packagePath} ${FLAGS}`)
       .then(() => done())
-      .catch(done);
-
+      .catch(e => {
+        if (
+          e.stderr &&
+          e.stderr.indexOf('previously published version') === -1
+        ) {
+          failedPackages.push({
+            cmd: e.cmd,
+            stderr: e.stderr
+          });
+        }
+        done();
+      });
   });
-
 });
 
-QUEUE.start((err) => {
-
+QUEUE.start(err => {
   if (err) {
     console.log('Error publishing ionic-native. ', err);
+  } else if (failedPackages.length > 0) {
+    console.log(`${failedPackages.length} packages failed to publish.`);
+    console.log(failedPackages);
   } else {
     console.log('Done publishing ionic-native!');
   }
-
 });
-

scripts/build/tsconfig-core.json

@@ -11,7 +11,10 @@
     "rootDir": "../../src/",
     "target": "es5",
     "skipLibCheck": true,
-    "lib": ["es2015", "dom"]
+    "lib": ["es2015", "dom"],
+    "sourceMap": true,
+    "inlineSources": true,
+    "noImplicitAny": true
   },
   "files": [
     "../../src/@ionic-native/core/index.ts"

scripts/build/tsconfig-plugin.json

@@ -14,7 +14,10 @@
     "rootDir": "../../../src/@ionic-native/plugins/",
     "target": "es5",
     "skipLibCheck": true,
-    "lib": ["es2015", "dom"]
+    "lib": ["es2015", "dom"],
+    "sourceMap": true,
+    "inlineSources": true,
+    "noImplicitAny": true
   },
   "files": []
 }

scripts/ci-tests.js

@@ -0,0 +1,71 @@
+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/config.json

@@ -1,6 +1,6 @@
 {
   "sitePath": "../ionic-site",
-  "v2DocsDir": "docs/v2/native",
-  "docsDest": "../ionic-site/content/docs/v2/native",
+  "v2DocsDir": "docs/native",
+  "docsDest": "../ionic-site/content/docs/native",
   "pluginDir": "dist/@ionic-native"
 }

scripts/docs/configs/links.js

@@ -0,0 +1,3 @@
+module.exports = function(getLinkInfo) {
+  getLinkInfo.useFirstAmbiguousLink = false;
+};

scripts/docs/configs/log.js

@@ -0,0 +1,3 @@
+module.exports = function(log) {
+  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
+};

scripts/docs/configs/tag-defs.js

@@ -0,0 +1,4 @@
+module.exports = function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
+    .concat(require('../tag-defs/tag-defs'));
+};

scripts/docs/configs/template-filters.js

@@ -0,0 +1,12 @@
+module.exports = function(templateEngine) {
+  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
+  // Also conflict with Jekyll
+  templateEngine.config.tags = {
+    variableStart: '<$',
+    variableEnd: '$>',
+    blockStart: '<@',
+    blockEnd: '@>',
+    commentStart: '<#',
+    commentEnd: '#>'
+  };
+};

scripts/docs/configs/template-tags.js

@@ -0,0 +1,9 @@
+module.exports = function(templateEngine) {
+  // add custom filters to nunjucks
+  templateEngine.filters.push(
+    require('../filters/capital'),
+    require('../filters/code'),
+    require('../filters/dump'),
+    require('../filters/dashify')
+  );
+};

scripts/docs/dgeni-config.js

@@ -1,182 +1,79 @@
-var Package = require('dgeni').Package;
-var jsdocPackage = require('dgeni-packages/jsdoc');
-var nunjucksPackage = require('dgeni-packages/nunjucks');
-var typescriptPackage = require('dgeni-packages/typescript');
-var linksPackage = require('dgeni-packages/links');
-var path = require('path');
-var semver = require('semver');
-var fs = require('fs');
-var _ = require('lodash');
-var config = require('../config.json');
-var projectPackage = require('../../package.json');
+"use strict";
+const Package = require('dgeni').Package,
+  jsdocPackage = require('dgeni-packages/jsdoc'),
+  nunjucksPackage = require('dgeni-packages/nunjucks'),
+  typescriptPackage = require('dgeni-packages/typescript'),
+  linksPackage = require('dgeni-packages/links'),
+  path = require('path'),
+  config = require('../config.json');
 
-// Define the dgeni package for generating the docs
-module.exports = function(currentVersion) {
+module.exports = currentVersion => {
 
-  return new Package('ionic-v2-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
+  return new Package('ionic-native-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
 
-// .processor(require('./processors/latest-version'))
-.processor(require('./processors/jekyll'))
-.processor(require('./processors/remove-private-members'))
-.processor(require('./processors/hide-private-api'))
-.processor(require('./processors/collect-inputs-outputs'))
-.processor(require('./processors/npm-id'))
+    .processor(require('./processors/remove-private-members'))
+    .processor(require('./processors/hide-private-api'))
+    .processor(require('./processors/parse-optional'))
+    .processor(require('./processors/mark-properties'))
+    .processor(require('./processors/npm-id'))
+    .processor(require('./processors/jekyll'))
 
-// for debugging docs
-// .processor(function test(){
-//   return {
-//
-//     $runBefore: ['rendering-docs'],
-//     $process: function(docs){
-//       docs.forEach(function(doc){
-//         if (doc.name == "Camera"){
-//
-//           // console.log(doc.tags);
-//           // doc.tags.forEach(function(tag){
-//           //   if(tag.tagName == 'classes'){
-//           //
-//           //   }
-//           // });
-//
-//           // doc.moduleDoc.exports.forEach(function(d,i){
-//           //   if(d.name === 'CameraOptions') {
-//           //     console.log('Name: ' + d.name);
-//           //     console.log('Type: ' + d.docType);
-//           //     console.log('First member: ', d.members[0]);
-//           //   }
-//           // });
-//
-//
-//           // var exports = doc.exportSymbol.parent.exports;
-//           // for(var p in exports) {
-//           //   if(p == 'CameraOptions')
-//           //   {
-//           //     var x = exports[p];
-//           //     console.log(x.members.quality);
-//           //   }
-//           // }
-//           // doc.members.forEach(function(method){
-//           //   if (method.name === "getPicture") {
-//           //     console.log(method);
-//           //   }
-//           // })
-//         }
-//       })
-//     }
-//   }
-// })
+    .config(require('./configs/log'))
+    .config(require('./configs/template-filters'))
+    .config(require('./configs/template-tags'))
+    .config(require('./configs/tag-defs'))
+    .config(require('./configs/links'))
 
-.config(function(log) {
-  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
-})
+    .config(function(renderDocsProcessor, computePathsProcessor) {
 
-.config(function(renderDocsProcessor, computePathsProcessor) {
+      currentVersion = {
+        href: '/' + config.v2DocsDir.replace('content/', ''),
+        folder: '',
+        name: currentVersion
+      };
 
-  versions = [];
-  // new version, add it to the versions list
-  if (currentVersion != 'nightly' && !_.includes(versions, currentVersion)) {
-    versions.unshift(currentVersion);
-  }
-  //First semver valid version is latest
-  var latestVersion = _.find(versions, semver.valid);
-  versions = versions.map(function(version) {
-    // We don't separate by versions so always put the docs in the root
-    var folder = '';
-    return {
-      href: '/' + config.v2DocsDir.replace('content/',''),
-      folder: folder,
-      name: version
-    };
-  });
+      renderDocsProcessor.extraData.version = {
+        list: [currentVersion],
+        current: currentVersion,
+        latest: currentVersion
+      };
 
-  var versionData = {
-    list: versions,
-    current: _.find(versions, {name: currentVersion}),
-    latest: _.find(versions, {name: latestVersion}) || _.first(versions)
-  };
+      computePathsProcessor.pathTemplates = [{
+        docTypes: ['class'],
+        getOutputPath: doc => 'content/' + config.v2DocsDir + '/' +  doc.name + '/index.md'
+      }];
 
-  renderDocsProcessor.extraData.version = versionData;
-  computePathsProcessor.pathTemplates = [{
-    docTypes: ['class', 'var', 'function', 'let'],
-    getOutputPath: function(doc) {
-      var docPath = doc.name + '/index.md';
-      var path = 'content/' + config.v2DocsDir + '/' +  docPath;
+    })
 
-      return path;
-    }
-  }];
-})
+    //configure file reading
+    .config(function(readFilesProcessor, readTypeScriptModules) {
 
-//configure file reading
-.config(function(readFilesProcessor, readTypeScriptModules) {
+      // Don't run unwanted processors since we are not using the normal file reading processor
+      readFilesProcessor.$enabled = false;
+      readFilesProcessor.basePath = path.resolve(__dirname, '../..');
 
-  // Don't run unwanted processors since we are not using the normal file reading processor
-  readFilesProcessor.$enabled = false;
-  readFilesProcessor.basePath = path.resolve(__dirname, '../..');
+      readTypeScriptModules.basePath = path.resolve(__dirname, '../..');
+      readTypeScriptModules.sourceFiles = [
+        './src/@ionic-native/plugins/**/*.ts'
+      ];
+    })
 
-  readTypeScriptModules.basePath = path.resolve(__dirname, '../..');
-  readTypeScriptModules.sourceFiles = [
-    './src/@ionic-native/plugins/**/*.ts'
-  ];
-})
+    // Configure file writing
+    .config(function(writeFilesProcessor) {
+      writeFilesProcessor.outputFolder  = '../ionic-site/';
+    })
 
-.config(function(parseTagsProcessor) {
-  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
-                                        .concat(require('./tag-defs/tag-defs'));
-})
+    // Configure rendering
+    .config(function(templateFinder) {
 
-// .config(function(parseTagsProcessor) {
-//   // We actually don't want to parse param docs in this package as we are
-//   // getting the data out using TS
-//   parseTagsProcessor.tagDefinitions.forEach(function(tagDef) {
-//     console.log(tagDef);
-//     if (tagDef.name === 'param') {
-//       tagDef.docProperty = 'paramData';
-//       tagDef.transforms = [];
-//     }
-//   });
-// })
+      templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
 
-// Configure links
-.config(function(getLinkInfo) {
-  getLinkInfo.useFirstAmbiguousLink = false;
-})
-
-// Configure file writing
-.config(function(writeFilesProcessor) {
-  writeFilesProcessor.outputFolder  = '../ionic-site/';
-})
-
-// Configure rendering
-.config(function(templateFinder, templateEngine) {
-
-  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
-  // Also conflict with Jekyll
-  templateEngine.config.tags = {
-    variableStart: '<$',
-    variableEnd: '$>',
-    blockStart: '<@',
-    blockEnd: '@>',
-    commentStart: '<#',
-    commentEnd: '#>'
-  };
-
-  // add custom filters to nunjucks
-  templateEngine.filters.push(
-    require('./filters/capital'),
-    require('./filters/code'),
-    require('./filters/dump'),
-    require('./filters/dashify')
-  );
-
-  templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
-
-  // Specify how to match docs to templates.
-  templateFinder.templatePatterns = [
-    '${ doc.template }',
-    '${ doc.docType }.template.html',
-    'common.template.html'
-  ];
-});
+      // Specify how to match docs to templates.
+      templateFinder.templatePatterns = [
+        '${ doc.template }',
+        '${ doc.docType }.template.html',
+        'common.template.html'
+      ];
+    });
 
 };

scripts/docs/dgeni-readmes-config.js

@@ -1,115 +1,53 @@
-var Package = require('dgeni').Package;
-var jsdocPackage = require('dgeni-packages/jsdoc');
-var nunjucksPackage = require('dgeni-packages/nunjucks');
-var typescriptPackage = require('dgeni-packages/typescript');
-var linksPackage = require('dgeni-packages/links');
-var path = require('path');
-var semver = require('semver');
-var fs = require('fs');
-var _ = require('lodash');
-var config = require('../config.json');
-var projectPackage = require('../../package.json');
+"use strict";
+const Package = require('dgeni').Package,
+  jsdocPackage = require('dgeni-packages/jsdoc'),
+  nunjucksPackage = require('dgeni-packages/nunjucks'),
+  typescriptPackage = require('dgeni-packages/typescript'),
+  linksPackage = require('dgeni-packages/links'),
+  path = require('path'),
+  config = require('../config.json');
 
-// jscs:disable validateIndentation
+module.exports = currentVersion => {
 
-// Define the dgeni package for generating the docs
-module.exports = function(currentVersion) {
+  return new Package('ionic-native-readmes', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
 
-  return new Package('ionic-v2-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
-
-  // .processor(require('./processors/latest-version'))
     .processor(require('./processors/readmes'))
-    .processor(require('./processors/npm-id'))
     .processor(require('./processors/remove-private-members'))
     .processor(require('./processors/hide-private-api'))
-    // .processor(require('./processors/collect-inputs-outputs'))
+    .processor(require('./processors/npm-id'))
+
+    .config(require('./configs/log'))
+    .config(require('./configs/template-filters'))
+    .config(require('./configs/template-tags'))
+    .config(require('./configs/tag-defs'))
+    .config(require('./configs/links'))
 
-    // for debugging docs
-    // .processor(function test(){
-    //   return {
-    //
-    //     $runBefore: ['rendering-docs'],
-    //     $process: function(docs){
-    //       docs.forEach(function(doc){
-    //         if (doc.name == "Camera"){
-    //
-    //           // console.log(doc.tags);
-    //           // doc.tags.forEach(function(tag){
-    //           //   if(tag.tagName == 'classes'){
-    //           //
-    //           //   }
-    //           // });
-    //
-    //           // doc.moduleDoc.exports.forEach(function(d,i){
-    //           //   if(d.name === 'CameraOptions') {
-    //           //     console.log('Name: ' + d.name);
-    //           //     console.log('Type: ' + d.docType);
-    //           //     console.log('First member: ', d.members[0]);
-    //           //   }
-    //           // });
-    //
-    //
-    //           // var exports = doc.exportSymbol.parent.exports;
-    //           // for(var p in exports) {
-    //           //   if(p == 'CameraOptions')
-    //           //   {
-    //           //     var x = exports[p];
-    //           //     console.log(x.members.quality);
-    //           //   }
-    //           // }
-    //           // doc.members.forEach(function(method){
-    //           //   if (method.name === "getPicture") {
-    //           //     console.log(method);
-    //           //   }
-    //           // })
-    //         }
-    //       })
-    //     }
-    //   }
-    // })
-    .config(function(log) {
-      log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
-    })
 
     .config(function(renderDocsProcessor, computePathsProcessor) {
 
-      versions = [];
-      // new version, add it to the versions list
-      if (currentVersion != 'nightly' && !_.includes(versions, currentVersion)) {
-        versions.unshift(currentVersion);
-      }
-      //First semver valid version is latest
-      var latestVersion = _.find(versions, semver.valid);
-      versions = versions.map(function(version) {
-        // We don't separate by versions so always put the docs in the root
-        var folder = '';
-        return {
-          href: '/' + config.v2DocsDir.replace('content/', ''),
-          folder: folder,
-          name: version
-        };
-      });
-
-      var versionData = {
-        list: versions,
-        current: _.find(versions, {name: currentVersion}),
-        latest: _.find(versions, {name: latestVersion}) || _.first(versions)
+      currentVersion = {
+        href: '/' + config.v2DocsDir.replace('content/', ''),
+        folder: '',
+        name: currentVersion
+      };
+
+      renderDocsProcessor.extraData.version = {
+        list: [currentVersion],
+        current: currentVersion,
+        latest: currentVersion
       };
 
-      renderDocsProcessor.extraData.version = versionData;
       computePathsProcessor.pathTemplates = [{
         docTypes: ['class'],
-        getOutputPath: function(doc) {
-          return doc.originalModule.replace(config.pluginDir + '/', '')
-              .replace('/plugins', '')
-              .replace('/index', '') + '/README.md';
-        }
+        getOutputPath: doc => doc.originalModule.replace(config.pluginDir + '/', '')
+          .replace('/plugins', '')
+          .replace(/\/index$/, '/README.md')
       }];
+
     })
 
     //configure file reading
     .config(function(readFilesProcessor, readTypeScriptModules) {
-
       // Don't run unwanted processors since we are not using the normal file reading processor
       readFilesProcessor.$enabled = false;
       readFilesProcessor.basePath = path.resolve(__dirname, '../..');
@@ -118,54 +56,13 @@ module.exports = function(currentVersion) {
       readTypeScriptModules.sourceFiles = ['./src/@ionic-native/plugins/**/*.ts'];
     })
 
-    .config(function(parseTagsProcessor) {
-      parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
-        .concat(require('./tag-defs/tag-defs'));
-    })
-
-    // .config(function(parseTagsProcessor) {
-    //   // We actually don't want to parse param docs in this package as we are
-    //   // getting the data out using TS
-    //   parseTagsProcessor.tagDefinitions.forEach(function(tagDef) {
-    //     console.log(tagDef);
-    //     if (tagDef.name === 'param') {
-    //       tagDef.docProperty = 'paramData';
-    //       tagDef.transforms = [];
-    //     }
-    //   });
-    // })
-
-    // Configure links
-    .config(function(getLinkInfo) {
-      getLinkInfo.useFirstAmbiguousLink = false;
-    })
-
     // Configure file writing
     .config(function(writeFilesProcessor) {
       writeFilesProcessor.outputFolder  = './dist/';
     })
 
     // Configure rendering
-    .config(function(templateFinder, templateEngine) {
-
-      // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
-      // Also conflict with Jekyll
-      templateEngine.config.tags = {
-        variableStart: '<$',
-        variableEnd: '$>',
-        blockStart: '<@',
-        blockEnd: '@>',
-        commentStart: '<#',
-        commentEnd: '#>'
-      };
-
-      // add custom filters to nunjucks
-      templateEngine.filters.push(
-        require('./filters/capital'),
-        require('./filters/code'),
-        require('./filters/dump')
-      );
-
+    .config(function(templateFinder) {
       templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
 
       // Specify how to match docs to templates.

scripts/docs/filters/capital.js

@@ -1,7 +1,5 @@
+"use strict";
 module.exports = {
   name: 'capital',
-  process: function(str) {
-    str || (str = '');
-    return str.charAt(0).toUpperCase() + str.substring(1);
-  }
+  process: str => str? str.charAt(0).toUpperCase() + str.substring(1) : ''
 };

scripts/docs/filters/code.js

@@ -1,4 +1,5 @@
-var encoder = new require('node-html-encoder').Encoder();
+"use strict";
+const encoder = new require('node-html-encoder').Encoder();
 
 function code(str, inline, lang) {
   // Encode any HTML entities in the code string
@@ -10,16 +11,14 @@ function code(str, inline, lang) {
   str = '<code' + lang + '>' + str + '</code>';
 
   // If not inline then wrap the code element in a pre element
-  if ( !inline ) {
+  if (!inline) {
     str = '<pre>' + str + '</pre>';
   }
 
   return str;
-};
+}
 
 module.exports = {
   name: 'code',
-  process: function(str, lang) {
-    return code(str, true, lang);
-  }
+  process: (str, lang) => code(str, true, lang)
 };

scripts/docs/filters/dashify.js

@@ -1,7 +1,5 @@
+"use strict";
 module.exports = {
   name: 'dashify',
-  process: function(str) {
-    str || (str = '');
-    return str.replace(/\s/g, '-');
-  }
+  process: str => str? str.replace(/\s/g, '-') : ''
 };

scripts/docs/filters/dump.js

@@ -1,6 +1,5 @@
+"use strict";
 module.exports = {
   name: 'dump',
-  process: function(obj) {
-    console.log(obj);
-  }
-};
+  process: obj => console.log(obj)
+};

scripts/docs/gulp-tasks.js

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

scripts/docs/prepare.sh

@@ -30,7 +30,7 @@ function run {
     git pull origin master
   fi
 
-  git rm -rf content/docs/v2/native/*/ || true
+  git rm -rf content/docs/native/*/ || true
 
 }
 

scripts/docs/processors/collect-inputs-outputs.js

@@ -1,71 +0,0 @@
-module.exports = function collectInputsOutputs() {
-  return {
-
-    $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      docs.forEach(function(doc) {
-
-        if (doc.statics && doc.statics.length) {
-          for (var i in doc.statics) {
-            // identify properties to differentiate from methods
-            if (typeof doc.statics[i].parameters == 'undefined') {
-              doc.statics[i].isProperty = true;
-            }
-          }
-        }
-
-        if (doc.members && doc.members.length) {
-          var members = [];
-          var inputs = [];
-          var outputs = [];
-
-          memberLoop:
-          for (var i in doc.members) {
-
-            // identify properties to differentiate from methods
-            if (typeof doc.members[i].parameters == 'undefined') {
-              doc.members[i].isProperty = true;
-            }
-
-            if (doc.members[i].decorators && doc.members[i].decorators.length) {
-
-              decoratorLoop:
-              for (var ii in doc.members[i].decorators) {
-
-                if (doc.members[i].decorators[ii].name == 'Input') {
-                  inputs.push(parseMember(doc.members[i]));
-                  continue memberLoop;
-                }
-                if (doc.members[i].decorators[ii].name == 'Output') {
-                  outputs.push(parseMember(doc.members[i]));
-                  continue memberLoop;
-                }
-              }
-              // not an input or output, must be a plain member
-              members.push(doc.members[i]);
-            } else {
-              members.push(doc.members[i]);
-            };
-          }
-
-          // update doc with pruned members list and add inputs and outputs
-          doc.members = members;
-          doc.inputs = inputs;
-          doc.outputs = outputs;
-        }
-
-        function parseMember(member) {
-          member.type = member.content.substring(
-            member.content.indexOf('{') + 1,
-            member.content.indexOf('}')
-          );
-          member.description = member.content.substring(
-            member.content.indexOf('}') + 1,
-            member.content.length
-          );
-          return member;
-        }
-      });
-    }
-  };
-};

scripts/docs/processors/debug.js

@@ -0,0 +1,43 @@
+"use strict";
+module.exports = function test(){
+  return {
+    name: 'debug',
+    $runBefore: ['rendering-docs'],
+    $process: function(docs){
+      docs.forEach(function(doc){
+        if (doc.name == "Camera"){
+
+          console.log(doc.tags);
+          doc.tags.forEach(function(tag){
+            if(tag.tagName == 'classes'){
+
+            }
+          });
+
+          doc.moduleDoc.exports.forEach(function(d,i){
+            if(d.name === 'CameraOptions') {
+              console.log('Name: ' + d.name);
+              console.log('Type: ' + d.docType);
+              console.log('First member: ', d.members[0]);
+            }
+          });
+
+
+          var exports = doc.exportSymbol.parent.exports;
+          for(var p in exports) {
+            if(p == 'CameraOptions')
+            {
+              var x = exports[p];
+              console.log(x.members.quality);
+            }
+          }
+          doc.members.forEach(function(method){
+            if (method.name === "getPicture") {
+              console.log(method);
+            }
+          })
+        }
+      })
+    }
+  }
+}

scripts/docs/processors/hide-private-api.js

@@ -1,18 +1,9 @@
+"use strict";
 module.exports = function removePrivateApi() {
   return {
     name: 'remove-private-api',
     description: 'Prevent the private apis from being rendered',
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      var publicDocs = [];
-      docs.forEach(function(doc){
-        if (!doc.private && (!doc.tags || !doc.tags.tagsByName.get('hidden'))){
-          publicDocs.push(doc);
-          return doc
-        }
-      });
-      docs = publicDocs;
-      return docs;
-    }
-  }
+    $process: docs => docs.filter(doc => !doc.private && (!doc.tags || !doc.tags.tagsByName.get('hidden')))
+  };
 };

scripts/docs/processors/jekyll.js

@@ -1,38 +1,65 @@
+"use strict";
 module.exports = function jekyll(renderDocsProcessor) {
   return {
     name: 'jekyll',
     description: 'Create jekyll includes',
     $runAfter: ['paths-computed'],
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      var currentVersion = renderDocsProcessor.extraData.version.current.name;
+    $process: docs => {
 
       // pretty up and sort the docs object for menu generation
-      docs = docs.filter(function(doc) {
-        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
-      });
-      docs.sort(function(a, b) {
-        textA = a.name ? a.name.toUpperCase() : '';
-        textB = b.name ? b.name.toUpperCase() : '';
-        return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
-      });
-      docs.forEach(function(doc, i) {
-        doc.outputPath = doc.outputPath.toLowerCase().replace(/\s/g, '-');
-        docs[i].URL = doc.outputPath.replace('docs/v2//', 'docs/v2/')
-                                    .replace('/index.md', '')
-                                    .replace('content/', '');
-
-        docs[i].demo = !!docs[i].demo;
-      });
+      docs = docs.filter(doc => (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page');
 
       docs.push({
-        docType: 'native_menu-menu',
-        id: 'native_menu-menu',
-        template: 'native_menu.template.html',
-        outputPath: 'content/_includes/v2_fluid/native_menu.html'
+        docType: 'class',
+        URL: 'https://github.com/ionic-team/ionic-native-google-maps/blob/master/documents/README.md',
+        name: 'Google Maps',
+      });
+
+      docs.sort((a, b) => {
+        const textA = a.name ? a.name.toUpperCase() : '',
+          textB = b.name ? b.name.toUpperCase() : '';
+
+        return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
+      });
+
+      docs.forEach(doc => {
+        if (!doc.outputPath) {
+          return;
+        }
+
+        doc.outputPath = doc.outputPath.toLowerCase().replace(/\s/g, '-');
+        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 + '/';
+        }
+
+        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',
+        id: 'native_menu',
+        template: 'native_menu.template.html',
+        outputPath: 'content/_includes/fluid/native_menu.html'
       });
 
-      // returning docs will replace docs object in the next process
       return docs;
     }
   };

scripts/docs/processors/latest-version.js

@@ -1,33 +0,0 @@
-var copy = require('cpr').cpr;
-var mkdirp = require('mkdirp');
-var path = require('canonical-path');
-var q = require('q');
-var fs = require('fs');
-
-module.exports = function latestVersion(renderDocsProcessor) {
-  return {
-    name: 'latest-version',
-    $runAfter: ['files-written'],
-    description: 'Copy the latest version (that was compiled to docs/) into docs/versionName',
-    $process: function(docs) {
-      var versionData = renderDocsProcessor.extraData.version;
-
-      var docsBase = 'dist/ionic-site/content/docs/v2/';
-      var versionDir = path.resolve(docsBase, versionData.latest.name);
-      var latestDir = path.resolve(docsBase, 'api');
-
-      var deferred = q.defer();
-
-      mkdirp(versionDir, function() {
-        copy(latestDir, path.join(versionDir, 'api'), {
-          deleteFirst: true,
-          overwrite: true
-        }, function(err, files) {
-          deferred.resolve(docs);
-        });
-      });
-
-      return deferred.promise;
-    }
-  }
-};

scripts/docs/processors/mark-properties.js

@@ -0,0 +1,15 @@
+"use strict";
+module.exports = function markProperties() {
+  return {
+    name: 'mark-properties',
+    $runBefore: ['rendering-docs'],
+    $process: docs => docs.map(doc => {
+      for (let i in doc.members) {
+        if (doc.members.hasOwnProperty(i) && typeof doc.members[i].parameters === 'undefined') {
+          doc.members[i].isProperty = true;
+        }
+      }
+      return doc;
+    })
+  }
+};

scripts/docs/processors/npm-id.js

@@ -1,24 +1,19 @@
+"use strict";
 module.exports = function npmId(renderDocsProcessor) {
   return {
     name: 'npm-id',
     $runAfter: ['paths-computed'],
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      var currentVersion = renderDocsProcessor.extraData.version.current.name;
-
+    $process: docs => {
       // pretty up and sort the docs object for menu generation
       docs = docs.filter(function(doc) {
         return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
       });
 
-      docs.forEach(function(doc, i) {
-        doc.npmId = doc.outputPath.replace('/README.md', '') // for readmes
-          .replace('@ionic-native/plugins/','') // for readmes
-          .replace('content/docs/v2/native/', '') // for docs
-          .replace('/index.md', ''); // for docs
+      docs.forEach(doc => {
+        doc.npmId = doc.id.match(/plugins\/(.*)\/index/)[1];
       });
 
-      // returning docs will replace docs object in the next process
       return docs;
     }
   };

scripts/docs/processors/parse-optional.js

@@ -0,0 +1,22 @@
+"use strict";
+module.exports = function parseOptional() {
+  return {
+    $runBefore: ['rendering-docs'],
+    $process: docs => {
+      docs.forEach(doc => {
+        if (doc.members && doc.members.length) {
+          for (let i in doc.members) {
+            if (doc.members[i].params && doc.members[i].params.length) {
+              for (let ii in doc.members[i].params) {
+                if (doc.members[i].params[ii].optional) {
+                  doc.members[i].params[ii].description += '<strong class="tag">Optional</strong>';
+                }
+              }
+            }
+          }
+        }
+      });
+      return docs;
+    }
+  }
+};

scripts/docs/processors/readmes.js

@@ -1,22 +1,18 @@
+"use strict";
 module.exports = function readmes(renderDocsProcessor) {
   return {
     name: 'readmes',
     description: 'Create jekyll includes',
     $runAfter: ['paths-computed'],
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      var currentVersion = renderDocsProcessor.extraData.version.current.name;
-
+    $process: docs => {
       // pretty up and sort the docs object for menu generation
-      docs = docs.filter(function(doc) {
-        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
-      });
+      docs = docs.filter(doc => (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page');
 
-      docs.forEach(function(doc, i) {
+      docs.forEach(doc => {
         doc.outputPath = doc.outputPath.replace('src/', '');
       });
 
-      // returning docs will replace docs object in the next process
       return docs;
     }
   };

scripts/docs/processors/remove-private-members.js

@@ -1,22 +1,19 @@
+"use strict";
 module.exports = function removePrivateMembers() {
   return {
     name: 'remove-private-members',
     description: 'Remove member docs with @private tags',
     $runAfter: ['tags-parsed'],
     $runBefore: ['rendering-docs'],
-    $process: function(docs) {
-      docs.forEach(function(doc) {
+    $process: docs => {
+      docs.forEach(doc => {
 
         if (doc.members) {
-          doc.members = doc.members.filter(function(member) {
-            return !member.tags.tagsByName.get('hidden');
-          });
+          doc.members = doc.members.filter(member => !member.tags.tagsByName.get('hidden'));
         }
 
         if (doc.statics) {
-          doc.statics = doc.statics.filter(function(staticMethod) {
-            return !staticMethod.tags.tagsByName.get('hidden');
-          });
+          doc.statics = doc.statics.filter(staticMethod => !staticMethod.tags.tagsByName.get('hidden'));
         }
 
       });

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

@@ -1,12 +1,11 @@
+"use strict";
 module.exports = [
   {'name': 'advanced'},
   {'name': 'demo'},
-  {'name': 'beta', transforms: function(doc, tag, value) {
-    // make the value true or undefined instead of '' or undefined
-    return typeof value !== 'undefined';
-  }},
+  {'name': 'beta', transforms: (doc, tag, value) => typeof value !== 'undefined'}, // make the value true or undefined instead of '' or undefined
   {'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

@@ -1,5 +1,5 @@
 ---
-layout: "v2_fluid/docs_base"
+layout: "fluid/docs_base"
 version: "<$ version.current.name $>"
 versionHref: "<$ version.current.href.replace('content/','') $>"
 path: "<$ doc.path $>"
@@ -11,7 +11,7 @@ doc: "<$ doc.name $>"
 docType: "<$ doc.docType $>"
 ---
 
-<@ macro interfaceTable(interface) @>
+<@- macro interfaceTable(interface) -@>
 <@ for export in doc.moduleDoc.exports -@>
 <@ if export.name == interface @>
 <table class="table param-table" style="margin:0;">
@@ -33,30 +33,21 @@ docType: "<$ doc.docType $>"
     </td>
     <td>
       <$ param.description | marked $>
-      <@ if param.optional @><strong class="tag">Optional</strong><@ endif @>
+      <@ if param.optional @><em>(optional)</em><@ endif @>
     </td>
   </tr>
   <@ endfor @>
   </tbody>
 </table>
-
 <@ endif @>
 <@- endfor @>
-<@ endmacro @>
-
-<@ macro paramList(paramData) -@>
-<@- if paramData -@><span class="params">(
-    <@- for param in paramData -@>
-      <span class="param"><$ param | escape $><@ if not loop.last @>, <@ endif @></span>
-    <@- endfor @>)</span>
-<@- endif @>
 <@- 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>
+<@- macro githubViewLink(doc) -@>
+<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) -@>
+<@- macro paramTable(params, isDirective) -@>
 <table class="table param-table" style="margin:0;">
   <thead>
   <tr>
@@ -66,156 +57,108 @@ docType: "<$ doc.docType $>"
   </tr>
   </thead>
   <tbody>
-  <@ for param in params @>
+  <@- for param in params @>
   <tr>
     <td>
       <$ param.name $>
-      <@ if param.alias @>| <$ param.alias $><@ endif @>
+      <@- if param.alias @>| <$ param.alias $><@ endif -@>
     </td>
     <td>
       <$ typeList(param.typeList) $>
     </td>
     <td>
       <$ param.description | marked $>
-      <@ if param.optional @><strong class="tag">Optional</strong><@ endif @>
-      <@ if param.defaultValue @><p><em>(default: <$ param.defaultValue $>)</em></p><@ endif @>
+      <@- if param.defaultValue @><p><em>(default: <$ param.defaultValue $>)</em></p><@ endif -@>
     </td>
   </tr>
-  <@ endfor @>
+  <@ endfor -@>
   </tbody>
 </table>
 <@- endmacro -@>
 
-
 <@- macro functionSyntax(fn) @>
   <@- set sep = joiner(',&nbsp;') -@>
   <code><$ fn.name $><@- if not fn.isProperty @>(<@ endif -@><@- for param in fn.params @><$ sep() $>
-  <@- if param.type.optional @>[<@ endif -@>
+  <@- if param.type.optional @>[<@- endif -@>
   <$ param.name $>
-  <@- if param.type.optional @>]<@ endif -@>
-  <@ endfor @><@- if not fn.isProperty @>)<@ endif -@></code>
-  <@ if fn.alias @><small>(alias: <$ fn.alias $>)</small><@ endif @>
-<@ endmacro -@>
+  <@- if param.type.optional -@>]<@- endif -@>
+  <@- endfor -@><@- if not fn.isProperty @>)<@- endif -@></code>
+<@- endmacro -@>
 
-<@ macro typeList(types) -@>
+<@- macro typeList(types) -@>
 <@ set separator = joiner("|") @>
-<@ for type in types @><$ separator() $><$ type | code $><@ endfor @>
+<@- for type in types @><$ separator() $><$ type | code $><@ endfor -@>
 <@- endmacro -@>
 
 <@- macro typeInfo(fn) -@>
 <$ typeList(fn.typeList) $> <$ fn.description $>
 <@- endmacro -@>
 
-
-
-<@ macro documentClass(doc) @>
-<@- if doc.statics.length -@>
-<h2>Static Members</h2>
-<@ for method in doc.statics -@>
-<@ if not method.internal @>
-<div id="<$ method.name $>"></div>
-<h3><$ functionSyntax(method) $></h3>
+<@- macro documentPlatforms(method) -@>
 <@- if method.decorators @>
 <@ for prop in method.decorators[0].argumentInfo @>
 <@ if prop.platforms @>
 <p>
-  <b>Platforms:</b>
-  <@- for platform in prop.platforms @>
-  <code><$ platform $></code>&nbsp;
-  <@ endfor -@>
+  <strong>Platforms:</strong>
+  <@- for platform in prop.platforms -@>
+  <strong class="tag"><$ platform $></strong>&nbsp;
+  <@- endfor -@>
 </p>
 <@ endif @>
 <@ endfor @>
 <@- endif @>
+<@- endmacro -@>
 
-<$ method.description $>
-
-<@ if method.params @>
-<$ paramTable(method.params) $>
-<@ endif @>
-
-<@ if method.this -@>
-<h4> Method's `this`
-  <$ method.this $>
-</h4>
-<@- endif @>
-
-<@ if method.returns @>
-<div class="return-value" markdown="1">
-  <i class="icon ion-arrow-return-left"></i>
-  <b>Returns:</b> <$ typeInfo(method.returns) $>
-</div>
-<@ endif @>
-<@ endif @>
-<@ endfor -@>
-<@ endif @>
-
-<!-- methods on the class -->
-<@- if doc.members and doc.members.length @>
-
-<h2>Instance Members</h2>
-<@ for method in doc.members -@>
-<div id="<$ method.name $>"></div>
-<h3>
-  <$ functionSyntax(method) $>
-</h3>
+<@ macro documentMethod(method) -@>
+<h3><a class="anchor" name="<$ method.name $>" href="#<$ method.name $>"></a><$ functionSyntax(method) $></h3>
+<$ documentPlatforms(method) $>
 <$ method.description $>
 <@ if method.params -@>
 <$ paramTable(method.params) $>
 <@- endif @>
-<@ if method.this -@>
-<h4> Method's `this`
-  <$ method.this $>
-</h4>
-<@- endif @>
+
 <@ if method.returns -@>
 <div class="return-value" markdown="1">
   <i class="icon ion-arrow-return-left"></i>
   <b>Returns:</b> <$ typeInfo(method.returns) $>
 </div>
 <@- endif @>
+<@- endmacro -@>
+
+<@- macro documentClass(doc) @>
+<@- if doc.statics.length -@>
+<h2><a class="anchor" name="static-members" href="#static-members"></a>Static Members</h2>
+<@ for method in doc.statics -@>
+<$ documentMethod(method) $>
+<@ endfor -@>
+<@ endif @>
+
+<# --- methods in class --- #>
+<@- if doc.members and doc.members.length @>
+
+<h2><a class="anchor" name="instance-members" href="#instance-members"></a>Instance Members</h2>
+<@ for method in doc.members -@>
+<$ documentMethod(method) $>
 <@- endfor @>
 <@- endif -@>
 <@ endmacro @>
-<@ block body @>
-<@ block content @>
-<@ block header @>
-<h1 class="api-title">
-  <@ if doc.docType == "directive" @>
-  <$ doc.name | dashCase $>
-  <@ else @>
-  <$ doc.name $>
-  <@ endif @>
 
-  <@ if doc.parent @>
-  <br />
-  <small>
-    Child of <$ doc.parent $>
-  </small>
-  <@ endif @>
-
-  <@ if doc.delegate @>
-  <br/>
-  <small>
-    Delegate: <$ doc.delegate $>
-  </small>
-  <@ endif @>
+<h1 class="api-title"><$ doc.name $>
   <@- 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>
 
-<@ endblock @>
-
-<!-- decorators -->
+<# --- Decorators --- #>
 <@- if doc.decorators @>
-
 <@ for prop in doc.decorators[0].argumentInfo @>
-
 <@ if doc.beta == true @>
 <p class="beta-notice">
   This plugin is still in beta stage and may not work as expected. Please
@@ -223,58 +166,58 @@ 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 $>
 
-<pre><code>$ <@ 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>
 
-<!-- description -->
-<@ block description @>
-<$ doc.description | marked $>
-<@ endblock @>
-
-
-<@- if doc.directiveInfo @>
-<h2><$ doc.directiveInfo.type $></h2>
-<h3><$ doc.directiveInfo.properties[0].name $>: <code><$ doc.directiveInfo.properties[0].values $></code></h3>
-<@ endif -@>
+<# --- 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 @>
-<!-- @platforms tag -->
-<h2>Supported platforms</h2>
-<@ block platforms @>
+<h2><a class="anchor" name="platforms" href="#platforms"></a>Supported platforms</h2>
 <ul>
   <@ for platform in prop.platforms -@>
   <li><$ platform $></li>
   <@- endfor @>
 </ul>
-<@ endblock @>
-<!-- @platforms tag end -->
 <@ endif @>
 <@ endfor @>
-<@ endif -@><!-- if doc.decorators -->
+<@ endif -@> <# --- end of: if doc.decorators --- #>
 
-<!-- @usage tag -->
+<# --- Plugin usage --- #>
 <@ if doc.usage @>
-<h2>Usage</h2>
-<@ block usage @>
+<h2><a class="anchor" name="usage" href="#usage"></a>Usage</h2>
 <$ doc.usage | marked $>
-<@ endblock @>
 <@ endif @>
 
-<!-- @property tags -->
-<@ if doc.properties @>
-<h2>Attributes:</h2>
+<# --- Plugin attributes --- #>
+<@- if doc.properties -@>
+<h2><a class="anchor" name="attributes" href="#attributes"></a>Attributes:</h2>
 <table class="table" style="margin:0;">
   <thead>
   <tr>
     <th>Attribute</th>
-
     <@ set hasTypes = false @>
     <@ for prop in doc.properties @>
     <@ if prop.type @>
@@ -284,12 +227,11 @@ $ npm install --save @ionic-native/<$ doc.npmId $>
     <@ if hasTypes @>
     <th>Type</th>
     <@ endif @>
-
     <th>Description</th>
   </tr>
   </thead>
   <tbody>
-  <@ for prop in doc.properties -@>
+  <@- for prop in doc.properties -@>
   <tr>
     <td>
       <$ prop.name $>
@@ -299,48 +241,44 @@ $ npm install --save @ionic-native/<$ doc.npmId $>
       <$ prop.type.name $>
     </td>
     <@ endif @>
-
     <td>
       <$ prop.description $>
     </td>
   </tr>
-  <@- endfor @>
+  <@ endfor -@>
   </tbody>
 </table>
-<@ endif @>
+<@- endif -@>
 
+<# --- Plugin class documentation --- #>
 <$ documentClass(doc) $>
 
-<@ block advanced @>
+<# --- Advanced usage --- #>
 <@- if doc.advanced -@>
 <h2><a class="anchor" name="advanced" href="#advanced"></a>Advanced</h2>
 <$ doc.advanced | marked $>
 <@- endif -@>
-<@ endblock @>
 
-<!-- other classes -->
-<@ for tag in doc.tags.tags -@>
-<@ if tag.tagName == 'classes' -@>
-<!--<h2><a class="anchor" name="related-classes" href="#related-classes"></a>Related Classes</h2>-->
-<@ set classes = tag.description.split('\n') @>
-<@ for item in classes -@>
-<@ if item.length > 1 @>
-<@ for export in doc.moduleDoc.exports -@>
-<@ if export.name == item @>
+<# --- Other classes --- #>
+<@- for tag in doc.tags.tags -@>
+<@- if tag.tagName == 'classes' -@>
+<@- set classes = tag.description.split('\n') -@>
+<@- for item in classes -@>
+<@- if item.length > 1 -@>
+<@- for export in doc.moduleDoc.exports -@>
+<@- if export.name == item -@>
 <h2><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h2>
 <$ documentClass(export) $>
-<@ endif @>
-<@- endfor @>
-<@ endif @>
-<@- endfor @>
-<@- endif @>
-<@- endfor @>
-<!-- end other classes -->
+<@- endif -@>
+<@- endfor -@>
+<@- endif -@>
+<@- endfor -@>
+<@- endif -@>
+<@- endfor -@>
 
-<!-- interfaces -->
+<# --- Other interfaces --- #>
 <@ for tag in doc.tags.tags -@>
 <@ if tag.tagName == 'interfaces' @>
-<!--<h2><a class="anchor" name="interfaces" href="#interfaces"></a>Interfaces</h2>-->
 <@ set interfaces = tag.description.split('\n') @>
 <@ for item in interfaces -@>
 <@ if item.length > 1 @>
@@ -350,21 +288,12 @@ $ npm install --save @ionic-native/<$ doc.npmId $>
 <@- endfor @>
 <@ endif @>
 <@- endfor @>
-<!-- end interfaces -->
 
-<!-- related link -->
+
+<# --- Related links --- #>
 <@- if doc.see @>
-
-<h2>Related</h2>
+<h2><a class="anchor" name="related" href="#related"></a>Related</h2>
 <@ for s in doc.see @>
 <$ s | safe $>
 <@- endfor -@>
-
 <@- endif -@>
-
-
-<!-- end content block -->
-<@ endblock @>
-
-<!-- end body block -->
-<@ endblock @>

scripts/docs/templates/native_menu.template.html

@@ -1,9 +1,10 @@
-<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
+<li class="capitalize {% if page.id == 'overview' %}active{% endif %}">
+  <a href="/docs/native/">Overview</a>
+</li>
+<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 @>
 <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,11 +16,11 @@
 <@ 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 $>
 ```
 
-## [Usage Documentation](https://ionicframework.com/docs/v2/native/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/')|replace('index.ts','')|replace('src/@ionic-native/plugins/','') $>)
+## [Usage Documentation](https://ionicframework.com/docs/native/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/')|replace('index.ts','')|replace('src/@ionic-native/plugins/','') $>)
 
 Plugin Repo: [<$ prop.repo $>](<$ prop.repo $>)
 

scripts/docs/update_docs.sh

@@ -23,17 +23,19 @@ function run {
   # CD in to the site dir to commit updated docs
   cd $SITE_DIR
 
+  # Add all files to git
+  git add .
+
   # if no changes, don't commit
-  CHANGED=$(git diff-index --name-only HEAD --)
-  if [ -z "$CHANGED" ];
+  CHANGED=$(git diff-index --name-only HEAD 2>/dev/null | wc -l)
+  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 add -A
-    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,24 +1,60 @@
-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
+ * - 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 }}) { }
+ *
+ * ...
+ *
+ *
+ * this.{{ pluginName }}.functionName('Hello', 123)
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
  * ```
  */
 @Plugin({
-  pluginName: 'PluginName',
-  plugin: '',
-  pluginRef: '',
-  repo: ''
+  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

@@ -5,39 +5,46 @@
  * - 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 { 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 }}';
  *
- * PluginName.functionName('Hello', 123)
- *   .then((something: any) => doSomething(something))
- *   .catch((error: any) => console.log(error));
+ *
+ * constructor(private {{ pluginName }}: {{ PluginName }}) { }
+ *
+ * ...
+ *
+ *
+ * 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
-  install: '' // OPTIONAL install command, in case the plugin requires variables
+  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,251 @@
+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,6 +1,8 @@
-import { instanceAvailability, checkAvailability, wrap, wrapInstance, overrideFunction } from './plugin';
-import { getPlugin, getPromise } from './util';
 import { Observable } from 'rxjs/Observable';
+import { _throw } from 'rxjs/observable/throw';
+
+import { checkAvailability, instanceAvailability, overrideFunction, wrap, wrapInstance } from './plugin';
+import { getPlugin, getPromise } from './util';
 
 export interface PluginConfig {
   /**
@@ -31,9 +33,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
    */
@@ -101,28 +106,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) {
@@ -130,9 +127,9 @@ export function InstanceCheck(opts: CordovaCheckOptions = {}) {
           }
 
           return getPromise(() => {});
-
         }
-      }
+      },
+      enumerable: true
     };
   };
 }
@@ -142,25 +139,30 @@ 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 {
-        if (checkAvailability(pluginObj) === true) {
+        const check = checkAvailability(pluginObj);
+        if (check === true) {
           return descriptor.value.apply(this, args);
         } else {
           if (opts.sync) {
-            return;
+            return null;
           } else if (opts.observable) {
-            return new Observable<any>(() => {});
+            return _throw(new Error(check && check.error));
           }
-          return getPromise(() => {});
+          return Promise.reject(check && check.error);
         }
-      }
+      },
+      enumerable: true
     };
   };
 }
 
-
 /**
  * @private
  *
@@ -180,12 +182,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) {
@@ -203,15 +204,19 @@ export function Plugin(config: PluginConfig) {
     cls['getPluginName'] = function() {
       return config.pluginName;
     };
+
     cls['getPluginRef'] = function() {
       return config.pluginRef;
     };
+
     cls['getPluginInstallName'] = function() {
       return config.plugin;
     };
+
     cls['getPluginRepo'] = function() {
       return config.repo;
     };
+
     cls['getSupportedPlatforms'] = function() {
       return config.platforms;
     };
@@ -227,11 +232,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
     };
   };
 }
@@ -241,12 +251,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
     };
   };
 }
@@ -259,6 +270,7 @@ export function CordovaInstance(opts: any = {}) {
  */
 export function CordovaProperty(target: any, key: string) {
   Object.defineProperty(target, key, {
+    enumerable: true,
     get: () => {
       if (checkAvailability(target, key) === true) {
         return getPlugin(target.constructor.getPluginRef())[key];
@@ -266,7 +278,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;
       }
@@ -282,10 +294,11 @@ export function CordovaProperty(target: any, key: string) {
  */
 export function InstanceProperty(target: any, key: string) {
   Object.defineProperty(target, key, {
-    get: function(){
+    enumerable: true,
+    get: function() {
       return this._objectInstance[key];
     },
-    set: function(value){
+    set: function(value) {
       this._objectInstance[key] = value;
     }
   });
@@ -298,47 +311,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,38 @@
-import { get, getPlugin, getPromise, cordovaWarn, pluginWarn } from './util';
+import { Observable } from 'rxjs/Observable';
+import { fromEvent } from 'rxjs/observable/fromEvent';
+
 import { checkReady } from './bootstrap';
 import { CordovaOptions } from './decorators';
-
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/fromEvent';
+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 +45,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 +65,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 +93,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 +138,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 +147,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,38 +167,96 @@ 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) => {
-    let pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
-    if (pluginResult && pluginResult.error) {
-      reject(pluginResult.error);
+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) {
+        reject(pluginResult.error);
+      } else if (pluginResult.then) {
+        pluginResult.then(resolve).catch(reject);
+      }
+    } else {
+      reject({ error: 'unexpected_error' });
     }
-    pluginResult.then(resolve).catch(reject);
   });
 }
 
-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();
@@ -171,26 +265,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
+    );
   }
-
 }
 
 /**
@@ -200,8 +313,11 @@ 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> {
-  return Observable.fromEvent(element, event);
+export function wrapEventObservable(
+  event: string,
+  element: any = window
+): Observable<any> {
+  return fromEvent(element, event);
 }
 
 /**
@@ -212,29 +328,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);
@@ -253,16 +379,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);
@@ -272,38 +419,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(
+      'Ionic 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(
+      `'Ionic 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(
+      'Ionic Native: tried calling ' +
+        pluginName +
+        '.' +
+        method +
+        ', but Cordova is not available. Make sure to a) run in a real device or simulator and b) include cordova.js in your index.html'
+    );
   } 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 a) run in a real device or simulator and b) include cordova.js in your index.html'
+    );
   }
 };

src/@ionic-native/plugins/abbyy-rtr/index.ts

@@ -0,0 +1,336 @@
+import { Injectable } from '@angular/core';
+import { CordovaCheck, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+declare const AbbyyRtrSdk: any;
+
+/**
+ * JSON object that you can pass as the options argument to change text
+ * capture settings. All keys are optional. Omitting a key means that a
+ * default setting will be used.
+ */
+export interface TextCaptureOptions {
+
+  /**
+   * The name of the license file. This file must be located in the
+   * www/rtr_assets/ directory in your project.
+   */
+  licenseFileName?: string;
+
+  /**
+   * Recognition languages which can be selected by the user,
+   * for example: ["English", "French", "German"]. Empty array
+   * disables language selection.
+   */
+  selectableRecognitionLanguages?: Array<string>;
+
+  /**
+   * Recognition language selected by default.
+   */
+  recognitionLanguages?: Array<string>;
+
+  /**
+   * Width and height of the recognition area, separated by a
+   * whitespace — for example: "0.8 0.3". The area of interest is
+   * centered in the preview frame, its width and height are
+   * relative to the preview frame size and should be in the [0.0, 1.0] range.
+   */
+  areaOfInterest?: string;
+
+  /**
+   * Whether to stop the plugin as soon as the result status is
+   * "Stable" (see Result status). When enabled (true), the
+   * recognition process can be stopped automatically. When
+   * disabled (false), recognition can be stopped only manually
+   * by user.
+   */
+  stopWhenStable?: boolean;
+
+  /**
+   * Show (true) or hide (false) the flashlight button in the text
+   * capture dialog.
+   */
+  isFlashlightVisible?: boolean;
+
+  /**
+   * Show (true) or hide (false) the stop button in the text
+   * capture dialog. When the user taps stop, RTR SDK returns
+   * the latest recognition result.
+   */
+  isStopButtonVisible?: boolean;
+}
+
+/**
+ * JSON object that represents text recognition results.
+ * The callback you implement should parse this object and show results to user.
+ */
+export interface TextCaptureResult {
+
+  /**
+   * An array of objects representing recognized lines of text.
+   * These objects have the following keys:
+   * · text (string): the recognized text.
+   * · quadrangle (string): vertex coordinates of the bounding quadrangle,
+   *   a string of 8 integers separated with whitespaces ("x1 y1 ... x4 y4"),
+   *   goes clockwise starting from the bottom left.
+   * · rect (string): position and size of the bounding rectangle,
+   *   a string of 4 integers separated with whitespaces ("x y width height").
+   */
+  textLines: Array<{ text: string, quadrangle: string, rect?: string }>;
+
+  /**
+   * Additional information. This object has the following keys:
+   * · stabilityStatus (string): result stability status.
+   *   See Result status for details.
+   * · userAction (string): the user's action which stopped the plugin,
+   *   if any. Can be "Manually Stopped" if the stop button has been used,
+   *   and "Canceled" if the user canceled processing. If the plugin has
+   *   stopped automatically, the userAction key is not present in resultInfo.
+   * · frameSize (string): full size of the preview frame, a string
+   *   with 2 integers separated with a whitespace ("720 1280").
+   * · recognitionLanguages (string array): languages used for recognition,
+   *   the array contains language identifiers (["English", "French", "German"]).
+   */
+  resultInfo: {
+    stabilityStatus: string,
+    userAction: string,
+    frameSize: string,
+    recognitionLanguages: Array<string>
+  };
+
+  /**
+   * Error details. This key is present only if an error occurs.
+   * The value is an object which has a single key:
+   * · description (string): human-readable error description.
+   */
+  error?: {
+    description: string;
+  };
+}
+
+/**
+ * JSON object that you can pass as the options argument to change data
+ * capture settings. All keys are optional. Omitting a key means that a default
+ * setting will be used, except the profile and customDataCaptureScenario
+ * keys: you must specify either one of them, but not both at the same time.
+ */
+export interface DataCaptureOptions {
+
+  /**
+   * The predefined data capture profile to use, for example: "MRZ".
+   * Note: For the list of supported documents, see Specifications — Data
+   * Capture Profiles in the ABBYY Real-Time Recognition SDK 1 Developer's Guide.
+   */
+  profile?: string;
+
+  /**
+   * Custom data capture settings. This object has the following keys:
+   * · name (string): the name of your custom data capture scenario, required.
+   * · description (string): a more detailed description. This key is optional;
+   *   if not given, it will be assigned the same value as name.
+   * · recognitionLanguages (string array): recognition languages to use.
+   *   Default is ["English"].
+   * · fields (object array): describes data fields to capture. Each object
+   *   in this array has a single regEx key; its value is a string containing
+   *   the regular expression that should be matched when capturing a field.
+   */
+  customDataCaptureScenario?: {
+    name: string,
+    description: string,
+    recognitionLanguages: Array<string>,
+    fields: Array<{ regEx: string }>
+  };
+
+  /**
+   * The name of the license file. This file must be located in the
+   * www/rtr_assets/ directory in your project.
+   */
+  licenseFileName?: string;
+
+  /**
+   * Width and height of the recognition area, separated by a
+   * whitespace — for example: "0.8 0.3". The area of interest is
+   * centered in the preview frame, its width and height are
+   * relative to the preview frame size and should be in the [0.0, 1.0] range.
+   */
+  areaOfInterest?: string;
+
+  /**
+   * Whether to stop the plugin as soon as the result status is
+   * "Stable" (see Result status). When enabled (true), the
+   * recognition process can be stopped automatically. When
+   * disabled (false), recognition can be stopped only manually
+   * by user.
+   */
+  stopWhenStable?: boolean;
+
+  /**
+   * Show (true) or hide (false) the flashlight button in the text
+   * capture dialog.
+   */
+  isFlashlightVisible?: boolean;
+
+  /**
+   * Show (true) or hide (false) the stop button in the text
+   * capture dialog. When the user taps stop, RTR SDK returns
+   * the latest recognition result.
+   */
+  isStopButtonVisible?: boolean;
+}
+
+/**
+ * JSON object that represents data recognition results. The callback you
+ * implement should parse this object and show results to user.
+ */
+export interface DataCaptureResult {
+
+  /**
+   * The data scheme which was applied during data capture.
+   * The value is an object which has two keys:
+   * · id (string): the internal scheme identifier.
+   * · name (string): the scheme name.
+   * If you had defined a custom data capture scenario in options, both the
+   * id and name will be the same as the scenario name you specified. If
+   * you selected a predefined profile, the id and name are specified by the
+   * profile. If an error occurs during processing, the dataScheme key is not
+   * present in the result.
+   */
+  dataScheme?: {
+    id: string,
+    name: string
+  };
+
+  /**
+   * Recognized data fields. Each object in the array represents a separate
+   * data field. The data field objects have the following keys:
+   * · id (string): the internal identifier of the field.
+   * · name (string): the field name.
+   * Similarly to dataScheme, in custom scenarios both id and name are the same
+   * as the scenario name you specified (currently custom scenarios allow
+   * only 1 recognized field).
+   * · text (string): full text of the field.
+   * · quadrangle (string): vertex coordinates of the bounding quadrangle, a
+   *   string of 8 integers separated with whitespaces ("x1 y1 ... x4 y4"),
+   *   goes clockwise starting from the bottom left.
+   * · components (object array): an array of objects representing field
+   *   components, that is, the text fragments found on the image, which
+   *   constitute the field.
+   * In the components array each element is an object with the following keys:
+   * · text (string): text of this fragment.
+   * · quadrangle (string): vertex coordinates of the bounding quadrangle of
+   *   this fragment, similar to the field's quadrangle.
+   * · rect (string): position and size of the bounding rectangle, a string
+   *   of 4 integers separated with whitespaces ("x y width height").
+   */
+  dataFields: {
+    id: string,
+    name: string,
+    text: string,
+    quadrangle: string,
+    components: {
+      text: string,
+      quadrangle: string,
+      rect: string
+    }
+  };
+
+  /**
+   * Additional information. This object has the following keys:
+   * · stabilityStatus (string): result stability status.
+   *   See Result status for details.
+   * · userAction (string): the user's action which stopped the plugin,
+   *   if any. Can be "Manually Stopped" if the stop button has been used,
+   *   and "Canceled" if the user canceled processing. If the plugin has
+   *   stopped automatically, the userAction key is not present in resultInfo.
+   * · frameSize (string): full size of the preview frame, a string
+   *   with 2 integers separated with a whitespace ("720 1280").
+   */
+  resultInfo: {
+    stabilityStatus: string,
+    userAction: string,
+    frameSize: string
+  };
+
+  /**
+   * Error details. This key is present only if an error occurs.
+   * The value is an object which has a single key:
+   * · description (string): human-readable error description.
+   */
+  error?: {
+    description: string;
+  };
+}
+
+/**
+ * @name ABBYY Real-Time Recognition
+ * @description
+ * This plugin allows to use the Text Capture and Data Capture features of
+ * ABBYY Real-Time Recognition SDK (RTR SDK) in apps.
+ *
+ * @usage
+ * ```typescript
+ * import { AbbyyRTR } from '@ionic-native/abbyy-rtr';
+ *
+ *
+ * constructor(private abbyyRTR: AbbyyRTR) { }
+ *
+ * ...
+ *
+ *
+ * this.abbyyRTR.startTextCapture(options)
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
+ *
+ * this.abbyyRTR.startDataCapture(options)
+ *   .then((res: any) => console.log(res))
+ *   .catch((error: any) => console.error(error));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'AbbyyRTR',
+  plugin: 'cordova-plugin-abbyy-rtr-sdk',
+  pluginRef: 'AbbyyRtrSdk',
+  repo: 'https://github.com/abbyysdk/RTR-SDK.Cordova',
+  install: 'ionic cordova plugin add cordova-plugin-abbyy-rtr-sdk',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class AbbyyRTR extends IonicNativePlugin {
+
+  /**
+   * Opens a modal dialog with controls for the Text Capture scenario.
+   * @param {TextCaptureOptions} options
+   * @return {Promise<TextCaptureResult>}
+   */
+  @CordovaCheck()
+  startTextCapture(options: TextCaptureOptions): Promise<TextCaptureResult> {
+    return new Promise<any>((resolve, reject) => {
+      AbbyyRtrSdk.startTextCapture((result: DataCaptureResult) => {
+        if (result.error) {
+          reject(result);
+        } else {
+          resolve(result);
+        }
+      }, options);
+    });
+  }
+
+  /**
+   * Opens a modal dialog with controls for the Data Capture scenario.
+   * @param {DataCaptureOptions} options
+   * @return {Promise<DataCaptureResult>}
+   */
+  @CordovaCheck()
+  startDataCapture(options: DataCaptureOptions): Promise<DataCaptureResult> {
+    return new Promise<any>((resolve, reject) => {
+      AbbyyRtrSdk.startDataCapture((result: DataCaptureResult) => {
+        if (result.error) {
+          reject(result);
+        } else {
+          resolve(result);
+        }
+      }, options);
+    });
+  }
+}

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

@@ -0,0 +1,322 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
+import { fromEvent } from 'rxjs/observable/fromEvent';
+
+export interface AdMobFreeBannerConfig {
+  /**
+   * Ad Unit ID
+   */
+  id?: string;
+  /**
+   * Receiving test ad
+   */
+  isTesting?: boolean;
+  /**
+   * Auto show ad when loaded
+   */
+  autoShow?: boolean;
+  /**
+   * Set to true, to put banner at top
+   */
+  bannerAtTop?: boolean;
+  /**
+   * Set to true, to allow banner overlap WebView
+   */
+  overlap?: boolean;
+  /**
+   * Set to true to avoid ios7 status bar overlap
+   */
+  offsetTopBar?: boolean;
+  /**
+   * Banner  size
+   */
+  size?: string;
+}
+
+export interface AdMobFreeInterstitialConfig {
+  /**
+   * Ad Unit ID
+   */
+  id?: string;
+  /**
+   * Receiving test ad
+   */
+  isTesting?: boolean;
+  /**
+   * Auto show ad when loaded
+   */
+  autoShow?: boolean;
+}
+
+export interface AdMobFreeRewardVideoConfig {
+  /**
+   * Ad Unit ID
+   */
+  id?: string;
+  /**
+   * Receiving test ad
+   */
+  isTesting?: boolean;
+  /**
+   * Auto show ad when loaded
+   */
+  autoShow?: boolean;
+}
+
+/**
+ * @name AdMob Free
+ * @description
+ * A free, no ad-sharing version of Google AdMob plugin for Cordova.
+ * 
+ * Requires Cordova plugin: `cordova-plugin-admob-free`. For more info, please see the [AdMob Free plugin docs](https://github.com/ratson/cordova-plugin-admob-free).
+ *
+ * @usage
+ * ```typescript
+ * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
+ *
+ *
+ * constructor(private admobFree: AdMobFree) { }
+ *
+ *
+ * ...
+ *
+ *
+ * const bannerConfig: AdMobFreeBannerConfig = {
+ *  // add your config here
+ *  // for the sake of this example we will just use the test config
+ *  isTesting: true,
+ *  autoShow: true
+ * };
+ * this.admobFree.banner.config(bannerConfig);
+ *
+ * this.admobFree.banner.prepare()
+ *   .then(() => {
+ *     // banner Ad is ready
+ *     // if we set autoShow to false, then we will need to call the show method here
+ *   })
+ *   .catch(e => console.log(e));
+ *
+ *
+ * ```
+ * @interfaces
+ * AdMobFreeBannerConfig
+ * AdMobFreeInterstitialConfig
+ * AdMobFreeRewardVideoConfig
+ * @classes
+ * AdMobFreeBanner
+ * AdMobFreeInterstitial
+ * AdMobFreeRewardVideo
+ */
+@Plugin({
+  pluginName: 'AdMobFree',
+  plugin: 'cordova-plugin-admob-free',
+  pluginRef: 'admob',
+  repo: 'https://github.com/ratson/cordova-plugin-admob-free',
+  platforms: ['Android', 'iOS']
+})
+@Injectable()
+export class AdMobFree extends IonicNativePlugin {
+  /**
+   * Convenience object to get event names
+   * @type {Object}
+   */
+  events = {
+    BANNER_LOAD: 'admob.banner.events.LOAD',
+    BANNER_LOAD_FAIL: 'admob.banner.events.LOAD_FAIL',
+    BANNER_OPEN: 'admob.banner.events.OPEN',
+    BANNER_CLOSE: 'admob.banner.events.CLOSE',
+    BANNER_EXIT_APP: 'admob.banner.events.EXIT_APP',
+
+    INTERSTITIAL_LOAD: 'admob.interstitial.events.LOAD',
+    INTERSTITIAL_LOAD_FAIL: 'admob.interstitial.events.LOAD_FAIL',
+    INTERSTITIAL_OPEN: 'admob.interstitial.events.OPEN',
+    INTERSTITIAL_CLOSE: 'admob.interstitial.events.CLOSE',
+    INTERSTITIAL_EXIT_APP: 'admob.interstitial.events.EXIT_APP',
+
+    REWARD_VIDEO_LOAD: 'admob.rewardvideo.events.LOAD',
+    REWARD_VIDEO_LOAD_FAIL: 'admob.rewardvideo.events.LOAD_FAIL',
+    REWARD_VIDEO_OPEN: 'admob.rewardvideo.events.OPEN',
+    REWARD_VIDEO_CLOSE: 'admob.rewardvideo.events.CLOSE',
+    REWARD_VIDEO_EXIT_APP: 'admob.rewardvideo.events.EXIT_APP',
+    REWARD_VIDEO_START: 'admob.rewardvideo.events.START',
+    REWARD_VIDEO_REWARD: 'admob.rewardvideo.events.REWARD'
+  };
+
+  /**
+   * Watch an event
+   * @param event {string} event name
+   * @return {Observable<any>}
+   */
+  on(event: string): Observable<any> {
+    return fromEvent(document, event);
+  }
+
+  /**
+   * 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();
+}
+
+/**
+ * @hidden
+ */
+@Plugin({
+  pluginName: 'AdMobFree',
+  plugin: 'cordova-plugin-admob-free',
+  pluginRef: 'admob.banner'
+})
+export class AdMobFreeBanner {
+  /**
+   * Update config
+   * @param options
+   * @return {AdMobFreeBannerConfig}
+   */
+  @Cordova({ sync: true })
+  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig {
+    return;
+  }
+
+  /**
+   * Hide the banner
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  hide(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Create banner
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  prepare(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Remove the banner
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  remove(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Show the banner
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  show(): Promise<any> {
+    return;
+  }
+}
+
+/**
+ * @hidden
+ */
+@Plugin({
+  pluginName: 'AdMobFree',
+  plugin: 'cordova-plugin-admob-free',
+  pluginRef: 'admob.interstitial'
+})
+export class AdMobFreeInterstitial {
+  /**
+   * Update config
+   * @param options
+   * @return {AdMobFreeInterstitialConfig}
+   */
+  @Cordova({ sync: true })
+  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig {
+    return;
+  }
+
+  /**
+   * Check if interstitial is ready
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  isReady(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Prepare interstitial
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  prepare(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Show the interstitial
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  show(): Promise<any> {
+    return;
+  }
+}
+
+/**
+ * @hidden
+ */
+@Plugin({
+  pluginName: 'AdMobFree',
+  plugin: 'cordova-plugin-admob-free',
+  pluginRef: 'admob.rewardvideo'
+})
+export class AdMobFreeRewardVideo {
+  /**
+   * Update config
+   * @param {AdMobFreeRewardVideoConfig} options Admob reward config
+   * @return {AdMobFreeRewardVideoConfig}
+   */
+  @Cordova({ sync: true })
+  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig {
+    return;
+  }
+
+  /**
+   * Check if reward video is ready
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  isReady(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Prepare reward video
+   * @return {Promise<any>}
+   */
+  @Cordova({ otherPromise: true })
+  prepare(): Promise<any> {
+    return;
+  }
+
+  /**
+   * Show the reward video
+   * @return {Promise<any>}
+   */
+  @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;
 
@@ -66,10 +72,18 @@ export interface AdMobOptions {
    */
   adExtras?: AdExtras;
 
+  /**
+   * License key for the plugin
+   */
+  license?: any;
+
+  /**
+   * Set offset
+   */
+  offsetTopBar?: boolean;
 }
 
 export interface AdExtras {
-
   color_bg: string;
 
   color_bg_top: string;
@@ -81,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()
@@ -100,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(); });
  * }
  *
@@ -111,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;
@@ -148,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.
@@ -160,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
@@ -187,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
@@ -203,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
@@ -219,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
@@ -242,9 +274,12 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdFailLoad'
+    event: 'onAdFailLoad',
+    element: document
   })
-  onAdFailLoad(): Observable<any> { return; }
+  onAdFailLoad(): Observable<any> {
+    return;
+  }
 
   /**
    * Triggered when Ad received
@@ -252,9 +287,12 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdLoaded'
+    event: 'onAdLoaded',
+    element: document
   })
-  onAdLoaded(): Observable<any> { return; }
+  onAdLoaded(): Observable<any> {
+    return;
+  }
 
   /**
    * Triggered when Ad will be showed on screen
@@ -262,9 +300,12 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdPresent'
+    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
@@ -272,9 +313,12 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdLeaveApp'
+    event: 'onAdLeaveApp',
+    element: document
   })
-  onAdLeaveApp(): Observable<any> { return; }
+  onAdLeaveApp(): Observable<any> {
+    return;
+  }
 
   /**
    * Triggered when dismiss the Ad and back to your App
@@ -282,8 +326,10 @@ export class AdMob {
    */
   @Cordova({
     eventObservable: true,
-    event: 'onAdDismiss'
+    event: 'onAdDismiss',
+    element: document
   })
-  onAdDismiss(): Observable<any> { return; }
-
+  onAdDismiss(): Observable<any> {
+    return;
+  }
 }

src/@ionic-native/plugins/aes-256/index.ts

@@ -0,0 +1,66 @@
+import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+
+/**
+ * @name AES256
+ * @description
+ * This cordova ionic plugin allows you to perform AES 256 encryption and decryption on the plain text.
+ * It's a cross-platform plugin which supports both Android and iOS.
+ * The encryption and decryption are performed on the device native layer so that the performance is much faster.
+ *
+ * @usage
+ * ```typescript
+ * import { AES256 } from '@ionic-native/aes-256';
+ *
+ *
+ * constructor(private aES256: AES256) { }
+ *
+ * ...
+ *
+ *
+ * this.aES256.encrypt('12345678123456781234567812345678', '1234567812345678', 'testdata')
+ *   .then(res => console.log('Encrypted Data: ',res))
+ *   .catch((error: any) => console.error(error));
+ *
+ * this.aES256.decrypt('12345678123456781234567812345678', '1234567812345678', 'encryptedData')
+ *   .then(res => console.log('Decrypted Data : ',res))
+ *   .catch((error: any) => console.error(error));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'AES256',
+  plugin: 'cordova-plugin-aes256-encryption',
+  pluginRef: 'cordova.plugins.AES256',
+  repo: 'https://github.com/Ideas2IT/cordova-aes256',
+  platforms: ['Android', 'iOS'],
+  install: 'ionic cordova plugin add cordova-plugin-aes256-encryption'
+})
+@Injectable()
+export class AES256 extends IonicNativePlugin {
+
+  /**
+   * This function used to perform the aes256 encryption
+   * @param {string} secureKey A 32 bytes string, which will used as input key for AES256 encryption.
+   * @param {string} secureIV A 16 bytes string, which will used as initial vector for AES256 encryption.
+   * @param {string} data A string which will be encrypted
+   * @return {Promise<string>} Returns a promise that resolves when encryption happens. The success response will returns encrypted data.
+   */
+  @Cordova()
+  encrypt(secureKey: string, secureIV: string, data: string): Promise<string> {
+    return;
+  }
+
+  /**
+   * This function used to perform the aes256 decryption
+   * @param {string} secureKey A 32 bytes string, which will used as input key for AES256 decryption.
+   * @param {string} secureIV A 16 bytes string, which will used as initial vector for AES256 decryption.
+   * @param {string} data An AES256 encrypted data which will be decrypted.
+   * @return {Promise<string>} Returns a promise that resolves when decryption happens. The success response will returns decrypted data.
+   */
+  @Cordova()
+  decrypt(secureKey: string, secureIV: string, data: string): Promise<string> {
+    return;
+  }
+
+}

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

@@ -1,83 +1,20 @@
-import { Plugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';
-
-export interface AlipayOrder {
-  /**
-   * appId assigned by Alipay
-   */
-  app_id: string;
-
-  /**
-   * Api name.
-   * Should be: alipay.trade.app.pay
-   */
-  method: string;
-
-  /**
-   * Data format
-   * Default: "JSON"
-   */
-  format?: string;
-
-  /**
-   * Charset
-   * Possible values: "UTF-8", "GBK"
-   * Default: "UTF-8"
-   */
-  charset: string;
-
-  /**
-   * Sign method
-   * Default: 'RSA'
-   */
-  sign_type: string;
-
-  /**
-   * Sign value. Should be got from server side.
-   * Default: 'RSA'
-   */
-  sign: string;
-
-  /**
-   * Timestamp, formated like "yyyy-MM-dd HH:mm:ss", e.g. 2014-07-24 03:07:50
-   */
-  timestamp: string;
-
-  /**
-   * Api version. Fixed value '1.0'
-   */
-  version: string;
-
-  /**
-   * Notify url.
-   */
-  notify_url: string;
-
-  /**
-   * biz content. formated in json. see alipay doc for detail.
-   */
-  biz_content: string;
-}
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
 
 /**
  * @name Alipay
  * @description
- * This plugin is used for Alipay APP support. Integrated with the latest SDK.
+ * This plugin facilitates the usage of Alipay 支付宝 in an Ionic apps with the integrated AlipaySDK dated on 20180601.
  *
- * Requires Cordova plugin: `cordova-alipay-base`. For more info, please see the [Alipay plugin docs](https://github.com/xueron/cordova-alipay-base).
+ * Requires Cordova plugin: `cordova-plugin-gubnoi-alipay`. For more info, please see https://github.com/jing-zhou/cordova-plugin-alipay .
  *
  * @usage
- * ```
- * import { Alipay, AlipayOrder } from '@ionic-native/alipay';
+ * ```typescript
+ * import { Alipay } from '@ionic-native/alipay';
  *
  * constructor(private alipay: Alipay) {
  *
- * // Should get from server side with sign.
- * const alipayOrder: AlipayOrder = {
- *       ...
- *     };
- *
- *
+ * //alipayOrder is a string that has been generated and signed by the server side.
  * this.alipay.pay(alipayOrder)
  *    .then(result => {
  *       console.log(result); // Success
@@ -88,28 +25,26 @@ export interface AlipayOrder {
  *
  * }
  *
- *
  * ```
- *
- * @interfaces
- * AlipayOrder
  */
 @Plugin({
   pluginName: 'Alipay',
-  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'
+  plugin: 'cordova-plugin-gubnoi-alipay',
+  pluginRef: 'Alipay',
+  repo: 'https://github.com/jing-zhou/cordova-plugin-alipay',
+  install: 'ionic cordova plugin add cordova-plugin-gubnoi-alipay --variable APP_ID=your_app_id',
+  installVariables: ['APP_ID'],
+  platforms: ['Android', 'iOS']
 })
 @Injectable()
-export class Alipay {
+export class Alipay extends IonicNativePlugin {
   /**
    * Open Alipay to perform App pay
-   * @param order { AlipayOrder } alipay options
+   * @param {string} order alipay order string
    * @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: 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,43 +147,97 @@ export interface AFAEncryptResponse {
  * AFAAuthOptions
  * AFAEncryptResponse
  * AFADecryptOptions
+ * AFAAvailableResponse
+ * AFADeleteOptions
  */
 @Plugin({
   pluginName: 'AndroidFingerprintAuth',
   plugin: 'cordova-plugin-android-fingerprint-auth',
   pluginRef: 'FingerprintAuth',
-  repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth'
+  repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth',
+  platforms: ['Android']
 })
 @Injectable()
-export class AndroidFingerprintAuth {
+export class AndroidFingerprintAuth extends IonicNativePlugin {
+  /**
+   * Convenience property containing all possible errors
+   */
+  ERRORS: {
+    BAD_PADDING_EXCEPTION: string;
+    CERTIFICATE_EXCEPTION: string;
+    FINGERPRINT_CANCELLED: string;
+    FINGERPRINT_DATA_NOT_DELETED: string;
+    FINGERPRINT_ERROR: string;
+    FINGERPRINT_NOT_AVAILABLE: string;
+    FINGERPRINT_PERMISSION_DENIED: string;
+    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: string;
+    ILLEGAL_BLOCK_SIZE_EXCEPTION: string;
+    INIT_CIPHER_FAILED: string;
+    INVALID_ALGORITHM_PARAMETER_EXCEPTION: string;
+    IO_EXCEPTION: string;
+    JSON_EXCEPTION: string;
+    MINIMUM_SDK: string;
+    MISSING_ACTION_PARAMETERS: string;
+    MISSING_PARAMETERS: string;
+    NO_SUCH_ALGORITHM_EXCEPTION: string;
+    SECURITY_EXCEPTION: string;
+  } = {
+    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

@@ -0,0 +1,131 @@
+import { Injectable } from '@angular/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
+ * @description
+ * This plugin enables developers to offer users a true full screen experience in their Cordova and PhoneGap apps for Android.
+ * Using Android 4.0+, you can use true full screen in "lean mode", the way you see in apps like YouTube, expanding the app right to the edges of the screen, hiding the status and navigation bars until the user next interacts. This is ideally suited to video or cut-scene content.
+ * In Android 4.4+, however, you can now enter true full screen, fully interactive immersive mode. In this mode, your app will remain in true full screen until you choose otherwise; users can swipe down from the top of the screen to temporarily display the system UI.
+ * @usage
+ * ```typescript
+ * import { AndroidFullScreen } from '@ionic-native/android-full-screen';
+ *
+ * constructor(private androidFullScreen: AndroidFullScreen) { }
+ *
+ * ...
+ *
+ * this.androidFullScreen.isImmersiveModeSupported()
+ *   .then(() => console.log('Immersive mode supported'))
+ *   .catch(err => console.log(err));
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'AndroidFullScreen',
+  plugin: 'cordova-plugin-fullscreen',
+  pluginRef: 'AndroidFullScreen',
+  repo: 'https://github.com/mesmotronic/cordova-plugin-fullscreen',
+  platforms: ['Android']
+})
+@Injectable()
+export class AndroidFullScreen extends IonicNativePlugin {
+  /**
+   * Is this plugin supported?
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  isSupported(): Promise<void> { return; }
+
+  /**
+   * Is immersive mode supported?
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  isImmersiveModeSupported(): Promise<void> { return; }
+
+  /**
+   * The width of the screen in immersive mode.
+   * @return {Promise<number>}
+   */
+  @Cordova()
+  immersiveWidth(): Promise<number> { return; }
+
+  /**
+   * The height of the screen in immersive mode.
+   * @return {Promise<number>}
+   */
+  @Cordova()
+  immersiveHeight(): Promise<number> { return; }
+
+  /**
+   * Hide system UI until user interacts.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  leanMode(): Promise<void> { return; }
+
+  /**
+   * Show system UI.
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  showSystemUI(): Promise<void> { return; }
+
+  /**
+   * Extend your app underneath the status bar (Android 4.4+ only).
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  showUnderStatusBar(): Promise<void> { return; }
+
+  /**
+   * Extend your app underneath the system UI (Android 4.4+ only).
+   * @return {Promise<void>}
+   */
+  @Cordova()
+  showUnderSystemUI(): Promise<void> { return; }
+
+  /**
+   * Hide system UI and keep it hidden (Android 4.4+ only).
+   * @return {Promise<void>}
+   */
+  @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,22 +11,24 @@ 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); });
  *
- * }
  * ```
  *
  */
 @Plugin({
   pluginName: 'AppPreferences',
-  plugin: 'cordova-plugin-app-preferences', // npm package name, example: cordova-plugin-camera
-  pluginRef: 'plugins.appPreferences', // the variable reference to call the plugin, example: navigator.geolocation
-  repo: 'https://github.com/apla/me.apla.cordova.app-preferences', // the github repository URL for the plugin
+  plugin: 'cordova-plugin-app-preferences',
+  pluginRef: 'plugins.appPreferences',
+  repo: 'https://github.com/apla/me.apla.cordova.app-preferences',
+  platforms: ['Android', 'BlackBerry 10', 'Browser', 'iOS', 'macOS', 'Windows 8', 'Windows Phone']
 })
 @Injectable()
-export class AppPreferences {
+export class AppPreferences extends IonicNativePlugin {
 
   /**
    * Get a preference value
@@ -36,7 +38,6 @@ export class AppPreferences {
    * @return {Promise<any>} Returns a promise
    */
   @Cordova({
-    sync: true,
     callbackOrder: 'reverse'
   })
   fetch(dict: string, key?: string): Promise<any> { return; }
@@ -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,39 @@ 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 the name of the app, e.g.: "My Awesome App"
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getAppName(): Promise<any> { return; }
+  getAppName(): Promise<string> { return; }
 
   /**
-   * Returns the package name of the app
-   * @returns {Promise<any>}
+   * Returns the package name of the app, e.g.: "com.example.myawesomeapp"
+   * @returns {Promise<string>}
    */
   @Cordova()
-  getPackageName(): Promise<any> { return; }
+  getPackageName(): Promise<string> { return; }
 
   /**
-   * Returns the build identifier of the app
-   * @returns {Promise<any>}
+   * Returns the build identifier of the app.
+   * In iOS a string with the build version like "1.6095"
+   * In Android a number generated from the version string, like 10203 for version "1.2.3"
+   * @returns {Promise<string | number>}
    */
   @Cordova()
-  getVersionCode(): Promise<any> { return; }
+  getVersionCode(): Promise<string | number> { return; }
 
   /**
-   * Returns the version of the app
-   * @returns {Promise<any>}
+   * Returns the version of the app, e.g.: "1.2.3"
+   * @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,6 +1,6 @@
-import { Plugin, Cordova } from '@ionic-native/core';
-import { Observable } from 'rxjs';
 import { Injectable } from '@angular/core';
+import { Cordova, IonicNativePlugin, Plugin } from '@ionic-native/core';
+import { Observable } from 'rxjs/Observable';
 
 /**
  * @name Appodeal
@@ -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,25 +446,26 @@ 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 { }
 
   /**
    * Method can be used to detect user changes in location services settings.
    * If user enable or disable location services then success callback will be executed.
    * In case or error (SettingNotFoundException) fail callback will be executed.
-   * @returns {Promise<boolean>}
+   * @returns {Observable<number>}
    */
   @Cordova({
-    platforms: ['Android']
+    platforms: ['Android'],
+    observable: true
   })
-  watchLocationMode(): Promise<boolean> { return; }
+  watchLocationMode(): Observable<number> { return; }
 
   /**
    * Stop watching for location mode changes.

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

@@ -1,45 +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;
-
-  /**
-   * The text that scrolls itself on statusbar
-   */
-  ticker?: String;
+  title?: string;
 
   /**
    * Description of background task
    */
-  text?: String;
+  text?: string;
+
+  /**
+   * 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 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;
 
   /**
    * if true plugin will not display a notification. Default is false.
    */
   silent?: boolean;
-
-  /**
-   * By default the app will come to foreground when taping on the notification. If false, plugin wont come to foreground when tapped.
-   */
-  resume?: 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';
@@ -59,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.
@@ -71,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.
@@ -87,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.
@@ -96,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`.
@@ -128,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.
@@ -139,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.
    */
@@ -158,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'],
@@ -168,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
@@ -191,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'
+    | 'PDF_417'
+    | '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 (optional) 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,91 @@ 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;
+  }
+
+  /**
+   * Establish an automatic connection to a peripheral. The phone will automatically connect to the Bluetooth peripheral
+   * whenever it is in range. The autoConnect function uses callbacks instead of observables because connect and
+   * disconnect can each be called many times as a devices connects and disconnects.
+   *
+   * On Android you can pass a MAC address directly to autoConnect. With iOS, you need to get a device id by scanning,
+   * calling ble.peripheralsWithIdentifiers, or calling ble.connectedPeripheralsWithServices.
+   *
+   * @usage
+   * ```
+   *  someFunction() {
+   *    this.ble.autoConnect(deviceId, onConnected.bind(this), onDisconnected.bind(this));
+   *  }
+   *
+   *  onConnected(peripheral) {
+   *    console.log(`Connected to ${peripheral.id}`)l
+   *  }
+   *
+   *  onDisconnected(peripheral) {
+   *    console.log(`Disconnected from ${peripheral.id}`)l
+   *  }
+   *
+   * ```
+   * @param {string} deviceId UUID or MAC address of the peripheral
+   * @param {function} connectCallback function that is called with peripheral data when the devices connects
+   * @param {function} disconnectCallback  function that is called with peripheral data when the devices disconnects
+   */
+  @Cordova({ sync: true })
+  autoConnect(deviceId: string, connectCallback: any, disconnectCallback: any) {
+    return;
+  }
+
+  /**
+   * Request MTU size.
+   * May be used to fix the Error 14 "Unlikely" on write requests with more than 20 bytes.
+   * @usage
+   * ```
+   *   BLE.requestMtu('12:34:56:78:9A:BC', 512).then(() => {
+   *     console.log('MTU Size Accepted');
+   *   }, error => {
+   *     console.log('MTU Size Failed');
+   *   });
+   * ```
+   * @param {string} deviceId UUID or MAC address of the peripheral
+   * @param {number} mtuSize The new MTU size. (23 - 517, default is usually 23. Max recommended: 512)
+   * @return {Promise<any>} Returns a Promise.
+   */
+  @Cordova()
+  requestMtu(deviceId: string, mtuSize: number): Promise<any> {
+    return;
+  }
+
+  /**
+   * Refresh Device Cache
+   * This method may fix a issue of old cached services and characteristics.
+   * NOTE Since this uses an undocumented API it's not guaranteed to work.
+   * If you choose a too low delay time (timeoutMillis) the method could fail.
+   * @usage
+   * ```
+   *   BLE.refreshDeviceCache('12:34:56:78:9A:BC', 10000).then(discoveredServices => {
+   *     console.log('The new discovered services after the clean: ', discoveredServices);
+   *   }, error => {
+   *     console.log('Refresh device cache failed.');
+   *   });
+   * ```
+   * @param {string} deviceId UUID or MAC address of the peripheral
+   * @param {number} timeoutMillis Delay in milliseconds after refresh before discovering services.
+   * @return {Promise<any>} Returns a Promise.
+   */
+  @Cordova()
+  refreshDeviceCache(deviceId: string, timeoutMillis: number): Promise<any> {
+    return;
+  }
 
   /**
    * Disconnect from a peripheral.
@@ -278,11 +371,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 +385,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 +403,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 +422,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 +430,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 +441,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 +449,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 +466,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 +477,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 +494,9 @@ export class BLE {
     deviceId: string,
     serviceUUID: string,
     characteristicUUID: string
-    ): Promise<any> { return; }
+  ): Promise<any> {
+    return;
+  }
 
   /**
    * Report the connection status.
@@ -407,7 +512,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 +522,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 +563,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 +573,56 @@ 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;
+  }
+
+
+  /**
+   * Retrieves a list of the peripherals (containing any of the specified services)
+   * currently connected to the system. The peripheral list is sent to the success callback.
+   * iOS only
+   *
+   * @param {string[]} services List of services to discover
+   * @returns {Promise<any>} Returns a promise with a list of peripheral objects
+   */
+  @Cordova()
+  connectedPeripheralsWithServices (services: string[]): Promise<any[]> {
+    return;
+  }
+
+  /**
+   * Find the connected peripherals offering the listed service UUIDs.
+   * iOS only
+   *
+   * @param {string[]} uuids List of peripheral UUIDs
+   * @returns {Promise<any>} Returns a promise with a list of peripheral objects
+   */
+  @Cordova()
+  peripheralsWithIdentifiers (uuids: string[]): Promise<any[]> {
+    return;
+  }
+
+  /**
+   * Find the bonded devices
+   * Android only
+   *
+   * @returns {Promise<any>} Returns a promise with a list of peripheral objects
+   */
+  @Cordova()
+  bondedDevices (): 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.open('https://ionic.io');
- *
+ *         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 | NameOrOptions} 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 | NameOrOptions): 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;
+  }
 }