chore(): update changelog

should fix #642

CHANGELOG.md

@@ -1,3 +1,70 @@
+<a name="2.1.7"></a>
+## [2.1.7](https://github.com/driftyco/ionic-native/compare/v2.1.6...v2.1.7) (2016-10-07)
+
+
+### Bug Fixes
+
+* **paypal:** fixed currency code not found issue ([#653](https://github.com/driftyco/ionic-native/issues/653)) ([598f8a9](https://github.com/driftyco/ionic-native/commit/598f8a9))
+
+
+
+<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)
+
+
+### Bug Fixes
+
+* **google-analytics:** specify successIndex and errorIndex for methods with optional params ([6f23bef](https://github.com/driftyco/ionic-native/commit/6f23bef))
+
+
+
+<a name="2.1.3"></a>
+## [2.1.3](https://github.com/driftyco/ionic-native/compare/v2.1.2...v2.1.3) (2016-10-06)
+
+
+### Bug Fixes
+
+* **google-analytics:** add missing methods, fix return types ([77b0277](https://github.com/driftyco/ionic-native/commit/77b0277))
+* **google-analytics:** add newSession param ([f62e108](https://github.com/driftyco/ionic-native/commit/f62e108))
+* **google-analytics:** fix depreciated plugin reference ([40325ca](https://github.com/driftyco/ionic-native/commit/40325ca))
+
+
+
+<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)
+
+
+### Bug Fixes
+
+* **googlemaps:** add missing properties ([72a694a](https://github.com/driftyco/ionic-native/commit/72a694a)), closes [#642](https://github.com/driftyco/ionic-native/issues/642)
+
+
+### Features
+
+* **zBar:** add zBar barcode scanner plugin ([#634](https://github.com/driftyco/ionic-native/issues/634)) ([bbbbb3e](https://github.com/driftyco/ionic-native/commit/bbbbb3e))
+
+
+
+<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)
 

gulpfile.js

@@ -2,7 +2,7 @@ var gulp = require('gulp');
 var minimist = require('minimist');
 var uglify = require('gulp-uglify');
 var rename = require("gulp-rename");
-var tslint = require('ionic-gulp-tslint');
+var tslint = require('gulp-tslint');
 var decamelize = require('decamelize');
 var replace = require('gulp-replace');
 
@@ -28,7 +28,12 @@ gulp.task("minify:dist", function(){
 });
 
 gulp.task('lint', function() {
-  tslint({src: 'src/**/*.ts'});
+  gulp.src('src/**/*.ts')
+    .pipe(tslint({
+      formatter: "verbose",
+      configuration: 'tslint.json'
+    }))
+    .pipe(tslint.report())
 });
 
 gulp.task('plugin:create', function(){

package.json

@@ -1,10 +1,10 @@
 {
   "name": "ionic-native",
-  "version": "2.1.0",
+  "version": "2.1.7",
   "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
   "main": "dist/es5/index.js",
-  "typings": "dist/es5/index.d.ts",
   "module": "dist/esm/index.js",
+  "typings": "dist/es5/index.d.ts",
   "files": [
     "dist"
   ],
@@ -26,9 +26,8 @@
     "gulp": "^3.9.1",
     "gulp-rename": "^1.2.2",
     "gulp-replace": "^0.5.4",
-    "gulp-tslint": "^5.0.0",
+    "gulp-tslint": "^6.1.2",
     "gulp-uglify": "^1.5.4",
-    "ionic-gulp-tslint": "^1.0.0",
     "jasmine-core": "~2.5.0",
     "karma": "~1.2.0",
     "karma-browserify": "~5.1.0",
@@ -41,7 +40,7 @@
     "q": "1.4.1",
     "semver": "^5.0.1",
     "tsify": "~1.0.4",
-    "tslint": "^3.8.1",
+    "tslint": "^3.15.1",
     "tslint-ionic-rules": "0.0.5",
     "typescript": "^2.0.1",
     "watchify": "~3.7.0"
@@ -52,9 +51,10 @@
     "start": "npm run test:watch",
     "lint": "gulp lint",
     "watch": "tsc -w",
-    "build": "npm run lint && npm run build:js && npm run build:bundle && npm run build:minify",
-    "build:js": "tsc",
-    "build:bundle": "browserify dist/index.js > dist/ionic.native.js",
+    "build": "npm run lint && npm run build:js && npm run build:esm && npm run build:bundle && npm run build:minify",
+    "build:js": "tsc -p tsconfig-es5.json",
+    "build:esm": "tsc -p tsconfig-esm.json",
+    "build:bundle": "browserify dist/es5/index.js > dist/ionic.native.js",
     "build:minify": "gulp minify:dist",
     "shipit": "npm run build && npm publish && bash ./scripts/bower.sh",
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",

scripts/docs/dgeni-config.js

@@ -31,12 +31,37 @@ module.exports = function(currentVersion) {
 //     $runBefore: ['rendering-docs'],
 //     $process: function(docs){
 //       docs.forEach(function(doc){
-//         if (doc.members && doc.name == "IonicApp"){
-//           doc.members.forEach(function(method){
-//             if (method.name === "load") {
-//               console.log(method);
-//             }
-//           })
+//         if (doc.name == "Camera"){
+//
+//           // console.log(doc.tags);
+//           // doc.tags.forEach(function(tag){
+//           //   if(tag.tagName == 'classes'){
+//           //
+//           //   }
+//           // });
+//
+//           // doc.moduleDoc.exports.forEach(function(d,i){
+//           //   if(d.name === 'CameraOptions') {
+//           //     console.log('Name: ' + d.name);
+//           //     console.log('Type: ' + d.docType);
+//           //     console.log('First member: ', d.members[0]);
+//           //   }
+//           // });
+//
+//
+//           // var exports = doc.exportSymbol.parent.exports;
+//           // for(var p in exports) {
+//           //   if(p == 'CameraOptions')
+//           //   {
+//           //     var x = exports[p];
+//           //     console.log(x.members.quality);
+//           //   }
+//           // }
+//           // doc.members.forEach(function(method){
+//           //   if (method.name === "getPicture") {
+//           //     console.log(method);
+//           //   }
+//           // })
 //         }
 //       })
 //     }

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

@@ -1,5 +1,7 @@
 module.exports = [
   {'name': 'advanced'},
   {'name': 'demo'},
-  {'name': 'usage'}
+  {'name': 'usage'},
+  {'name': 'classes'}, // related classes
+  {'name': 'interfaces'} // related interfaces
 ];

scripts/docs/templates/common.template.html

@@ -11,6 +11,39 @@ doc: "<$ doc.name $>"
 docType: "<$ doc.docType $>"
 ---
 
+<@ macro interfaceTable(interface) @>
+<@ for export in doc.moduleDoc.exports -@>
+<@ if export.name == interface @>
+<table class="table param-table" style="margin:0;">
+  <thead>
+  <tr>
+    <th>Param</th>
+    <th>Type</th>
+    <th>Details</th>
+  </tr>
+  </thead>
+  <tbody>
+  <@ for param in export.members @>
+  <tr>
+    <td>
+      <$ param.name $>
+      <@ if param.optional @><div><em>(optional)</em></div><@ endif @>
+    </td>
+    <td>
+      <$ param.returnType | escape $>
+    </td>
+    <td>
+      <$ param.description | marked $>
+    </td>
+  </tr>
+  <@ endfor @>
+  </tbody>
+</table>
+
+<@ endif @>
+<@- endfor @>
+<@ endmacro @>
+
 <@ macro paramList(paramData) -@>
 <@- if paramData -@><span class="params">(
     <@- for param in paramData -@>
@@ -73,15 +106,81 @@ docType: "<$ doc.docType $>"
 <$ typeList(fn.typeList) $> <$ fn.description $>
 <@- endmacro -@>
 
+
+
+<@ macro documentClass(doc) @>
+<@- if doc.statics.length -@>
+<h2>Static Members</h2>
+<@ for method in doc.statics -@>
+<@ if not method.internal @>
+<div id="<$ method.name $>"></div>
+<h3><$ functionSyntax(method) $></h3>
+<@- if method.decorators @>
+<@ for prop in method.decorators[0].argumentInfo @>
+<@ if prop.platforms @>
+<p>
+  <b>Platforms:</b>
+  <@- for platform in prop.platforms @>
+  <code><$ platform $></code>&nbsp;
+  <@ endfor -@>
+</p>
+<@ endif @>
+<@ endfor @>
+<@- endif @>
+
+<$ method.description $>
+
+<@ if method.params @>
+<$ paramTable(method.params) $>
+<@ endif @>
+
+<@ if method.this -@>
+<h4> Method's `this`
+  <$ method.this $>
+</h4>
+<@- endif @>
+
+<@ if method.returns @>
+<div class="return-value" markdown="1">
+  <i class="icon ion-arrow-return-left"></i>
+  <b>Returns:</b> <$ typeInfo(method.returns) $>
+</div>
+<@ endif @>
+<@ endif @>
+<@ endfor -@>
+<@ endif @>
+
+<!-- methods on the class -->
+<@- if doc.members and doc.members.length @>
+
+<h2>Instance Members</h2>
+<@ for method in doc.members -@>
+<div id="<$ method.name $>"></div>
+<h3>
+  <$ functionSyntax(method) $>
+</h3>
+<$ method.description $>
+<@ if method.params -@>
+<$ paramTable(method.params) $>
+<@- endif @>
+<@ if method.this -@>
+<h4> Method's `this`
+  <$ method.this $>
+</h4>
+<@- endif @>
+<@ if method.returns -@>
+<div class="return-value" markdown="1">
+  <i class="icon ion-arrow-return-left"></i>
+  <b>Returns:</b> <$ typeInfo(method.returns) $>
+</div>
+<@- endif @>
+<@- endfor @>
+<@- endif -@>
+<@ endmacro @>
 <@ block body @>
-
-
 <@ block content @>
-
 <@ block header @>
-
 <h1 class="api-title">
-
   <@ if doc.docType == "directive" @>
   <$ doc.name | dashCase $>
   <@ else @>
@@ -108,10 +207,6 @@ docType: "<$ doc.docType $>"
   Improve this doc
 </a>
 
-<@ if doc.codepen @>
-{% include codepen.html id="<$ doc.codepen $>" %}
-<@ endif @>
-
 <@ endblock @>
 
 <!-- decorators -->
@@ -141,9 +236,9 @@ docType: "<$ doc.docType $>"
 <h2>Supported platforms</h2>
 <@ block platforms @>
 <ul>
-  <@- for platform in prop.platforms @>
+  <@ for platform in prop.platforms -@>
   <li><$ platform $></li>
-  <@ endfor -@>
+  <@- endfor @>
 </ul>
 <@ endblock @>
 <!-- @platforms tag end -->
@@ -181,12 +276,11 @@ docType: "<$ doc.docType $>"
   </tr>
   </thead>
   <tbody>
-  <@ for prop in doc.properties @>
+  <@ for prop in doc.properties -@>
   <tr>
     <td>
       <$ prop.name $>
     </td>
-
     <@ if hasTypes @>
     <td>
       <$ prop.type.name $>
@@ -197,86 +291,12 @@ docType: "<$ doc.docType $>"
       <$ prop.description $>
     </td>
   </tr>
-  <@ endfor @>
+  <@- endfor @>
   </tbody>
 </table>
 <@ endif @>
 
-<@- if doc.statics.length -@>
-<h2>Static Members</h2>
-<@- for method in doc.statics @><@ if not method.internal @>
-<div id="<$ method.name $>"></div>
-<h3><$ functionSyntax(method) $></h3>
-
-<@- if method.decorators @>
-<@ for prop in method.decorators[0].argumentInfo @>
-<@ if prop.platforms @>
-<p>
-<b>Platforms:</b>
-<@- for platform in prop.platforms @>
-<code><$ platform $></code>&nbsp;
-<@ endfor -@>
-</p>
-<@ endif @>
-<@ endfor @>
-<@ endif -@>
-
-<$ method.description $>
-
-<@ if method.params @>
-<$ paramTable(method.params) $>
-<@ endif @>
-
-<@ if method.this @>
-<h4> Method's `this`
-  <$ method.this $>
-</h4>
-<@ endif @>
-
-<@ if method.returns @>
-<div class="return-value" markdown="1">
-  <i class="icon ion-arrow-return-left"></i>
-  <b>Returns:</b> <$ typeInfo(method.returns) $>
-</div>
-<@ endif @>
-<@ endif @>
-<@ endfor -@>
-<@ endif @>
-
-<!-- methods on the class -->
-<@- if doc.members and doc.members.length @>
-
-<h2>Instance Members</h2>
-<@- for method in doc.members @>
-
-<div id="<$ method.name $>"></div>
-
-<h3>
-  <$ functionSyntax(method) $>
-</h3>
-
-<$ method.description $>
-
-<@ if method.params @>
-<$ paramTable(method.params) $>
-<@ endif @>
-
-<@ if method.this @>
-<h4> Method's `this`
-  <$ method.this $>
-</h4>
-<@ endif @>
-
-<@ if method.returns @>
-<div class="return-value" markdown="1">
-  <i class="icon ion-arrow-return-left"></i>
-  <b>Returns:</b> <$ typeInfo(method.returns) $>
-</div>
-<@ endif @>
-
-<@ endfor -@>
-
-<@- endif -@>
+<$ documentClass(doc) $>
 
 <@ block advanced @>
 <@- if doc.advanced -@>
@@ -285,6 +305,40 @@ docType: "<$ doc.docType $>"
 <@- endif -@>
 <@ endblock @>
 
+<!-- other classes -->
+<@ for tag in doc.tags.tags -@>
+<@ if tag.tagName == 'classes' -@>
+<h2><a class="anchor" name="related-classes" href="#related-classes"></a>Related Classes</h2>
+<@ set classes = tag.description.split('\n') @>
+<@ for item in classes -@>
+<@ if item.length > 1 @>
+<@ for export in doc.moduleDoc.exports -@>
+<@ if export.name == item @>
+<h3><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h3>
+<$ documentClass(export) $>
+<@ endif @>
+<@- endfor @>
+<@ endif @>
+<@- endfor @>
+<@- endif @>
+<@- endfor @>
+<!-- end other classes -->
+
+<!-- interfaces -->
+<@ for tag in doc.tags.tags -@>
+<@ if tag.tagName == 'interfaces' @>
+<h2><a class="anchor" name="interfaces" href="#interfaces"></a>Interfaces</h2>
+<@ set interfaces = tag.description.split('\n') @>
+<@ for item in interfaces -@>
+<@ if item.length > 1 @>
+<h3><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h3>
+<$ interfaceTable(item) $>
+<@ endif @>
+<@- endfor @>
+<@ endif @>
+<@- endfor @>
+<!-- end interfaces -->
+
 <!-- related link -->
 <@- if doc.see @>
 

src/index.ts

@@ -107,120 +107,114 @@ import { VideoEditor } from './plugins/video-editor';
 import { VideoPlayer } from './plugins/video-player';
 import { WebIntent } from './plugins/webintent';
 import { YoutubeVideoPlayer } from './plugins/youtube-video-player';
+import { ZBar } from './plugins/z-bar';
 import { Zip } from './plugins/zip';
 export * from './plugins/3dtouch';
+export * from './plugins/actionsheet';
+export * from './plugins/admob';
+export * from './plugins/android-fingerprint-auth';
+export * from './plugins/appavailability';
+export * from './plugins/apprate';
+export * from './plugins/appversion';
 export * from './plugins/background-geolocation';
 export * from './plugins/backgroundmode';
+export * from './plugins/badge';
+export * from './plugins/barcodescanner';
+export * from './plugins/base64togallery';
 export * from './plugins/batterystatus';
+export * from './plugins/ble';
+export * from './plugins/bluetoothserial';
+export * from './plugins/brightness';
 export * from './plugins/calendar';
+export * from './plugins/call-number';
 export * from './plugins/camera';
+export * from './plugins/camera-preview';
 export * from './plugins/card-io';
+export * from './plugins/clipboard';
 export * from './plugins/code-push';
 export * from './plugins/contacts';
+export * from './plugins/crop';
 export * from './plugins/datepicker';
+export * from './plugins/dbmeter';
+export * from './plugins/deeplinks';
 export * from './plugins/device';
+export * from './plugins/deviceaccounts';
 export * from './plugins/devicemotion';
 export * from './plugins/deviceorientation';
+export * from './plugins/diagnostic';
+export * from './plugins/dialogs';
+export * from './plugins/emailcomposer';
+export * from './plugins/estimote-beacons';
 export * from './plugins/facebook';
 export * from './plugins/file';
+export * from './plugins/file-chooser';
+export * from './plugins/file-opener';
 export * from './plugins/filetransfer';
+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/hotspot';
 export * from './plugins/httpd';
 export * from './plugins/ibeacon';
 export * from './plugins/imagepicker';
 export * from './plugins/imageresizer';
 export * from './plugins/inappbrowser';
+export * from './plugins/inapppurchase';
+export * from './plugins/insomnia';
+export * from './plugins/instagram';
+export * from './plugins/is-debug';
+export * from './plugins/keyboard';
 export * from './plugins/launchnavigator';
 export * from './plugins/localnotifications';
-export * from './plugins/nfc';
+export * from './plugins/location-accuracy';
+export * from './plugins/market';
 export * from './plugins/media';
 export * from './plugins/media-capture';
 export * from './plugins/mixpanel';
-export * from './plugins/pay-pal';
+export * from './plugins/music-controls';
+export * from './plugins/native-audio';
 export * from './plugins/native-page-transitions';
+export * from './plugins/nativestorage';
+export * from './plugins/network';
+export * from './plugins/nfc';
+export * from './plugins/onesignal';
+export * from './plugins/pay-pal';
+export * from './plugins/photo-viewer';
+export * from './plugins/pin-dialog';
+export * from './plugins/plugin';
+export * from './plugins/power-management';
 export * from './plugins/printer';
 export * from './plugins/push';
 export * from './plugins/safari-view-controller';
+export * from './plugins/screen-orientation';
+export * from './plugins/screenshot';
+export * from './plugins/securestorage';
+export * from './plugins/shake';
+export * from './plugins/sim';
 export * from './plugins/sms';
+export * from './plugins/socialsharing';
 export * from './plugins/spinnerdialog';
+export * from './plugins/splashscreen';
+export * from './plugins/sqlite';
+export * from './plugins/statusbar';
+export * from './plugins/stepcounter';
 export * from './plugins/streaming-media';
+export * from './plugins/text-to-speech';
 export * from './plugins/themable-browser';
 export * from './plugins/toast';
+export * from './plugins/touchid';
 export * from './plugins/twitter-connect';
+export * from './plugins/vibration';
 export * from './plugins/video-editor';
 export * from './plugins/video-player';
-export {
-ActionSheet,
-AdMob,
-AndroidFingerprintAuth,
-AppAvailability,
-AppRate,
-AppVersion,
-Badge,
-BarcodeScanner,
-Base64ToGallery,
-BatteryStatus,
-Brightness,
-BLE,
-BluetoothSerial,
-CallNumber,
-CameraPreview,
-Clipboard,
-CodePush,
-Crop,
-DBMeter,
-Deeplinks,
-DeviceAccounts,
-Dialogs,
-Diagnostic,
-EmailComposer,
-EstimoteBeacons,
-File,
-FileChooser,
-FileOpener,
-Flashlight,
-Geofence,
-Globalization,
-GooglePlus,
-GoogleAnalytics,
-Hotspot,
-InAppPurchase,
-Insomnia,
-Instagram,
-IsDebug,
-Keyboard,
-LocationAccuracy,
-MusicControls,
-NativeAudio,
-NativeStorage,
-Network,
-Market,
-OneSignal,
-PhotoViewer,
-ScreenOrientation,
-PinDialog,
-PowerManagement,
-Screenshot,
-SecureStorage,
-Shake,
-SocialSharing,
-Sim,
-Splashscreen,
-SQLite,
-StatusBar,
-Stepcounter,
-TouchID,
-Transfer,
-TextToSpeech,
-Vibration,
-VideoPlayer,
-WebIntent,
-YoutubeVideoPlayer,
-Zip
-}
-
-export * from './plugins/plugin';
+export * from './plugins/webintent';
+export * from './plugins/youtube-video-player';
+export * from './plugins/z-bar';
+export * from './plugins/zip';
 
 // Window export to use outside of a module loading system
 window['IonicNative'] = {
@@ -277,6 +271,7 @@ window['IonicNative'] = {
   ImageResizer,
   InAppBrowser,
   InAppPurchase,
+  Insomnia,
   Instagram,
   IsDebug,
   Keyboard,
@@ -326,6 +321,7 @@ window['IonicNative'] = {
   Vibration,
   WebIntent,
   YoutubeVideoPlayer,
+  ZBar,
   Zip
 };
 

src/plugins/background-geolocation.ts

@@ -267,6 +267,9 @@ export interface Config {
  * BackgroundGeolocation.stop();
  *
  * ```
+ * @interfaces
+ * Location
+ * Config
  */
 @Plugin({
   plugin: 'cordova-plugin-mauron85-background-geolocation',

src/plugins/camera.ts

@@ -7,8 +7,8 @@ export interface CameraOptions {
   /**
    * Choose the format of the return value.
    * Defined in navigator.camera.DestinationType. Default is FILE_URI.
-   *      DATA_URL : 0,   Return image as base64-encoded string
-   *      FILE_URI : 1,   Return image 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
    *          (e.g., assets-library:// on iOS or content:// on Android)
    */
@@ -105,6 +105,9 @@ export interface CameraPopoverOptions {
  *  // Handle error
  * });
  * ```
+ * @interfaces
+ * CameraOptions
+ * CameraPopoverOptions
  */
 @Plugin({
   plugin: 'cordova-plugin-camera',

src/plugins/contacts.ts

@@ -1,9 +1,11 @@
 import { Cordova, CordovaInstance, InstanceProperty, Plugin } from './plugin';
 
-
 declare var window: any,
   navigator: any;
 
+/**
+ * @private
+ */
 export interface IContactProperties {
   /** A globally unique identifier. */
   id?: string;
@@ -75,6 +77,9 @@ export class Contact implements IContactProperties {
   save(): Promise<any> { return; }
 }
 
+/**
+ * @private
+ */
 interface IContactError {
   /** Error code */
   code: number;
@@ -82,6 +87,9 @@ interface IContactError {
   message: string;
 }
 
+/**
+ * @private
+ */
 declare var ContactError: {
   new (code: number): IContactError;
   UNKNOWN_ERROR: number;
@@ -186,13 +194,21 @@ export class ContactAddress implements IContactAddress {
     this._objectInstance = new window.ContactAddress(pref, type, formatted, streetAddress, locality, region, postalCode, country);
   }
 
+  /** Set to true if this ContactAddress contains the user's preferred value. */
   @InstanceProperty get pref(): boolean { return; }
+  /** A string indicating what type of field this is, home for example. */
   @InstanceProperty get type(): string { return; }
+  /** The full address formatted for display. */
   @InstanceProperty get formatted(): string { return; }
+  /** The full street address. */
   @InstanceProperty get streetAddress(): string { return; }
+  /** The city or locality. */
   @InstanceProperty get locality(): string { return; }
+  /** The state or region. */
   @InstanceProperty get region(): string { return; }
+  /** The zip code or postal code. */
   @InstanceProperty get postalCode(): string { return; }
+  /** The country name. */
   @InstanceProperty get country(): string { return; }
 }
 
@@ -217,10 +233,15 @@ export class ContactOrganization implements IContactOrganization {
   constructor() {
     this._objectInstance = new window.ContactOrganization();
   }
+  /** Set to true if this ContactOrganization contains the user's preferred value. */
   @InstanceProperty get pref(): boolean { return; }
+  /** A string that indicates what type of field this is, home for example. */
   @InstanceProperty get type(): string { return; }
+  /** The name of the organization. */
   @InstanceProperty get name(): string { return; }
+  /** The department the contract works for. */
   @InstanceProperty get department(): string { return; }
+  /** The contact's title at the organization. */
   @InstanceProperty get title(): string { return; }
 }
 
@@ -232,6 +253,10 @@ export interface IContactFindOptions {
   multiple?: boolean;
   /* Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields. */
   desiredFields?: string[];
+  /**
+   * (Android only): Filters the search to only return contacts with a phone number informed.
+   */
+  hasPhoneNumber?: boolean;
 }
 
 /**
@@ -244,9 +269,24 @@ export class ContactFindOptions implements IContactFindOptions {
     this._objectInstance = new window.ContactFindOptions();
   }
 
+  /**
+   * The search string used to find navigator.contacts. (Default: "")
+   */
   @InstanceProperty get filter(): string { return; }
+
+  /**
+   * Determines if the find operation returns multiple navigator.contacts. (Default: false)
+   */
   @InstanceProperty get multiple(): boolean { return; }
+
+  /**
+   * Contact fields to be returned back. If specified, the resulting Contact object only features values for these fields.
+   */
   @InstanceProperty get desiredFields(): any { return; }
+
+  /**
+   * (Android only): Filters the search to only return contacts with a phone number informed.
+   */
   @InstanceProperty get hasPhoneNumber(): boolean { return; }
 }
 
@@ -268,8 +308,12 @@ export class ContactFindOptions implements IContactFindOptions {
  *   (error: any) => console.error('Error saving contact.', error)
  * );
  * ```
- *
- *
+ * @interfaces
+ * IContactProperties
+ * @classes
+ * ContactFindOptions
+ * ContactOrganization
+ * ContactAddress
  */
 @Plugin({
   plugin: 'cordova-plugin-contacts',

src/plugins/estimote-beacons.ts

@@ -272,7 +272,7 @@ export class EstimoteBeacons {
    *
    * @usage
    * ```
-   * let region: BeaconRegion = {} // Empty region matches all beacons.
+   * let region: EstimoteBeaconRegion = {} // Empty region matches all beacons.
    * EstimoteBeacons.startRangingBeaconsInRegion(region).subscribe(info => {
    *   console.log(JSON.stringify(info));
    * });
@@ -280,7 +280,7 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopRangingBeaconsInRegion(region).then(() => { console.log('scan stopped'); });
    * }, 5000);
    * ```
-   * @param region {BeaconRegion} Dictionary with region properties (mandatory).
+   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
    * @return Returns an Observable that notifies of each beacon discovered.
    */
   @Cordova({
@@ -288,14 +288,14 @@ export class EstimoteBeacons {
     clearFunction: 'stopRangingBeaconsInRegion',
     clearWithArgs: true
   })
-  static startRangingBeaconsInRegion(region: BeaconRegion): Observable<any> { return; }
+  static startRangingBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
 
   /**
    * Stop ranging beacons. Available on iOS and Android.
    *
    * @usage
    * ```
-   * let region: BeaconRegion = {} // Empty region matches all beacons.
+   * let region: EstimoteBeaconRegion = {} // Empty region matches all beacons.
    * EstimoteBeacons.startRangingBeaconsInRegion(region).subscribe(info => {
    *   console.log(JSON.stringify(info));
    * });
@@ -303,11 +303,11 @@ export class EstimoteBeacons {
    *   EstimoteBeacons.stopRangingBeaconsInRegion(region).then(() => { console.log('scan stopped'); });
    * }, 5000);
    * ```
-   * @param region {BeaconRegion} Dictionary with region properties (mandatory).
+   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
    * @return returns a Promise.
    */
   @Cordova()
-  static stopRangingBeaconsInRegion(region: BeaconRegion): Promise<any> { return; }
+  static stopRangingBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start ranging secure beacons. Available on iOS.
@@ -321,7 +321,7 @@ export class EstimoteBeacons {
     clearFunction: 'stopRangingSecureBeaconsInRegion',
     clearWithArgs: true
   })
-  static startRangingSecureBeaconsInRegion(region: BeaconRegion): Observable<any> { return; }
+  static startRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Observable<any> { return; }
 
   /**
    * Stop ranging secure beacons. Available on iOS.
@@ -329,19 +329,19 @@ export class EstimoteBeacons {
    * {@link EstimoteBeacons.stopRangingBeaconsInRegion}.
    */
   @Cordova()
-  static stopRangingSecureBeaconsInRegion(region: BeaconRegion): Promise<any> { return; }
+  static stopRangingSecureBeaconsInRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start monitoring beacons. Available on iOS and Android.
    *
    * @usage
    * ```
-   * let region: BeaconRegion = {} // Empty region matches all beacons.
+   * let region: EstimoteBeaconRegion = {} // Empty region matches all beacons.
    * EstimoteBeacons.startMonitoringForRegion(region).subscribe(state => {
    *   console.log('Region state: ' + JSON.stringify(state));
    * });
    * ```
-   * @param region {BeaconRegion} Dictionary with region properties (mandatory).
+   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
    * @param [notifyEntryStateOnDisplay=false] {boolean} Set to true to detect if you
    * are inside a region when the user turns display on, see
    * {@link https://developer.apple.com/library/prerelease/ios/documentation/CoreLocation/Reference/CLBeaconRegion_class/index.html#//apple_ref/occ/instp/CLBeaconRegion/notifyEntryStateOnDisplay|iOS documentation}
@@ -355,21 +355,21 @@ export class EstimoteBeacons {
     successIndex: 1,
     errorIndex: 2
   })
-  static startMonitoringForRegion(region: BeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
+  static startMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
 
   /**
    * Stop monitoring beacons. Available on iOS and Android.
    *
    * @usage
    * ```
-   * let region: BeaconRegion = {} // Empty region matches all beacons.
+   * let region: EstimoteBeaconRegion = {} // Empty region matches all beacons.
    * EstimoteBeacons.stopMonitoringForRegion(region).then(() => { console.log('monitoring is stopped'); });
    * ```
-   * @param region {BeaconRegion} Dictionary with region properties (mandatory).
+   * @param region {EstimoteBeaconRegion} Dictionary with region properties (mandatory).
    * @return returns a Promise.
    */
   @Cordova()
-  static stopMonitoringForRegion(region: BeaconRegion): Promise<any> { return; }
+  static stopMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Start monitoring secure beacons. Available on iOS.
@@ -378,6 +378,8 @@ export class EstimoteBeacons {
    * To use secure beacons set the App ID and App Token using
    * {@link EstimoteBeacons.setupAppIDAndAppToken}.
    * @see {@link EstimoteBeacons.startMonitoringForRegion}
+   * @param region {EstimoteBeaconRegion} Region
+   * @param notifyEntryStateOnDisplay {boolean}
    */
   @Cordova({
     observable: true,
@@ -386,16 +388,17 @@ export class EstimoteBeacons {
     successIndex: 1,
     errorIndex: 2
   })
-  static startSecureMonitoringForRegion(region: BeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
+  static startSecureMonitoringForRegion(region: EstimoteBeaconRegion, notifyEntryStateOnDisplay: boolean): Observable<any> { return; }
 
 
   /**
   * Stop monitoring secure beacons. Available on iOS.
   * This function has the same parameters/behaviour as
   * {@link EstimoteBeacons.stopMonitoringForRegion}.
+   * @param region {EstimoteBeaconRegion} Region
   */
   @Cordova()
-  static stopSecureMonitoringForRegion(region: BeaconRegion): Promise<any> { return; }
+  static stopSecureMonitoringForRegion(region: EstimoteBeaconRegion): Promise<any> { return; }
 
   /**
    * Connect to Estimote Beacon. Available on Android.
@@ -473,7 +476,7 @@ export class EstimoteBeacons {
 
 }
 
-export interface BeaconRegion {
+export interface EstimoteBeaconRegion {
   state?: string;
   major: number;
   minor: number;

src/plugins/geolocation.ts

@@ -121,14 +121,22 @@ export interface GeolocationOptions {
  * Geolocation.getCurrentPosition().then((resp) => {
  *  // resp.coords.latitude
  *  // resp.coords.longitude
- * })
+ * }).catch((error) => {
+ *   console.log('Error getting location', error);
+ * });
  *
  * let watch = Geolocation.watchPosition();
  * watch.subscribe((data) => {
+ *  // data can be a set of coordinates, or an error (if an error occurred).
  *  // data.coords.latitude
  *  // data.coords.longitude
- * })
+ * });
  * ```
+ * @interfaces
+ * Coordinates
+ * Geoposition
+ * PositionError
+ * GeolocationOptions
  */
 @Plugin({
   plugin: 'cordova-plugin-geolocation',

src/plugins/googleanalytics.ts

@@ -14,7 +14,7 @@ declare var window;
  */
 @Plugin({
   plugin: 'cordova-plugin-google-analytics',
-  pluginRef: 'analytics',
+  pluginRef: 'ga',
   repo: 'https://github.com/danwilson/google-analytics-plugin',
   platforms: ['Android', 'iOS']
 })
@@ -23,45 +23,128 @@ 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>}
    */
   @Cordova()
   static startTrackerWithId(id: string): 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>}
+   */
+  @Cordova()
+  static setAllowIDFACollection(allow: boolean): Promise<any> { return; }
+
+  /**
+   * Set a UserId
+   * https://developers.google.com/analytics/devguides/collection/analyticsjs/user-id
+   * @param {string} id User ID
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static setUserId(id: string): Promise<any> { return; }
+
+  /**
+   * Set a anonymize Ip address
+   * @param anonymize {boolean} Set to true to anonymize the IP Address
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static setAnonymizeIp(anonymize: boolean): Promise<any> { return; }
+
+  /**
+   * Sets the app version
+   * @param appVersion {string} App version
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static setAppVersion(appVersion: string): Promise<any> { return; }
+
+  /**
+   * Set OptOut
+   * @param optout {boolean}
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static setOptOut(optout: boolean): Promise<any> { return; }
+
+  /**
+   * Enable verbose logging
+   * @return {Promise<any>}
+   */
+  @Cordova()
+  static debugMode(): Promise<any> { return; }
+
+  /**
+   * Track custom metric
+   * @param key {string}
+   * @param value {any}
+   * @return {Promise<any>}
+   */
+  @Cordova({
+    successIndex: 2,
+    errorIndex: 3
+  })
+  static trackMetric(key: string, value?: any): Promise<any> { return; }
+
   /**
    * Track a screen
    * https://developers.google.com/analytics/devguides/collection/analyticsjs/screens
    *
-   * @param {string}  title         Screen title
-   * @param {string}  campaignUrl   Campaign url for measuring referrals
+   * @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>}
+   */
+  @Cordova({
+    successIndex: 3,
+    errorIndex: 4
+  })
+  static trackView(title: string, campaignUrl?: string, newSession?: boolean): Promise<any> { return; }
+
+  /**
+   * Add a Custom Dimension
+   * https://developers.google.com/analytics/devguides/platform/customdimsmets
+   * @param key {string}
+   * @param value {string}
+   * @return {Promise<any>}
    */
   @Cordova()
-  static trackView(title: string, campaignUrl?: string): Promise<any> { return; }
+  static addCustomDimension(key: number, value: string): Promise<any> { return; }
 
   /**
    * Track an event
    * https://developers.google.com/analytics/devguides/collection/analyticsjs/events
-   * @param {string}  category
-   * @param {string}  action
-   * @param {string}  label
-   * @param {number}  value
+   * @param category {string}
+   * @param action {string}
+   * @param label {string}
+   * @param value {number}
+   * @param newSession {boolean} Set to true to create a new session
+   * @return {Promise<any>}
    */
-  @Cordova()
-  static trackEvent(category: string, action: string, label?: string, value?: number): Promise<any> { return; }
+  @Cordova({
+    successIndex: 5,
+    errorIndex: 6
+  })
+  static trackEvent(category: string, action: string, label?: string, value?: number, newSession?: boolean): Promise<any> { return; }
 
   /**
    * Track an exception
-   * @param {string}  description
-   * @param {boolean} fatal
+   * @param description {string}
+   * @param fatal {boolean}
+   * @return {Promise<any>}
    */
   @Cordova()
   static trackException(description: string, fatal: boolean): Promise<any> { return; }
 
   /**
    * Track User Timing (App Speed)
-   * @param {string}  category
-   * @param {number}  intervalInMilliseconds
-   * @param {string}  variable
-   * @param {string}  label
+   * @param category {string}
+   * @param intervalInMilliseconds {number}
+   * @param variable {string}
+   * @param label {string}
+   * @return {Promise<any>}
    */
   @Cordova()
   static trackTiming(category: string, intervalInMilliseconds: number, variable: string, label: string): Promise<any> { return; }
@@ -69,12 +152,13 @@ export class GoogleAnalytics {
   /**
    * Add a Transaction (Ecommerce)
    * https://developers.google.com/analytics/devguides/collection/analyticsjs/ecommerce#addTrans
-   * @param {string}  id
-   * @param {string}  affiliation
-   * @param {number}  revenue
-   * @param {number}  tax
-   * @param {number}  shipping
-   * @param {string}  currencyCode
+   * @param id {string}
+   * @param affiliation {string}
+   * @param revenue {number}
+   * @param tax {number}
+   * @param shipping {number}
+   * @param currencyCode {string}
+   * @return {Promise<any>}
    */
   @Cordova()
   static addTransaction(id: string, affiliation: string, revenue: number, tax: number, shipping: number, currencyCode: string): Promise<any> { return; }
@@ -89,57 +173,15 @@ export class GoogleAnalytics {
    * @param {number}  price
    * @param {number}  quantity
    * @param {string}  currencyCode
+   * @return {Promise<any>}
    */
   @Cordova()
   static addTransactionItem(id: string, name: string, sku: string, category: string, price: number, quantity: number, currencyCode: string): Promise<any> { return; }
 
-  /**
-   * Add a Custom Dimension
-   * https://developers.google.com/analytics/devguides/platform/customdimsmets
-   * @param {string}  key
-   * @param {string}  value
-   */
-  @Cordova()
-  static addCustomDimension(key: number, value: string): Promise<any> { return; }
-
-  /**
-   * Set a UserId
-   * https://developers.google.com/analytics/devguides/collection/analyticsjs/user-id
-   * @param {string}  id
-   */
-  @Cordova({sync: true})
-  static setUserId(id: string): void { }
-
-  /**
-   * Sets the app version
-   * @param appVersion
-   */
-  @Cordova({sync: true})
-  static setAppVersion(appVersion: string): void { }
-
-  /**
-   * Set a anonymize Ip address
-   * @param anonymize
-   */
-  @Cordova({sync: true})
-  static setAnonymizeIp(anonymize: boolean): void { }
-
-  /**
-   * Enabling Advertising Features in Google Analytics allows you to take advantage of Remarketing, Demographics & Interests reports, and more
-   * @param allow
-   */
-  @Cordova({sync: true})
-  static setAllowIDFACollection(allow: boolean): void { }
-
-  /**
-   * Enable verbose logging
-   */
-  @Cordova({sync: true})
-  static debugMode(): Promise<any> { return; }
-
   /**
    * Enable/disable automatic reporting of uncaught exceptions
-   * @param {boolean} shouldEnable
+   * @param shouldEnable {boolean}
+   * @return {Promise<any>}
    */
   @Cordova()
   static enableUncaughtExceptionReporting(shouldEnable: boolean): Promise<any> { return; }

src/plugins/googlemaps.ts

@@ -1,4 +1,4 @@
-import { Cordova, CordovaInstance, Plugin } from './plugin';
+import {Cordova, CordovaInstance, Plugin, InstanceProperty} from './plugin';
 import { Observable } from 'rxjs/Observable';
 
 
@@ -851,7 +851,10 @@ export class GoogleMapsKmlOverlay {
 export class GoogleMapsLatLngBounds {
   private _objectInstance: any;
 
-  constructor(public southwestOrArrayOfLatLng: GoogleMapsLatLng | GoogleMapsLatLng[], public northeast?: GoogleMapsLatLng) {
+  @InstanceProperty get northeast(): GoogleMapsLatLng { return; }
+  @InstanceProperty get southwest(): GoogleMapsLatLng { return; }
+
+  constructor(southwestOrArrayOfLatLng: GoogleMapsLatLng | GoogleMapsLatLng[], northeast?: GoogleMapsLatLng) {
     let args = !!northeast ? [southwestOrArrayOfLatLng, northeast] : southwestOrArrayOfLatLng;
     this._objectInstance = new plugin.google.maps.LatLngBounds(args);
   }
@@ -878,7 +881,10 @@ export class GoogleMapsLatLngBounds {
 export class GoogleMapsLatLng {
   private _objectInstance: any;
 
-  constructor(public lat: number, public lng: number) {
+  @InstanceProperty get lat(): number { return; }
+  @InstanceProperty get lng(): number { return; }
+
+  constructor(lat: number, lng: number) {
     this._objectInstance = new plugin.google.maps.LatLng(lat, lng);
   }
 

src/plugins/hotspot.ts

@@ -155,10 +155,10 @@ export class Hotspot {
   static isWifiDirectSupported(): Promise<boolean> { return; }
 
   @Cordova()
-  static scanWifi(): Promise<Array<Network>> { return; }
+  static scanWifi(): Promise<Array<HotspotNetwork>> { return; }
 
   @Cordova()
-  static scanWifiByLevel(): Promise<Array<Network>> { return; }
+  static scanWifiByLevel(): Promise<Array<HotspotNetwork>> { return; }
 
   @Cordova()
   static startWifiPeriodicallyScan(interval: number, duration: number): Promise<any> { return; }
@@ -167,7 +167,7 @@ export class Hotspot {
   static stopWifiPeriodicallyScan(): Promise<any> { return; }
 
   @Cordova()
-  static getNetConfig(): Promise<NetworkConfig> { return; }
+  static getNetConfig(): Promise<HotspotNetworkConfig> { return; }
 
   @Cordova()
   static getConnectionInfo(): Promise<ConnectionInfo> { return; }
@@ -217,90 +217,90 @@ export class Hotspot {
 
 export interface ConnectionInfo {
   /**
-   * @property {string}   SSID
+   *   SSID
    *      The service set identifier (SSID) of the current 802.11 network.
    */
   SSID: string;
   /**
-   * @property {string}   BSSID
+   *   BSSID
    *      The basic service set identifier (BSSID) of the current access point.
    */
   BSSID: string;
   /**
-   * @property {string}   linkSpeed
+   *   linkSpeed
    *      The current link speed in Mbps
    */
   linkSpeed: string;
   /**
-   * @property {string}   IPAddress
+   *   IPAddress
    *      The IP Address
    */
   IPAddress: string;
   /**
-   * @property {string}   networkID
+   *   networkID
    *      Each configured network has a unique small integer ID, used to identify the network when performing operations on the supplicant.
    */
   networkID: string;
 }
 
-export interface Network {
+export interface HotspotNetwork {
   /**
-   * @property {string}       SSID
+   *       SSID
    *      Human readable network name
    */
   SSID: string;
   /**
-   * @property {string}       BSSID
+   *       BSSID
    *      MAC Address of the access point
    */
   BSSID: string;
   /**
-   * @property {number (int)} frequency
+   * frequency
    *      The primary 20 MHz frequency (in MHz) of the channel over which the client is communicating with the access point.
    */
   frequency: number;
   /**
-   * @property {number}       level
+   *       level
    *      The detected signal level in dBm, also known as the RSSI.
    */
   level: number;
   /**
-   * @property {number}       timestamp
+   *       timestamp
    *      Timestamp in microseconds (since boot) when this result was last seen.
    */
   timestamp: number;
   /**
-   * @property {string}       capabilities
+   *       capabilities
    *      Describes the authentication, key management, and encryption schemes supported by the access point.
    */
   capabilities: string;
 }
-export interface NetworkConfig {
+export interface HotspotNetworkConfig {
   /**
-   * @property {string}   deviceIPAddress - Device IP Address
+   *   deviceIPAddress - Device IP Address
    */
   deviceIPAddress: string;
   /**
-   * @property {string}   deviceMacAddress - Device MAC Address
+   *   deviceMacAddress - Device MAC Address
    */
   deviceMacAddress: string;
   /**
-   * @property {string}   gatewayIPAddress - Gateway IP Address
+   *   gatewayIPAddress - Gateway IP Address
    */
   gatewayIPAddress: string;
   /**
-   * @property {string}   gatewayMacAddress - Gateway MAC Address
+   *   gatewayMacAddress - Gateway MAC Address
    */
   gatewayMacAddress: string;
 }
 export interface HotspotDevice {
   /**
-   * @property {string}   ip
+   *   ip
    *      Hotspot IP Address
    */
   ip: string;
   /**
-   * @property {string}   mac
+   *   mac
    *      Hotspot MAC Address
    */
   mac: string;

src/plugins/onesignal.ts

@@ -34,7 +34,7 @@ export class OneSignal {
   /**
    * Only required method you need to call to setup OneSignal to receive push notifications. Call this from the `deviceready` event.
    *
-   * @param {appId} Your AppId from your OneSignal app
+   * @param {string} Your AppId from your OneSignal app
    * @param {options} The Google Project Number (which you can get from the Google Developer Potal) and the autoRegister option.
    * @returns {Observable} when a notification is received. Handle your notification action here.
    */
@@ -58,8 +58,8 @@ export class OneSignal {
    * Tag a user based on an app event of your choosing so later you can create segments on [onesignal.com](https://onesignal.com/) to target these users.
    * Recommend using sendTags over sendTag if you need to set more than one tag on a user at a time.
    *
-   * @param {key} Key of your choosing to create or update.
-   * @param {value} Value to set on the key. NOTE: Passing in a blank String deletes the key, you can also call deleteTag.
+   * @param {string} Key of your choosing to create or update.
+   * @param {string} Value to set on the key. NOTE: Passing in a blank String deletes the key, you can also call deleteTag.
    */
   @Cordova({ sync: true })
   static sendTag(key: string, value: string): void { }
@@ -68,7 +68,7 @@ export class OneSignal {
  * Tag a user based on an app event of your choosing so later you can create segments on [onesignal.com](https://onesignal.com/) to target these users.
  * Recommend using sendTags over sendTag if you need to set more than one tag on a user at a time.
  *
- * @param {json} Pass a json object with key/value pairs like: {key: "value", key2: "value2"}
+ * @param {string} Pass a json object with key/value pairs like: {key: "value", key2: "value2"}
  */
   @Cordova({ sync: true })
   static sendTags(json: any): void { }
@@ -84,7 +84,7 @@ export class OneSignal {
   /**
   * Deletes a tag that was previously set on a user with `sendTag` or `sendTags`. Use `deleteTags` if you need to delete more than one.
   *
-  * @param {key} Key to remove.
+  * @param {string} Key to remove.
   */
   @Cordova({ sync: true })
   static deleteTag(key: string): void { }
@@ -92,7 +92,7 @@ export class OneSignal {
   /**
   * Deletes tags that were previously set on a user with `sendTag` or `sendTags`.
   *
-  * @param {keys} Keys to remove.
+  * @param {Array<string>} Keys to remove.
   */
   @Cordova({ sync: true })
   static deleteTags(keys: string[]): void { }
@@ -114,7 +114,7 @@ export class OneSignal {
   * By default OneSignal always vibrates the device when a notification is displayed unless the device is in a total silent mode.
   * Passing false means that the device will only vibrate lightly when the device is in it's vibrate only mode.
   *
-  * @param {enable} false to disable vibrate, true to re-enable it.
+  * @param {boolean} false to disable vibrate, true to re-enable it.
   */
   @Cordova({ sync: true })
   static enableVibrate(enable: boolean): void { }
@@ -126,7 +126,7 @@ export class OneSignal {
   * By default OneSignal plays the system's default notification sound when the device's notification system volume is turned on.
   * Passing false means that the device will only vibrate unless the device is set to a total silent mode.
   *
-  * @param {enable} false to disable sound, true to re-enable it.
+  * @param {boolean} false to disable sound, true to re-enable it.
   */
   @Cordova({ sync: true })
   static enableSound(enable: boolean): void { }
@@ -138,7 +138,7 @@ export class OneSignal {
   * By default this is false and notifications will not be shown when the user is in your app, instead the notificationOpenedCallback is fired.
   * If set to true notifications will always show in the notification area and notificationOpenedCallback will not fire until the user taps on the notification.
   *
-  * @param {enable} enable
+  * @param {boolean} enable
   */
   @Cordova({ sync: true })
   static enableNotificationsWhenActive(enable: boolean): void { }
@@ -148,7 +148,7 @@ export class OneSignal {
   * If set to true notifications will be shown as native alert boxes if a notification is received when the user is in your app.
   * The notificationOpenedCallback is then fired after the alert box is closed.
   *
-  * @param {enable} enable
+  * @param {boolean} enable
   */
   @Cordova({ sync: true })
   static enableInAppAlertNotification(enable: boolean): void { }
@@ -157,7 +157,7 @@ export class OneSignal {
   * You can call this method with false to opt users out of receiving all notifications through OneSignal.
   * You can pass true later to opt users back into notifications.
   *
-  * @param {enable} enable
+  * @param {boolean} enable
   */
   @Cordova({ sync: true })
   static setSubscription(enable: boolean): void { }

src/plugins/pay-pal.ts

@@ -18,10 +18,11 @@ import { Plugin, Cordova } from './plugin';
  * ```
  * @interfaces
  * PayPalEnvironment
- * PayPalPayment
- * PayPAlItem
- * PayPalPaymentDetails
  * PayPalConfigurationOptions
+ * @classes
+ * PayPalPayment
+ * PayPalItem
+ * PayPalPaymentDetails
  * PayPalShippingAddress
  */
 @Plugin({
@@ -36,8 +37,8 @@ export class PayPal {
    * UI faster. The preconnect is valid for a limited time, so
    * the recommended time to preconnect is on page load.
    *
-   * @param {String} environment: available options are "PayPalEnvironmentNoNetwork", "PayPalEnvironmentProduction" and "PayPalEnvironmentSandbox"
-   * @param {PayPalConfiguration} configuration: For Future Payments merchantName, merchantPrivacyPolicyURL and merchantUserAgreementURL must be set be set
+   * @param {String} environment available options are "PayPalEnvironmentNoNetwork", "PayPalEnvironmentProduction" and "PayPalEnvironmentSandbox"
+   * @param {PayPalConfiguration} configuration For Future Payments merchantName, merchantPrivacyPolicyURL and merchantUserAgreementURL must be set be set
    */
   @Cordova()
   static init(environment: PayPalEnvironment, configuration?: PayPalConfiguration): Promise<any> {return; }
@@ -53,7 +54,7 @@ export class PayPal {
    * See https://developer.paypal.com/webapps/developer/docs/integration/mobile/ios-integration-guide/
    * for more documentation of the params.
    *
-   * @param {PayPalPayment} payment: PayPalPayment object
+   * @param {PayPalPayment} payment PayPalPayment object
    */
   @Cordova()
   static renderSinglePaymentUI(payment: PayPalPayment): Promise<any> {return; }
@@ -79,7 +80,7 @@ export class PayPal {
   /**
    * Please Read Docs on Profile Sharing at https://github.com/paypal/PayPal-iOS-SDK#profile-sharing
    *
-   * @param {Array<string>} scopes: scopes Set of requested scope-values. Accepted scopes are: openid, profile, address, email, phone, futurepayments and paypalattributes
+   * @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
    **/
   @Cordova()
@@ -91,21 +92,26 @@ export interface PayPalEnvironment {
   PayPalEnvironmentProduction: string;
   PayPalEnvironmentSandbox: string;
 }
-export declare var PayPalPayment: {
+
+/**
+ * @private
+ */
+export class PayPalPayment {
   /**
    * Convenience constructor.
    * Returns a PayPalPayment with the specified amount, currency code, and short description.
    * @param {String} amount: The amount of the payment.
-   * @param {String} currencyCode: The ISO 4217 currency for the payment.
+   * @param {String} currency: The ISO 4217 currency for the payment.
    * @param {String} shortDescription: A short description of the payment.
    * @param {String} intent: "Sale" for an immediate payment.
    */
-  new(amount: string, currencyCode: string, shortDescription: string, intent: string): PayPalPayment;
-};
-/**
- * @private
- */
-export interface PayPalPayment {
+  constructor(amount: string, currency: string, shortDescription: string, intent: string) {
+    this.amount = amount;
+    this.currency = currency;
+    this.shortDescription = shortDescription;
+    this.intent = intent;
+  }
+
   /**
    * The amount of the payment.
    */
@@ -113,7 +119,7 @@ export interface PayPalPayment {
   /**
    * The ISO 4217 currency for the payment.
    */
-  currencyCode: string;
+  currency: string;
   /**
    * A short description of the payment.
    */
@@ -126,7 +132,7 @@ export interface PayPalPayment {
    * Optional Build Notation code ("BN code"), obtained from partnerprogram@paypal.com,
    * for your tracking purposes.
    */
-  bnCode: string;
+  bnCode: string = 'PhoneGap_SP';
   /**
    * Optional invoice number, for your tracking purposes. (up to 256 characters)
    */
@@ -153,7 +159,27 @@ export interface PayPalPayment {
   shippingAddress: string;
 }
 
-export interface PayPalItem {
+/**
+ * @private
+ */
+export class PayPalItem {
+  /**
+   * The PayPalItem class defines an optional itemization for a payment.
+   * @see https://developer.paypal.com/docs/api/#item-object for more details.
+   * @param {String} name: Name of the item. 127 characters max
+   * @param {Number} quantity: Number of units. 10 characters max.
+   * @param {String} price: Unit price for this item 10 characters max.
+   * May be negative for "coupon" etc
+   * @param {String} currency: ISO standard currency code.
+   * @param {String} sku: The stock keeping unit for this item. 50 characters max (optional)
+   */
+  constructor(name: string, quantity: number, price: string, currency: string, sku: string) {
+    this.name = name;
+    this.quantity = quantity;
+    this.price = price;
+    this.currency = currency;
+    this.sku = sku;
+  }
   /**
    * Name of the item. 127 characters max
    */
@@ -176,21 +202,21 @@ export interface PayPalItem {
   sku: string;
 }
 
-export declare var PayPalItem: {
+/**
+ * @private
+ */
+export class PayPalPaymentDetails {
   /**
-   * The PayPalItem class defines an optional itemization for a payment.
-   * @see https://developer.paypal.com/docs/api/#item-object for more details.
-   * @param {String} name: Name of the item. 127 characters max
-   * @param {Number} quantity: Number of units. 10 characters max.
-   * @param {String} price: Unit price for this item 10 characters max.
-   * May be negative for "coupon" etc
-   * @param {String} currency: ISO standard currency code.
-   * @param {String} sku: The stock keeping unit for this item. 50 characters max (optional)
+   * The PayPalPaymentDetails class defines optional amount details.
+   * @param {String} subtotal: Sub-total (amount) of items being paid for. 10 characters max with support for 2 decimal places.
+   * @param {String} shipping: Amount charged for shipping. 10 characters max with support for 2 decimal places.
+   * @param {String} tax: Amount charged for tax. 10 characters max with support for 2 decimal places.
    */
-  new(name: string, quantity: number, price: string, currency: string, sku: string): PayPalItem;
-};
-
-export interface PayPalPaymentDetails {
+  constructor(subtotal: string, shipping: string, tax: string) {
+    this.subtotal = subtotal;
+    this.shipping = shipping;
+    this.tax = tax;
+  }
   /**
    * Sub-total (amount) of items being paid for. 10 characters max with support for 2 decimal places.
    */
@@ -205,16 +231,6 @@ export interface PayPalPaymentDetails {
   tax: string;
 }
 
-export declare var PayPalPaymentDetails: {
-  /**
-   * The PayPalPaymentDetails class defines optional amount details.
-   * @param {String} subtotal: Sub-total (amount) of items being paid for. 10 characters max with support for 2 decimal places.
-   * @param {String} shipping: Amount charged for shipping. 10 characters max with support for 2 decimal places.
-   * @param {String} tax: Amount charged for tax. 10 characters max with support for 2 decimal places.
-   */
-  new(subtotal: string, shipping: string, tax: string): PayPalPaymentDetails;
-};
-
 /**
  * @private
  */
@@ -238,11 +254,11 @@ export interface PayPalConfigurationOptions {
   /**
    * URL of your company's privacy policy, which will be offered to the user when requesting consent via a PayPalFuturePaymentViewController.
    */
-  merchantPrivacyPolicyUrl?: string;
+  merchantPrivacyPolicyURL?: string;
   /**
    * URL of your company's user agreement, which will be offered to the user when requesting consent via a PayPalFuturePaymentViewController.
    */
-  merchantUserAgreementUrl?: string;
+  merchantUserAgreementURL?: string;
   /**
    * If set to NO, the SDK will only support paying with PayPal, not with credit cards.
    * This applies only to single payments (via PayPalPaymentViewController).
@@ -316,37 +332,47 @@ export interface PayPalConfigurationOptions {
 /**
  * @private
  */
-export declare var PayPalConfiguration: {
+export class PayPalConfiguration implements PayPalConfigurationOptions {
   /**
    * You use a PayPalConfiguration object to configure many aspects of how the SDK behaves.
    * see defaults for options available
    */
-  new(options: PayPalConfigurationOptions): PayPalConfiguration;
-};
-/**
- * @private
- */
-export interface PayPalConfiguration {
-  defaultUserEmail: string;
-  defaultUserPhoneCountryCode: string;
-  defaultUserPhoneNumber: string;
-  merchantName: string;
-  merchantPrivacyPolicyUrl: string;
-  merchantUserAgreementUrl: string;
-  acceptCreditCards: boolean;
-  payPalShippingAddressOption: number;
-  rememberUser: boolean;
-  languageOrLocale: string;
-  disableBlurWhenBackgrounding: boolean;
-  presentingInPopover: boolean;
-  forceDefaultsInSandbox: boolean;
-  sandboxUserPassword: string;
-  sandboxUserPin: string;
+  constructor(options?: PayPalConfigurationOptions) {
+
+    let defaults: PayPalConfigurationOptions = {
+      defaultUserEmail: null,
+      defaultUserPhoneCountryCode: null,
+      defaultUserPhoneNumber: null,
+      merchantName: null,
+      merchantPrivacyPolicyURL: null,
+      merchantUserAgreementURL: null,
+      acceptCreditCards: true,
+      payPalShippingAddressOption: 0,
+      rememberUser: true,
+      languageOrLocale: null,
+      disableBlurWhenBackgrounding: false,
+      presentingInPopover: false,
+      forceDefaultsInSandbox: false,
+      sandboxUserPassword: null,
+      sandboxUserPin: null
+    };
+
+    if (options && typeof options === 'object') {
+      for (var i in options) {
+        if (defaults.hasOwnProperty(i)) {
+          defaults[i] = options[i];
+        }
+      }
+    }
+
+    return defaults;
+  }
 }
+
 /**
  * @private
  */
-export declare var PayPalShippingAddress: {
+export class PayPalShippingAddress {
   /**
    * See the documentation of the individual properties for more detail.
    * @param {String} recipientName: Name of the recipient at this address. 50 characters max.
@@ -357,12 +383,15 @@ export declare var PayPalShippingAddress: {
    * @param {String} postalCode: ZIP code or equivalent is usually required for countries that have them. 20 characters max. Required in certain countries.
    * @param {String} countryCode: 2-letter country code. 2 characters max.
    */
-  new(recipientName: string, line1: string, line2: string, city: string, state: string, postalCode: string, countryCode: string): PayPalShippingAddress;
-};
-/**
- * @private
- */
-export interface PayPalShippingAddress {
+  constructor(recipientName: string, line1: string, line2: string, city: string, state: string, postalCode: string, countryCode: string) {
+    this.recipientName = recipientName;
+    this.line1 = line1;
+    this.line2 = line2;
+    this.city = city;
+    this.state = state;
+    this.postalCode = postalCode;
+    this.countryCode = countryCode;
+  }
   /**
    * Name of the recipient at this address. 50 characters max.
    */

src/plugins/plugin.ts

@@ -61,7 +61,12 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
     args.push(obj);
   } else if (typeof opts.successIndex !== 'undefined' || typeof opts.errorIndex !== 'undefined') {
     // If we've specified a success/error index
-    args.splice(opts.successIndex, 0, resolve);
+
+    if (opts.successIndex > args.length) {
+      args[opts.successIndex] = resolve;
+    } else {
+      args.splice(opts.successIndex, 0, resolve);
+    }
 
     // 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) {
@@ -72,8 +77,10 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
   } else {
     // Otherwise, let's tack them on to the end of the argument list
     // which is 90% of cases
-    args.push(resolve);
-    args.push(reject);
+    if (!opts.sync) {
+      args.push(resolve);
+      args.push(reject);
+    }
   }
   return args;
 }

src/plugins/z-bar.ts

@@ -0,0 +1,91 @@
+import { Plugin, Cordova } from './plugin';
+
+/**
+ * @name ZBar
+ * @description
+ * The ZBar Scanner Plugin allows you to scan 2d barcodes.
+ *
+ * Requires Cordova plugin: `cordova-plugin-cszbar`. For more info, please see the [zBar plugin docs](https://github.com/tjwoon/csZBar).
+ *
+ * @usage
+ * ```
+ * import { ZBar } from 'ionic-native';
+ *
+ * let zBarOptions = {
+ *       flash: "off",
+ *       drawSight: false
+ *     };
+ *
+ * ZBar.scan(zBarOptions)
+ *    .then(result => {
+ *       console.log(result); // Scanned code
+ *    })
+ *    .catch(error => {
+ *       console.log(error); // Error message
+ *    });
+ *
+ * ```
+ *
+ * @advanced
+ * zBar options
+ *
+ * | Option             | Type      | Values                    | Defaults                                                    |
+ * |--------------------|-----------|-----------------------------------------------------------------------------------------|
+ * | text_title         |`string?`  |                           | `"Scan QR Code"` (Android only)                             |
+ * | text_instructions  |`string?`  |                           | `"Please point your camera at the QR code."` (Android only) |
+ * | camera             |`string?`  | `"front"`, `"back"`,      | `"back"`                                                    |
+ * | flash              |`string?`  | `"on"`, `"off"`, `"auto"` | `"auto"`                                                    |
+ * | drawSight          |`boolean?` | `true`, `false`           | `true` (Draws red line in center of scanner)                |
+ *
+ */
+@Plugin({
+  plugin: 'cordova-plugin-cszbar',
+  pluginRef: 'cloudSky.zBar',
+  repo: 'https://github.com/tjwoon/csZBar',
+  platforms: ['Android', 'iOS']
+})
+export class ZBar {
+
+  /**
+   * Open the scanner
+   * @param options { ZBarOptions } Scan options
+   * @return Returns a Promise that resolves with the scanned string, or rejects with an error.
+   */
+  @Cordova()
+  static scan(options: ZBarOptions): Promise<any> { return; }
+
+}
+
+export interface ZBarOptions {
+  /**
+   * A string representing the title text (Android only).
+   * Default: "Scan QR Code"
+   */
+  text_title?: string;
+
+  /**
+   * A string representing the instruction text (Android only).
+   * Default: "Please point your camera at the QR code."
+   */
+  text_instructions?: string;
+
+  /**
+   * A string defining the active camera when opening the scanner.
+   * Possible values: "front", "back"
+   * Default: "back"
+   */
+  camera?: string;
+
+  /**
+   * A string defining the state of the flash.
+   * Possible values: "on", "off", "auto"
+   * Default: "auto"
+   */
+  flash?: string;
+
+  /**
+   * A boolean to show or hide a line in the center of the scanner.
+   * Default: true
+   */
+  drawSight?: boolean;
+}

test/plugin.spec.ts

@@ -36,7 +36,7 @@ describe('plugin', () => {
     const spy = spyOn(window.plugins.test, 'syncMethod').and.callThrough();
     const result = Test.syncMethod('foo');
     expect(result).toEqual('syncResult');
-    expect(spy).toHaveBeenCalledWith('foo', undefined, undefined);
+    expect(spy).toHaveBeenCalledWith('foo');
 
   });
 
@@ -138,4 +138,4 @@ describe('plugin', () => {
 
   });
 
-});
+});