3.1.0-rc.2

chore(): update deps
Merge branch 'v3-injectable' of github.com:driftyco/ionic-native into v3-injectable
2026-07-16 00:00:04 +08:00 · 2017-03-10 10:39:55 -05:00 · 2017-03-10 10:39:40 -05:00 · 2017-03-10 10:22:15 -05:00 · 2017-03-10 10:22:03 -05:00 · 2017-03-08 13:08:10 -06:00
284 changed files with 9485 additions and 26329 deletions
@@ -4,8 +4,8 @@
 #### There are no rules, but here are a few things to consider:
 ###### Before you submit an issue:
 * Do a quick search to see if there are similar issues
-* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/api/platform/Platform/#ready).
-* **Check that you are using the latest version of** `ionic-native`, you can install the latest version by running `npm i --save @ionic-native/core@latest`
+* Make sure that you are waiting for `deviceready` to fire before interacting with any plugin. If you are using Ionic 2, this can be done using [the `Platform.ready()` function](http://ionicframework.com/docs/v2/api/platform/Platform/#ready).
+* **Check that you are using the latest version of** `ionic-native`, you can install the latest version by running `npm i --save ionic-native@latest`

 ###### Still having problems? submit an issue with the following details:
 * Short description of the issue
@@ -16,4 +16,4 @@
 ## Feature request?
 Have a plugin you'd like to see supported? Since Ionic Native is a thin wrapper around existing Cordova plugins, adding support for new plugins is as easy as creating a new wrapper for whatever plugin you'd like to add.

-Take a look at our [Developer Guide](https://github.com/ionic-team/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.
+Take a look at our [Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more info on adding new plugins.
@@ -1,28 +0,0 @@
-**I'm submitting a ...**  (check one with "x")
-[ ] bug report
-[ ] feature request
-[ ] support request => Please do not submit support requests here, use one of these channels: https://forum.ionicframework.com/ or https://ionicworldwide.herokuapp.com/
-
-**Current behavior:**
-<!-- Describe how the bug manifests. -->
-
-**Expected behavior:**
-<!-- Describe what the behavior would be without the bug. -->
-
-**Steps to reproduce:**
-<!-- If you are able to illustrate the bug or feature request with an example, please provide steps to reproduce. -->
-
-**Related code:**
-
-```
-insert any relevant code here
-```
-
-**Other information:**
-<!-- List any other information that is relevant to your issue. Stack traces, related issues, suggestions on how to fix, Stack Overflow links, forum links, etc. -->
-
-**Ionic info:** (run `ionic info` from a terminal/cmd prompt and paste output below):
-
-```
-insert the output from ionic info here
-```
@@ -3,5 +3,5 @@ node_modules/
 .idea
 .tmp
 aot/
-scripts/ionic-native-bower
 dist/
+scripts/ionic-native-bower
@@ -12,12 +12,8 @@ First, let's start by creating a new plugin wrapper from template.
 // Make sure to capitalize the first letter, or use CamelCase if necessary.
 
 gulp plugin:create -n PluginName
-
-// add -m flag to get a minimal template to start with
-gulp plugin:create -m -n PluginName
 ```

-Running the command above will create a new directory `src/@ionic-native/plugins/plugin-name/` with a single file in there: `index.ts`. This file is where all the plugin definitions should be.

 Let's take a look at the existing plugin wrapper for Geolocation to see what goes into an Ionic Native plugin (comments have been removed for clarity):

@@ -26,18 +22,17 @@ Let's take a look at the existing plugin wrapper for Geolocation to see what goe
  plugin: 'cordova-plugin-geolocation',
  pluginRef: 'navigator.geolocation'
 })
-@Injectable()
 export class Geolocation {

  @Cordova()
-  getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return; }
+  static getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return }

  @Cordova({
    callbackOrder: 'reverse',
    observable: true,
    clearFunction: 'clearWatch'
  })
-  watchPosition(options?: GeolocationOptions): Observable<Geoposition> { return; }
+  static watchPosition(options?: GeolocationOptions): Observable<Geoposition> { return }
 }
 ```

@@ -46,7 +41,6 @@ export class Geolocation {
 First and foremost, we want to create a class representing our plugin, in this case Geolocation.

 ```
-@Injectable()
 class Geolocation {

 }
@@ -63,7 +57,6 @@ For example, the `@Plugin` decorator adds information about the plugin to our Ge
  plugin: 'cordova-plugin-geolocation',
  pluginRef: 'navigator.geolocation'
 })
-@Injectable()
 export class Geolocation {

 }
@@ -81,7 +74,7 @@ Let's take a look at `getCurrentPosition` first.

 ```
  @Cordova()
-  getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return }
+  static getCurrentPosition(options?: GeolocationOptions): Promise<Geoposition> { return }
 ```

 It's just a stub. The `return` is only there to keep the TypeScript type-checker from complaining since we indicate that `getCurrentPosition` returns a `Promise<Geoposition>`.
@@ -98,20 +91,72 @@ Next, let's look at the `watchPosition` method.
    observable: true,
    clearFunction: 'clearWatch'
  })
-  watchPosition(options?: GeolocationOptions): Observable<Geoposition> { return }
+  static watchPosition(options?: GeolocationOptions): Observable<Geoposition> { return }
 ```

 The `@Cordova` decorator has a few more options now.

-`observable` indicates that this method may call its callbacks multiple times, so `@Cordova` wraps it in an [`Observable`](https://github.com/ionic-team/ionic-native#promises-and-observables) instead of a Promise.
+`observable` indicates that this method may call its callbacks multiple times, so `@Cordova` wraps it in an [`Observable`](https://github.com/driftyco/ionic-native#promises-and-observables) instead of a Promise.

 `callbackOrder` refers to the method signature of the underlying Cordova plugin, and tells Ionic Native which arguments are the callbacks to map to the wrapping Promise or Observable.  In this case, the signature is [`watchPosition(success, error, options)`](https://github.com/apache/cordova-plugin-geolocation#navigatorgeolocationwatchposition), so we need to tell `@Cordova` that the callbacks are the first arguments, not the last arguments.  For rare cases, you can also specify the options `successIndex` and `errorIndex` to indicate where in the argument list the callbacks are located.

 `clearFunction` is used in conjunction with the `observable` option and indicates the function to be called when the Observable is disposed.

+### Updating index.ts
+
+For new plugins, you will need to update `/src/index.ts` to properly export your plugin and make it available for use.
+
+1. Import the plugin class into `index.ts`:
+
+`import {PluginClassName} from ./plugins/filenameForPlugin`
+
+No need to put the `.ts` extension on the filename.
+
+2. Add the plugin class name to the list in the `export` object:
+
+```
+export {
+  ActionSheet,
+  AdMob,
+  AndroidFingerprintAuth,
+  YourPluginClassName,
+  ...
+}
+```
+
+3. Add the plugin class name to the `window['IonicNative']` object:
+
+```
+window['IonicNative'] = {
+  ActionSheet: ActionSheet,
+  AdMob: AdMob,
+  AndroidFingerprintAuth: AndroidFingerprintAuth,
+  YourPluginClassName: YourPluginClassName,
+  ...
+```
+
+4. If your plugin exports any other objects outside of the plugin class, add an export statement for the file:
+
+`export * from './plugins/filenameForPlugin';`
+
+No need to put the `.ts` extension on the filename.
+
+For example, `googlemaps.ts` exports a const outside of the plugin's main `GoogleMap` class:
+
+```
+export const GoogleMapsAnimation = {
+  BOUNCE: 'BOUNCE',
+  DROP: 'DROP'
+};
+```
+
+To properly export `GoogleMapsAnimation`, `index.ts` is updated with:
+
+`export * from './plugins/googlemaps';`
+
 ### Testing your changes

-You need to run `npm run build` in the `ionic-native` project, this will create a `dist` directory. The `dist` directory will contain a sub directory `@ionic-native` with all the packages compiled in there. Copy the package(s) you created/modified to your app's node_modules under the `@ionic-native` directory. (e.g. `cp -r dist/@ionic-native/plugin-name ../my-app/node_modules/@ionic-native/`).
+You need to run `npm run build` in the `ionic-native` project, this will create a `dist` directory. Then, you must go to your ionic application folder and replace your current `node_modules/ionic-native/dist/` with the newly generated one.

 ### Cleaning the code

@@ -119,7 +164,7 @@ You need to run `npm run lint` to analyze the code and ensure it's consistency w

 ### 'Wrapping' Up

-That's it! The only thing left to do is rigorously document the plugin and it's usage. Take a look at some of the other plugins for good documentation styles.
+That's it! The only thing left to do is rigorously document the plugin and it's usage.  Take a look at some of the other plugins for good documentation styles.

 ## Commit Message Format

@@ -148,74 +193,4 @@ The subject contains succinct description of the change:
 * use the imperative, present tense: "change" not "changed" nor "changes"
 * do not capitalize first letter
 * do not place a period (.) at the end
-* entire length of the commit message must not go over 50 characters
-
-
-### Ionic Native Decorators
-
-#### Plugin
-A decorator to wrap the main plugin class, and any other classes that will use `@Cordova` or `@CordovaProperty` decorators. This decorator accepts the following configuration:
- *pluginName*: Plugin name, this should match the class name
- *plugin*: The plugin's NPM package, or Github URL if NPM is not available.
- *pluginRef*: The plugin object reference. Example: 'cordova.file'.
- *repo*: The plugin's Github Repository URL
- *install*: (optional) Install command. This is used in case a plugin has a custom install command (takes variables).
- *platforms*: An array of strings indicating the supported platforms. 
-
-#### Cordova
-Checks if the plugin and the method are available before executing. By default, the decorator will wrap the callbacks of the function and return a Promise. This decorator takes the following configuration options:
- **observable**: set to true to return an Observable
- **clearFunction**: an optional name of a method to clear the observable we returned
- **clearWithArgs**: This can be used if clearFunction is set. Set this to true to call the clearFunction with the same arguments used in the initial function.
- **sync**: set to true if the method should return the value as-is without wrapping with Observable/Promise
- **callbackOrder**: set to `reverse` if the success and error callbacks are the first two arguements of the method
- **callbackStyle**: set to `node` if the plugin has one callback with a node style (e.g: `function(err, result){}`), or set to `object` if the callbacks are part of an object
- **successName**: Success function property name. This must be set if callbackStyle is set to object.
- **errorName**: Error function property name. This must be set if callbackStyle is set to object.
- **successIndex**: Set a custom index for the success callback function. This doesn't work if callbackOrder or callbackStyle are set.
- **errorIndex**: Set a custom index for the error callback function. This doesn't work if callbackOrder or callbackStyle are set.
- **eventObservable**: set to true to return an observable that wraps an event listener
- **event**: Event name, this must be set if eventObservable is set to true
- **element**: Element to attach the event listener to, this is optional, defaults to `window`
- **otherPromise**: Set to true if the wrapped method returns a promise
- **platforms**: array of strings indicating supported platforms. Specify this if the supported platforms doesn't match the plugin's supported platforms.
-
-Example:
-```ts
-@Cordova()
-someMethod(): Promise<any> { return; }
-
-@Cordova({ sync: true })
-syncMethod(): number { }
-```
-
-#### CordovaProperty
-Checks if the plugin and property exist before getting/setting the property's value
-
-Example:
-```ts
-@CordovaProperty
-someProperty: string;
-```
-
-#### CordovaCheck
-Checks if the plugin exists before performing a custom written method. By default, the method will return a promise that will reject with an error if the plugin is not available.  This wrapper accepts two optional configurations:
- **observable**: set to true to return an empty Observable if the plugin isn't available
- **sync**: set to true to return nothing if the plugin isn't available
-
-Example:
-```ts
-@CordovaCheck()
-someMethod(): Promise<any> {
-  // anything here will only run if the plugin is available
-}
-```
-
-#### CordovaFunctionOverride
-Wrap a stub function in a call to a Cordova plugin, checking if both Cordova and the required plugin are installed.
-
-Example:
-```ts
-@CordovaFunctionOverride()
-someMethod(): Observable<any> { return; }
-```
+* entire length of the commit message must not go over 50 characters
@@ -1,178 +1,95 @@
-[![Circle CI](https://circleci.com/gh/ionic-team/ionic-native.svg?style=shield)](https://circleci.com/gh/ionic-team/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/) ![](https://img.shields.io/npm/v/@ionic-native/core.svg)
+[![Circle CI](https://circleci.com/gh/driftyco/ionic-native.svg?style=shield)](https://circleci.com/gh/driftyco/ionic-native) [![Commitizen friendly](https://img.shields.io/badge/commitizen-friendly-brightgreen.svg)](http://commitizen.github.io/cz-cli/)
+[![npm](https://img.shields.io/npm/l/express.svg)](https://www.npmjs.com/package/ionic-native)

+[![NPM](https://nodei.co/npm/ionic-native.png?stars&downloads)](https://nodei.co/npm/ionic-native/)
+[![NPM](https://nodei.co/npm-dl/ionic-native.png?months=6&height=2)](https://nodei.co/npm/ionic-native/)

 # Ionic Native

-Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic](https://ionicframework.com/) mobile app easy.
+Ionic Native is a curated set of wrappers for Cordova plugins that make adding any native functionality you need to your [Ionic](http://ionicframework.com/), Cordova, or Web View mobile app easy.

-Ionic Native wraps plugin callbacks in a Promise or Observable, providing a common interface for all plugins and making it easy to use plugins with Angular change detection.
+### Documentation

-## Installation
+For the full Ionic Native documentation, please visit [http://ionicframework.com/docs/v2/native/](http://ionicframework.com/docs/v2/native/).

-Run following command to install Ionic Native in your project.
-```bash
-npm install @ionic-native/core --save
+### Promises and Observables
+
+Ionic Native wraps plugin callbacks in a Promise or [Observable](https://gist.github.com/staltz/868e7e9bc2a7b8c1f754), providing a common interface for all plugins and ensuring that native events trigger change detection in Angular 2.
+
+```
+import { Geolocation } from 'ionic-native';
+
+Geolocation.getCurrentPosition().then(pos => {
+  console.log('lat: ' + pos.coords.latitude + ', lon: ' + pos.coords.longitude);
+});
+
+let watch = Geolocation.watchPosition().subscribe(pos => {
+  console.log('lat: ' + pos.coords.latitude + ', lon: ' + pos.coords.longitude);
+});
+
+// to stop watching
+watch.unsubscribe();
 ```

-You also need to install the Ionic Native package for each plugin you want to add. Please see the [Ionic Native documentation](https://ionicframework.com/docs/native/) for complete instructions on how to add and use the plugins.
+### Angular 1

-## Documentation
+Ionic Native works as a stand-in for [ngCordova](http://ngcordova.com/). In many cases, the usage is identical, but we import `ionic.native` instead of `ngCordova` as our module.

-For the full Ionic Native documentation, please visit [https://ionicframework.com/docs/native/](https://ionicframework.com/docs/native/).
+As a rule of thumb: take the ES6 class name of the plugin and add `$cordova` to get the service name. For example, `Geolocation` would be `$cordovaGeolocation`, and `Camera` will be `$cordovaCamera`:

-### Basic Usage
+```javascript
+angular.module('myApp', ['ionic', 'ionic.native'])

-To use a plugin, import and add the plugin provider to your `@NgModule`, and then inject it where you wish to use it.
-
-```typescript
-// app.module.ts
-import { Camera } from '@ionic-native/camera';
-
-...
-
-@NgModule({
-  ...
-
-  providers: [
-    ...
-    Camera
-    ...
-  ]
-  ...
-})
-export class AppModule { }
-```
-
-```typescript
-import { Geolocation } from '@ionic-native/geolocation';
-import { Platform } from 'ionic-angular';
-
-import { NgZone } from '@angular/core';
-
-@Component({ ... })
-export class MyComponent {
-
-  constructor(private geolocation: Geolocation, private platform: Platform) {
-
-    platform.ready().then(() => {
-
-      // get position
-      geolocation.getCurrentPosition().then(pos => {
-        console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-      });
-
-
-      // watch position
-      const watch = geolocation.watchPosition().subscribe(pos => {
-        console.log(`lat: ${pos.coords.latitude}, lon: ${pos.coords.longitude}`)
-        this.position = pos;
-      });
-
-      // to stop watching
-      watch.unsubscribe();
+.controller('MyCtrl', function($scope, $cordovaCamera) {
+  $scope.takePicture = function() {
+    $cordovaCamera.getPicture(opts).then(function(p) {
+    }, function(err) {
    });
-    
-  }
-  
-}
+  };
+});
 ```

-### Mocking and Browser Development
+For services that return observables, the Angular 1 digest cycle must be done manually (currently):

-Ionic Native 3.x makes it possible to mock plugins and develop nearly the entirety of your app in the browser or in `ionic serve`.
+```javascript
+angular.module('myApp', ['ionic', 'ionic.native'])

-To do this, you need to provide a mock implementation of the plugins you wish to use. Here's an example of mocking the `Camera` plugin to return a stock image while in development:
-
-First import the `Camera` class in your `src/app/app.module.ts` file:
-
-```typescript
-import { Camera } from '@ionic-native/camera';
+.controller('MyCtrl', function($scope, $cordovaGeolocation) {
+  $scope.takePicture = function() {
+    $cordovaGeolocation.watchPosition(opts).subscribe(function(p) {
+      $scope.$apply(function() {
+        $scope.position = p.coords;
+      });
+    }, function(err) {
+    });
+  };
+});
 ```

-Then create a new class that extends the `Camera` class with a mock implementation:
-
-```typescript
-class CameraMock extends Camera {
-  getPicture(options) {
-    return new Promise((resolve, reject) => {
-      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
-    })
-  }
-}
-```
-
-Finally, override the previous `Camera` class in your `providers` for this module:
-
-```typescript
-providers: [
-  { provide: Camera, useClass: CameraMock }
-]
-```
-
-Here's the full example:
-
-```typescript
-import { NgModule, ErrorHandler } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { IonicApp, IonicModule, IonicErrorHandler } from 'ionic-angular';
-import { MyApp } from './app.component';
-import { HomePage } from '../pages/home/home';
-
-import { Camera } from '@ionic-native/camera';
-
-class CameraMock extends Camera {
-  getPicture(options) {
-    return new Promise((resolve, reject) => {
-      resolve("BASE_64_ENCODED_DATA_GOES_HERE");
-    })
-  }
-}
-
-@NgModule({
-  declarations: [
-    MyApp,
-    HomePage
-  ],
-  imports: [
-    BrowserModule,
-    IonicModule.forRoot(MyApp)
-  ],
-  bootstrap: [IonicApp],
-  entryComponents: [
-    MyApp,
-    HomePage
-  ],
-  providers: [
-    {provide: ErrorHandler, useClass: IonicErrorHandler},
-    { provide: Camera, useClass: CameraMock }
-  ]
-})
-export class AppModule {}
-```
-
-
 ### Runtime Diagnostics

 Spent way too long diagnosing an issue only to realize a plugin wasn't firing or installed? Ionic Native lets you know what the issue is and how you can resolve it.

-![img](https://ionic-io-assets.s3.amazonaws.com/ionic-native-console.png)
+![img](http://ionic-io-assets.s3.amazonaws.com/ionic-native-console.png)
+
+## Installation
+
+Run following commmand to install ionic-native in your project.
+```
+npm install ionic-native --save
+```


 ## Plugin Missing?
-Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/ionic-team/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:
+Let us know or submit a PR! Take a look at [the Developer Guide](https://github.com/driftyco/ionic-native/blob/master/DEVELOPER.md) for more on how to contribute. :heart:

-## Ionic v1 (AngularJS, Angular 1.x) support
-
-For Ionic v1 (AngularJS, Angular 1.x) support, please use version 2 of Ionic Native. See the [2.x README](https://github.com/ionic-team/ionic-native/blob/v2.x/README.md) for usage information.

 # Credits

-Ibby Hadeed - [@ihadeed](https://github.com/ihadeed)
+Ibby Hadeed - [@ihadeed](http://github.com/ihadeed)

-Tim Lancina - [@timlancina](https://twitter.com/timlancina)
+Tim Lancina - [@timlancina](http://twitter.com/timlancina)

-Mike Hartington - [@mhartington](https://twitter.com/mhartington)
-
-Max Lynch - [@maxlynch](https://twitter.com/maxlynch)
+Max Lynch - [@maxlynch](http://twitter.com/maxlynch)

 Rob Wormald - [@robwormald](https://twitter.com/robwormald)
@@ -1,51 +1,27 @@
-version: 2
-jobs:
-  build:
-    working_directory: ~/ionic-native/
-    docker:
-      - image: node:7
-    steps:
-      - checkout
-      - restore_cache:
-         key: ionic-site-{{ checksum "package.json" }}
-      - run:
-         name: Prepare ionic-site repo
-         command: |
-           if [ "${CIRCLE_BRANCH}" == "master" ]; then
-             ./scripts/docs/prepare.sh
-           fi
-      - save_cache:
-         key: ionic-site-{{ checksum "package.json" }}
-         paths:
-         - ~/ionic-site/
-      - restore_cache:
-         key: node_modules_{{ checksum "package.json" }}
-      - run:
-         name: Install node modules
-         command: npm i
-      - save_cache:
-         key: node_modules_{{ checksum "package.json" }}
-         paths:
-         - ~/ionic-native/node_modules/
-      - run:
-          name: Run tslint
-          command: npm run lint
-      - run: bash ./scripts/git/config.sh
-      - run:
-          name: Build Ionic Native
-          command: npm run build:core && ./node_modules/.bin/tsc
-      - run:
-          name: Generate README files to ensure docs are valid
-          command: npm run readmes
-      - run:
-          name: Run tests
-          command: npm test
-      - add_ssh_keys
-      - deploy:
-          name: Update docs
-          command: |
-            if [ "${CIRCLE_BRANCH}" == "master" ]; then
-              ./scripts/docs/update_docs.sh
-            else
-              echo "We are on ${CIRCLE_BRANCH} branch, not going to update docs."
-            fi
+machine:
+  node:
+    version: 4.1.0
+  ruby:
+    version: 2.1.2
+
+general:
+  branches:
+    only:
+      - master # ignore PRs and branches
+
+dependencies:
+ pre:
+   - ./scripts/docs/prepare.sh
+ cache_directories:
+   - "~/ionic-site" # cache ionic-site
+
+test:
+  override:
+    - npm test
+    - npm run build
+
+deployment:
+ staging:
+   branch: master
+   commands:
+     - ./scripts/docs/update_docs.sh
@@ -1,50 +1,48 @@
-"use strict";
+var gulp = require('gulp');
+var minimist = require('minimist');
+var uglify = require('gulp-uglify');
+var rename = require("gulp-rename");
+var tslint = require('gulp-tslint');
+var decamelize = require('decamelize');
+var replace = require('gulp-replace');

-const gulp = require('gulp'),
-  minimist = require('minimist'),
-  rename = require("gulp-rename"),
-  tslint = require('gulp-tslint'),
-  decamelize = require('decamelize'),
-  replace = require('gulp-replace'),
-  _ = require('lodash');
-
-const flagConfig = {
-    string: ['port', 'version', 'ngVersion', 'animations'],
-    boolean: ['dry-run'],
-    alias: {'p': 'port', 'v': 'version', 'a': 'ngVersion'},
-    default: { port: 8000 }
-  },
-
-  flags = minimist(process.argv.slice(2), flagConfig);
+var flagConfig = {
+  string: ['port', 'version', 'ngVersion', 'animations'],
+  boolean: ['dry-run'],
+  alias: {'p': 'port', 'v': 'version', 'a': 'ngVersion'},
+  default: { port: 8000 }
+};
+var flags = minimist(process.argv.slice(2), flagConfig);

 /* Docs tasks */
 require('./scripts/docs/gulp-tasks')(gulp, flags);

-gulp.task('lint', () => {
-  return gulp.src('src/**/*.ts')
+
+gulp.task("minify:dist", function(){
+  gulp.src('./dist/ionic.native.js')
+  .pipe(uglify())
+  .pipe(rename({
+    suffix: '.min'
+  }))
+  .pipe(gulp.dest('./dist'));
+});
+
+gulp.task('lint', function() {
+  gulp.src('src/**/*.ts')
    .pipe(tslint({
      formatter: "verbose",
      configuration: 'tslint.json'
    }))
-    .pipe(tslint.report());
+    .pipe(tslint.report())
 });

-gulp.task('plugin:create', () => {
-  if (flags.n && flags.n !== ''){
-
-    const src = flags.m ? './scripts/templates/wrap-min.tmpl':'./scripts/templates/wrap.tmpl',
-      pluginName = flags.n,
-      spaced = pluginName.replace(/(?!^)([A-Z])/g, ' $1'),
-      kebabCase = _.kebabCase(pluginName);
-
+gulp.task('plugin:create', function(){
+  if(flags.n && flags.n !== ''){
+    var src = flags.m?'./scripts/templates/wrap-min.tmpl':'./scripts/templates/wrap.tmpl';
    return gulp.src(src)
-      .pipe(replace('{{ PluginName }}', pluginName))
-      .pipe(replace('{{ Plugin_Name }}', spaced))
-      .pipe(replace('{{ pluginName }}', _.lowerFirst(pluginName)))
-      .pipe(replace('{{ plugin-name }}', kebabCase))
-      .pipe(rename('index.ts'))
-      .pipe(gulp.dest('./src/@ionic-native/plugins/' + kebabCase));
-
+      .pipe(replace('PluginName', flags.n))
+      .pipe(rename(decamelize(flags.n, '-') + '.ts'))
+      .pipe(gulp.dest('./src/plugins/'));
  } else {
    console.log("Usage is: gulp plugin:create -n PluginName");
  }
@@ -1,55 +0,0 @@
-"use strict";
-
-module.exports = config => {
-
-  const conf = {
-    frameworks: [
-      'jasmine',
-      'karma-typescript'
-    ],
-
-    plugins: [
-      'karma-typescript',
-      'karma-jasmine',
-      'karma-phantomjs-launcher'
-    ],
-
-    preprocessors: {
-      'src/**/*.ts': ['karma-typescript']
-    },
-
-    karmaTypescriptConfig: {
-      bundlerOptions: {
-        entrypoints: /\.spec\.ts$/,
-        transforms: [
-          require("karma-typescript-es6-transform")()
-        ]
-      },
-      compilerOptions: {
-        lib: ['es2015', 'dom'],
-        paths: {
-          "@ionic-native/core": ["./src/@ionic-native/core"]
-        },
-        baseUrl: '.'
-      }
-    },
-
-    files: [
-      { pattern: 'src/**/*.ts', included: true, watched: true }
-    ],
-
-    reporters: ['progress'],
-
-    port: 9876,
-    colors: true,
-    logLevel: config.INFO,
-    autoWatch: true,
-    browsers: [
-      'PhantomJS'
-    ],
-    singleRun: false
-  };
-
-  config.set(conf);
-
-};
@@ -0,0 +1,61 @@
+const WATCH = process.argv.indexOf('--watch') > -1;
+
+module.exports = config => {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: './',
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine', 'browserify'],
+
+    // list of files / patterns to load in the browser
+    files: [
+      'test/**/*.spec.ts'
+    ],
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+      'test/**/*.spec.ts': ['browserify']
+    },
+
+    browserify: {
+      debug: true,
+      plugin: [ 'tsify' ],
+      extensions: ['.js', '.ts']
+    },
+
+    phantomjsLauncher: {
+      // Have phantomjs exit if a ResourceError is encountered (useful if karma exits without killing phantom)
+      exitOnResourceError: true
+    },
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['dots'],
+
+    // web server port
+    port: 9876,
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_INFO,
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: WATCH,
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: !WATCH
+  });
+};
@@ -1,73 +1,79 @@
 {
  "name": "ionic-native",
-  "version": "4.5.1",
+  "version": "3.1.0-rc.2",
  "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
-  "homepage": "https://ionicframework.com/",
-  "author": "Ionic Team <hi@ionic.io> (https://ionic.io)",
-  "license": "MIT",
+  "main": "dist/es5/index.js",
+  "module": "dist/esm/index.js",
+  "typings": "dist/es5/index.d.ts",
+  "files": [
+    "dist"
+  ],
  "devDependencies": {
-    "@angular/compiler": "4.4.4",
-    "@angular/compiler-cli": "4.4.4",
-    "@angular/core": "4.4.4",
-    "@types/cordova": "0.0.34",
-    "@types/jasmine": "^2.6.3",
-    "@types/node": "^8.0.50",
+    "@angular/compiler": "2.2.1",
+    "@angular/compiler-cli": "2.2.1",
+    "@angular/core": "2.2.1",
+    "browserify": "^13.3.0",
    "canonical-path": "0.0.2",
-    "child-process-promise": "2.2.1",
-    "conventional-changelog-cli": "1.3.4",
-    "cpr": "2.0.0",
-    "cz-conventional-changelog": "2.0.0",
-    "decamelize": "1.2.0",
-    "dgeni": "0.4.7",
-    "dgeni-packages": "0.16.10",
-    "fs-extra": "2.0.0",
-    "fs-extra-promise": "0.4.1",
-    "gulp": "3.9.1",
-    "gulp-rename": "1.2.2",
-    "gulp-replace": "0.5.4",
-    "gulp-tslint": "6.1.2",
-    "jasmine-core": "^2.6.1",
-    "karma": "^1.7.0",
-    "karma-cli": "^1.0.1",
-    "karma-jasmine": "^1.1.0",
-    "karma-phantomjs-launcher": "^1.0.4",
-    "karma-typescript": "^3.0.1",
-    "karma-typescript-es6-transform": "^1.0.0",
+    "child-process-promise": "^2.2.0",
+    "conventional-changelog-cli": "^1.2.0",
+    "conventional-github-releaser": "^1.1.3",
+    "cpr": "^2.0.2",
+    "cz-conventional-changelog": "^1.2.0",
+    "decamelize": "^1.2.0",
+    "dgeni": "^0.4.2",
+    "dgeni-packages": "^0.10.18",
+    "es6-shim": "~0.35.2",
+    "fs-extra": "^2.0.0",
+    "fs-extra-promise": "^0.4.1",
+    "glob": "^7.1.1",
+    "gulp": "^3.9.1",
+    "gulp-rename": "^1.2.2",
+    "gulp-replace": "^0.5.4",
+    "gulp-tslint": "^6.1.2",
+    "gulp-uglify": "^2.0.0",
+    "jasmine-core": "~2.5.2",
+    "karma": "~1.3.0",
+    "karma-browserify": "~5.1.0",
+    "karma-jasmine": "~1.1.0",
+    "karma-phantomjs-launcher": "~1.0.2",
    "lodash": "4.17.4",
-    "minimist": "1.2.0",
+    "minimist": "^1.1.3",
    "node-html-encoder": "0.0.2",
-    "q": "1.5.0",
-    "queue": "4.2.1",
-    "rimraf": "2.6.1",
-    "rxjs": "5.5.2",
-    "semver": "5.3.0",
-    "tslint": "3.15.1",
-    "tslint-ionic-rules": "0.0.8",
-    "typescript": "~2.4.2",
-    "zone.js": "0.8.18"
+    "q": "1.4.1",
+    "queue": "^4.2.1",
+    "rimraf": "^2.5.4",
+    "rxjs": "5.0.1",
+    "semver": "^5.3.0",
+    "tsify": "~3.0.0",
+    "tslint": "^3.15.1",
+    "tslint-ionic-rules": "0.0.7",
+    "typescript": "2.0.09",
+    "watchify": "~3.7.0",
+    "zone.js": "0.7.2"
  },
  "scripts": {
+    "test": "karma start",
+    "test:watch": "npm test -- --watch",
    "start": "npm run test:watch",
    "lint": "gulp lint",
    "build": "npm run clean && npm run lint && npm run build:core && npm run build:modules",
    "build:core": "ngc -p scripts/build/tsconfig-core.json",
    "build:modules": "node scripts/build/build.js",
-    "clean": "rimraf dist .tmp",
+    "clean": "rimraf dist",
    "shipit": "npm run build && gulp readmes && npm run npmpub",
    "npmpub": "node scripts/build/publish.js",
    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0",
-    "postchangelog": "git commit -am \"chore(): update changelog\"",
-    "test": "karma start karma.conf.js --single-run",
-    "test:watch": "karma start karma.conf.js",
-    "readmes": "gulp readmes"
+    "plugin:create": "gulp plugin:create"
  },
  "repository": {
    "type": "git",
-    "url": "git+https://github.com/ionic-team/ionic-native.git"
+    "url": "https://github.com/driftyco/ionic-native.git"
  },
+  "license": "MIT",
  "bugs": {
-    "url": "https://github.com/ionic-team/ionic-native/issues"
+    "url": "https://github.com/driftyco/ionic-native/issues"
  },
+  "homepage": "https://github.com/driftyco/ionic-native",
  "config": {
    "commitizen": {
      "path": "./node_modules/cz-conventional-changelog"
@@ -0,0 +1,26 @@
+{
+  "name": "ionic-native",
+  "description": "Native plugin wrappers for Cordova and Ionic with TypeScript, ES6+, Promise and Observable support",
+  "main": [
+    "ionic.native.js"
+  ],
+  "authors": [
+    "Max Lynch <max@ionic.io>"
+  ],
+  "license": "MIT",
+  "keywords": [
+    "ionic",
+    "native",
+    "html5",
+    "hybrid",
+    "mobile"
+  ],
+  "homepage": "https://github.com/driftyco/ionic-native-bower",
+  "ignore": [
+    "**/.*",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ]
+}
@@ -0,0 +1,28 @@
+#!/bin/bash
+set -e
+
+
+# readJsonProp(jsonFile, property)
+# - restriction: property needs to be on an own line!
+function readJsonProp {
+  echo $(sed -En 's/.*"'$2'"[ ]*:[ ]*"(.*)".*/\1/p' $1)
+}
+
+VERSION=$(readJsonProp "package.json" "version")
+
+echo "BOWERING IONIC-NATIVE VERSION $VERSION. FOR GREAT JUSTICE..."
+
+DIR="scripts/ionic-native-bower"
+rm -rf $DIR
+mkdir $DIR
+cp dist/ionic.native.js dist/ionic.native.min.js $DIR
+cd $DIR
+git init
+git remote add origin git@github.com:driftyco/ionic-native-bower.git
+cp ../bower.json .
+git add .
+git commit -m "Bower release"
+git tag -f -m v$VERSION v$VERSION
+git push -f --tags origin master
+
+echo "BOWERING COMPLETED SOMEWHAT SUCCESSFULLY"
@@ -1,4 +1,3 @@
-"use strict";
 // Node module dependencies
 const fs = require('fs-extra-promise').useFs(require('fs-extra')),
  queue = require('queue'),
@@ -12,14 +11,14 @@ const ROOT = path.resolve(path.join(__dirname, '../../')), // root ionic-native
  PLUGIN_PACKAGE_JSON = require(path.resolve(__dirname, 'plugin-package.json')), // plugin package.json template
  PLUGIN_TS_CONFIG = require(path.resolve(__dirname, 'tsconfig-plugin.json')), // plugin tsconfig template
  BUILD_TMP = path.resolve(ROOT, '.tmp'), // tmp directory path
-  BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/@ionic-native'), // dist directory root path
+  BUILD_DIST_ROOT = path.resolve(ROOT, 'dist/packages-dist/@ionic-native'), // dist directory root path
+  BUILD_PLUGINS_DIST = path.resolve(BUILD_DIST_ROOT, 'plugins'), // plugins dist directory path
  BUILD_CORE_DIST = path.resolve(BUILD_DIST_ROOT, 'core'); // core dist directory path


 // dependency versions
-const ANGULAR_VERSION = '*',
-  RXJS_VERSION = '^5.0.1',
-  MIN_CORE_VERSION = '^4.2.0',
+const ANGULAR_VERSION = '2.2.1',
+  RXJS_VERSION = '5.0.0-beta.12',
  IONIC_NATIVE_VERSION = require(path.resolve(ROOT, 'package.json')).version;

 // package dependencies
@@ -28,7 +27,7 @@ const CORE_PEER_DEPS = {
 };

 const PLUGIN_PEER_DEPS = {
-  '@ionic-native/core': MIN_CORE_VERSION,
+  '@ionic-native/core': IONIC_NATIVE_VERSION,
  '@angular/core': ANGULAR_VERSION,
  'rxjs': RXJS_VERSION
 };
@@ -36,10 +35,18 @@ const PLUGIN_PEER_DEPS = {
 // set peer dependencies for all plugins
 PLUGIN_PACKAGE_JSON.peerDependencies = PLUGIN_PEER_DEPS;

+
+// Delete dist directory and any temporary files
+console.log('Removing old TMP directory');
+fs.removeSync(BUILD_TMP);
+fs.removeSync(BUILD_PLUGINS_DIST);
+
+
 // Create tmp/dist directories
 console.log('Making new TMP directory');
 fs.mkdirpSync(BUILD_TMP);

+
 // Prepare and copy the core module's package.json
 console.log('Preparing core module package.json');
 CORE_PACKAGE_JSON.version = IONIC_NATIVE_VERSION;
@@ -50,21 +57,6 @@ fs.writeJsonSync(path.resolve(BUILD_CORE_DIST, 'package.json'), CORE_PACKAGE_JSO
 // Fetch a list of the plugins
 const PLUGINS = fs.readdirSync(PLUGINS_PATH);

-// Build specific list of plugins to build from arguments, if any
-let pluginsToBuild = process.argv.slice(2);
-let ignoreErrors = false;
-let errors = [];
-
-const index = pluginsToBuild.indexOf('ignore-errors');
-if (index > -1) {
-  ignoreErrors = true;
-  pluginsToBuild.splice(index, 1);
-  console.log('Build will continue even if errors were thrown. Errors will be printed when build finishes.');
-}
-
-if (!pluginsToBuild.length) {
-  pluginsToBuild = PLUGINS;
-}

 // Create a queue to process tasks
 const QUEUE = queue({
@@ -85,7 +77,7 @@ const addPluginToQueue = pluginName => {
    let tsConfigPath;

    fs.mkdirpAsync(PLUGIN_BUILD_DIR) // create tmp build dir
-      .then(() => fs.mkdirpAsync(path.resolve(BUILD_DIST_ROOT, pluginName))) // create dist dir
+      .then(() => fs.mkdirpAsync(path.resolve(BUILD_PLUGINS_DIST, pluginName))) // create dist dir
      .then(() => {

        // Write tsconfig.json
@@ -104,7 +96,7 @@ const addPluginToQueue = pluginName => {
        packageJson.name = `@ionic-native/${pluginName}`;
        packageJson.version = IONIC_NATIVE_VERSION;

-        return fs.writeJsonAsync(path.resolve(BUILD_DIST_ROOT, pluginName, 'package.json'), packageJson);
+        return fs.writeJsonAsync(path.resolve(BUILD_PLUGINS_DIST, pluginName, 'package.json'), packageJson);
      })
      .then(() => {

@@ -112,16 +104,10 @@ const addPluginToQueue = pluginName => {
        exec(`${ROOT}/node_modules/.bin/ngc -p ${tsConfigPath}`, (err, stdout, stderr) => {

          if (err) {
-
-            if (!ignoreErrors) {
-              // oops! something went wrong.
-              console.log(err);
-              callback(`\n\nBuilding ${pluginName} failed.`);
-              return;
-            } else {
-              errors.push(err);
-            }
-
+            // oops! something went wrong.
+            callback(`\n\nBuilding ${pluginName} failed.`);
+            console.log(err);
+            return;
          }

          // we're done with this plugin!
@@ -136,22 +122,12 @@ const addPluginToQueue = pluginName => {

 };

-pluginsToBuild.forEach(addPluginToQueue);
+PLUGINS.forEach(addPluginToQueue);

 QUEUE.start((err) => {

  if (err) {
-    console.log('Error building plugins.');
-    console.log(err);
-    process.stderr.write(err);
-    process.exit(1);
-  } else if (errors.length) {
-    errors.forEach(e => {
-      console.log(e.message) && console.log('\n');
-      process.stderr.write(err);
-    });
-    console.log('Build complete with errors');
-    process.exit(1);
+    console.log('Error building plugins. ', err);
  } else {
    console.log('Done processing plugins!');
  }
@@ -9,6 +9,6 @@
  "peerDependencies": {},
  "repository": {
    "type": "git",
-    "url": "https://github.com/ionic-team/ionic-native.git"
+    "url": "https://github.com/driftyco/ionic-native.git"
  }
 }
@@ -9,6 +9,6 @@
  "peerDependencies": {},
  "repository": {
    "type": "git",
-    "url": "https://github.com/ionic-team/ionic-native.git"
+    "url": "https://github.com/driftyco/ionic-native.git"
  }
 }
@@ -1,4 +1,3 @@
-"use strict";
 // Node module dependencies
 const fs = require('fs-extra-promise').useFs(require('fs-extra')),
  queue = require('queue'),
@@ -7,52 +6,51 @@ const fs = require('fs-extra-promise').useFs(require('fs-extra')),


 const ROOT = path.resolve(path.join(__dirname, '../../')),
-  DIST = path.resolve(ROOT, 'dist', '@ionic-native');
+  DIST = path.resolve(ROOT, 'dist', 'packages-dist', '@ionic-native'),
+  PLUGINS_ROOT = path.resolve(DIST, 'plugins'),
+  CORE = path.resolve(DIST, 'core');

 const FLAGS = '--access public'; // add any flags here if you want... (example: --tag alpha)

-const PACKAGES = fs.readdirSync(DIST);
+console.log('Publishing @ionic-native/core');
+exec(`npm publish ${CORE} ${FLAGS}`)
+  .then(() => {

-const failedPackages = [];
+    const PLUGINS = fs.readdirSync(PLUGINS_ROOT);

-const QUEUE = queue({
-  concurrency: 10
-});
+    const QUEUE = queue({
+      concurrency: 10
+    });

-PACKAGES.forEach(packageName => {
+    PLUGINS.forEach(pluginName => {

-  QUEUE.push(done => {
+      QUEUE.push(done => {
+
+        console.log(`Publishing plugin ${pluginName}`);
+        const pluginPath = path.resolve(PLUGINS_ROOT, pluginName);
+
+        exec(`npm publish ${pluginPath} ${FLAGS}`)
+          .then(() => done())
+          .catch(done);

-    console.log(`Publishing @ionic-native/${packageName}`);
-    const packagePath = path.resolve(DIST, packageName);
-    exec(`npm publish ${packagePath} ${FLAGS}`)
-      .then(() => done())
-      .catch((e) => {
-        if (e.stderr && e.stderr.indexOf('previously published version') === -1) {
-          failedPackages.push({
-            cmd: e.cmd,
-            stderr: e.stderr
-          });
-        }
-        done();
      });

+    });
+
+    QUEUE.start((err) => {
+
+      if (err) {
+        console.log('Error publishing ionic-native. ', err);
+      } else {
+        console.log('Done publishing ionic-native!');
+      }
+
+    });
+
+  })
+  .catch(e => {
+
+    console.log('Publish failed');
+    console.log(e);
+
  });
-
-});
-
-QUEUE.start((err) => {
-
-  if (err) {
-    console.log('Error publishing ionic-native. ', err);
-  } else if (failedPackages.length > 0) {
-    console.log(`${failedPackages.length} packages failed to publish.`);
-    console.log(failedPackages);
-  } else {
-    console.log('Done publishing ionic-native!');
-  }
-
-
-
-});
-
@@ -7,19 +7,13 @@
    "emitDecoratorMetadata": true,
    "module": "es2015",
    "moduleResolution": "node",
-    "outDir": "../../dist/",
+    "outDir": "../../dist/packages-dist/",
    "rootDir": "../../src/",
    "target": "es5",
    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    "sourceMap": true,
-    "inlineSources": true,
-    "noImplicitAny": true
+    "lib": ["es2015", "dom"]
  },
  "files": [
    "../../src/@ionic-native/core/index.ts"
-  ],
-  "angularCompilerOptions": {
-    "genDir": "../../.tmp/core-aot"
-  }
+  ]
 }
@@ -7,17 +7,16 @@
    "emitDecoratorMetadata": true,
    "module": "es2015",
    "moduleResolution": "node",
-    "outDir": "../../../dist/@ionic-native/",
+    "outDir": "../../../dist/packages-dist/",
    "paths": {
-      "@ionic-native/core": ["../../../dist/@ionic-native/core"]
+      "@ionic-native/core": ["../../../dist/packages-dist/@ionic-native/core"]
    },
-    "rootDir": "../../../src/@ionic-native/plugins/",
+    "rootDir": "../../../src/",
    "target": "es5",
    "skipLibCheck": true,
-    "lib": ["es2015", "dom"],
-    "sourceMap": true,
-    "inlineSources": true,
-    "noImplicitAny": true
+    "lib": ["es2015", "dom"]
  },
-  "files": []
+  "files": [
+    "../../../src/@ionic-native/plugins/{{PLUGIN}}/index.ts"
+  ]
 }
@@ -1,65 +0,0 @@
-const exec = require('child-process-promise').exec;
-let diff;
-exec(`git branch | grep \\* | cut -d ' ' -f2`)
-  .then(output => {
-    if (output.stderr) {
-      return Promise.reject(output.stderr);
-    }
-
-    const branch = output.stdout.trim();
-
-    if (branch !== 'master') {
-
-      console.log('Merging master branch in ...');
-      // not on master branch
-      // let's test the changes that were made
-      return exec(`git merge origin master`);
-    }
-  })
-  .then((output) => {
-    if (output && output.stderr) {
-      return Promise.reject(output.stderr);
-    }
-    console.log('Checking for differences ...');
-    return exec(`git diff --name-status origin master`)
-  })
-  .then((output) => {
-    if (output && output.stderr) {
-      return Promise.reject(output.stderr);
-    }
-
-    diff = output.stdout;
-    diff = diff.replace(/A\s+/g, '');
-    diff = diff.match(/src\/@ionic-native\/plugins\/([a-zA-Z0-9\-]+)\/index\.ts/g);
-
-    if (!diff) process.exit();
-
-    console.log(`${ diff.length } plugins were modified. We will now build them to verify they still work.`);
-
-    return exec('npm run build:core --silent');
-  })
-  .then((output) => {
-
-    if (output && output.stderr) {
-      return Promise.reject(output.stderr);
-    }
-
-    console.log('Built core library successfully ...');
-    console.log('Building plugins ...');
-
-    diff = diff.map(text => text.replace('src/@ionic-native/plugins/', '').replace('/index.ts', ''));
-
-    return exec(`npm run build:modules ${diff.join(' ')} --silent`);
-  })
-  .then((output) => {
-    if (output && output.stderr) {
-      console.log(output.stderr);
-      process.exit(1);
-    }
-    console.log(output.stdout);
-    process.exit();
-  })
-  .catch(e => {
-    console.log(e.message || e);
-    process.exit(1);
-  });
@@ -1,6 +1,6 @@
 {
  "sitePath": "../ionic-site",
-  "v2DocsDir": "docs/native",
-  "docsDest": "../ionic-site/content/docs/native",
-  "pluginDir": "dist/@ionic-native"
+  "v2DocsDir": "docs/v2/native",
+  "docsDest": "../ionic-site/content/docs/v2/native",
+  "pluginDir": "dist/packages-dist/@ionic-native/plugins"
 }
@@ -1,3 +0,0 @@
-module.exports = function(getLinkInfo) {
-  getLinkInfo.useFirstAmbiguousLink = false;
-};
@@ -1,3 +0,0 @@
-module.exports = function(log) {
-  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
-};
@@ -1,4 +0,0 @@
-module.exports = function(parseTagsProcessor) {
-  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
-    .concat(require('../tag-defs/tag-defs'));
-};
@@ -1,12 +0,0 @@
-module.exports = function(templateEngine) {
-  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
-  // Also conflict with Jekyll
-  templateEngine.config.tags = {
-    variableStart: '<$',
-    variableEnd: '$>',
-    blockStart: '<@',
-    blockEnd: '@>',
-    commentStart: '<#',
-    commentEnd: '#>'
-  };
-};
@@ -1,9 +0,0 @@
-module.exports = function(templateEngine) {
-  // add custom filters to nunjucks
-  templateEngine.filters.push(
-    require('../filters/capital'),
-    require('../filters/code'),
-    require('../filters/dump'),
-    require('../filters/dashify')
-  );
-};
@@ -1,79 +1,185 @@
-"use strict";
-const Package = require('dgeni').Package,
-  jsdocPackage = require('dgeni-packages/jsdoc'),
-  nunjucksPackage = require('dgeni-packages/nunjucks'),
-  typescriptPackage = require('dgeni-packages/typescript'),
-  linksPackage = require('dgeni-packages/links'),
-  path = require('path'),
-  config = require('../config.json');
+var Package = require('dgeni').Package;
+var jsdocPackage = require('dgeni-packages/jsdoc');
+var nunjucksPackage = require('dgeni-packages/nunjucks');
+var typescriptPackage = require('./typescript-package');
+var linksPackage = require('./links-package');
+var gitPackage = require('dgeni-packages/git');
+var path = require('path');
+var semver = require('semver');
+var fs = require('fs');
+var _ = require('lodash');
+var config = require('../config.json');
+var projectPackage = require('../../package.json');

-module.exports = currentVersion => {
+// Define the dgeni package for generating the docs
+module.exports = function(currentVersion) {

-  return new Package('ionic-native-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
+  return new Package('ionic-v2-docs',
+                     [jsdocPackage, nunjucksPackage, typescriptPackage,
+                      linksPackage, gitPackage])

-    .processor(require('./processors/remove-private-members'))
-    .processor(require('./processors/hide-private-api'))
-    .processor(require('./processors/parse-optional'))
-    .processor(require('./processors/mark-properties'))
-    .processor(require('./processors/npm-id'))
-    .processor(require('./processors/jekyll'))
+// .processor(require('./processors/latest-version'))
+.processor(require('./processors/jekyll'))
+.processor(require('./processors/remove-private-members'))
+.processor(require('./processors/hide-private-api'))
+.processor(require('./processors/collect-inputs-outputs'))

-    .config(require('./configs/log'))
-    .config(require('./configs/template-filters'))
-    .config(require('./configs/template-tags'))
-    .config(require('./configs/tag-defs'))
-    .config(require('./configs/links'))
+// for debugging docs
+// .processor(function test(){
+//   return {
+//
+//     $runBefore: ['rendering-docs'],
+//     $process: function(docs){
+//       docs.forEach(function(doc){
+//         if (doc.name == "Camera"){
+//
+//           // console.log(doc.tags);
+//           // doc.tags.forEach(function(tag){
+//           //   if(tag.tagName == 'classes'){
+//           //
+//           //   }
+//           // });
+//
+//           // doc.moduleDoc.exports.forEach(function(d,i){
+//           //   if(d.name === 'CameraOptions') {
+//           //     console.log('Name: ' + d.name);
+//           //     console.log('Type: ' + d.docType);
+//           //     console.log('First member: ', d.members[0]);
+//           //   }
+//           // });
+//
+//
+//           // var exports = doc.exportSymbol.parent.exports;
+//           // for(var p in exports) {
+//           //   if(p == 'CameraOptions')
+//           //   {
+//           //     var x = exports[p];
+//           //     console.log(x.members.quality);
+//           //   }
+//           // }
+//           // doc.members.forEach(function(method){
+//           //   if (method.name === "getPicture") {
+//           //     console.log(method);
+//           //   }
+//           // })
+//         }
+//       })
+//     }
+//   }
+// })

-    .config(function(renderDocsProcessor, computePathsProcessor) {
+.config(function(log) {
+  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
+})

-      currentVersion = {
-        href: '/' + config.v2DocsDir.replace('content/', ''),
-        folder: '',
-        name: currentVersion
-      };
+.config(function(renderDocsProcessor, computePathsProcessor, versionInfo) {

-      renderDocsProcessor.extraData.version = {
-        list: [currentVersion],
-        current: currentVersion,
-        latest: currentVersion
-      };
+  versions = [];
+  // new version, add it to the versions list
+  if (currentVersion != 'nightly' && !_.includes(versions, currentVersion)) {
+    versions.unshift(currentVersion);
+  }
+  //First semver valid version is latest
+  var latestVersion = _.find(versions, semver.valid);
+  versions = versions.map(function(version) {
+    // We don't separate by versions so always put the docs in the root
+    var folder = '';
+    return {
+      href: '/' + config.v2DocsDir.replace('content/',''),
+      folder: folder,
+      name: version
+    };
+  });

-      computePathsProcessor.pathTemplates = [{
-        docTypes: ['class'],
-        getOutputPath: doc => 'content/' + config.v2DocsDir + '/' +  doc.name + '/index.md'
-      }];
+  var versionData = {
+    list: versions,
+    current: _.find(versions, {name: currentVersion}),
+    latest: _.find(versions, {name: latestVersion}) || _.first(versions)
+  };

-    })
+  renderDocsProcessor.extraData.version = versionData;
+  renderDocsProcessor.extraData.versionInfo = versionInfo;
+  computePathsProcessor.pathTemplates = [{
+    docTypes: ['class', 'var', 'function', 'let'],
+    getOutputPath: function(doc) {
+      var docPath = doc.name + '/index.md';
+      var path = 'content/' + config.v2DocsDir + '/' +  docPath;

-    //configure file reading
-    .config(function(readFilesProcessor, readTypeScriptModules) {
+      return path;
+    }
+  }];
+})

-      // Don't run unwanted processors since we are not using the normal file reading processor
-      readFilesProcessor.$enabled = false;
-      readFilesProcessor.basePath = path.resolve(__dirname, '../..');
+//configure file reading
+.config(function(readFilesProcessor, readTypeScriptModules) {

-      readTypeScriptModules.basePath = path.resolve(__dirname, '../..');
-      readTypeScriptModules.sourceFiles = [
-        './src/@ionic-native/plugins/**/*.ts'
-      ];
-    })
+  // Don't run unwanted processors since we are not using the normal file reading processor
+  readFilesProcessor.$enabled = false;
+  readFilesProcessor.basePath = path.resolve(__dirname, '../..');

-    // Configure file writing
-    .config(function(writeFilesProcessor) {
-      writeFilesProcessor.outputFolder  = '../ionic-site/';
-    })
+  readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname,
+                                                '../..'));
+  readTypeScriptModules.sourceFiles = [
+    './src/@ionic-native/plugins/**/*.ts'
+  ];
+})

-    // Configure rendering
-    .config(function(templateFinder) {
+.config(function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
+                                        .concat(require('./tag-defs/tag-defs'));
+})

-      templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
+// .config(function(parseTagsProcessor) {
+//   // We actually don't want to parse param docs in this package as we are
+//   // getting the data out using TS
+//   parseTagsProcessor.tagDefinitions.forEach(function(tagDef) {
+//     console.log(tagDef);
+//     if (tagDef.name === 'param') {
+//       tagDef.docProperty = 'paramData';
+//       tagDef.transforms = [];
+//     }
+//   });
+// })

-      // Specify how to match docs to templates.
-      templateFinder.templatePatterns = [
-        '${ doc.template }',
-        '${ doc.docType }.template.html',
-        'common.template.html'
-      ];
-    });
+// Configure links
+.config(function(getLinkInfo) {
+  getLinkInfo.useFirstAmbiguousLink = false;
+})
+
+// Configure file writing
+.config(function(writeFilesProcessor) {
+  writeFilesProcessor.outputFolder  = './src/@ionic-native/plugins2/';
+})
+
+// Configure rendering
+.config(function(templateFinder, templateEngine) {
+
+  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
+  // Also conflict with Jekyll
+  templateEngine.config.tags = {
+    variableStart: '<$',
+    variableEnd: '$>',
+    blockStart: '<@',
+    blockEnd: '@>',
+    commentStart: '<#',
+    commentEnd: '#>'
+  };
+
+  // add custom filters to nunjucks
+  templateEngine.filters.push(
+    require('./filters/capital'),
+    require('./filters/code'),
+    require('./filters/dump')
+  );
+
+  templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
+
+  // Specify how to match docs to templates.
+  templateFinder.templatePatterns = [
+    '${ doc.template }',
+    '${ doc.docType }.template.html',
+    'common.template.html'
+  ];
+});

 };
@@ -1,76 +1,184 @@
-"use strict";
-const Package = require('dgeni').Package,
-  jsdocPackage = require('dgeni-packages/jsdoc'),
-  nunjucksPackage = require('dgeni-packages/nunjucks'),
-  typescriptPackage = require('dgeni-packages/typescript'),
-  linksPackage = require('dgeni-packages/links'),
-  path = require('path'),
-  config = require('../config.json');
+var Package = require('dgeni').Package;
+var jsdocPackage = require('dgeni-packages/jsdoc');
+var nunjucksPackage = require('dgeni-packages/nunjucks');
+var typescriptPackage = require('./typescript-package');
+var linksPackage = require('./links-package');
+var gitPackage = require('dgeni-packages/git');
+var path = require('path');
+var semver = require('semver');
+var fs = require('fs');
+var _ = require('lodash');
+var config = require('../config.json');
+var projectPackage = require('../../package.json');

-module.exports = currentVersion => {
+// jscs:disable validateIndentation

-  return new Package('ionic-native-readmes', [jsdocPackage, nunjucksPackage, typescriptPackage, linksPackage])
+// Define the dgeni package for generating the docs
+module.exports = function(currentVersion) {

-    .processor(require('./processors/readmes'))
-    .processor(require('./processors/remove-private-members'))
-    .processor(require('./processors/hide-private-api'))
-    .processor(require('./processors/npm-id'))
+  return new Package('ionic-v2-docs',
+                     [jsdocPackage, nunjucksPackage, typescriptPackage,
+                      linksPackage, gitPackage])

-    .config(require('./configs/log'))
-    .config(require('./configs/template-filters'))
-    .config(require('./configs/template-tags'))
-    .config(require('./configs/tag-defs'))
-    .config(require('./configs/links'))
+// .processor(require('./processors/latest-version'))
+.processor(require('./processors/readmes'))
+.processor(require('./processors/remove-private-members'))
+.processor(require('./processors/hide-private-api'))
+.processor(require('./processors/collect-inputs-outputs'))

+// for debugging docs
+// .processor(function test(){
+//   return {
+//
+//     $runBefore: ['rendering-docs'],
+//     $process: function(docs){
+//       docs.forEach(function(doc){
+//         if (doc.name == "Camera"){
+//
+//           // console.log(doc.tags);
+//           // doc.tags.forEach(function(tag){
+//           //   if(tag.tagName == 'classes'){
+//           //
+//           //   }
+//           // });
+//
+//           // doc.moduleDoc.exports.forEach(function(d,i){
+//           //   if(d.name === 'CameraOptions') {
+//           //     console.log('Name: ' + d.name);
+//           //     console.log('Type: ' + d.docType);
+//           //     console.log('First member: ', d.members[0]);
+//           //   }
+//           // });
+//
+//
+//           // var exports = doc.exportSymbol.parent.exports;
+//           // for(var p in exports) {
+//           //   if(p == 'CameraOptions')
+//           //   {
+//           //     var x = exports[p];
+//           //     console.log(x.members.quality);
+//           //   }
+//           // }
+//           // doc.members.forEach(function(method){
+//           //   if (method.name === "getPicture") {
+//           //     console.log(method);
+//           //   }
+//           // })
+//         }
+//       })
+//     }
+//   }
+// })
+.config(function(log) {
+  log.level = 'error'; //'silly', 'debug', 'info', 'warn', 'error'
+})

-    .config(function(renderDocsProcessor, computePathsProcessor) {
+.config(function(renderDocsProcessor, computePathsProcessor, versionInfo) {

-      currentVersion = {
-        href: '/' + config.v2DocsDir.replace('content/', ''),
-        folder: '',
-        name: currentVersion
-      };
+  versions = [];
+  // new version, add it to the versions list
+  if (currentVersion != 'nightly' && !_.includes(versions, currentVersion)) {
+    versions.unshift(currentVersion);
+  }
+  //First semver valid version is latest
+  var latestVersion = _.find(versions, semver.valid);
+  versions = versions.map(function(version) {
+    // We don't separate by versions so always put the docs in the root
+    var folder = '';
+    return {
+      href: '/' + config.v2DocsDir.replace('content/', ''),
+      folder: folder,
+      name: version
+    };
+  });

-      renderDocsProcessor.extraData.version = {
-        list: [currentVersion],
-        current: currentVersion,
-        latest: currentVersion
-      };
+  var versionData = {
+    list: versions,
+    current: _.find(versions, {name: currentVersion}),
+    latest: _.find(versions, {name: latestVersion}) || _.first(versions)
+  };

-      computePathsProcessor.pathTemplates = [{
-        docTypes: ['class'],
-        getOutputPath: doc => doc.originalModule.replace(config.pluginDir + '/', '')
-          .replace('/plugins', '')
-          .replace(/\/index$/, '/README.md')
-      }];
+  renderDocsProcessor.extraData.version = versionData;
+  renderDocsProcessor.extraData.versionInfo = versionInfo;
+  computePathsProcessor.pathTemplates = [{
+    docTypes: ['class', 'var', 'function', 'let'],
+    getOutputPath: function(doc) {
+      return doc.originalModule.replace(config.pluginDir + '/', '')
+        .replace('/index', '') + '/README.md';
+    }
+  }];
+})

-    })
+//configure file reading
+.config(function(readFilesProcessor, readTypeScriptModules) {

-    //configure file reading
-    .config(function(readFilesProcessor, readTypeScriptModules) {
-      // Don't run unwanted processors since we are not using the normal file reading processor
-      readFilesProcessor.$enabled = false;
-      readFilesProcessor.basePath = path.resolve(__dirname, '../..');
+  // Don't run unwanted processors since we are not using the normal file reading processor
+  readFilesProcessor.$enabled = false;
+  readFilesProcessor.basePath = path.resolve(__dirname, '../..');

-      readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../..'));
-      readTypeScriptModules.sourceFiles = ['./src/@ionic-native/plugins/**/*.ts'];
-    })
+  readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname,
+                                                '../..'));
+  readTypeScriptModules.sourceFiles = [
+    './src/@ionic-native/plugins/**/*.ts'
+  ];
+})

-    // Configure file writing
-    .config(function(writeFilesProcessor) {
-      writeFilesProcessor.outputFolder  = './dist/';
-    })
+.config(function(parseTagsProcessor) {
+  parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions
+                                        .concat(require('./tag-defs/tag-defs'));
+})

-    // Configure rendering
-    .config(function(templateFinder) {
-      templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
+// .config(function(parseTagsProcessor) {
+//   // We actually don't want to parse param docs in this package as we are
+//   // getting the data out using TS
+//   parseTagsProcessor.tagDefinitions.forEach(function(tagDef) {
+//     console.log(tagDef);
+//     if (tagDef.name === 'param') {
+//       tagDef.docProperty = 'paramData';
+//       tagDef.transforms = [];
+//     }
+//   });
+// })

-      // Specify how to match docs to templates.
-      templateFinder.templatePatterns = [
-        '${ doc.template }',
-        '${ doc.docType }.template.md',
-        'readme.template.md'
-      ];
-    });
+// Configure links
+.config(function(getLinkInfo) {
+  getLinkInfo.useFirstAmbiguousLink = false;
+})
+
+// Configure file writing
+.config(function(writeFilesProcessor) {
+  writeFilesProcessor.outputFolder  = './dist/packages-dist/';
+})
+
+// Configure rendering
+.config(function(templateFinder, templateEngine) {
+
+  // Nunjucks and Angular conflict in their template bindings so change the Nunjucks
+  // Also conflict with Jekyll
+  templateEngine.config.tags = {
+    variableStart: '<$',
+    variableEnd: '$>',
+    blockStart: '<@',
+    blockEnd: '@>',
+    commentStart: '<#',
+    commentEnd: '#>'
+  };
+
+  // add custom filters to nunjucks
+  templateEngine.filters.push(
+    require('./filters/capital'),
+    require('./filters/code'),
+    require('./filters/dump')
+  );
+
+  templateFinder.templateFolders.unshift(path.resolve(__dirname, 'templates'));
+
+  // Specify how to match docs to templates.
+  templateFinder.templatePatterns = [
+    '${ doc.template }',
+    '${ doc.docType }.template.md',
+    'readme.template.md'
+  ];
+});

 };
@@ -1,5 +1,7 @@
-"use strict";
 module.exports = {
  name: 'capital',
-  process: str => str? str.charAt(0).toUpperCase() + str.substring(1) : ''
+  process: function(str) {
+    str || (str = '');
+    return str.charAt(0).toUpperCase() + str.substring(1);
+  }
 };
@@ -1,5 +1,4 @@
-"use strict";
-const encoder = new require('node-html-encoder').Encoder();
+var encoder = new require('node-html-encoder').Encoder();

 function code(str, inline, lang) {
  // Encode any HTML entities in the code string
@@ -11,14 +10,16 @@ function code(str, inline, lang) {
  str = '<code' + lang + '>' + str + '</code>';

  // If not inline then wrap the code element in a pre element
-  if (!inline) {
+  if ( !inline ) {
    str = '<pre>' + str + '</pre>';
  }

  return str;
-}
+};

 module.exports = {
  name: 'code',
-  process: (str, lang) => code(str, true, lang)
+  process: function(str, lang) {
+    return code(str, true, lang);
+  }
 };
@@ -1,5 +0,0 @@
-"use strict";
-module.exports = {
-  name: 'dashify',
-  process: str => str? str.replace(/\s/g, '-') : ''
-};
@@ -1,5 +1,6 @@
-"use strict";
 module.exports = {
  name: 'dump',
-  process: obj => console.log(obj)
-};
+  process: function(obj) {
+    console.log(obj);
+  }
+};
@@ -1,39 +1,31 @@
-"use strict";
-const config = require('../config.json'),
-  projectPackage = require('../../package.json'),
-  path = require('path'),
-  fs = require('fs-extra-promise').useFs(require('fs-extra')),
-  Dgeni = require('dgeni');
-
-module.exports = gulp => {
-  gulp.task('docs', [], () => {
-
+var config = require('../config.json');
+var projectPackage = require('../../package.json');
+module.exports = function(gulp) {
+  gulp.task('docs', [], function() {
+    var Dgeni = require('dgeni');
+    var semver = require('semver');
    try {
-
-      const ionicPackage = require('./dgeni-config')(projectPackage.version),
-        dgeni = new Dgeni([ionicPackage]);
-
-      return dgeni.generate().then(docs => console.log(docs.length + ' docs generated'));
-
+      var ionicPackage = require('./dgeni-config')(projectPackage.version);
+      var dgeni = new Dgeni([ionicPackage]);
+      return dgeni.generate().then(function(docs) {
+        console.log(docs.length + ' docs generated');
+      });
    } catch (err) {
      console.log(err.stack);
    }
-
  });

  gulp.task('readmes', [], function() {
-
-    fs.copySync(path.resolve(__dirname, '..', '..', 'README.md'), path.resolve(__dirname, '..', '..', config.pluginDir, 'core', 'README.md'));
-
+    var Dgeni = require('dgeni');
+    var semver = require('semver');
    try {
-
-      const ionicPackage = require('./dgeni-readmes-config')(projectPackage.version),
-        dgeni = new Dgeni([ionicPackage]);
-      return dgeni.generate().then(docs => console.log(docs.length + ' README files generated'));
-
+      var ionicPackage = require('./dgeni-readmes-config')(projectPackage.version);
+      var dgeni = new Dgeni([ionicPackage]);
+      return dgeni.generate().then(function(docs) {
+        console.log(docs.length + ' README files generated');
+      });
    } catch (err) {
      console.log(err.stack);
    }
-
  });
-};
+}
@@ -0,0 +1,12 @@
+var Package = require('dgeni').Package;
+
+module.exports = new Package('links', [])
+
+.factory(require('./inline-tag-defs/link'))
+.factory(require('dgeni-packages/ngdoc/services/getAliases'))
+.factory(require('dgeni-packages/ngdoc/services/getDocFromAlias'))
+.factory(require('./services/getLinkInfo'))
+
+.config(function(inlineTagProcessor, linkInlineTagDef) {
+  inlineTagProcessor.inlineTagDefinitions.push(linkInlineTagDef);
+});
@@ -0,0 +1,33 @@
+var INLINE_LINK = /(\S+)(?:\s+([\s\S]+))?/;
+
+/**
+ * @dgService linkInlineTagDef
+ * @description
+ * Process inline link tags (of the form {@link some/uri Some Title}), replacing them with HTML anchors
+ * @kind function
+ * @param  {Object} url   The url to match
+ * @param  {Function} docs error message
+ * @return {String}  The html link information
+ *
+ * @property {boolean} relativeLinks Whether we expect the links to be relative to the originating doc
+ */
+module.exports = function linkInlineTagDef(getLinkInfo, createDocMessage, log) {
+  return {
+    name: 'link',
+    description: 'Process inline link tags (of the form {@link some/uri Some Title}), replacing them with HTML anchors',
+    handler: function(doc, tagName, tagDescription) {
+
+      // Parse out the uri and title
+      return tagDescription.replace(INLINE_LINK, function(match, uri, title) {
+
+        var linkInfo = getLinkInfo(uri, title, doc);
+
+        if ( !linkInfo.valid ) {
+          log.warn(createDocMessage(linkInfo.error, doc));
+        }
+
+        return "<a href='" + linkInfo.url + "'>" + linkInfo.title + "</a>";
+      });
+    }
+  };
+};
@@ -0,0 +1,72 @@
+var _ = require('lodash');
+var path = require('canonical-path');
+
+/**
+ * @dgService getLinkInfo
+ * @description
+ * Get link information to a document that matches the given url
+ * @kind function
+ * @param  {String} url   The url to match
+ * @param  {String} title An optional title to return in the link information
+ * @return {Object}       The link information
+ *
+ * @property {boolean} relativeLinks Whether we expect the links to be relative to the originating doc
+ */
+module.exports = function getLinkInfo(getDocFromAlias, encodeCodeBlock, log) {
+
+  return function getLinkInfoImpl(url, title, currentDoc) {
+    var linkInfo = {
+      url: url,
+      type: 'url',
+      valid: true,
+      title: title || url
+    };
+
+    if ( !url ) {
+      throw new Error('Invalid url');
+    }
+
+    var docs = getDocFromAlias(url, currentDoc);
+
+    if ( !getLinkInfoImpl.useFirstAmbiguousLink && docs.length > 1 ) {
+
+      linkInfo.valid = false;
+      linkInfo.errorType = 'ambiguous';
+      linkInfo.error = 'Ambiguous link: "' + url + '".\n' +
+        docs.reduce(function(msg, doc) { return msg + '\n  "' + doc.id + '" ('+ doc.docType + ') : (' + doc.path + ' / ' + doc.fileInfo.relativePath + ')'; }, 'Matching docs: ');
+
+    } else if ( docs.length >= 1 ) {
+
+      linkInfo.url = docs[0].path;
+      linkInfo.title = title || encodeCodeBlock(docs[0].name, true);
+      linkInfo.type = 'doc';
+
+      if ( getLinkInfoImpl.relativeLinks && currentDoc && currentDoc.path ) {
+        var currentFolder = path.dirname(currentDoc.path);
+        var docFolder = path.dirname(linkInfo.url);
+        var relativeFolder = path.relative(path.join('/', currentFolder), path.join('/', docFolder));
+        linkInfo.url = path.join(relativeFolder, path.basename(linkInfo.url));
+        log.debug(currentDoc.path, docs[0].path, linkInfo.url);
+      }
+
+    } else if ( url.indexOf('#') > 0 ) {
+      var pathAndHash = url.split('#');
+      linkInfo = getLinkInfoImpl(pathAndHash[0], title, currentDoc);
+      linkInfo.url = linkInfo.url + '#' + pathAndHash[1];
+      return linkInfo;
+
+    } else if ( url.indexOf('/') === -1 && url.indexOf('#') !== 0 ) {
+
+      linkInfo.valid = false;
+      linkInfo.errorType = 'missing';
+      linkInfo.error = 'Invalid link (does not match any doc): "' + url + '"';
+
+    } else {
+
+      linkInfo.title = title || (( url.indexOf('#') === 0 ) ? url.substring(1) : path.basename(url, '.html'));
+
+    }
+
+    return linkInfo;
+  };
+};
@@ -30,7 +30,7 @@ function run {
    git pull origin master
  fi

-  git rm -rf content/docs/native/*/ || true
+  git rm -rf content/docs/v2/native/*/ || true

 }

@@ -0,0 +1,71 @@
+module.exports = function collectInputsOutputs() {
+  return {
+
+    $runBefore: ['rendering-docs'],
+    $process: function(docs) {
+      docs.forEach(function(doc) {
+
+        if (doc.statics && doc.statics.length) {
+          for (var i in doc.statics) {
+            // identify properties to differentiate from methods
+            if (typeof doc.statics[i].parameters == 'undefined') {
+              doc.statics[i].isProperty = true;
+            }
+          }
+        }
+
+        if (doc.members && doc.members.length) {
+          var members = [];
+          var inputs = [];
+          var outputs = [];
+
+          memberLoop:
+          for (var i in doc.members) {
+
+            // identify properties to differentiate from methods
+            if (typeof doc.members[i].parameters == 'undefined') {
+              doc.members[i].isProperty = true;
+            }
+
+            if (doc.members[i].decorators && doc.members[i].decorators.length) {
+
+              decoratorLoop:
+              for (var ii in doc.members[i].decorators) {
+
+                if (doc.members[i].decorators[ii].name == 'Input') {
+                  inputs.push(parseMember(doc.members[i]));
+                  continue memberLoop;
+                }
+                if (doc.members[i].decorators[ii].name == 'Output') {
+                  outputs.push(parseMember(doc.members[i]));
+                  continue memberLoop;
+                }
+              }
+              // not an input or output, must be a plain member
+              members.push(doc.members[i]);
+            } else {
+              members.push(doc.members[i]);
+            };
+          }
+
+          // update doc with pruned members list and add inputs and outputs
+          doc.members = members;
+          doc.inputs = inputs;
+          doc.outputs = outputs;
+        }
+
+        function parseMember(member) {
+          member.type = member.content.substring(
+            member.content.indexOf('{') + 1,
+            member.content.indexOf('}')
+          );
+          member.description = member.content.substring(
+            member.content.indexOf('}') + 1,
+            member.content.length
+          );
+          return member;
+        }
+      });
+    }
+  };
+};
@@ -1,43 +0,0 @@
-"use strict";
-module.exports = function test(){
-  return {
-    name: 'debug',
-    $runBefore: ['rendering-docs'],
-    $process: function(docs){
-      docs.forEach(function(doc){
-        if (doc.name == "Camera"){
-
-          console.log(doc.tags);
-          doc.tags.forEach(function(tag){
-            if(tag.tagName == 'classes'){
-
-            }
-          });
-
-          doc.moduleDoc.exports.forEach(function(d,i){
-            if(d.name === 'CameraOptions') {
-              console.log('Name: ' + d.name);
-              console.log('Type: ' + d.docType);
-              console.log('First member: ', d.members[0]);
-            }
-          });
-
-
-          var exports = doc.exportSymbol.parent.exports;
-          for(var p in exports) {
-            if(p == 'CameraOptions')
-            {
-              var x = exports[p];
-              console.log(x.members.quality);
-            }
-          }
-          doc.members.forEach(function(method){
-            if (method.name === "getPicture") {
-              console.log(method);
-            }
-          })
-        }
-      })
-    }
-  }
-}
@@ -1,9 +1,18 @@
-"use strict";
 module.exports = function removePrivateApi() {
  return {
    name: 'remove-private-api',
    description: 'Prevent the private apis from being rendered',
    $runBefore: ['rendering-docs'],
-    $process: docs => docs.filter(doc => !doc.private && (!doc.tags || !doc.tags.tagsByName.get('hidden')))
-  };
+    $process: function(docs) {
+      var publicDocs = [];
+       docs.forEach(function(doc){
+        if(!doc.private){
+          publicDocs.push(doc);
+          return doc
+        }
+      })
+     docs = publicDocs;
+     return docs;
+    }
+  }
 };
@@ -1,53 +1,38 @@
-"use strict";
 module.exports = function jekyll(renderDocsProcessor) {
  return {
    name: 'jekyll',
    description: 'Create jekyll includes',
    $runAfter: ['paths-computed'],
    $runBefore: ['rendering-docs'],
-    $process: docs => {
+    $process: function(docs) {
+      var currentVersion = renderDocsProcessor.extraData.version.current.name;

      // pretty up and sort the docs object for menu generation
-      docs = docs.filter(doc => (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page');
-
-      docs.sort((a, b) => {
-        const textA = a.name ? a.name.toUpperCase() : '',
-          textB = b.name ? b.name.toUpperCase() : '';
-
+      docs = docs.filter(function(doc) {
+        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
+      });
+      docs.sort(function(a, b) {
+        textA = a.name ? a.name.toUpperCase() : '';
+        textB = b.name ? b.name.toUpperCase() : '';
        return (textA < textB) ? -1 : (textA > textB) ? 1 : 0;
      });
+      docs.forEach(function(doc, i) {
+        doc.outputPath = doc.outputPath.toLowerCase().replace(' ', '-');
+        docs[i].URL = doc.outputPath.replace('docs/v2//', 'docs/v2/')
+                                    .replace('/index.md', '')
+                                    .replace('content/', '');

-      docs.forEach(doc => {
-        doc.outputPath = doc.outputPath.toLowerCase().replace(/\s/g, '-');
-        doc.URL = doc.outputPath.replace('docs//', 'docs/')
-          .replace('/index.md', '')
-          .replace('content/', '');
-        // add trailing slash to plugin pages
-        if(!doc.URL.endsWith("/") && !doc.URL.endsWith(".html")) {
-          doc.URL = doc.URL+'/'; 
-        }
+        docs[i].demo = !!docs[i].demo;
      });

-      const betaDocs = [];
-
-      docs = docs.filter(doc => {
-        if (doc.beta === true) {
-          betaDocs.push(doc);
-          return false;
-        }
-        return true;
-      });
-
-      docs = docs.concat(betaDocs);
-
-      // add side menu
      docs.push({
-        docType: 'nativeMenu',
-        id: 'native_menu',
+        docType: 'native_menu-menu',
+        id: 'native_menu-menu',
        template: 'native_menu.template.html',
-        outputPath: 'content/_includes/fluid/native_menu.html'
+        outputPath: 'content/_includes/v2_fluid/native_menu.html'
      });

+      // returning docs will replace docs object in the next process
      return docs;
    }
  };
@@ -0,0 +1,33 @@
+var copy = require('cpr').cpr;
+var mkdirp = require('mkdirp');
+var path = require('canonical-path');
+var q = require('q');
+var fs = require('fs');
+
+module.exports = function latestVersion(renderDocsProcessor) {
+  return {
+    name: 'latest-version',
+    $runAfter: ['files-written'],
+    description: 'Copy the latest version (that was compiled to docs/) into docs/versionName',
+    $process: function(docs) {
+      var versionData = renderDocsProcessor.extraData.version;
+
+      var docsBase = 'dist/ionic-site/content/docs/v2/';
+      var versionDir = path.resolve(docsBase, versionData.latest.name);
+      var latestDir = path.resolve(docsBase, 'api');
+
+      var deferred = q.defer();
+
+      mkdirp(versionDir, function() {
+        copy(latestDir, path.join(versionDir, 'api'), {
+          deleteFirst: true,
+          overwrite: true
+        }, function(err, files) {
+          deferred.resolve(docs);
+        });
+      });
+
+      return deferred.promise;
+    }
+  }
+};
@@ -1,15 +0,0 @@
-"use strict";
-module.exports = function markProperties() {
-  return {
-    name: 'mark-properties',
-    $runBefore: ['rendering-docs'],
-    $process: docs => docs.map(doc => {
-      for (let i in doc.members) {
-        if (doc.members.hasOwnProperty(i) && typeof doc.members[i].parameters === 'undefined') {
-          doc.members[i].isProperty = true;
-        }
-      }
-      return doc;
-    })
-  }
-};
@@ -1,20 +0,0 @@
-"use strict";
-module.exports = function npmId(renderDocsProcessor) {
-  return {
-    name: 'npm-id',
-    $runAfter: ['paths-computed'],
-    $runBefore: ['rendering-docs'],
-    $process: docs => {
-      // pretty up and sort the docs object for menu generation
-      docs = docs.filter(function(doc) {
-        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
-      });
-
-      docs.forEach(doc => {
-        doc.npmId = doc.id.match(/plugins\/(.*)\/index/)[1];
-      });
-
-      return docs;
-    }
-  };
-};
@@ -1,22 +0,0 @@
-"use strict";
-module.exports = function parseOptional() {
-  return {
-    $runBefore: ['rendering-docs'],
-    $process: docs => {
-      docs.forEach(doc => {
-        if (doc.members && doc.members.length) {
-          for (let i in doc.members) {
-            if (doc.members[i].params && doc.members[i].params.length) {
-              for (let ii in doc.members[i].params) {
-                if (doc.members[i].params[ii].optional) {
-                  doc.members[i].params[ii].description += '<strong class="tag">Optional</strong>';
-                }
-              }
-            }
-          }
-        }
-      });
-      return docs;
-    }
-  }
-};
@@ -1,18 +1,24 @@
-"use strict";
-module.exports = function readmes(renderDocsProcessor) {
+module.exports = function jekyll(renderDocsProcessor) {
  return {
    name: 'readmes',
    description: 'Create jekyll includes',
    $runAfter: ['paths-computed'],
    $runBefore: ['rendering-docs'],
-    $process: docs => {
-      // pretty up and sort the docs object for menu generation
-      docs = docs.filter(doc => (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page');
+    $process: function(docs) {
+      var currentVersion = renderDocsProcessor.extraData.version.current.name;

-      docs.forEach(doc => {
+      // pretty up and sort the docs object for menu generation
+      docs = docs.filter(function(doc) {
+        return (!!doc.name && !!doc.outputPath) || doc.docType === 'index-page';
+      });
+
+      docs.forEach(function(doc, i) {
+        doc.npmId = doc.outputPath.replace('/README.md', '')
+          .replace('src/@ionic-native/plugins/','');
        doc.outputPath = doc.outputPath.replace('src/', '');
      });

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

      return docs;
@@ -1,11 +1,11 @@
-"use strict";
 module.exports = [
  {'name': 'advanced'},
  {'name': 'demo'},
-  {'name': 'beta', transforms: (doc, tag, value) => typeof value !== 'undefined'}, // make the value true or undefined instead of '' or undefined
+  {'name': 'beta', transforms: function(doc, tag, value) {
+    // make the value true or undefined instead of '' or undefined
+    return typeof value !== 'undefined';
+  }},
  {'name': 'usage'},
-  {'name': 'hidden'}, // hide from docs
  {'name': 'classes'}, // related classes
-  {'name': 'interfaces'}, // related interfaces
-  {'name': 'paid', transforms: (doc, tag, value) => typeof value !== 'undefined'} // paid plugin, set value to true
+  {'name': 'interfaces'} // related interfaces
 ];
@@ -1,5 +1,5 @@
 ---
-layout: "fluid/docs_base"
+layout: "v2_fluid/docs_base"
 version: "<$ version.current.name $>"
 versionHref: "<$ version.current.href.replace('content/','') $>"
 path: "<$ doc.path $>"
@@ -11,7 +11,7 @@ doc: "<$ doc.name $>"
 docType: "<$ doc.docType $>"
 ---

-<@- macro interfaceTable(interface) -@>
+<@ macro interfaceTable(interface) @>
 <@ for export in doc.moduleDoc.exports -@>
 <@ if export.name == interface @>
 <table class="table param-table" style="margin:0;">
@@ -27,27 +27,36 @@ docType: "<$ doc.docType $>"
  <tr>
    <td>
      <$ param.name $>
+      <@ if param.optional @><div><em>(optional)</em></div><@ endif @>
    </td>
    <td>
      <code><$ param.returnType | escape $></code>
    </td>
    <td>
      <$ param.description | marked $>
-      <@ if param.optional @><em>(optional)</em><@ endif @>
    </td>
  </tr>
  <@ endfor @>
  </tbody>
 </table>
+
 <@ endif @>
 <@- endfor @>
+<@ endmacro @>
+
+<@ macro paramList(paramData) -@>
+<@- if paramData -@><span class="params">(
+    <@- for param in paramData -@>
+      <span class="param"><$ param | escape $><@ if not loop.last @>, <@ endif @></span>
+    <@- endfor @>)</span>
+<@- endif @>
 <@- endmacro -@>

-<@- macro githubViewLink(doc) -@>
-<a href="https://github.com/ionic-team/ionic-native/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
+<@ macro githubViewLink(doc) -@>
+<a href="https://github.com/<$ versionInfo.gitRepoInfo.owner $>/<$ versionInfo.gitRepoInfo.repo $>/tree/master/<$ doc.fileInfo.relativePath $>#L<$ doc.location.start.line+1 $>-L<$ doc.location.end.line+1 $>"><$ doc.fileInfo.relativePath $> (line <$ doc.location.start.line+1 $>)</a>
 <@- endmacro -@>

-<@- macro paramTable(params, isDirective) -@>
+<@ macro paramTable(params, isDirective) -@>
 <table class="table param-table" style="margin:0;">
  <thead>
  <tr>
@@ -57,108 +66,156 @@ docType: "<$ doc.docType $>"
  </tr>
  </thead>
  <tbody>
-  <@- for param in params @>
+  <@ for param in params @>
  <tr>
    <td>
      <$ param.name $>
-      <@- if param.alias @>| <$ param.alias $><@ endif -@>
+      <@ if param.alias @>| <$ param.alias $><@ endif @>
+      <@ if param.type.optional @><div><em>(optional)</em></div><@ endif @>
    </td>
    <td>
      <$ typeList(param.typeList) $>
    </td>
    <td>
      <$ param.description | marked $>
-      <@- if param.defaultValue @><p><em>(default: <$ param.defaultValue $>)</em></p><@ endif -@>
+      <@ if param.default @><p><em>(default: <$ param.default $>)</em></p><@ endif @>
    </td>
  </tr>
-  <@ endfor -@>
+  <@ endfor @>
  </tbody>
 </table>
 <@- endmacro -@>

+
 <@- macro functionSyntax(fn) @>
  <@- set sep = joiner(',&nbsp;') -@>
  <code><$ fn.name $><@- if not fn.isProperty @>(<@ endif -@><@- for param in fn.params @><$ sep() $>
-  <@- if param.type.optional @>[<@- endif -@>
+  <@- if param.type.optional @>[<@ endif -@>
  <$ param.name $>
-  <@- if param.type.optional -@>]<@- endif -@>
-  <@- endfor -@><@- if not fn.isProperty @>)<@- endif -@></code>
-<@- endmacro -@>
+  <@- if param.type.optional @>]<@ endif -@>
+  <@ endfor @><@- if not fn.isProperty @>)<@ endif -@></code>
+  <@ if fn.alias @><small>(alias: <$ fn.alias $>)</small><@ endif @>
+<@ endmacro -@>

-<@- macro typeList(types) -@>
+<@ macro typeList(types) -@>
 <@ set separator = joiner("|") @>
-<@- for type in types @><$ separator() $><$ type | code $><@ endfor -@>
+<@ for type in types @><$ separator() $><$ type | code $><@ endfor @>
 <@- endmacro -@>

 <@- macro typeInfo(fn) -@>
 <$ typeList(fn.typeList) $> <$ fn.description $>
 <@- endmacro -@>

-<@- macro documentPlatforms(method) -@>
+
+
+<@ 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>
-  <strong>Platforms:</strong>
-  <@- for platform in prop.platforms -@>
-  <strong class="tag"><$ platform $></strong>&nbsp;
-  <@- endfor -@>
+  <b>Platforms:</b>
+  <@- for platform in prop.platforms @>
+  <code><$ platform $></code>&nbsp;
+  <@ endfor -@>
 </p>
 <@ endif @>
 <@ endfor @>
 <@- endif @>
-<@- endmacro -@>

-<@ macro documentMethod(method) -@>
-<h3><a class="anchor" name="<$ method.name $>" href="#<$ method.name $>"></a><$ functionSyntax(method) $></h3>
-<$ documentPlatforms(method) $>
+<$ method.description $>
+
+<@ if method.params @>
+<$ paramTable(method.params) $>
+<@ endif @>
+
+<@ if method.this -@>
+<h4> Method's `this`
+  <$ method.this $>
+</h4>
+<@- endif @>
+
+<@ if method.returns @>
+<div class="return-value" markdown="1">
+  <i class="icon ion-arrow-return-left"></i>
+  <b>Returns:</b> <$ typeInfo(method.returns) $>
+</div>
+<@ endif @>
+<@ 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 @>
-<@- endmacro -@>
-
-<@- macro documentClass(doc) @>
-<@- if doc.statics.length -@>
-<h2><a class="anchor" name="static-members" href="#static-members"></a>Static Members</h2>
-<@ for method in doc.statics -@>
-<$ documentMethod(method) $>
-<@ endfor -@>
-<@ endif @>
-
-<# --- methods in class --- #>
-<@- if doc.members and doc.members.length @>
-
-<h2><a class="anchor" name="instance-members" href="#instance-members"></a>Instance Members</h2>
-<@ for method in doc.members -@>
-<$ documentMethod(method) $>
 <@- endfor @>
 <@- endif -@>
 <@ endmacro @>
+<@ block body @>
+<@ block content @>
+<@ block header @>
+<h1 class="api-title">
+  <@ if doc.docType == "directive" @>
+  <$ doc.name | dashCase $>
+  <@ else @>
+  <$ doc.name $>
+  <@ endif @>

-<h1 class="api-title"><$ doc.name $>
+  <@ if doc.parent @>
+  <br />
+  <small>
+    Child of <$ doc.parent $>
+  </small>
+  <@ endif @>
+
+  <@ if doc.delegate @>
+  <br/>
+  <small>
+    Delegate: <$ doc.delegate $>
+  </small>
+  <@ endif @>
  <@- if doc.beta == true -@>
    <span class="beta" title="beta">&beta;</span>
  <@- endif -@>
-  <@- if doc.paid == true -@>
-    <span class="paid" title="paid">Paid</span>
-  <@- endif -@>
 </h1>

-<a class="improve-v2-docs" href="http://github.com/ionic-team/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
+<a class="improve-v2-docs" href="http://github.com/driftyco/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
  Improve this doc
 </a>

-<# --- Decorators --- #>
+<@ endblock @>
+
+<!-- decorators -->
 <@- if doc.decorators @>
+
 <@ for prop in doc.decorators[0].argumentInfo @>
+
 <@ if doc.beta == true @>
 <p class="beta-notice">
  This plugin is still in beta stage and may not work as expected. Please
@@ -166,58 +223,56 @@ docType: "<$ doc.docType $>"
  href="<$ prop.repo $>/issues">plugin repo</a>.
 </p>
 <@ endif @>
-<@ if doc.paid == true @>
-<p class="paid-notice">
-  This plugin might require a paid license, or might take a share of your app's earnings.
-  Check the <a target="_blank" rel="nofollow" href="<$ prop.repo $>">plugin's repo</a> for more information.
-</p>
-<@ endif @>
-
-<# --- Plugin description --- #>
-<$ doc.description | marked $>

+<pre><code>$ <@ if prop.install @><$ prop.install $><@ else @>npm install @ionic-native/<$ prop.pluginRef $> -save<@ endif -@></code></pre>
 <p>Repo:
  <a href="<$ prop.repo $>">
    <$ prop.repo $>
  </a>
 </p>

-<# --- Install commands --- #>
-<h2><a class="anchor" name="installation" href="#installation"></a>Installation</h2>
-<ol class="installation">
-  <li>Install the Cordova and Ionic Native plugins:<br>
-    <pre><code class="nohighlight">$ <@ if prop.install @><$ prop.install | replace('<', '&lt;').replace('>', '&gt;') $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
-$ npm install --save @ionic-native/<$ doc.npmId $>
-</code></pre>
-  </li>
-  <li><a href="https://ionicframework.com/docs/native/#Add_Plugins_to_Your_App_Module">Add this plugin to your app's module</a></li>
-</ol>
+<!-- description -->
+<@ block description @>
+<$ doc.description | marked $>
+<@ endblock @>
+
+
+<@- if doc.directiveInfo @>
+<h2><$ doc.directiveInfo.type $></h2>
+<h3><$ doc.directiveInfo.properties[0].name $>: <code><$ doc.directiveInfo.properties[0].values $></code></h3>
+<@ endif -@>

-<# --- Plugin supported platforms --- #>
 <@ if prop.platforms @>
-<h2><a class="anchor" name="platforms" href="#platforms"></a>Supported platforms</h2>
+<!-- @platforms tag -->
+<h2>Supported platforms</h2>
+<@ block platforms @>
 <ul>
  <@ for platform in prop.platforms -@>
  <li><$ platform $></li>
  <@- endfor @>
 </ul>
+<@ endblock @>
+<!-- @platforms tag end -->
 <@ endif @>
 <@ endfor @>
-<@ endif -@> <# --- end of: if doc.decorators --- #>
+<@ endif -@><!-- if doc.decorators -->

-<# --- Plugin usage --- #>
+<!-- @usage tag -->
 <@ if doc.usage @>
-<h2><a class="anchor" name="usage" href="#usage"></a>Usage</h2>
+<h2>Usage</h2>
+<@ block usage @>
 <$ doc.usage | marked $>
+<@ endblock @>
 <@ endif @>

-<# --- Plugin attributes --- #>
-<@- if doc.properties -@>
-<h2><a class="anchor" name="attributes" href="#attributes"></a>Attributes:</h2>
+<!-- @property tags -->
+<@ if doc.properties @>
+<h2>Attributes:</h2>
 <table class="table" style="margin:0;">
  <thead>
  <tr>
    <th>Attribute</th>
+
    <@ set hasTypes = false @>
    <@ for prop in doc.properties @>
    <@ if prop.type @>
@@ -227,11 +282,12 @@ $ npm install --save @ionic-native/<$ doc.npmId $>
    <@ if hasTypes @>
    <th>Type</th>
    <@ endif @>
+
    <th>Description</th>
  </tr>
  </thead>
  <tbody>
-  <@- for prop in doc.properties -@>
+  <@ for prop in doc.properties -@>
  <tr>
    <td>
      <$ prop.name $>
@@ -241,44 +297,48 @@ $ npm install --save @ionic-native/<$ doc.npmId $>
      <$ prop.type.name $>
    </td>
    <@ endif @>
+
    <td>
      <$ prop.description $>
    </td>
  </tr>
-  <@ endfor -@>
+  <@- endfor @>
  </tbody>
 </table>
-<@- endif -@>
+<@ endif @>

-<# --- Plugin class documentation --- #>
 <$ documentClass(doc) $>

-<# --- Advanced usage --- #>
+<@ block advanced @>
 <@- if doc.advanced -@>
 <h2><a class="anchor" name="advanced" href="#advanced"></a>Advanced</h2>
 <$ doc.advanced | marked $>
 <@- endif -@>
+<@ endblock @>

-<# --- Other classes --- #>
-<@- for tag in doc.tags.tags -@>
-<@- if tag.tagName == 'classes' -@>
-<@- set classes = tag.description.split('\n') -@>
-<@- for item in classes -@>
-<@- if item.length > 1 -@>
-<@- for export in doc.moduleDoc.exports -@>
-<@- if export.name == item -@>
+<!-- other classes -->
+<@ for tag in doc.tags.tags -@>
+<@ if tag.tagName == 'classes' -@>
+<!--<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 @>
 <h2><a class="anchor" name="<$ item $>" href="#<$ item $>"></a><$ item $></h2>
 <$ documentClass(export) $>
-<@- endif -@>
-<@- endfor -@>
-<@- endif -@>
-<@- endfor -@>
-<@- endif -@>
-<@- endfor -@>
+<@ endif @>
+<@- endfor @>
+<@ endif @>
+<@- endfor @>
+<@- endif @>
+<@- endfor @>
+<!-- end other classes -->

-<# --- Other interfaces --- #>
+<!-- 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 @>
@@ -288,12 +348,21 @@ $ npm install --save @ionic-native/<$ doc.npmId $>
 <@- endfor @>
 <@ endif @>
 <@- endfor @>
+<!-- end interfaces -->

-
-<# --- Related links --- #>
+<!-- related link -->
 <@- if doc.see @>
-<h2><a class="anchor" name="related" href="#related"></a>Related</h2>
+
+<h2>Related</h2>
 <@ for s in doc.see @>
 <$ s | safe $>
 <@- endfor -@>
+
 <@- endif -@>
+
+
+<!-- end content block -->
+<@ endblock @>
+
+<!-- end body block -->
+<@ endblock @>
@@ -1,10 +1,9 @@
-<li class="capitalize {% if page.id == 'overview' %}active{% endif %}">
-  <a href="/docs/native/">Overview</a>
-</li>
-<li class="capitalize {% if page.id == 'mocking' %}active{% endif %}">
-  <a href="/docs/native/browser.html">Browser Usage</a>
-</li>
-<@- for doc in docs @><@ if doc.URL and doc.private != true @>
-<li class="capitalize {% if page.id == '<$ doc.name|lower|dashify $>' %}active{% endif %}">
-  <a href="/<$ doc.URL $>"><$ doc.name $><@ if doc.paid == true @> <span class="paid">Paid</span><@ endif @><@ if doc.beta == true @> <span class="beta">&beta;</span><@ endif @></a>
+<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta != true @>
+<li class="capitalize {% if page.id == '<$ doc.name|lower|replace(' ','-') $>' %}active{% endif %}">
+  <a href="/<$ doc.URL $>"><$ doc.name $></a>
+</li><@ endif @><@ endfor @>
+
+<@ for doc in docs @><@ if doc.URL and doc.private != true and doc.beta == true @>
+<li class="capitalize {% if page.id == '<$ doc.name|lower|replace(' ','-') $>' %}active{% endif %}">
+  <a href="/<$ doc.URL $>"><$ doc.name $> <span class="beta">&beta;</span></a>
 </li><@ endif @><@ endfor @>
@@ -1,38 +1,54 @@
-<a style="float:right;font-size:12px;" href="http://github.com/ionic-team/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
+<@- block body @>
+<@- block content @>
+<@- block header @>
+<a style="float:right;font-size:12px;" href="http://github.com/driftyco/ionic-native/edit/master/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/') $>#L<$ doc.location.start.line $>">
  Improve this doc
 </a>

 # <$ doc.name $>
+<!-- end header block -->
+<@ endblock -@>

 <@- if doc.beta == true @>
-  <p style="color:orange">
-    This plugin is still in beta stage and may not work as expected. Please
-    submit any issues to the <a target="_blank"
-    href="<$ prop.repo $>/issues">plugin repo</a>.
-  </p>
+<p style="color:orange">
+  This plugin is still in beta stage and may not work as expected. Please
+  submit any issues to the <a target="_blank"
+  href="<$ prop.repo $>/issues">plugin repo</a>.
+</p>
 <@ endif -@>

-
-<@ for prop in doc.decorators[0].argumentInfo @>
-
+<@- for prop in doc.decorators[0].argumentInfo @>
 ```
-$ <@ if prop.install @><$ prop.install $><@ else @>ionic cordova plugin add <$ prop.plugin $><@ endif @>
-$ npm install --save @ionic-native/<$ doc.npmId $>
+$ <@ if prop.install @><$ prop.install $><@ else @>npm install @ionic-native/<$ doc.npmId $> --save<@ endif @>
 ```

-## [Usage Documentation](https://ionicframework.com/docs/native/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/')|replace('index.ts','')|replace('src/@ionic-native/plugins/','') $>)
+## [Usage Documentation](https://ionicframework.com/docs/v2/native/<$ doc.fileInfo.relativePath|replace('/home/ubuntu/ionic-native/', '')|replace('//','/')|replace('index.ts','')|replace('src/@ionic-native/plugins/','') $>)

-Plugin Repo: [<$ prop.repo $>](<$ prop.repo $>)
+Cordova Repo: [<$ prop.repo $>](<$ prop.repo $>)

+<!-- description -->
+<@- block description @>
 <$ doc.description $>
+<@ endblock -@>
+
+<@- if doc.directiveInfo @>
+## <$ doc.directiveInfo.type $>
+### <$ doc.directiveInfo.properties[0].name $>: `<$ doc.directiveInfo.properties[0].values $>`
+<@ endif -@>

 <@- if prop.platforms @>
-
+<!-- @platforms tag -->
 ## Supported platforms
+<@ block platforms @>
 <@ for platform in prop.platforms -@>
 - <$ platform $>
 <@ endfor @>
-
+<@ endblock -@>
+<!-- @platforms tag end -->
 <@ endif -@>
-
-<@ endfor @>
+<!-- end for prop in method.decorators[0].argumentInfo -->
+<@ endfor -@>
+<!-- end content block -->
+<@ endblock -@>
+<!-- end body block -->
+<@ endblock -@>
@@ -0,0 +1,100 @@
+var Package = require('dgeni').Package;
+var jsdocPackage = require('dgeni-packages/jsdoc');
+var nunjucksPackage = require('dgeni-packages/nunjucks');
+var typescriptPackage = require('../typescript-package');
+var gitPackage = require('dgeni-packages/git');
+var path = require('canonical-path');
+
+// Define the dgeni package for generating the docs
+module.exports = new Package('angular-v2-docs', [jsdocPackage, nunjucksPackage, typescriptPackage, gitPackage])
+
+// Register the processors
+.processor(require('./processors/createTypeDefinitionFile'))
+
+.config(function(readFilesProcessor, inlineTagProcessor) {
+  readFilesProcessor.basePath = path.resolve(__dirname, '../..');
+  // Don't run unwanted processors
+  readFilesProcessor.$enabled = false;
+  inlineTagProcessor.$enabled = false;
+})
+
+
+// Configure the log service
+.config(function(log) {
+  log.level = 'info';
+})
+
+
+.config(function(renderDocsProcessor, versionInfo) {
+  renderDocsProcessor.extraData.versionInfo = versionInfo;
+})
+
+.config(function(readFilesProcessor, inlineTagProcessor, readTypeScriptModules, createTypeDefinitionFile) {
+
+  // Don't run unwanted processors
+  readFilesProcessor.$enabled = false; // We are not using the normal file reading processor
+  inlineTagProcessor.$enabled = false; // We are not actually processing the inline link tags
+
+  // Configure file reading
+  readFilesProcessor.basePath = path.resolve(__dirname, '../..');
+  readTypeScriptModules.sourceFiles = [
+    'angular2/angular2.ts',
+    'angular2/router.ts'
+  ];
+  readTypeScriptModules.basePath = path.resolve(path.resolve(__dirname, '../../modules'));
+  
+  createTypeDefinitionFile.typeDefinitions = [
+      {
+        id: 'angular2/angular2',
+        modules: {
+          'angular2/angular2': 'angular2/angular2',
+        }
+      },
+      {
+        id: 'angular2/router',
+        modules: {
+          'angular2/router': 'angular2/router'
+        }
+      }    
+  ];
+})
+
+
+.config(function(parseTagsProcessor, getInjectables) {
+  // We actually don't want to parse param docs in this package as we are getting the data out using TS
+  parseTagsProcessor.tagDefinitions.forEach(function(tagDef) {
+    if (tagDef.name === 'param') {
+      tagDef.docProperty = 'paramData';
+      tagDef.transforms = [];
+    }
+  });
+
+})
+
+
+// Configure file writing
+.config(function(writeFilesProcessor) {
+  writeFilesProcessor.outputFolder  = 'dist/docs';
+})
+
+
+// Configure rendering
+.config(function(templateFinder, templateEngine) {
+
+  // Nunjucks and Angular conflict in their template bindings so change Nunjucks
+  templateEngine.config.tags = {
+    variableStart: '{$',
+    variableEnd: '$}'
+  };
+
+  templateFinder.templateFolders
+      .unshift(path.resolve(__dirname, 'templates'));
+
+  templateFinder.templatePatterns = [
+    '${ doc.template }',
+    '${ doc.id }.${ doc.docType }.template.html',
+    '${ doc.id }.template.html',
+    '${ doc.docType }.template.html',
+    'common.template.html'
+  ];
+});
@@ -0,0 +1,11 @@
+var Package = require('dgeni').Package;
+
+module.exports = function mockPackage() {
+
+  return new Package('mockPackage', [require('../')])
+
+  // provide a mock log service
+  .factory('log', function() { return require('dgeni/lib/mocks/log')(false); })
+//  .factory('templateEngine', function() { return {}; });
+
+};
@@ -0,0 +1,86 @@
+var _ = require('lodash');
+var path = require('canonical-path');
+
+module.exports = function createTypeDefinitionFile(log) {
+
+  return {
+    $runAfter: ['processing-docs'],
+    $runBefore: ['docs-processed'],
+    $validate: {
+      dtsPath: { presence: true },
+      dtsExtension: { presence: true },
+      typeDefinitions: { presence: true }
+    },
+    dtsPath: 'typings',
+    dtsExtension: '.d.ts',
+    typeDefinitions: [],
+    $process: function(docs) {
+      var dtsPath = this.dtsPath;
+      var dtsExtension = this.dtsExtension;
+
+      // For each type definition that we wish to create we define a dgeni "doc" for it
+      var typeDefDocs = _.map(this.typeDefinitions, function(def) {
+
+        var id = def.id + dtsExtension;
+        var docPath = path.join(dtsPath, id);
+
+        return {
+          docType: 'type-definition',
+          id: id,
+          aliases: [id],
+          path: docPath,
+          outputPath: docPath,
+          // A type definition may include a number of top level modules
+          // And those modules could be aliased (such as 'angular2/angular2.api' -> 'angular2/angular2')
+          moduleDocs: _.transform(def.modules, function(moduleDocs, id, alias) {
+            moduleDocs[id] = { id: alias, doc: null };
+          })
+        };
+      });
+
+      // Now add all the module docs to their corresponding type definition doc
+      _.forEach(docs, function(doc) {
+        _.forEach(typeDefDocs, function(typeDefDoc) {
+          if(typeDefDoc.moduleDocs[doc.id]) {
+            // Add a copy, because we are going to modify it
+            typeDefDoc.moduleDocs[doc.id].doc = doc;
+          }
+        });
+      });
+
+      return _.filter(typeDefDocs, function(doc) {
+        _.forEach(doc.moduleDocs, function(modDoc, alias) {
+          if (!doc || !modDoc.doc) {
+            log.error('createTypeDefinitionFile processor: no such module "' + alias + '" (Did you forget to add it to the modules to load?)');
+            doc = null;
+            return;
+          }
+          _.forEach(modDoc.doc.exports, function(exportDoc) {
+
+            // Search for classes with a constructor marked as `@private`
+            if (exportDoc.docType === 'class' && exportDoc.constructorDoc && exportDoc.constructorDoc.private) {
+
+              // Convert this class to an interface with no constructor
+              exportDoc.docType = 'interface';
+              exportDoc.constructorDoc = null;
+              
+              if (exportDoc.heritage) {
+                // convert the heritage since interfaces use `extends` not `implements`
+                exportDoc.heritage = exportDoc.heritage.replace('implements', 'extends');
+              }
+
+              // Add the `declare var SomeClass extends InjectableReference` construct
+              modDoc.doc.exports.push({
+                docType: 'var',
+                name: exportDoc.name,
+                id: exportDoc.id,
+                heritage: ': InjectableReference'
+              });
+            }
+          });
+        });
+        return !!doc;
+      });
+    }
+  };
+};
@@ -0,0 +1,48 @@
+var mockPackage = require('../mocks/mockPackage');
+var Dgeni = require('dgeni');
+var path = require('canonical-path');
+var _ = require('lodash');
+
+describe('createTypeDefinitionFile processor', function() {
+  var dgeni, injector, processor;
+
+  beforeEach(function() {
+    dgeni = new Dgeni([mockPackage()]);
+    injector = dgeni.configureInjector();
+    processor = injector.get('createTypeDefinitionFile');
+
+    // Initialize the processor
+    processor.typeDefinitions = [{
+      id: 'angular2/angular2',
+      modules: { 'angular2/angular2': 'angular2/angular2' }
+    }];
+  });
+
+
+
+  describe('classes with private constructors', function() {
+    
+    it('should convert heritage from `implements` into `extends`', function() {
+      
+      // Create some mock docs for testing
+      var docs = [
+        {
+          id: 'angular2/angular2',
+          exports: [
+            { docType: 'class', heritage: 'implements Xyz', constructorDoc: { private: true }  }
+          ]
+        }
+      ];
+
+      docs = processor.$process(docs);
+      
+      expect(docs.length).toEqual(1);
+      expect(docs[0].docType).toEqual('type-definition');
+
+      var moduleDoc = docs[0].moduleDocs['angular2/angular2'].doc;
+      expect(moduleDoc.exports.length).toEqual(2);
+      expect(moduleDoc.exports[0].heritage).toEqual('extends Xyz');
+    });
+  });
+	
+});
@@ -0,0 +1,17 @@
+{% extends '../type-definition.template.html' %}
+{% block staticDeclarations %}
+
+interface List<T> extends Array<T> {}
+interface Map<K,V> {}
+interface StringMap<K,V> extends Map<K,V> {}
+
+declare module ng {
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+  interface InjectableReference {}
+}
+{% endblock %}
@@ -0,0 +1,72 @@
+
+{%- macro commentBlock(doc, level) -%}
+{%- if doc.content | trim %}
+
+{% if level > 1 %}{$ '/**' | indent(level-1, true) | replace(r/\n$/, "") $}{% else %}/**{% endif %}
+{$ doc.content | trim | replace(r/^/gm, "* ") | indent(level, true) | replace(r/\n$/, "") $}
+{$ '*/' | indent(level, true) | replace(r/\n$/, "") $}{% endif -%}
+{%- endmacro -%}
+
+
+{%- macro memberInfo(member) -%}
+{$ commentBlock(member, 5) $}
+     {$ member.name $}{% if member.optional %}?{% endif -%}
+{% if member.typeParameters %}<{% for typeParam in member.typeParameters %}{$ typeParam $}{% if not loop.last %}, {% endif %}{% endfor %}>{% endif -%}
+{%- if member.parameters -%}({% for param in member.parameters %}{$ param $}{% if not loop.last %}, {% endif %}{% endfor %}){%- endif -%}
+{%- if member.returnType == 'Directive' %}: DirectiveAnnotation{%- elif member.returnType -%}: {$ member.returnType $}{%- else -%}: void
+{%- endif -%};
+{%- endmacro -%}
+
+
+// Type definitions for Angular v{$ versionInfo.currentVersion.full | replace(r/\+/, "_") $}
+// Project: http://angular.io/
+// Definitions by: angular team <https://github.com/angular/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// ***********************************************************
+// This file is generated by the Angular build process.
+// Please do not create manual edits or send pull requests
+// modifying this file.
+// ***********************************************************
+{% block staticDeclarations %}{% endblock %}
+{% for alias, module in doc.moduleDocs %}
+{$ commentBlock(module.doc, 1) $}
+declare module ng {
+
+  {%- for export in module.doc.exports -%}
+  {%- if export.content -%}
+    {$ commentBlock(export, 3) $}
+  {%- endif %}
+  {$ export.docType $} {$ export.name $}{$ export.typeParams $}{%- if export.heritage == ' extends Directive' %} extends DirectiveAnnotation{% else %}{$ export.heritage $}{% endif %}
+  {%- if export.docType == 'class' or export.docType == 'interface' %} {
+  {%- if export.newMember %}
+    {$ memberInfo(export.newMember) $}
+  {% endif %}
+  {%- if export.callMember %}
+    {$ memberInfo(export.callMember) $}
+  {% endif -%}
+  {%- for member in export.members %}
+    {$ memberInfo(member) $}
+  {%- endfor %}
+  }
+
+  {%- elif export.docType == 'enum' %} {
+    {%- for member in export.members %}
+    {$ member $}{% if not loop.last %},
+    {%- endif -%}
+    {%- endfor %}
+  }
+
+  {%- else -%}
+    {% if export.parameters %}({% for param in export.parameters %}{$ param $}{% if not loop.last %}, {% endif %}{% endfor %}){%- endif %}
+    {%- if export.returnType %} : {$ export.returnType $} {% endif -%}
+    ;
+  {%- endif %}
+  {% endfor %}
+}
+
+{% endfor %}
+
+declare module "angular2/angular2" {
+  export = ng;
+}
@@ -0,0 +1,74 @@
+var basePackage = require('dgeni-packages/base');
+var Package = require('dgeni').Package;
+var path = require('canonical-path');
+
+// Define the dgeni package for generating the docs
+module.exports = new Package('typescript-parsing', [basePackage])
+
+// Register the services and file readers
+.factory(require('./services/modules'))
+.factory(require('./services/tsParser'))
+.factory(require('./services/tsParser/createCompilerHost'))
+.factory(require('./services/tsParser/getFileInfo'))
+.factory(require('./services/tsParser/getExportDocType'))
+.factory(require('./services/tsParser/getContent'))
+.factory(require('./services/tsParser/getDirectiveInfo'))
+
+.factory(require('./services/convertPrivateClassesToInterfaces'))
+
+.factory('EXPORT_DOC_TYPES', function() {
+  return [
+    'class',
+    'interface',
+    'function',
+    'var',
+    'const',
+    'let',
+    'enum',
+    'type-alias'
+  ];
+})
+
+
+// Register the processors
+.processor(require('./processors/readTypeScriptModules'))
+
+
+// Configure the log service
+.config(function(log) {
+  log.level = 'warn';
+})
+
+
+// Configure ids and paths
+.config(function(computeIdsProcessor, computePathsProcessor, EXPORT_DOC_TYPES) {
+
+  computeIdsProcessor.idTemplates.push({
+    docTypes: ['member'],
+    idTemplate: '${classDoc.id}.${name}',
+    getAliases: function(doc) {
+      return doc.classDoc.aliases.map(function(alias) { return alias + '.' + doc.name; });
+    }
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['member'],
+    pathTemplate: '${classDoc.path}#${name}',
+    getOutputPath: function() {} // These docs are not written to their own file, instead they are part of their class doc
+  });
+
+  var MODULES_DOCS_PATH = 'partials/modules';
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: ['module'],
+    pathTemplate: '/${id}',
+    outputPathTemplate: MODULES_DOCS_PATH + '/${id}/index.html'
+  });
+
+  computePathsProcessor.pathTemplates.push({
+    docTypes: EXPORT_DOC_TYPES,
+    pathTemplate: '${moduleDoc.path}/${name}',
+    outputPathTemplate: MODULES_DOCS_PATH + '/${path}/index.html'
+  });
+
+});
@@ -0,0 +1,11 @@
+var Package = require('dgeni').Package;
+
+module.exports = function mockPackage() {
+
+  return new Package('mockPackage', [require('../')])
+
+  // provide a mock log service
+  .factory('log', function() { return require('dgeni/lib/mocks/log')(false); })
+  .factory('templateEngine', function() { return {}; });
+
+};
@@ -0,0 +1,4 @@
+export var __esModule = true;
+export class OKToExport {}
+export function _thisIsPrivate() {}
+export var thisIsOK = '!';
@@ -0,0 +1,5 @@
+export interface MyInterface {
+  optionalProperty? : string
+  <T, U extends Findable<T>>(param: T) : U
+  new (param: number) : MyInterface
+}
@@ -0,0 +1,6 @@
+export class Test {
+  firstItem;
+  constructor() { this.doStuff(); }
+  otherMethod() {}
+  doStuff() {}
+}
@@ -0,0 +1 @@
+export var x = 10;
@@ -0,0 +1,3 @@
+export { x as y} from './privateModule';
+
+export abstract class AbstractClass {}
@@ -0,0 +1 @@
+export var x = 100;
@@ -0,0 +1,34 @@
+/**
+ * @module
+ * @description
+ * This is the module description
+ */
+
+export * from 'importedSrc';
+
+/**
+ * This is some random other comment
+ */
+
+/**
+ * This is MyClass
+ */
+export class MyClass {
+  message: String;
+
+  /**
+   * Create a new MyClass
+   * @param {String} name The name to say hello to
+   */
+  constructor(name) { this.message = 'hello ' + name; }
+
+  /**
+   * Return a greeting message
+   */
+  greet() { return this.message; }
+}
+
+/**
+ * An exported function
+ */
+export var myFn = (val: number) => return val * 2;
@@ -0,0 +1,454 @@
+var glob = require('glob');
+var path = require('canonical-path');
+var _ = require('lodash');
+var ts = require('typescript');
+
+module.exports = function readTypeScriptModules(tsParser, modules, getFileInfo,
+                                                getDirectiveInfo,
+                                                getExportDocType, getContent,
+                                                createDocMessage, log) {
+
+  return {
+    $runAfter: ['files-read'],
+    $runBefore: ['parsing-tags'],
+
+    $validate: {
+      sourceFiles: {presence: true},
+      basePath: {presence: true},
+      hidePrivateMembers: {inclusion: [true, false]},
+      sortClassMembers: {inclusion: [true, false]},
+      ignoreExportsMatching: {}
+    },
+
+    // A collection of globs that identify those modules for which we should create docs
+    sourceFiles: [],
+    // The base path from which to load the source files
+    basePath: '.',
+    // We can ignore members of classes that are private
+    hidePrivateMembers: true,
+    // We leave class members sorted in order of declaration
+    sortClassMembers: false,
+    // We can provide a collection of strings or regexes to ignore exports whose export names match
+    ignoreExportsMatching: ['___esModule'],
+
+    $process: function(docs) {
+
+      // Convert ignoreExportsMatching to an array of regexes
+      var ignoreExportsMatching = convertToRegexCollection(this.ignoreExportsMatching);
+
+      var hidePrivateMembers = this.hidePrivateMembers;
+      var sortClassMembers = this.sortClassMembers;
+
+      var basePath = path.resolve(this.basePath);
+      var filesPaths = expandSourceFiles(this.sourceFiles, basePath);
+      var parseInfo = tsParser.parse(filesPaths, this.basePath);
+      var moduleSymbols = parseInfo.moduleSymbols;
+
+      // Iterate through each of the modules that were parsed and generate a module doc
+      // as well as docs for each module's exports.
+      moduleSymbols.forEach(function(moduleSymbol) {
+
+        var moduleDoc = createModuleDoc(moduleSymbol, basePath);
+
+        // Add this module doc to the module lookup collection and the docs collection
+        modules[moduleDoc.id] = moduleDoc;
+        docs.push(moduleDoc);
+
+        // Iterate through this module's exports and generate a doc for each
+        moduleSymbol.exportArray.forEach(function(exportSymbol) {
+
+          // Ignore exports starting with an underscore
+          if (anyMatches(ignoreExportsMatching, exportSymbol.name)) return;
+
+          // If the symbol is an Alias then for most things we want the original resolved symbol
+          var resolvedExport = exportSymbol.resolvedSymbol || exportSymbol;
+
+          // If the resolved symbol contains no declarations then it is invalid
+          // (probably an abstract class)
+          // For the moment we are just going to ignore such exports
+          // TODO: find a way of generating docs for them
+          if (!resolvedExport.declarations) return;
+
+          var exportDoc = createExportDoc(exportSymbol.name, resolvedExport, moduleDoc, basePath, parseInfo.typeChecker);
+          log.debug('>>>> EXPORT: ' + exportDoc.name + ' (' + exportDoc.docType + ') from ' + moduleDoc.id);
+
+          // Add this export doc to its module doc
+          moduleDoc.exports.push(exportDoc);
+          docs.push(exportDoc);
+
+          exportDoc.members = [];
+          exportDoc.statics = [];
+
+          // Generate docs for each of the export's members
+          if (resolvedExport.flags & ts.SymbolFlags.HasMembers) {
+
+            for(var memberName in resolvedExport.members) {
+              // FIXME(alexeagle): why do generic type params appear in members?
+              if (memberName === 'T') {
+                continue;
+              }
+              log.silly('>>>>>> member: ' + memberName + ' from ' + exportDoc.id + ' in ' + moduleDoc.id);
+              var memberSymbol = resolvedExport.members[memberName];
+              var memberDoc = createMemberDoc(memberSymbol, exportDoc, basePath, parseInfo.typeChecker);
+
+              // We special case the constructor and sort the other members alphabetically
+              if (memberSymbol.flags & ts.SymbolFlags.Constructor) {
+                exportDoc.constructorDoc = memberDoc;
+                docs.push(memberDoc);
+              } else if (!hidePrivateMembers || memberSymbol.name.charAt(0) !== '_') {
+                docs.push(memberDoc);
+                exportDoc.members.push(memberDoc);
+              } else if (memberSymbol.name === '__call' && memberSymbol.flags & ts.SymbolFlags.Signature) {
+                docs.push(memberDoc);
+                exportDoc.callMember = memberDoc;
+              } else if (memberSymbol.name === '__new' && memberSymbol.flags & ts.SymbolFlags.Signature) {
+                docs.push(memberDoc);
+                exportDoc.newMember = memberDoc;
+              }
+            }
+          }
+
+          if (exportDoc.docType === 'enum') {
+            for(var memberName in resolvedExport.exports) {
+              log.silly('>>>>>> member: ' + memberName + ' from ' + exportDoc.id + ' in ' + moduleDoc.id);
+              var memberSymbol = resolvedExport.exports[memberName];
+              var memberDoc = createMemberDoc(memberSymbol, exportDoc, basePath, parseInfo.typeChecker);
+              docs.push(memberDoc);
+              exportDoc.members.push(memberDoc);
+            }
+          } else if (resolvedExport.flags & ts.SymbolFlags.HasExports) {
+            for (var exported in resolvedExport.exports) {
+              if (exported === 'prototype') continue;
+              if (hidePrivateMembers && exported.charAt(0) === '_') continue;
+              var memberSymbol = resolvedExport.exports[exported];
+              var memberDoc = createMemberDoc(memberSymbol, exportDoc, basePath, parseInfo.typeChecker);
+              memberDoc.isStatic = true;
+              docs.push(memberDoc);
+              exportDoc.statics.push(memberDoc);
+            }
+          }
+
+          if (sortClassMembers) {
+            exportDoc.members.sort(function(a, b) {
+              if (a.name > b.name) return 1;
+              if (a.name < b.name) return -1;
+              return 0;
+            });
+            exportDoc.statics.sort(function(a, b) {
+              if (a.name > b.name) return 1;
+              if (a.name < b.name) return -1;
+              return 0;
+            });
+          }
+        });
+      });
+    }
+  };
+
+
+  function createModuleDoc(moduleSymbol, basePath) {
+    var id = moduleSymbol.name.replace(/^"|"$/g, '');
+    var name = id.split('/').pop();
+    var moduleDoc = {
+      docType: 'module',
+      name: name,
+      id: id,
+      aliases: [id, name],
+      moduleTree: moduleSymbol,
+      content: getContent(moduleSymbol),
+      exports: [],
+      fileInfo: getFileInfo(moduleSymbol, basePath),
+      location: getLocation(moduleSymbol)
+    };
+    return moduleDoc;
+  }
+
+  function createExportDoc(name, exportSymbol, moduleDoc, basePath, typeChecker) {
+    var typeParamString = '';
+    var heritageString = '';
+    var typeDefinition = '';
+
+    exportSymbol.declarations.forEach(function(decl) {
+      var sourceFile = ts.getSourceFileOfNode(decl);
+
+      if (decl.typeParameters) {
+        typeParamString = '<' + getText(sourceFile, decl.typeParameters) + '>';
+      }
+
+      if (decl.symbol.flags & ts.SymbolFlags.TypeAlias) {
+        typeDefinition = getText(sourceFile, decl.type);
+      }
+
+      if (decl.heritageClauses) {
+        decl.heritageClauses.forEach(function(heritage) {
+
+          if (heritage.token == ts.SyntaxKind.ExtendsKeyword) {
+            heritageString += " extends";
+            heritage.types.forEach(function(typ, idx) {
+              heritageString += (idx > 0 ? ',' : '') + typ.getFullText();
+            });
+          }
+
+          if (heritage.token == ts.SyntaxKind.ImplementsKeyword) {
+            heritageString += " implements";
+            heritage.types.forEach(function(typ, idx) {
+              heritageString += (idx > 0 ? ', ' : '') + typ.getFullText();
+            });
+          }
+        });
+      }
+    });
+
+    //Make sure duplicate aliases aren't created, so "Ambiguous link" warnings are prevented
+    var aliasNames = [name, moduleDoc.id + '/' + name];
+    if (typeParamString) {
+      aliasNames.push(name + typeParamString);
+      aliasNames.push(moduleDoc.id + '/' + name + typeParamString);
+    }
+
+    var exportDoc = {
+      docType: getExportDocType(exportSymbol),
+      exportSymbol: exportSymbol,
+      name: name,
+      id: moduleDoc.id + '/' + name,
+      typeParams: typeParamString,
+      heritage: heritageString,
+      decorators: getDecorators(exportSymbol),
+      aliases: aliasNames,
+      moduleDoc: moduleDoc,
+      content: getContent(exportSymbol),
+      fileInfo: getFileInfo(exportSymbol, basePath),
+      location: getLocation(exportSymbol),
+      directiveInfo: getDirectiveInfo(exportSymbol)
+    };
+
+    if (exportDoc.docType === 'var' || exportDoc.docType === 'const' || exportDoc.docType === 'let') {
+      exportDoc.symbolTypeName = exportSymbol.valueDeclaration.type &&
+                                 exportSymbol.valueDeclaration.type.typeName &&
+                                 exportSymbol.valueDeclaration.type.typeName.text;
+    }
+
+    if (exportDoc.docType === 'type-alias') {
+      exportDoc.returnType = getReturnType(typeChecker, exportSymbol);
+    }
+
+    if(exportSymbol.flags & ts.SymbolFlags.Function) {
+      exportDoc.parameters = getParameters(typeChecker, exportSymbol);
+    }
+    if(exportSymbol.flags & ts.SymbolFlags.Value) {
+      exportDoc.returnType = getReturnType(typeChecker, exportSymbol);
+    }
+    if (exportSymbol.flags & ts.SymbolFlags.TypeAlias) {
+      exportDoc.typeDefinition = typeDefinition;
+    }
+
+    // Compute the original module name from the relative file path
+    exportDoc.originalModule = exportDoc.fileInfo.relativePath
+        .replace(new RegExp('\.' + exportDoc.fileInfo.extension + '$'), '');
+
+    return exportDoc;
+  }
+
+  function createMemberDoc(memberSymbol, classDoc, basePath, typeChecker) {
+    var memberDoc = {
+      docType: 'member',
+      classDoc: classDoc,
+      name: memberSymbol.name,
+      decorators: getDecorators(memberSymbol),
+      content: getContent(memberSymbol),
+      fileInfo: getFileInfo(memberSymbol, basePath),
+      location: getLocation(memberSymbol)
+    };
+
+    memberDoc.typeParameters = getTypeParameters(typeChecker, memberSymbol);
+
+    if(memberSymbol.flags & (ts.SymbolFlags.Signature) ) {
+      memberDoc.parameters = getParameters(typeChecker, memberSymbol);
+      memberDoc.returnType = getReturnType(typeChecker, memberSymbol);
+      switch(memberDoc.name) {
+        case '__call':
+          memberDoc.name = '';
+          break;
+        case '__new':
+          memberDoc.name = 'new';
+          break;
+      }
+    }
+
+    if (memberSymbol.flags & ts.SymbolFlags.Method) {
+      // NOTE: we use the property name `parameters` here so we don't conflict
+      // with the `params` property that will be updated by dgeni reading the
+      // `@param` tags from the docs
+      memberDoc.parameters = getParameters(typeChecker, memberSymbol);
+    }
+
+    if (memberSymbol.flags & ts.SymbolFlags.Constructor) {
+      memberDoc.parameters = getParameters(typeChecker, memberSymbol);
+      memberDoc.name = 'constructor';
+    }
+
+    if(memberSymbol.flags & ts.SymbolFlags.Value) {
+      memberDoc.returnType = getReturnType(typeChecker, memberSymbol);
+    }
+
+    if(memberSymbol.flags & ts.SymbolFlags.Optional) {
+      memberDoc.optional = true;
+    }
+
+    return memberDoc;
+  }
+
+
+  function getDecorators(symbol) {
+
+    var declaration = symbol.valueDeclaration || symbol.declarations[0];
+    var sourceFile = ts.getSourceFileOfNode(declaration);
+
+    var decorators = declaration.decorators && declaration.decorators.map(function(decorator) {
+      decorator = decorator.expression;
+      return {
+        name: decorator.expression ? decorator.expression.text : decorator.text,
+        arguments: decorator.arguments && decorator.arguments.map(function(argument) {
+          return getText(sourceFile, argument).trim();
+        }),
+        argumentInfo: decorator.arguments && decorator.arguments.map(function(argument) {
+          return parseArgument(argument);
+        }),
+        expression: decorator
+      };
+    });
+    return decorators;
+  }
+
+  function parseProperties(properties) {
+    var result = {};
+    _.forEach(properties, function(property) {
+      result[property.name.text] = parseArgument(property.initializer);
+    });
+    return result;
+  }
+
+  function parseArgument(argument) {
+    if (argument.text) return argument.text;
+    if (argument.properties) return parseProperties(argument.properties);
+    if (argument.elements) return argument.elements.map(function(element) { return element.text; });
+    var sourceFile = ts.getSourceFileOfNode(argument);
+    var text = getText(sourceFile, argument).trim();
+    return text;
+  }
+
+  function getParameters(typeChecker, symbol) {
+    var declaration = symbol.valueDeclaration || symbol.declarations[0];
+    var sourceFile = ts.getSourceFileOfNode(declaration);
+    if (!declaration.parameters) {
+      var location = getLocation(symbol);
+      throw new Error('missing declaration parameters for "' + symbol.name +
+        '" in ' + sourceFile.fileName +
+        ' at line ' + location.start.line);
+    }
+    return declaration.parameters.map(function(parameter) {
+      var paramText = '';
+      if (parameter.dotDotDotToken) {
+        paramText += '...';
+      }
+      paramText += getText(sourceFile, parameter.name);
+      if (parameter.questionToken || parameter.initializer) {
+        paramText += '?';
+      }
+      if (parameter.type) {
+        paramText += ':' + getType(sourceFile, parameter.type);
+      } else {
+        paramText += ': any';
+        if (parameter.dotDotDotToken) {
+          paramText += '[]';
+        }
+      }
+      return paramText.trim();
+    });
+  }
+
+  function getTypeParameters(typeChecker, symbol) {
+    var declaration = symbol.valueDeclaration || symbol.declarations[0];
+    var sourceFile = ts.getSourceFileOfNode(declaration);
+    if (!declaration.typeParameters) return;
+    var typeParams = declaration.typeParameters.map(function(type) {
+      return getText(sourceFile, type).trim();
+    });
+    return typeParams;
+  }
+
+  function getReturnType(typeChecker, symbol) {
+    var declaration = symbol.valueDeclaration || symbol.declarations[0];
+    var sourceFile = ts.getSourceFileOfNode(declaration);
+    if (declaration.type) {
+      return getType(sourceFile, declaration.type).trim();
+    } else if (declaration.initializer) {
+      // The symbol does not have a "type" but it is being initialized
+      // so we can deduce the type of from the initializer (mostly).
+      if (declaration.initializer.expression) {
+        return declaration.initializer.expression.text.trim();
+      } else {
+        return getType(sourceFile, declaration.initializer).trim();
+      }
+    }
+  }
+
+
+  function expandSourceFiles(sourceFiles, basePath) {
+    var filePaths = [];
+    sourceFiles.forEach(function(sourcePattern) {
+      filePaths = filePaths.concat(glob.sync(sourcePattern, { cwd: basePath }));
+    });
+    return filePaths;
+  }
+
+
+  function getText(sourceFile, node) {
+    return sourceFile.text.substring(node.pos, node.end);
+  }
+
+
+  // Strip any local renamed imports from the front of types
+  function getType(sourceFile, type) {
+    var text = getText(sourceFile, type);
+    while (text.indexOf(".") >= 0) {
+      // Keep namespaced symbols in RxNext
+      if (text.match(/^\s*RxNext\./)) break;
+      // handle the case List<thing.stuff> -> List<stuff>
+      text = text.replace(/([^.<]*)\.([^>]*)/, "$2");
+    }
+    return text;
+  }
+
+  function getLocation(symbol) {
+    var node = symbol.valueDeclaration || symbol.declarations[0];
+    var sourceFile = ts.getSourceFileOfNode(node);
+    var location = {
+      start: ts.getLineAndCharacterOfPosition(sourceFile, node.pos),
+      end: ts.getLineAndCharacterOfPosition(sourceFile, node.end)
+    };
+    return location;
+  }
+
+};
+
+function convertToRegexCollection(items) {
+  if (!items) return [];
+
+  // Must be an array
+  if (!_.isArray(items)) {
+    items = [items];
+  }
+
+  // Convert string to exact matching regexes
+  return items.map(function(item) {
+    return _.isString(item) ? new RegExp('^' + item + '$') : item;
+  });
+}
+
+function anyMatches(regexes, item) {
+  for(var i=0; i<regexes.length; ++i) {
+    if ( item.match(regexes[i]) ) return true;
+  }
+  return false;
+}
@@ -0,0 +1,136 @@
+var mockPackage = require('../mocks/mockPackage');
+var Dgeni = require('dgeni');
+var path = require('canonical-path');
+var _ = require('lodash');
+
+describe('readTypeScriptModules', function() {
+  var dgeni, injector, processor;
+
+  beforeEach(function() {
+    dgeni = new Dgeni([mockPackage()]);
+    injector = dgeni.configureInjector();
+    processor = injector.get('readTypeScriptModules');
+    processor.basePath = path.resolve(__dirname, '../mocks/readTypeScriptModules');
+  });
+
+  describe('exportDocs', function() {
+    it('should provide the original module if the export is re-exported', function() {
+      processor.sourceFiles = [ 'publicModule.ts' ];
+      var docs = [];
+      processor.$process(docs);
+
+      var exportedDoc = docs[1];
+      expect(exportedDoc.originalModule).toEqual('privateModule');
+    });
+
+    it('should include exported abstract classes', function() {
+      processor.sourceFiles = [ 'publicModule.ts' ];
+      var docs = [];
+      processor.$process(docs);
+
+      var exportedDoc = docs[2];
+      expect(exportedDoc.name).toEqual('AbstractClass');
+    });
+
+  });
+
+
+  describe('ignoreExportsMatching', function() {
+    it('should ignore exports that match items in the `ignoreExportsMatching` property', function() {
+      processor.sourceFiles = [ 'ignoreExportsMatching.ts'];
+      processor.ignoreExportsMatching = [/^_/];
+      var docs = [];
+      processor.$process(docs);
+
+      var moduleDoc = docs[0];
+      expect(moduleDoc.docType).toEqual('module');
+      expect(moduleDoc.exports).toEqual([
+        jasmine.objectContaining({ name: 'OKToExport' }),
+        jasmine.objectContaining({ name: 'thisIsOK' })
+      ]);
+    });
+
+    it('should only ignore `___esModule` exports by default', function() {
+      processor.sourceFiles = [ 'ignoreExportsMatching.ts'];
+      var docs = [];
+      processor.$process(docs);
+
+      var moduleDoc = docs[0];
+      expect(moduleDoc.docType).toEqual('module');
+      expect(getNames(moduleDoc.exports)).toEqual([
+        'OKToExport',
+        '_thisIsPrivate',
+        'thisIsOK'
+      ]);
+    });
+  });
+
+
+  describe('interfaces', function() {
+
+    it('should mark optional properties', function() {
+      processor.sourceFiles = [ 'interfaces.ts'];
+      var docs = [];
+      processor.$process(docs);
+
+      var moduleDoc = docs[0];
+      var exportedInterface = moduleDoc.exports[0];
+      var member = exportedInterface.members[0];
+      expect(member.name).toEqual('optionalProperty');
+      expect(member.optional).toEqual(true);
+    });
+
+
+    it('should handle "call" type interfaces', function() {
+      processor.sourceFiles = [ 'interfaces.ts'];
+      var docs = [];
+      processor.$process(docs);
+
+      var moduleDoc = docs[0];
+      var exportedInterface = moduleDoc.exports[0];
+
+      expect(exportedInterface.callMember).toBeDefined();
+      expect(exportedInterface.callMember.parameters).toEqual(['param: T']);
+      expect(exportedInterface.callMember.returnType).toEqual('U');
+      expect(exportedInterface.callMember.typeParameters).toEqual(['T', 'U extends Findable<T>']);
+      expect(exportedInterface.newMember).toBeDefined();
+      expect(exportedInterface.newMember.parameters).toEqual(['param: number']);
+      expect(exportedInterface.newMember.returnType).toEqual('MyInterface');
+    });
+  });
+
+
+  describe('ordering of members', function() {
+    it('should order class members in order of appearance (by default)', function() {
+      processor.sourceFiles = ['orderingOfMembers.ts'];
+      var docs = [];
+      processor.$process(docs);
+      var classDoc = _.find(docs, { docType: 'class' });
+      expect(classDoc.docType).toEqual('class');
+      expect(getNames(classDoc.members)).toEqual([
+        'firstItem',
+        'otherMethod',
+        'doStuff',
+      ]);
+    });
+
+
+    it('should not order class members if not sortClassMembers is false', function() {
+      processor.sourceFiles = ['orderingOfMembers.ts'];
+      processor.sortClassMembers = false;
+      var docs = [];
+      processor.$process(docs);
+      var classDoc = _.find(docs, { docType: 'class' });
+      expect(classDoc.docType).toEqual('class');
+      expect(getNames(classDoc.members)).toEqual([
+        'firstItem',
+        'otherMethod',
+        'doStuff'
+      ]);
+    });
+  });
+});
+
+function getNames(collection) {
+  return collection.map(function(item) { return item.name; });
+}
@@ -0,0 +1,31 @@
+var _ = require('lodash');
+
+module.exports = function convertPrivateClassesToInterfaces() {
+  return function(exportDocs, addInjectableReference) {
+    _.forEach(exportDocs, function(exportDoc) {
+
+      // Search for classes with a constructor marked as `@internal`
+      if (exportDoc.docType === 'class' && exportDoc.constructorDoc && exportDoc.constructorDoc.internal) {
+
+        // Convert this class to an interface with no constructor
+        exportDoc.docType = 'interface';
+        exportDoc.constructorDoc = null;
+
+        if (exportDoc.heritage) {
+          // convert the heritage since interfaces use `extends` not `implements`
+          exportDoc.heritage = exportDoc.heritage.replace('implements', 'extends');
+        }
+
+        if (addInjectableReference) {
+          // Add the `declare var SomeClass extends InjectableReference` construct
+          exportDocs.push({
+            docType: 'var',
+            name: exportDoc.name,
+            id: exportDoc.id,
+            returnType: 'InjectableReference'
+          });
+        }
+      }
+    });
+  };
+};
@@ -0,0 +1,76 @@
+var mockPackage = require('../mocks/mockPackage');
+var Dgeni = require('dgeni');
+var _ = require('lodash');
+
+describe('readTypeScriptModules', function() {
+  var dgeni, injector, convertPrivateClassesToInterfaces;
+
+  beforeEach(function() {
+    dgeni = new Dgeni([mockPackage()]);
+    injector = dgeni.configureInjector();
+    convertPrivateClassesToInterfaces = injector.get('convertPrivateClassesToInterfaces');
+  });
+
+  it('should convert private class docs to interface docs', function() {
+    var docs = [
+      {
+        docType: 'class',
+        name: 'privateClass',
+        id: 'privateClass',
+        constructorDoc: { internal: true }
+      }
+    ];
+    convertPrivateClassesToInterfaces(docs, false);
+    expect(docs[0].docType).toEqual('interface');
+  });
+
+
+  it('should not touch non-private class docs', function() {
+    var docs = [
+      {
+        docType: 'class',
+        name: 'privateClass',
+        id: 'privateClass',
+        constructorDoc: { }
+      }
+    ];
+    convertPrivateClassesToInterfaces(docs, false);
+    expect(docs[0].docType).toEqual('class');
+  });
+
+
+  it('should convert the heritage since interfaces use `extends` not `implements`', function() {
+    var docs = [
+      {
+        docType: 'class',
+        name: 'privateClass',
+        id: 'privateClass',
+        constructorDoc: { internal: true },
+        heritage: 'implements parentInterface'
+      }
+    ];
+    convertPrivateClassesToInterfaces(docs, false);
+    expect(docs[0].heritage).toEqual('extends parentInterface');
+  });
+
+
+  it('should add new injectable reference types, if specified, to the passed in collection', function() {
+    var docs = [
+      {
+        docType: 'class',
+        name: 'privateClass',
+        id: 'privateClass',
+        constructorDoc: { internal: true },
+        heritage: 'implements parentInterface'
+      }
+    ];
+    convertPrivateClassesToInterfaces(docs, true);
+    expect(docs[1]).toEqual({
+      docType : 'var',
+      name : 'privateClass',
+      id : 'privateClass',
+      returnType : 'InjectableReference'
+    });
+  });
+
+});
@@ -0,0 +1,3 @@
+module.exports = function modules() {
+  return {};
+};
@@ -0,0 +1,80 @@
+var ts = require('typescript');
+var fs = require('fs');
+var path = require('canonical-path');
+
+// We need to provide our own version of CompilerHost because we want to set the
+// base directory and specify what extensions to consider when trying to load a source
+// file
+module.exports = function createCompilerHost(log) {
+
+  return function createCompilerHost(options, baseDir, extensions) {
+
+    return {
+      getSourceFile: function(fileName, languageVersion, onError) {
+        var text, resolvedPath, resolvedPathWithExt;
+
+        // Strip off the extension and resolve relative to the baseDir
+        baseFilePath = fileName.replace(/\.[^.]+$/, '');
+        resolvedPath = path.resolve(baseDir, baseFilePath);
+
+        // Iterate through each possible extension and return the first source file that is actually found
+        for(var i=0; i<extensions.length; i++) {
+
+          // Try reading the content from files using each of the given extensions
+          try {
+            resolvedPathWithExt = resolvedPath + extensions[i];
+            log.silly('getSourceFile:', resolvedPathWithExt);
+            text = fs.readFileSync(resolvedPathWithExt, { encoding: options.charset });
+            log.debug('found source file:', fileName, resolvedPathWithExt);
+            return ts.createSourceFile(baseFilePath + extensions[i], text, languageVersion);
+          }
+          catch(e) {
+            // Try again if the file simply did not exist, otherwise report the error as a warning
+            if(e.code !== 'ENOENT') {
+              if (onError) onError(e.message);
+              log.warn('Error reading ' + resolvedPathWithExt + ' : ' + e.message);
+            }
+          }
+        }
+      },
+      getDefaultLibFileName: function(options) {
+        return path.resolve(path.dirname(ts.sys.getExecutingFilePath()), ts.getDefaultLibFileName(options));
+      },
+      writeFile: function(fileName, data, writeByteOrderMark, onError) {
+        // no-op
+      },
+      getCurrentDirectory: function() {
+        return baseDir;
+      },
+      useCaseSensitiveFileNames: function() {
+        return ts.sys.useCaseSensitiveFileNames;
+      },
+      getCanonicalFileName: function(fileName) {
+        // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
+        // otherwise use toLowerCase as a canonical form.
+        return ts.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
+      },
+      getNewLine: function() {
+        return ts.sys.newLine;
+      },
+      fileExists: function(fileName) {
+        var text, resolvedPath, resolvedPathWithExt;
+
+        // Strip off the extension and resolve relative to the baseDir
+        baseFilePath = fileName.replace(/\.[^.]+$/, '');
+        resolvedPath = path.resolve(baseDir, baseFilePath);
+
+        // Iterate through each possible extension and return the first source file that is actually found
+        for(var i=0; i<extensions.length; i++) {
+          // Try reading the content from files using each of the given extensions
+          resolvedPathWithExt = resolvedPath + extensions[i];
+          if (fs.existsSync(resolvedPathWithExt)) return true;
+        }
+        return false;
+      },
+      readFile: function(fileName) {
+        console.log('readFile - NOT IMPLEMENTED', fileName);
+      }
+    };
+  };
+};
@@ -0,0 +1,80 @@
+var mockPackage = require('../../mocks/mockPackage');
+var Dgeni = require('dgeni');
+var path = require('canonical-path');
+var ts = require('typescript');
+
+describe('createCompilerHost', function() {
+  var dgeni, injector, options, host, baseDir, extensions;
+
+  beforeEach(function() {
+    dgeni = new Dgeni([mockPackage()]);
+    injector = dgeni.configureInjector();
+    var createCompilerHost = injector.get('createCompilerHost');
+
+    options = { charset: 'utf8' };
+    baseDir = path.resolve(__dirname, '../../mocks/tsParser');
+    extensions = ['.ts', '.js'];
+
+    host = createCompilerHost(options, baseDir, extensions);
+  });
+
+  describe('getSourceFile', function() {
+    it('should return a SourceFile object for a given path, with fileName relative to baseDir', function() {
+      var sourceFile = host.getSourceFile('testSrc.ts');
+      expect(sourceFile.fileName).toEqual('testSrc.ts');
+      expect(sourceFile.pos).toEqual(0);
+      expect(sourceFile.text).toEqual(jasmine.any(String));
+    });
+
+    it('should try each of the configured extensions and update the filename to the correct extension', function() {
+      var sourceFile = host.getSourceFile('testSrc.js');
+      expect(sourceFile.fileName).toEqual('testSrc.ts');
+
+      sourceFile = host.getSourceFile('../mockPackage.ts');
+      expect(sourceFile.fileName).toEqual('../mockPackage.js');
+    });
+  });
+
+
+  describe('getDefaultLibFileName', function() {
+    it('should return a path to the default library', function() {
+      expect(host.getDefaultLibFileName(options)).toContain('typescript/lib/lib.d.ts');
+    });
+  });
+
+
+  describe('writeFile', function() {
+    it('should do nothing', function() {
+      host.writeFile();
+    });
+  });
+
+
+  describe('getCurrentDirectory', function() {
+    it('should return the baseDir', function() {
+      expect(host.getCurrentDirectory()).toEqual(baseDir);
+    });
+  });
+
+
+  describe('useCaseSensitiveFileNames', function() {
+    it('should return true if the OS is case sensitive', function() {
+      expect(host.useCaseSensitiveFileNames()).toBe(ts.sys.useCaseSensitiveFileNames);
+    });
+  });
+
+
+  describe('getCanonicalFileName', function() {
+    it('should lower case the filename', function() {
+      var expectedFilePath = host.useCaseSensitiveFileNames() ? 'SomeFile.ts' : 'somefile.ts';
+      expect(host.getCanonicalFileName('SomeFile.ts')).toEqual(expectedFilePath);
+    });
+  });
+
+
+  describe('getNewLine', function() {
+    it('should return the newline character for the OS', function() {
+      expect(host.getNewLine()).toEqual(require('os').EOL);
+    });
+  });
+});
@@ -0,0 +1,49 @@
+var ts = require('typescript');
+var LEADING_STAR = /^[^\S\r\n]*\*[^\S\n\r]?/gm;
+
+module.exports = function getContent() {
+  return function(symbol) {
+
+    var content = "";
+
+    if (!symbol.declarations) return content;
+
+    symbol.declarations.forEach(function(declaration) {
+
+      // If this is left side of dotted module declaration, there is no doc comment associated with this declaration
+      if (declaration.kind === ts.SyntaxKind.ModuleDeclaration && declaration.body.kind === ts.SyntaxKind.ModuleDeclaration) {
+          return content;
+      }
+
+      // If this is dotted module name, get the doc comments from the parent
+      while (declaration.kind === ts.SyntaxKind.ModuleDeclaration && declaration.parent.kind === ts.SyntaxKind.ModuleDeclaration) {
+          declaration = declaration.parent;
+      }
+
+      // If this is a variable declaration then we get the doc comments from the grand parent
+      if (declaration.kind === ts.SyntaxKind.VariableDeclaration) {
+        declaration = declaration.parent.parent;
+      }
+
+      // Get the source file of this declaration
+      var sourceFile = ts.getSourceFileOfNode(declaration);
+      var commentRanges = ts.getJsDocComments(declaration, sourceFile);
+
+      if (commentRanges) {
+        commentRanges.forEach(function(commentRange) {
+          content += sourceFile.text
+              .substring(commentRange.pos+ '/**'.length, commentRange.end - '*/'.length)
+              .replace(LEADING_STAR, '')
+              .trim();
+          if (commentRange.hasTrailingNewLine) {
+            content += '\n';
+          }
+        });
+      }
+
+      content += '\n';
+    });
+
+    return content;
+  };
+};
@@ -0,0 +1,34 @@
+
+module.exports = function getDirectiveInfo() {
+
+  return function (symbol) {
+    var directiveInfo;
+    if (symbol.valueDeclaration) {
+      var decorators = symbol.valueDeclaration.decorators;
+      decorators && decorators.forEach(function(decorator){
+        try {
+          var expr = decorator.expression;
+          var type = expr.expression.text.match(/Component|Directive/);
+          if (type) {
+            // type is either Component or Directive
+            // properties are selector, inputs and outputs
+            directiveInfo = { type: type[0], properties: [] };
+
+            //Directive only takes one argument
+            expr.arguments[0].properties.forEach(function(prop){
+              var name = prop.name.text;
+              if (name === "selector") {
+                directiveInfo.properties.push({name: name, values: prop.initializer.text.split(",")});
+              }
+              if (name === "inputs" || name === "outputs") {
+                var values = prop.initializer.elements.map(function(e){ return e.text });
+                directiveInfo.properties.push({name: name, values: values });
+              }
+            });
+          }
+        } catch(e){}
+      });
+    }
+    return directiveInfo;
+  };
+};
@@ -0,0 +1,54 @@
+var ts = require('typescript');
+
+module.exports = function getExportDocType(log) {
+
+  return function(symbol) {
+    if(symbol.flags & ts.SymbolFlags.Function) {
+      return 'function';
+    }
+    if(symbol.flags & ts.SymbolFlags.Class) {
+      return 'class';
+    }
+    if(symbol.flags & ts.SymbolFlags.Interface) {
+      return 'interface';
+    }
+    if(symbol.flags & ts.SymbolFlags.ConstEnum) {
+      return 'enum';
+    }
+    if(symbol.flags & ts.SymbolFlags.RegularEnum) {
+      return 'enum';
+    }
+    if(symbol.flags & ts.SymbolFlags.Property) {
+      return 'module-property';
+    }
+    if(symbol.flags & ts.SymbolFlags.TypeAlias) {
+      return 'type-alias';
+    }
+    if(symbol.flags & ts.SymbolFlags.FunctionScopedVariable) {
+      return 'var';
+    }
+    if(symbol.flags & ts.SymbolFlags.BlockScopedVariable) {
+      return getBlockScopedVariableDocType(symbol);
+    }
+
+    log.warn('getExportDocType(): Unknown symbol type', {
+      symbolName: symbol.name,
+      symbolType: symbol.flags,
+      symbolTarget: symbol.target,
+      file: ts.getSourceFileOfNode(symbol.declarations[0]).fileName
+    });
+    return 'unknown';
+  };
+
+  function getBlockScopedVariableDocType(symbol) {
+
+    var node = symbol.valueDeclaration;
+    while(node) {
+      if ( node.flags & 0x2000 /* const */) {
+        return 'const';
+      }
+      node = node.parent;
+    }
+    return 'let';
+  }
+};
@@ -0,0 +1,20 @@
+var path = require('canonical-path');
+var ts = require('typescript');
+
+module.exports = function getFileInfo(log) {
+
+  return function (symbol, basePath) {
+    var fileName = ts.getSourceFileOfNode(symbol.declarations[0]).fileName;
+
+    var file = path.resolve(basePath, fileName);
+    var fileInfo = {
+      filePath: file,
+      baseName: path.basename(file, path.extname(file)),
+      extension: path.extname(file).replace(/^\./, ''),
+      basePath: basePath,
+      relativePath: fileName,
+      projectRelativePath: fileName
+    };
+    return fileInfo;
+  };
+};
@@ -0,0 +1,74 @@
+var ts = require('typescript');
+var path = require('canonical-path');
+
+module.exports = function tsParser(createCompilerHost, log) {
+
+  return {
+
+    // These are the extension that we should consider when trying to load a module
+    // During migration from Traceur, there is a mix of `.ts`, `.es6` and `.js` (atScript)
+    // files in the project and the TypeScript compiler only looks for `.ts` files when trying
+    // to load imports.
+    extensions: ['.ts', '.js'],
+
+    // The options for the TS compiler
+    options: {
+      allowNonTsExtensions: true,
+      charset: 'utf8'
+    },
+
+    parse: function(fileNames, baseDir) {
+
+      // "Compile" a program from the given module filenames, to get hold of a
+      // typeChecker that can be used to interrogate the modules, exports and so on.
+      var host = createCompilerHost(this.options, baseDir, this.extensions);
+      var program = ts.createProgram(fileNames, this.options, host);
+      var typeChecker = program.getTypeChecker();
+
+      // Create an array of module symbols for each file we were given
+      var moduleSymbols = [];
+      fileNames.forEach(function(fileName) {
+        var sourceFile = program.getSourceFile(fileName);
+
+        if (!sourceFile) {
+          throw new Error('Invalid source file: ' + fileName);
+        } else if (!sourceFile.symbol) {
+          // Some files contain only a comment and no actual module code
+          log.warn('No module code found in ' + fileName);
+        } else {
+          moduleSymbols.push(sourceFile.symbol);
+        }
+      });
+
+
+      moduleSymbols.forEach(function(tsModule) {
+
+        // The type checker has a nice helper function that returns an array of Symbols
+        // representing the exports for a given module
+        tsModule.exportArray = typeChecker.getExportsOfModule(tsModule);
+
+        // Although 'star' imports (e.g. `export * from 'some/module';) get resolved automatically
+        // by the compiler/binder, it seems that explicit imports (e.g. `export {SomeClass} from 'some/module'`)
+        // do not so we have to do a little work.
+        tsModule.exportArray.forEach(function(moduleExport) {
+          if (moduleExport.flags & ts.SymbolFlags.Alias) {
+            // To maintain the alias information (particularly the alias name)
+            // we just attach the original "resolved" symbol to the alias symbol
+            moduleExport.resolvedSymbol = typeChecker.getAliasedSymbol(moduleExport);
+          }
+        });
+      });
+
+      moduleSymbols.typeChecker = typeChecker;
+
+      return {
+        moduleSymbols: moduleSymbols,
+        typeChecker: typeChecker,
+        program: program,
+        host: host
+      };
+    }
+  };
+
+
+};
@@ -0,0 +1,21 @@
+var mockPackage = require('../../mocks/mockPackage');
+var Dgeni = require('dgeni');
+var path = require('canonical-path');
+
+describe('tsParser', function() {
+  var dgeni, injector, parser;
+
+  beforeEach(function() {
+    dgeni = new Dgeni([mockPackage()]);
+    injector = dgeni.configureInjector();
+    parser = injector.get('tsParser');
+  });
+
+  it("should parse a TS file", function() {
+    var parseInfo = parser.parse(['testSrc.ts'], path.resolve(__dirname, '../../mocks/tsParser'));
+    var tsModules = parseInfo.moduleSymbols;
+    expect(tsModules.length).toEqual(1);
+    expect(tsModules[0].exportArray.length).toEqual(3);
+    expect(tsModules[0].exportArray.map(function(i) { return i.name; })).toEqual(['MyClass', 'myFn', 'x']);
+  });
+});
@@ -23,19 +23,17 @@ function run {
  # CD in to the site dir to commit updated docs
  cd $SITE_DIR

-  # Add all files to git
-  git add .
-
  # if no changes, don't commit
-  CHANGED=$(git diff-index --name-only HEAD 2>/dev/null | wc -l)
-  if [ $CHANGED -eq 0 ];
+  CHANGED=$(git diff-index --name-only HEAD --)
+  if [ -z "$CHANGED" ];
  then
    echo "-- No changes detected for the following commit, docs not updated."
-    echo "https://github.com/ionic-team/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
+    echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
  else
    git config --global user.email "hi@ionicframework.com"
    git config --global user.name "Ionitron"
-    git commit -am "Automated build of native docs ionic-team/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
+    git add -A
+    git commit -am "Automated build of native docs driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
    # in case a different commit was pushed to ionic-site during doc/demo gen,
    # try to rebase around it before pushing
    git fetch
@@ -18,12 +18,12 @@ function run {
  if [ -z "$CHANGED" ];
  then
    echo "-- No changes detected for the following commit, docs not updated."
-    echo "https://github.com/ionic-team/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
+    echo "https://github.com/driftyco/$CIRCLE_PROJECT_REPONAME/commit/$CIRCLE_SHA1"
  else
    git config --global user.email "hi@ionicframework.com"
    git config --global user.name "Ionitron"
    git add -A
-    git commit -am "Automated build of native readmes for ionic-team/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
+    git commit -am "Automated build of native readmes for driftyco/$CIRCLE_PROJECT_REPONAME@$CIRCLE_SHA1"
    # in case a different commit was pushed to ionic-site during doc/demo gen,
    # try to rebase around it before pushing
    git fetch
@@ -21,7 +21,7 @@ function run {
  git config --global user.email "hi@ionicframework.com"
  git config --global user.name "Ionitron"

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

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

  /**
   * This function does something
@@ -54,7 +44,7 @@ export class {{ PluginName }} extends IonicNativePlugin {
   * @return {Promise<any>} Returns a promise that resolves when something happens
   */
  @Cordova()
-  functionName(arg1: string, arg2: number): Promise<any> {
+  static functionName(arg1: string, arg2: number): Promise<any> {
    return; // We add return; here to avoid any IDE / Compiler errors
  }

@@ -1,6 +1,9 @@
+declare var window;
+
 export function checkReady() {
  const DEVICE_READY_TIMEOUT = 5000;

+
  // To help developers using cordova, we listen for the device ready event and
  // log an error if it didn't fire in a reasonable amount of time. Generally,
  // when this happens, developers should remove and reinstall plugins, since
@@ -9,13 +12,13 @@ export function checkReady() {

  let didFireReady = false;
  document.addEventListener('deviceready', () => {
-    console.log(`Ionic Native: deviceready event fired after ${(Date.now() - before)} ms`);
+    console.log('DEVICE READY FIRED AFTER', (Date.now() - before), 'ms');
    didFireReady = true;
  });

  setTimeout(() => {
-    if (!didFireReady && !!window.cordova) {
-      console.warn(`Ionic Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`);
+    if (!didFireReady && window.cordova) {
+      console.warn(`Native: deviceready did not fire within ${DEVICE_READY_TIMEOUT}ms. This can happen when plugins are in an inconsistent state. Try removing plugins from plugins/ and reinstalling them.`);
    }
  }, DEVICE_READY_TIMEOUT);
 }
@@ -1,277 +0,0 @@
-import 'core-js';
-import { Plugin, Cordova, CordovaProperty, CordovaCheck, CordovaInstance, InstanceProperty } from './decorators';
-import { IonicNativePlugin } from './ionic-native-plugin';
-import { ERR_CORDOVA_NOT_AVAILABLE, ERR_PLUGIN_NOT_INSTALLED } from './plugin';
-import { Observable } from 'rxjs/Observable';
-
-declare const window: any;
-
-class TestObject {
-
-  constructor(public _objectInstance: any) {}
-
-  @InstanceProperty
-  name: string;
-
-  @CordovaInstance({ sync: true })
-  pingSync(): string { return; }
-
-  @CordovaInstance()
-  ping(): Promise<any> { return; }
-
-}
-
-@Plugin({
-  pluginName: 'TestPlugin',
-  pluginRef: 'testPlugin',
-  repo: '',
-  plugin: 'cordova-plugin-my-plugin',
-  platforms: ['Android', 'iOS']
-})
-class TestPlugin extends IonicNativePlugin {
-
-  @CordovaProperty
-  name: string;
-
-  @Cordova({ sync: true })
-  pingSync(): string { return; }
-
-  @Cordova()
-  ping(): Promise<string> { return; }
-
-  @CordovaCheck()
-  customPing(): Promise<string> {
-    return Promise.resolve('pong');
-  }
-
-  create(): TestObject {
-    return new TestObject(TestPlugin.getPlugin().create());
-  }
-
-  @Cordova({
-    destruct: true
-  })
-  destructPromise(): Promise<any> { return; }
-
-  @Cordova({
-    destruct: true,
-    observable: true
-  })
-  destructObservable(): Observable<any> { return; }
-
-}
-
-function definePlugin() {
-  (window as any).testPlugin = {
-    name: 'John Smith',
-    ping: (success: Function, error: Function) => success('pong'),
-    pingSync: () => 'pong',
-    create: function TestObject() {
-      this.pingSync = () => 'pong';
-      this.ping = (success: Function, error: Function) => success('pong');
-      this.name = 'John Smith';
-      return this;
-    },
-    destructPromise: (success: Function) => success('hello', 'world'),
-    destructObservable: (success: Function) => success('hello', 'world')
-  };
-}
-
-describe('Regular Decorators', () => {
-
-  let plugin: TestPlugin;
-
-  beforeEach(() => {
-    plugin = new TestPlugin();
-    definePlugin();
-  });
-
-  describe('Plugin', () => {
-
-    it('should set pluginName', () => {
-      expect(TestPlugin.getPluginName()).toEqual('TestPlugin');
-    });
-
-    it('should set pluginRef', () => {
-      expect(TestPlugin.getPluginRef()).toEqual('testPlugin');
-    });
-
-    it('should return original plugin object', () => {
-      expect(TestPlugin.getPlugin()).toEqual(window.testPlugin);
-    });
-
-    it('should return supported platforms', () => {
-      expect(TestPlugin.getSupportedPlatforms()).toEqual(['Android', 'iOS']);
-    });
-
-  });
-
-  describe('Cordova', () => {
-
-    it('should do a sync function', () => {
-      expect(plugin.pingSync()).toEqual('pong');
-    });
-
-    it('should do an async function', (done: Function) => {
-      plugin.ping()
-        .then(res => {
-          expect(res).toEqual('pong');
-          done();
-        })
-        .catch(e => {
-          expect(e).toBeUndefined();
-          done('Method should have resolved');
-        });
-    });
-
-    it('should throw plugin_not_installed error', (done: Function) => {
-
-      delete window.testPlugin;
-      window.cordova = true;
-
-      expect(<any>plugin.pingSync()).toEqual(ERR_PLUGIN_NOT_INSTALLED);
-
-      plugin.ping()
-        .catch(e => {
-          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
-          delete window.cordova;
-          done();
-        });
-
-    });
-
-    it('should throw cordova_not_available error', (done: Function) => {
-
-      delete window.testPlugin;
-
-      expect(<any>plugin.pingSync()).toEqual(ERR_CORDOVA_NOT_AVAILABLE);
-
-      plugin.ping()
-        .catch(e => {
-          expect(e).toEqual(ERR_CORDOVA_NOT_AVAILABLE.error);
-          done();
-        });
-
-    });
-
-  });
-
-  describe('CordovaProperty', () => {
-
-    it('should return property value', () => {
-      expect(plugin.name).toEqual('John Smith');
-    });
-
-    it('should set property value', () => {
-      plugin.name = 'value2';
-      expect(plugin.name).toEqual('value2');
-    });
-
-  });
-
-  describe('CordovaCheck', () => {
-
-    it('should run the method when plugin exists', (done) => {
-      plugin.customPing()
-        .then(res => {
-          expect(res).toEqual('pong');
-          done();
-        });
-    });
-
-    it('shouldnt run the method when plugin doesnt exist', (done) => {
-      delete window.testPlugin;
-      window.cordova = true;
-      plugin.customPing()
-        .catch(e => {
-          expect(e).toEqual(ERR_PLUGIN_NOT_INSTALLED.error);
-          done();
-        });
-    });
-
-  });
-
-  describe('CordovaOptions', () => {
-
-    describe('destruct', () => {
-
-      it('should destruct values returned by a Promise', (done) => {
-        plugin.destructPromise()
-          .then((args: any[]) => {
-            expect(args).toEqual(['hello', 'world']);
-            done();
-          });
-      });
-
-      it('should destruct values returned by an Observable', (done) => {
-        plugin.destructObservable()
-          .subscribe((args: any[]) => {
-            expect(args).toEqual(['hello', 'world']);
-            done();
-          });
-      });
-
-    });
-
-  });
-
-});
-
-describe('Instance Decorators', () => {
-
-  let instance: TestObject,
-    plugin: TestPlugin;
-
-  beforeEach(() => {
-    definePlugin();
-    plugin = new TestPlugin();
-    instance = plugin.create();
-  });
-
-  describe('Instance plugin', () => {
-
-
-
-  });
-
-  describe('CordovaInstance', () => {
-
-    it('should call instance async method', (done) => {
-      instance.ping()
-        .then(r => {
-          expect(r).toEqual('pong');
-          done();
-        });
-    });
-
-    it('should call instance sync method', () => {
-      expect(instance.pingSync()).toEqual('pong');
-    });
-
-    it('shouldnt call instance method when _objectInstance is undefined', () => {
-
-      delete instance._objectInstance;
-      instance.ping()
-        .then(r => {
-          expect(r).toBeUndefined();
-        })
-        .catch(e => {
-          expect(e).toBeUndefined();
-        });
-
-    });
-
-  });
-
-  describe('InstanceProperty', () => {
-    it('should return property value', () => {
-      expect(instance.name).toEqual('John Smith');
-    });
-
-    it('should set property value', () => {
-      instance.name = 'John Cena';
-      expect(instance.name).toEqual('John Cena');
-    });
-  });
-
-});
@@ -1,313 +0,0 @@
-import { instanceAvailability, checkAvailability, wrap, wrapInstance, overrideFunction } from './plugin';
-import { getPlugin, getPromise } from './util';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/observable/throw';
-
-export interface PluginConfig {
-  /**
-   * Plugin name, this should match the class name
-   */
-  pluginName: string;
-  /**
-   * Plugin NPM package name
-   */
-  plugin: string;
-  /**
-   * Plugin object reference
-   */
-  pluginRef?: string;
-  /**
-   * Github repository URL
-   */
-  repo?: string;
-  /**
-   * Custom install command
-   */
-  install?: string;
-  /**
-   * Available installation variables
-   */
-  installVariables?: string[];
-  /**
-   * Supported platforms
-   */
-  platforms?: string[];
-
-  [key: string]: any;
-}
-
-export interface CordovaOptions {
-  destruct?: boolean;
-  /**
-   * Set to true if the wrapped method is a sync function
-   */
-  sync?: boolean;
-  /**
-   * Callback order. Set to reverse if the success/error callbacks are the first 2 arguments that the wrapped method takes.
-   */
-  callbackOrder?: 'reverse';
-  /**
-   * Callback style
-   */
-  callbackStyle?: 'node' | 'object';
-  /**
-   * Set a custom index for the success callback function. This doesn't work if callbackOrder or callbackStyle are set.
-   */
-  successIndex?: number;
-  /**
-   * Set a custom index for the error callback function. This doesn't work if callbackOrder or callbackStyle are set.
-   */
-  errorIndex?: number;
-  /**
-   * Success function property name. This must be set if callbackStyle is set to object.
-   */
-  successName?: string;
-  /**
-   * Error function property name. This must be set if callbackStyle is set to object.
-   */
-  errorName?: string;
-  /**
-   * Set to true to return an observable
-   */
-  observable?: boolean;
-  /**
-   * If observable is set to true, this can be set to a different function name that will cancel the observable.
-   */
-  clearFunction?: string;
-  /**
-   * This can be used if clearFunction is set. Set this to true to call the clearFunction with the same arguments used in the initial function.
-   */
-  clearWithArgs?: boolean;
-  /**
-   * Creates an observable that wraps a global event. Replaces document.addEventListener
-   */
-  eventObservable?: boolean;
-  /**
-   * Event name, this must be set if eventObservable is set to true
-   */
-  event?: string;
-  /**
-   * Element to attach the event listener to, this is optional, defaults to `window`
-   */
-  element?: any;
-  /**
-   * Set to true if the wrapped method returns a promise
-   */
-  otherPromise?: boolean;
-  /**
-   * Supported platforms
-   */
-  platforms?: string[];
-}
-
-export interface CordovaCheckOptions {
-  sync?: boolean;
-  observable?: boolean;
-}
-
-/**
- * @private
- */
-export function InstanceCheck(opts: CordovaCheckOptions = {}) {
-  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
-    return {
-      value: function(...args: any[]): any {
-        if (instanceAvailability(this)) {
-          return descriptor.value.apply(this, args);
-        } else {
-
-          if (opts.sync) {
-            return;
-          } else if (opts.observable) {
-            return new Observable<any>(() => { });
-          }
-
-          return getPromise(() => { });
-
-        }
-      },
-      enumerable: true
-    };
-  };
-}
-
-/**
- * Executes function only if plugin is available
- * @private
- */
-export function CordovaCheck(opts: CordovaCheckOptions = {}) {
-  return (pluginObj: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>): TypedPropertyDescriptor<any> => {
-    return {
-      value: function(...args: any[]): any {
-        const check = checkAvailability(pluginObj);
-        if (check === true) {
-          return descriptor.value.apply(this, args);
-        } else {
-          if (opts.sync) {
-            return null;
-          } else if (opts.observable) {
-            return Observable.throw(new Error(check && check.error));
-          }
-          return Promise.reject(check && check.error);
-        }
-      },
-      enumerable: true
-    };
-  };
-}
-
-/**
- * @private
- *
- * Class decorator specifying Plugin metadata. Required for all plugins.
- *
- * @usage
- * ```typescript
- * @Plugin({
- *  pluginName: 'MyPlugin',
- *  plugin: 'cordova-plugin-myplugin',
- *  pluginRef: 'window.myplugin'
- *  })
- *  export class MyPlugin {
- *
- *    // Plugin wrappers, properties, and functions go here ...
- *
- *  }
- * ```
- */
-export function Plugin(config: PluginConfig): ClassDecorator {
-  return function(cls: any) {
-
-    // Add these fields to the class
-    for (let prop in config) {
-      cls[prop] = config[prop];
-    }
-
-    cls['installed'] = function(printWarning?: boolean) {
-      return !!getPlugin(config.pluginRef);
-    };
-
-    cls['getPlugin'] = function() {
-      return getPlugin(config.pluginRef);
-    };
-
-    cls['checkInstall'] = function() {
-      return checkAvailability(cls) === true;
-    };
-
-    cls['getPluginName'] = function() {
-      return config.pluginName;
-    };
-
-    cls['getPluginRef'] = function() {
-      return config.pluginRef;
-    };
-
-    cls['getPluginInstallName'] = function() {
-      return config.plugin;
-    };
-
-    cls['getPluginRepo'] = function() {
-      return config.repo;
-    };
-
-    cls['getSupportedPlatforms'] = function() {
-      return config.platforms;
-    };
-
-    return cls;
-  };
-}
-
-/**
- * @private
- *
- * Wrap a stub function in a call to a Cordova plugin, checking if both Cordova
- * and the required plugin are installed.
- */
-export function Cordova(opts: CordovaOptions = {}) {
-  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
-    return {
-      value: function(...args: any[]) {
-        return wrap(this, methodName, opts).apply(this, args);
-      },
-      enumerable: true
-    };
-  };
-}
-
-/**
- * @private
- *
- * Wrap an instance method
- */
-export function CordovaInstance(opts: CordovaOptions = {}) {
-  return (target: Object, methodName: string) => {
-    return {
-      value: function(...args: any[]) {
-        return wrapInstance(this, methodName, opts).apply(this, args);
-      },
-      enumerable: true
-    };
-  };
-}
-
-/**
- * @private
- *
- *
- * Before calling the original method, ensure Cordova and the plugin are installed.
- */
-export function CordovaProperty(target: any, key: string) {
-  Object.defineProperty(target, key, {
-    enumerable: true,
-    get: () => {
-      if (checkAvailability(target, key) === true) {
-        return getPlugin(target.constructor.getPluginRef())[key];
-      } else {
-        return null;
-      }
-    },
-    set: (value) => {
-      if (checkAvailability(target, key) === true) {
-        getPlugin(target.constructor.getPluginRef())[key] = value;
-      }
-    }
-  });
-}
-
-/**
- * @private
- * @param target
- * @param key
- * @constructor
- */
-export function InstanceProperty(target: any, key: string) {
-  Object.defineProperty(target, key, {
-    enumerable: true,
-    get: function() {
-      return this._objectInstance[key];
-    },
-    set: function(value) {
-      this._objectInstance[key] = value;
-    }
-  });
-}
-
-/**
- * @private
- *
- * Wrap a stub function in a call to a Cordova plugin, checking if both Cordova
- * and the required plugin are installed.
- */
-export function CordovaFunctionOverride(opts: any = {}) {
-  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
-    return {
-      value: function(...args: any[]) {
-        return overrideFunction(this, methodName, opts);
-      },
-      enumerable: true
-    };
-  };
-}
-
@@ -1,4 +1 @@
 export * from './plugin';
-export * from './decorators';
-export * from './util';
-export * from './ionic-native-plugin';
@@ -1,69 +0,0 @@
-// This is to verify that new (FileTransfer.getPlugin)() works
-
-import { Plugin, CordovaInstance } from './decorators';
-import { checkAvailability } from './plugin';
-import { IonicNativePlugin } from './ionic-native-plugin';
-
-class FT {
-  hello(): string {
-    return 'world';
-  }
-}
-
-(window as any).FileTransfer = () => new FT();
-
-@Plugin({
-  plugin: 'cordova-plugin-file-transfer',
-  pluginRef: 'FileTransfer',
-  repo: '',
-  pluginName: 'FileTransfer'
-})
-export class FileTransfer extends IonicNativePlugin {
-  create(): FileTransferObject {
-    let instance: any;
-    if (checkAvailability(FileTransfer.getPluginRef(), null, FileTransfer.getPluginName()) === true) {
-      instance = new (FileTransfer.getPlugin())();
-    }
-    return new FileTransferObject(instance);
-  }
-}
-
-export class FileTransferObject {
-
-  constructor(public _objectInstance: any) {
-    console.info('Creating a new FileTransferObject with instance: ', _objectInstance);
-  }
-
-  @CordovaInstance({ sync: true })
-  hello(): string { return; }
-
-}
-
-describe('Mock FileTransfer Plugin', () => {
-
-  let plugin: FileTransfer,
-    instance: FileTransferObject;
-
-  beforeAll(() => {
-    plugin = new FileTransfer();
-    instance = plugin.create();
-  });
-
-  it('should create a new FileTransfer plugin instance', () => {
-    expect(plugin instanceof FileTransfer).toBeTruthy();
-  });
-
-  it('should create new FileTransferObject instance', () => {
-    expect(instance instanceof FileTransferObject).toBeTruthy();
-  });
-
-  it('FileTransferObject instance should have _objectInstance property', () => {
-    expect(instance._objectInstance).toBeDefined();
-  });
-
-  it('FileTransferObject.hello should return world', () => {
-    console.info('instance hello is', instance.hello());
-    expect(instance.hello()).toEqual('world');
-  });
-
-});
@@ -1,46 +0,0 @@
-export class IonicNativePlugin {
-
-  static pluginName: string;
-
-  static pluginRef: string;
-
-  static plugin: string;
-
-  static repo: string;
-
-  static platforms: string[];
-
-  static install: string;
-
-  /**
-   * Returns a boolean that indicates whether the plugin is installed
-   * @return {boolean}
-   */
-  static installed(): boolean { return false; }
-
-  /**
-   * Returns the original plugin object
-   */
-  static getPlugin(): any { }
-
-  /**
-   * Returns the plugin's name
-   */
-  static getPluginName(): string { return; }
-
-  /**
-   * Returns the plugin's reference
-   */
-  static getPluginRef(): string { return; }
-
-  /**
-   * Returns the plugin's install name
-   */
-  static getPluginInstallName(): string { return; }
-
-  /**
-   * Returns the plugin's supported platforms
-   */
-  static getSupportedPlatforms(): string[] { return; }
-
-}
@@ -1,61 +1,151 @@
-import { getPlugin, getPromise, cordovaWarn, pluginWarn } from './util';
+import { get } from './util';
 import { checkReady } from './bootstrap';
-import { CordovaOptions } from './decorators';

 import { Observable } from 'rxjs/Observable';
 import 'rxjs/add/observable/fromEvent';

+
 checkReady();

-// declare const window;
-// declare var Promise;
-
-export const ERR_CORDOVA_NOT_AVAILABLE = { error: 'cordova_not_available' };
-export const ERR_PLUGIN_NOT_INSTALLED = { error: 'plugin_not_installed' };
-
+declare var window;
+declare var Promise;

 /**
- * Checks if plugin/cordova is available
- * @return {boolean | { error: string } }
 * @private
 */
-export function checkAvailability(pluginRef: string, methodName?: string, pluginName?: string): boolean | { error: string };
-export function checkAvailability(pluginObj: any, methodName?: string, pluginName?: string): boolean | { error: string };
-export function checkAvailability(plugin: any, methodName?: string, pluginName?: string): boolean | { error: string } {
+export interface PluginConfig {
+  /**
+   * Plugin name, this should match the class name
+   */
+  pluginName: string;
+  /**
+   * Plugin NPM package name
+   */
+  plugin: string;
+  /**
+   * Plugin object reference
+   */
+  pluginRef: string;
+  /**
+   * Github repository URL
+   */
+  repo: string;
+  /**
+   * Custom install command
+   */
+  install?: string;
+  /**
+   * Available installation variables
+   */
+  installVariables?: string[];
+  /**
+   * Supported platforms
+   */
+  platforms?: string[];
+}

-  let pluginRef, pluginInstance, pluginPackage;
+/**
+ * @private
+ */
+export interface CordovaOptions {
+  /**
+   * Set to true if the wrapped method is a sync function
+   */
+  sync?: boolean;
+  /**
+   * Callback order. Set to reverse if the success/error callbacks are the first 2 arguments that the wrapped method takes.
+   */
+  callbackOrder?: 'reverse';
+  /**
+   * Callback style
+   */
+  callbackStyle?: 'node' | 'object';
+  /**
+   * Set a custom index for the success callback function. This doesn't work if callbackOrder or callbackStyle are set.
+   */
+  successIndex?: number;
+  /**
+   * Set a custom index for the error callback function. This doesn't work if callbackOrder or callbackStyle are set.
+   */
+  errorIndex?: number;
+  /**
+   * Success function property name. This must be set if callbackStyle is set to object.
+   */
+  successName?: string;
+  /**
+   * Error function property name. This must be set if callbackStyle is set to object.
+   */
+  errorName?: string;
+  /**
+   * Set to true to return an observable
+   */
+  observable?: boolean;
+  /**
+   * If observable is set to true, this can be set to a different function name that will cancel the observable.
+   */
+  clearFunction?: string;
+  /**
+   * This can be used if clearFunction is set. Set this to true to call the clearFunction with the same arguments used in the initial function.
+   */
+  clearWithArgs?: boolean;
+  /**
+   * Creates an observable that wraps a global event. Replaces document.addEventListener
+   */
+  eventObservable?: boolean;
+  /**
+   * Event name, this must be set if eventObservable is set to true
+   */
+  event?: string;
+  /**
+   * Element to attach the event listener to, this is optional, defaults to `window`
+   */
+  element?: any;
+  /**
+   * Set to true if the wrapped method returns a promise
+   */
+  otherPromise?: boolean;
+  /**
+   * Supported platforms
+   */
+  platforms?: string[];
+}

-  if (typeof plugin === 'string') {
-    pluginRef = plugin;
+/**
+ * @private
+ * @param pluginRef
+ * @returns {null|*}
+ */
+export const getPlugin = function(pluginRef: string): any {
+  return get(window, pluginRef);
+};
+
+/**
+ * @private
+ * @param pluginObj
+ * @param method
+ */
+export const pluginWarn = function(pluginObj: any, method?: string) {
+  let pluginName = pluginObj.constructor.getPluginName(), plugin = pluginObj.constructor.getPlugin();
+  if (method) {
+    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
  } else {
-    pluginRef = plugin.constructor.getPluginRef();
-    pluginName = plugin.constructor.getPluginName();
-    pluginPackage = plugin.constructor.getPluginInstallName();
+    console.warn('Native: tried accessing the ' + pluginName + ' plugin but it\'s not installed.');
  }
-
-  pluginInstance = getPlugin(pluginRef);
-
-  if (!pluginInstance || (!!methodName && typeof pluginInstance[methodName] === 'undefined')) {
-    if (!window.cordova) {
-      cordovaWarn(pluginName, methodName);
-      return ERR_CORDOVA_NOT_AVAILABLE;
-    }
-
-    pluginWarn(pluginName, pluginPackage, methodName);
-    return ERR_PLUGIN_NOT_INSTALLED;
-  }
-
-  return true;
-}
+  console.warn('Install the ' + pluginName + ' plugin: \'ionic plugin add ' + plugin + '\'');
+};

 /**
- * Checks if _objectInstance exists and has the method/property
 * @private
+ * @param pluginName
+ * @param method
 */
-export function instanceAvailability(pluginObj: any, methodName?: string): boolean {
-  return pluginObj._objectInstance && (!methodName || typeof pluginObj._objectInstance[methodName] !== 'undefined');
-}
-
+export const cordovaWarn = function(pluginName: string, method: string) {
+  if (method) {
+    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
+  } else {
+    console.warn('Native: tried accessing the ' + pluginName + ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
+  }
+};
 function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Function): any {
  // ignore resolve and reject in case sync
  if (opts.sync) {
@@ -68,7 +158,7 @@ function setIndex(args: any[], opts: any = {}, resolve?: Function, reject?: Func
    args.unshift(reject);
    args.unshift(resolve);
  } else if (opts.callbackStyle === 'node') {
-    args.push((err: any, result: any) => {
+    args.push((err, result) => {
      if (err) {
        reject(err);
      } else {
@@ -122,25 +212,48 @@ function callCordovaPlugin(pluginObj: any, methodName: string, args: any[], opts
  // to our promise resolve/reject handlers.
  args = setIndex(args, opts, resolve, reject);

-  const availabilityCheck = checkAvailability(pluginObj, methodName);
+  let pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());

-  if (availabilityCheck === true) {
-    const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
-    return pluginInstance[methodName].apply(pluginInstance, args);
-  } else {
-    return availabilityCheck;
+  if (!pluginInstance || pluginInstance[methodName] === 'undefined') {
+    // 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.constructor.getPluginName(), methodName);
+      return {
+        error: 'cordova_not_available'
+      };
+    }
+
+    pluginWarn(pluginObj, methodName);
+    return {
+      error: 'plugin_not_installed'
+    };
  }

+  return pluginInstance[methodName].apply(pluginInstance, args);
+}
+
+/**
+ * @private
+ */
+export function getPromise(cb) {
+
+  const tryNativePromise = () => {
+    if (window.Promise) {
+      return new Promise((resolve, reject) => {
+        cb(resolve, reject);
+      });
+    } else {
+      console.error('No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular 2 or on a recent browser.');
+    }
+  };
+
+  return tryNativePromise();
 }

 function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
-  let pluginResult: any, rej: Function;
-  const p = getPromise((resolve: Function, reject: Function) => {
-    if (opts.destruct) {
-      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
-    } else {
-      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
-    }
+  let pluginResult, rej;
+  const p = getPromise((resolve, reject) => {
+    pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, resolve, reject);
    rej = reject;
  });
  // Angular throws an error on unhandled rejection, but in this case we have already printed
@@ -148,39 +261,26 @@ function wrapPromise(pluginObj: any, methodName: string, args: any[], opts: any
  // to error
  if (pluginResult && pluginResult.error) {
    p.catch(() => { });
-    typeof rej === 'function' && rej(pluginResult.error);
+    rej(pluginResult.error);
  }
  return p;
 }

-function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
-  return getPromise((resolve: Function, reject: Function) => {
-    const pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
-    if (pluginResult) {
-      if (pluginResult.error) {
-        reject(pluginResult.error);
-      } else if (pluginResult.then) {
-        pluginResult.then(resolve).catch(reject);
-      }
-    } else {
-      reject({ error: 'unexpected_error' });
+function wrapOtherPromise(pluginObj: any, methodName: string, args: any[], opts: any= {}) {
+  return getPromise((resolve, reject) => {
+    let pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts);
+    if (pluginResult && pluginResult.error) {
+      reject(pluginResult.error);
    }
+    pluginResult.then(resolve).catch(reject);
  });
 }

 function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: any = {}) {
  return new Observable(observer => {
-    let pluginResult;
-
-    if (opts.destruct) {
-      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
-    } else {
-      pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
-    }
-
+    let pluginResult = callCordovaPlugin(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
    if (pluginResult && pluginResult.error) {
      observer.error(pluginResult.error);
-      observer.complete();
    }
    return () => {
      try {
@@ -188,34 +288,61 @@ function wrapObservable(pluginObj: any, methodName: string, args: any[], opts: a
          if (opts.clearWithArgs) {
            return callCordovaPlugin(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
          }
-          return callCordovaPlugin(pluginObj, opts.clearFunction, []);
+          return get(window, pluginObj.constructor.getPluginRef())[opts.clearFunction].call(pluginObj, pluginResult);
        }
      } catch (e) {
        console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-        console.warn(e);
+        console.error(e);
      }
    };
  });
 }

 function callInstance(pluginObj: any, methodName: string, args: any[], opts: any = {}, resolve?: Function, reject?: Function) {
-
  args = setIndex(args, opts, resolve, reject);
+  return pluginObj._objectInstance[methodName].apply(pluginObj._objectInstance, args);
+}

-  if (instanceAvailability(pluginObj, methodName)) {
-    return pluginObj._objectInstance[methodName].apply(pluginObj._objectInstance, args);
-  }
-
+function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
+  return (...args) => {
+    if (opts.sync) {
+      // Sync doesn't wrap the plugin with a promise or observable, it returns the result as-is
+      return callInstance(pluginObj, methodName, args, opts);
+    } else if (opts.observable) {
+      return new Observable(observer => {
+        let pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
+        return () => {
+          try {
+            if (opts.clearWithArgs) {
+              return pluginObj._objectInstance[opts.clearFunction].apply(pluginObj._objectInstance, args);
+            }
+            return pluginObj._objectInstance[opts.clearFunction].call(pluginObj, pluginResult);
+          } catch (e) {
+            console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
+            console.error(e);
+          }
+        };
+      });
+    } else if (opts.otherPromise) {
+      return getPromise((resolve, reject) => {
+        let result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
+        result.then(resolve, reject);
+      });
+    } else {
+      return getPromise((resolve, reject) => {
+        callInstance(pluginObj, methodName, args, opts, resolve, reject);
+      });
+    }
+  };
 }

 /**
 * Wrap the event with an observable
- * @private
 * @param event even name
 * @param element The element to attach the event listener to
 * @returns {Observable}
 */
-export function wrapEventObservable(event: string, element: any = window): Observable<any> {
+function wrapEventObservable(event: string, element: any = window): Observable<any> {
  return Observable.fromEvent(element, event);
 }

@@ -225,31 +352,42 @@ export function wrapEventObservable(event: string, element: any = window): Obser
 *
 * Unfortunately, this is brittle and would be better wrapped as an Observable. overrideFunction
 * does just this.
- * @private
 */
-export function overrideFunction(pluginObj: any, methodName: string, args: any[], opts: any = {}): Observable<any> {
+function overrideFunction(pluginObj: any, methodName: string, args: any[], opts: any = {}): Observable<any> {
  return new Observable(observer => {

-    const availabilityCheck = checkAvailability(pluginObj, null, pluginObj.constructor.getPluginName());
+    let pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());

-    if (availabilityCheck === true) {
-      const pluginInstance = getPlugin(pluginObj.constructor.getPluginRef());
-      pluginInstance[methodName] = observer.next.bind(observer);
-      return () => pluginInstance[methodName] = () => { };
-    } else {
-      observer.error(availabilityCheck);
-      observer.complete();
+    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.constructor.getPluginName(), methodName);
+        observer.error({
+          error: 'cordova_not_available'
+        });
+      }
+
+      pluginWarn(pluginObj, methodName);
+      observer.error({
+        error: 'plugin_not_installed'
+      });
+      return;
    }

+    pluginInstance[methodName] = observer.next.bind(observer);
  });
 }


 /**
 * @private
+ * @param pluginObj
+ * @param methodName
+ * @param opts
+ * @returns {function(...[any]): (undefined|*|Observable|*|*)}
 */
 export const wrap = function(pluginObj: any, methodName: string, opts: CordovaOptions = {}) {
-  return (...args: any[]) => {
+  return (...args) => {
    if (opts.sync) {
      // Sync doesn't wrap the plugin with a promise or observable, it returns the result as-is
      return callCordovaPlugin(pluginObj, methodName, args, opts);
@@ -265,80 +403,213 @@ export const wrap = function(pluginObj: any, methodName: string, opts: CordovaOp
  };
 };

+
+/**
+ * @private
+ *
+ * Class decorator specifying Plugin metadata. Required for all plugins.
+ *
+ * @usage
+ * ```typescript
+ * @Plugin({
+ *  pluginName: 'MyPlugin',
+ *  plugin: 'cordova-plugin-myplugin',
+ *  pluginRef: 'window.myplugin'
+ *  })
+ *  export class MyPlugin {
+ *
+ *    // Plugin wrappers, properties, and functions go here ...
+ *
+ *  }
+ * ```
+ */
+export function Plugin(config: PluginConfig) {
+  return function(cls) {
+
+    // Add these fields to the class
+    for (let k in config) {
+      cls[k] = config[k];
+    }
+
+    cls['installed'] = function(printWarning?: boolean) {
+      return !!getPlugin(config.pluginRef);
+    };
+
+    cls['getPlugin'] = function() {
+      return getPlugin(config.pluginRef);
+    };
+
+    cls['checkInstall'] = function() {
+      let pluginInstance = getPlugin(config.pluginRef);
+
+      if (!pluginInstance) {
+        pluginWarn(cls);
+        return false;
+      }
+      return true;
+    };
+
+    cls['getPluginName'] = function() {
+      return config.pluginName;
+    };
+    cls['getPluginRef'] = function() {
+      return config.pluginRef;
+    };
+    cls['getPluginInstallName'] = function() {
+      return config.plugin;
+    };
+    cls['getPluginRepo'] = function() {
+      return config.repo;
+    };
+    cls['getSupportedPlatforms'] = function() {
+      return config.platforms;
+    };
+
+    return cls;
+  };
+}
+
+/**
+ * @private
+ *
+ * Wrap a stub function in a call to a Cordova plugin, checking if both Cordova
+ * and the required plugin are installed.
+ */
+export function Cordova(opts: CordovaOptions = {}) {
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
+    return {
+      value: function(...args: any[]) {
+        return wrap(this, methodName, opts).apply(this, args);
+      }
+    };
+  };
+}
+
+/**
+ * @private
+ *
+ * Wrap an instance method
+ */
+export function CordovaInstance(opts: any = {}) {
+  return (target: Object, methodName: string) => {
+    return {
+      value: function(...args: any[]) {
+        return wrapInstance(this, methodName, opts).apply(this, args);
+      }
+    };
+  };
+}
+
+/**
+ * @private
+ *
+ *
+ * Before calling the original method, ensure Cordova and the plugin are installed.
+ */
+export function CordovaProperty(target: any, key: string) {
+  const exists = () => {
+    let pluginInstance = getPlugin(target.pluginRef);
+    if (!pluginInstance || typeof pluginInstance[key] === 'undefined') {
+      pluginWarn(target, key);
+      return false;
+    }
+    return true;
+  };
+
+  Object.defineProperty(target, key, {
+    get: () => {
+      if (exists()) {
+        return getPlugin(target.pluginRef)[key];
+      } else {
+        return null;
+      }
+    },
+    set: (value) => {
+      if (exists()) {
+        getPlugin(target.pluginRef)[key] = value;
+      }
+    }
+  });
+}
+
+/**
+ * @private
+ * @param target
+ * @param key
+ * @constructor
+ */
+export function InstanceProperty(target: any, key: string) {
+  Object.defineProperty(target, key, {
+    get: function(){
+      return this._objectInstance[key];
+    },
+    set: function(value){
+      this._objectInstance[key] = value;
+    }
+  });
+}
+
+/**
+ * @private
+ *
+ * Wrap a stub function in a call to a Cordova plugin, checking if both Cordova
+ * and the required plugin are installed.
+ */
+export function CordovaFunctionOverride(opts: any = {}) {
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
+    return {
+      value: function(...args: any[]) {
+        return overrideFunction(this, methodName, opts);
+      }
+    };
+  };
+}
+
 /**
 * @private
 */
-export function wrapInstance(pluginObj: any, methodName: string, opts: any = {}) {
-  return (...args: any[]) => {
-    if (opts.sync) {
+export interface CordovaFiniteObservableOptions extends CordovaOptions {
+  /**
+   * Function that gets a result returned from plugin's success callback, and decides whether it is last value and observable should complete.
+   */
+  resultFinalPredicate?: (result: any) => boolean;
+  /**
+   * Function that gets called after resultFinalPredicate, and removes service data that indicates end of stream from the result.
+   */
+  resultTransform?: (result: any) => any;
+}

-      return callInstance(pluginObj, methodName, args, opts);
-
-    } else if (opts.observable) {
-
-      return new Observable(observer => {
-
-        let pluginResult;
-
-        if (opts.destruct) {
-          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => observer.next(args), (...args: any[]) => observer.error(args));
-        } else {
-          pluginResult = callInstance(pluginObj, methodName, args, opts, observer.next.bind(observer), observer.error.bind(observer));
-        }
-
-        if (pluginResult && pluginResult.error) {
-          observer.error(pluginResult.error);
-          observer.complete();
-        }
-
-        return () => {
-          try {
-            if (opts.clearWithArgs) {
-              return callInstance(pluginObj, opts.clearFunction, args, opts, observer.next.bind(observer), observer.error.bind(observer));
-            }
-            return callInstance(pluginObj, opts.clearFunction, []);
-          } catch (e) {
-            console.warn('Unable to clear the previous observable watch for', pluginObj.constructor.getPluginName(), methodName);
-            console.warn(e);
-          }
-        };
-      });
-
-    } else if (opts.otherPromise) {
-      return getPromise((resolve: Function, reject: Function) => {
-        let result;
-        if (opts.destruct) {
-          result = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
-        } else {
-          result = callInstance(pluginObj, methodName, args, opts, resolve, reject);
-        }
-        if (result && !!result.then) {
-          result.then(resolve, reject);
-        } else {
-          reject();
-        }
-      });
-
-    } else {
-      let pluginResult: any, rej: Function;
-      const p = getPromise((resolve: Function, reject: Function) => {
-        if (opts.destruct) {
-          pluginResult = callInstance(pluginObj, methodName, args, opts, (...args: any[]) => resolve(args), (...args: any[]) => reject(args));
-        } else {
-          pluginResult = callInstance(pluginObj, methodName, args, opts, resolve, reject);
-        }
-        rej = reject;
-      });
-      // Angular throws an error on unhandled rejection, but in this case we have already printed
-      // a warning that Cordova is undefined or the plugin is uninstalled, so there is no reason
-      // to error
-      if (pluginResult && pluginResult.error) {
-        p.catch(() => { });
-        typeof rej === 'function' && rej(pluginResult.error);
+/**
+ * @private
+ *
+ * Wraps method that returns an observable that can be completed. Provided opts.resultFinalPredicate dictates when the observable completes.
+ *
+ */
+export function CordovaFiniteObservable(opts: CordovaFiniteObservableOptions = {}) {
+  if (opts.observable === false) {
+    throw new Error('CordovaFiniteObservable decorator can only be used on methods that returns observable. Please provide correct option.');
+  }
+  opts.observable = true;
+  return (target: Object, methodName: string, descriptor: TypedPropertyDescriptor<any>) => {
+    return {
+      value: function(...args: any[]) {
+        let wrappedObservable: Observable<any> = wrap(this, methodName, opts).apply(this, args);
+        return new Observable<any>((observer) => {
+          let wrappedSubscription = wrappedObservable.subscribe({
+            next: (x) => {
+              observer.next(opts.resultTransform ? opts.resultTransform(x) : x);
+              if (opts.resultFinalPredicate && opts.resultFinalPredicate(x)) {
+                observer.complete();
+              }
+            },
+            error: (err) => { observer.error(err); },
+            complete: () => { observer.complete(); }
+          });
+          return () => {
+            wrappedSubscription.unsubscribe();
+          };
+        });
      }
-      return p;
-
-
-    }
+    };
  };
 }
@@ -1,69 +1,7 @@
-declare const window: any;
-
-/**
- * @private
- */
-export const get = (element: Element | Window, path: string): any => {
-  const paths: string[] = path.split('.');
-  let obj: any = element;
-  for (let i: number = 0; i < paths.length; i++) {
+export function get(obj, path) {
+  for (var i = 0, path = path.split('.'), len = path.length; i < len; i++) {
    if (!obj) { return null; }
-    obj = obj[paths[i]];
+    obj = obj[path[i]];
  }
  return obj;
 };
-
-
-/**
- * @private
- */
-export const getPromise = (callback: Function): Promise<any> => {
-
-  const tryNativePromise = () => {
-    if (window.Promise) {
-      return new Promise((resolve, reject) => {
-        callback(resolve, reject);
-      });
-    } else {
-      console.error('No Promise support or polyfill found. To enable Ionic Native support, please add the es6-promise polyfill before this script, or run with a library like Angular or on a recent browser.');
-    }
-  };
-
-  return tryNativePromise();
-};
-
-/**
- * @private
- * @param pluginRef
- * @returns {null|*}
- */
-export const getPlugin = (pluginRef: string): any => {
-  return get(window, pluginRef);
-};
-
-/**
- * @private
- */
-export const pluginWarn = (pluginName: string, plugin?: string, method?: string): void => {
-  if (method) {
-    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but the ' + pluginName + ' plugin is not installed.');
-  } else {
-    console.warn('Native: tried accessing the ' + pluginName + ' plugin but it\'s not installed.');
-  }
-  if (plugin) {
-    console.warn('Install the ' + pluginName + ' plugin: \'ionic cordova plugin add ' + plugin + '\'');
-  }
-};
-
-/**
- * @private
- * @param pluginName
- * @param method
- */
-export const cordovaWarn = (pluginName: string, method?: string): void => {
-  if (method) {
-    console.warn('Native: tried calling ' + pluginName + '.' + method + ', but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
-  } else {
-    console.warn('Native: tried accessing the ' + pluginName + ' plugin but Cordova is not available. Make sure to include cordova.js or run in a device/simulator');
-  }
-};
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+import { Cordova, Plugin } from '@ionic-native/core';

 export interface ActionSheetOptions {

@@ -13,11 +13,6 @@ export interface ActionSheetOptions {
   */
  title?: string;

-  /**
-   * The subtitle for the actionsheet (IOS only)
-   */
-  subtitle?: string;
-
  /**
   * Theme to be used on Android
   */
@@ -48,10 +43,6 @@ export interface ActionSheetOptions {
   */
  position?: number[];

-  /**
-   * Choose if destructive button will be the last
-   */
-  destructiveButtonLast?: boolean;
 }

 /**
@@ -74,12 +65,9 @@ export interface ActionSheetOptions {
 *
 * const options: ActionSheetOptions = {
 *   title: 'What do you want with this image?',
- *   subtitle: 'Choose an action',
 *   buttonLabels: buttonLabels,
 *   addCancelButtonWithLabel: 'Cancel',
- *   addDestructiveButtonWithLabel: 'Delete',
- *   androidTheme: this.actionSheet.ANDROID_THEMES.THEME_HOLO_DARK,
- *   destructiveButtonLast: true
+ *   addDestructiveButtonWithLabel: 'Delete'
 * };
 *
 * this.actionSheet.show(options).then((buttonIndex: number) => {
@@ -94,27 +82,10 @@ export interface ActionSheetOptions {
  plugin: 'cordova-plugin-actionsheet',
  pluginRef: 'plugins.actionsheet',
  repo: 'https://github.com/EddyVerbruggen/cordova-plugin-actionsheet',
-  platforms: ['Android', 'Browser', 'iOS', 'Windows', 'Windows Phone 8']
+  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
@Injectable()
-export class ActionSheet extends IonicNativePlugin {
-
-  /**
-   * Convenience property to select an Android theme value
-   */
-  ANDROID_THEMES: {
-    THEME_TRADITIONAL: number;
-    THEME_HOLO_DARK: number;
-    THEME_HOLO_LIGHT: number;
-    THEME_DEVICE_DEFAULT_DARK: number;
-    THEME_DEVICE_DEFAULT_LIGHT: number;
-  } = {
-    THEME_TRADITIONAL: 1,
-    THEME_HOLO_DARK: 2,
-    THEME_HOLO_LIGHT: 3,
-    THEME_DEVICE_DEFAULT_DARK: 4,
-    THEME_DEVICE_DEFAULT_LIGHT: 5
-  };
+export class ActionSheet {

  /**
   * Show a native ActionSheet component. See below for options.
@@ -1,5 +1,5 @@
 import { Injectable } from '@angular/core';
-import { Cordova, Plugin, IonicNativePlugin } from '@ionic-native/core';
+import { Cordova, Plugin } from '@ionic-native/core';
 import { Observable } from 'rxjs/Observable';

 export type AdSize = 'SMART_BANNER' | 'BANNER' | 'MEDIUM_RECTANGLE' | 'FULL_BANNER' | 'LEADERBOARD' | 'SKYSCRAPER' | 'CUSTOM';
@@ -32,7 +32,7 @@ export interface AdMobOptions {
  overlap?: boolean;

  /**
-   * Position of banner ad. Defaults to `TOP_CENTER`. You can use the `AdMobPro.AD_POSITION` property to select other values.
+   * Position of banner ad. Defaults to `TOP_CENTER`. You can use the `AdMob.AD_POSITION` property to select other values.
   */
  position?: number;

@@ -66,11 +66,6 @@ export interface AdMobOptions {
   */
  adExtras?: AdExtras;

-  /**
-   * License key for the plugin
-   */
-  license?: any;
-
 }

 export interface AdExtras {
@@ -90,18 +85,14 @@ export interface AdExtras {
 }

 /**
- * @paid
- * @name AdMob Pro
+ * @name AdMob
 * @description
- * Plugin for Google Ads, including AdMob / DFP (DoubleClick for publisher) and mediations to other Ad networks.
- *
- * IMPORTANT NOTICE: this plugin takes a percentage out of your earnings if you profit more than $1,000. Read more about this on the plugin's repo. For a completely free alternative, see [AdMobPro Free](../admob-free).
+ * Plugin for Google Ads, including AdMob / DFP (doubleclick for publisher) and mediations to other Ad networks.
 * @usage
 * ```typescript
- * import { AdMobPro } from '@ionic-native/admob-pro';
- * import { Platform } from 'ionic-angular';
+ * import { AdMob, AdMobOptions, AdSize, AdExtras } from '@ionic-native/ad-mob';
 *
- * constructor(private admob: AdMobPro, private platform: Platform ) { }
+ * constructor(private admob: AdMob){}
 *
 * ionViewDidLoad() {
 *   this.admob.onAdDismiss()
@@ -109,13 +100,7 @@ export interface AdExtras {
 * }
 *
 * onClick() {
- *   let adId;
- *   if(this.platform.is('android')) {
- *     adId = 'YOUR_ADID_ANDROID';
- *   } else if (this.platform.is('ios')) {
- *     adId = 'YOUR_ADID_IOS';
- *   }
- *   this.admob.prepareInterstitial({adId: adId})
+ *   this.admob.prepareInterstitial('YOUR_ADID')
 *     .then(() => { this.admob.showInterstitial(); });
 * }
 *
@@ -126,28 +111,19 @@ export interface AdExtras {
 * AdExtras
 */
@Plugin({
-  pluginName: 'AdMob Pro',
+  pluginName: 'AdMob',
  plugin: 'cordova-plugin-admobpro',
  pluginRef: 'AdMob',
  repo: 'https://github.com/floatinghotpot/cordova-admob-pro',
  platforms: ['Android', 'iOS', 'Windows Phone 8']
 })
@Injectable()
-export class AdMobPro extends IonicNativePlugin {
+export class AdMob {

-  AD_POSITION: {
-    NO_CHANGE: number;
-    TOP_LEFT: number;
-    TOP_CENTER: number;
-    TOP_RIGHT: number;
-    LEFT: number;
-    CENTER: number;
-    RIGHT: number;
-    BOTTOM_LEFT: number;
-    BOTTOM_CENTER: number;
-    BOTTOM_RIGHT: number;
-    POS_XY: number;
-  } = {
+  /**
+   * @private
+   */
+  static AD_POSITION = {
    NO_CHANGE: 0,
    TOP_LEFT: 1,
    TOP_CENTER: 2,
@@ -179,7 +155,7 @@ export class AdMobPro extends IonicNativePlugin {

  /**
   * Show banner at position
-   * @param position {number} Position. Use `AdMobPro.AD_POSITION` to set values.
+   * @param position {number} Position. Use `AdMob.AD_POSITION` to set values.
   */
  @Cordova({
    sync: true
@@ -257,8 +233,7 @@ export class AdMobPro extends IonicNativePlugin {
   */
  @Cordova({
    eventObservable: true,
-    event: 'onAdFailLoad',
-    element: document
+    event: 'onAdFailLoad'
  })
  onAdFailLoad(): Observable<any> { return; }

@@ -268,8 +243,7 @@ export class AdMobPro extends IonicNativePlugin {
   */
  @Cordova({
    eventObservable: true,
-    event: 'onAdLoaded',
-    element: document
+    event: 'onAdLoaded'
  })
  onAdLoaded(): Observable<any> { return; }

@@ -279,8 +253,7 @@ export class AdMobPro extends IonicNativePlugin {
   */
  @Cordova({
    eventObservable: true,
-    event: 'onAdPresent',
-    element: document
+    event: 'onAdPresent'
  })
  onAdPresent(): Observable<any> { return; }

@@ -290,8 +263,7 @@ export class AdMobPro extends IonicNativePlugin {
   */
  @Cordova({
    eventObservable: true,
-    event: 'onAdLeaveApp',
-    element: document
+    event: 'onAdLeaveApp'
  })
  onAdLeaveApp(): Observable<any> { return; }

@@ -301,8 +273,7 @@ export class AdMobPro extends IonicNativePlugin {
   */
  @Cordova({
    eventObservable: true,
-    event: 'onAdDismiss',
-    element: document
+    event: 'onAdDismiss'
  })
  onAdDismiss(): Observable<any> { return; }

@@ -1,301 +0,0 @@
-import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
-import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import 'rxjs/add/observable/fromEvent';
-
-export interface AdMobFreeBannerConfig {
-  /**
-   * Ad Unit ID
-   */
-  id?: string;
-  /**
-   * Receiving test ad
-   */
-  isTesting?: boolean;
-  /**
-   * Auto show ad when loaded
-   */
-  autoShow?: boolean;
-  /**
-   * Set to true, to put banner at top
-   */
-  bannerAtTop?: boolean;
-  /**
-   * Set to true, to allow banner overlap WebView
-   */
-  overlap?: boolean;
-  /**
-   * Set to true to avoid ios7 status bar overlap
-   */
-  offsetTopBar?: boolean;
-  /**
-   * Banner  size
-   */
-  size?: string;
-}
-
-export interface AdMobFreeInterstitialConfig {
-  /**
-   * Ad Unit ID
-   */
-  id?: string;
-  /**
-   * Receiving test ad
-   */
-  isTesting?: boolean;
-  /**
-   * Auto show ad when loaded
-   */
-  autoShow?: boolean;
-}
-
-export interface AdMobFreeRewardVideoConfig {
-  /**
-   * Ad Unit ID
-   */
-  id?: string;
-  /**
-   * Receiving test ad
-   */
-  isTesting?: boolean;
-  /**
-   * Auto show ad when loaded
-   */
-  autoShow?: boolean;
-}
-
-/**
- * @name AdMob Free
- * @description
- *
- * @usage
- * ```typescript
- * import { AdMobFree, AdMobFreeBannerConfig } from '@ionic-native/admob-free';
- *
- *
- * constructor(private admobFree: AdMobFree) { }
- *
- *
- * ...
- *
- *
- * const bannerConfig: AdMobFreeBannerConfig = {
- *  // add your config here
- *  // for the sake of this example we will just use the test config
- *  isTesting: true,
- *  autoShow: true
- * };
- * this.admobFree.banner.config(bannerConfig);
- *
- * this.admobFree.banner.prepare()
- *   .then(() => {
- *     // banner Ad is ready
- *     // if we set autoShow to false, then we will need to call the show method here
- *   })
- *   .catch(e => console.log(e));
- *
- *
- * ```
- * @interfaces
- * AdMobFreeBannerConfig
- * AdMobFreeInterstitialConfig
- * AdMobFreeRewardVideoConfig
- * @classes
- * AdMobFreeBanner
- * AdMobFreeInterstitial
- * AdMobFreeRewardVideo
- */
-@Plugin({
-  pluginName: 'AdMobFree',
-  plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob',
-  repo: 'https://github.com/ratson/cordova-plugin-admob-free',
-  platforms: ['Android', 'iOS']
-})
-@Injectable()
-export class AdMobFree extends IonicNativePlugin {
-
-  /**
-   * Convenience object to get event names
-   * @type {Object}
-   */
-  events: any = {
-    BANNER_LOAD: 'admob.banner.events.LOAD',
-    BANNER_LOAD_FAIL: 'admob.banner.events.LOAD_FAIL',
-    BANNER_OPEN: 'admob.banner.events.OPEN',
-    BANNER_CLOSE: 'admob.banner.events.CLOSE',
-    BANNER_EXIT_APP: 'admob.banner.events.EXIT_APP',
-
-    INTERSTITIAL_LOAD: 'admob.interstitial.events.LOAD',
-    INTERSTITIAL_LOAD_FAIL: 'admob.interstitial.events.LOAD_FAIL',
-    INTERSTITIAL_OPEN: 'admob.interstitial.events.OPEN',
-    INTERSTITIAL_CLOSE: 'admob.interstitial.events.CLOSE',
-    INTERSTITIAL_EXIT_APP: 'admob.interstitial.events.EXIT_APP',
-
-    REWARD_VIDEO_LOAD: 'admob.rewardvideo.events.LOAD',
-    REWARD_VIDEO_LOAD_FAIL: 'admob.rewardvideo.events.LOAD_FAIL',
-    REWARD_VIDEO_OPEN: 'admob.rewardvideo.events.OPEN',
-    REWARD_VIDEO_CLOSE: 'admob.rewardvideo.events.CLOSE',
-    REWARD_VIDEO_EXIT_APP: 'admob.rewardvideo.events.EXIT_APP',
-    REWARD_VIDEO_START: 'admob.rewardvideo.events.START',
-    REWARD_VIDEO_REWARD: 'admob.rewardvideo.events.REWARD'
-  };
-
-  /**
-   * Watch an event
-   * @param event {string} event name
-   * @return {Observable<any>}
-   */
-  on(event: string): Observable<any> {
-    return Observable.fromEvent(document, event);
-  }
-
-  /**
-   * Returns the AdMobFreeBanner object
-   * @type {AdMobFreeBanner}
-   */
-  banner: AdMobFreeBanner = new AdMobFreeBanner();
-
-  /**
-   * Returns the AdMobFreeInterstitial object
-   * @type {AdMobFreeInterstitial}
-   */
-  interstitial: AdMobFreeInterstitial = new AdMobFreeInterstitial();
-
-  /**
-   * Returns the AdMobFreeRewardVideo object
-   * @type {AdMobFreeRewardVideo}
-   */
-  rewardVideo: AdMobFreeRewardVideo = new AdMobFreeRewardVideo();
-
-}
-
-/**
- * @hidden
- */
-@Plugin({
-  pluginName: 'AdMobFree',
-  plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.banner',
-})
-export class AdMobFreeBanner {
-
-  /**
-   * Update config.
-   * @param options
-   * @return {AdMobFreeBannerConfig}
-   */
-  @Cordova({ sync: true })
-  config(options: AdMobFreeBannerConfig): AdMobFreeBannerConfig { return; }
-
-  /**
-   * Hide the banner.
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  hide(): Promise<any> { return; }
-
-  /**
-   * Create banner.
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  prepare(): Promise<any> { return; }
-
-  /**
-   * Remove the banner.
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  remove(): Promise<any> { return; }
-
-  /**
-   * Show the banner.
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  show(): Promise<any> { return; }
-
-}
-
-/**
- * @hidden
- */
-@Plugin({
-  pluginName: 'AdMobFree',
-  plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.interstitial',
-})
-export class AdMobFreeInterstitial {
-
-  /**
-   * Update config.
-   * @param options
-   * @return {AdMobFreeInterstitialConfig}
-   */
-  @Cordova({ sync: true })
-  config(options: AdMobFreeInterstitialConfig): AdMobFreeInterstitialConfig { return; }
-
-  /**
-   * Check if interstitial is ready
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  isReady(): Promise<any> { return; }
-
-  /**
-   * Prepare interstitial
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  prepare(): Promise<any> { return; }
-
-  /**
-   * Show the interstitial
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  show(): Promise<any> { return; }
-
-}
-
-/**
- * @hidden
- */
-@Plugin({
-  pluginName: 'AdMobFree',
-  plugin: 'cordova-plugin-admob-free',
-  pluginRef: 'admob.rewardvideo',
-})
-export class AdMobFreeRewardVideo {
-
-  /**
-   * Update config.
-   * @param options
-   * @return {AdMobFreeRewardVideoConfig}
-   */
-  @Cordova({ sync: true })
-  config(options: AdMobFreeRewardVideoConfig): AdMobFreeRewardVideoConfig { return; }
-
-  /**
-   * Check if reward video is ready
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  isReady(): Promise<any> { return; }
-
-  /**
-   * Prepare reward video
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  prepare(): Promise<any> { return; }
-
-  /**
-   * Show the reward video
-   * @return {Promise<any>}
-   */
-  @Cordova({ otherPromise: true })
-  show(): Promise<any> { return; }
-
-}
@@ -1,8 +1,6 @@
-import { Plugin, Cordova, IonicNativePlugin } from '@ionic-native/core';
+import { Plugin, Cordova } from '@ionic-native/core';
 import { Injectable } from '@angular/core';

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


 export interface AFAAuthOptions {
@@ -102,7 +102,7 @@ export interface AFAEncryptResponse {
 * This plugin will open a native dialog fragment prompting the user to authenticate using their fingerprint. If the device has a secure lockscreen (pattern, PIN, or password), the user may opt to authenticate using that method as a backup.
 * @usage
 * ```typescript
- * import { AndroidFingerprintAuth } from '@ionic-native/android-fingerprint-auth';
+ * import { AndroidFingerprintAuth, AFAAuthOptions } from '@ionic-native/android-fingerprint-auth';
 *
 * constructor(private androidFingerprintAuth: AndroidFingerprintAuth) { }
 *
@@ -114,18 +114,18 @@ export interface AFAEncryptResponse {
 *     if(result.isAvailable){
 *       // it is available
 *
- *       this.androidFingerprintAuth.encrypt({ clientId: 'myAppName', username: 'myUsername', password: 'myPassword' })
+ *       this.androidFingerprintAuth.encrypt({ clientId: "myAppName", username: "myUsername", password: "myPassword" })
 *         .then(result => {
 *            if (result.withFingerprint) {
- *                console.log('Successfully encrypted credentials.');
- *                console.log('Encrypted credentials: ' + result.token);
+ *                console.log("Successfully encrypted credentials.");
+ *                console.log("Encrypted credentials: " + result.token);
 *            } else if (result.withBackup) {
 *              console.log('Successfully authenticated with backup password!');
 *            } else console.log('Didn\'t authenticate!');
 *         })
 *         .catch(error => {
- *            if (error === this.androidFingerprintAuth.ERRORS.FINGERPRINT_CANCELLED) {
- *              console.log('Fingerprint authentication cancelled');
+ *            if (error === "Cancelled") {
+ *              console.log("Fingerprint authentication cancelled");
 *            } else console.error(error)
 *         });
 *
@@ -144,32 +144,10 @@ export interface AFAEncryptResponse {
  pluginName: 'AndroidFingerprintAuth',
  plugin: 'cordova-plugin-android-fingerprint-auth',
  pluginRef: 'FingerprintAuth',
-  repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth',
-  platforms: ['Android']
+  repo: 'https://github.com/mjwheatley/cordova-plugin-android-fingerprint-auth'
 })
@Injectable()
-export class AndroidFingerprintAuth extends IonicNativePlugin {
-
-  ERRORS: {
-    BAD_PADDING_EXCEPTION: 'BAD_PADDING_EXCEPTION',
-    CERTIFICATE_EXCEPTION: 'CERTIFICATE_EXCEPTION',
-    FINGERPRINT_CANCELLED: 'FINGERPRINT_CANCELLED',
-    FINGERPRINT_DATA_NOT_DELETED: 'FINGERPRINT_DATA_NOT_DELETED',
-    FINGERPRINT_ERROR: 'FINGERPRINT_ERROR',
-    FINGERPRINT_NOT_AVAILABLE: 'FINGERPRINT_NOT_AVAILABLE',
-    FINGERPRINT_PERMISSION_DENIED: 'FINGERPRINT_PERMISSION_DENIED',
-    FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST: 'FINGERPRINT_PERMISSION_DENIED_SHOW_REQUEST',
-    ILLEGAL_BLOCK_SIZE_EXCEPTION: 'ILLEGAL_BLOCK_SIZE_EXCEPTION',
-    INIT_CIPHER_FAILED: 'INIT_CIPHER_FAILED',
-    INVALID_ALGORITHM_PARAMETER_EXCEPTION: 'INVALID_ALGORITHM_PARAMETER_EXCEPTION',
-    IO_EXCEPTION: 'IO_EXCEPTION',
-    JSON_EXCEPTION: 'JSON_EXCEPTION',
-    MINIMUM_SDK: 'MINIMUM_SDK',
-    MISSING_ACTION_PARAMETERS: 'MISSING_ACTION_PARAMETERS',
-    MISSING_PARAMETERS: 'MISSING_PARAMETERS',
-    NO_SUCH_ALGORITHM_EXCEPTION: 'NO_SUCH_ALGORITHM_EXCEPTION',
-    SECURITY_EXCEPTION: 'SECURITY_EXCEPTION'
-  };
+export class AndroidFingerprintAuth {

  /**
   * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
@@ -177,7 +155,7 @@ export class AndroidFingerprintAuth extends IonicNativePlugin {
   * @returns {Promise<any>}
   */
  @Cordova()
-  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> { return; }
+  encrypt(options: AFAAuthOptions): Promise<AFAEncryptResponse> {return; }

  /**
   * Opens a native dialog fragment to use the device hardware fingerprint scanner to authenticate against fingerprints registered for the device.
@@ -185,19 +163,19 @@ export class AndroidFingerprintAuth extends IonicNativePlugin {
   * @returns {Promise<any>}
   */
  @Cordova()
-  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> { return; }
+  decrypt(options: AFAAuthOptions): Promise<AFADecryptOptions> {return; }

  /**
   * Check if service is available
   * @returns {Promise<any>} Returns a Promise that resolves if fingerprint auth is available on the device
   */
  @Cordova()
-  isAvailable(): Promise<{ isAvailable: boolean, isHardwareDetected: boolean, hasEnrolledFingerprints: boolean }> { return; }
+  isAvailable(): Promise<{isAvailable: boolean}> { return; }

  /**
   * Delete the cipher used for encryption and decryption by username
   * @returns {Promise<any>} Returns a Promise that resolves if the cipher was successfully deleted
   */
  @Cordova()
-  delete(options: { clientId: string; username: string; }): Promise<{ deleted: boolean }> { return; }
+  delete(options: {clientId: string; username: string; }): Promise<{deleted: boolean}> { return; }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ibby	d36a8c8257	3.1.0-rc.2	2017-03-10 10:39:55 -05:00
Ibby	3665781b40	chore(): update deps	2017-03-10 10:39:40 -05:00
Ibby	9108db7653	Merge branch 'v3-injectable' of github.com:driftyco/ionic-native into v3-injectable	2017-03-10 10:22:15 -05:00
Ibby	00d1ad7d3b	set concurrency to number of cores	2017-03-10 10:22:03 -05:00
perry	de51ef8a82	chore(CI): fixing npm install instructions in generated readmes	2017-03-08 13:08:10 -06:00
Ibby	9a68ea242c	docs(health): fix return type	2017-03-08 05:44:56 -05:00
Ibby	10daa1f1dd	docs(background-fetch): fix return type	2017-03-07 06:01:43 -05:00
Ibby	38bb8410e5	refactor(background-geolocation): update imports	2017-03-07 05:58:00 -05:00
Ibby	d35d176a79	3.1.0-rc.1	2017-03-07 05:53:34 -05:00
Ibby	fe8a380902	docs(): update docs	2017-03-07 05:52:20 -05:00
Ibby	a8edd53d26	fix(background-geolocation): configure returns an observable	2017-03-07 05:30:58 -05:00
Ibby HadeedandGitHub	00a7fa547e	chore(): merge master into v3-injectable (#1146 ) * 2.5.0 * chore(): update changelog * fix(pin-dialog): add missing errorIndex * 2.5.1 * chore(): update changelog * fix(zip): progress callback is optional (#1049) * fix(apprate): add missing Windows Store option (#1072) * Update file-chooser.ts (#1071) Removed semicolon after .then() in usage instructions * docs(device-motion): update interface names (#1076) AccelerationData interface is wrongly named in docs. It should be DeviceMotionAccelerationData. And I added it to import statement. * feat(inappbrowser): add interface for IAB options (#1065) * Add InAppBrowserOptions Interface for better tooling. * feat(inappbrowser): add interface for IAB options * Add more constructor tests. * Add missing iOS options. * docs(media): update method usage (#1089) * fix(push): add the missing option clearBadge (#1087) * docs(badge): fix example (#1096) Error in code example (supplied parameters do not match call signature) * fix(imagepicker): add outputType option (#1098) * fix(facebook): fixes issue when not supplying default params (#1088) * Fix default facebook logEvent parameters * Implement correct parameters format in facebook logEvent method * Update ibeacon.ts (#1099) Return type of `getAuthorizationStatus()` made more explicit. * fix(file): add missing exports (#1101) Any declaration that is not being exported is missing from the resulting d.ts declaration files. * Add InAppBrowserOptions interface to documentation. (#1103) * Update sqlite.ts (#1106) Added a bracket to remove the syntax error * update device orientation docs to reflect renaming of CompassHeading interface (#1107) * Move marker code inside MAP_READY (#1108) The code to set the camera position and marker should be moved inside the function handling MAP_READY. Otherwise they execute before the event is fired and it doesn't work. * refactor(file): accept ArrayBuffer for data to write (#1109) * docs(google-maps): fix param type closes #1110 * fix(media): add missing pauseRecord and resumeRecord methods (#1122) * docs(stripe): fix type and naming issues (#1129) * refactor(paypal): fix type of items (#1125) Type of items should be Array<PayPalItem> instead of string. * fix(serial): Serial.requestPermission() options are optional (#1128) * add success/error indices * feat(browser-tab): add browser tab plugin (#1126) * feature: added hasPermission function to Firebase fixes #1115 * feat: Implemented support for BrowserTab #1077 * docs(browser-tab): add proper docs * fix(background-geolocation): configure returns a promise closes #1118 * docs(background-geolocation): add return types and platforms * fix(contacts): allow passing asterisk as contact field type closes 1093 * fix(contacts): allow passing asterisk as contact field type closes #1093 * fix(plugin): revert changes to support stable version (#1116) fix #1001 * feat(file): add system paths * feat(app-update): add cordova-plugin-app-update support (#1105) * add new app-update plugin * update plugin info * docs(app-update): add docs * feat(alipay): add alipay support. (#1097) * add cordova-alipay-base plugin. to support Alipay payment * change ALI_PID to APP_ID, make it same with the latest SDK * rewrite comments * docs(google-maps): improve docs (#1095) Move `map.moveCamera(position);` inside the MAP_READY event. Allow to zoom the map on first launch (both iOS and Android). * fix(file): remove FileError from return type (#1086) Promises that reject with a `FileError` are not of the type `Promise<T\|FileError>`, but `Promise<T>`. The previous declarations of `Promise<T\|FileError>` would break typing further down the chain where you are trying to use the value that the typing says could be `T\|FileError` but in reality could only be `T`. * feat(google-maps): add constant for map type * fix(file): platform Browser will raise a an DOMException (#1082) fix(File): Platform Browser will raise a an DOMException on resoleLocalFilesystemUrl and tries to write on readonly property DOMException err.message in fillErrorMessage * feat(local-notifications): support for icon background color (#1079) The Cordova plugin Ionic Natives uses allows specifying the background color of the smallIcon. By not including it in your interface you force users to use the default color for their version of Android. While the LocalNotification plugin is not well documented, it does include this feature, see Options.java line 253: ``` /** * @return * The notification background color for the small icon * Returns null, if no color is given. / public int getColor() { String hex = options.optString("color", null); if (hex == null) { return NotificationCompat.COLOR_DEFAULT; } int aRGB = Integer.parseInt(hex, 16); return aRGB + 0xFF000000; } ``` I've simply added the option to the interface as well as a short description. This lets you go from the default color (varies by Android version): https://goo.gl/photos/nERcj4GZgapy8aee9 To any color you'd like: https://goo.gl/photos/t8V9WVba8jDU49aHA And also works if you also specify a large icon: https://goo.gl/photos/gWQYwa12djmdXfYcA feat(unique-device-add): add UniqueDeviceId plugin (#1064) * fix plugin * feat(text-to-speech): Add stop method (#1063) https://github.com/vilic/cordova-plugin-tts/pull/32 * feat(appodeal): adds Appodeal SDK wrappers for iOS and Android (#1031) * feat(Appodeal) bootrapping * starting docs * more docs * feat(appodeal): add event Observables * feat(appodeal): replace Cordova Observable events with #.fromEvent() * feat(appodeal): update decorator metadata * feat(couchbase-lite): add CouchbaseLite cordova plugin (#1025) * feat(CouchbaseLite): add CouchbaseLite cordova plugin * add plugin url * feat(background-fetch): Adding Background Fetch requested in #990 (#1013) * Adding Background Fetch (https://github.com/transistorsoft/cordova-plugin-background-fetch) requested in #990 * Adding BackgroundFetch to index * feat(gyroscope): add Gyroscope plugin (#1004) * add gyroscope.ts to plugins * add gyroscope to index * Update gyroscope.ts * Update gyroscope.ts * Revert "fix(File): typing where `FileError` can be thrown" (#1130) * tslint and fix build issues * 2.6.0 * chore(): update changelog * fix(core): dont check if method exists when overriding fixes #1043 * fix(file): fix writeExistingFile closes #1044 * feat(diagnostic): add new methods closes #1045 * feat(background-mode): replace event listeners with on method The methods onactivate, ondeactive and onfailure no longer exist. You must now use `on` method. * feat(background-mode): add missing functions closes #1078 * tslint * set GoogleMapsMapTypeId to private * remove beta from stripe * 2.7.0 * chore(): update changelog * feat(app-preferences): added cordova-plugin-app-preferences support (#1084) * (feat) added cordova-plugin-app-preferences support * replaced callback functions with promises * updated example * (feat) added cordova-plugin-browsertab support * Revert "(feat) added cordova-plugin-browsertab support" This reverts commit `00eb5cf5d8`. * (update) synchronize fetch * feat(photo-library): added cordova-plugin-photo-library (#1102) * feat(photo-library): added cordova-plugin-photo-library * CordovaFiniteObservable moved to photo-library. Overloads are marked as private. * refactor(photo-library): fixed circleci failing in 2.7.0 (#1132) * feat(photo-library): added cordova-plugin-photo-library * CordovaFiniteObservable moved to photo-library. Overloads are marked as private. * fixed typescript error in 2.7.0 * feat(health): add wrapper for cordova-plugin-health (#1039) * feat(health): add wrapper for cordova-plugin-health * fix(Health): add optional params to QueryOptions for .query() * docs(health): fix javadoc of interfaces * fix(health): remove unused Plugin option * docs(health): add missing documentation * doc(health): add promise to return * doc(health): remove empty lines * doc(health): Add description & reference to repo * doc(health: add "return {Promise<any>}" * refactor(safari-view-controller): hide returns promise * fix typo in ibeacon plugin (#1138) * fix(file): fix return types fixes #1139 * docs(background-geolocation): fix param docs * refactor(health): fix return types and prefix interfaces * 2.8.0 * chore(): update changelog * docs(sqlite): syntax error resolved (#1142) * Syntax error resolved The `{}` should be `[]`, but since there is no binding we do not get error. In case we add one, then the syntax will be incorrect. * Fixed a syntax error	2017-03-07 05:06:38 -05:00
Ibby	b393c7448b	remove console logs closes #1145	2017-03-06 04:31:31 -05:00
Ibby	46f80555f7	refactor(): remove some prefixes	2017-03-01 19:35:35 -05:00
Ibby	0aee729e8e	remove utils from publish command	2017-02-22 19:16:00 -05:00
Ibby	06c8c44efc	3.1.0-alpha.3	2017-02-22 19:10:23 -05:00
Ibby	6df3383585	remove auto-install and cleanup	2017-02-22 19:08:34 -05:00
Ibby	f912a452dc	remove alpha tag	2017-02-16 22:05:36 -05:00
Ibby	ea697bd884	edit publish command	2017-02-16 22:05:23 -05:00
Ibby	6e7b087cff	3.1.0-alpha.2	2017-02-16 22:00:12 -05:00
Ibby	87b5327a42	fix AoT support and add publish script	2017-02-16 22:00:06 -05:00
Ibby	1b1a0e99e8	3.1.0-alpha.1	2017-02-16 20:53:30 -05:00
Ibby	2828319d0a	3.0.1-0	2017-02-16 20:51:44 -05:00
Ibby	d3c87fd95a	fix build	2017-02-16 20:38:13 -05:00
Ibby	964cc91548	Merge branch 'v3-injectable' into v3-injectable-ngc	2017-02-16 19:49:56 -05:00
Ibby	a2e410c4cb	resolve merge conflict	2017-02-16 19:49:25 -05:00
Ibby	9055154781	chore(): ngc build	2017-02-16 19:47:50 -05:00
perry	822a4120c7	updating package name in usage instructions	2017-02-15 14:17:53 -06:00
perry	bc60d0678b	outputting readmes to dist dir instead of src	2017-02-15 10:29:47 -06:00
perry	9aa7ad0221	automating readme file generation and adding it to CI # Conflicts: # src/@ionic-native/plugins/googlemap/index.ts # src/@ionic-native/plugins/inappbrowser/index.ts # src/@ionic-native/plugins/media/index.ts # src/@ionic-native/plugins/sqlite/index.ts	2017-02-15 10:19:26 -06:00
perry	e965d654c5	readme templates	2017-02-15 09:48:46 -06:00
perry	82d6efac76	gulp task to generate readme files	2017-02-15 09:48:32 -06:00
Ibby	de51746bfc	rename google maps	2017-02-13 15:06:09 -05:00
Ibby	157367ddb6	fix(plugins): rename packages/classes	2017-02-13 15:02:36 -05:00
Ibby HadeedandGitHub	6de9697aa9	chore(build): add auto install scripts (#1059 ) * feat(core): auto install scripts * minor fixes * minor fixes * remove prompt message	2017-02-13 14:51:10 -05:00
Ibby	1dfdbaf1f0	chore(build): convert dependencies to peer dependencies	2017-02-13 14:31:41 -05:00
Max Lynch	1fe1cd6f75	Cleanup	2017-02-13 12:21:47 -06:00
Max Lynch	dcd5e3ac9f	Merge branch 'v3-injectable-instance-plugins' into v3-injectable	2017-02-13 12:14:11 -06:00
Max Lynch	aa44c09ec4	Merge branch 'v3-injectable' into v3-injectable-instance-plugins	2017-02-13 12:13:50 -06:00
Max Lynch	281e8b737e	Merge remote-tracking branch 'origin/v3-node-build' into v3-injectable	2017-02-09 08:29:19 -06:00
Ibby	b5ce8e9fbb	feat(): make instance based plugins injectable	2017-02-09 09:28:52 -05:00
Ibby	0b17b253d9	chore(): move fs-extra-promise to devDeps	2017-02-09 08:49:30 -05:00
Ibby	faffc76a76	chore(): nodejs build script	2017-02-09 08:48:29 -05:00
Max Lynch	20fbfb91ca	Fix build errors	2017-02-08 22:25:16 -06:00
Max Lynch	4acdd41837	Remove lots of static stuff with a fancy regex	2017-02-08 22:14:53 -06:00
Max Lynch	1f2dba0a3f	Remove duplicate injectables	2017-02-08 17:30:16 -06:00
Max Lynch	76f07092df	More stuff	2017-02-08 17:25:48 -06:00
Max Lynch	91a5b5bbfc	Checkpoint	2017-02-08 17:14:25 -06:00
Max Lynch	e3164c95df	Updates	2017-02-08 17:06:03 -06:00
Max Lynch	1933ec66d9	Working on injectable	2017-02-08 16:21:57 -06:00
Max Lynch	742df16837	3.0.0	2017-02-08 12:32:56 -06:00
Max LynchandGitHub	c742bdab85	Merge pull request #1048 from driftyco/fix-alpha-package chore(): change rxjs version to match ionic framework	2017-02-08 10:56:46 -06:00
Ibby HadeedandGitHub	cd6d166e76	Update plugin-package.json.template	2017-02-08 08:40:44 -05:00
Ibby HadeedandGitHub	e061219aff	Update core-package.json.template	2017-02-08 08:40:19 -05:00
Max Lynch	9f1ce45f06	Bump	2017-02-07 15:09:48 -06:00
Max Lynch	dd04564335	Some stuff	2017-02-07 15:09:01 -06:00
Max Lynch	03254ad4b7	Build and push	2017-02-07 14:51:40 -06:00
Max Lynch	f13a007a1c	Individual packages	2017-02-07 13:29:09 -06:00
Max Lynch	9802b7f2e4	Build	2017-02-07 12:50:35 -06:00
Max Lynch	a2dcca3815	Remove core	2017-02-07 12:43:13 -06:00
Max Lynch	7226bcad50	Test	2017-02-07 12:40:50 -06:00
Max Lynch	63ab1a205e	Plugin tsconfig	2017-02-06 17:22:24 -06:00
Max Lynch	b6ab01d100	Core	2017-02-06 17:17:58 -06:00
Max Lynch	ecb98e2e82	Core kind of buidls	2017-02-06 17:15:46 -06:00
Max Lynch	c733127134	Plugin tsconfigs	2017-02-06 17:06:59 -06:00
Max Lynch	0cce8e9ce7	tsconfig for plugins	2017-02-06 17:05:50 -06:00
Max Lynch	b773c0709f	Moving things aroudn	2017-02-06 17:00:10 -06:00
Max Lynch	d426b15c1c	Removed	2017-02-06 16:38:43 -06:00
Max Lynch	b05627d2d6	Moving to modules	2017-02-06 16:37:59 -06:00
Max Lynch	dbd9df41f0	First try	2017-02-06 15:43:45 -06:00