chore(): update changelog

Update camera-preview.ts

CHANGELOG.md

@@ -1,3 +1,68 @@
+<a name="2.2.8"></a>
+## [2.2.8](https://github.com/driftyco/ionic-native/compare/v2.2.7...v2.2.8) (2016-12-01)
+
+
+### Bug Fixes
+
+* **card-io:** fix typo in options ([e6700a3](https://github.com/driftyco/ionic-native/commit/e6700a3))
+* **globalization:** add missing parameter to numberToString function ([1072ab1](https://github.com/driftyco/ionic-native/commit/1072ab1)), closes [#835](https://github.com/driftyco/ionic-native/issues/835)
+
+
+### Features
+
+* **card-io:** add typing for response ([2e82320](https://github.com/driftyco/ionic-native/commit/2e82320))
+
+
+
+<a name="2.2.7"></a>
+## [2.2.7](https://github.com/driftyco/ionic-native/compare/v2.2.5...v2.2.7) (2016-11-24)
+
+
+### Bug Fixes
+
+* **3dTouch:** fixes onHomeIconPressed ([#813](https://github.com/driftyco/ionic-native/issues/813)) ([695099b](https://github.com/driftyco/ionic-native/commit/695099b))
+* **camera-preview:** formatting. Closes [#790](https://github.com/driftyco/ionic-native/issues/790) ([5577c51](https://github.com/driftyco/ionic-native/commit/5577c51))
+* **datepicker:** fix allowOldDates option ([#761](https://github.com/driftyco/ionic-native/issues/761)) ([fa03fa5](https://github.com/driftyco/ionic-native/commit/fa03fa5))
+* **diagnostics:** fix [#776](https://github.com/driftyco/ionic-native/issues/776) ([#777](https://github.com/driftyco/ionic-native/issues/777)) ([01b30c6](https://github.com/driftyco/ionic-native/commit/01b30c6))
+* **file:** correct writeFile flags ([9bd8997](https://github.com/driftyco/ionic-native/commit/9bd8997)), closes [#789](https://github.com/driftyco/ionic-native/issues/789)
+* **googlemap:** fix typoe googledesic to geodesic ([78b3ec5](https://github.com/driftyco/ionic-native/commit/78b3ec5)), closes [#765](https://github.com/driftyco/ionic-native/issues/765)
+* **native-audio:** completeCallback is optional on play method ([b719a03](https://github.com/driftyco/ionic-native/commit/b719a03)), closes [#792](https://github.com/driftyco/ionic-native/issues/792)
+* **nfc:** don't bind to name field, fix [#740](https://github.com/driftyco/ionic-native/issues/740) ([#749](https://github.com/driftyco/ionic-native/issues/749)) ([ca43394](https://github.com/driftyco/ionic-native/commit/ca43394))
+* **plugin:** don't bind to name field. Fixes [#740](https://github.com/driftyco/ionic-native/issues/740) ([71916a8](https://github.com/driftyco/ionic-native/commit/71916a8))
+* **video-player:** scalingMode is number ([f07431a](https://github.com/driftyco/ionic-native/commit/f07431a)), closes [#774](https://github.com/driftyco/ionic-native/issues/774)
+
+
+### Features
+
+* **camera-preview:** add disable method ([6ad54ec](https://github.com/driftyco/ionic-native/commit/6ad54ec))
+* **google-analytics:** new interval period parameter ([abd910d](https://github.com/driftyco/ionic-native/commit/abd910d)), closes [#816](https://github.com/driftyco/ionic-native/issues/816)
+* **google-map:** add get and set methods to Marker class ([51ab03d](https://github.com/driftyco/ionic-native/commit/51ab03d)), closes [#798](https://github.com/driftyco/ionic-native/issues/798)
+
+
+
+<a name="2.2.5"></a>
+## [2.2.5](https://github.com/driftyco/ionic-native/compare/v2.2.4...v2.2.5) (2016-10-27)
+
+
+### Bug Fixes
+
+* **3dtouch:** add missing property ([#739](https://github.com/driftyco/ionic-native/issues/739)) ([757d096](https://github.com/driftyco/ionic-native/commit/757d096))
+* **geolocation:** fix watchPosition return type ([d5310b0](https://github.com/driftyco/ionic-native/commit/d5310b0)), closes [#741](https://github.com/driftyco/ionic-native/issues/741)
+* **nfc:** fix Ndef class ([ac181c5](https://github.com/driftyco/ionic-native/commit/ac181c5)), closes [#713](https://github.com/driftyco/ionic-native/issues/713)
+* **sqlite:** check if plugin exists before opening database ([6f47371](https://github.com/driftyco/ionic-native/commit/6f47371))
+* **sqlite:** check if plugin exists before opening database ([c98b4f4](https://github.com/driftyco/ionic-native/commit/c98b4f4))
+* **sqlite:** fix callback issue with transaction method ([a72cd59](https://github.com/driftyco/ionic-native/commit/a72cd59)), closes [#732](https://github.com/driftyco/ionic-native/issues/732)
+
+
+### Features
+
+* **diagnostic:** add missing functions ([eb03de9](https://github.com/driftyco/ionic-native/commit/eb03de9)), closes [#743](https://github.com/driftyco/ionic-native/issues/743)
+* **filepath:** add cordova-plugin-filepath ([#714](https://github.com/driftyco/ionic-native/issues/714)) ([0660a3b](https://github.com/driftyco/ionic-native/commit/0660a3b))
+* **plugins:** add name field ([9677656](https://github.com/driftyco/ionic-native/commit/9677656))
+* **sms:** add hasPermission method ([8fbf1f2](https://github.com/driftyco/ionic-native/commit/8fbf1f2)), closes [#721](https://github.com/driftyco/ionic-native/issues/721)
+
+
+
 <a name="2.2.4"></a>
 ## [2.2.4](https://github.com/driftyco/ionic-native/compare/v2.2.3...v2.2.4) (2016-10-15)
 
@@ -70,7 +135,6 @@
 
 * **native-transitions:** add missing interface properties ([35c8bbd](https://github.com/driftyco/ionic-native/commit/35c8bbd))
 * **onesignal:** update to match latest api ([#671](https://github.com/driftyco/ionic-native/issues/671)) ([7c6e6d8](https://github.com/driftyco/ionic-native/commit/7c6e6d8)), closes [#667](https://github.com/driftyco/ionic-native/issues/667)
-* **thmeable-browser:** fix the name of the plugin ([#663](https://github.com/driftyco/ionic-native/issues/663)) ([1368175](https://github.com/driftyco/ionic-native/commit/1368175))
 
 
 ### Features
@@ -80,23 +144,15 @@
 
 
 <a name="2.1.9"></a>
-## [2.1.9](https://github.com/driftyco/ionic-native/compare/v2.1.8...v2.1.9) (2016-10-09)
-
-
-### Bug Fixes
-
-* **paypal:** add optional details param to paypalpayment ([7200845](https://github.com/driftyco/ionic-native/commit/7200845))
-* **paypal:** problems with selection of PayPal environment ([#662](https://github.com/driftyco/ionic-native/issues/662)) ([3dd6a92](https://github.com/driftyco/ionic-native/commit/3dd6a92))
-
-
-
-<a name="2.1.8"></a>
-## [2.1.8](https://github.com/driftyco/ionic-native/compare/v2.1.7...v2.1.8) (2016-10-08)
+## [2.1.9](https://github.com/driftyco/ionic-native/compare/v2.1.7...v2.1.9) (2016-10-09)
 
 
 ### Bug Fixes
 
 * **googlemaps:** fixes GoogleMapsLatLng class ([11653ce](https://github.com/driftyco/ionic-native/commit/11653ce))
+* **paypal:** add optional details param to paypalpayment ([7200845](https://github.com/driftyco/ionic-native/commit/7200845))
+* **paypal:** problems with selection of PayPal environment ([#662](https://github.com/driftyco/ionic-native/issues/662)) ([3dd6a92](https://github.com/driftyco/ionic-native/commit/3dd6a92))
+* **thmeable-browser:** fix the name of the plugin ([#663](https://github.com/driftyco/ionic-native/issues/663)) ([1368175](https://github.com/driftyco/ionic-native/commit/1368175))
 
 
 
@@ -111,27 +167,13 @@
 
 
 <a name="2.1.6"></a>
-## [2.1.6](https://github.com/driftyco/ionic-native/compare/v2.1.5...v2.1.6) (2016-10-06)
-
-
-### Bug Fixes
-
-* **paypal:** fix helper classes ([f002657](https://github.com/driftyco/ionic-native/commit/f002657))
-
-
-
-<a name="2.1.5"></a>
-## [2.1.5](https://github.com/driftyco/ionic-native/compare/v2.1.4...v2.1.5) (2016-10-06)
-
-
-
-<a name="2.1.4"></a>
-## [2.1.4](https://github.com/driftyco/ionic-native/compare/v2.1.3...v2.1.4) (2016-10-06)
+## [2.1.6](https://github.com/driftyco/ionic-native/compare/v2.1.3...v2.1.6) (2016-10-06)
 
 
 ### Bug Fixes
 
 * **google-analytics:** specify successIndex and errorIndex for methods with optional params ([6f23bef](https://github.com/driftyco/ionic-native/commit/6f23bef))
+* **paypal:** fix helper classes ([f002657](https://github.com/driftyco/ionic-native/commit/f002657))
 
 
 
@@ -148,7 +190,7 @@
 
 
 <a name="2.1.2"></a>
-## [2.1.2](https://github.com/driftyco/ionic-native/compare/v2.1.1...v2.1.2) (2016-10-06)
+## [2.1.2](https://github.com/driftyco/ionic-native/compare/v2.1.0...v2.1.2) (2016-10-06)
 
 
 ### Bug Fixes
@@ -162,11 +204,6 @@
 
 
 
-<a name="2.1.1"></a>
-## [2.1.1](https://github.com/driftyco/ionic-native/compare/v2.1.0...v2.1.1) (2016-10-03)
-
-
-
 <a name="2.1.0"></a>
 # [2.1.0](https://github.com/driftyco/ionic-native/compare/v2.0.3...v2.1.0) (2016-10-03)
 

karma.conf.ts

@@ -22,6 +22,7 @@ module.exports = config => {
     },
 
     browserify: {
+      debug: true,
       plugin: [ 'tsify' ],
       extensions: ['.js', '.ts']
     },

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ionic-native",
-  "version": "2.2.4",
+  "version": "2.2.8",
   "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
   "main": "dist/es5/index.js",
   "module": "dist/esm/index.js",

scripts/docs/prepare.sh

@@ -21,13 +21,17 @@ function run {
     ./git/clone.sh --repository="ionic-site" \
       --directory="$SITE_DIR" \
       --branch="master"
-    ls -al $SITE_DIR
+    cd $SITE_DIR
+    ls -al
   else
     echo "using existing"
     cd $SITE_DIR
     git reset --hard
     git pull origin master
   fi
+
+  git rm -rf docs/v2/native/*/
+
 }
 
 source $(dirname $0)/../utils.inc.sh

scripts/docs/update_docs.sh

@@ -23,10 +23,8 @@ function run {
   # CD in to the site dir to commit updated docs
   cd $SITE_DIR
 
-  CHANGES=$(git status --porcelain)
-
   # if no changes, don't commit
-  if [[ "$CHANGES" == "" ]]; then
+  if [[ `git status --porcelain` ]]; then
     echo "-- No changes detected for the following commit, docs not updated."
     echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
   else

scripts/templates/wrap-min.tmpl

@@ -11,6 +11,7 @@ import { Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'PluginName',
   plugin: '',
   pluginRef: '',
   repo: ''

scripts/templates/wrap.tmpl

@@ -29,6 +29,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  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

src/index.ts

@@ -44,13 +44,14 @@ import { Facebook } from './plugins/facebook';
 import { File } from './plugins/file';
 import { FileChooser } from './plugins/file-chooser';
 import { FileOpener } from './plugins/file-opener';
+import { FilePath } from './plugins/filepath';
 import { Transfer } from './plugins/filetransfer';
 import { Flashlight } from './plugins/flashlight';
 import { Geofence } from './plugins/geofence';
 import { Geolocation } from './plugins/geolocation';
 import { Globalization } from './plugins/globalization';
 import { GooglePlus } from './plugins/google-plus';
-import { GoogleMap } from './plugins/googlemaps';
+import { GoogleMap } from './plugins/googlemap';
 import { GoogleAnalytics } from './plugins/googleanalytics';
 import { Hotspot } from  './plugins/hotspot';
 import { HTTP } from  './plugins/http';
@@ -153,13 +154,14 @@ export * from './plugins/file';
 export * from './plugins/file-chooser';
 export * from './plugins/file-opener';
 export * from './plugins/filetransfer';
+export * from './plugins/filepath';
 export * from './plugins/flashlight';
 export * from './plugins/geofence';
 export * from './plugins/geolocation';
 export * from './plugins/globalization';
 export * from './plugins/google-plus';
 export * from './plugins/googleanalytics';
-export * from './plugins/googlemaps';
+export * from './plugins/googlemap';
 export * from './plugins/hotspot';
 export * from './plugins/http';
 export * from './plugins/httpd';
@@ -262,6 +264,7 @@ window['IonicNative'] = {
   File,
   FileChooser,
   FileOpener,
+  FilePath,
   Flashlight,
   Geofence,
   Geolocation,

src/plugins/3dtouch.ts

@@ -54,7 +54,7 @@ declare var window: any;
  * ];
  * ThreeDeeTouch.configureQuickActions(actions);
  *
- * ThreeDeeTouchForceTouch.onHomeIconPressed().subscribe(
+ * ThreeDeeTouch.onHomeIconPressed().subscribe(
  *  (payload) => {
  *    // returns an object that is the button you presed
  *    console.log('Pressed the ${payload.title} button')
@@ -65,6 +65,7 @@ declare var window: any;
  * ```
  */
 @Plugin({
+  pluginName: 'ThreeDeeTouch',
   plugin: 'cordova-plugin-3dtouch',
   pluginRef: 'ThreeDeeTouch',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-3dtouch',
@@ -94,6 +95,7 @@ export class ThreeDeeTouch {
    * @param {string} title Title for your action
    * @param {string} subtitle (optional) A short description for your action
    * @param {string} iconType (optional) Choose between Prohibit, Contact, Home, MarkLocation, Favorite, Love, Cloud, Invitation, Confirmation, Mail, Message, Date, Time, CapturePhoto, CaptureVideo, Task, TaskCompleted, Alarm, Bookmark, Shuffle, Audio, Update
+   * @param {string} iconTemplate (optional) Can be used to provide your own icon
    */
   @Cordova({
     sync: true
@@ -106,7 +108,7 @@ export class ThreeDeeTouch {
    */
   static onHomeIconPressed(): Observable<any> {
     return new Observable(observer => {
-      if (window.ThreeDeeTouch && window.ThreeDeeTouch.onHomeIconPressed) {
+      if (window.ThreeDeeTouch) {
         window.ThreeDeeTouch.onHomeIconPressed = observer.next.bind(observer);
       } else {
         observer.error('3dTouch plugin is not available.');
@@ -139,6 +141,7 @@ export interface ThreeDeeTouchQuickAction {
   title: string;
   subtitle?: string;
   iconType?: string;
+  iconTemplate?: string;
 }
 
 export interface ThreeDeeTouchForceTouch {

src/plugins/actionsheet.ts

@@ -41,6 +41,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
+  pluginName: 'ActionSheet',
   plugin: 'cordova-plugin-actionsheet',
   pluginRef: 'plugins.actionsheet',
   repo: 'https://github.com/EddyVerbruggen/cordova-plugin-actionsheet',
@@ -51,7 +52,7 @@ export class ActionSheet {
   /**
    * Show a native ActionSheet component. See below for options.
    * @param {options} Options See table below
-   * @returns {Promise} Returns a Promise that resolves with the index of the
+   * @returns {Promise<any>} Returns a Promise that resolves with the index of the
    *   button pressed (1 based, so 1, 2, 3, etc.)
    */
   @Cordova()
@@ -69,7 +70,7 @@ export class ActionSheet {
 
   /**
    * Progamtically hide the native ActionSheet
-   * @returns {Promise} Returns a Promise that resolves when the actionsheet is closed
+   * @returns {Promise<any>} Returns a Promise that resolves when the actionsheet is closed
    */
   @Cordova()
   static hide(options?: any): Promise<any> { return; }

src/plugins/admob.ts

@@ -5,9 +5,24 @@ import { Observable } from 'rxjs/Observable';
  * @name AdMob
  * @description Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
  * @usage
+ * ```typescript
+ * import { AdMob } from 'ionic-native';
+ * 
+ * ionViewDidLoad() {
+ *   AdMob.onBannerDismiss()
+ *     .subscribe(() => { console.log('User returned from interstitial'); });
+ * }
+ * 
+ * public onClick() {
+ *   AdMob.prepareInterstitial('YOUR_ADID')
+ *     .then(() => { AdMob.showInterstitial(); });
+ * }
+ *
+ * ```
  * Please refer the the plugin's original repository for detailed usage.
  */
 @Plugin({
+  pluginName: 'AdMob',
   plugin: 'cordova-plugin-admobpro',
   pluginRef: 'AdMob',
   repo: 'https://github.com/floatinghotpot/cordova-admob-pro',
@@ -20,6 +35,7 @@ export class AdMob {
   /**
    *
    * @param adIdOrOptions
+   * @returns {Promise<any>} Returns a Promise that resolves when the banner is created
    */
   @Cordova()
   static createBanner(adIdOrOptions: any): Promise<any> { return; }
@@ -62,6 +78,7 @@ export class AdMob {
   /**
    *
    * @param adIdOrOptions
+   * @returns {Promise<any>} Returns a Promise that resolves when interstitial is prepared
    */
   @Cordova()
   static prepareInterstitial(adIdOrOptions: any): Promise<any> { return; }
@@ -76,6 +93,7 @@ export class AdMob {
 
   /**
    *
+   * @returns {Promise<any>} Returns a Promise that resolves when the interstitial is ready
    */
   @Cordova()
   static isInterstitialReady(): Promise<boolean> { return; }
@@ -83,6 +101,7 @@ export class AdMob {
   /**
    * Prepare a reward video ad
    * @param adIdOrOptions
+   * @returns {Promise<any>} Returns a Promise that resolves when the ad is prepared
    */
   @Cordova()
   static prepareRewardVideoAd(adIdOrOptions: any): Promise<any> { return; }
@@ -98,6 +117,7 @@ export class AdMob {
   /**
    * Sets the values for configuration and targeting
    * @param options Returns a promise that resolves if the options are set successfully
+   * @returns {Promise<any>} Returns a Promise that resolves when the options have been set
    */
   @Cordova()
   static setOptions(options: any): Promise<any> { return; }

src/plugins/android-fingerprint-auth.ts

@@ -30,6 +30,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'AndroidFingerprintAuth',
   plugin: 'cordova-plugin-android-fingerprint-auth',
   pluginRef: 'FingerprintAuth',
   repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth'
@@ -70,6 +71,7 @@ export class AndroidFingerprintAuth {
 
   /**
    * Check if service is available
+   * @returns {Promise<any>} Returns a Promise that resolves if fingerprint auth is available on the device
    */
   @Cordova()
   static isAvailable(): Promise<{isAvailable: boolean}> {return; }

src/plugins/appavailability.ts

@@ -28,6 +28,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'AppAvailability',
   plugin: 'cordova-plugin-appavailability',
   pluginRef: 'appAvailability',
   repo: 'https://github.com/ohh2ahh/AppAvailability',

src/plugins/apprate.ts

@@ -19,7 +19,7 @@ declare var window;
  *    android: 'market://details?id=<package_name>',
  *  };
  *
- * AppRate.promptForRating();
+ * AppRate.promptForRating(false);
  * ```
  *
  * @advanced
@@ -44,6 +44,7 @@ declare var window;
 
  */
 @Plugin({
+  pluginName: 'AppRate',
   plugin: 'cordova-plugin-apprate',
   pluginRef: 'AppRate',
   repo: 'https://github.com/pushandplay/cordova-plugin-apprate',

src/plugins/appversion.ts

@@ -19,6 +19,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'AppVersion',
   plugin: 'cordova-plugin-app-version',
   pluginRef: 'cordova.getAppVersion',
   repo: 'https://github.com/whiteoctober/cordova-plugin-app-version',
@@ -27,28 +28,28 @@ import { Cordova, Plugin } from './plugin';
 export class AppVersion {
   /**
    * Returns the name of the app
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getAppName(): Promise<any> { return; }
 
   /**
    * Returns the package name of the app
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getPackageName(): Promise<any> { return; }
 
   /**
    * Returns the build identifier of the app
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getVersionCode(): Promise<any> { return; }
 
   /**
    * Returns the version of the app
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getVersionNumber(): Promise<any> { return; }

src/plugins/background-geolocation.ts

@@ -272,6 +272,7 @@ export interface Config {
  * Config
  */
 @Plugin({
+  pluginName: 'BackgroundGeolocation',
   plugin: 'cordova-plugin-mauron85-background-geolocation',
   pluginRef: 'backgroundGeolocation',
   repo: 'https://github.com/mauron85/cordova-plugin-background-geolocation',
@@ -345,12 +346,14 @@ export class BackgroundGeolocation {
   /**
    * Turn ON the background-geolocation system.
    * The user will be tracked whenever they suspend the app.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static start(): Promise<any> { return; }
 
   /**
    * Turn OFF background-tracking
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stop(): Promise<any> { return; }
@@ -371,6 +374,7 @@ export class BackgroundGeolocation {
 
   /**
    * Setup configuration
+   * @returns {Promise<any>}
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -380,6 +384,7 @@ export class BackgroundGeolocation {
   /**
    * Returns current stationaryLocation if available. null if not
    * NOTE: IOS, WP only
+   * @returns {Promise<Location>}
    */
   @Cordova()
   static getStationaryLocation(): Promise<Location> { return; }
@@ -388,6 +393,7 @@ export class BackgroundGeolocation {
    * Add a stationary-region listener. Whenever the devices enters "stationary-mode",
    * your #success callback will be executed with #location param containing #radius of region
    * NOTE: IOS, WP only
+   * @returns {Promise<any>}
    */
   @Cordova()
   static onStationary(): Promise<any> { return; }
@@ -417,6 +423,7 @@ export class BackgroundGeolocation {
    * If user enable or disable location services then success callback will be executed.
    * In case or error (SettingNotFoundException) fail callback will be executed.
    * NOTE: ANDROID only
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static watchLocationMode(): Promise<boolean> { return; }
@@ -436,12 +443,14 @@ export class BackgroundGeolocation {
    *  or
    *  - option.debug is true
    * NOTE: ANDROID only
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getLocations(): Promise<any> { return; }
 
   /**

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

+   * @returns {Promise<any>}
    */
   @Cordova()
   static getValidLocations(): Promise<any> { return; }
@@ -449,6 +458,7 @@ export class BackgroundGeolocation {
   /**
    * Delete stored location by given locationId.
    * NOTE: ANDROID only
+   * @returns {Promise<any>}
    */
   @Cordova()
   static deleteLocation(locationId: number): Promise<any> { return; }
@@ -456,6 +466,7 @@ export class BackgroundGeolocation {
   /**
    * Delete all stored locations.
    * NOTE: ANDROID only
+   * @returns {Promise<any>}
    */
   @Cordova()
   static deleteAllLocations(): Promise<any> { return; }
@@ -473,6 +484,7 @@ export class BackgroundGeolocation {
    * NOTE: iOS only
    *
    * @param {number} See above.

+   * @returns {Promise<any>}
    */
   @Cordova()
   static switchMode(modeId: number): Promise<any> { return; }
@@ -482,6 +494,7 @@ export class BackgroundGeolocation {
    * @see https://github.com/mauron85/cordova-plugin-background-geolocation/tree/v2.2.1#debugging for more information.

    *
    * @param {number} Limits the number of entries

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

src/plugins/backgroundmode.ts

@@ -6,7 +6,7 @@ import { Observable } from 'rxjs/Observable';
 * @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#android-customization
+* Requires Cordova plugin: cordova-plugin-background-mode. For more info about plugin, vist: https://github.com/katzer/cordova-plugin-background-mode
 *@usage
 * ```typescript
 * import { BackgroundMode } from 'ionic-native';
@@ -28,6 +28,7 @@ import { Observable } from 'rxjs/Observable';
 *
 */
 @Plugin({
+  pluginName: 'BackgroundMode',
   plugin: 'cordova-plugin-background-mode',
   pluginRef: 'cordova.plugins.backgroundMode',
   repo: 'https://github.com/katzer/cordova-plugin-background-mode',
@@ -48,18 +49,18 @@ export class BackgroundMode {
   * Once the background mode has been disabled, the app will be paused when in background.
   */
   @Cordova()
-  static disable(): void { }
+  static disable(): Promise<any> { return; }
 
   /**
   * Checks if background mode is enabled or not.
-  * @returns {boolean} returns a true of false if the background mode is enabled.
+  * @returns {Promise<boolean>} returns a promise that resolves with boolean that indicates if the background mode is enabled.
   */
   @Cordova()
   static isEnabled(): Promise<boolean> { return; }
 
   /**
   * Can be used to get the information if the background mode is active.
-  * @returns {boolean} returns tru or flase if the background mode is active.
+  * @returns {Promise<boolean>} returns a promise that resolves with boolean that indicates if the background mode is active.
   */
   @Cordova()
   static isActive(): Promise<boolean> { return; }
@@ -72,7 +73,7 @@ export class BackgroundMode {
   @Cordova({
     platforms: ['Android']
   })
-  static setDefaults(options?: Configure): void { }
+  static setDefaults(options?: Configure): Promise<any> { return; }
 
   /**
   * Modify the displayed information.
@@ -82,22 +83,25 @@ export class BackgroundMode {
   @Cordova({
     platforms: ['Android']
   })
-  static configure(options?: Configure): void { }
+  static configure(options?: Configure): Promise<any> { return; }
 
   /**
   * Called when background mode is activated.
+  * @returns {Observable<any>} returns an observable that emits when background mode is activated
   */
   @CordovaFunctionOverride()
   static onactivate(): Observable<any> { return; };
 
   /**
   * Called when background mode is deactivated.
+  * @returns {Observable<any>} returns an observable that emits when background mode is deactivated
   */
   @CordovaFunctionOverride()
   static ondeactivate(): Observable<any> { return; };
 
   /**
   * Called when background mode fails
+  * @returns {Observable<any>} returns an observable that emits when background mode fails
   */
   @CordovaFunctionOverride()
   static onfailure(): Observable<any> { return; };

src/plugins/badge.ts

@@ -18,6 +18,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Badge',
   plugin: 'cordova-plugin-badge',
   pluginRef: 'cordova.plugins.notification.badge',
   repo: 'https://github.com/katzer/cordova-plugin-badge',
@@ -27,6 +28,7 @@ export class Badge {
 
   /**
    * Clear the badge of the app icon.
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static clear(): Promise<boolean> { return; }
@@ -34,14 +36,14 @@ export class Badge {
   /**
    * Set the badge of the app icon.
    * @param {number} badgeNumber  The new badge number.
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static set(badgeNumber: number): Promise<any> { return; }
 
   /**
    * Get the badge of the app icon.
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static get(): Promise<any> { return; }
@@ -49,7 +51,7 @@ export class Badge {
   /**
    * Increase the badge number.
    * @param {number} increaseBy  Count to add to the current badge number
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static increase(increaseBy: number): Promise<any> { return; }
@@ -57,20 +59,21 @@ export class Badge {
   /**
    * Decrease the badge number.
    * @param {number} decreaseBy  Count to subtract from the current badge number
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static decrease(decreaseBy: number): Promise<any> { return; }
 
   /**
    * Determine if the app has permission to show badges.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static hasPermission(): Promise<any> { return; }
 
   /**
    * Register permission to set badge notifications
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static registerPermission(): Promise<any> { return; }

src/plugins/barcodescanner.ts

@@ -20,6 +20,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'BarcodeScanner',
   plugin: 'phonegap-plugin-barcodescanner',
   pluginRef: 'cordova.plugins.barcodeScanner',
   repo: 'https://github.com/phonegap/phonegap-plugin-barcodescanner',
@@ -39,7 +40,7 @@ export class BarcodeScanner {
   /**
    * Open the barcode scanner.
    * @param options {Object} Optional options to pass to the scanner
-   * @return Returns a Promise that resolves with scanner data, or rejects with an error.
+   * @returns {Promise<any>} Returns a Promise that resolves with scanner data, or rejects with an error.
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -51,6 +52,7 @@ export class BarcodeScanner {
    * NOTE: not well supported on Android
    * @param type {string} Type of encoding
    * @param data {any} Data to encode
+   * @returns {Promise<any>}
    */
   @Cordova()
   static encode(type: string, data: any): Promise<any> { return; }

src/plugins/base64togallery.ts

@@ -14,6 +14,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Base64ToGallery',
   plugin: 'cordova-base64-to-gallery',
   pluginRef: 'cordova',
   repo: 'https://github.com/Nexxa/cordova-base64-to-gallery',
@@ -24,8 +25,8 @@ export class Base64ToGallery {
   /**
    * 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.  
-   * @returns {Promise} returns a promise that resolves when the image is saved.
+   * @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.
+   * @returns {Promise<any>} returns a promise that resolves when the image is saved.
    */
   @Cordova({
     successIndex: 2,

src/plugins/batterystatus.ts

@@ -24,6 +24,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'BatteryStatus',
   plugin: 'cordova-plugin-battery-status',
   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']
@@ -32,7 +33,7 @@ export class BatteryStatus {
 
   /**
    * Watch the change in battery level
-   * @returns {Observable} Returns an observable that pushes a status object
+   * @returns {Observable<StatusObject>} Returns an observable that pushes a status object
    */
   @Cordova({
     eventObservable: true,

src/plugins/ble.ts

@@ -160,6 +160,7 @@ import { Observable } from 'rxjs/Observable';
  *
  */
 @Plugin({
+  pluginName: 'BLE',
   plugin: 'cordova-plugin-ble-central',
   pluginRef: 'ble',
   repo: 'https://github.com/don/cordova-plugin-ble-central',
@@ -177,7 +178,7 @@ export class BLE {
    * ```
    * @param {string[]} services  List of service UUIDs to discover, or `[]` to find all devices
    * @param {number} seconds  Number of seconds to run discovery
-   * @return Returns an Observable that notifies of each peripheral that is discovered during the specified time.
+   * @returns {Observable<any>} Returns an Observable that notifies of each peripheral that is discovered during the specified time.
    */
   @Cordova({
     observable: true
@@ -198,7 +199,7 @@ export class BLE {
    * }, 5000);
    * ```
    * @param {string[]} services  List of service UUIDs to discover, or `[]` to find all devices
-   * @return Returns an Observable that notifies of each peripheral discovered.
+   * @returns {Observable<any>} Returns an Observable that notifies of each peripheral discovered.
    */
   @Cordova({
     observable: true,
@@ -211,7 +212,7 @@ export class BLE {
    * 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}
-   * @return Returns an Observable that notifies of each peripheral discovered.
+   * @returns {Observable<any>} Returns an Observable that notifies of each peripheral discovered.
    */
   @Cordova({
     observable: true,
@@ -372,7 +373,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 a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stopNotification(
@@ -392,7 +393,7 @@ export class BLE {
    * );
    * ```
    * @param {string} deviceId  UUID or MAC address of the peripheral
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static isConnected(deviceId: string): Promise<any> { return; }
@@ -400,7 +401,7 @@ export class BLE {
   /**
    * Report if bluetooth is enabled.
    *
-   * @return {Promise<void>} Returns a Promise that resolves if Bluetooth is enabled, and rejects if disabled.
+   * @returns {Promise<void>} Returns a Promise that resolves if Bluetooth is enabled, and rejects if disabled.
    */
   @Cordova()
   static isEnabled(): Promise<void> { return; }
@@ -408,7 +409,7 @@ export class BLE {
   /**
    * Open System Bluetooth settings (Android only).
    *
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static showBluetoothSettings(): Promise<any> { return; }
@@ -416,7 +417,7 @@ export class BLE {
   /**
    * Enable Bluetooth on the device (Android only).
    *
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static enable(): Promise<any> { return; }

src/plugins/bluetoothserial.ts

@@ -28,6 +28,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'BluetoothSerial',
   repo: 'https://github.com/don/BluetoothSerial',
   plugin: 'cordova-plugin-bluetooth-serial',
   pluginRef: 'bluetoothSerial',
@@ -38,7 +39,7 @@ export class BluetoothSerial {
   /**
    * Connect to a Bluetooth device
    * @param {string} macAddress_or_uuid Identifier of the remote device
-   * @returns {Observable} Subscribe to connect, unsubscribe to disconnect.
+   * @returns {Observable<any>} Subscribe to connect, unsubscribe to disconnect.
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone'],
@@ -50,7 +51,7 @@ export class BluetoothSerial {
   /**
    * Connect insecurely to a Bluetooth device
    * @param {string} macAddress Identifier of the remote device
-   * @returns {Observable} Subscribe to connect, unsubscribe to disconnect.
+   * @returns {Observable<any>} Subscribe to connect, unsubscribe to disconnect.
    */
   @Cordova({
     platforms: ['Android'],
@@ -62,7 +63,7 @@ export class BluetoothSerial {
   /**
    * Writes data to the serial port
    * @param {any} data ArrayBuffer of data
-   * @returns {Promise} returns a promise when data has been written
+   * @returns {Promise<any>} returns a promise when data has been written
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -71,7 +72,7 @@ export class BluetoothSerial {
 
   /**
    * Gets the number of bytes of data available
-   * @returns {Promise} returns a promise that contains the available bytes
+   * @returns {Promise<any>} returns a promise that contains the available bytes
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -79,7 +80,7 @@ export class BluetoothSerial {
 
   /**
    * Reads data from the buffer
-   * @returns {Promise} returns a promise with data from the buffer
+   * @returns {Promise<any>} returns a promise with data from the buffer
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -89,7 +90,7 @@ export class BluetoothSerial {
   /**
    * Reads data from the buffer until it reaches a delimiter
    * @param {string} delimiter string that you want to search until
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -99,7 +100,7 @@ export class BluetoothSerial {
   /**
    * Subscribe to be notified when data is received
    * @param {string} delimiter the string you want to watch for
-   * @returns {Observable} returns an observable.
+   * @returns {Observable<any>} returns an observable.
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone'],
@@ -110,7 +111,7 @@ export class BluetoothSerial {
 
   /**
    * Subscribe to be notified when data is received
-   * @returns {Observable} returns an observable
+   * @returns {Observable<any>} returns an observable
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone'],
@@ -121,7 +122,7 @@ export class BluetoothSerial {
 
   /**
    * Clears data in buffer
-   * @returns {Promise} returns a promise when completed
+   * @returns {Promise<any>} returns a promise when completed
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -130,7 +131,7 @@ export class BluetoothSerial {
 
   /**
    * Lists bonded devices
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -139,7 +140,7 @@ export class BluetoothSerial {
 
   /**
    * Reports if bluetooth is enabled
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -148,7 +149,7 @@ export class BluetoothSerial {
 
   /**
    * Reports the connection status
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -157,7 +158,7 @@ export class BluetoothSerial {
 
   /**
    * Reads the RSSI from the connected peripheral
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -166,7 +167,7 @@ export class BluetoothSerial {
 
   /**
    * Show the Bluetooth settings on the device
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -175,7 +176,7 @@ export class BluetoothSerial {
 
   /**
    * Enable Bluetooth on the device
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -184,7 +185,7 @@ export class BluetoothSerial {
 
   /**
    * Discover unpaired devices
-   * @returns {Promise} returns a promise
+   * @returns {Promise<any>} returns a promise
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone']
@@ -193,7 +194,7 @@ export class BluetoothSerial {
 
   /**
    * Subscribe to be notified on Bluetooth device discovery. Discovery process must be initiated with the `discoverUnpaired` function.
-   * @returns {Observable} Returns an observable
+   * @returns {Observable<any>} Returns an observable
    */
   @Cordova({
     platforms: ['Android', 'iOS', 'Windows Phone'],

src/plugins/brightness.ts

@@ -18,6 +18,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
+  pluginName: 'Brightness',
   plugin: 'cordova-plugin-brightness',
   pluginRef: 'cordova.plugins.brightness',
   repo: 'https://github.com/mgcrea/cordova-plugin-brightness',
@@ -29,7 +30,7 @@ export class Brightness {
    * 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.
-   * @returns {Promise} Returns a Promise that resolves if setting brightness was successful.
+   * @returns {Promise<any>} Returns a Promise that resolves if setting brightness was successful.
    */
   @Cordova()
   static setBrightness(value: number): Promise<any> { return; }
@@ -37,7 +38,7 @@ export class Brightness {
   /**
    * Reads the current brightness of the device display.
    *
-   * @returns {Promise} Returns a Promise that resolves with the
+   * @returns {Promise<any>} Returns a Promise that resolves with the
    * brightness value of the device display (floating number between 0 and 1).
    */
   @Cordova()

src/plugins/calendar.ts

@@ -38,6 +38,7 @@ export interface CalendarOptions {
  *
  */
 @Plugin({
+  pluginName: 'Calendar',
   plugin: 'cordova-plugin-calendar',
   pluginRef: 'plugins.calendar',
   repo: 'https://github.com/EddyVerbruggen/Calendar-PhoneGap-Plugin',
@@ -98,7 +99,7 @@ export class Calendar {
    * 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
-   * @return {Promise} Returns a Promise
+   * @returns {Promise<any>} Returns a Promise
    */
   @Cordova()
   static createCalendar(
@@ -108,7 +109,7 @@ export class Calendar {
   /**
    * Delete a calendar. (iOS only)
    * @param {string} name  Name of the calendar to delete.
-   * @return Returns a Promise
+   * @returns {Promise<any>} Returns a Promise
    */
   @Cordova()
   static deleteCalendar(name: string): Promise<any> { return; }
@@ -149,7 +150,7 @@ export class Calendar {
    * @param {string} [notes]  The event notes
    * @param {Date} [startDate]  The event start date
    * @param {Date} [endDate]  The event end date
-   * @return Returns a Promise
+   * @returns {Promise<any>} Returns a Promise
    */
   @Cordova()
   static createEvent(
@@ -169,7 +170,7 @@ export class Calendar {
    * @param {Date} [startDate]  The event start date
    * @param {Date} [endDate]  The event end date
    * @param {CalendarOptions} [options]  Additional options, see `getCalendarOptions`
-   * @return Returns a Promise
+   * @returns {Promise<any>} Returns a Promise
    */
   @Cordova()
   static createEventWithOptions(
@@ -189,7 +190,7 @@ export class Calendar {
    * @param {string} [notes]  The event notes
    * @param {Date} [startDate]  The event start date
    * @param {Date} [endDate]  The event end date
-   * @return Returns a Promise
+   * @returns {Promise<any>} Returns a Promise
    */
   @Cordova()
   static createEventInteractively(
@@ -209,7 +210,7 @@ export class Calendar {
    * @param {Date} [startDate]  The event start date
    * @param {Date} [endDate]  The event end date
    * @param {CalendarOptions} [options]  Additional options, see `getCalendarOptions`
-   * @return Returns a Promise
+   * @returns {Promise<any>}
    */
   @Cordova()
   static createEventInteractivelyWithOptions(
@@ -240,7 +241,7 @@ export class Calendar {
    * @param {string} [notes]  The event notes
    * @param {Date} [startDate]  The event start date
    * @param {Date} [endDate]  The event end date
-   * @return Returns a Promise
+   * @returns {Promise<any>}
    */
   @Cordova()
   static findEvent(
@@ -259,7 +260,7 @@ export class Calendar {
    * @param {Date} [startDate]  The event start date
    * @param {Date} [endDate]  The event end date
    * @param {CalendarOptions} [options]  Additional options, see `getCalendarOptions`
-   * @return Returns a Promise that resolves with the event, or rejects with an error.
+   * @returns {Promise<any>} Returns a Promise that resolves with the event, or rejects with an error.
    */
   @Cordova()
   static findEventWithOptions(
@@ -276,21 +277,21 @@ export class Calendar {
    *
    * @param {Date} [startDate]  The start date
    * @param {Date} [endDate]  The end date
-   * @return Returns a Promise that resolves with the list of events, or rejects with an error.
+   * @returns {Promise<any>} Returns a Promise that resolves with the list of events, or rejects with an error.
    */
   @Cordova()
   static listEventsInRange(startDate: Date, endDate: Date): Promise<any> { return; }
 
   /**
    * Get a list of all calendars.
-   * @return A Promise that resolves with the list of calendars, or rejects with an error.
+   * @returns {Promise<any>} A Promise that resolves with the list of calendars, or rejects with an error.
    */
   @Cordova()
   static listCalendars(): Promise<any> { return; }
 
   /**
    * Get a list of all future events in the specified calendar. (iOS only)
-   * @return Returns a Promise that resolves with the list of events, or rejects with an error.
+   * @returns {Promise<any>} Returns a Promise that resolves with the list of events, or rejects with an error.
    */
   @Cordova()
   static findAllEventsInNamedCalendar(calendarName: string): Promise<any> { return; }

src/plugins/call-number.ts

@@ -16,6 +16,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'CallNumber',
   plugin: 'call-number',
   pluginRef: 'plugins.CallNumber',
   repo: 'https://github.com/Rohfosho/CordovaCallNumberPlugin',
@@ -26,6 +27,7 @@ export class CallNumber {
    * Calls a phone number
    * @param numberToCall {string} The phone number to call as a string
    * @param bypassAppChooser {boolean} Set to true to bypass the app chooser and go directly to dialer
+   * @return {Promise<any>}
    */
   @Cordova({
     callbackOrder: 'reverse'

src/plugins/camera-preview.ts

@@ -19,11 +19,11 @@ export interface CameraPreviewSize {
  * @description
  * Showing camera preview in HTML
  *
- * For more info, please see the [Cordova Camera Preview Plugin Docs](https://github.com/westonganger/cordova-plugin-camera-preview).
+ * For more info, please see the [Cordova Camera Preview Plugin Docs](https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview).
  *
  * @usage
  * ```
- * import { CameraPreview } from 'ionic-native';
+ * import { CameraPreview, CameraPreviewRect } from 'ionic-native';
  *
  * // camera options (Size and location)
  * let cameraRect: CameraPreviewRect = {
@@ -38,9 +38,10 @@ export interface CameraPreviewSize {
  * CameraPreview.startCamera(
  *   cameraRect, // position and size of preview
  *   'front', // default camera
- *   true, // tape to take picture
+ *   true, // tap to take picture
  *   false, // disable drag
- *   true // send the preview to the back of the screen so we can add overlaying elements
+ *   false, // keep preview in front. Set to true (back of the screen) to apply overlaying elements
+ *   1 // set the preview alpha
  * );
  *
  * // Set the handler to run every time we take a picture
@@ -69,9 +70,10 @@ export interface CameraPreviewSize {
  *
  */
 @Plugin({
+  pluginName: 'CameraPreview',
   plugin: 'cordova-plugin-camera-preview',
   pluginRef: 'cordova.plugins.camerapreview',
-  repo: 'https://github.com/westonganger/cordova-plugin-camera-preview',
+  repo: 'https://github.com/cordova-plugin-camera-preview/cordova-plugin-camera-preview',
   platforms: ['Android', 'iOS']
 })
 export class CameraPreview {
@@ -88,7 +90,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static startCamera(rect: CameraPreviewRect, defaultCamera: string, tapEnabled: boolean, dragEnabled: boolean, toBack: boolean, alpha: number): void { };
+  static startCamera(rect: CameraPreviewRect, defaultCamera: string, tapEnabled: boolean, dragEnabled: boolean, toBack: boolean, alpha: number): void { }
 
   /**
    * Stops the camera preview instance.
@@ -96,7 +98,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static stopCamera(): void { };
+  static stopCamera(): void { }
 
   /**
    * Take the picture, the parameter size is optional
@@ -105,15 +107,16 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static takePicture(size: CameraPreviewSize): void { };
+  static takePicture(size: CameraPreviewSize): void { }
 
   /**
    * Register a callback function that receives the original picture and the image captured from the preview box.
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true
   })
-  static setOnPictureTakenHandler(): Observable<any> { return; };
+  static setOnPictureTakenHandler(): Observable<any> { return; }
 
   /**
    * Switch from the rear camera and front camera, if available.
@@ -121,7 +124,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static switchCamera(): void { };
+  static switchCamera(): void { }
 
   /**
    * Show the camera preview box.
@@ -129,7 +132,7 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static show(): void { };
+  static show(): void { }
 
   /**
    * Hide the camera preview box.
@@ -137,7 +140,15 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static hide(): void { };
+  static hide(): void { }
+
+  /**
+   * Disables the camera preview
+   */
+  @Cordova({
+    sync: true
+  })
+  static disable(): void { }
 
   /**
    * Set camera color effect.
@@ -145,5 +156,5 @@ export class CameraPreview {
   @Cordova({
     sync: true
   })
-  static setColorEffect(effect: string): void { };
+  static setColorEffect(effect: string): void { }
 }

src/plugins/camera.ts

@@ -6,7 +6,7 @@ export interface CameraOptions {
   quality?: number;
   /**
    * Choose the format of the return value.
-   * Defined in navigator.camera.DestinationType. Default is FILE_URI.
+   * Defined in Camera.DestinationType. Default is FILE_URI.
    *      DATA_URL : 0,   Return image as base64-encoded string,
    *      FILE_URI : 1,   Return image file URI,
    *      NATIVE_URI : 2  Return image native URI
@@ -15,7 +15,7 @@ export interface CameraOptions {
   destinationType?: number;
   /**
    * Set the source of the picture.
-   * Defined in navigator.camera.PictureSourceType. Default is CAMERA.
+   * Defined in Camera.PictureSourceType. Default is CAMERA.
    *      PHOTOLIBRARY : 0,
    *      CAMERA : 1,
    *      SAVEDPHOTOALBUM : 2
@@ -25,7 +25,7 @@ export interface CameraOptions {
   allowEdit?: boolean;
   /**
    * Choose the returned image file's encoding.
-   * Defined in navigator.camera.EncodingType. Default is JPEG
+   * Defined in Camera.EncodingType. Default is JPEG
    *      JPEG : 0    Return JPEG encoded image
    *      PNG : 1     Return PNG encoded image
    */
@@ -42,7 +42,7 @@ export interface CameraOptions {
   targetHeight?: number;
   /**
    * Set the type of media to select from. Only works when PictureSourceType
-   * is PHOTOLIBRARY or SAVEDPHOTOALBUM. Defined in nagivator.camera.MediaType
+   * is PHOTOLIBRARY or SAVEDPHOTOALBUM. Defined in Camera.MediaType
    *      PICTURE: 0      allow selection of still pictures only. DEFAULT.
    *          Will return format specified via DestinationType
    *      VIDEO: 1        allow selection of video only, WILL ALWAYS RETURN FILE_URI
@@ -55,9 +55,9 @@ export interface CameraOptions {
   saveToPhotoAlbum?: boolean;
   /**
    * Choose the camera to use (front- or back-facing).
-   * Defined in navigator.camera.Direction. Default is BACK.
-   *      FRONT: 0
-   *      BACK: 1
+   * Defined in Camera.Direction. Default is BACK.
+   *      BACK: 0
+   *      FRONT: 1
    */
   cameraDirection?: number;
   /** iOS-only options that specify popover location in iPad. Defined in CameraPopoverOptions. */
@@ -110,6 +110,7 @@ export interface CameraPopoverOptions {
  * CameraPopoverOptions
  */
 @Plugin({
+  pluginName: 'Camera',
   plugin: 'cordova-plugin-camera',
   pluginRef: 'navigator.camera',
   repo: 'https://github.com/apache/cordova-plugin-camera',
@@ -120,7 +121,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static DestinationType = {
+  static DestinationType = {
     /** Return base64 encoded string. DATA_URL can be very memory intensive and cause app crashes or out of memory errors. Use FILE_URI or NATIVE_URI if possible */
     DATA_URL: 0,
     /** Return file uri (content://media/external/images/media/2 for Android) */
@@ -133,7 +134,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static EncodingType = {
+  static EncodingType = {
     /** Return JPEG encoded image */
     JPEG: 0,
     /** Return PNG encoded image */
@@ -143,7 +144,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static MediaType = {
+  static MediaType = {
     /** Allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType */
     PICTURE: 0,
     /** Allow selection of video only, ONLY RETURNS URL */
@@ -156,7 +157,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static PictureSourceType = {
+  static PictureSourceType = {
     /** Choose image from picture library (same as SAVEDPHOTOALBUM for Android) */
     PHOTOLIBRARY: 0,
     /** Take picture from camera */
@@ -170,7 +171,7 @@ export class Camera {
    * Matches iOS UIPopoverArrowDirection constants to specify arrow location on popover.
    * @enum {number}
    */
-  public static PopoverArrowDirection = {
+  static PopoverArrowDirection = {
     ARROW_UP: 1,
     ARROW_DOWN: 2,
     ARROW_LEFT: 4,
@@ -182,7 +183,7 @@ export class Camera {
    * @private
    * @enum {number}
    */
-  public static Direction = {
+  static Direction = {
     /** Use the back-facing camera */
     BACK: 0,
     /** Use the front-facing camera */
@@ -191,8 +192,8 @@ export class Camera {
 
   /**
    * Take a picture or video, or load one from the library.
-   * @param {CameraOptions?} options Options that you want to pass to the camera. Encoding type, quality, etc. Optional
-   * @return {Promise} Returns a Promise that resolves with Base64 encoding of the image data, or the image file URI, depending on cameraOptions, otherwise rejects with an error.
+   * @param {CameraOptions?} options optional. Options that you want to pass to the camera. Encoding type, quality, etc. Platform-specific quirks are described in the [Cordova plugin docs](https://github.com/apache/cordova-plugin-camera#cameraoptions-errata-).
+   * @returns {Promise<any>} Returns a Promise that resolves with Base64 encoding of the image data, or the image file URI, depending on cameraOptions, otherwise rejects with an error.
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -202,7 +203,7 @@ export class Camera {
   /**
    * Remove intermediate image files that are kept in temporary storage after calling camera.getPicture.
    * Applies only when the value of Camera.sourceType equals Camera.PictureSourceType.CAMERA and the Camera.destinationType equals Camera.DestinationType.FILE_URI.
-   * @return Returns a Promise
+   * @returns {Promise<any>}
    */
   @Cordova({
     platforms: ['iOS']

src/plugins/card-io.ts

@@ -25,6 +25,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'CardIO',
   plugin: 'https://github.com/card-io/card.io-Cordova-Plugin',
   pluginRef: 'CardIO',
   repo: 'https://github.com/card-io/card.io-Cordova-Plugin',
@@ -35,6 +36,7 @@ export class CardIO {
    * Check whether card scanning is currently available. (May vary by
    * device, OS version, network connectivity, etc.)
    *
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static canScan(): Promise<boolean> { return; }
@@ -42,12 +44,14 @@ export class CardIO {
   /**
    * Scan a credit card with card.io.
    * @param {CardIOOptions} options Options for configuring the plugin
+   * @returns {Promise<any>}
    */
   @Cordova()
-  static scan(options?: CardIOOptions): Promise<any> { return; }
+  static scan(options?: CardIOOptions): Promise<CardIOResponse> { return; }
 
   /**
    * Retrieve the version of the card.io library. Useful when contacting support.
+   * @returns {Promise<string>}
    */
   @Cordova()
   static version(): Promise<string> { return; }
@@ -56,7 +60,7 @@ export class CardIO {
 
 export interface CardIOOptions {
   requireExpiry?: boolean;
-  requireCCV?: boolean;
+  requireCVV?: boolean;
   requirePostalCode?: boolean;
   supressManual?: boolean;
   restrictPostalCodeToNumericOnly?: boolean;
@@ -72,3 +76,14 @@ export interface CardIOOptions {
   useCardIOLogo?: boolean;
   supressScan?: boolean;
 }
+
+export interface CardIOResponse {
+  cardType: string;
+  redactedCardNumber: string;
+  cardNumber: string;
+  expiryMonth: number;
+  expiryYear: number;
+  cvv: string;
+  postalCode: string;
+  cardholderName: string;
+}

src/plugins/clipboard.ts

@@ -28,6 +28,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Clipboard',
   plugin: 'https://github.com/VersoSolutions/CordovaClipboard.git',
   pluginRef: 'cordova.plugins.clipboard',
   repo: 'https://github.com/VersoSolutions/CordovaClipboard',
@@ -38,14 +39,14 @@ export class Clipboard {
   /**
    * Copies the given text
    * @param {string} text Text that gets copied on the system clipboard
-   * @returns {Promise<T>} Returns a promise after the text has been copied
+   * @returns {Promise<any>} Returns a promise after the text has been copied
    */
   @Cordova()
   static copy(text: string): Promise<any> { return; }
 
   /**
    * Pastes the text stored in clipboard
-   * @returns {Promise<T>} Returns a promise after the text has been pasted
+   * @returns {Promise<any>} Returns a promise after the text has been pasted
    */
   @Cordova()
   static paste(): Promise<any> { return; }

src/plugins/code-push.ts

@@ -420,6 +420,7 @@ export interface DownloadProgress {
  * ```
  */
 @Plugin({
+  pluginName: 'CodePush',
   plugin: 'cordova-plugin-code-push',
   pluginRef: 'codePush',
   repo: 'https://github.com/Microsoft/cordova-plugin-code-push',
@@ -432,6 +433,7 @@ export class CodePush {
    *
    * @param packageSuccess Callback invoked with the currently deployed package information.
    * @param packageError Optional callback invoked in case of an error.
+   * @returns {Promise<ILocalPackage>}
    */
   @Cordova()
   static getCurrentPackage(): Promise<ILocalPackage> {
@@ -441,6 +443,7 @@ export class CodePush {
   /**
    * Gets the pending package information, if any. A pending package is one that has been installed but the application still runs the old code.
    * This happends only after a package has been installed using ON_NEXT_RESTART or ON_NEXT_RESUME mode, but the application was not restarted/resumed yet.
+   * @returns {Promise<ILocalPackage>}
    */
   @Cordova()
   static getPendingPackage(): Promise<ILocalPackage> {
@@ -455,6 +458,7 @@ export class CodePush {
    *                     A null package means the application is up to date for the current native application version.
    * @param queryError Optional callback invoked in case of an error.
    * @param deploymentKey Optional deployment key that overrides the config.xml setting.
+   * @returns {Promise<IRemotePackage>}
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -470,6 +474,7 @@ export class CodePush {
    *
    * @param notifySucceeded Optional callback invoked if the plugin was successfully notified.
    * @param notifyFailed Optional callback invoked in case of an error during notifying the plugin.
+   * @returns {Promise<void>}
    */
   @Cordova()
   static notifyApplicationReady(): Promise<void> {
@@ -479,6 +484,7 @@ export class CodePush {
   /**
    * Reloads the application. If there is a pending update package installed using ON_NEXT_RESTART or ON_NEXT_RESUME modes, the update
    * will be immediately visible to the user. Otherwise, calling this function will simply reload the current version of the application.
+   * @returns {Promise<void>}
    */
   @Cordova()
   static restartApplication(): Promise<void> {
@@ -503,6 +509,7 @@ export class CodePush {
    * @param syncCallback Optional callback to be called with the status of the sync operation.
    * @param syncOptions Optional SyncOptions parameter configuring the behavior of the sync operation.
    * @param downloadProgress Optional callback invoked during the download process. It is called several times with one DownloadProgress parameter.
+   * @returns {Observable<SyncStatus>}
    *
    */
   @Cordova({

src/plugins/contacts.ts

@@ -80,7 +80,7 @@ export class Contact implements IContactProperties {
 /**
  * @private
  */
-interface IContactError {
+export interface IContactError {
   /** Error code */
   code: number;
   /** Error message */
@@ -90,7 +90,7 @@ interface IContactError {
 /**
  * @private
  */
-declare var ContactError: {
+export declare var ContactError: {
   new (code: number): IContactError;
   UNKNOWN_ERROR: number;
   INVALID_ARGUMENT_ERROR: number;
@@ -316,6 +316,7 @@ export class ContactFindOptions implements IContactFindOptions {
  * ContactAddress
  */
 @Plugin({
+  pluginName: 'Contacts',
   plugin: 'cordova-plugin-contacts',
   pluginRef: 'navigator.contacts',
   repo: 'https://github.com/apache/cordova-plugin-contacts'
@@ -323,7 +324,7 @@ export class ContactFindOptions implements IContactFindOptions {
 export class Contacts {
   /**
    * Create a single contact.
-   * @return Returns a object Contact
+   * @returns {Contact} Returns a Contact object
    */
   static create(): Contact {
     return new Contact();
@@ -341,7 +342,7 @@ export class Contacts {
    *   desiredFields: Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields. (DOMString[]) [Optional]
    *   hasPhoneNumber(Android only): Filters the search to only return contacts with a phone number informed. (Boolean) (Default: false)
    *
-   * @return Returns a Promise that resolves with the search results (an array of Contact objects)
+   * @returns {Promise<any>} Returns a Promise that resolves with the search results (an array of Contact objects)
    */
   @Cordova({
     successIndex: 1,
@@ -351,7 +352,7 @@ export class Contacts {
 
   /**
    * Select a single Contact.
-   * @return Returns a Promise that resolves with the selected Contact
+   * @returns {Promise<any>} Returns a Promise that resolves with the selected Contact
    */
   @Cordova()
   static pickContact(): Promise<any> { return; }

src/plugins/crop.ts

@@ -16,6 +16,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Crop',
   plugin: 'cordova-plugin-crop',
   pluginRef: 'plugins',
   repo: 'https://github.com/jeduan/cordova-plugin-crop'
@@ -25,7 +26,7 @@ export class Crop {
    * Crops an image
    * @param pathToImage
    * @param options
-   * @return {Promise<string>} Returns a promise that resolves with the new image path, or rejects if failed to crop.
+   * @returns {Promise<string>} Returns a promise that resolves with the new image path, or rejects if failed to crop.
    */
   @Cordova({
     callbackOrder: 'reverse'

src/plugins/datepicker.ts

@@ -59,7 +59,7 @@ export interface DatePickerOptions {
   /**
    * Shows or hide dates earlier then selected date.
    */
-  allowOldDate?: boolean;
+  allowOldDates?: boolean;
   /**
    * Shows or hide dates after selected date.
    */
@@ -107,10 +107,6 @@ export interface DatePickerOptions {
  * @description
  * The DatePicker plugin allows the user to fetch date or time using native dialogs.
  *
- * Platforms supported: iOS, Android, Windows
- *
- * Requires Cordova plugin: `cordova-plugin-datepicker`. For more info, please see the [DatePicker plugin docs](https://github.com/VitaliiBlagodir/cordova-plugin-datepicker).
- *
  * @usage
  * ```typescript
  * import { DatePicker } from 'ionic-native';
@@ -128,9 +124,11 @@ export interface DatePickerOptions {
  * DatePickerOptions
  */
 @Plugin({
+  pluginName: 'DatePicker',
   plugin: 'cordova-plugin-datepicker',
   pluginRef: 'datePicker',
-  repo: 'https://github.com/VitaliiBlagodir/cordova-plugin-datepicker'
+  repo: 'https://github.com/VitaliiBlagodir/cordova-plugin-datepicker',
+  platforms: ['Android', 'iOS', 'Windows']
 })
 export class DatePicker {
 

src/plugins/dbmeter.ts

@@ -31,6 +31,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'DBMeter',
   plugin: 'cordova-plugin-dbmeter',
   pluginRef: 'DBMeter',
   repo: 'https://github.com/akofman/cordova-plugin-dbmeter',
@@ -40,7 +41,7 @@ export class DBMeter {
 
   /**
    * Starts listening
-   * @return {Observable<string>} Returns an observable. Subscribe to start listening. Unsubscribe to stop listening.
+   * @returns {Observable<any>} Returns an observable. Subscribe to start listening. Unsubscribe to stop listening.
    */
   @Cordova({
     observable: true,
@@ -57,14 +58,14 @@ export class DBMeter {
 
   /**
    * Check if the DB Meter is listening
-   * @return {Promise<boolean>} Returns a promise that resolves with a boolean that tells us whether the DB meter is listening
+   * @returns {Promise<boolean>} Returns a promise that resolves with a boolean that tells us whether the DB meter is listening
    */
   @Cordova()
   static isListening(): Promise<boolean> { return; }
 
   /**
    * Delete the DB Meter instance
-   * @return {Promise<any>} Returns a promise that will resolve if the instance has been deleted, and rejects if errors occur.
+   * @returns {Promise<any>} Returns a promise that will resolve if the instance has been deleted, and rejects if errors occur.
    */
   @Cordova()
   static delete(): Promise<any> { return; }

src/plugins/deeplinks.ts

@@ -28,11 +28,38 @@ export interface DeeplinkMatch {
  *
  * @usage
  * ```typescript
- * import { IonicDeeplinks } from 'ionic-native';
+ * import { Deeplinks } from 'ionic-native';
  *
+ * Deeplinks.route({
+      '/about-us': AboutPage,
+      '/universal-links-test': AboutPage,
+      '/products/:productId': ProductPage
+    }).subscribe((match) => {
+      // match.$route - the route we matched, which is the matched entry from the arguments to route()
+      // match.$args - the args passed in the link
+      // match.$link - the full link data
+      console.log('Successfully matched route', match);
+    }, (nomatch) => {
+      // nomatch.$link - the full link data
+      console.error('Got a deeplink that didn\'t match', nomatch);
+    });
  * ```
+ *
+ * Alternatively, if you're using Ionic 2, there's a convenience method that takes a reference to a `NavController` and handles
+ * the actual navigation for you:
+ *
+ * ```typescript
+ * Deeplinks.routeWithNavController(this.navController, {
+    '/about-us': AboutPage,
+    '/products/:productId': ProductPage
+  });
+ * ```
+ *
+ * See the [Ionic 2 Deeplinks Demo](https://github.com/driftyco/ionic2-deeplinks-demo/blob/master/app/app.ts) for an example of how to
+ * retrieve the `NavController` reference at runtime.
  */
 @Plugin({
+  pluginName: 'Deeplinks',
   plugin: 'ionic-plugin-deeplinks',
   pluginRef: 'IonicDeeplink',
   repo: 'https://github.com/driftyco/ionic-plugin-deeplinks',
@@ -48,8 +75,8 @@ export class Deeplinks {
    * paths takes an object of the form { 'path': data }. If a deeplink
    * matches the path, the resulting path-data pair will be returned in the
    * promise result which you can then use to navigate in the app as you see fit.
-   * @returns {Promise} Returns a Promise that resolves when a deeplink comes through, and
-   * is rejected if a deeplink comes through that does not match a given path.
+   * @returns {Observable<DeeplinkMatch>} Returns an Observable that is called each time a deeplink comes through, and
+   * errors if a deeplink comes through that does not match a given path.
    */
   @Cordova({
     observable: true
@@ -71,8 +98,8 @@ export class Deeplinks {
    * matches the path, the resulting path-data pair will be returned in the
    * promise result which you can then use to navigate in the app as you see fit.
    *
-   * @returns {Promise} Returns a Promise that resolves when a deeplink comes through, and
-   * is rejected if a deeplink comes through that does not match a given path.
+   * @returns {Observable<DeeplinkMatch} Returns an Observable that resolves each time a deeplink comes through, and
+   * errors if a deeplink comes through that does not match a given path.
    */
   @Cordova({
     observable: true

src/plugins/device-feedback.ts

@@ -1,4 +1,4 @@
-import {Plugin, Cordova} from './plugin';
+import { Plugin, Cordova } from './plugin';
 /**
  * @name DeviceFeedback
  * @description
@@ -25,6 +25,7 @@ import {Plugin, Cordova} from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'DeviceFeedback',
   plugin: 'cordova-plugin-velda-devicefeedback',
   pluginRef: 'plugins.deviceFeedback',
   repo: 'https://github.com/VVelda/device-feedback',
@@ -47,6 +48,7 @@ export class DeviceFeedback {
 
   /**
    * Check if haptic and acoustic feedback is enabled by user settings.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static isFeedbackEnabled(): Promise<{ haptic: boolean; acoustic: boolean; }> { return; }

src/plugins/device.ts

@@ -41,6 +41,7 @@ export interface Device {
  * ```
  */
 @Plugin({
+  pluginName: 'Device',
   plugin: 'cordova-plugin-device',
   pluginRef: 'device',
   repo: 'https://github.com/apache/cordova-plugin-device'
@@ -50,9 +51,9 @@ export class Device {
   /**
    * Returns the whole device object.
    *
-   * @returns {Object} The device object.
+   * @returns {Device} The device object.
    */
   @CordovaProperty
-  static get device() { return window.device; }
+  static get device(): Device { return window.device; }
 
 }

src/plugins/deviceaccounts.ts

@@ -2,6 +2,7 @@ import { Cordova, Plugin } from './plugin';
 
 
 @Plugin({
+  pluginName: 'DeviceAccounts',
   plugin: 'https://github.com/loicknuchel/cordova-device-accounts.git',
   pluginRef: 'plugins.DeviceAccounts',
   repo: 'https://github.com/loicknuchel/cordova-device-accounts',
@@ -11,24 +12,28 @@ export class DeviceAccounts {
 
   /**
    *  Gets all accounts registered on the Android Device
+   * @returns {Promise<any>}
    */
   @Cordova()
   static get(): Promise<any> { return; }
 
   /**
    *  Get all accounts registered on Android device for requested type
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getByType(type: string): Promise<any> { return; }
 
   /**
    *  Get all emails registered on Android device (accounts with 'com.google' type)
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getEmails(): Promise<any> { return; }
 
   /**
    *  Get the first email registered on Android device
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getEmail(): Promise<any> { return; }

src/plugins/devicemotion.ts

@@ -62,6 +62,7 @@ export interface AccelerometerOptions {
  * ```
  */
 @Plugin({
+  pluginName: 'DeviceMotion',
   plugin: 'cordova-plugin-device-motion',
   pluginRef: 'navigator.accelerometer',
   repo: 'https://github.com/apache/cordova-plugin-device-motion'
@@ -70,7 +71,7 @@ export class DeviceMotion {
 
   /**
    * Get the current acceleration along the x, y, and z axes.
-   * @returns {Promise<any>} Returns object with x, y, z, and timestamp properties
+   * @returns {Promise<AccelerationData>} Returns object with x, y, z, and timestamp properties
    */
   @Cordova()
   static getCurrentAcceleration(): Promise<AccelerationData> { return; }

src/plugins/deviceorientation.ts

@@ -67,6 +67,7 @@ export interface CompassOptions {
  * ```
  */
 @Plugin({
+  pluginName: 'DeviceOrientation',
   plugin: 'cordova-plugin-device-orientation',
   pluginRef: 'navigator.compass',
   repo: 'https://github.com/apache/cordova-plugin-device-orientation'

src/plugins/diagnostic.ts

@@ -29,6 +29,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Diagnostic',
   plugin: 'cordova.plugins.diagnostic',
   pluginRef: 'cordova.plugins.diagnostic',
   repo: 'https://github.com/dpa99c/cordova-diagnostic-plugin'
@@ -173,6 +174,7 @@ export class Diagnostic {
    * Enables/disables WiFi on the device.
    * Requires `ACCESS_WIFI_STATE` and `CHANGE_WIFI_STATE` permissions on Android
    * @param state {boolean}
+   * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
   static setWifiState(state: boolean): Promise<any> { return; }
@@ -181,6 +183,7 @@ export class Diagnostic {
    * Enables/disables Bluetooth on the device.
    * Requires `BLUETOOTH` and `BLUETOOTH_ADMIN` permissions on Android
    * @param state {boolean}
+   * @returns {Promise<any>}
    */
   @Cordova({ callbackOrder: 'reverse', platforms: ['Android', 'Windows 10'] })
   static setBluetoothState(state: boolean): Promise<any> { return; }
@@ -214,7 +217,7 @@ export class Diagnostic {
    * mode - (iOS-only / optional) location authorization mode: "always" or "when_in_use". If not specified, defaults to "when_in_use".
    * @returns {Promise<any>}
    */
-  @Cordova({ platforms: ['Android', 'iOS'] })
+  @Cordova({ platforms: ['Android', 'iOS'], callbackOrder: 'reverse' })
   static requestLocationAuthorization(mode?: string): Promise<any> { return; }
 
   /**
@@ -296,7 +299,7 @@ export class Diagnostic {
    *
    * Notes for iOS:
    *   - This relates to Calendar Events (not Calendar Reminders)
-   * @returns {Promise<any>}
+   * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android', 'iOS'] })
   static isCalendarAuthorized(): Promise<boolean> { return; }
@@ -365,7 +368,7 @@ export class Diagnostic {
   /**
    * Checks if high-accuracy locations are available to the app from GPS hardware.
    * Returns true if Location mode is enabled and is set to "Device only" or "High accuracy" AND if the app is authorised to use location.
-   * @returns {Promise<any>}
+   * @returns {Promise<boolean>}
    */
   @Cordova({ platforms: ['Android'] })
   static isGpsLocationAvailable(): Promise<boolean> { return; }
@@ -375,6 +378,7 @@ export class Diagnostic {
    *   Returns true if Location mode is enabled and is set to either:
    *   - Device only = GPS hardware only (high accuracy)
    *   - High accuracy = GPS hardware, network triangulation and Wifi network IDs (high and low accuracy)
+   * @returns {Promise<any>}
    */
   @Cordova({ platforms: ['Android'] })
   static isGpsLocationEnabled(): Promise<any> { return; }
@@ -440,6 +444,24 @@ export class Diagnostic {
   @Cordova({ platforms: ['Android'], callbackOrder: 'reverse' })
   static requestRuntimePermissions(permissions: any[]): Promise<any> { return; }
 
+  /**
+   * Indicates if the plugin is currently requesting a runtime permission via the native API.
+   * Note that only one request can be made concurrently because the native API cannot handle concurrent requests,
+   * so the plugin will invoke the error callback if attempting to make more than one simultaneous request.
+   * Multiple permission requests should be grouped into a single call since the native API is setup to handle batch requests of multiple permission groups.
+   * @returns {boolean}
+   */
+  @Cordova({ sync: true })
+  static isRequestingPermission(): boolean { return; }
+
+  /**
+   * Registers a function to be called when a runtime permission request has completed.
+   * Pass in a falsey value to de-register the currently registered function.
+   * @param handler {Function}
+   */
+  @Cordova({ sync: true })
+  static registerPermissionRequestCompleteHandler(handler: Function): void { return; }
+
   /**
    * Checks if the device setting for Bluetooth is switched on.
    * This requires `BLUETOOTH` permission on Android

src/plugins/dialogs.ts

@@ -32,6 +32,7 @@ export interface PromptCallback {
  * ```
  */
 @Plugin({
+  pluginName: 'Dialogs',
   plugin: 'cordova-plugin-dialogs',
   pluginRef: 'navigator.notification',
   repo: 'https://github.com/apache/cordova-plugin-dialogs.git'

src/plugins/emailcomposer.ts

@@ -44,6 +44,7 @@ declare var cordova: any;
  * ```
  */
 @Plugin({
+  pluginName: 'EmailComposer',
   plugin: 'cordova-plugin-email',
   pluginRef: 'cordova.plugins.email',
   repo: 'https://github.com/hypery2k/cordova-email-plugin',
@@ -55,7 +56,7 @@ export class EmailComposer {
    * Verifies if sending emails is supported on the device.
    *
    * @param app {string?} An optional app id or uri scheme.
-   * @returns {Promise<boolean>} Resolves if available, rejects if not available
+   * @returns {Promise<any>} Resolves if available, rejects if not available
    */
   static isAvailable(app?: string): Promise<any> {
     return new Promise<boolean>((resolve, reject) => {

src/plugins/estimote-beacons.ts

@@ -9,6 +9,7 @@ import { Observable } from 'rxjs/Observable';
  *
  */
 @Plugin({
+  pluginName: 'EstimoteBeacons',
   plugin: 'cordova-plugin-estimote',
   pluginRef: 'estimote.beacons',
   repo: 'https://github.com/evothings/phonegap-estimotebeacons',
@@ -87,7 +88,7 @@ export class EstimoteBeacons {
    * ```
    *
    * @see {@link https://community.estimote.com/hc/en-us/articles/203393036-Estimote-SDK-and-iOS-8-Location-Services|Estimote SDK and iOS 8 Location Services}
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static requestWhenInUseAuthorization(): Promise<any> { return; }
@@ -108,7 +109,7 @@ export class EstimoteBeacons {
    * ```
    *
    * @see {@link https://community.estimote.com/hc/en-us/articles/203393036-Estimote-SDK-and-iOS-8-Location-Services|Estimote SDK and iOS 8 Location Services}
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static requestAlwaysAuthorization(): Promise<any> { return; }
@@ -127,7 +128,7 @@ export class EstimoteBeacons {
    * ```
    *
    * @see {@link https://community.estimote.com/hc/en-us/articles/203393036-Estimote-SDK-and-iOS-8-Location-Services|Estimote SDK and iOS 8 Location Services}
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static authorizationStatus(): Promise<any> { return; }
@@ -147,7 +148,7 @@ export class EstimoteBeacons {
    * @param major {number} Major value to advertise (mandatory).
    * @param minor {number} Minor value to advertise (mandatory).
    * @param regionId {string} Identifier of the region used to advertise (mandatory).
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova({
     clearFunction: 'stopAdvertisingAsBeacon'
@@ -165,7 +166,7 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopAdvertisingAsBeacon().then((result) => { console.log('Beacon stopped'); });
    * }, 5000);
    * ```
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stopAdvertisingAsBeacon(): Promise<any> { return; }
@@ -180,7 +181,7 @@ export class EstimoteBeacons {
    * EstimoteBeacons.enableAnalytics(true).then(() => { console.log('Analytics enabled'); });
    * ```
    * @param enable {number} Boolean value to turn analytics on or off (mandatory).
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static enableAnalytics(enable: boolean): Promise<any> { return; }
@@ -194,7 +195,7 @@ export class EstimoteBeacons {
    * ```
    * EstimoteBeacons.isAnalyticsEnabled().then((enabled) => { console.log('Analytics enabled: ' + enabled); });
    * ```
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static isAnalyticsEnabled(): Promise<any> { return; }
@@ -208,7 +209,7 @@ export class EstimoteBeacons {
    * ```
    * EstimoteBeacons.isAuthorized().then((isAuthorized) => { console.log('App ID and App Token is set: ' + isAuthorized); });
    * ```
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static isAuthorized(): Promise<any> { return; }
@@ -224,7 +225,7 @@ export class EstimoteBeacons {
    * ```
    * @param appID {string} The App ID (mandatory).
    * @param appToken {string} The App Token (mandatory).
-   * @return Returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setupAppIDAndAppToken(appID: string, appToken: string): Promise<any> { return; }
@@ -242,7 +243,7 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopEstimoteBeaconDiscovery().then(() => { console.log('scan stopped'); });
    * }, 5000);
    * ```
-   * @return Returns an Observable that notifies of each beacon discovered.
+   * @returns {Observable<any>} Returns an Observable that notifies of each beacon discovered.
    */
   @Cordova({
     observable: true,
@@ -262,7 +263,7 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopEstimoteBeaconDiscovery().then(() => { console.log('scan stopped'); });
    * }, 5000);
    * ```
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stopEstimoteBeaconDiscovery(): Promise<any> { return; }
@@ -281,7 +282,7 @@ export class EstimoteBeacons {
    * }, 5000);
    * ```
    * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
-   * @return Returns an Observable that notifies of each beacon discovered.
+   * @returns {Observable<any>} Returns an Observable that notifies of each beacon discovered.
    */
   @Cordova({
     observable: true,
@@ -304,7 +305,7 @@ export class EstimoteBeacons {
    * }, 5000);
    * ```
    * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
@@ -315,6 +316,7 @@ export class EstimoteBeacons {
    * {@link EstimoteBeacons.startRangingBeaconsInRegion}.
    * To use secure beacons set the App ID and App Token using
    * {@link EstimoteBeacons.setupAppIDAndAppToken}.
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true,
@@ -327,6 +329,7 @@ export class EstimoteBeacons {
    * Stop ranging secure beacons. Available on iOS.
    * This function has the same parameters/behaviour as
    * {@link EstimoteBeacons.stopRangingBeaconsInRegion}.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
@@ -346,7 +349,7 @@ export class EstimoteBeacons {
    * are inside a region when the user turns display on, see
    * {@link https://developer.apple.com/library/prerelease/ios/documentation/CoreLocation/Reference/CLBeaconRegion_class/index.html#//apple_ref/occ/instp/CLBeaconRegion/notifyEntryStateOnDisplay|iOS documentation}
    * for further details (optional, defaults to false, iOS only).
-   * @return Returns an Observable that notifies of each region state discovered.
+   * @returns {Observable<any>} Returns an Observable that notifies of each region state discovered.
    */
   @Cordova({
     observable: true,
@@ -366,7 +369,7 @@ export class EstimoteBeacons {
    * EstimoteBeacons.stopMonitoringForRegion(region).then(() => { console.log('monitoring is stopped'); });
    * ```
    * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
@@ -380,6 +383,7 @@ export class EstimoteBeacons {
    * @see {@link EstimoteBeacons.startMonitoringForRegion}
    * @param region {EstimoteBeaconRegion} Region
    * @param notifyEntryStateOnDisplay {boolean}
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true,
@@ -395,7 +399,8 @@ export class EstimoteBeacons {
   * Stop monitoring secure beacons. Available on iOS.
   * This function has the same parameters/behaviour as
   * {@link EstimoteBeacons.stopMonitoringForRegion}.
-   * @param region {EstimoteBeaconRegion} Region
+  * @param region {EstimoteBeaconRegion} Region
+  * @returns {Promise<any>}
   */
   @Cordova()
   static stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
@@ -415,7 +420,7 @@ export class EstimoteBeacons {
    *   });
    * ```
    * @param beacon {Beacon} Beacon to connect to.
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static connectToBeacon(beacon: any): Promise<any> { return; }
@@ -427,7 +432,7 @@ export class EstimoteBeacons {
    * ```
    * EstimoteBeacons.disconnectConnectedBeacon();
    * ```
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static disconnectConnectedBeacon(): Promise<any> { return; }
@@ -441,7 +446,7 @@ export class EstimoteBeacons {
    * EstimoteBeacons.writeConnectedProximityUUID(ESTIMOTE_PROXIMITY_UUID);
    *
    * @param uuid {string} String to write as new UUID
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static writeConnectedProximityUUID(uuid: any): Promise<any> { return; }
@@ -455,7 +460,7 @@ export class EstimoteBeacons {
    * EstimoteBeacons.writeConnectedMajor(1);
    *
    * @param major {number} number to write as new major
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static writeConnectedMajor(major: number): Promise<any> { return; }
@@ -469,7 +474,7 @@ export class EstimoteBeacons {
    * EstimoteBeacons.writeConnectedMinor(1);
    *
    * @param minor {number} number to write as new minor
-   * @return returns a Promise.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static writeConnectedMinor(minor: number): Promise<any> { return; }

src/plugins/facebook.ts

@@ -78,6 +78,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
+  pluginName: 'Facebook',
   plugin: 'cordova-plugin-facebook4',
   pluginRef: 'facebookConnectPlugin',
   repo: 'https://github.com/jeduan/cordova-plugin-facebook4',
@@ -89,6 +90,7 @@ export class Facebook {
    * Browser wrapper
    * @param {number} appId Your Facebook AppID from their dashboard
    * @param {string} version The version of API you may want to use. Optional
+   * @returns {Promise<any>}
    */
   @Cordova()
   static browserInit(appId: number, version?: string): Promise<any> {
@@ -113,7 +115,7 @@ export class Facebook {
    * ```
    *
    * @param {string[]}  permissions List of [permissions](https://developers.facebook.com/docs/facebook-login/permissions) this app has upon logging in.
-   * @return {Promise<FacebookLoginResponse>} Returns a Promise that resolves with a status object if login succeeds, and rejects if login fails.
+   * @returns {Promise<FacebookLoginResponse>} Returns a Promise that resolves with a status object if login succeeds, and rejects if login fails.
    */
   @Cordova()
   static login(permissions: string[]): Promise<FacebookLoginResponse> { return; }
@@ -122,7 +124,7 @@ export class Facebook {
    * Logout of Facebook.
    *
    * For more info see the [Facebook docs](https://developers.facebook.com/docs/reference/javascript/FB.logout)
-   * @return Returns a Promise that resolves on a successful logout, and rejects if logout fails.
+   * @returns {Promise<any>} Returns a Promise that resolves on a successful logout, and rejects if logout fails.
    */
   @Cordova()
   static logout(): Promise<any> { return; }
@@ -151,7 +153,7 @@ export class Facebook {
    *
    * For more information see the [Facebook docs](https://developers.facebook.com/docs/reference/javascript/FB.getLoginStatus)
    *
-   * @return Returns a Promise that resolves with a status, or rejects with an error
+   * @returns {Promise<any>} Returns a Promise that resolves with a status, or rejects with an error
    */
   @Cordova()
   static getLoginStatus(): Promise<any> { return; }
@@ -159,7 +161,7 @@ export class Facebook {
   /**
    * Get a Facebook access token for using Facebook services.
    *
-   * @return Returns a Promise that resolves with an access token, or rejects with an error
+   * @returns {Promise<string>} Returns a Promise that resolves with an access token, or rejects with an error
    */
   @Cordova()
   static getAccessToken(): Promise<string> { return; }
@@ -178,8 +180,8 @@ export class Facebook {
    * ```
    *
    * For more options see the [Cordova plugin docs](https://github.com/jeduan/cordova-plugin-facebook4#show-a-dialog) and the [Facebook docs](https://developers.facebook.com/docs/javascript/reference/FB.ui)
-   * @options {Object}  options The dialog options
-   * @return Returns a Promise that resolves with success data, or rejects with an error
+   * @param {Object} options The dialog options
+   * @returns {Promise<any>} Returns a Promise that resolves with success data, or rejects with an error
    */
   @Cordova()
   static showDialog(options: any): Promise<any> { return; }
@@ -195,7 +197,7 @@ export class Facebook {
    *
    * @param {string}  requestPath Graph API endpoint you want to call
    * @param {string[]}  permissions List of [permissions](https://developers.facebook.com/docs/facebook-login/permissions) for this request.
-   * @return Returns a Promise that resolves with the result of the request, or rejects with an error
+   * @returns {Promise<any>} Returns a Promise that resolves with the result of the request, or rejects with an error
    */
   @Cordova()
   static api(requestPath: string, permissions: string[]): Promise<any> { return; }
@@ -206,7 +208,7 @@ export class Facebook {
    * @param {string}  name Name of the event
    * @param {Object}  [params] An object containing extra data to log with the event
    * @param {number}  [valueToSum] any value to be added to added to a sum on each event
-   * @return
+   * @returns {Promise<any>}
    */
   @Cordova()
   static logEvent(
@@ -220,7 +222,7 @@ export class Facebook {
    *
    * @param {number}  value Value of the purchase.
    * @param {string}  currency The currency, as an [ISO 4217 currency code](http://en.wikipedia.org/wiki/ISO_4217)
-   * @return Returns a Promise
+   * @returns {Promise<any>}
    */
   @Cordova()
   static logPurchase(value: number, currency: string): Promise<any> { return; }
@@ -238,7 +240,7 @@ export class Facebook {
    *   url: [App Link](https://developers.facebook.com/docs/applinks) to your app
    *   picture: image to be displayed in the App Invite dialog
    *
-   * @return Returns a Promise that resolves with the result data, or rejects with an error
+   * @returns {Promise<any>} Returns a Promise that resolves with the result data, or rejects with an error
    */
   @Cordova()
   static appInvite(options: {

src/plugins/file-chooser.ts

@@ -16,6 +16,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'FileChooser',
   plugin: 'http://github.com/don/cordova-filechooser.git',
   pluginRef: 'fileChooser',
   repo: 'https://github.com/don/cordova-filechooser',
@@ -24,6 +25,7 @@ import { Plugin, Cordova } from './plugin';
 export class FileChooser {
   /**
    * Open a file
+   * @returns {Promise<string>}
    */
   @Cordova()
   static open(): Promise<string> { return; }

src/plugins/file-opener.ts

@@ -13,6 +13,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'FileOpener',
   plugin: 'cordova-plugin-file-opener2',
   pluginRef: 'cordova.plugins.fileOpener2',
   repo: 'https://github.com/pwlin/cordova-plugin-file-opener2'
@@ -22,6 +23,7 @@ export class FileOpener {
    * Open an file
    * @param filePath {string} File Path
    * @param fileMIMEType {string} File MIME Type
+   * @returns {Promise<any>}
    */
   @Cordova({
     callbackStyle: 'object',
@@ -33,6 +35,7 @@ export class FileOpener {
   /**
    * Uninstalls a package
    * @param packageId {string}  Package ID
+   * @returns {Promise<any>}
    */
   @Cordova({
     callbackStyle: 'object',
@@ -44,6 +47,7 @@ export class FileOpener {
   /**
    * Check if an app is already installed
    * @param packageId {string} Package ID
+   * @returns {Promise<any>}
    */
   @Cordova({
     callbackStyle: 'object',

src/plugins/file.ts

@@ -25,7 +25,7 @@ export interface Entry {
   /** The full absolute path from the root to the entry. */
   fullPath: string;
   /** The file system on which the entry resides. */
-  fileSystem: FileSystem;
+  filesystem: FileSystem;
   nativeURL: string;
   /**
    * Look up metadata about this entry.
@@ -171,6 +171,7 @@ export interface Flags {
 }
 
 export interface WriteOptions {
+  create?: boolean;
   replace?: boolean;
   append?: boolean;
   truncate?: number; // if present, number of bytes to truncate file to before writing
@@ -337,11 +338,6 @@ declare var FileError: {
   PATH_EXISTS_ERR: number;
 };
 
-let pluginMeta = {
-  plugin: 'cordova-plugin-file',
-  pluginRef: 'cordova.file',
-  repo: 'https://github.com/apache/cordova-plugin-file'
-};
 
 /**
  * @name File
@@ -364,7 +360,12 @@ let pluginMeta = {
  *  Although most of the plugin code was written when an earlier spec was current: http://www.w3.org/TR/2011/WD-file-system-api-20110419/
  *  It also implements the FileWriter spec : http://dev.w3.org/2009/dap/file-system/file-writer.html
  */
-@Plugin(pluginMeta)
+@Plugin({
+  pluginName: 'File',
+  plugin: 'cordova-plugin-file',
+  pluginRef: 'cordova.file',
+  repo: 'https://github.com/apache/cordova-plugin-file'
+})
 export class File {
   static cordovaFileError: {} = {
     1: 'NOT_FOUND_ERR',
@@ -390,7 +391,10 @@ export class File {
   static getFreeDiskSpace(): Promise<number> {
     return new Promise<any>((resolve, reject) => {
       if (!cordova || !cordova.exec) {
-        pluginWarn(pluginMeta);
+        pluginWarn({
+          pluginName: 'File',
+          plugin: 'cordova-plugin-file'
+        });
         reject({ error: 'plugin_not_installed' });
       } else {
         cordova.exec(resolve, reject, 'File', 'getFreeDiskSpace', []);
@@ -403,7 +407,7 @@ export class File {
    *
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} dir Name of directory to check
-   * @return {Promise<boolean|FileError>} Returns a Promise that resolves to true if the directory exists or rejects with an error.
+   * @returns {Promise<boolean|FileError>} Returns a Promise that resolves to true if the directory exists or rejects with an error.
    */
   static checkDir(path: string, dir: string): Promise<boolean|FileError> {
     if ((/^\//.test(dir))) {
@@ -427,7 +431,7 @@ export class File {
    * @param {string} path  Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} dirName Name of directory to create
    * @param {boolean} replace If true, replaces file with same name. If false returns error
-   * @return {Promise<DirectoryEntry|FileError>} Returns a Promise that resolves with a DirectoryEntry or rejects with an error.
+   * @returns {Promise<DirectoryEntry|FileError>} Returns a Promise that resolves with a DirectoryEntry or rejects with an error.
    */
   static createDir(path: string, dirName: string, replace: boolean): Promise<DirectoryEntry|FileError> {
     if ((/^\//.test(dirName))) {
@@ -455,7 +459,7 @@ export class File {
    *
    * @param {string} path The path to the directory
    * @param {string} dirName The directory name
-   * @return {Promise<RemoveResult|FileError>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
+   * @returns {Promise<RemoveResult|FileError>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
    */
   static removeDir(path: string, dirName: string): Promise<RemoveResult|FileError> {
     if ((/^\//.test(dirName))) {
@@ -480,7 +484,7 @@ export class File {
    * @param {string} dirName The source directory name
    * @param {string} newPath The destionation path to the directory
    * @param {string} newDirName The destination directory name
-   * @return {Promise<DirectoryEntry|Entry|FileError>} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error.
+   * @returns {Promise<DirectoryEntry|Entry|FileError>} Returns a Promise that resolves to the new DirectoryEntry object or rejects with an error.
    */
   static moveDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<DirectoryEntry|Entry|FileError> {
     newDirName = newDirName || dirName;
@@ -510,7 +514,7 @@ export class File {
    * @param {string} dirName Name of directory to copy
    * @param {string} newPath Base FileSystem of new location
    * @param {string} newDirName New name of directory to copy to (leave blank to remain the same)
-   * @return {Promise<Entry|FileError>} Returns a Promise that resolves to the new Entry object or rejects with an error.
+   * @returns {Promise<Entry|FileError>} Returns a Promise that resolves to the new Entry object or rejects with an error.
    */
   static copyDir(path: string, dirName: string, newPath: string, newDirName: string): Promise<Entry|FileError> {
     if ((/^\//.test(newDirName))) {
@@ -536,7 +540,7 @@ export class File {
    *
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} dirName Name of directory
-   * @return {Promise<Entry[]>} Returns a Promise that resolves to an array of Entry objects or rejects with an error.
+   * @returns {Promise<Entry[]>} Returns a Promise that resolves to an array of Entry objects or rejects with an error.
    */
   static listDir(path: string, dirName: string): Promise<Entry[]> {
     if ((/^\//.test(dirName))) {
@@ -560,7 +564,7 @@ export class File {
    *
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} dirName Name of directory
-   * @return {Promise<RemoveResult>} Returns a Promise that resolves with a RemoveResult or rejects with an error.
+   * @returns {Promise<RemoveResult>} Returns a Promise that resolves with a RemoveResult or rejects with an error.
    */
   static removeRecursively(path: string, dirName: string): Promise<RemoveResult> {
     if ((/^\//.test(dirName))) {
@@ -583,7 +587,7 @@ export class File {
    *
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} file Name of file to check
-   * @return {Promise<boolean|FileError>} Returns a Promise that resolves with a boolean or rejects with an error.
+   * @returns {Promise<boolean|FileError>} Returns a Promise that resolves with a boolean or rejects with an error.
    */
   static checkFile(path: string, file: string): Promise<boolean|FileError> {
     if ((/^\//.test(file))) {
@@ -612,7 +616,7 @@ export class File {
    * @param {string} path  Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} fileName Name of file to create
    * @param {boolean} replace If true, replaces file with same name. If false returns error
-   * @return {Promise<FileEntry|FileError>} Returns a Promise that resolves to a FileEntry or rejects with an error.
+   * @returns {Promise<FileEntry|FileError>} Returns a Promise that resolves to a FileEntry or rejects with an error.
    */
   static createFile(path: string, fileName: string, replace: boolean): Promise<FileEntry|FileError> {
     if ((/^\//.test(fileName))) {
@@ -640,7 +644,7 @@ export class File {
    *
    * @param {string} path  Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} fileName Name of file to remove
-   * @return {Promise<RemoveResult|FileError>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
+   * @returns {Promise<RemoveResult|FileError>} Returns a Promise that resolves to a RemoveResult or rejects with an error.
    */
   static removeFile(path: string, fileName: string): Promise<RemoveResult|FileError> {
     if ((/^\//.test(fileName))) {
@@ -664,19 +668,19 @@ export class File {
    * @param {string} fileName path relative to base path
    * @param {string | Blob} text content or blob to write
    * @param {WriteOptions} options replace file if set to true. See WriteOptions for more information.
-   * @returns {Promise<void>} Returns a Promise that resolves or rejects with an error.
+   * @returns {Promise<any>} Returns a Promise that resolves to updated file entry or rejects with an error.
    */
   static writeFile(path: string, fileName: string,
-                   text: string | Blob, options: WriteOptions): Promise<void> {
+                   text: string | Blob, options: WriteOptions = {}): Promise<any> {
     if ((/^\//.test(fileName))) {
-      let err = new FileError(5);
+      const err = new FileError(5);
       err.message = 'file-name cannot start with \/';
       return Promise.reject(err);
     }
 
-    let getFileOpts: Flags = {
-      create: true,
-      exclusive: options.replace
+    const getFileOpts: Flags = {
+      create: !options.append,
+      exclusive: !options.replace
     };
 
     return File.resolveDirectoryUrl(path)
@@ -684,10 +688,21 @@ export class File {
         return File.getFile(fse, fileName, getFileOpts);
       })
       .then((fe) => {
-        return File.createWriter(fe);
-      })
-      .then((writer) => {
+        return File.writeFileEntry(fe, text, options);
+      });
+  }
 
+  /** Write content to FileEntry.
+   *
+   * @private
+   * @param {FileEntry} fe file entry object
+   * @param {string | Blob} text content or blob to write
+   * @param {WriteOptions} options replace file if set to true. See WriteOptions for more information.
+   * @returns {Promise<FileEntry>} Returns a Promise that resolves to updated file entry or rejects with an error.
+   */
+  private static writeFileEntry(fe: FileEntry, text: string | Blob, options: WriteOptions) {
+    return File.createWriter(fe)
+      .then((writer) => {
         if (options.append) {
           writer.seek(writer.length);
         }
@@ -697,9 +712,11 @@ export class File {
         }
 
         return File.write(writer, text);
-      });
+      })
+      .then(() => fe);
   }
 
+
   /** Write to an existing file.
    *
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
@@ -708,22 +725,7 @@ export class File {
    * @returns {Promise<void>} Returns a Promise that resolves or rejects with an error.
    */
   static writeExistingFile(path: string, fileName: string, text: string | Blob): Promise<void> {
-    if ((/^\//.test(fileName))) {
-      let err = new FileError(5);
-      err.message = 'file-name cannot start with \/';
-      return Promise.reject(err);
-    }
-
-    return File.resolveDirectoryUrl(path)
-      .then((fse) => {
-        return File.getFile(fse, fileName, {create: false});
-      })
-      .then((fe) => {
-        return File.createWriter(fe);
-      })
-      .then((writer) => {
-        return File.write(writer, text);
-      });
+    return File.writeFile(path, fileName, text, { create: false });
   }
 
   /**
@@ -731,7 +733,7 @@ export class File {
    *
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} file Name of file, relative to path.
-   * @return {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as string or rejects with an error.
+   * @returns {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as string or rejects with an error.
    */
   static readAsText(path: string, file: string): Promise<string|FileError> {
     if ((/^\//.test(file))) {
@@ -772,7 +774,7 @@ export class File {
 
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} file Name of file, relative to path.
-   * @return {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as data URL or rejects with an error.
+   * @returns {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as data URL or rejects with an error.
    */
   static readAsDataURL(path: string, file: string): Promise<string|FileError> {
     if ((/^\//.test(file))) {
@@ -814,7 +816,7 @@ export class File {
 
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} file Name of file, relative to path.
-   * @return {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as string rejects with an error.
+   * @returns {Promise<string|FileError>} Returns a Promise that resolves with the contents of the file as string rejects with an error.
    */
   static readAsBinaryString(path: string, file: string): Promise<string|FileError> {
     if ((/^\//.test(file))) {
@@ -855,7 +857,7 @@ export class File {
 
    * @param {string} path Base FileSystem. Please refer to the iOS and Android filesystems above
    * @param {string} file Name of file, relative to path.
-   * @return {Promise<ArrayBuffer|FileError>} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects with an error.
+   * @returns {Promise<ArrayBuffer|FileError>} Returns a Promise that resolves with the contents of the file as ArrayBuffer or rejects with an error.
    */
   static readAsArrayBuffer(path: string, file: string): Promise<ArrayBuffer|FileError> {
     if ((/^\//.test(file))) {
@@ -898,7 +900,7 @@ export class File {
    * @param {string} fileName Name of file to move
    * @param {string} newPath Base FileSystem of new location
    * @param {string} newFileName New name of file to move to (leave blank to remain the same)
-   * @return {Promise<Entry|FileError>} Returns a Promise that resolves to the new Entry or rejects with an error.
+   * @returns {Promise<Entry|FileError>} Returns a Promise that resolves to the new Entry or rejects with an error.
    */
   static moveFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry|FileError> {
     newFileName = newFileName || fileName;
@@ -928,7 +930,7 @@ export class File {
    * @param {string} fileName Name of file to copy
    * @param {string} newPath Base FileSystem of new location
    * @param {string} newFileName New name of file to copy to (leave blank to remain the same)
-   * @return {Promise<Entry|FileError>} Returns a Promise that resolves to an Entry or rejects with an error.
+   * @returns {Promise<Entry|FileError>} Returns a Promise that resolves to an Entry or rejects with an error.
    */
   static copyFile(path: string, fileName: string, newPath: string, newFileName: string): Promise<Entry|FileError> {
     newFileName = newFileName || fileName;

src/plugins/filepath.ts

@@ -0,0 +1,36 @@
+import { Plugin, Cordova } from './plugin';
+
+declare var window: any;
+
+/**
+ * @name FilePath
+ * @description
+ *
+ * This plugin allows you to resolve the native filesystem path for Android content URIs and is based on code in the aFileChooser library.
+ *
+ * @usage
+ * ```
+ * import {FilePath} from 'ionic-native';
+ *
+ * FilePath.resolveNativePath(path)
+ *   .then(filePath => console.log(filePath);
+ *   .catch(err => console.log(err);
+ *
+ * ```
+ */
+@Plugin({
+  pluginName: 'FilePath',
+  plugin: 'cordova-plugin-filepath',
+  pluginRef: 'window.FilePath',
+  repo: 'https://github.com/hiddentao/cordova-plugin-filepath',
+  platforms: ['Android']
+})
+export class FilePath {
+  /**
+   * Resolve native path for given content URL/path.
+   * @param {String} path  Content URL/path.
+   * @returns {Promise<string>}
+   */
+  @Cordova()
+  static resolveNativePath(path: string): Promise<string> {return; }
+}

src/plugins/filetransfer.ts

@@ -138,7 +138,7 @@ export interface FileTransferError {
  *      fileKey: 'file',
  *      fileName: 'name.jpg',
  *      headers: {}
- *      ..... 
+ *      .....
  *   }
  *   fileTransfer.upload("<file path>", "<api endpoint>", options)
  *    .then((data) => {
@@ -148,10 +148,32 @@ export interface FileTransferError {
  *    })
  * }
  *
+ * // Cordova
+ * declare var cordova: any;
+ *
+ * download() {
+ *   const fileTransfer = new Transfer();
+ *   let url = 'http://www.example.com/file.pdf';
+ *   fileTransfer.download(url, cordova.file.dataDirectory + 'file.pdf').then((entry) => {
+ *     console.log('download complete: ' + entry.toURL());
+ *   }, (error) => {
+ *     // handle error
+ *   });
+ * }
+ *
  * ```
  *
+ * Note: You will not see your documents using a file explorer on your device. Use adb:
+ *
+ * ```
+ * adb shell
+ * run-as com.your.app
+ * cd files
+ * ls
+ * ```
  */
 @Plugin({
+  pluginName: 'FileTransfer',
   plugin: 'cordova-plugin-file-transfer',
   pluginRef: 'FileTransfer',
   repo: 'https://github.com/apache/cordova-plugin-file-transfer'
@@ -189,7 +211,7 @@ export class Transfer {
    * @param {string} url  URL of the server to receive the file, as encoded by encodeURI().
    * @param {FileUploadOptions} options  Optional parameters.
    * @param {boolean} trustAllHosts  Optional parameter, defaults to false. If set to true, it accepts all security certificates. This is useful since Android rejects self-signed security certificates. Not recommended for production use. Supported on Android and iOS.
-   * @return Returns a Promise that resolves to a FileUploadResult and rejects with FileTransferError.
+   * @returns {Promise<FileUploadResult>} Returns a Promise that resolves to a FileUploadResult and rejects with FileTransferError.
    */
   @CordovaInstance({
     successIndex: 2,
@@ -206,7 +228,7 @@ export class Transfer {
    * @param {stirng} target  Filesystem url representing the file on the device. For backwards compatibility, this can also be the full path of the file on the device.
    * @param {boolean} trustAllHosts  Optional parameter, defaults to false. If set to true, it accepts all security certificates. This is useful because Android rejects self-signed security certificates. Not recommended for production use. Supported on Android and iOS.
    * @param {object} Optional parameters, currently only supports headers (such as Authorization (Basic Authentication), etc).
-   * @return Returns a Promise that resolves to a FileEntry object.
+   * @returns {Promise<any>} Returns a Promise that resolves to a FileEntry object.
    */
   @CordovaInstance({
     successIndex: 2,

src/plugins/flashlight.ts

@@ -16,6 +16,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Flashlight',
   plugin: 'cordova-plugin-flashlight',
   pluginRef: 'window.plugins.flashlight',
   repo: 'https://github.com/EddyVerbruggen/Flashlight-PhoneGap-Plugin.git'

src/plugins/geofence.ts

@@ -74,6 +74,7 @@ import { Observable } from 'rxjs/Observable';
 declare var window: any;
 
 @Plugin({
+  pluginName: 'Geofence',
   plugin: 'cordova-plugin-geofence',
   pluginRef: 'geofence',
   repo: 'https://github.com/cowbell/cordova-plugin-geofence/',
@@ -93,7 +94,7 @@ export class Geofence {
   /**
    * Initializes the plugin. User will be prompted to allow the app to use location and notifications.
    *
-   * @return {Promise<any>}
+   * @returns {Promise<void>}
    */
   @Cordova()
   static initialize(): Promise<void> { return; };
@@ -101,7 +102,7 @@ export class Geofence {
   /**
    * Adds a new geofence or array of geofences. For geofence object, see above.
    *
-   * @return {Promise<any>}
+   * @returns {Promise<void>}
    */
   @Cordova()
   static addOrUpdate(geofences: Object | Array<Object>): Promise<void> { return; };
@@ -110,7 +111,7 @@ export class Geofence {
    * Removes a geofence or array of geofences. `geofenceID` corresponds to one or more IDs specified when the
    * geofence was created.
    *
-   * @return {Promise<any>}
+   * @returns {Promise<void>}
    */
   @Cordova()
   static remove(geofenceId: string | Array<string>): Promise<void> { return; };
@@ -118,7 +119,7 @@ export class Geofence {
   /**
    * Removes all geofences.
    *
-   * @return {Promise<any>}
+   * @returns {Promise<void>}
    */
   @Cordova()
   static removeAll(): Promise<void> { return; };
@@ -126,7 +127,7 @@ export class Geofence {
   /**
    * Returns an array of geofences currently being monitored.
    *
-   * @return {Promise<Array<string>>}
+   * @returns {Promise<Array<string>>}
    */
   @Cordova()
   static getWatched(): Promise<string> { return; };
@@ -134,7 +135,7 @@ export class Geofence {
   /**
    * Called when a geofence is crossed in the direction specified by `TransitType`.
    *
-   * @return {Promise<any>}
+   * @returns {Observable<any>}
    */
   static onTransitionReceived(): Observable<any> {
 
@@ -146,9 +147,9 @@ export class Geofence {
   }
 
   /**
-   * Called when the user clicks a geofence notification. iOS and Android only.   
+   * Called when the user clicks a geofence notification. iOS and Android only.
    *
-   * @return {Promise<Object>}
+   * @returns {Observable<any>}
    */
   static onNotificationClicked(): Observable<any> {
 

src/plugins/geolocation.ts

@@ -139,6 +139,7 @@ export interface GeolocationOptions {
  * GeolocationOptions
  */
 @Plugin({
+  pluginName: 'Geolocation',
   plugin: 'cordova-plugin-geolocation',
   pluginRef: 'navigator.geolocation',
   repo: 'https://github.com/apache/cordova-plugin-geolocation'
@@ -148,7 +149,7 @@ export class Geolocation {
    * Get the device's current position.
    *
    * @param {GeolocationOptions} options  The [geolocation options](https://developer.mozilla.org/en-US/docs/Web/API/PositionOptions).
-   * @return Returns a Promise that resolves with the [position](https://developer.mozilla.org/en-US/docs/Web/API/Position) of the device, or rejects with an error.
+   * @returns {Promise<Geoposition>} Returns a Promise that resolves with the [position](https://developer.mozilla.org/en-US/docs/Web/API/Position) of the device, or rejects with an error.
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -171,9 +172,9 @@ export class Geolocation {
    * ```
    *
    * @param {GeolocationOptions} options  The [geolocation options](https://developer.mozilla.org/en-US/docs/Web/API/PositionOptions).
-   * @return Returns an Observable that notifies with the [position](https://developer.mozilla.org/en-US/docs/Web/API/Position) of the device, or errors.
+   * @returns {Observable<Geoposition>} Returns an Observable that notifies with the [position](https://developer.mozilla.org/en-US/docs/Web/API/Position) of the device, or errors.
    */
-  static watchPosition(options?: GeolocationOptions): Observable<Geoposition | PositionError> {
+  static watchPosition(options?: GeolocationOptions): Observable<Geoposition> {
     return new Observable<Geoposition>(
       (observer: any) => {
         let watchId = navigator.geolocation.watchPosition(observer.next.bind(observer), observer.next.bind(observer), options);

src/plugins/globalization.ts

@@ -11,6 +11,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Globalization',
   plugin: 'cordova-plugin-globalization',
   pluginRef: 'navigator.globalization',
   repo: 'https://github.com/apache/cordova-plugin-globalization'
@@ -19,14 +20,14 @@ export class Globalization {
 
   /**
    * Returns the BCP-47 compliant language identifier tag to the successCallback with a properties object as a parameter. That object should have a value property with a String value.
-   * @return {Promise<{value: string}>}
+   * @returns {Promise<{value: string}>}
    */
   @Cordova()
   static getPreferredLanguage(): Promise<{ value: string }> { return; }
 
   /**
    * Returns the BCP 47 compliant locale identifier string to the successCallback with a properties object as a parameter.
-   * @return {Promise<{value: string}>}
+   * @returns {Promise<{value: string}>}
    */
   @Cordova()
   static getLocaleName(): Promise<{ value: string }> { return; }
@@ -35,7 +36,7 @@ export class Globalization {
    * Converts date to string
    * @param {Date} date Date you wish to convert
    * @param options Options for the converted date. Length, selector.
-   * @return {Promise<{value: string}>} Returns a promise when the date has been converted.
+   * @returns {Promise<{value: string}>} Returns a promise when the date has been converted.
    */
   @Cordova({
     successIndex: 1,
@@ -47,7 +48,7 @@ export class Globalization {
    * Parses a date formatted as a string, according to the client's user preferences and calendar using the time zone of the client, and returns the corresponding date object.
    * @param {string} dateString Date as a string to be converted
    * @param options Options for the converted date. Length, selector.
-   * @return {Promise<{value: string}>} Returns a promise when the date has been converted.
+   * @returns {Promise<{ year: number, month: number, day: number, hour: number, minute: number, second: number, millisecond: number }>} Returns a promise when the date has been converted.
    */
   @Cordova({
     successIndex: 1,
@@ -58,7 +59,7 @@ export class Globalization {
   /**
    * Returns a pattern string to format and parse dates according to the client's user preferences.
    * @param options Object with the format length and selector
-   * @return {Promise<{value: string}>} Returns a promise.
+   * @returns {Promise<{pattern: string}>} Returns a promise.
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -68,7 +69,7 @@ export class Globalization {
   /**
    * Returns an array of the names of the months or days of the week, depending on the client's user preferences and calendar.
    * @param options Object with type (narrow or wide) and item (month or days).
-   * @return {Promise<{value: string}>} Returns a promise.
+   * @returns {Promise<{value: Array<string>}>} Returns a promise.
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -78,33 +79,34 @@ export class Globalization {
   /**
    * Indicates whether daylight savings time is in effect for a given date using the client's time zone and calendar.
    * @param {data} date Date to process
-   * @returns {Promise<dst>} reutrns a promise with the value
+   * @returns {Promise<{dst: string}>} reutrns a promise with the value
    */
   @Cordova()
   static isDayLightSavingsTime(date: Date): Promise<{ dst: string }> { return; }
 
   /**
    * Returns the first day of the week according to the client's user preferences and calendar.
-   * @returns {Promise<value>} reutrns a promise with the value
+   * @returns {Promise<{value: string}>} returns a promise with the value
    */
   @Cordova()
   static getFirstDayOfWeek(): Promise<{ value: string }> { return; }
 
   /**
    * Returns a number formatted as a string according to the client's user preferences.
-   * @param options
+   * @param numberToConvert {Number} The number to convert
+   * @param options {Object} Object with property `type` that can be set to: decimal, percent, or currency.
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 2
   })
-  static numberToString(options: { type: string }): Promise<{ value: string }> { return; }
+  static numberToString(numberToConvert: number, options: { type: string }): Promise<{ value: string }> { return; }
 
   /**
    *
    * @param {string} stringToConvert String you want to conver to a number
    * @param options  The type of number you want to return. Can be decimal, percent, or currency.
-   * @returns {Promise} Returns a promise with the value.
+   * @returns {Promise<{ value: number | string }>} Returns a promise with the value.
    */
   @Cordova({
     successIndex: 1,
@@ -115,7 +117,7 @@ export class Globalization {
   /**
    * Returns a pattern string to format and parse numbers according to the client's user preferences.
    * @param options Can be decimal, percent, or currency.
-   * @returns {Promise} returns a promise with the value.
+   * @returns {Promise<{ pattern: string, symbol: string, fraction: number, rounding: number, positive: string, negative: string, decimal: string, grouping: string }>}
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -125,7 +127,7 @@ export class Globalization {
   /**
    * Returns a pattern string to format and parse currency values according to the client's user preferences and ISO 4217 currency code.
    * @param {string} currencyCode Currency Code.A
-   * @returns {Promise} returns a promise with the value
+   * @returns {Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }>}
    */
   @Cordova()
   static getCurrencyPattern(currencyCode: string): Promise<{ pattern: string, code: string, fraction: number, rounding: number, decimal: number, grouping: string }> { return; }

src/plugins/google-plus.ts

@@ -12,17 +12,19 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
-    plugin: 'cordova-plugin-googleplus',
-    pluginRef: 'window.plugins.googleplus',
-    repo: 'https://github.com/EddyVerbruggen/cordova-plugin-googleplus',
-    platforms: ['Web', 'Android', 'iOS'],
-    install: 'ionic plugin add cordova-plugin-googleplus --variable REVERSED_CLIENT_ID=myreversedclientid'
+  pluginName: 'GooglePlus',
+  plugin: 'cordova-plugin-googleplus',
+  pluginRef: 'window.plugins.googleplus',
+  repo: 'https://github.com/EddyVerbruggen/cordova-plugin-googleplus',
+  platforms: ['Web', 'Android', 'iOS'],
+  install: 'ionic plugin add cordova-plugin-googleplus --variable REVERSED_CLIENT_ID=myreversedclientid'
 })
 export class GooglePlus {
 
     /**
      * The login function walks the user through the Google Auth process.
      * @param options
+     * @returns {Promise<any>}
      */
     @Cordova()
     static login(options?: any): Promise<any> { return; }
@@ -30,18 +32,21 @@ export class GooglePlus {
     /**
      * You can call trySilentLogin to check if they're already signed in to the app and sign them in silently if they are.
      * @param options
+     * @returns {Promise<any>}
      */
     @Cordova()
     static trySilentLogin(options?: any): Promise<any> { return; }
 
     /**
      * This will clear the OAuth2 token.
+     * @returns {Promise<any>}
      */
     @Cordova()
     static logout(): Promise<any> { return; }
 
     /**
      * This will clear the OAuth2 token, forget which account was used to login, and disconnect that account from the app. This will require the user to allow the app access again next time they sign in. Be aware that this effect is not always instantaneous. It can take time to completely disconnect.
+     * @returns {Promise<any>}
      */
     @Cordova()
     static disconnect(): Promise<any> { return; }

src/plugins/googleanalytics.ts

@@ -13,25 +13,27 @@ declare var window;
  * - (Android) Google Play Services SDK installed via [Android SDK Manager](https://developer.android.com/sdk/installing/adding-packages.html)
  */
 @Plugin({
+  pluginName: 'GoogleAnalytics',
   plugin: 'cordova-plugin-google-analytics',
   pluginRef: 'ga',
   repo: 'https://github.com/danwilson/google-analytics-plugin',
-  platforms: ['Android', 'iOS']
+  platforms: ['Android', 'iOS', 'Browser']
 })
 export class GoogleAnalytics {
   /**
    * In your 'deviceready' handler, set up your Analytics tracker.
    * https://developers.google.com/analytics/devguides/collection/analyticsjs/
    * @param {string}  id  Your Google Analytics Mobile App property
-   * @return {Promise<any>}
+   * @param {number} interval Optional dispatch period in seconds. Defaults to 30.
+   * @returns {Promise<any>}
    */
   @Cordova()
-  static startTrackerWithId(id: string): Promise<any> { return; }
+  static startTrackerWithId(id: string, interval?: number): Promise<any> { return; }
 
   /**
    * Enabling Advertising Features in Google Analytics allows you to take advantage of Remarketing, Demographics & Interests reports, and more
    * @param allow {boolean}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setAllowIDFACollection(allow: boolean): Promise<any> { return; }
@@ -40,7 +42,7 @@ export class GoogleAnalytics {
    * Set a UserId
    * https://developers.google.com/analytics/devguides/collection/analyticsjs/user-id
    * @param {string} id User ID
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setUserId(id: string): Promise<any> { return; }
@@ -48,7 +50,7 @@ export class GoogleAnalytics {
   /**
    * Set a anonymize Ip address
    * @param anonymize {boolean} Set to true to anonymize the IP Address
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setAnonymizeIp(anonymize: boolean): Promise<any> { return; }
@@ -56,7 +58,7 @@ export class GoogleAnalytics {
   /**
    * Sets the app version
    * @param appVersion {string} App version
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setAppVersion(appVersion: string): Promise<any> { return; }
@@ -64,14 +66,14 @@ export class GoogleAnalytics {
   /**
    * Set OptOut
    * @param optout {boolean}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setOptOut(optout: boolean): Promise<any> { return; }
 
   /**
    * Enable verbose logging
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static debugMode(): Promise<any> { return; }
@@ -80,7 +82,7 @@ export class GoogleAnalytics {
    * Track custom metric
    * @param key {string}
    * @param value {any}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 2,
@@ -95,7 +97,7 @@ export class GoogleAnalytics {
    * @param title {string} Screen title
    * @param campaignUrl {string} Campaign url for measuring referrals
    * @param newSession {boolean} Set to true to create a new session
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 3,
@@ -108,7 +110,7 @@ export class GoogleAnalytics {
    * https://developers.google.com/analytics/devguides/platform/customdimsmets
    * @param key {string}
    * @param value {string}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static addCustomDimension(key: number, value: string): Promise<any> { return; }
@@ -121,7 +123,7 @@ export class GoogleAnalytics {
    * @param label {string}
    * @param value {number}
    * @param newSession {boolean} Set to true to create a new session
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 5,
@@ -133,7 +135,7 @@ export class GoogleAnalytics {
    * Track an exception
    * @param description {string}
    * @param fatal {boolean}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static trackException(description: string, fatal: boolean): Promise<any> { return; }
@@ -144,7 +146,7 @@ export class GoogleAnalytics {
    * @param intervalInMilliseconds {number}
    * @param variable {string}
    * @param label {string}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static trackTiming(category: string, intervalInMilliseconds: number, variable: string, label: string): Promise<any> { return; }
@@ -158,7 +160,7 @@ export class GoogleAnalytics {
    * @param tax {number}
    * @param shipping {number}
    * @param currencyCode {string}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static addTransaction(id: string, affiliation: string, revenue: number, tax: number, shipping: number, currencyCode: string): Promise<any> { return; }
@@ -173,7 +175,7 @@ export class GoogleAnalytics {
    * @param {number}  price
    * @param {number}  quantity
    * @param {string}  currencyCode
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static addTransactionItem(id: string, name: string, sku: string, category: string, price: number, quantity: number, currencyCode: string): Promise<any> { return; }
@@ -181,7 +183,7 @@ export class GoogleAnalytics {
   /**
    * Enable/disable automatic reporting of uncaught exceptions
    * @param shouldEnable {boolean}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static enableUncaughtExceptionReporting(shouldEnable: boolean): Promise<any> { return; }

src/plugins/googlemap.ts

@@ -41,62 +41,79 @@ export const GoogleMapsAnimation = {
  * @description This plugin uses the native Google Maps SDK
  * @usage
  * ```
- * import { GoogleMap, GoogleMapsEvent } from 'ionic-native';
+ * import {
+ *  GoogleMap,
+ *  GoogleMapsEvent,
+ *  GoogleMapsLatLng,
+ *  CameraPosition,
+ *  GoogleMapsMarkerOptions,
+ *  GoogleMapsMarker
+ * } from 'ionic-native';
  *
- * // create a new map using element ID
- * let map = new GoogleMap('elementID');
+ * export class MapPage {
+ *  constructor() {}
  *
- * // or create a new map by passing HTMLElement
- * let element: HTMLElement = document.getElementById('elementID');
+ * // Load map only after view is initialize
+ * ngAfterViewInit() {
+ *  this.loadMap();
+ * }
  *
- * // In Angular 2 or Ionic 2, if we have this element in html: <div #map></div>
- * // then we can use @ViewChild to find the element and pass it to GoogleMaps
- * @ViewChild('map') mapElement;
- * let map = new GoogleMap(mapElement);
+ * loadMap() {
+ *  // make sure to create following structure in your view.html file
+ *  // <ion-content>
+ *  //  <div #map id="map"></div>
+ *  // </ion-content>
  *
- * // listen to MAP_READY event
- * map.one(GoogleMapsEvent.MAP_READY).then(() => console.log('Map is ready!'));
+ *  // create a new map by passing HTMLElement
+ *  let element: HTMLElement = document.getElementById('map');
  *
+ *  let map = new GoogleMap(element);
  *
- * // create LatLng object
- * let ionic: GoogleMapsLatLng = new GoogleMapsLatLng(43.0741904,-89.3809802);
+ *  // listen to MAP_READY event
+ *  map.one(GoogleMapsEvent.MAP_READY).then(() => console.log('Map is ready!'));
  *
- * // create CameraPosition
- * let position: CameraPosition = {
- *   target: ionic,
- *   zoom: 18,
- *   tilt: 30
- * };
+ *  // create LatLng object
+ *  let ionic: GoogleMapsLatLng = new GoogleMapsLatLng(43.0741904,-89.3809802);
  *
- * // move the map's camera to position
- * map.moveCamera(position);
+ *  // create CameraPosition
+ *  let position: CameraPosition = {
+ *    target: ionic,
+ *    zoom: 18,
+ *    tilt: 30
+ *  };
  *
- * // create new marker
- * let markerOptions: GoogleMapsMarkerOptions = {
- *   position: ionic,
- *   title: 'Ionic'
- * };
+ *  // move the map's camera to position
+ *  map.moveCamera(position);
  *
- * map.addMarker(markerOptions)
- *   .then((marker: GoogleMapsMarker) => {
- *     marker.showInfoWindow();
- *   });
+ *  // create new marker
+ *  let markerOptions: GoogleMapsMarkerOptions = {
+ *    position: ionic,
+ *    title: 'Ionic'
+ *  };
+ *
+ *  map.addMarker(markerOptions)
+ *    .then((marker: GoogleMapsMarker) => {
+ *       marker.showInfoWindow();
+ *     });
+ *  }
+ *
+ * }
  * ```
  */
-let pluginMap = {
+@Plugin({
+  pluginName: 'GoogleMap',
   pluginRef: 'plugin.google.maps.Map',
   plugin: 'cordova-plugin-googlemaps',
   repo: 'https://github.com/mapsplugin/cordova-plugin-googlemaps',
   install: 'ionic plugin add cordova-plugin-googlemaps --variable API_KEY_FOR_ANDROID="YOUR_ANDROID_API_KEY_IS_HERE" --variable API_KEY_FOR_IOS="YOUR_IOS_API_KEY_IS_HERE"'
-};
-@Plugin(pluginMap)
+})
 export class GoogleMap {
   _objectInstance: any;
 
   /**
    * Checks if a map object has been created and is available.
    *
-   * @return {Promise<boolean>}
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static isAvailable(): Promise<boolean> { return; }
@@ -108,14 +125,17 @@ export class GoogleMap {
       }
       this._objectInstance = plugin.google.maps.Map.getMap(element, options);
     } else {
-      pluginWarn(pluginMap);
+      pluginWarn({
+        pluginName: 'GoogleMap',
+        plugin: 'plugin.google.maps.Map'
+      });
     }
   }
 
   /**
    * Listen to a map event.
    *
-   * @return {Observable<any>}
+   * @returns {Observable<any>}
    */
   on(event: any): Observable<any> {
     if (!this._objectInstance) {
@@ -135,7 +155,7 @@ export class GoogleMap {
   /**
    * Listen to a map event only once.
    *
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   one(event: any): Promise<any> {
     if (!this._objectInstance) {
@@ -155,7 +175,7 @@ export class GoogleMap {
   /**
    * Get the position of the camera.
    *
-   * @return {Promise<CameraPosition>}
+   * @returns {Promise<CameraPosition>}
    */
   @CordovaInstance()
   getCameraPosition(): Promise<CameraPosition> { return; }
@@ -163,7 +183,7 @@ export class GoogleMap {
   /**
    * Get the location of the user.
    *
-   * @return {Promise<MyLocation>}
+   * @returns {Promise<MyLocation>}
    */
   @CordovaInstance()
   getMyLocation(options?: MyLocationOptions): Promise<MyLocation> { return; }
@@ -171,7 +191,7 @@ export class GoogleMap {
   /**
    * Get the visible region.
    *
-   * @return {Promise<VisibleRegion>}
+   * @returns {Promise<VisibleRegion>}
    */
   @CordovaInstance()
   getVisibleRegion(): Promise<VisibleRegion> { return; }
@@ -197,9 +217,15 @@ export class GoogleMap {
   @CordovaInstance({ sync: true })
   setTilt(tiltLevel: number): void { }
 
+  /**
+   * @returns {Promise<any>}
+   */
   @CordovaInstance()
   animateCamera(animateCameraOptions: AnimateCameraOptions): Promise<any> { return; }
 
+  /**
+   * @returns {Promise<any>}
+   */
   @CordovaInstance()
   moveCamera(cameraPosition: CameraPosition): Promise<any> { return; }
 
@@ -218,6 +244,9 @@ export class GoogleMap {
   @CordovaInstance({ sync: true })
   setAllGesturesEnabled(enabled: boolean): void { }
 
+  /**
+   * @returns {Promise<GoogleMapsMarker | any>}
+   */
   addMarker(options: GoogleMapsMarkerOptions): Promise<GoogleMapsMarker | any> {
     if (!this._objectInstance) {
       return Promise.reject({ error: 'plugin_not_installed' });
@@ -235,6 +264,9 @@ export class GoogleMap {
     );
   }
 
+  /**
+   * @returns {Promise<GoogleMapsCircle | any>}
+   */
   addCircle(options: GoogleMapsCircleOptions): Promise<GoogleMapsCircle | any> {
     if (!this._objectInstance) {
       return Promise.reject({ error: 'plugin_not_installed' });
@@ -252,6 +284,9 @@ export class GoogleMap {
     );
   }
 
+  /**
+   * @returns {Promise<GoogleMapsPolygon | any>}
+   */
   addPolygon(options: GoogleMapsPolygonOptions): Promise<GoogleMapsPolygon | any> {
     if (!this._objectInstance) {
       return Promise.reject({ error: 'plugin_not_installed' });
@@ -269,6 +304,9 @@ export class GoogleMap {
     );
   }
 
+  /**
+   * @returns {Promise<GoogleMapsPolyline | any>}
+   */
   addPolyline(options: GoogleMapsPolylineOptions): Promise<GoogleMapsPolyline | any> {
     if (!this._objectInstance) {
       return Promise.reject({ error: 'plugin_not_installed' });
@@ -286,6 +324,9 @@ export class GoogleMap {
     );
   }
 
+  /**
+   * @returns {Promise<GoogleMapsTileOverlay | any>}
+   */
   addTileOverlay(options: GoogleMapsTileOverlayOptions): Promise<GoogleMapsTileOverlay | any> {
     if (!this._objectInstance) {
       return Promise.reject({ error: 'plugin_not_installed' });
@@ -303,6 +344,9 @@ export class GoogleMap {
     );
   }
 
+  /**
+   * @returns {Promise<GoogleMapsGroundOverlay | any>}
+   */
   addGroundOverlay(options: GoogleMapsGroundOverlayOptions): Promise<GoogleMapsGroundOverlay | any> {
     if (!this._objectInstance) {
       return Promise.reject({ error: 'plugin_not_installed' });
@@ -320,6 +364,9 @@ export class GoogleMap {
     );
   }
 
+  /**
+   * @returns {Promise<GoogleMapsKmlOverlay | any>}
+   */
   addKmlOverlay(options: GoogleMapsKmlOverlayOptions): Promise<GoogleMapsKmlOverlay | any> {
     if (!this._objectInstance) {
       return Promise.reject({ error: 'plugin_not_installed' });
@@ -358,12 +405,21 @@ export class GoogleMap {
   @CordovaInstance({ sync: true })
   refreshLayout(): void { }
 
+  /**
+   * @returns {Promise<any>}
+   */
   @CordovaInstance()
   fromLatLngToPoint(latLng: GoogleMapsLatLng, point: any): Promise<any> { return; }
 
+  /**
+   * @returns {Promise<GoogleMapsLatLng>}
+   */
   @CordovaInstance()
   fromPointToLatLng(point: any, latLng: GoogleMapsLatLng): Promise<GoogleMapsLatLng> { return; }
 
+  /**
+   * @returns {Promise<any>}
+   */
   @CordovaInstance()
   toDataURL(): Promise<any> { return; }
 
@@ -466,6 +522,21 @@ export class GoogleMapsMarker {
     );
   }
 
+  /**
+   * Gets a value
+   * @param key
+   */
+  @CordovaInstance({sync: true})
+  get(key: string): any { return; }
+
+  /**
+   * Sets a value
+   * @param key
+   * @param value
+   */
+  @CordovaInstance({sync: true})
+  set(key: string, value: any): void { }
+
   @CordovaInstance({ sync: true })
   isVisible(): boolean { return; }
 
@@ -621,7 +692,7 @@ export class GoogleMapsCircle {
 export interface GoogleMapsPolylineOptions {
   points?: Array<GoogleMapsLatLng>;
   visible?: boolean;
-  googledesic?: boolean;
+  geodesic?: boolean;
   color?: string;
   width?: number;
   zIndex?: number;
@@ -978,7 +1049,10 @@ export class Geocoder {
   static geocode(request: GeocoderRequest): Promise<GeocoderResult[] | any> {
     return new Promise<GeocoderResult[]>((resolve, reject) => {
       if (!plugin || !plugin.google || !plugin.google.maps || !plugin.google.maps.Geocoder) {
-        pluginWarn(pluginMap);
+        pluginWarn({
+          pluginName: 'GoogleMap',
+          plugin: 'plugin.google.maps.Map'
+        });
         reject({ error: 'plugin_not_installed' });
       } else {
         plugin.google.maps.Geocoder.geocode(request, resolve);

src/plugins/hotspot.ts

@@ -15,6 +15,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Hotspot',
   plugin: 'cordova-plugin-hotspot',
   pluginRef: 'cordova.plugins.hotspot',
   repo: 'https://github.com/hypery2k/cordova-hotspot-plugin',
@@ -22,9 +23,15 @@ import { Cordova, Plugin } from './plugin';
 })
 export class Hotspot {
 
+  /**
+   * @returns {Promise<boolean>}
+   */
   @Cordova()
   static isAvailable(): Promise<boolean> { return; }
 
+  /**
+   * @returns {Promise<boolean>}
+   */
   @Cordova()
   static toggleWifi(): Promise<boolean> { return; }
 
@@ -35,7 +42,7 @@ export class Hotspot {
    * @param {string}    mode        - encryption mode (Open, WEP, WPA, WPA_PSK)
    * @param {string}    password    - password for your new Access Point
    *
-   * @return {Promise<void>}        - Promise to call once hotspot is started, or reject upon failure
+   * @returns {Promise<void>}        - Promise to call once hotspot is started, or reject upon failure
    */
   @Cordova()
   static createHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
@@ -43,7 +50,7 @@ export class Hotspot {
   /**
    * Turns on Access Point
    *
-   * @return {Promise<boolean>} - true if AP is started
+   * @returns {Promise<boolean>} - true if AP is started
    */
   @Cordova()
   static startHotspot(): Promise<boolean> { return; }
@@ -55,7 +62,7 @@ export class Hotspot {
    * @param {string}    mode        - encryption mode (Open, WEP, WPA, WPA_PSK)
    * @param {string}    password    - password for your new Access Point
    *
-   * @return {Promise<void>}        - Promise to call when hotspot is configured, or reject upon failure
+   * @returns {Promise<void>}        - Promise to call when hotspot is configured, or reject upon failure
    */
   @Cordova()
   static configureHotspot(ssid: string, mode: string, password: string): Promise<void> { return; }
@@ -63,7 +70,7 @@ export class Hotspot {
   /**
    * Turns off Access Point
    *
-   * @return {Promise<boolean>} - Promise to turn off the hotspot, true on success, false on failure
+   * @returns {Promise<boolean>} - Promise to turn off the hotspot, true on success, false on failure
    */
   @Cordova()
   static stopHotspot(): Promise<boolean> { return; }
@@ -71,11 +78,14 @@ export class Hotspot {
   /**
    * Checks if hotspot is enabled
    *
-   * @return {Promise<void>}    - Promise that hotspot is enabled, rejected if it is not enabled
+   * @returns {Promise<void>}    - Promise that hotspot is enabled, rejected if it is not enabled
    */
   @Cordova()
   static isHotspotEnabled(): Promise<void> { return; }
 
+  /**
+   * @returns {Promise<Array<HotspotDevice>>}
+   */
   @Cordova()
   static getAllHotspotDevices(): Promise<Array<HotspotDevice>> { return; }
 
@@ -87,7 +97,7 @@ export class Hotspot {
    * @param {string}    password
    *      password to use
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
@@ -105,7 +115,7 @@ export class Hotspot {
    * @param {string[]} encryption
    *      Encryption modes to use (CCMP, TKIP, WEP104, WEP40)
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    *      Promise that connection to the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
@@ -121,7 +131,7 @@ export class Hotspot {
    * @param {string}    password
    *      Password for network
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    *      Promise that adding the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
@@ -133,45 +143,81 @@ export class Hotspot {
    * @param {string}    ssid
    *      SSID of network
    *
-   * @return {Promise<void>}
+   * @returns {Promise<void>}
    *      Promise that removing the WiFi network was successfull, rejected if unsuccessful
    */
   @Cordova()
   static removeWifiNetwork(ssid: string): Promise<void> { return; }
 
+  /**
+   * @returns {Promise<boolean>}
+   */
   @Cordova()
   static isConnectedToInternet(): Promise<boolean> { return; }
 
+  /**
+   * @returns {Promise<boolean>}
+   */
   @Cordova()
   static isConnectedToInternetViaWifi(): Promise<boolean> { return; }
 
+  /**
+   * @returns {Promise<boolean>}
+   */
   @Cordova()
   static isWifiOn(): Promise<boolean> { return; }
 
+  /**
+   * @returns {Promise<boolean>}
+   */
   @Cordova()
   static isWifiSupported(): Promise<boolean> { return; }
 
+  /**
+   * @returns {Promise<boolean>}
+   */
   @Cordova()
   static isWifiDirectSupported(): Promise<boolean> { return; }
 
+  /**
+   * @returns {Promise<Array<HotspotNetwork>>}
+   */
   @Cordova()
   static scanWifi(): Promise<Array<HotspotNetwork>> { return; }
 
+  /**
+   * @returns {Promise<Array<HotspotNetwork>>}
+   */
   @Cordova()
   static scanWifiByLevel(): Promise<Array<HotspotNetwork>> { return; }
 
+  /**
+   * @returns {Promise<any>}
+   */
   @Cordova()
   static startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> { return; }
 
+  /**
+   * @returns {Promise<any>}
+   */
   @Cordova()
   static stopWifiPeriodicallyScan(): Promise<any> { return; }
 
+  /**
+   * @returns {Promise<HotspotNetworkConfig>}
+   */
   @Cordova()
   static getNetConfig(): Promise<HotspotNetworkConfig> { return; }
 
+  /**
+   * @returns {Promise<ConnectionInfo>}
+   */
   @Cordova()
   static getConnectionInfo(): Promise<ConnectionInfo> { return; }
 
+  /**
+   * @returns {Promise<string>}
+   */
   @Cordova()
   static pingHost(ip: string): Promise<string> { return; }
 
@@ -180,7 +226,7 @@ export class Hotspot {
    *
    * @param {string}        ip  - IP Address that you want the MAC Address of
    *
-   * @return {Promise<string>}  - A Promise for the MAC Address
+   * @returns {Promise<string>}  - A Promise for the MAC Address
    */
   @Cordova()
   static getMacAddressOfHost(ip: string): Promise<string> { return; }
@@ -190,7 +236,7 @@ export class Hotspot {
    *
    * @param {string}        ip  - IP Address you want to test
    *
-   * @return {Promise<boolean>} - A Promise for whether the IP Address is reachable
+   * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
   static isDnsLive(ip: string): Promise<boolean> { return; }
@@ -200,7 +246,7 @@ export class Hotspot {
    *
    * @param {string}        ip  - IP Address you want to test
    *
-   * @return {Promise<boolean>} - A Promise for whether the IP Address is reachable
+   * @returns {Promise<boolean>} - A Promise for whether the IP Address is reachable
    */
   @Cordova()
   static isPortLive(ip: string): Promise<boolean> { return; }
@@ -208,7 +254,7 @@ export class Hotspot {
   /**
    * Checks if device is rooted
    *
-   * @return {Promise<boolean>} - A Promise for whether the device is rooted
+   * @returns {Promise<boolean>} - A Promise for whether the device is rooted
    */
   @Cordova()
   static isRooted(): Promise<boolean> { return; }

src/plugins/http.ts

@@ -33,6 +33,7 @@ import { Plugin, Cordova } from './plugin';
  * HTTPResponse
  */
 @Plugin({
+  pluginName: 'HTTP',
   plugin: 'cordova-plugin-http',
   pluginRef: 'cordovaHTTP',
   repo: 'https://github.com/wymsee/cordova-HTTP',
@@ -44,7 +45,7 @@ export class HTTP {
    * This returns an object representing a basic HTTP Authorization header of the form.
    * @param username {string} Username
    * @param password {string} Password
-   * @return {Object} an object representing a basic HTTP Authorization header of the form {'Authorization': 'Basic base64encodedusernameandpassword'}
+   * @returns {Object} an object representing a basic HTTP Authorization header of the form {'Authorization': 'Basic base64encodedusernameandpassword'}
    */
   @Cordova({ sync: true })
   static getBasicAuthHeader(username: string, password: string): { Authorization: string; } { return; }
@@ -72,7 +73,7 @@ export class HTTP {
    *
    * As an alternative, you can store your .cer files in the www/certificates folder.
    * @param enable {boolean} Set to true to enable
-   * @return {Promise<any>} returns a promise that will resolve on success, and reject on failure
+   * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
   static enableSSLPinning(enable: boolean): Promise<void> { return; }
@@ -80,7 +81,7 @@ export class HTTP {
   /**
    * Accept all SSL certificates. Or disabled accepting all certificates. Defaults to false.
    * @param accept {boolean} Set to true to accept
-   * @return {Promise<any>} returns a promise that will resolve on success, and reject on failure
+   * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
   static acceptAllCerts(accept: boolean): Promise<void> { return; }
@@ -88,7 +89,7 @@ export class HTTP {
   /**
    * Whether or not to validate the domain name in the certificate. This defaults to true.
    * @param validate {boolean} Set to true to validate
-   * @return {Promise<any>} returns a promise that will resolve on success, and reject on failure
+   * @returns {Promise<void>} returns a promise that will resolve on success, and reject on failure
    */
   @Cordova()
   static validateDomainName(validate: boolean): Promise<void> { return; }
@@ -98,7 +99,7 @@ export class HTTP {
    * @param url {string} The url to send the request to
    * @param body {Object} The body of the request
    * @param headers {Object} The headers to set for this request
-   * @return {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
+   * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
   static post(url: string, body: any, headers: any): Promise<HTTPResponse> { return; }
@@ -108,7 +109,7 @@ export class HTTP {
    * @param url {string} The url to send the request to
    * @param parameters {Object} Parameters to send with the request
    * @param headers {Object} The headers to set for this request
-   * @return {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
+   * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
   static get(url: string, parameters: any, headers: any): Promise<HTTPResponse> { return; }
@@ -120,7 +121,7 @@ export class HTTP {
    * @param headers {Object} The headers to set for this request
    * @param filePath {string} The local path of the file to upload
    * @param name {string} The name of the parameter to pass the file along as
-   * @return {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
+   * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
   static uploadFile(url: string, body: any, headers: any, filePath: string, name: string): Promise<HTTPResponse> { return; }
@@ -131,7 +132,7 @@ export class HTTP {
    * @param body {Object} The body of the request
    * @param headers {Object} The headers to set for this request
    * @param filePath {string} The path to donwload the file to, including the file name.
-   * @return {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
+   * @returns {Promise<HTTPResponse>} returns a promise that resolve on success, and reject on failure
    */
   @Cordova()
   static downloadFile(url: string, body: any, headers: any, filePath: string): Promise<HTTPResponse> { return; }

src/plugins/httpd.ts

@@ -23,6 +23,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'Httpd',
   plugin: 'https://github.com/floatinghotpot/cordova-httpd.git',
   pluginRef: 'cordova.plugins.CorHttpd',
   repo: 'https://github.com/floatinghotpot/cordova-httpd',
@@ -34,6 +35,7 @@ export class Httpd {
    * Starts a web server.
    * @returns {Observable<string>} Returns an Observable. Subscribe to receive the URL for your web server (if succeeded). Unsubscribe to stop the server.
    * @param options {HttpdOptions}
+   * @returns {Observable<string>}
    */
   @Cordova({
     observable: true,

src/plugins/ibeacon.ts

@@ -140,7 +140,7 @@ export interface Delegate {
   /**
    * An observable that publishes information about the location permission authorization status.
    *
-   * @return Returns a string.
+   * @returns {Observable<string>} Returns a string.
    */
   didChangeAuthorizationStatus(): Observable<string>;
 
@@ -151,7 +151,7 @@ export interface Delegate {
    * This event is called when the phone begins starts monitoring,
    * when requestStateForRegion is called, etc.
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   didDetermineStateForRegion(): Observable<PluginResult>;
 
@@ -163,7 +163,7 @@ export interface Delegate {
    *  will be called even when the app is not running on iOS.
    * The app will run silently in the background for a small amount of time.
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   didEnterRegion(): Observable<PluginResult>;
 
@@ -175,7 +175,7 @@ export interface Delegate {
    *  will be called even when the app is not running on iOS.
    * The app will run silently in the background for a small amount of time.
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   didExitRegion(): Observable<PluginResult>;
 
@@ -184,7 +184,7 @@ export interface Delegate {
    *  each time that the device ranges beacons. Modern Android and iOS devices range
    * aproximately once per second.
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   didRangeBeaconsInRegion(): Observable<PluginResult>;
 
@@ -192,7 +192,7 @@ export interface Delegate {
    * An Observable that publishes event data to it's subscribers
    *  when the device begins monitoring a region.
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   didStartMonitoringForRegion(): Observable<PluginResult>;
 
@@ -200,7 +200,7 @@ export interface Delegate {
    * An Observable that publishes event data to it's subscribers
    *  when the device fails to monitor a region.
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   monitoringDidFailForRegionWithError(): Observable<PluginResult>;
 
@@ -208,7 +208,7 @@ export interface Delegate {
    * An Observable that publishes event data to it's subscribers
    *  when the device begins advertising as an iBeacon.
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   peripheralManagerDidStartAdvertising(): Observable<PluginResult>;
 
@@ -217,7 +217,7 @@ export interface Delegate {
    * when the state of the peripheral manager's state updates.
    *
    *
-   * @return {PluginResult} Returns a PluginResult object with information about the event, region, and beacon(s).
+   * @returns {Observable<PluginResult>} Returns a PluginResult object with information about the event, region, and beacon(s).
    */
   peripheralManagerDidUpdateState(): Observable<PluginResult>;
 }
@@ -268,6 +268,7 @@ export interface Delegate {
  * ```
  */
 @Plugin({
+  pluginName: 'IBeacon',
   plugin: 'cordova-plugin-ibeacon',
   pluginRef: 'cordova.plugins.locationManager',
   repo: 'https://github.com/petermetz/cordova-plugin-ibeacon',
@@ -379,14 +380,14 @@ export class IBeacon {
    * @param {Number} minor The minor value that you use to identify a specific beacon.
    * @param {BOOL} notifyEntryStateOnDisplay
    *
-   * @return Returns the BeaconRegion that was created
+   * @returns {BeaconRegion} Returns the BeaconRegion that was created
    */
   static BeaconRegion(identifer: string, uuid: string, major?: number, minor?: number, notifyEntryStateOnDisplay?: boolean): BeaconRegion {
     return new cordova.plugins.locationManager.BeaconRegion(identifer, uuid, major, minor, notifyEntryStateOnDisplay);
   }
 
   /**
-   * @return Returns the Delegate
+   * @returns {Delegate} Returns the Delegate
    */
   @Cordova()
   static getDelegate(): Delegate { return; }
@@ -394,7 +395,7 @@ export class IBeacon {
   /**
    * @param {Delegate} delegate An instance of a delegate to register with the native layer.
    *
-   * @return Returns the Delegate
+   * @returns {Delegate} Returns the Delegate
    */
   @Cordova()
   static setDelegate(delegate: Delegate): Delegate { return; }
@@ -416,7 +417,7 @@ export class IBeacon {
    * message get emitted in the native runtime and the DOM as well after a certain
    * period of time.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the request and started to send events.
    */
   @Cordova({otherPromise: true})
@@ -424,7 +425,7 @@ export class IBeacon {
 
   /**
    * Determines if bluetooth is switched on, according to the native layer.
-   * @returns Returns a promise which is resolved with a {Boolean}
+   * @returns {Promise<boolean>} Returns a promise which is resolved with a {Boolean}
    * indicating whether bluetooth is active.
    */
   @Cordova({otherPromise: true})
@@ -433,7 +434,7 @@ export class IBeacon {
   /**
    * Enables Bluetooth using the native Layer. (ANDROID ONLY)
    *
-   * @returns Returns a promise which is resolved when Bluetooth
+   * @returns {Promise<void>} Returns a promise which is resolved when Bluetooth
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({otherPromise: true})
@@ -442,7 +443,7 @@ export class IBeacon {
   /**
    * Disables Bluetooth using the native Layer. (ANDROID ONLY)
    *
-   * @returns Returns a promise which is resolved when Bluetooth
+   * @returns {Promise<void>} Returns a promise which is resolved when Bluetooth
    * could be enabled. If not, the promise will be rejected with an error.
    */
   @Cordova({otherPromise: true})
@@ -462,7 +463,7 @@ export class IBeacon {
    * @param {Region} region An instance of {Region} which will be monitored
    * by the operating system.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<string>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({otherPromise: true})
@@ -479,7 +480,7 @@ export class IBeacon {
    * @param {Region} region An instance of {Region} which will be monitored
    * by the operating system.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({otherPromise: true})
@@ -495,7 +496,7 @@ export class IBeacon {
    * @param {Region} region An instance of {Region} which will be monitored
    * by the operating system.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({otherPromise: true})
@@ -513,7 +514,7 @@ export class IBeacon {
    * @param {Region} region An instance of {BeaconRegion} which will be monitored
    * by the operating system.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the dispatch of the monitoring request.
    */
   @Cordova({otherPromise: true})
@@ -530,7 +531,7 @@ export class IBeacon {
    * @param {Region} region An instance of {BeaconRegion} which will be monitored
    * by the operating system.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the dispatch of the request to stop monitoring.
    */
   @Cordova({otherPromise: true})
@@ -539,7 +540,7 @@ export class IBeacon {
   /**
    * Queries the native layer to determine the current authorization in effect.
    *
-   * @returns Returns a promise which is resolved with the
+   * @returns {Promise<any>} Returns a promise which is resolved with the
    * requested authorization status.
    */
   @Cordova({otherPromise: true})
@@ -552,7 +553,7 @@ export class IBeacon {
    * <a href="https://developer.apple.com/library/prerelease/iOS/documentation/CoreLocation/Reference/CLLocationManager_Class/index.html#//apple_ref/occ/instm/CLLocationManager/requestAlwaysAuthorization">requestAlwaysAuthorization</a>
    *
    * If you are using this plugin on Android devices only, you will never have to use this, nor {@code requestAlwaysAuthorization}
-   * @returns Returns a promise that is resolved when the request dialog is shown.
+   * @returns {Promise<void>} Returns a promise that is resolved when the request dialog is shown.
    */
   @Cordova({otherPromise: true})
   static requestWhenInUseAuthorization(): Promise<void> { return; }
@@ -561,7 +562,7 @@ export class IBeacon {
   /**
    * See the docuemntation of {@code requestWhenInUseAuthorization} for further details.
    *
-   * @returns Returns a promise which is resolved when the native layer
+   * @returns {Promise<void>} Returns a promise which is resolved when the native layer
    * shows the request dialog.
    */
   @Cordova({otherPromise: true})
@@ -569,7 +570,7 @@ export class IBeacon {
 
   /**
    *
-   * @returns Returns a promise which is resolved with an {Array}
+   * @returns {Promise<Region[]>} Returns a promise which is resolved with an {Array}
    * of {Region} instances that are being monitored by the native layer.
    */
   @Cordova({otherPromise: true})
@@ -577,7 +578,7 @@ export class IBeacon {
 
   /**
    *
-   * @returns Returns a promise which is resolved with an {Array}
+   * @returns {Promise<Region[]>} Returns a promise which is resolved with an {Array}
    * of {Region} instances that are being ranged by the native layer.
    */
   @Cordova({otherPromise: true})
@@ -585,7 +586,7 @@ export class IBeacon {
 
   /**
    * Determines if ranging is available or not, according to the native layer.
-   * @returns Returns a promise which is resolved with a {Boolean}
+   * @returns {Promise<boolean>} Returns a promise which is resolved with a {Boolean}
    * indicating whether ranging is available or not.
    */
   @Cordova({otherPromise: true})
@@ -597,7 +598,7 @@ export class IBeacon {
    * @param {Region} region An instance of {Region} which will be checked
    * by the operating system.
    *
-   * @returns Returns a promise which is resolved with a {Boolean}
+   * @returns {Promise<boolean>} Returns a promise which is resolved with a {Boolean}
    * indicating whether the region type is supported or not.
    */
   @Cordova({otherPromise: true})
@@ -617,7 +618,7 @@ export class IBeacon {
    * @param {Integer} measuredPower: Optional parameter, if left empty, the device will
    * use it's own default value.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the dispatch of the advertising request.
    */
   @Cordova({otherPromise: true})
@@ -628,7 +629,7 @@ export class IBeacon {
    *
    * This is done asynchronously and may not be immediately reflected in isAdvertising.
    *
-   * @return Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer acknowledged the dispatch of the request to stop advertising.
    */
   @Cordova({otherPromise: true})
@@ -636,7 +637,7 @@ export class IBeacon {
 
   /**
    * Determines if advertising is available or not, according to the native layer.
-   * @returns Returns a promise which is resolved with a {Boolean}
+   * @returns {Promise<void>} Returns a promise which is resolved with a {Boolean}
    * indicating whether advertising is available or not.
    */
   @Cordova({otherPromise: true})
@@ -644,7 +645,7 @@ export class IBeacon {
 
   /**
    * Determines if advertising is currently active, according to the native layer.
-   * @returns Returns a promise which is resolved with a {Boolean}
+   * @returns {Promise<void>} Returns a promise which is resolved with a {Boolean}
    * indicating whether advertising is active.
    */
   @Cordova({otherPromise: true})
@@ -654,7 +655,7 @@ export class IBeacon {
    * Disables debug logging in the native layer. Use this method if you want
    * to prevent this plugin from writing to the device logs.
    *
-   * @returns Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer has set the logging level accordingly.
    */
   @Cordova({otherPromise: true})
@@ -665,7 +666,7 @@ export class IBeacon {
    * to allow the plugin the posting local notifications.
    * This can be very helpful when debugging how to apps behave when launched into the background.
    *
-   * @returns Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer has set the flag to enabled.
    */
   @Cordova({otherPromise: true})
@@ -675,7 +676,7 @@ export class IBeacon {
    * Disables the posting of debug notifications in the native layer. Use this method if you want
    * to prevent the plugin from posting local notifications.
    *
-   * @returns Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer has set the flag to disabled.
    */
   @Cordova({otherPromise: true})
@@ -685,7 +686,7 @@ export class IBeacon {
    * Enables debug logging in the native layer. Use this method if you want
    * a debug the inner workings of this plugin.
    *
-   * @returns Returns a promise which is resolved as soon as the
+   * @returns {Promise<void>} Returns a promise which is resolved as soon as the
    * native layer has set the logging level accordingly.
    */
   @Cordova({otherPromise: true})
@@ -697,7 +698,7 @@ export class IBeacon {
    *
    * @param {String} message The message to append to the device logs.
    *
-   * @returns Returns a promise which is resolved with the log
+   * @returns {Promise<void>} Returns a promise which is resolved with the log
    * message received by the native layer for appending. The returned message
    * is expected to be equivalent to the one provided in the original call.
    */

src/plugins/imagepicker.ts

@@ -46,15 +46,16 @@ export interface ImagePickerOptions {
  * ImagePickerOptions
  */
 @Plugin({
-  plugin: 'cordova-plugin-image-picker',
+  pluginName: 'ImagePicker',
+  plugin: 'https://github.com/Telerik-Verified-Plugins/ImagePicker',
   pluginRef: 'window.imagePicker',
-  repo: 'https://github.com/wymsee/cordova-imagePicker'
+  repo: 'https://github.com/Telerik-Verified-Plugins/ImagePicker'
 })
 export class ImagePicker {
   /**
    * Pick pictures from the library.
    * @param {ImagePickerOptions} options
-   * @return Returns a Promise that resolves the image file URI
+   * @returns {Promise<any>} Returns a Promise that resolves the image file URI
    * otherwise rejects with an error.
    */
   @Cordova({

src/plugins/imageresizer.ts

@@ -67,11 +67,15 @@ export interface ImageResizerOptions {
  * ```
  */
 @Plugin({
+  pluginName: 'ImageResizer',
   plugin: 'https://github.com/protonet/cordova-plugin-image-resizer.git',
   pluginRef: 'ImageResizer',
   repo: 'https://github.com/protonet/cordova-plugin-image-resizer'
 })
 export class ImageResizer {
+  /**
+   * @returns {Promise<any>}
+   */
   @Cordova()
   static resize(options: ImageResizerOptions): Promise<any> { return; }
 }

src/plugins/inappbrowser.ts

@@ -31,14 +31,18 @@ export interface InAppBrowserEvent extends Event {
  * ```
  */
 @Plugin({
+  pluginName: 'InAppBrowser',
   plugin: 'cordova-plugin-inappbrowser',
   pluginRef: 'cordova.InAppBrowser',
   repo: 'https://github.com/apache/cordova-plugin-inappbrowser'
 })
 export class InAppBrowser {
 
+  /**
+   * @private
+   */
   static open(url: string, target?: string, options?: string): void {
-    console.warn('Native: Your current usage of the InAppBrowser plugin is depreciated as of ionic-native@1.3.8. Please check the Ionic Native docs for the latest usage details.');
+    console.warn('Native: Your current usage of the InAppBrowser plugin is deprecated as of ionic-native@1.3.8. Please check the Ionic Native docs for the latest usage details.');
   }
 
   private _objectInstance: any;
@@ -76,13 +80,15 @@ export class InAppBrowser {
   /**
    * Injects JavaScript code into the InAppBrowser window.
    * @param script    Details of the script to run, specifying either a file or code key.
+   * @returns {Promise<any>}
    */
   @CordovaInstance()
   executeScript(script: {file?: string, code?: string}): Promise<any> {return; }
 
   /**
    * Injects CSS into the InAppBrowser window.
-   * @param css       Details of the script to run, specifying either a file or code key.
+   * @param {Object}       Details of the script to run, specifying either a file or code key.
+   * @returns {Promise<any>}
    */
   @CordovaInstance()
   insertCss(css: {file?: string, code?: string}): Promise<any> {return; }
@@ -92,8 +98,8 @@ export class InAppBrowser {
 
   /**
    * A method that allows you to listen to events happening in the browser.
-   * @param event Event name
-   * @returns {Observable<any>} Returns back an observable that will listen to the event on subscribe, and will stop listening to the event on unsubscribe.
+   * @param {string} name of the event
+   * @returns {Observable<InAppBrowserEvent>} Returns back an observable that will listen to the event on subscribe, and will stop listening to the event on unsubscribe.
    */
   on(event: string): Observable<InAppBrowserEvent> {
     return new Observable<InAppBrowserEvent>((observer) => {

src/plugins/inapppurchase.ts

@@ -51,6 +51,7 @@ import { Plugin, Cordova } from './plugin';
  *
  */
 @Plugin({
+  pluginName: 'InAppPurchase',
   plugin: 'cordova-plugin-inapppurchase',
   pluginRef: 'inAppPurchase',
   platforms: ['Android', 'iOS'],
@@ -61,7 +62,7 @@ export class InAppPurchase {
   /**
    * Retrieves a list of full product data from Apple/Google. This method must be called before making purchases.
    * @param {array<string>} productId an array of product ids.
-   * @returns {Promise} Returns a Promise that resolves with an array of objects.
+   * @returns {Promise<any>} Returns a Promise that resolves with an array of objects.
    */
   @Cordova({
     otherPromise: true
@@ -71,7 +72,7 @@ export class InAppPurchase {
   /**
    * Buy a product that matches the productId.
    * @param {string} productId A string that matches the product you want to buy.
-   * @returns {Promise} Returns a Promise that resolves with the transaction details.
+   * @returns {Promise<{transactionId: string, receipt: string, signature: string, productType: string}>} Returns a Promise that resolves with the transaction details.
    */
   @Cordova({
     otherPromise: true
@@ -81,7 +82,7 @@ export class InAppPurchase {
   /**
    * Same as buy, but for subscription based products.
    * @param {string} productId A string that matches the product you want to subscribe to.
-   * @returns {Promise} Returns a Promise that resolves with the transaction details.
+   * @returns {Promise<{transactionId: string, receipt: string, signature: string, productType: string}>} Returns a Promise that resolves with the transaction details.
    */
   @Cordova({
     otherPromise: true
@@ -93,6 +94,7 @@ export class InAppPurchase {
    * @param {string} productType
    * @param {string} receipt
    * @param {string} signature
+   * @returns {Promise<any>}
    */
   @Cordova({
     otherPromise: true
@@ -101,7 +103,7 @@ export class InAppPurchase {
 
   /**
    * Restore all purchases from the store
-   * @returns {Promise} Returns a promise with an array of purchases.
+   * @returns {Promise<any>} Returns a promise with an array of purchases.
    */
   @Cordova({
     otherPromise: true

src/plugins/insomnia.ts

@@ -26,6 +26,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
+  pluginName: 'Insomnia',
   plugin: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin.git',
   pluginRef: 'plugins.insomnia',
   repo: 'https://github.com/EddyVerbruggen/Insomnia-PhoneGap-Plugin',
@@ -35,14 +36,14 @@ export class Insomnia {
 
   /**
    * Keeps awake the application
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static keepAwake(): Promise<any> { return; }
 
   /**
    * Allows the application to sleep again
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static allowSleepAgain(): Promise<any> { return; }

src/plugins/instagram.ts

@@ -15,6 +15,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Instagram',
   plugin: 'cordova-instagram-plugin',
   pluginRef: 'Instagram',
   repo: 'https://github.com/vstirbu/InstagramPlugin'
@@ -24,7 +25,7 @@ export class Instagram {
   /**
    * Detect if the Instagram application is installed on the device.
    *
-   * @return {Promise<boolean|string>} Returns a promise that returns a boolean value if installed, or the app version on android
+   * @returns {Promise<boolean|string>} Returns a promise that returns a boolean value if installed, or the app version on android
    */
   @Cordova({
     callbackStyle: 'node'
@@ -37,7 +38,7 @@ export class Instagram {
    *
    * @param canvasIdOrDataUrl The canvas element id or the dataURL of the image to share
    * @param caption The caption of the image
-   * @return {Promise<any>} Returns a promise that resolves if the image was shared
+   * @returns {Promise<any>} Returns a promise that resolves if the image was shared
    */
   @Cordova({
     callbackStyle: 'node'
@@ -47,7 +48,7 @@ export class Instagram {
   /**
    * Share a library asset or video
    * @param assetLocalIdentifier A local fileURI
-   * @return {Promise<any>} Returns a promise that resolves if the image was shared
+   * @returns {Promise<any>} Returns a promise that resolves if the image was shared
    */
   @Cordova({
     callbackOrder: 'reverse'

src/plugins/is-debug.ts

@@ -17,6 +17,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'IsDebug',
   plugin: 'cordova-plugin-is-debug',
   pluginRef: 'cordova.plugins.IsDebug',
   repo: 'https://github.com/mattlewis92/cordova-plugin-is-debug'
@@ -25,7 +26,7 @@ export class IsDebug {
 
   /**
    * Determine if an app was installed via xcode / eclipse / the ionic CLI etc
-   * @return {Promise<boolean>} Returns a promise that resolves with true if the app was installed via xcode / eclipse / the ionic CLI etc. It will resolve to false if the app was downloaded from the app / play store by the end user.
+   * @returns {Promise<boolean>} Returns a promise that resolves with true if the app was installed via xcode / eclipse / the ionic CLI etc. It will resolve to false if the app was downloaded from the app / play store by the end user.
    */
   @Cordova()
   static getIsDebug(): Promise<boolean> {

src/plugins/keyboard.ts

@@ -14,6 +14,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'Keyboard',
   plugin: 'ionic-plugin-keyboard',
   pluginRef: 'cordova.plugins.Keyboard',
   repo: 'https://github.com/driftyco/ionic-plugin-keyboard'
@@ -57,6 +58,7 @@ export class Keyboard {
 
   /**
    * Creates an observable that notifies you when the keyboard is shown. Unsubscribe to observable to cancel event watch.
+   * @returns {Observable<any>}
    */
   @Cordova({
     eventObservable: true,
@@ -67,6 +69,7 @@ export class Keyboard {
 
   /**
    * Creates an observable that notifies you when the keyboard is hidden. Unsubscribe to observable to cancel event watch.
+   * @returns {Observable<any>}
    */
   @Cordova({
     eventObservable: true,

src/plugins/launchnavigator.ts

@@ -82,6 +82,7 @@ export interface LaunchNavigatorOptions {
  * ```
  */
 @Plugin({
+  pluginName: 'LaunchNavigator',
   plugin: 'uk.co.workingedge.phonegap.plugin.launchnavigator',
   pluginRef: 'launchnavigator',
   repo: 'https://github.com/dpa99c/phonegap-launch-navigator.git'
@@ -106,12 +107,14 @@ export class LaunchNavigator {
   /**
    * Determines if the given app is installed and available on the current device.
    * @param app {string}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static isAppAvailable(app: string): Promise<any> { return; }
 
   /**
    * Returns a list indicating which apps are installed and available on the current device.
+   * @returns {Promise<string[]>}
    */
   @Cordova()
   static availableApps(): Promise<string[]> { return; }
@@ -119,6 +122,7 @@ export class LaunchNavigator {
   /**
    * Returns the display name of the specified app.
    * @param app {string}
+   * @returns {string}
    */
   @Cordova({ sync: true })
   static getAppDisplayName(app: string): string { return; }
@@ -126,6 +130,7 @@ export class LaunchNavigator {
   /**
    * Returns list of supported apps on a given platform.
    * @param platform {string}
+   * @returns {string[]}
    */
   @Cordova({ sync: true })
   static getAppsForPlatform(platform: string): string[] { return; }
@@ -134,6 +139,7 @@ export class LaunchNavigator {
    * Indicates if an app on a given platform supports specification of transport mode.
    * @param app {string} specified as a string, you can use one of the constants, e.g `LaunchNavigator.APP.GOOGLE_MAPS`
    * @param platform {string}
+   * @returns {boolean}
    */
   @Cordova({ sync: true })
   static supportsTransportMode(app: string, platform: string): boolean { return; }
@@ -142,6 +148,7 @@ export class LaunchNavigator {
    * Returns the list of transport modes supported by an app on a given platform.
    * @param app {string}
    * @param platform {string}
+   * @returns {string[]}
    */
   @Cordova({ sync: true })
   static getTransportModes(app: string, platform: string): string[] { return; }
@@ -151,6 +158,7 @@ export class LaunchNavigator {
    * Note that currently only Google Maps on Android does.
    * @param app {string}
    * @param platform {string}
+   * @returns {boolean}
    */
   @Cordova({ sync: true })
   static supportsLaunchMode(app: string, platform: string): boolean { return; }
@@ -159,16 +167,31 @@ export class LaunchNavigator {
    * Indicates if an app on a given platform supports specification of start location.
    * @param app {string}
    * @param platform {string}
+   * @returns {boolean}
    */
   @Cordova({ sync: true })
   static supportsStart(app: string, platform: string): boolean { return; }
 
+  /**
+   * @param app {string}
+   * @param platform {string}
+   * @returns {boolean}
+   */
   @Cordova({ sync: true })
   static supportsStartName(app: string, platform: string): boolean { return; }
 
+  /**
+   * @param app {string}
+   * @param platform {string}
+   * @returns {boolean}
+   */
   @Cordova({ sync: true })
   static supportsDestName(app: string, platform: string): boolean { return; }
 
+  /**
+   * @param destination {string | number[]}
+   * @param options {LaunchNavigatorOptions}
+   */
   @Cordova({ sync: true })
   static userSelect(destination: string | number[], options: LaunchNavigatorOptions): void { }
 

src/plugins/localnotifications.ts

@@ -45,6 +45,7 @@ import { Cordova, Plugin } from './plugin';
  *
  */
 @Plugin({
+  pluginName: 'LocalNotifications',
   plugin: 'de.appplant.cordova.plugin.local-notification',
   pluginRef: 'cordova.plugins.notification.local',
   repo: 'https://github.com/katzer/cordova-plugin-local-notifications'
@@ -53,7 +54,7 @@ export class LocalNotifications {
 
   /**
    * Schedules a single or multiple notifications
-   * @param options
+   * @param options {Notification | Array<Notification>} optional
    */
   @Cordova({
     sync: true
@@ -62,7 +63,7 @@ export class LocalNotifications {
 
   /**
    * Updates a previously scheduled notification. Must include the id in the options parameter.
-   * @param options
+   * @param options {Notification} optional
    */
   @Cordova({
     sync: true
@@ -71,15 +72,15 @@ export class LocalNotifications {
 
   /**
    * Clears single or multiple notifications
-   * @param notificationId A single notification id, or an array of notification ids.
-   * @returns {Promise} Returns a promise when the notification had been cleared
+   * @param notificationId {any} A single notification id, or an array of notification ids.
+   * @returns {Promise<any>} Returns a promise when the notification had been cleared
    */
   @Cordova()
   static clear(notificationId: any): Promise<any> { return; }
 
   /**
    * Clears all notifications
-   * @returns {Promise} Returns a promise when all notifications have cleared
+   * @returns {Promise<any>} Returns a promise when all notifications have cleared
    */
   @Cordova({
     successIndex: 0,
@@ -89,15 +90,15 @@ export class LocalNotifications {
 
   /**
    * Cancels single or multiple notifications
-   * @param notificationId A single notification id, or an array of notification ids.
-   * @returns {Promise} Returns a promise when the notification is canceled
+   * @param notificationId {any} A single notification id, or an array of notification ids.
+   * @returns {Promise<any>} Returns a promise when the notification is canceled
    */
   @Cordova()
   static cancel(notificationId: any): Promise<any> { return; }
 
   /**
    * Cancels all notifications
-   * @returns {Promise} Returns a promise when all notifications are canceled
+   * @returns {Promise<any>} Returns a promise when all notifications are canceled
    */
   @Cordova({
     successIndex: 0,
@@ -107,61 +108,61 @@ export class LocalNotifications {
 
   /**
    * Checks presence of a notification
-   * @param notificationId
-   * @returns {Promise} Returns a promise
+   * @param notificationId {number}
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static isPresent(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Checks is a notification is scheduled
-   * @param notificationId
-   * @returns {Promise} Returns a promise
+   * @param notificationId {number}
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static isScheduled(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Checks if a notification is triggered
-   * @param notificationId
-   * @returns {Promise} Returns a promise
+   * @param notificationId {number}
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static isTriggered(notificationId: number): Promise<boolean> { return; }
 
   /**
    * Get all the notification ids
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<Array<number>>}
    */
   @Cordova()
   static getAllIds(): Promise<Array<number>> { return; }
 
   /**
    * Get the ids of triggered notifications
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<Array<number>>}
    */
   @Cordova()
   static getTriggeredIds(): Promise<Array<number>> { return; }
 
   /**
    * Get the ids of scheduled notifications
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<Array<number>>} Returns a promise
    */
   @Cordova()
   static getScheduledIds(): Promise<Array<number>> { return; }
 
   /**
    * Get a notification object
-   * @param notificationId The id of the notification to get
-   * @returns {Promise} Returns a promise
+   * @param notificationId {any} The id of the notification to get
+   * @returns {Promise<Notification>}
    */
   @Cordova()
   static get(notificationId: any): Promise<Notification> { return; }
 
   /**
    * Get a scheduled notification object
-   * @param notificationId The id of the notification to get
-   * @returns {Promise} Returns a promise
+   * @param notificationId {any} The id of the notification to get
+   * @returns {Promise<Notification>}
    */
   @Cordova()
   static getScheduled(notificationId: any): Promise<Notification> { return; }
@@ -169,42 +170,42 @@ export class LocalNotifications {
   /**
    * Get a triggered notification object
    * @param notificationId The id of the notification to get
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<Notification>}
    */
   @Cordova()
   static getTriggered(notificationId: any): Promise<Notification> { return; }
 
   /**
    * Get all notification objects
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<Array<Notification>>}
    */
   @Cordova()
   static getAll(): Promise<Array<Notification>> { return; }
 
   /**
    * Get all scheduled notification objects
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<Array<Notification>>}
    */
   @Cordova()
   static getAllScheduled(): Promise<Array<Notification>> { return; }
 
   /**
    * Get all triggered notification objects
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<Array<Notification>>}
    */
   @Cordova()
   static getAllTriggered(): Promise<Array<Notification>> { return; }
 
   /**
    * Register permission to show notifications if not already granted.
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static registerPermission(): Promise<boolean> { return; }
 
   /**
    * Informs if the app has the permission to show notifications.
-   * @returns {Promise} Returns a promise
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static hasPermission(): Promise<boolean> { return; }

src/plugins/location-accuracy.ts

@@ -23,6 +23,7 @@ import {Plugin, Cordova} from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'LocationAccuracy',
   plugin: 'cordova-plugin-request-location-accuracy',
   pluginRef: 'cordova.plugins.locationAccuracy',
   repo: 'https://github.com/dpa99c/cordova-plugin-request-location-accuracy'

src/plugins/market.ts

@@ -13,15 +13,16 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Market',
   plugin: 'cordova-plugin-market',
-  pluginRef: 'plugins.market',
+  pluginRef: 'cordova.plugins.market',
   repo: 'https://github.com/xmartlabs/cordova-plugin-market'
 })
 export class Market {
   /**
    * Opens an app in Google Play / App Store
    * @param appId {string} Package name
-   * @param callbacks {Object} Optional callbacks
+   * @param callbacks {Object} Optional callbacks in the format {success?: Function, failure?: Function}
    */
   @Cordova({sync: true})
   static open(appId: string, callbacks?: {success?: Function, failure?: Function}): void { }

src/plugins/media-capture.ts

@@ -22,13 +22,14 @@ declare var navigator: any;
  * ```
  */
 @Plugin({
+  pluginName: 'MediaCapture',
   plugin: 'cordova-plugin-media-capture',
   pluginRef: 'navigator.device.capture',
   repo: 'https://github.com/apache/cordova-plugin-media-capture'
 })
 export class MediaCapture {
   /**
-   * The audio recording formats supported by the device.
+   * The recording image sizes and formats supported by the device.
    * @returns {ConfigurationData[]}
    */
   @CordovaProperty
@@ -37,7 +38,7 @@ export class MediaCapture {
   }
 
   /**
-   * The recording image sizes and formats supported by the device.
+   * The audio recording formats supported by the device.
    * @returns {ConfigurationData[]}
    */
   @CordovaProperty
@@ -57,6 +58,7 @@ export class MediaCapture {
   /**
    * Start the audio recorder application and return information about captured audio clip files.
    * @param options
+   * @returns {Promise<MediaFile[]>} 
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -66,6 +68,7 @@ export class MediaCapture {
   /**
    * Start the camera application and return information about captured image files.
    * @param options
+   * @returns {Promise<MediaFile[]>}
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -75,6 +78,7 @@ export class MediaCapture {
   /**
    * Start the video recorder application and return information about captured video clip files.
    * @param options
+   * @returns {Promise<MediaFile[]>}
    */
   @Cordova({
     callbackOrder: 'reverse'
@@ -83,6 +87,7 @@ export class MediaCapture {
 
   /**
    * is fired if the capture call is successful
+   * @returns {Observable<MediaFile[]>}
    */
   @Cordova({
     eventObservable: true,
@@ -92,6 +97,7 @@ export class MediaCapture {
 
   /**
    * is fired if the capture call is unsuccessful
+   * @returns {Observable<CaptureError>}
    */
   @Cordova({
     eventObservable: true,

src/plugins/media.ts

@@ -67,12 +67,12 @@ export interface MediaError {
  *
  * ```
  */
-let pluginMeta = {
+@Plugin({
+  pluginName: 'MediaPlugin',
   repo: 'https://github.com/apache/cordova-plugin-media',
   plugin: 'cordova-plugin-media',
   pluginRef: 'Media'
-};
-@Plugin(pluginMeta)
+})
 export class MediaPlugin {
 
   // Constants
@@ -131,27 +131,30 @@ export class MediaPlugin {
         this._objectInstance = new Media(src, resolve, reject, onStatusUpdate);
       });
     } else {
-      pluginWarn(pluginMeta);
+      pluginWarn({
+        pluginName: 'MediaPlugin',
+        plugin: 'cordova-plugin-media'
+      });
     }
   }
 
   /**
    * Get the current amplitude of the current recording.
-   * @returns {Promise} Returns a promise with the amplitude of the current recording
+   * @returns {Promise<any>} Returns a promise with the amplitude of the current recording
    */
   @CordovaInstance()
   getCurrentAmplitude(): Promise<any> { return; }
 
   /**
    * Get the current position within an audio file. Also updates the Media object's position parameter.
-   * @returns {Promise} Returns a promise with the position of the current recording
+   * @returns {Promise<any>} Returns a promise with the position of the current recording
    */
   @CordovaInstance()
   getCurrentPosition(): Promise<any> { return; }
 
   /**
    * Get the duration of an audio file in seconds. If the duration is unknown, it returns a value of -1.
-   * @returns {Promise} Returns a promise with the duration of the current recording
+   * @returns {number} Returns a promise with the duration of the current recording
    */
   @CordovaInstance({
     sync: true
@@ -196,7 +199,7 @@ export class MediaPlugin {
 
   /**
    * Set the volume for an audio file.
-   * @param volume The volume to set for playback. The value must be within the range of 0.0 to 1.0.
+   * @param volume {number} The volume to set for playback. The value must be within the range of 0.0 to 1.0.
    */
   @CordovaInstance({
     sync: true

src/plugins/mixpanel.ts

@@ -2,15 +2,6 @@ import { Cordova, Plugin } from './plugin';
 
 declare var mixpanel: any;
 
-/**
- * @private
- */
-export const pluginMeta = {
-  plugin: 'cordova-plugin-mixpanel',
-  pluginRef: 'mixpanel',
-  repo: 'https://github.com/samzilverberg/cordova-mixpanel-plugin'
-};
-
 /**
  * @name Mixpanel
  * @description
@@ -26,7 +17,12 @@ export const pluginMeta = {
  *
  * ```
  */
-@Plugin(pluginMeta)
+@Plugin({
+  pluginName: 'Mixpanel',
+  plugin: 'cordova-plugin-mixpanel',
+  pluginRef: 'mixpanel',
+  repo: 'https://github.com/samzilverberg/cordova-mixpanel-plugin'
+})
 export class Mixpanel {
   /**
    *
@@ -45,7 +41,7 @@ export class Mixpanel {
   static distinctId(): Promise<any> { return; }
 
   /**
-   *
+   * @returns {Promise<any>}
    */
   @Cordova()
   static flush(): Promise<any> { return; }
@@ -56,7 +52,7 @@ export class Mixpanel {
    * @returns {Promise<any>}
    */
   @Cordova()
-  static identify(distinctId): Promise<any> { return; }
+  static identify(distinctId: string): Promise<any> { return; }
 
   /**
    *
@@ -68,7 +64,7 @@ export class Mixpanel {
 
   /**
    *
-   * @param superProperties
+   * @param superProperties {any}
    * @returns {Promise<any>}
    */
   @Cordova()
@@ -83,8 +79,9 @@ export class Mixpanel {
 
   /**
    *
-   * @param eventName
-   * @param eventProperties
+   * @param eventName {string}
+   * @param eventProperties {any} optional
+   * @returns {Promise<any>}
    */
   @Cordova()
   static track(eventName: string, eventProperties?: any): Promise<any> { return; }
@@ -112,11 +109,11 @@ export class MixpanelPeople {
   /**
    * @private
    */
-  static plugin: string = pluginMeta.plugin;
+  static plugin: string = 'cordova-plugin-mixpanel';
   /**
    * @private
    */
-  static pluginRef: string = pluginMeta.pluginRef + '.people';
+  static pluginRef: string = 'mixpanel.people';
 
   /**
    *

src/plugins/music-controls.ts

@@ -73,6 +73,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'MusicControls',
   plugin: 'cordova-plugin-music-controls',
   pluginRef: 'MusicControls',
   repo: 'https://github.com/homerours/cordova-music-controls-plugin'

src/plugins/native-audio.ts

@@ -10,6 +10,10 @@ import { Plugin, Cordova } from './plugin';
  * NativeAudio.preloadComplex('uniqueId2', 'path/to/file2.mp3', 1, 1, 0).then(onSuccess, onError);
  *
  * NativeAudio.play('uniqueId1').then(onSuccess, onError);
+ *
+ * // can optionally pass a callback to be called when the file is done playing
+ * NativeAudio.play('uniqueId1', () => console.log('uniqueId1 is done playing'));
+ *
  * NativeAudio.loop('uniqueId2').then(onSuccess, onError);
  *
  * NativeAudio.setVolumeForComplexAsset('uniqueId2', 0.6).then(onSuccess,onError);
@@ -21,6 +25,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'NativeAudio',
   plugin: 'cordova-plugin-nativeaudio',
   pluginRef: 'plugins.NativeAudio',
   repo: 'https://github.com/floatinghotpot/cordova-plugin-nativeaudio'
@@ -50,17 +55,19 @@ export class NativeAudio {
   /**
    * Plays an audio asset
    * @param id {string} unique ID for the audio file
-   * @param completeCallback {Function} callback to be invoked when audio is done playing
+   * @param completeCallback {Function} optional. Callback to be invoked when audio is done playing
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 1,
     errorIndex: 2
   })
-  static play(id: string, completeCallback: Function): Promise<any> {return; }
+  static play(id: string, completeCallback?: Function): Promise<any> {return; }
 
   /**
    * Stops playing an audio
    * @param id {string} unique ID for the audio file
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stop(id: string): Promise<any> {return; }
@@ -76,6 +83,7 @@ export class NativeAudio {
   /**
    * Unloads an audio file from memory
    * @param id {string} unique ID for the audio file
+   * @returns {Promise<any>}
    */
   @Cordova()
   static unload(id: string): Promise<any> {return; }
@@ -84,6 +92,7 @@ export class NativeAudio {
    * Changes the volume for preloaded complex assets.
    * @param id {string} unique ID for the audio file
    * @param volume {number} the volume of the audio asset (0.1 to 1.0)
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setVolumeForComplexAsset(id: string, volume: number): Promise<any> {return; }

src/plugins/native-page-transitions.ts

@@ -27,6 +27,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'NativePageTransitions',
   plugin: 'com.telerik.plugins.nativepagetransitions',
   pluginRef: 'plugins.nativepagetransitions',
   repo: 'https://github.com/Telerik-Verified-Plugins/NativePageTransitions',
@@ -36,6 +37,7 @@ export class NativePageTransitions {
   /**
    * Perform a slide animation
    * @param options {TransitionOptions} Options for the transition
+   * @returns {Promise<any>}
    */
   @Cordova()
   static slide(options: TransitionOptions): Promise<any> { return; }
@@ -43,6 +45,7 @@ export class NativePageTransitions {
   /**
    * Perform a flip animation
    * @param options {TransitionOptions} Options for the transition
+   * @returns {Promise<any>}
    */
   @Cordova()
   static flip(options: TransitionOptions): Promise<any> { return; }
@@ -50,6 +53,7 @@ export class NativePageTransitions {
   /**
    * Perform a fade animation
    * @param options {TransitionOptions} Options for the transition
+   * @returns {Promise<any>}
    */
   @Cordova({platforms: ['iOS', 'Android']})
   static fade(options: TransitionOptions): Promise<any> { return; }
@@ -58,6 +62,7 @@ export class NativePageTransitions {
   /**
    * Perform a slide animation
    * @param options {TransitionOptions} Options for the transition
+   * @returns {Promise<any>}
    */
   @Cordova({platforms: ['iOS', 'Android']})
   static drawer(options: TransitionOptions): Promise<any> { return; }
@@ -67,6 +72,7 @@ export class NativePageTransitions {
   /**
    * Perform a slide animation
    * @param options {TransitionOptions} Options for the transition
+   * @returns {Promise<any>}
    */
   @Cordova({platforms: ['iOS']})
   static curl(options: TransitionOptions): Promise<any> { return; }

src/plugins/nativestorage.ts

@@ -23,6 +23,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'NativeStorage',
   plugin: 'cordova-plugin-nativestorage',
   pluginRef: 'NativeStorage',
   repo: 'https://github.com/TheCocoaProject/cordova-plugin-nativestorage'
@@ -32,6 +33,7 @@ export class NativeStorage {
    * Stores a value
    * @param reference {string}
    * @param value
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setItem(reference: string, value: any): Promise<any> {return; }
@@ -39,6 +41,7 @@ export class NativeStorage {
   /**
    * Gets a stored item
    * @param reference {string}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getItem(reference: string): Promise<any> {return; }
@@ -46,12 +49,14 @@ export class NativeStorage {
   /**
    * Removes a single stored item
    * @param reference {string}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static remove(reference: string): Promise<any> {return; }
 
   /**
    * Removes all stored values.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static clear(): Promise<any> {return; }

src/plugins/network.ts

@@ -43,6 +43,7 @@ declare var navigator: any;
  * The `connection` property will return one of the following connection types: `unknown`, `ethernet`, `wifi`, `2g`, `3g`, `4g`, `cellular`, `none`
  */
 @Plugin({
+  pluginName: 'Network',
   plugin: 'cordova-plugin-network-information',
   repo: 'https://github.com/apache/cordova-plugin-network-information',
   platforms: ['Amazon Fire OS', 'iOS', 'Android', 'BlackBerry 10', 'Windows Phone 7', 'Windows Phone 8', 'Windows', 'Firefox OS', 'Browser'],

src/plugins/nfc.ts

@@ -1,5 +1,6 @@
 import { Plugin, Cordova } from './plugin';
 import { Observable } from 'rxjs/Observable';
+declare let window: any;
 /**
  * @name NFC
  * @description
@@ -23,6 +24,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'NFC',
   plugin: 'phonegap-nfc',
   pluginRef: 'nfc',
   repo: 'https://github.com/chariotsolutions/phonegap-nfc'
@@ -32,7 +34,7 @@ export class NFC {
    * Registers an event listener for any NDEF tag.
    * @param onSuccess
    * @param onFailure
-   * @return {Promise<any>}
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true,
@@ -48,7 +50,7 @@ export class NFC {
    * @param mimeType
    * @param onSuccess
    * @param onFailure
-   * @return {Promise<any>}
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true,
@@ -63,7 +65,7 @@ export class NFC {
    * Registers an event listener for NDEF tags matching a specified MIME type.
    * @param onSuccess
    * @param onFailure
-   * @return {Promise<any>}
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true,
@@ -78,7 +80,7 @@ export class NFC {
    * Registers an event listener for formatable NDEF tags.
    * @param onSuccess
    * @param onFailure
-   * @return {Promise<any>}
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true,
@@ -90,13 +92,13 @@ export class NFC {
   /**
    * Qrites an NdefMessage to a NFC tag.
    * @param message {any[]}
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static write(message: any[]): Promise<any> {return; }
   /**
    * Makes a NFC tag read only. **Warning** this is permanent.
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static makeReadyOnly(): Promise<any> {return; }
@@ -104,14 +106,14 @@ export class NFC {
   /**
    * Shares an NDEF Message via peer-to-peer.
    * @param message An array of NDEF Records.
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static share(message: any[]): Promise<any> {return; }
 
   /**
    * Stop sharing NDEF data via peer-to-peer.
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static unshare(): Promise<any> {return; }
@@ -125,28 +127,28 @@ export class NFC {
   /**
    * Send a file to another device via NFC handover.
    * @param uris A URI as a String, or an array of URIs.
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static handover(uris: string[]): Promise<any> {return; }
 
   /**
    * Stop sharing NDEF data via NFC handover.
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static stopHandover(): Promise<any> {return; }
 
   /**
    * Show the NFC settings on the device.
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static showSettings(): Promise<any> {return; }
 
   /**
    * Check if NFC is available and enabled on this device.
-   * @return {Promise<any>}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static enabled(): Promise<any> {return; }
@@ -155,9 +157,29 @@ export class NFC {
 /**
  * @private
  */
-export declare class Ndef {
-  static uriRecord(uri: string): any;
-  static textRecord(text: string): any;
-  static mimeMediaRecord(mimeType: string, payload: string): any;
-  static androidApplicationRecord(packageName: string): any;
+export class Ndef {
+  /**
+   * @private
+   */
+  static pluginName = 'NFC';
+  /**
+   * @private
+   */
+  static plugin = 'phonegap-nfc';
+  /**
+   * @private
+   */
+  static pluginRef = 'ndef';
+
+  @Cordova({ sync: true })
+  static uriRecord(uri: string): any { return; }
+
+  @Cordova({ sync: true })
+  static textRecord(text: string): any { return; }
+
+  @Cordova({ sync: true })
+  static mimeMediaRecord(mimeType: string, payload: string): any { return; }
+
+  @Cordova({ sync: true })
+  static androidApplicationRecord(packageName: string): any { return; }
 }

src/plugins/onesignal.ts

@@ -30,6 +30,7 @@ import { Observable } from 'rxjs/Observable';
  *
  */
 @Plugin({
+  pluginName: 'OneSignal',
   plugin: 'onesignal-cordova-plugin',
   pluginRef: 'plugins.OneSignal',
   repo: 'https://github.com/OneSignal/OneSignal-Cordova-SDK'
@@ -50,6 +51,7 @@ export class OneSignal {
    *
    * @param {string} appId Your AppId from your OneSignal app
    * @param {string} googleProjectNumber The Google Project Number (which you can get from the Google Developer Portal) and the autoRegister option.
+   * @returns {any}
    */
   @Cordova({ sync: true })
   static startInit(appId: string, googleProjectNumber: string): any { return; }
@@ -75,6 +77,7 @@ export class OneSignal {
   /**
    *
    * @param settings
+   * @returns {any}
    */
   @Cordova({ sync: true })
   static iOSSettings(settings: {
@@ -82,13 +85,16 @@ export class OneSignal {
     kOSSettingsKeyAutoPrompt: boolean;
   }): any { return; }
 
+  /**
+   * @returns {any}
+   */
   @Cordova({ sync: true })
   static endInit(): any { return; }
 
   /**
    * Retrieve a list of tags that have been set on the user from the OneSignal server.
    *
-   * @returns {Promise} Returns a Promise that resolves when tags are recieved.
+   * @returns {Promise<any>} Returns a Promise that resolves when tags are recieved.
    */
   @Cordova()
   static getTags(): Promise<any> { return; }
@@ -97,7 +103,7 @@ export class OneSignal {
    * Lets you retrieve the OneSignal user id and device token.
    * Your handler is called after the device is successfully registered with OneSignal.
    *
-   * @returns {Promise} Returns a Promise that reolves if the device was successfully registered.
+   * @returns {Promise<any>} Returns a Promise that reolves if the device was successfully registered.
    * It returns a JSON with `userId`and `pushToken`.
    */
   @Cordova()
@@ -191,7 +197,7 @@ export class OneSignal {
   /**
   *
   * @param {notificationObj} Parameters see POST [documentation](https://documentation.onesignal.com/v2.0/docs/notifications-create-notification)
-  * @returns {Promise} Returns a Promise that resolves if the notification was send successfully.
+  * @returns {Promise<any>} Returns a Promise that resolves if the notification was send successfully.
   */
   @Cordova()
   static postNotification(notificationObj: OneSignalNotification): Promise<any> { return; }

src/plugins/pay-pal.ts

@@ -58,6 +58,7 @@ import { Plugin, Cordova } from './plugin';
  * PayPalShippingAddress
  */
 @Plugin({
+  pluginName: 'PayPal',
   plugin: 'com.paypal.cordova.mobilesdk',
   pluginRef: 'PayPalMobile',
   repo: 'https://github.com/paypal/PayPal-Cordova-Plugin'
@@ -65,6 +66,7 @@ import { Plugin, Cordova } from './plugin';
 export class PayPal {
   /**
    * Retrieve the version of the PayPal iOS SDK library. Useful when contacting support.
+   * @returns {Promise<string>}
    */
   @Cordova()
   static version(): Promise<string> {return; }
@@ -76,6 +78,7 @@ export class PayPal {
    * the recommended time to preconnect is on page load.
    *
    * @param {PayPalEnvironment} clientIdsForEnvironments: set of client ids for environments
+   * @returns {Promise<any>}
    */
   @Cordova()
   static init(clientIdsForEnvironments: PayPalEnvironment): Promise<any> {return; }
@@ -87,7 +90,8 @@ export class PayPal {
    *
    * @param {String} environment: available options are "PayPalEnvironmentNoNetwork", "PayPalEnvironmentProduction" and "PayPalEnvironmentSandbox"
    * @param {PayPalConfiguration} configuration: PayPalConfiguration object, for Future Payments merchantName, merchantPrivacyPolicyURL and merchantUserAgreementURL must be set be set
-   **/
+   * @returns {Promise<any>}
+   */
   @Cordova()
   static prepareToRender(environment: string, configuration: PayPalConfiguration): Promise<any> {return; }
 
@@ -97,6 +101,7 @@ export class PayPal {
    * for more documentation of the params.
    *
    * @param {PayPalPayment} payment PayPalPayment object
+   * @returns {Promise<any>}
    */
   @Cordova()
   static renderSinglePaymentUI(payment: PayPalPayment): Promise<any> {return; }
@@ -109,12 +114,14 @@ export class PayPal {
    * This method MUST be called prior to initiating a pre-consented payment (a "future payment") from a mobile device.
    * Pass the result to your server, to include in the payment request sent to PayPal.
    * Do not otherwise cache or store this value.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static clientMetadataID(): Promise<any> {return; }
 
   /**
    * Please Read Docs on Future Payments at https://github.com/paypal/PayPal-iOS-SDK#future-payments
+   * @returns {Promise<any>}
    */
   @Cordova()
   static renderFuturePaymentUI(): Promise<any> {return; }
@@ -124,7 +131,8 @@ export class PayPal {
    *
    * @param {Array<string>} scopes scopes Set of requested scope-values. Accepted scopes are: openid, profile, address, email, phone, futurepayments and paypalattributes
    * See https://developer.paypal.com/docs/integration/direct/identity/attributes/ for more details
-   **/
+   * @returns {Promise<any>}
+   */
   @Cordova()
   static renderProfileSharingUI(scopes: string[]): Promise<any> {return; }
 }

src/plugins/photo-viewer.ts

@@ -12,6 +12,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'PhotoViewer',
   plugin: 'com-sarriaroman-photoviewer',
   pluginRef: 'PhotoViewer',
   repo: 'https://github.com/sarriaroman/photoviewer'
@@ -24,5 +25,5 @@ export class PhotoViewer {
    * @param options {any}
    */
   @Cordova({sync: true})
-  static show(url: string, title?: string, options?: {share?: boolean; }): void { }
+  static show(url: string, title?: string, options?: {share?: boolean}): void { }
 }

src/plugins/pin-dialog.ts

@@ -20,6 +20,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'PinDialog',
   plugin: 'cordova-plugin-pin-dialog',
   pluginRef: 'plugins.pinDialog',
   repo: 'https://github.com/Paldom/PinDialog'
@@ -30,6 +31,7 @@ export class PinDialog {
    * @param {string} message Message to show the user
    * @param {string} title Title of the dialog
    * @param {string[]} buttons Buttons to show
+   * @returns {Promise<{ buttonIndex: number, input1: string }>}
    */
   @Cordova({
     successIndex: 1

src/plugins/plugin.ts

@@ -19,7 +19,7 @@ export const getPlugin = function(pluginRef: string): any {
  * @param method
  */
 export const pluginWarn = function(pluginObj: any, method?: string) {
-  let pluginName = pluginObj.name, plugin = pluginObj.plugin;
+  let pluginName = pluginObj.pluginName, plugin = pluginObj.plugin;
   if (method) {
     console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
   } else {
@@ -65,20 +65,33 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
     obj[opts.errorName] = reject;
     args.push(obj);
   } else if (typeof opts.successIndex !== 'undefined' || typeof opts.errorIndex !== 'undefined') {
-    // If we've specified a success/error index
+    const setSuccessIndex = () => {
+      // If we've specified a success/error index
+      if (opts.successIndex > args.length) {
+        args[opts.successIndex] = resolve;
+      } else {
+        args.splice(opts.successIndex, 0, resolve);
+      }
+    };
 
-    if (opts.successIndex > args.length) {
-      args[opts.successIndex] = resolve;
+    const setErrorIndex = () => {
+      // We don't want that the reject cb gets spliced into the position of an optional argument that has not been defined and thus causing non expected behaviour.
+      if (opts.errorIndex > args.length) {
+        args[opts.errorIndex] = reject; // insert the reject fn at the correct specific index
+      } else {
+        args.splice(opts.errorIndex, 0, reject); // otherwise just splice it into the array
+      }
+    };
+
+    if (opts.successIndex > opts.errorIndex) {
+      setErrorIndex();
+      setSuccessIndex();
     } else {
-      args.splice(opts.successIndex, 0, resolve);
+      setSuccessIndex();
+      setErrorIndex();
     }
 
-    // We don't want that the reject cb gets spliced into the position of an optional argument that has not been defined and thus causing non expected behaviour.
-    if (opts.errorIndex > args.length) {
-      args[opts.errorIndex] = reject; // insert the reject fn at the correct specific index
-    } else {
-      args.splice(opts.errorIndex, 0, reject); // otherwise just splice it into the array
-    }
+
   } else {
     // Otherwise, let's tack them on to the end of the argument list
     // which is 90% of cases
@@ -98,7 +111,7 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts
   if (!pluginInstance) {
     // Do this check in here in the case that the Web API for this plugin is available (for example, Geolocation).
     if (!window.cordova) {
-      cordovaWarn(pluginObj.name, methodName);
+      cordovaWarn(pluginObj.pluginName, methodName);
       return {
         error: 'cordova_not_available'
       };
@@ -183,7 +196,7 @@ function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: a
           return get(window, pluginObj.pluginRef)[opts.clearFunction].call(pluginObj, pluginResult);
         }
       } catch (e) {
-        console.warn('Unable to clear the previous observable watch for', pluginObj.name, methodName);
+        console.warn('Unable to clear the previous observable watch for', pluginObj.pluginName, methodName);
         console.error(e);
       }
     };
@@ -210,7 +223,7 @@ function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
             }
             return pluginObj._objectInstance[opts.clearFunction].call(pluginObj, pluginResult);
           } catch (e) {
-            console.warn('Unable to clear the previous observable watch for', pluginObj.name, methodName);
+            console.warn('Unable to clear the previous observable watch for', pluginObj.pluginName, methodName);
             console.error(e);
           }
         };
@@ -255,7 +268,7 @@ function overrideFunction(pluginObj: any, methodName: string, args: any[], opts:
     if (!pluginInstance) {
       // Do this check in here in the case that the Web API for this plugin is available (for example, Geolocation).
       if (!window.cordova) {
-        cordovaWarn(pluginObj.name, methodName);
+        cordovaWarn(pluginObj.pluginName, methodName);
         observer.error({
           error: 'cordova_not_available'
         });
@@ -313,7 +326,7 @@ export const wrap = function(pluginObj: any, methodName: string, opts: any = {})
  * @usage
  * ```typescript
  * @Plugin({
- *  name: 'MyPlugin',
+ *  pluginName: 'MyPlugin',
  *  plugin: 'cordova-plugin-myplugin',
  *  pluginRef: 'window.myplugin'
  *  })

src/plugins/power-management.ts

@@ -16,6 +16,7 @@ import { Plugin, Cordova } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'PowerManagement',
   plugin: 'cordova-plugin-powermanagement-orig',
   pluginRef: 'powerManagement',
   repo: 'https://github.com/Viras-/cordova-plugin-powermanagement'
@@ -23,18 +24,21 @@ import { Plugin, Cordova } from './plugin';
 export class PowerManagement {
   /**
    * Acquire a wakelock by calling this.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static acquire(): Promise<any> {return; }
 
   /**
    * This acquires a partial wakelock, allowing the screen to be dimmed.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static dim(): Promise<any> {return; }
 
   /**
    * Release the wakelock. It's important to do this when you're finished with the wakelock, to avoid unnecessary battery drain.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static release(): Promise<any> {return; }
@@ -43,6 +47,7 @@ export class PowerManagement {
    * By default, the plugin will automatically release a wakelock when your app is paused (e.g. when the screen is turned off, or the user switches to another app).
    * It will reacquire the wakelock upon app resume. If you would prefer to disable this behaviour, you can use this function.
    * @param set {boolean}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static setReleaseOnPause(set: boolean): Promise<any> {return; }

src/plugins/printer.ts

@@ -61,6 +61,7 @@ export interface PrintOptions {
  * ```
  */
 @Plugin({
+  pluginName: 'Printer',
   plugin: 'de.appplant.cordova.plugin.printer',
   pluginRef: 'cordova.plugins.printer',
   repo: 'https://github.com/katzer/cordova-plugin-printer.git',
@@ -70,14 +71,16 @@ export class Printer {
 
   /**
    * Checks whether to device is capable of printing.
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static isAvailable(): Promise<boolean> { return; }
 
   /**
    * Sends content to the printer.
-   * @param {content} The content to print. Can be a URL or an HTML string. If a HTML DOM Object is provided, its innerHtml property value will be used.
-   * @param {options} The options to pass to the printer
+   * @param content {string | HTMLElement} The content to print. Can be a URL or an HTML string. If a HTML DOM Object is provided, its innerHtml property value will be used.
+   * @param options {PrintOptions} optional. The options to pass to the printer
+   * @returns {Promise<any>}
    */
   @Cordova()
   static print(content: string | HTMLElement, options?: PrintOptions): Promise<any> { return; }

src/plugins/push.ts

@@ -286,9 +286,11 @@ declare var PushNotification: {
  * ```
  */
 @Plugin({
+  pluginName: 'Push',
   plugin: 'phonegap-plugin-push',
   pluginRef: 'PushNotification',
-  repo: 'https://github.com/phonegap/phonegap-plugin-push'
+  repo: 'https://github.com/phonegap/phonegap-plugin-push',
+  install: 'ionic plugin add phonegap-plugin-push --variable SENDER_ID=XXXXXXXXX'
 })
 export class Push {
 
@@ -310,7 +312,7 @@ export class Push {
    * ```
    *
    * @param {PushOptions} options  The Push [options](https://github.com/phonegap/phonegap-plugin-push/blob/master/docs/API.md#parameters).
-   * @return {PushNotification}  Returns a new [PushNotification](https://github.com/phonegap/phonegap-plugin-push/blob/master/docs/API.md#pushonevent-callback) object.
+   * @returns {PushNotification}  Returns a new [PushNotification](https://github.com/phonegap/phonegap-plugin-push/blob/master/docs/API.md#pushonevent-callback) object.
    */
   @Cordova({
     sync: true
@@ -319,7 +321,7 @@ export class Push {
 
   /**
    * Check whether the push notification permission has been granted.
-   * @return {Promise} Returns a Promise that resolves with an object with one property: isEnabled, a boolean that indicates if permission has been granted.
+   * @return {Promise<{isEnabled: boolean}>} Returns a Promise that resolves with an object with one property: isEnabled, a boolean that indicates if permission has been granted.
    */
   @Cordova()
   static hasPermission(): Promise<{ isEnabled: boolean }> { return; }

src/plugins/safari-view-controller.ts

@@ -39,6 +39,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'SafariViewController',
   plugin: 'cordova-plugin-safariviewcontroller',
   pluginRef: 'SafariViewController',
   platforms: ['iOS', 'Android'],
@@ -48,13 +49,15 @@ export class SafariViewController {
 
   /**
    * Checks if SafariViewController is available
+   * @returns {Promise<boolean>}
    */
   @Cordova()
   static isAvailable(): Promise<boolean> { return; }
 
   /**
    * Shows Safari View Controller
-   * @param options
+   * @param options {SafariViewControllerOptions} optional
+   * @returns {Promise<any>}
    */
   @Cordova()
   static show(options?: SafariViewControllerOptions): Promise<any> { return; }
@@ -67,19 +70,22 @@ export class SafariViewController {
 
   /**
    * Tries to connect to the  Chrome's custom tabs service. you must call this method before calling any of the other methods listed below.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static connectToService(): Promise<any> { return; }
 
   /**
    * Call this method whenever there's a chance the user will open an external url.
+   * @returns {Promise<any>}
    */
   @Cordova()
   static warmUp(): Promise<any> { return; }
 
   /**
    * For even better performance optimization, call this methods if there's more than a 50% chance the user will open a certain URL.
-   * @param url
+   * @param url{string}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static mayLaunchUrl(url: string): Promise<any> { return; }

src/plugins/screen-orientation.ts

@@ -23,9 +23,9 @@ declare var window;
  * ```
  *
  * @advanced
- * 
+ *
  * Accepted orientation values:
- * 
+ *
  * | Value                         | Description                                                                  |
  * |-------------------------------|------------------------------------------------------------------------------|
  * | portrait-primary              | The orientation is in the primary portrait mode.                             |
@@ -34,9 +34,10 @@ declare var window;
  * | landscape-secondary           | The orientation is in the secondary landscape mode.                          |
  * | portrait                      | The orientation is either portrait-primary or portrait-secondary (sensor).   |
  * | landscape                     | The orientation is either landscape-primary or landscape-secondary (sensor). |
- * 
+ *
  */
 @Plugin({
+  pluginName: 'ScreenOrientation',
   plugin: 'cordova-plugin-screen-orientation',
   pluginRef: 'window.screen',
   repo: 'https://github.com/apache/cordova-plugin-screen-orientation',
@@ -47,7 +48,7 @@ export class ScreenOrientation {
   /**
    * Lock the orientation to the passed value.
    * See below for accepted values
-   * @param {orientation} The orientation which should be locked. Accepted values see table below.
+   * @param orientation {string} The orientation which should be locked. Accepted values see table below.
    */
   @Cordova({ sync: true })
   static lockOrientation(orientation: string): void { }

src/plugins/screenshot.ts

@@ -17,6 +17,7 @@ declare var navigator: any;
  * ```
  */
 @Plugin({
+  pluginName: 'Screenshot',
   plugin: 'https://github.com/gitawego/cordova-screenshot.git',
   pluginRef: 'navigator.screenshot',
   repo: 'https://github.com/gitawego/cordova-screenshot.git'
@@ -31,6 +32,7 @@ export class Screenshot {
    * @param {number} quality. Determines the quality of the screenshot.
    *        Default quality is set to 100.
    * @param {string} filename. Name of the file as stored on the storage
+   * @returns {Promise<any>}
    */
   static save(format?: string, quality?: number, filename?: string): Promise<any> {
     return new Promise<any>(
@@ -56,6 +58,7 @@ export class Screenshot {
    *
    * @param {number} quality. Determines the quality of the screenshot.
    *        Default quality is set to 100.
+   * @returns {Promise<any>}
    */
   static URI(quality?: number): Promise<any> {
     return new Promise<any>(

src/plugins/securestorage.ts

@@ -40,6 +40,7 @@ declare var cordova: any;
  * ```
  */
 @Plugin({
+  pluginName: 'SecureStorage',
   plugin: 'cordova-plugin-secure-storage',
   pluginRef: 'plugins.securestorage',
   repo: 'https://github.com/Crypho/cordova-plugin-secure-storage',
@@ -54,6 +55,7 @@ export class SecureStorage {
   /**
    * Creates a namespaced storage.
    * @param store {string}
+   * @returns {Promise<any>}
    */
   create(store: string): Promise<any> {
     return new Promise((res, rej) => {
@@ -64,6 +66,7 @@ export class SecureStorage {
   /**
    * Gets a stored item
    * @param reference {string}
+   * @returns {Promise<any>}
    */
  @CordovaInstance({
     callbackOrder: 'reverse'
@@ -74,6 +77,7 @@ export class SecureStorage {
    * Stores a value
    * @param reference {string}
    * @param value {string}
+   * @returns {Promise<any>}
    */
  @CordovaInstance({
     callbackOrder: 'reverse'
@@ -83,6 +87,7 @@ export class SecureStorage {
   /**
    * Removes a single stored item
    * @param reference {string}
+   * @returns {Promise<any>}
    */
  @CordovaInstance({
     callbackOrder: 'reverse'

src/plugins/shake.ts

@@ -15,6 +15,7 @@ import { Observable } from 'rxjs/Observable';
  * ```
  */
 @Plugin({
+  pluginName: 'Shake',
   plugin: 'cordova-plugin-shake',
   pluginRef: 'shake',
   repo: 'https://github.com/leecrossley/cordova-plugin-shake'
@@ -23,6 +24,7 @@ export class Shake {
   /**
    * Watch for shake gesture
    * @param sensitivity {number} Optional sensitivity parameter. Defaults to 40
+   * @returns {Observable<any>}
    */
   @Cordova({
     observable: true,

src/plugins/sim.ts

@@ -20,6 +20,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'Sim',
   plugin: 'cordova-plugin-sim',
   pluginRef: 'plugins.sim',
   repo: 'https://github.com/pbakondy/cordova-plugin-sim',
@@ -28,7 +29,7 @@ import { Cordova, Plugin } from './plugin';
 export class Sim {
   /**
    * Returns info from the SIM card.
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static getSimInfo(): Promise<any> { return; }

src/plugins/sms.ts

@@ -40,6 +40,7 @@ export interface SmsOptionsAndroid {
  * ```
  */
 @Plugin({
+  pluginName: 'SMS',
   plugin: 'cordova-sms-plugin',
   pluginRef: 'sms',
   repo: 'https://github.com/cordova-sms/cordova-sms-plugin',
@@ -59,6 +60,15 @@ export class SMS {
     phoneNumber: string | string[],
     message: string,
     options?: SmsOptions
-    ): Promise<any> { return; }
+  ): Promise<any> { return; }
+
+  /**
+   * This function lets you know if the app has permission to send SMS
+   * @return {Promise<boolean>} returns a promise that resolves with a boolean that indicates if we have permission
+   */
+  @Cordova({
+    platforms: ['Android']
+  })
+  static hasPermission(): Promise<boolean> { return; }
 
 }

src/plugins/socialsharing.ts

@@ -25,6 +25,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'SocialSharing',
   plugin: 'cordova-plugin-x-socialsharing',
   pluginRef: 'plugins.socialsharing',
   repo: 'https://github.com/EddyVerbruggen/SocialSharing-PhoneGap-Plugin',
@@ -37,7 +38,7 @@ export class SocialSharing {
    * @param subject {string} The subject
    * @param file {string|string[]} URL(s) to file(s) or image(s), local path(s) to file(s) or image(s), or base64 data of an image. Only the first file/image will be used on Windows Phone.
    * @param url {string} A URL to share
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova()
   static share(message?: string, subject?: string, file?: string|string[], url?: string): Promise<any> { return; }
@@ -45,7 +46,7 @@ export class SocialSharing {
   /**
    * Shares using the share sheet with additional options and returns a result object or an error message (requires plugin version 5.1.0+)
    * @param options {object} The options object with the message, subject, files, url and chooserTitle properties.
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     platforms: ['iOS', 'Android']
@@ -59,7 +60,7 @@ export class SocialSharing {
    * @param subject {string}
    * @param image {string}
    * @param url {string}
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 5,
@@ -73,7 +74,7 @@ export class SocialSharing {
    * @param message {string}
    * @param image {string}
    * @param url {string}
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 3,
@@ -87,7 +88,7 @@ export class SocialSharing {
    * @param message {string}
    * @param image {string}
    * @param url {string}
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 3,
@@ -103,7 +104,7 @@ export class SocialSharing {
    * @param image {string}
    * @param url {string}
    * @param pasteMessageHint {string}
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 4,
@@ -116,7 +117,7 @@ export class SocialSharing {
    * Shares directly to Instagram
    * @param message {string}
    * @param image {string}
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     platforms: ['iOS', 'Android']
@@ -128,7 +129,7 @@ export class SocialSharing {
    * @param message {string}
    * @param image {string}
    * @param url {string}
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 3,
@@ -143,7 +144,7 @@ export class SocialSharing {
    * @param message {string} Message to send
    * @param image {string} Image to send (does not work on iOS
    * @param url {string} Link to send
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 4,
@@ -156,7 +157,7 @@ export class SocialSharing {
    * Share via SMS
    * @param messge {string} message to send
    * @param phoneNumber {string} Number or multiple numbers seperated by commas
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     platforms: ['iOS', 'Android']
@@ -165,7 +166,7 @@ export class SocialSharing {
 
   /**
    * Checks if you can share via email
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     platforms: ['iOS', 'Android']
@@ -180,7 +181,7 @@ export class SocialSharing {
    * @param cc {string[]} Optional
    * @param bcc {string[]} Optional
    * @param files {string|string[]} Optional URL or local path to file(s) to attach
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     platforms: ['iOS', 'Android'],
@@ -196,7 +197,7 @@ export class SocialSharing {
    * @param subject {string}
    * @param image {string}
    * @param url {string}
-   * @returns {Promise}
+   * @returns {Promise<any>}
    */
   @Cordova({
     successIndex: 5,

src/plugins/spinnerdialog.ts

@@ -15,6 +15,7 @@ import { Cordova, Plugin } from './plugin';
  * ```
  */
 @Plugin({
+  pluginName: 'SpinnerDialog',
   plugin: 'cordova-plugin-spinner-dialog',
   pluginRef: 'window.plugins.spinnerDialog',
   repo: 'https://github.com/Paldom/SpinnerDialog',