From 4f1c124243f852aa86942f82bac8b723f47c38d5 Mon Sep 17 00:00:00 2001
From: Alex Kankov <akankov@users.noreply.github.com>
Date: Fri, 30 Sep 2016 14:26:12 +0700
Subject: [PATCH 001/245] Object with themes

---
 amcharts/AmCharts.d.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/amcharts/AmCharts.d.ts b/amcharts/AmCharts.d.ts
index 4f5dbe90f7..ae5baad50e 100644
--- a/amcharts/AmCharts.d.ts
+++ b/amcharts/AmCharts.d.ts
@@ -23,6 +23,9 @@ declare namespace AmCharts {
 
     /** Set it to true if you want UTC time to be used instead of local time. */
     var useUTC: boolean;
+    
+    /** Object with themes */
+    var themes: any;
 
     /** Clears all the charts on page, removes listeners and intervals. */
     function clear();

From 29bf3b2414e2a611ee98fda86b9256016a908fa1 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Fri, 30 Sep 2016 09:32:07 -0700
Subject: [PATCH 002/245] [rethinkdb] Clean up the listing issues in the test

---
 rethinkdb/rethinkdb-tests.ts | 48 +++++++++++++++++++-----------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index 4dbd7ab638..1654d182e0 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -1,17 +1,20 @@
 /// <reference path="rethinkdb.d.ts" />
 
-import r = require("rethinkdb")
+import r = require("rethinkdb");
 
-r.connect({host:"localhost", port: 28015}, function(err, conn) {
-    console.log("HI", err, conn)
-    var testDb = r.db('test')
-    testDb.tableCreate('users').run(conn, function(err, stuff) {
-        var users = testDb.table('users')
+r.connect({ host: "localhost", port: 28015 }, function(err, conn) {
+    console.log("HI", err, conn);
 
-        users.insert({name: "bob"}).run(conn, function() {})
+    const testDb = r.db("test");
+
+    testDb.tableCreate("users").run(conn, function(err, stuff) {
+        const users = testDb.table("users");
+
+        users.insert({ name: "bob" }).run(conn, function() {
+        });
 
         users.filter(function(doc?) {
-            return doc("henry").eq("bob")
+            return doc("henry").eq("bob");
         })
         .between("james", "beth")
         .limit(4)
@@ -19,26 +22,27 @@ r.connect({host:"localhost", port: 28015}, function(err, conn) {
           cursor.toArray().then(rows => {
             console.log(rows);
           });
-        })
-
-    })
-})
+        });
+    });
+});
 
 // use promises instead of callbacks
-r.connect({host:"localhost", port: 28015}).then(function(conn) {
-    console.log("HI", conn)
-    var testDb = r.db('test')
-    testDb.tableCreate('users').run(conn).then(function(stuff) {
-        var users = testDb.table('users')
+r.connect({ host: "localhost", port: 28015 }).then(function(conn) {
+    console.log("HI", conn);
 
-        users.insert({name: "bob"}).run(conn, function() {})
+    const testDb = r.db("test");
+
+    testDb.tableCreate("users").run(conn).then(function(stuff) {
+        const users = testDb.table("users");
+
+        users.insert({ name: "bob" }).run(conn, function() {
+        });
 
         users.filter(function(doc?) {
-            return doc("henry").eq("bob")
+            return doc("henry").eq("bob");
         })
         .between("james", "beth")
         .limit(4)
         .run(conn);
-
-    })
-})
+    });
+});

From 655bd4c93bf6790a75d94625ccef332c47416ea8 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Fri, 30 Sep 2016 10:32:33 -0700
Subject: [PATCH 003/245] [rethinkdb] Removes Bluebird dependency, adds many
 missing methods and overloads

---
 rethinkdb/rethinkdb-tests.ts |  23 ++-
 rethinkdb/rethinkdb.d.ts     | 263 ++++++++++++++++++++++++++++++++---
 rethinkdb/tsconfig.json      |   9 ++
 3 files changed, 270 insertions(+), 25 deletions(-)
 create mode 100644 rethinkdb/tsconfig.json

diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index 1654d182e0..633c82e2ec 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -1,6 +1,4 @@
-/// <reference path="rethinkdb.d.ts" />
-
-import r = require("rethinkdb");
+import * as r from "rethinkdb";
 
 r.connect({ host: "localhost", port: 28015 }, function(err, conn) {
     console.log("HI", err, conn);
@@ -19,11 +17,19 @@ r.connect({ host: "localhost", port: 28015 }, function(err, conn) {
         .between("james", "beth")
         .limit(4)
         .run(conn, function(err, cursor) {
-          cursor.toArray().then(rows => {
-            console.log(rows);
+          cursor.toArray<string>((err, strings) => {
+            console.log(strings);
           });
         });
     });
+
+    r.js("'str1' + 'str2'").run(conn, function (err, value) {});
+    r.uuid().run(conn, function (err, uuid) {});
+    r.uuid("input value").run(conn, function (err, uuid) {});
+
+    r.table("games").changes().run(conn, function(err, cursor) {
+      cursor.each(console.log);
+    });
 });
 
 // use promises instead of callbacks
@@ -43,6 +49,11 @@ r.connect({ host: "localhost", port: 28015 }).then(function(conn) {
         })
         .between("james", "beth")
         .limit(4)
-        .run(conn);
+        .run(conn)
+        .then(cursor => {
+          cursor.toArray().then(rows => {
+            console.log(rows);
+          });
+        });
     });
 });
diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index a34ef1fbce..6d87eccf50 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -1,14 +1,34 @@
-// Type definitions for Rethinkdb 1.10.0
+//
+// Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
-// Definitions by: Sean Hess <https://seanhess.github.io/>
+//
+// Definitions by: Sean Hess <https://seanhess.github.io/>, Alex Gorbatchev <https://github.com/alexgorbatchev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// Reference: http://www.rethinkdb.com/api/#js
-// TODO: Document manipulation and below
-///<reference path="../bluebird/bluebird-2.0.d.ts"/>
+//
+// Reference: https://rethinkdb.com/api/javascript/
+//
+// Notes:
+//   - Currently missing control structures and geospatial commands. Please help out!
+//
+// Testing:
+//   $ tsc --noImplicitAny --module commonjs -p rethinkdb/
+//
 
+/// <reference path="../node/node.d.ts"/>
+
+/**
+ * https://rethinkdb.com/api/javascript/
+ */
 declare module "rethinkdb" {
-
-    export function connect(host: ConnectionOptions, cb?: (err: Error, conn: Connection) => void): Promise<Connection>;
+    /**
+     * Create a new connection to the database server.
+     *
+     * See: https://rethinkdb.com/api/javascript/connect/
+     */
+    export function connect(opts: ConnectionOptions, cb: (err: ReqlDriverError, conn: Connection) => void): void;
+    export function connect(host: string, cb: (err: ReqlDriverError, conn: Connection) => void): void;
+    export function connect(opts: ConnectionOptions): Promise<Connection>;
+    export function connect(host: string): Promise<Connection>;
 
     export function dbCreate(name: string): Operation<CreateResult>;
     export function dbDrop(name: string): Operation<DropResult>;
@@ -32,6 +52,19 @@ declare module "rethinkdb" {
     // Control Structures
     export function branch(test: Expression<boolean>, trueBranch: Expression<any>, falseBranch: Expression<any>): Expression<any>;
 
+    /**
+     * Create a javascript expression.
+     *
+     * @param {Number} timeout - The number of seconds before `r.js` times out. The default value is `5` seconds.
+     */
+    export function js(jsString: string, opts?: { timeout: number }): Operation<any>;
+
+    /**
+     * Return a UUID (universally unique identifier), a string that can be used as a unique ID. If a string is passed to uuid as an argument, the UUID will be deterministic, derived from the string’s SHA-1 hash.
+     *
+     * RethinkDB’s UUIDs are standards-compliant. Without the optional argument, a version 4 random UUID will be generated; with that argument, a version 5 UUID will be generated, using a fixed namespace UUID of 91461c99-f89d-49d2-af96-d8e2e14e9b58.
+     */
+    export function uuid(input?: string): Operation<string>;
 
     export class Cursor {
         hasNext(): boolean;
@@ -49,19 +82,57 @@ declare module "rethinkdb" {
         close(): Promise<void>;
     }
 
+    /**
+     * Connection options.
+     *
+     * See: https://rethinkdb.com/api/javascript/connect/
+     */
     interface ConnectionOptions {
-        host: string;
-        port: number;
+        /** The host to connect to (default `localhost`) */
+        host?: string;
+
+        /** The port to connect on (default `28015`) */
+        port?: number;
+
+        /** The default database (default `test`) */
         db?: string;
-        authKey?: string;
+
+        /** The user account to connect as (default `admin`) */
+        user?: string;
+
+        /** The password for the user account to connect as (default `''`, empty) */
+        password?: string;
+
+        /** Timeout period in seconds for the connection to be opened (default `20`) */
+        timeout?: number;
+
+        /**
+         * A hash of options to support SSL connections (default `null`). Currently,
+         * there is only one option available, and if the `ssl` option is specified,
+         * this key is required.
+         */
+        ssl?: {
+          /** A list of Node.js `Buffer` objects containing SSL CA certificates */
+          ca: Buffer[];
+        };
+    }
+
+    interface NoReplyWait {
+      noreplyWait: boolean;
     }
 
     interface Connection {
+        open: boolean;
+
         close(cb: (err: Error) => void): void;
-        close(opts: { noreplyWait: boolean }, cb: (err: Error) => void): void;
+        close(opts: NoReplyWait, cb: (err: Error) => void): void;
         close(): Promise<void>;
-        close(opts: { noreplyWait: boolean }): Promise<void>;
-        reconnect(cb?: (err: Error, conn: Connection) => void): Promise<Connection>;
+        close(opts: NoReplyWait): Promise<void>;
+
+        reconnect(cb: (err: Error, conn: Connection) => void): void;
+        reconnect(opts: NoReplyWait, cb: (err: Error, conn: Connection) => void): void;
+        reconnect(opts?: NoReplyWait): Promise<Connection>;
+
         use(dbName: string): void;
         addListener(event: string, cb: Function): void;
         on(event: string, cb: Function): void;
@@ -92,6 +163,45 @@ declare module "rethinkdb" {
         delete(options?: UpdateOptions): Operation<WriteResult>;
     }
 
+    /**
+     * See: https://rethinkdb.com/api/javascript/changes/
+     */
+    interface ChangesOptions {
+        /**
+         * Controls how change notifications are batched. Acceptable values are `true`, `false` and a numeric value:
+         *
+         *   * `true`: When multiple changes to the same document occur before a batch of notifications is sent, the changes are “squashed” into one change. The client receives a notification that will bring it fully up to date with the server.
+         *   * `false`: All changes will be sent to the client verbatim. This is the default.
+         *   * `n`: A numeric value (floating point). Similar to `true`, but the server will wait `n` seconds to respond in order to squash as many changes together as possible, reducing network traffic. The first batch will always be returned immediately.
+         */
+        squash: boolean | number;
+
+        /**
+         * The number of changes the server will buffer between client reads before it starts dropping changes and generates an error (default: 100,000).
+         */
+        changefeedQueueSize: number;
+
+        /**
+         * If `true`, the changefeed stream will begin with the current contents of the table or selection being monitored. These initial results will have `new_val` fields, but no `old_val` fields. The initial results may be intermixed with actual changes, as long as an initial result for the changed document has already been given. If an initial result for a document has been sent and a change is made to that document that would move it to the unsent part of the result set (e.g., a changefeed monitors the top 100 posters, the first 50 have been sent, and poster 48 has become poster 52), an “uninitial” notification will be sent, with an `old_val` field but no `new_val` field.
+         */
+        includeInitial: boolean;
+
+        /**
+         * If `true`, the changefeed stream will include special status documents consisting of the field `state` and a string indicating a change in the feed’s state. These documents can occur at any point in the feed between the notification documents described below. If `includeStates` is `false` (the default), the status documents will not be sent.
+         */
+        includeStates: boolean;
+
+        /**
+         * If `true`, a changefeed stream on an `orderBy.limit` changefeed will include `old_offset` and `new_offset` fields in status documents that include `old_val` and `new_val`. This allows applications to maintain ordered lists of the stream’s result set. If `old_offset` is set and not `null`, the element at `old_offset` is being deleted; if `new_offset` is set and not `null`, then `new_val` is being inserted at `new_offset`. Setting `includeOffsets` to `true` on a changefeed that does not support it will raise an error.
+         */
+        includeOffsets: boolean;
+
+        /**
+         * If `true`, every result on a changefeed will include a `type` field with a string that indicates the kind of change the result represents: `add`, `remove`, `change`, `initial`, `uninitial`, `state`. Defaults to `false`.
+         */
+        includeTypes: boolean;
+    }
+
     interface Table extends Sequence {
         indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;
         indexDrop(name: string): Operation<DropResult>;
@@ -103,16 +213,27 @@ declare module "rethinkdb" {
         get(key: string): Sequence; // primary key
         getAll(key: string, index?: Index): Sequence; // without index defaults to primary key
         getAll(...keys: string[]): Sequence;
+
+        /**
+         * Turn a query into a changefeed, an infinite stream of objects representing
+         * changes to the query’s results as they occur. A changefeed may return changes
+         * to a table or an individual document (a “point” changefeed). Commands such as
+         * filter or `map` may be used before the changes command to transform or filter
+         * the output, and many commands that operate on sequences can be chained after
+         * `changes`.
+         *
+         * See: https://rethinkdb.com/api/javascript/changes/
+         */
+        changes(opts?: ChangesOptions): Sequence;
     }
 
     interface Sequence extends Operation<Cursor>, Writeable {
-
         between(lower: any, upper: any, index?: Index): Sequence;
+
         filter(rql: ExpressionFunction<boolean>): Sequence;
         filter(rql: Expression<boolean>): Sequence;
         filter(obj: { [key: string]: any }): Sequence;
 
-
         // Join
         // these return left, right
         innerJoin(sequence: Sequence, join: JoinFunction<boolean>): Sequence;
@@ -231,16 +352,120 @@ declare module "rethinkdb" {
         default(value: T): Expression<T>;
     }
 
+    interface OperationOptions {
+        /**
+         * One of three possible values affecting the consistency guarantee for the query (default: 'single').
+         *
+         *   * 'single' (the default) returns values that are in memory (but not necessarily written to disk) on the primary replica.
+         *   * 'majority' will only return values that are safely committed on disk on a majority of replicas. This requires sending a message to every replica on each read, so it is the slowest but most consistent.
+         *   * 'outdated' will return values that are in memory on an arbitrarily-selected replica. This is the fastest but least consistent.
+         */
+        readMode: "single" | "majority" | "outdated";
+
+        /**
+         * What format to return times in (default: 'native'). Set this to 'raw' if you want times returned as JSON objects for exporting.
+         */
+        timeFormat: "native" | "raw";
+
+        /**
+         * Whether or not to return a profile of the query’s execution (default: false).
+         */
+        profile: boolean;
+
+        /**
+         * Possible values are 'hard' and 'soft'. In soft durability mode RethinkDB will acknowledge the write immediately after receiving it, but before the write has been committed to disk.
+         */
+        durability: "hard" | "soft";
+
+        /**
+         * What format to return `grouped_data` and `grouped_streams` in (default: 'native'). Set this to 'raw' if you want the raw pseudotype.
+         */
+        groupFormat: "native" | "raw";
+
+        /**
+         * Set to `true` to not receive the result object or cursor and return immediately.
+         */
+        noreply: boolean;
+
+        /**
+         * The database to run this query against as a string. The default is the database specified in the db parameter to connect (which defaults to test). The database may also be specified with the db command.
+         */
+        db: string;
+
+        /**
+         * The maximum numbers of array elements that can be returned by a query (default: 100,000). This affects all ReQL commands that return arrays. Note that it has no effect on the size of arrays being written to the database; those always have an upper limit of 100,000 elements.
+         */
+        arrayLimit: number;
+
+        /**
+         * What format to return binary data in (default: 'native'). Set this to 'raw' if you want the raw pseudotype.
+         */
+        binaryFormat: "native" | "raw";
+
+        /**
+         * Minimum number of rows to wait for before batching a result set (default: 8). This is an integer.
+         */
+        minBatchRows: number;
+
+        /**
+         * Maximum number of rows to wait for before batching a result set (default: unlimited). This is an integer.
+         */
+        maxBatchRows: number;
+
+        /**
+         * Maximum number of bytes to wait for before batching a result set (default: 1MB). This is an integer.
+         */
+        maxBatchBytes: number;
+
+        /**
+         * Maximum number of seconds to wait before batching a result set (default: 0.5). This is a float (not an integer) and may be specified to the microsecond.
+         */
+        maxBatchSeconds: number;
+
+        /**
+         * Factor to scale the other parameters down by on the first batch (default: 4). For example, with this set to 8 and maxBatchRows set to 80, on the first batch maxBatchRows will be adjusted to 10 (80 / 8). This allows the first batch to return faster.
+         */
+        firstBatchScaledownFactor: number;
+    }
+
     interface Operation<T> {
-        run(conn: Connection, cb?: (err: Error, result: T) => void): Promise<T>;
+        /**
+         * Run a query on a connection. The callback will get either an error, a single JSON result, or a cursor, depending on the query.
+         *
+         * See: https://rethinkdb.com/api/javascript/run/
+         */
+        run(conn: Connection, opts: OperationOptions, cb: (err: Error, result: T) => void): void;
+        run(conn: Connection, cb: (err: Error, result: T) => void): void;
+        run(conn: Connection, opts: OperationOptions): Promise<T>;
+        run(conn: Connection): Promise<T>;
     }
 
     interface Aggregator { }
+
     interface Sort { }
 
-    interface Time { }
+    interface ReqlType {
+      $reql_type$: string;
+    }
 
+    interface Time extends ReqlType {
+      $reql_type$: "TIME";
+      epoch_time: number;
+      timezone: string;
+    }
 
-    // http://www.rethinkdb.com/api/#js
-    // TODO control structures
+    interface Binary extends ReqlType {
+      $reql_type$: "BINARY";
+      data: string;
+    }
+
+    interface ReqlError extends Error {}
+
+    /**
+     * An error has occurred within the driver. This may be a driver bug, or it may
+     * be an unfulfillable command, such as an unserializable query.
+     *
+     * See https://www.rethinkdb.com/docs/error-types/
+     */
+    interface ReqlDriverError extends ReqlError {}
 }
diff --git a/rethinkdb/tsconfig.json b/rethinkdb/tsconfig.json
new file mode 100644
index 0000000000..a7f2567b9c
--- /dev/null
+++ b/rethinkdb/tsconfig.json
@@ -0,0 +1,9 @@
+{
+    "compilerOptions": {
+        "module": "es6",
+        "target": "es6"
+    },
+    "include": [
+      "*.ts"
+    ]
+}

From 45d59849e7a83c52ccd69fbd648cbceacdbca3f2 Mon Sep 17 00:00:00 2001
From: dennispg <dennispg@gmail.com>
Date: Sat, 1 Oct 2016 10:41:44 -0500
Subject: [PATCH 004/245] export Handsontable as a module

---
 handsontable/handsontable.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/handsontable/handsontable.d.ts b/handsontable/handsontable.d.ts
index 7a82509baa..49b4a307a5 100644
--- a/handsontable/handsontable.d.ts
+++ b/handsontable/handsontable.d.ts
@@ -290,3 +290,9 @@ declare namespace ht {
 declare var Handsontable: {
   new (element: Element, options: ht.Options): ht.Methods;
 };
+
+declare module "handsontable" {
+    export var Handsontable: {
+      new (element: Element, options: ht.Options): ht.Methods;
+    };
+}

From ac05be6eedb8055bdbbfa7d640e854dc7a07d082 Mon Sep 17 00:00:00 2001
From: dennispg <dennispg@gmail.com>
Date: Sat, 1 Oct 2016 10:47:22 -0500
Subject: [PATCH 005/245] Update handsontable.d.ts

---
 handsontable/handsontable.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handsontable/handsontable.d.ts b/handsontable/handsontable.d.ts
index 49b4a307a5..e358e32cf9 100644
--- a/handsontable/handsontable.d.ts
+++ b/handsontable/handsontable.d.ts
@@ -292,7 +292,7 @@ declare var Handsontable: {
 };
 
 declare module "handsontable" {
-    export var Handsontable: {
-      new (element: Element, options: ht.Options): ht.Methods;
+    export = {
+      Handsontable: Handsontable
     };
 }

From 8a019fe8a28ee142972d908265705514656cd7f3 Mon Sep 17 00:00:00 2001
From: dennispg <dennispg@gmail.com>
Date: Sat, 1 Oct 2016 10:49:19 -0500
Subject: [PATCH 006/245] Update handsontable.d.ts

---
 handsontable/handsontable.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/handsontable/handsontable.d.ts b/handsontable/handsontable.d.ts
index e358e32cf9..49b4a307a5 100644
--- a/handsontable/handsontable.d.ts
+++ b/handsontable/handsontable.d.ts
@@ -292,7 +292,7 @@ declare var Handsontable: {
 };
 
 declare module "handsontable" {
-    export = {
-      Handsontable: Handsontable
+    export var Handsontable: {
+      new (element: Element, options: ht.Options): ht.Methods;
     };
 }

From e1820ba703d3737bffe54703458dfc078d671b82 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Sun, 2 Oct 2016 09:00:01 -0700
Subject: [PATCH 007/245] [rethinkdb] Fixes r.now() return results

---
 rethinkdb/rethinkdb-tests.ts | 1 +
 rethinkdb/rethinkdb.d.ts     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index 633c82e2ec..a6bc1caadd 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -14,6 +14,7 @@ r.connect({ host: "localhost", port: 28015 }, function(err, conn) {
         users.filter(function(doc?) {
             return doc("henry").eq("bob");
         })
+        .filter(r.row("updatedAt").default(0).lt(r.now().sub(1000)))
         .between("james", "beth")
         .limit(4)
         .run(conn, function(err, cursor) {
diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 6d87eccf50..83576c84ac 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -47,7 +47,7 @@ declare module "rethinkdb" {
     export function row(name: string): Expression<any>;
     export function expr(stuff: any): Expression<any>;
 
-    export function now(): Time;
+    export function now(): Expression<Time>;
 
     // Control Structures
     export function branch(test: Expression<boolean>, trueBranch: Expression<any>, falseBranch: Expression<any>): Expression<any>;

From b416006b7f7e5fcf7c97c79a96da9b0b1f73a687 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Sun, 2 Oct 2016 09:03:25 -0700
Subject: [PATCH 008/245] [rethinkdb] Fixes header

---
 rethinkdb/rethinkdb.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 83576c84ac..6425639c70 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -1,7 +1,5 @@
-//
 // Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
-//
 // Definitions by: Sean Hess <https://seanhess.github.io/>, Alex Gorbatchev <https://github.com/alexgorbatchev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
@@ -12,7 +10,6 @@
 //
 // Testing:
 //   $ tsc --noImplicitAny --module commonjs -p rethinkdb/
-//
 
 /// <reference path="../node/node.d.ts"/>
 

From 625b39c951ef0db7334c8cbb41a025eb642c53ff Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Sun, 2 Oct 2016 09:15:23 -0700
Subject: [PATCH 009/245] [rethinkdb] Updates sub()

---
 rethinkdb/rethinkdb.d.ts | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 6425639c70..782a1df5fd 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -339,7 +339,29 @@ declare module "rethinkdb" {
         le(value: T): Expression<boolean>;
 
         add(n: number): Expression<number>;
-        sub(n: number): Expression<number>;
+
+        /**
+         * Subtract two numbers.
+         *
+         * See: https://rethinkdb.com/api/javascript/sub/
+         *
+         * Example:
+         *
+         *     r.expr(2).sub(2).run(conn, callback)
+         */
+        sub(n: number, ...numbers: number[]): Expression<number>;
+
+        /**
+         * Retrieve how many seconds elapsed between today and `date`.
+         *
+         * See: https://rethinkdb.com/api/javascript/sub/
+         *
+         * Example:
+         *
+         *     r.now().sub(365 * 24 * 60 * 60)
+         */
+        sub(date: Time): Expression<number>;
+
         mul(n: number): Expression<number>;
         div(n: number): Expression<number>;
         mod(n: number): Expression<number>;

From dd6c2c88d7bfcf742fbcfb5f0ca2ebbeab4344a6 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Sun, 2 Oct 2016 11:13:42 -0700
Subject: [PATCH 010/245] [rethinkdb] Fixes dt testing

---
 rethinkdb/rethinkdb-tests.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index a6bc1caadd..3397247854 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -1,3 +1,5 @@
+/// <reference path="./rethinkdb.d.ts"/>
+
 import * as r from "rethinkdb";
 
 r.connect({ host: "localhost", port: 28015 }, function(err, conn) {

From 4601d7808dca83a2b13f90e41b1a892b53eab100 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Sun, 2 Oct 2016 13:12:18 -0700
Subject: [PATCH 011/245] [rethinkdb] Adds hasFields()

---
 rethinkdb/rethinkdb-tests.ts | 25 ++++++++++++++++++++-----
 rethinkdb/rethinkdb.d.ts     | 36 +++++++++++++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 10 deletions(-)

diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index 3397247854..edfc5cc485 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -2,17 +2,27 @@
 
 import * as r from "rethinkdb";
 
-r.connect({ host: "localhost", port: 28015 }, function(err, conn) {
+function errorAndCursorCallback(err: Error, cursor: r.Cursor): void {}
+function cursorCallback(cursor: r.Cursor): void {}
+
+r.connect({ host: "localhost", port: 28015 }, function(err: Error, conn: r.Connection) {
     console.log("HI", err, conn);
 
     const testDb = r.db("test");
 
+    r.table("players").hasFields("games_won").run(conn, errorAndCursorCallback);
+    r.table("players").hasFields({ "games_won": { "championships": true } }).run(conn, errorAndCursorCallback);
+    r.table("players").filter(r.row.hasFields("games_won").not()).run(conn, errorAndCursorCallback);
+    r.table("players").filter(r.row.hasFields({ "games_won": { "championships": true } }).not()).run(conn, errorAndCursorCallback);
+
     testDb.tableCreate("users").run(conn, function(err, stuff) {
         const users = testDb.table("users");
 
         users.insert({ name: "bob" }).run(conn, function() {
         });
 
+        users.hasFields("foo_bar").run(conn, () => {});
+
         users.filter(function(doc?) {
             return doc("henry").eq("bob");
         })
@@ -36,12 +46,17 @@ r.connect({ host: "localhost", port: 28015 }, function(err, conn) {
 });
 
 // use promises instead of callbacks
-r.connect({ host: "localhost", port: 28015 }).then(function(conn) {
+r.connect({ host: "localhost", port: 28015 }).then(function(conn: r.Connection) {
     console.log("HI", conn);
 
     const testDb = r.db("test");
 
-    testDb.tableCreate("users").run(conn).then(function(stuff) {
+    r.table("players").hasFields("games_won").run(conn).then(cursorCallback);
+    r.table("players").hasFields({ "games_won": { "championships": true } }).run(conn).then(cursorCallback);
+    r.table("players").filter(r.row.hasFields("games_won").not()).run(conn).then(cursorCallback);
+    r.table("players").filter(r.row.hasFields({ "games_won": { "championships": true } }).not()).run(conn).then(cursorCallback);
+
+    testDb.tableCreate("users").run(conn).then(function() {
         const users = testDb.table("users");
 
         users.insert({ name: "bob" }).run(conn, function() {
@@ -53,8 +68,8 @@ r.connect({ host: "localhost", port: 28015 }).then(function(conn) {
         .between("james", "beth")
         .limit(4)
         .run(conn)
-        .then(cursor => {
-          cursor.toArray().then(rows => {
+        .then((cursor: r.Cursor) => {
+          cursor.toArray().then((rows: any[]) => {
             console.log(rows);
           });
         });
diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 782a1df5fd..4c2a9ddb96 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -41,7 +41,7 @@ declare module "rethinkdb" {
     export function sum(prop: string): Aggregator;
     export function avg(prop: string): Aggregator;
 
-    export function row(name: string): Expression<any>;
+    export const row: Row;
     export function expr(stuff: any): Expression<any>;
 
     export function now(): Expression<Time>;
@@ -79,6 +79,10 @@ declare module "rethinkdb" {
         close(): Promise<void>;
     }
 
+    interface Row extends Expression<any> {
+      (name: string): Expression<any>;
+    }
+
     /**
      * Connection options.
      *
@@ -199,7 +203,27 @@ declare module "rethinkdb" {
         includeTypes: boolean;
     }
 
-    interface Table extends Sequence {
+    interface HasFields<T> {
+        /**
+         * Test if an object has one or more fields. An object has a field if it has that key and the key has a non-null value.
+         *
+         * `hasFields` lets you test for nested fields in objects. If the value of a field is itself a set of key/value pairs, you can test for the presence of specific keys.
+         *
+         * See: https://rethinkdb.com/api/javascript/has_fields/
+         */
+        hasFields(selector: BooleanMap): T;
+
+        /**
+         * Test if an object has one or more fields. An object has a field if it has that key and the key has a non-null value. For instance, the object `{'a': 1,'b': 2,'c': null}` has the fields `a` and `b`.
+         *
+         * When applied to a single object, `hasFields` returns `true` if the object has the fields and `false` if it does not. When applied to a sequence, it will return a new sequence (an array or stream) containing the elements that have the specified fields.
+         *
+         * See: https://rethinkdb.com/api/javascript/has_fields/
+         */
+        hasFields(...fields: string[]): T;
+    }
+
+    interface Table extends Sequence, HasFields<Sequence> {
         indexCreate(name: string, index?: ExpressionFunction<any>): Operation<CreateResult>;
         indexDrop(name: string): Operation<DropResult>;
         indexList(): Operation<string[]>;
@@ -321,7 +345,11 @@ declare module "rethinkdb" {
         right_bound?: string; // 'open'
     }
 
-    interface Expression<T> extends Writeable, Operation<T> {
+    interface BooleanMap {
+      [ key: string ]: Boolean | BooleanMap;
+    }
+
+    interface Expression<T> extends Writeable, Operation<T>, HasFields<Expression<number>> {
         (prop: string): Expression<any>;
         merge(query: Expression<Object>): Expression<Object>;
         append(prop: string): Expression<Object>;
@@ -366,8 +394,6 @@ declare module "rethinkdb" {
         div(n: number): Expression<number>;
         mod(n: number): Expression<number>;
 
-        hasFields(...fields: string[]): Expression<boolean>;
-
         default(value: T): Expression<T>;
     }
 

From 69edec5c4dcffec6211ebaf7b39a2a57aa283070 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Sun, 2 Oct 2016 16:59:52 -0700
Subject: [PATCH 012/245] [rethinkdb] Fixes boolean operators

---
 rethinkdb/rethinkdb-tests.ts | 7 +++++++
 rethinkdb/rethinkdb.d.ts     | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/rethinkdb/rethinkdb-tests.ts b/rethinkdb/rethinkdb-tests.ts
index edfc5cc485..06a37eb504 100644
--- a/rethinkdb/rethinkdb-tests.ts
+++ b/rethinkdb/rethinkdb-tests.ts
@@ -15,6 +15,13 @@ r.connect({ host: "localhost", port: 28015 }, function(err: Error, conn: r.Conne
     r.table("players").filter(r.row.hasFields("games_won").not()).run(conn, errorAndCursorCallback);
     r.table("players").filter(r.row.hasFields({ "games_won": { "championships": true } }).not()).run(conn, errorAndCursorCallback);
 
+    r.table("players").filter(
+      r.row.hasFields("games_won").not()
+      .or(r.row("games_won").not().eq(true))
+      .and(true)
+    )
+    .run(conn, errorAndCursorCallback);
+
     testDb.tableCreate("users").run(conn, function(err, stuff) {
         const users = testDb.table("users");
 
diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 4c2a9ddb96..2b65617726 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -355,10 +355,10 @@ declare module "rethinkdb" {
         append(prop: string): Expression<Object>;
         contains(prop: string): Expression<boolean>;
 
-        and(b: boolean): Expression<boolean>;
-        or(b: boolean): Expression<boolean>;
-        eq(v: any): Expression<boolean>;
-        ne(v: any): Expression<boolean>;
+        and(b: boolean | Expression<boolean>): Expression<boolean>;
+        or(b: boolean | Expression<boolean>): Expression<boolean>;
+        eq(v: any | Expression<any>): Expression<boolean>;
+        ne(v: any | Expression<any>): Expression<boolean>;
         not(): Expression<boolean>;
 
         gt(value: T): Expression<boolean>;

From 37beef5c622f308a11147d6b6bd09079acd52342 Mon Sep 17 00:00:00 2001
From: Alex Gorbatchev <alex.gorbatchev@gmail.com>
Date: Mon, 3 Oct 2016 09:48:21 -0700
Subject: [PATCH 013/245] [rethinkdb] Removing @seanhess as author

---
 rethinkdb/rethinkdb.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rethinkdb/rethinkdb.d.ts b/rethinkdb/rethinkdb.d.ts
index 2b65617726..9dd6437ca1 100644
--- a/rethinkdb/rethinkdb.d.ts
+++ b/rethinkdb/rethinkdb.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for RethinkDB 2.3
 // Project: http://rethinkdb.com/
-// Definitions by: Sean Hess <https://seanhess.github.io/>, Alex Gorbatchev <https://github.com/alexgorbatchev>
+// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 //
 // Reference: https://rethinkdb.com/api/javascript/

From 5724f1fe4dced577bb82950b81e32a5397b8aad4 Mon Sep 17 00:00:00 2001
From: Artur Eshenbrener <strate@yandex.ru>
Date: Wed, 5 Oct 2016 12:58:41 +0300
Subject: [PATCH 014/245] bluebird: more strict .catch definitions

---
 bluebird/bluebird-tests.ts | 11 +++++++++++
 bluebird/bluebird.d.ts     | 13 +++++++++----
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index d7995438c1..7970ee0fe5 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -338,6 +338,17 @@ fooOrBarProm = fooProm.caught(Promise.CancellationError, (reason: any) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+{
+	class CustomError extends Error {
+		public customField: number;
+	}
+	fooProm = fooProm.catch(CustomError, reason => {
+		let a: number = reason.customField
+	})
+}
+
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+
 barProm = fooProm.error((reason: any) => {
 	return bar;
 });
diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index 3dc66b78f0..6562046138 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -71,14 +71,19 @@ class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R> {
    */
   catch(predicate: (error: any) => boolean, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
   caught(predicate: (error: any) => boolean, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  
   catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   caught<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  catch(ErrorClass: Function, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  caught(ErrorClass: Function, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  catch<U>(ErrorClass: Function, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  caught<U>(ErrorClass: Function, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  
+  catch<E>(ErrorClass: new () => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  caught<E>(ErrorClass: new () => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+
+  catch<E, U>(ErrorClass: new () => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  caught<E, U>(ErrorClass: new () => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  
   catch(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
   caught(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  
   catch<U>(predicate: Object, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   caught<U>(predicate: Object, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
 

From f584d8748ce314643c01eaa84e47f8ae04ab38de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6hn?= <m.koehn@mip-consult.de>
Date: Thu, 6 Oct 2016 10:44:01 +0200
Subject: [PATCH 015/245] Definitions for shopify buy.

        * Definitions for shopify buy.
---
 shopify-buy/shopify-buy-tests.ts | 406 +++++++++++++++++++++++++++++++
 shopify-buy/shopify-buy.d.ts     | 377 ++++++++++++++++++++++++++++
 2 files changed, 783 insertions(+)
 create mode 100644 shopify-buy/shopify-buy-tests.ts
 create mode 100644 shopify-buy/shopify-buy.d.ts

diff --git a/shopify-buy/shopify-buy-tests.ts b/shopify-buy/shopify-buy-tests.ts
new file mode 100644
index 0000000000..3d8d1f5988
--- /dev/null
+++ b/shopify-buy/shopify-buy-tests.ts
@@ -0,0 +1,406 @@
+/// <reference path="shopify-buy.d.ts" />
+/// <reference path="../jquery/jquery.d.ts" />
+
+/* Build new ShopifyBuy client
+============================================================ */
+let client = ShopifyBuy.buildClient({
+    apiKey: 'bf081e860bc9dc1ce0654fdfbc20892d',
+    myShopifyDomain: 'embeds',
+    appId: '6'
+});
+
+var product : ShopifyBuy.Shopify.ProductModel;
+var cart : ShopifyBuy.Shopify.CartModel;
+var cartLineItemCount : number;
+if(localStorage.getItem('lastCartId')) {
+    client.fetchCart(localStorage.getItem('lastCartId')).then(function(remoteCart : ShopifyBuy.Shopify.CartModel) {
+        cart = remoteCart;
+        cartLineItemCount = cart.lineItems.length;
+        renderCartItems();
+    });
+} else {
+    client.createCart().then(function (newCart : ShopifyBuy.Shopify.CartModel) {
+        cart = newCart;
+        localStorage.setItem('lastCartId', ""+cart.id);
+        cartLineItemCount = 0;
+    });
+}
+
+var previousFocusItem : any;
+
+/* Fetch product and init
+============================================================ */
+client.fetchProduct('3614436099').then(function (fetchedProduct : ShopifyBuy.Shopify.ProductModel) {
+    product = fetchedProduct;
+    var selectedVariant : ShopifyBuy.Shopify.ProductVariantModel = product.selectedVariant;
+    var selectedVariantImage : any = product.selectedVariantImage;
+    var currentOptions : ShopifyBuy.Shopify.Option[] = product.options;
+
+    var variantSelectors = generateSelectors(product);
+    $('.variant-selectors').html(""+variantSelectors);
+
+    updateProductTitle(product.title);
+    updateVariantImage(selectedVariantImage);
+    updateVariantTitle(selectedVariant);
+    updateVariantPrice(selectedVariant);
+    attachOnVariantSelectListeners(product);
+    updateCartTabButton();
+    bindEventListeners();
+});
+
+/* Generate DOM elements for variant selectors
+============================================================ */
+function generateSelectors(product : ShopifyBuy.Shopify.ProductModel) {
+    var elements = product.options.map(function(option : ShopifyBuy.Shopify.Option) {
+        var optionsHtml = option.values.map(function(value : any) {
+            return '<option value="' + value + '">' + value + '</option>';
+        });
+
+        return '<div class="shopify-select">\
+                <select class="select" name="' + option.name + '">' + optionsHtml + '</select>\
+                <svg class="shopify-select-icon" viewBox="0 0 24 24"><path d="M21 5.176l-9.086 9.353L3 5.176.686 7.647 12 19.382 23.314 7.647 21 5.176z"></path></svg>\
+                </div>'
+    });
+    return elements;
+}
+
+/* Bind Event Listeners
+============================================================ */
+function bindEventListeners() {
+    /* cart close button listener */
+    $('.cart .btn--close').on('click', closeCart);
+
+    /* click away listener to close cart */
+    $(document).on('click', function(evt) {
+        if((!$(evt.target).closest('.cart').length) && (!$(evt.target).closest('.js-prevent-cart-listener').length)) {
+        closeCart();
+        }
+    });
+
+    /* escape key handler */
+    var ESCAPE_KEYCODE = 27;
+    $(document).on('keydown', function (evt) {
+        if (evt.which === ESCAPE_KEYCODE) {
+        if (previousFocusItem) {
+            $(previousFocusItem).focus();
+            previousFocusItem = ''
+        }
+        closeCart();
+        }
+    });
+
+    /* checkout button click listener */
+    $('.btn--cart-checkout').on('click', function () {
+        window.open(cart.checkoutUrl, '_self');
+    });
+
+    /* buy button click listener */
+    $('.buy-button').on('click', buyButtonClickHandler);
+
+    /* increment quantity click listener */
+    $('.cart').on('click', '.quantity-increment', function () {
+        var variantId = $(this).data('variant-id');
+        incrementQuantity(variantId);
+    });
+
+    /* decrement quantity click listener */
+    $('.cart').on('click', '.quantity-decrement', function() {
+        var variantId = $(this).data('variant-id');
+        decrementQuantity(variantId);
+    });
+
+    /* update quantity field listener */
+    $('.cart').on('keyup', '.cart-item__quantity', debounce(fieldQuantityHandler, 250));
+
+    /* cart tab click listener */
+    $('.btn--cart-tab').click(function() {
+        setPreviousFocusItem(this);
+        openCart();
+    });
+}
+
+
+/* Variant option change handler
+============================================================ */
+function attachOnVariantSelectListeners(product : ShopifyBuy.Shopify.ProductModel) {
+    $('.variant-selectors').on('change', 'select', function(event) {
+        var $element : any = $(event.target);
+        var name : string = $element.attr('name');
+        var value : string = $element.val();
+        product.options.filter(function(option : ShopifyBuy.Shopify.Option) {
+            return option.name === name;
+        })[0].selected = value;
+
+        var selectedVariant : ShopifyBuy.Shopify.ProductVariantModel = product.selectedVariant;
+        var selectedVariantImage : any = product.selectedVariantImage;
+        updateProductTitle(product.title);
+        updateVariantImage(selectedVariantImage);
+        updateVariantTitle(selectedVariant);
+        updateVariantPrice(selectedVariant);
+    });
+}
+
+/* Update product title
+============================================================ */
+function updateProductTitle(title : string) {
+    $('#buy-button-1 .product-title').text(title);
+}
+
+/* Update product image based on selected variant
+============================================================ */
+function updateVariantImage(image : any) {
+    var src = (image) ? image.src : ShopifyBuy.NO_IMAGE_URI;
+
+    $('#buy-button-1 .variant-image').attr('src', src);
+}
+
+/* Update product variant title based on selected variant
+============================================================ */
+function updateVariantTitle(variant : ShopifyBuy.Shopify.ProductVariantModel) {
+    $('#buy-button-1 .variant-title').text(variant.title);
+}
+
+/* Update product variant price based on selected variant
+============================================================ */
+function updateVariantPrice(variant : ShopifyBuy.Shopify.ProductVariantModel) {
+    $('#buy-button-1 .variant-price').text('$' + variant.price);
+}
+
+/* Attach and control listeners onto buy button
+============================================================ */
+function buyButtonClickHandler(evt : any) {
+    evt.preventDefault();
+    var id : string | number = product.selectedVariant.id;
+    var quantity : number;
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(id);
+
+    quantity = cartLineItem ? cartLineItem.quantity + 1 : 1;
+
+    addOrUpdateVariant(product.selectedVariant, quantity);
+    setPreviousFocusItem(evt.target);
+    $('#checkout').focus();
+}
+
+/* Update product variant quantity in cart
+============================================================ */
+function updateQuantity(fn : Function, variantId : string | number) {
+    var variant : ShopifyBuy.Shopify.ProductVariantModel = product.variants.filter(function (variant : ShopifyBuy.Shopify.ProductVariantModel) {
+        return (variant.id === variantId);
+    })[0];
+    var quantity : number;
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(variant.id);
+    if (cartLineItem) {
+        quantity = fn(cartLineItem.quantity);
+        updateVariantInCart(cartLineItem, quantity);
+    }
+}
+
+/* Decrease quantity amount by 1
+============================================================ */
+function decrementQuantity(variantId : string | number) {
+    updateQuantity(function(quantity : number) {
+        return quantity - 1;
+    }, variantId);
+}
+
+/* Increase quantity amount by 1
+============================================================ */
+function incrementQuantity(variantId : string | number) {
+    updateQuantity(function(quantity : number) {
+        return quantity + 1;
+    }, variantId);
+}
+
+/* Update product variant quantity in cart through input field
+============================================================ */
+function fieldQuantityHandler(evt : any) {
+    var variantId : string | number = parseInt($(this).closest('.cart-item').attr('data-variant-id'), 10);
+    var variant : ShopifyBuy.Shopify.ProductVariantModel = product.variants.filter(function (variant : ShopifyBuy.Shopify.ProductVariantModel) {
+        return (variant.id === variantId);
+    })[0];
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(variant.id);
+    var quantity : number = evt.target.value;
+    if (cartLineItem) {
+        updateVariantInCart(cartLineItem, quantity);
+    }
+}
+
+/* Debounce taken from _.js
+============================================================ */
+function debounce(func : any, wait : number, immediate? : number) {
+    var timeout : number;
+    return function() {
+        var context = this, args = arguments;
+        var later = function() {
+        timeout = null;
+        if (!immediate) func.apply(context, args);
+        };
+        var callNow = immediate && !timeout;
+        clearTimeout(timeout);
+        timeout = setTimeout(later, wait);
+        if (callNow) func.apply(context, args);
+    }
+}
+
+/* Open Cart
+============================================================ */
+function openCart() {
+    $('.cart').addClass('js-active');
+}
+
+/* Close Cart
+============================================================ */
+function closeCart() {
+    $('.cart').removeClass('js-active');
+    $('.overlay').removeClass('js-active');
+}
+
+/* Find Cart Line Item By Variant Id
+============================================================ */
+function findCartItemByVariantId(variantId : string | number) {
+    return cart.lineItems.filter(function (item) {
+        return (item.variant_id === variantId);
+    })[0];
+}
+
+/* Determine action for variant adding/updating/removing
+============================================================ */
+function addOrUpdateVariant(variant : ShopifyBuy.Shopify.ProductVariantModel, quantity : number) {
+    openCart();
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(variant.id);
+
+    if (cartLineItem) {
+        updateVariantInCart(cartLineItem, quantity);
+    } else {
+        addVariantToCart(variant, quantity);
+    }
+
+    updateCartTabButton();
+}
+
+/* Update details for item already in cart. Remove if necessary
+============================================================ */
+function updateVariantInCart(cartLineItem : ShopifyBuy.Shopify.CartLineItem, quantity : number) {
+    var variantId : string | number = cartLineItem.variant_id;
+    var cartLength : number = cart.lineItems.length;
+    cart.updateLineItem(cartLineItem.id, quantity).then(function(updatedCart : ShopifyBuy.Shopify.CartModel) {
+        var $cartItem = $('.cart').find('.cart-item[data-variant-id="' + variantId + '"]');
+        if (updatedCart.lineItems.length >= cartLength) {
+            $cartItem.find('.cart-item__quantity').val(cartLineItem.quantity);
+            $cartItem.find('.cart-item__price').text(formatAsMoney(cartLineItem.line_price));
+        } else {
+            $cartItem.addClass('js-hidden').bind('transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd', function() {
+                $cartItem.remove();
+            });
+        }
+
+        updateCartTabButton();
+        updateTotalCartPricing();
+        if (updatedCart.lineItems.length < 1) {
+            closeCart();
+        }
+    }).catch(function (errors : string) {
+        console.log('Fail');
+        console.error(errors);
+    });
+}
+
+/* Add 'quantity' amount of product 'variant' to cart
+============================================================ */
+function addVariantToCart(variant : ShopifyBuy.Shopify.ProductVariantModel, quantity : number) {
+    openCart();
+
+    cart.addVariants({ variant: variant, quantity: quantity }).then(function() {
+        var cartItem : ShopifyBuy.Shopify.CartLineItem = cart.lineItems.filter(function (item : ShopifyBuy.Shopify.CartLineItem ) {
+            return (item.variant_id === variant.id);
+        })[0];
+        var $cartItem = renderCartItem(cartItem);
+        var $cartItemContainer = $('.cart-item-container');
+        $cartItemContainer.append($cartItem);
+        setTimeout(function () {
+            $cartItemContainer.find('.js-hidden').removeClass('js-hidden');
+        }, 0)
+
+    }).catch(function (errors : string) {
+        console.log('Fail');
+        console.error(errors);
+    });
+
+    updateTotalCartPricing();
+    updateCartTabButton();
+}
+
+/* Return required markup for single item rendering
+============================================================ */
+function renderCartItem(lineItem : ShopifyBuy.Shopify.CartLineItem) {
+    var lineItemEmptyTemplate = $('#CartItemTemplate').html();
+    var $lineItemTemplate = $(lineItemEmptyTemplate);
+    var itemImage = lineItem.image.src;
+    $lineItemTemplate.attr('data-variant-id', lineItem.variant_id);
+    $lineItemTemplate.addClass('js-hidden');
+    $lineItemTemplate.find('.cart-item__img').css('background-image', 'url(' + itemImage + ')');
+    $lineItemTemplate.find('.cart-item__title').text(lineItem.title);
+    $lineItemTemplate.find('.cart-item__variant-title').text(lineItem.variant_title);
+    $lineItemTemplate.find('.cart-item__price').text(formatAsMoney(lineItem.line_price));
+    $lineItemTemplate.find('.cart-item__quantity').attr('value', lineItem.quantity);
+    $lineItemTemplate.find('.quantity-decrement').attr('data-variant-id', lineItem.variant_id);
+    $lineItemTemplate.find('.quantity-increment').attr('data-variant-id', lineItem.variant_id);
+
+    return $lineItemTemplate;
+}
+
+/* Render the line items currently in the cart
+============================================================ */
+function renderCartItems() {
+    var $cartItemContainer = $('.cart-item-container');
+    $cartItemContainer.empty();
+    var lineItemEmptyTemplate = $('#CartItemTemplate').html();
+    var $cartLineItems = cart.lineItems.map(function (lineItem, index) {
+        return renderCartItem(lineItem);
+    });
+    $cartItemContainer.append($cartLineItems);
+
+    setTimeout(function () {
+        $cartItemContainer.find('.js-hidden').removeClass('js-hidden');
+    }, 0)
+    updateTotalCartPricing();
+}
+
+/* Update Total Cart Pricing
+============================================================ */
+function updateTotalCartPricing() {
+    $('.cart .pricing').text(formatAsMoney(cart.subtotal));
+}
+
+/* Format amount as currency
+============================================================ */
+function formatAsMoney(amount : string, currency? : string, thousandSeparator? : string, decimalSeparator? : string , localeDecimalSeparator? : string) {
+    currency = currency || '$';
+    thousandSeparator = thousandSeparator || ',';
+    decimalSeparator = decimalSeparator || '.';
+    localeDecimalSeparator = localeDecimalSeparator || '.';
+    var regex = new RegExp('(\\d)(?=(\\d{3})+\\.)', 'g');
+
+    return currency + parseFloat(amount).toFixed(2)
+        .replace(localeDecimalSeparator, decimalSeparator)
+        .replace(regex, '$1' + thousandSeparator)
+        .toString();
+}
+
+/* Update cart tab button
+============================================================ */
+function updateCartTabButton() {
+    if (cart.lineItems.length > 0) {
+        $('.btn--cart-tab .btn__counter').html(""+cart.lineItemCount);
+        $('.btn--cart-tab').addClass('js-active');
+    } else {
+        $('.btn--cart-tab').removeClass('js-active');
+        $('.cart').removeClass('js-active');
+    }
+}
+
+/* Set previously focused item for escape handler
+============================================================ */
+function setPreviousFocusItem(item : ShopifyBuy.Shopify.CartLineItem) {
+    previousFocusItem = item;
+}
diff --git a/shopify-buy/shopify-buy.d.ts b/shopify-buy/shopify-buy.d.ts
new file mode 100644
index 0000000000..afcff03c0a
--- /dev/null
+++ b/shopify-buy/shopify-buy.d.ts
@@ -0,0 +1,377 @@
+// // Type definitions for shopify-buy
+// // Project: http://shopify.github.io/js-buy-sdk/api/
+// // Definitions by: Martin Köhn <[https://github.com/openminder]>
+// // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../core-js/core-js.d.ts" />
+
+/**
+ * The JS Buy SDK is a lightweight library that allows you to build ecommerce into any website.
+ * It is based on Shopify’s API and provides the ability to retrieve products and collections from your shop,
+ * add products to a cart, and checkout.
+ */
+declare namespace ShopifyBuy {
+    /**
+     * Create a ShopClient. This is the main entry point to the SDK.
+     */
+    export function buildClient(configAttrs : Shopify.Config) : Shopify.ShopClient
+
+    /**
+     * Internal Image description
+     */
+    interface Image {
+        id : string|number
+        src : string
+        position : number
+        product_id : string
+        variant_ids : Array<string>
+        created_at : string
+        updated_at : string
+    }
+
+    /**
+     * Internal BaseModel class
+     */
+    class BaseModel {
+        constructor( attrs: any, metaAttrs: any )
+
+        attrs : any
+        serializer: any
+        adapter: any
+        shopClient: any
+    }
+
+    var NO_IMAGE_URI : string;
+
+    /**
+     * This namespace contains all globally accessible classes
+     */
+    export namespace Shopify {
+
+        /**
+         * Base Shopify Client config object
+         */
+        interface Config
+        {
+            /**
+             *  Your api client's public token.
+             */
+            apiKey: string
+
+            /** The app whose listings the client will be using.
+             * If you are just modifying a buy button, the buy-button's app id is.
+             * Otherwise, obtain the app id of the app you're modifying or extending.
+             */
+            appId: string
+
+            /** You shop's myshopify.com domain. */
+            myShopifyDomain: string
+        }
+
+        /**
+         * Cart item, that should be added to the card
+         */
+        interface CartModelItem {
+            variant : Shopify.ProductVariantModel
+            quantity : number
+        }
+
+        class CartLineItem extends BaseModel {
+          constructor()
+
+          /**
+           * Line item unique ID
+           */
+          id : string|number
+
+          /**
+           * Images associated with product.
+           */
+          image : Image
+
+          /**
+           * Product title
+           */
+          title: string
+
+          /**
+           * ID of selected variant
+           */
+          variant_id: string|number
+
+          /**
+           * Title of selected variant
+           */
+          variant_title: string
+
+          /**
+           * Number of selected items
+           */
+          quantity : number
+
+          /**
+           * Variant weight in grams
+           */
+          grams: number
+
+          /**
+           * ID of selected product
+           */
+          product_id: string|number
+
+          /**
+           * Price of variant, formatted as currency
+           */
+          price: string
+
+          /**
+           * Compare at price for variant formatted as currency.
+           */
+          compare_at_price: string
+
+          /**
+           * Calculated price for the number of variant in card
+           */
+          line_price: string
+
+        }
+
+        /**
+         * Shopify-Buy-SDK Client to handle products and cart
+         */
+        class ShopClient {
+
+            /**
+             * Config data to be used throughout all API interaction
+             */
+            constructor( config? : Config )
+            /**
+             * Creates a CartModel instance, optionally including attrs.
+             */
+            createCart(attrs? : any) : Promise<CartModel>
+
+            /**
+             * Updates an existing CartModel instance and persists it to localStorage.
+             */
+            updateCart(attrs? : any) : Promise<CartModel>
+
+            /**
+             * Retrieve a previously created cart by its key.
+             */
+            fetchCart(id : string) : Promise<CartModel>
+
+            /**
+             * Fetch one collection by its ID.
+             */
+            fetchCollection(id : string|number) : Promise<any> //TODO: Find declaration for Collection
+
+            /**
+             * Fetch one product by its ID.
+             */
+            fetchProduct(id: string|number) : Promise<ProductModel>
+
+            /**
+             * Fetches a list of collections matching a specified query.
+             */
+            fetchQueryCollections(query? : any) : Promise<Array<any>>
+
+            /**
+             * Fetches a list of products matching a specified query.
+             */
+            fetchQueryProducts(query? : any) : Promise<Array<ProductModel>>
+
+        }
+
+        /**
+         * Class for cart model
+         */
+        class CartModel extends BaseModel {
+
+            constructor()
+
+            /**
+             * Get checkout URL for current cart
+             */
+            checkoutUrl : string
+
+            /**
+             * get ID for current cart
+             */
+            id : string|number
+
+            /**
+             * Get current line items for cart
+             */
+            lineItems : Array<CartLineItem>
+
+            /**
+             * Get current subtotal price for all line items
+             */
+            subtotal: string
+
+            /**
+             * Gets the sum quantity of each line item
+             */
+            lineItemCount : number
+
+            /**
+             * Add items to cart. Updates cart's lineItems
+             */
+            addVariants(item : CartModelItem, nextItem? : Array<CartModelItem>) : Promise<CartModel>
+
+            /**
+             * Remove all line items from cart
+             */
+            clearLineItems() : Promise<CartModel>
+
+            /**
+             * Remove line item from cart
+             */
+            removeLineItem(id : string|number) : Promise<CartModel>
+
+            /**
+             * Update line item quantity
+             */
+            updateLineItem(id : string|number, quantitiy : number ) : Promise<CartModel>
+
+        }
+
+        /**
+         * Class for products returned by fetch('product')
+         */
+        class ProductModel extends BaseModel {
+
+            constructor()
+
+            /**
+             * Product unique ID
+             */
+            id : string|number
+
+            /**
+             * All images associated with product.
+             */
+            images : Array<Image>
+
+            /**
+             * Product title
+             */
+            title: string
+
+            /**
+             * All variants of a product.
+             */
+            variants: Array<ProductVariantModel>
+
+            /**
+             * Get array of options with nested values. Useful for creating UI for selecting options.
+             */
+            options : Array<Option>
+
+            /**
+             * Retrieve variant for currently selected options
+             */
+            selectedVariant : ProductVariantModel
+
+            /**
+             * Retrieve image for currently selected variantImage
+             */
+            selectedVariantImage : Image
+
+            /**
+             * Retrieve currently selected option values.
+             */
+            selections : Option
+        }
+
+        /**
+         * Model for product variant
+         */
+        class ProductVariantModel extends BaseModel {
+
+            constructor()
+
+            /*
+             * Checkout URL for purchasing variant with quantity.
+             */
+            checkoutUrl( quantitiy : number ) : string
+
+            /**
+             * Compare at price for variant formatted as currency.
+             */
+            compareAtPrice : string
+
+            /**
+             * Variant weight in grams
+             */
+            grams : number
+
+            /**
+             * Variant unique ID
+             */
+            id : string|number
+
+            /**
+             * Image for variant
+             */
+            image : Image
+
+            /**
+             * Option values associated with this variant, ex {name: "color", value: "Blue"}
+            */
+            optionValues : Array<Option>
+
+            /**
+             * Price of variant, formatted as currency
+             */
+            price : string
+
+            /**
+             * ID of product variant belongs to
+             */
+            productId : string|number
+
+            /**
+             * Title of product variant belongs to
+             */
+            productTitle : string
+
+            /**
+             * Title of variant
+             */
+            title: string
+        }
+
+        /**
+         * Class for product option
+         */
+        class Option extends BaseModel {
+
+            constructor()
+
+            /**
+             * name of option (ex. "Size", "Color")
+             */
+            name: string
+
+            /**
+             * get/set selected option value (ex. "Large").
+             * Setting this will update the selected value on the model.
+             * Throws {Error} if setting selected to value that does not exist for option
+             */
+            selected : string
+
+            /**
+             * possible values for selection
+             */
+            values : Array<any>
+
+        }
+
+    }
+
+}
+
+declare module "ShopifyBuy" {
+    export = ShopifyBuy
+}

From 14688c8f4e60ca30eee56ea03c3918429316c7aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6hn?= <m.koehn@mip-consult.de>
Date: Thu, 6 Oct 2016 11:05:23 +0200
Subject: [PATCH 016/245] fix header format and remove core-js reference

---
 shopify-buy/shopify-buy.d.ts | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/shopify-buy/shopify-buy.d.ts b/shopify-buy/shopify-buy.d.ts
index afcff03c0a..18c9358b3b 100644
--- a/shopify-buy/shopify-buy.d.ts
+++ b/shopify-buy/shopify-buy.d.ts
@@ -1,9 +1,7 @@
-// // Type definitions for shopify-buy
-// // Project: http://shopify.github.io/js-buy-sdk/api/
-// // Definitions by: Martin Köhn <[https://github.com/openminder]>
-// // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../core-js/core-js.d.ts" />
+// Type definitions for shopify-buy
+// Project: http://shopify.github.io/js-buy-sdk/api/
+// Definitions by: Martin Köhn <https://github.com/openminder>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
  * The JS Buy SDK is a lightweight library that allows you to build ecommerce into any website.

From e4e75c6498001bf2f5e48386c9682a3054650e06 Mon Sep 17 00:00:00 2001
From: Rogier Schouten <r.schouten@spiritit.com>
Date: Thu, 6 Oct 2016 11:33:29 +0200
Subject: [PATCH 017/245] resemblejs typings did not work at all

---
 resemblejs/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/resemblejs/index.d.ts b/resemblejs/index.d.ts
index 7b1801ad35..69c3356797 100644
--- a/resemblejs/index.d.ts
+++ b/resemblejs/index.d.ts
@@ -95,3 +95,7 @@ declare namespace Resemble {
 }
 
 declare var resemble: Resemble.ResembleStatic;
+
+declare module "resemblejs" {
+  export = resemble;
+}

From 491d5379dca729dd76097f11931d37afe81e1b37 Mon Sep 17 00:00:00 2001
From: Rogier Schouten <r.schouten@spiritit.com>
Date: Fri, 7 Oct 2016 09:53:56 +0200
Subject: [PATCH 018/245] process review comment

---
 resemblejs/index.d.ts | 31 +++++++++++++------------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/resemblejs/index.d.ts b/resemblejs/index.d.ts
index 69c3356797..166beb186b 100644
--- a/resemblejs/index.d.ts
+++ b/resemblejs/index.d.ts
@@ -3,18 +3,19 @@
 // Definitions by: Tim Perry <https://github.com/pimterry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace Resemble {
-  interface ResembleStatic {
-    /**
-     * Retrieve basic analysis for a single image (add compareTo to compare with another).
-     */
-    (image: string|ImageData): ResembleAnalysis;
+export = Resemble;
+export as namespace resemble;
 
-    /**
-     * Set the resemblance image output style
-     */
-    outputSettings(settings: OutputSettings): ResembleStatic;
-  }
+/**
+ * Retrieve basic analysis for a single image (add compareTo to compare with another).
+ */
+declare function Resemble(image: string | ImageData): Resemble.ResembleAnalysis;
+
+declare namespace Resemble {
+  /**
+   * Set the resemblance image output style
+   */
+  function outputSettings(settings: OutputSettings): typeof Resemble;
 
   interface OutputSettings {
     errorColor: {
@@ -36,7 +37,7 @@ declare namespace Resemble {
     /**
      * Compare this image to another image, to get resemblance data
      */
-    compareTo(fileData: string|ImageData): ResembleComparison;
+    compareTo(fileData: string | ImageData): ResembleComparison;
   }
 
   interface ResembleAnalysisResult {
@@ -93,9 +94,3 @@ declare namespace Resemble {
     analysisTime: number;
   }
 }
-
-declare var resemble: Resemble.ResembleStatic;
-
-declare module "resemblejs" {
-  export = resemble;
-}

From d1d801b96e3c0d36b2c7f2e703c690abd5fc7580 Mon Sep 17 00:00:00 2001
From: Artur Eshenbrener <strate@yandex.ru>
Date: Fri, 7 Oct 2016 11:24:56 +0300
Subject: [PATCH 019/245] Improve catch with constructor filter.

Add arguments to constructor's `new()` signature + tests
---
 bluebird/bluebird-tests.ts | 12 ++++++++++++
 bluebird/bluebird.d.ts     |  8 ++++----
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/bluebird/bluebird-tests.ts b/bluebird/bluebird-tests.ts
index 7970ee0fe5..318e6f8a4c 100644
--- a/bluebird/bluebird-tests.ts
+++ b/bluebird/bluebird-tests.ts
@@ -347,6 +347,18 @@ fooOrBarProm = fooProm.caught(Promise.CancellationError, (reason: any) => {
 	})
 }
 
+{
+	class CustomErrorWithConstructor extends Error {
+		constructor(public arg1: boolean, public arg2: number) {
+			super();
+		};
+	}
+	fooProm = fooProm.catch(CustomErrorWithConstructor, reason => {
+		let a: boolean = reason.arg1;
+		let b: number = reason.arg2;
+	})
+}
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 barProm = fooProm.error((reason: any) => {
diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index 6562046138..5ee5c0cad4 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -75,11 +75,11 @@ class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R> {
   catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   caught<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   
-  catch<E>(ErrorClass: new () => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  caught<E>(ErrorClass: new () => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  catch<E>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  caught<E>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
 
-  catch<E, U>(ErrorClass: new () => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  caught<E, U>(ErrorClass: new () => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  catch<E, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  caught<E, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   
   catch(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
   caught(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;

From 82e9f897d6aeda0dad38be9a6cff35ff421d60ca Mon Sep 17 00:00:00 2001
From: Artur Eshenbrener <strate@yandex.ru>
Date: Fri, 7 Oct 2016 14:41:52 +0300
Subject: [PATCH 020/245] Add type constraint

---
 bluebird/bluebird.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bluebird/bluebird.d.ts b/bluebird/bluebird.d.ts
index 5ee5c0cad4..ca8acb2446 100644
--- a/bluebird/bluebird.d.ts
+++ b/bluebird/bluebird.d.ts
@@ -75,11 +75,11 @@ class Bluebird<R> implements Bluebird.Thenable<R>, Bluebird.Inspection<R> {
   catch<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   caught<U>(predicate: (error: any) => boolean, onReject: (error: any) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   
-  catch<E>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
-  caught<E>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  catch<E extends Error>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
+  caught<E extends Error>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
 
-  catch<E, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
-  caught<E, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  catch<E extends Error, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
+  caught<E extends Error, U>(ErrorClass: new (...args: any[]) => E, onReject: (error: E) => U | Bluebird.Thenable<U>): Bluebird<U | R>;
   
   catch(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;
   caught(predicate: Object, onReject: (error: any) => R | Bluebird.Thenable<R> | void | Bluebird.Thenable<void>): Bluebird<R>;

From 44db8de5cc9377c8e906838b12e4528ec9256a47 Mon Sep 17 00:00:00 2001
From: Artur Eshenbrener <strate@yandex.ru>
Date: Sun, 9 Oct 2016 22:52:37 +0300
Subject: [PATCH 021/245] knex: add missed methods definitions

http://knexjs.org/#Schema-dropUnique
http://knexjs.org/#Schema-dropPrimary
---
 knex/knex-tests.ts | 4 ++++
 knex/knex.d.ts     | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/knex/knex-tests.ts b/knex/knex-tests.ts
index 7ec53cbe3b..b103562b83 100644
--- a/knex/knex-tests.ts
+++ b/knex/knex-tests.ts
@@ -456,6 +456,10 @@ knex.schema.raw("SET sql_mode='TRADITIONAL'")
     table.dropColumn('name');
     table.string('first_name');
     table.string('last_name');
+    table.dropUnique(["name1", "name2"], "index_name");
+    table.dropUnique(["name1", "name2"]);
+    table.dropPrimary();
+    table.dropPrimary("constraint_name");
 });
 
 knex('users')
diff --git a/knex/knex.d.ts b/knex/knex.d.ts
index 9a16d3afc0..c1cf4f6cba 100644
--- a/knex/knex.d.ts
+++ b/knex/knex.d.ts
@@ -382,6 +382,8 @@ declare module "knex" {
       foreign(column: string): ForeignConstraintBuilder;
       foreign(columns: string[]): MultikeyForeignConstraintBuilder;
       dropForeign(columnNames: string[], foreignKeyName?: string): TableBuilder;
+      dropUnique(columnNames: string[], indexName?: string): TableBuilder;
+      dropPrimary(constraintName?: string): TableBuilder;
     }
 
     interface CreateTableBuilder extends TableBuilder {

From 3e13cd8e459f428a6e46d993f853f77394d29d78 Mon Sep 17 00:00:00 2001
From: songawee <dennis@songawee.com>
Date: Thu, 6 Oct 2016 16:45:29 -0600
Subject: [PATCH 022/245] use object type for body in expect fn arguments

---
 supertest/supertest-tests.ts | 18 +++++++++++++-----
 supertest/supertest.d.ts     |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/supertest/supertest-tests.ts b/supertest/supertest-tests.ts
index 5e0de8ad8c..ce01551ef9 100644
--- a/supertest/supertest-tests.ts
+++ b/supertest/supertest-tests.ts
@@ -4,7 +4,7 @@
 import * as supertest from 'supertest';
 import * as express from 'express';
 
-var app = express();
+const app = express();
 
 supertest(app)
   .get('/user')
@@ -16,15 +16,15 @@ supertest(app)
   });
 
 // cookie scenario
-var request = supertest(app);
-var agent = supertest.agent();
+const request = supertest(app);
+const agent = supertest.agent();
 request
   .post('/login')
   .end((err: any, res: supertest.Response) => {
     if (err) throw err;
     agent.saveCookies(res);
 
-    var req = request.get('/admin');
+    const req = request.get('/admin');
     agent.attachCookies(req);
     req.expect(200, (err: any, res: supertest.Response) => {
       if (err) throw err;
@@ -32,7 +32,7 @@ request
   });
 
 // cookie scenario, new version
-var client = supertest.agent(app);
+const client = supertest.agent(app);
 client
   .post('/login')
   .end((err: any, res: supertest.Response) => {
@@ -56,3 +56,11 @@ function hasPreviousAndNextKeys(res: supertest.Response) {
   if (!('next' in res.body)) return "missing next key";
   if (!('prev' in res.body)) throw new Error("missing prev key");
 }
+
+// object expect
+supertest(app)
+  .get('/')
+  .expect(200, { foo: 'bar' })
+  .end((err: any, res: supertest.Response) => {
+    if (err) throw err;
+  });
diff --git a/supertest/supertest.d.ts b/supertest/supertest.d.ts
index 5793483300..7aa5d14d64 100644
--- a/supertest/supertest.d.ts
+++ b/supertest/supertest.d.ts
@@ -23,7 +23,7 @@ declare module "supertest" {
       url: string;
       serverAddress(app: any, path: string): string;
       expect(status: number, callback?: CallbackHandler): this;
-      expect(status: number, body: string, callback?: CallbackHandler): this;
+      expect(status: number, body: any, callback?: CallbackHandler): this;
       expect(body: string, callback?: CallbackHandler): this;
       expect(body: RegExp, callback?: CallbackHandler): this;
       expect(body: Object, callback?: CallbackHandler): this;

From aab1d973640fc22f0ea9f77896ccdfb751d9da5b Mon Sep 17 00:00:00 2001
From: stafford <stafford.williams@gmail.com>
Date: Mon, 10 Oct 2016 12:46:59 +1100
Subject: [PATCH 023/245] return type should be array

---
 greensock/greensock.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/greensock/greensock.d.ts b/greensock/greensock.d.ts
index 95c2ad6a4c..881fb1cd92 100644
--- a/greensock/greensock.d.ts
+++ b/greensock/greensock.d.ts
@@ -161,7 +161,7 @@ declare class TimelineLite extends SimpleTimeline {
     static exportRoot(vars?: Object, omitDelayedCalls?: boolean): TimelineLite;
     from(target: Object, duration: number, vars: Object, position?: any): TimelineLite;
     fromTo(target: Object, duration: number, fromVars: Object, toVars: Object, position?: any): TimelineLite;
-    getChildren(nested?: boolean, tweens?: boolean, timelines?: boolean, ignoreBeforeTime?: number): Tween | Timeline[];
+    getChildren(nested?: boolean, tweens?: boolean, timelines?: boolean, ignoreBeforeTime?: number): (Tween | Timeline)[];
     getLabelTime(label: string): number;
     getTweensOf(target: Object, nested?: boolean): Tween[];
     recent(): Animation;

From 6bd2349f41dd9ea57d326702c2dfbe77fbbc8aa8 Mon Sep 17 00:00:00 2001
From: Rogier Schouten <r.schouten@spiritit.com>
Date: Mon, 10 Oct 2016 09:03:06 +0200
Subject: [PATCH 024/245] fix CI test failure

---
 phantomcss/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/phantomcss/index.d.ts b/phantomcss/index.d.ts
index 48829a1bbe..9f57e26c46 100644
--- a/phantomcss/index.d.ts
+++ b/phantomcss/index.d.ts
@@ -138,7 +138,7 @@ declare namespace PhantomCSS {
         prefixCount?: boolean;
 
         hideElements?: string;
-        outputSettings?: Resemble.OutputSettings;
+        outputSettings?: resemble.OutputSettings;
     }
 
 }

From 103654a0f176545edded86381389dbc1b5baa81f Mon Sep 17 00:00:00 2001
From: Hugo Leclerc <hugal.leclerc@gmail.com>
Date: Tue, 11 Oct 2016 15:44:33 +0200
Subject: [PATCH 025/245] modification of signature of
 async.[any,all,every,...] which actually works with a second callback of type
 (Error,boolean)=>void (async version 2.0.1)

---
 async/async-tests.ts | 40 ++++++++++++++++++++--------------------
 async/async.d.ts     | 18 +++++++++---------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/async/async-tests.ts b/async/async-tests.ts
index 63640cecf6..455ce81d16 100644
--- a/async/async-tests.ts
+++ b/async/async-tests.ts
@@ -4,20 +4,20 @@ var fs, path;
 
 function callback() {}
 
-async.map(['file1', 'file2', 'file3'], fs.stat, function (err, results) { });
-async.mapSeries(['file1', 'file2', 'file3'], fs.stat, function (err, results) { });
-async.mapLimit(['file1', 'file2', 'file3'], 2, fs.stat, function (err, results) { });
+async.map(['file1', 'file2', 'file3'], fs.stat, function (err:Error, results:Array<fs.Stats>) { });
+async.mapSeries(['file1', 'file2', 'file3'], fs.stat, function (err:Error, results:Array<fs.Stats>) { });
+async.mapLimit(['file1', 'file2', 'file3'], 2, fs.stat, function (err:Error, results:Array<fs.Stats>) { });
 
-async.filter(['file1', 'file2', 'file3'], path.exists, function (results) { });
-async.filterSeries(['file1', 'file2', 'file3'], path.exists, function (results) { });
-async.filterLimit(['file1', 'file2', 'file3'], 2, path.exists, function (results) { });
-async.select(['file1', 'file2', 'file3'], path.exists, function (results) { });
-async.selectSeries(['file1', 'file2', 'file3'], path.exists, function (results) { });
-async.selectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (results) { });
+async.filter(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
+async.filterSeries(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
+async.filterLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,results:Array<string>) { });
+async.select(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
+async.selectSeries(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
+async.selectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,results:Array<string>) { });
 
-async.reject(['file1', 'file2', 'file3'], path.exists, function (results) { });
-async.rejectSeries(['file1', 'file2', 'file3'], path.exists, function (results) { });
-async.rejectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (results) { });
+async.reject(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
+async.rejectSeries(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
+async.rejectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,results:Array<string>) { });
 
 async.parallel([
     function () { },
@@ -83,13 +83,13 @@ async.sortBy(['file1', 'file2', 'file3'], function (file, callback) {
     });
 }, function (err, results) { });
 
-async.some(['file1', 'file2', 'file3'], path.exists, function (result) { });
-async.someLimit(['file1', 'file2', 'file3'], 2, path.exists, function (result) { });
-async.any(['file1', 'file2', 'file3'], path.exists, function (result) { });
+async.some(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
+async.someLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,result:boolean) { });
+async.any(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
 
-async.every(['file1', 'file2', 'file3'], path.exists, function (result) { });
-async.everyLimit(['file1', 'file2', 'file3'], 2, path.exists, function (result) { });
-async.all(['file1', 'file2', 'file3'], path.exists, function (result) { });
+async.every(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
+async.everyLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,result:boolean) { });
+async.all(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
 
 async.concat(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { });
 async.concatSeries(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { });
@@ -382,10 +382,10 @@ async.retry({ times: 3, interval: (retryCount) => { return 200 * retryCount; } }
 
 
 async.parallel([
-    function (callback) { },
+    function (callback: ( err:Error, val:string ) => void ) { },
     function (callback) { }
 ],
-function (results) {
+function (err:Error,results:Array<string>) {
     async.series([
         function (callback) { },
         function email_link(callback) { }
diff --git a/async/async.d.ts b/async/async.d.ts
index 96da35c1ea..56388d09f5 100644
--- a/async/async.d.ts
+++ b/async/async.d.ts
@@ -124,15 +124,15 @@ interface Async {
     detectLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<T>): any;
     findLimit: typeof async.detectLimit;
     sortBy<T, V>(arr: T[], iterator: AsyncResultIterator<T, V>, callback?: AsyncResultArrayCallback<T>): any;
-    some<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => void): any;
-    someLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => void): any;
+    some<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
+    someLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
     anyLimit: typeof async.someLimit;
-    someSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => void): any;
+    someSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
     anySeries: typeof async.someSeries;
-    any<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => void): any;
-    every<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => any): any;
-    everyLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => any): any;
-    all<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: (result: boolean) => any): any;
+    any<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
+    every<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
+    everyLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
+    all<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
     concat<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback?: AsyncResultArrayCallback<R>): any;
     concatSeries<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback?: AsyncResultArrayCallback<R>): any;
 
@@ -167,8 +167,8 @@ interface Async {
     nextTick(callback: Function, ...args: any[]): void;
     setImmediate: typeof async.nextTick;
 
-    allLimit<T>(arr: T[], limit: number, iteratee: AsyncBooleanIterator<T>, cb?: (result: boolean) => any) : any;
-    everySeries<T>(arr: T[], iteratee: AsyncBooleanIterator<T>, cb?: (result: boolean) => any) : any
+    allLimit<T>(arr: T[], limit: number, iteratee: AsyncBooleanIterator<T>, cb?: AsyncResultCallback<boolean>) : any;
+    everySeries<T>(arr: T[], iteratee: AsyncBooleanIterator<T>, cb?: AsyncResultCallback<boolean>) : any
     allSeries: typeof async.everySeries;
 
     reflect<T>(fn: AsyncFunction<T>) : (callback: (err: void, result: {error?: Error, value?: T}) => void) => void;

From 72e05196c13ad1ff3976f0e7810b0297bbc9c789 Mon Sep 17 00:00:00 2001
From: Hugo Leclerc <hugal.leclerc@gmail.com>
Date: Tue, 11 Oct 2016 16:03:28 +0200
Subject: [PATCH 026/245] cont mod signature async.[all,every,any,some...] 
 (Error,boolean for the second callback)

---
 async/async-tests.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/async/async-tests.ts b/async/async-tests.ts
index 455ce81d16..bd7fee390a 100644
--- a/async/async-tests.ts
+++ b/async/async-tests.ts
@@ -41,9 +41,9 @@ var openFilesObj = {
     file2: "fileTwo"
 }
 
-var saveFile = function () { }
-async.each(openFiles, saveFile, function (err) { });
-async.eachSeries(openFiles, saveFile, function (err) { });
+var saveFile = function (file:string,cb:(err:Error)=>void) { }
+async.each(openFiles, saveFile, function (err:Error) { });
+async.eachSeries(openFiles, saveFile, function (err:Error) { });
 
 var documents, requestApi;
 async.eachLimit(documents, 20, requestApi, function (err) { });

From d82038ed3d7c8c42e0551d9258115b5bc7558bf7 Mon Sep 17 00:00:00 2001
From: Hugo Leclerc <hugal.leclerc@gmail.com>
Date: Tue, 11 Oct 2016 17:39:26 +0200
Subject: [PATCH 027/245] async: in callbacks args, `err` can be of any type,
 not necessarily `Error` (or `string` as seen before) => use of a generic
 type. Remove `path.exist` from async-test + use of node.d.ts to get the exact
 content of the fs module.

---
 async/async-tests.ts |  54 ++++++-------
 async/async.d.ts     | 182 +++++++++++++++++++++----------------------
 2 files changed, 119 insertions(+), 117 deletions(-)

diff --git a/async/async-tests.ts b/async/async-tests.ts
index bd7fee390a..fa0e49c4c1 100644
--- a/async/async-tests.ts
+++ b/async/async-tests.ts
@@ -1,23 +1,25 @@
 /// <reference path="async.d.ts" />
-
-var fs, path;
+/// <reference path="../node/node.d.ts" />
+import * as fs from "fs";
+// var fs = require("fs");
 
 function callback() {}
+function funcStringCbErrBoolean(v:string, cb:(err:Error,res:boolean) => void) {}
 
 async.map(['file1', 'file2', 'file3'], fs.stat, function (err:Error, results:Array<fs.Stats>) { });
 async.mapSeries(['file1', 'file2', 'file3'], fs.stat, function (err:Error, results:Array<fs.Stats>) { });
 async.mapLimit(['file1', 'file2', 'file3'], 2, fs.stat, function (err:Error, results:Array<fs.Stats>) { });
 
-async.filter(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
-async.filterSeries(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
-async.filterLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,results:Array<string>) { });
-async.select(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
-async.selectSeries(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
-async.selectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,results:Array<string>) { });
+async.filter(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
+async.filterSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
+async.filterLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
+async.select(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
+async.selectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
+async.selectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
 
-async.reject(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
-async.rejectSeries(['file1', 'file2', 'file3'], path.exists, function (err:Error,results:Array<string>) { });
-async.rejectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,results:Array<string>) { });
+async.reject(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
+async.rejectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
+async.rejectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,results:Array<string>) { });
 
 async.parallel([
     function () { },
@@ -73,9 +75,9 @@ async.foldl(numArray, 0, reducer, function (err, result) { });
 async.reduceRight(numArray, 0, reducer, function (err, result) { });
 async.foldr(numArray, 0, reducer, function (err, result) { });
 
-async.detect(['file1', 'file2', 'file3'], path.exists, function (result) { });
-async.detectSeries(['file1', 'file2', 'file3'], path.exists, function (result) { });
-async.detectLimit(['file1', 'file2', 'file3'], 2, path.exists, function (result) { });
+async.detect(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err,result:string) { });
+async.detectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err,result) { });
+async.detectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err,result) { });
 
 async.sortBy(['file1', 'file2', 'file3'], function (file, callback) {
     fs.stat(file, function (err, stats) {
@@ -83,13 +85,13 @@ async.sortBy(['file1', 'file2', 'file3'], function (file, callback) {
     });
 }, function (err, results) { });
 
-async.some(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
-async.someLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,result:boolean) { });
-async.any(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
+async.some(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { });
+async.someLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,result:boolean) { });
+async.any(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { });
 
-async.every(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
-async.everyLimit(['file1', 'file2', 'file3'], 2, path.exists, function (err:Error,result:boolean) { });
-async.all(['file1', 'file2', 'file3'], path.exists, function (err:Error,result:boolean) { });
+async.every(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { });
+async.everyLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err:Error,result:boolean) { });
+async.all(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err:Error,result:boolean) { });
 
 async.concat(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { });
 async.concatSeries(['dir1', 'dir2', 'dir3'], fs.readdir, function (err, files) { });
@@ -107,7 +109,7 @@ async.series([
 ],
 function (err, results) { });
 
-async.series<string>([
+async.series<string,Error>([
     function (callback) {
         callback(null, 'one');
     },
@@ -131,7 +133,7 @@ async.series({
 },
 function (err, results) { });
 
-async.series<number>({
+async.series<number,Error>({
     one: function (callback) {
         setTimeout(function () {
             callback(null, 1);
@@ -171,7 +173,7 @@ async.parallel([
 ],
 function (err, results) { });
 
-async.parallel<string>([
+async.parallel<string,Error>([
     function (callback) {
         setTimeout(function () {
             callback(null, 'one');
@@ -200,7 +202,7 @@ async.parallel({
 },
 function (err, results) { });
 
-async.parallel<number>({
+async.parallel<number,Error>({
     one: function (callback) {
         setTimeout(function () {
             callback(null, 1);
@@ -266,7 +268,7 @@ async.waterfall([
 ], function (err, result) { });
 
 
-var q = async.queue<any>(function (task: any, callback) {
+var q = async.queue<any,Error>(function (task: any, callback) {
     console.log('hello ' + task.name);
     callback();
 }, 2);
@@ -319,7 +321,7 @@ q.resume();
 q.kill();
 
 // tests for strongly typed tasks
-var q2 = async.queue<string>(function (task: string, callback) {
+var q2 = async.queue<string,Error>(function (task: string, callback) {
     console.log('Task: ' + task);
     callback();
 }, 1);
diff --git a/async/async.d.ts b/async/async.d.ts
index 56388d09f5..b6830f9643 100644
--- a/async/async.d.ts
+++ b/async/async.d.ts
@@ -5,20 +5,20 @@
 
 interface Dictionary<T> { [key: string]: T; }
 
-interface ErrorCallback { (err?: Error): void; }
-interface AsyncResultCallback<T> { (err: Error, result: T): void; }
-interface AsyncResultArrayCallback<T> { (err: Error, results: T[]): void; }
-interface AsyncResultObjectCallback<T> { (err: Error, results: Dictionary<T>): void; }
+interface ErrorCallback<T> { (err?: T): void; }
+interface AsyncResultCallback<T, E> { (err: E, result: T): void; }
+interface AsyncResultArrayCallback<T, E> { (err: E, results: T[]): void; }
+interface AsyncResultObjectCallback<T, E> { (err: E, results: Dictionary<T>): void; }
 
-interface AsyncFunction<T> { (callback: (err?: Error, result?: T) => void): void; }
-interface AsyncIterator<T> { (item: T, callback: ErrorCallback): void; }
-interface AsyncForEachOfIterator<T> { (item: T, key: number|string, callback: ErrorCallback): void; }
-interface AsyncResultIterator<T, R> { (item: T, callback: AsyncResultCallback<R>): void; }
-interface AsyncMemoIterator<T, R> { (memo: R, item: T, callback: AsyncResultCallback<R>): void; }
-interface AsyncBooleanIterator<T> { (item: T, callback: (err: string, truthValue: boolean) => void): void; }
+interface AsyncFunction<T, E> { (callback: (err?: E, result?: T) => void): void; }
+interface AsyncIterator<T, E> { (item: T, callback: ErrorCallback<E>): void; }
+interface AsyncForEachOfIterator<T, E> { (item: T, key: number|string, callback: ErrorCallback<E>): void; }
+interface AsyncResultIterator<T, R, E> { (item: T, callback: AsyncResultCallback<R, E>): void; }
+interface AsyncMemoIterator<T, R, E> { (memo: R, item: T, callback: AsyncResultCallback<R, E>): void; }
+interface AsyncBooleanIterator<T, E> { (item: T, callback: (err: E, truthValue: boolean) => void): void; }
 
-interface AsyncWorker<T> { (task: T, callback: ErrorCallback): void; }
-interface AsyncVoidFunction { (callback: ErrorCallback): void; }
+interface AsyncWorker<T, E> { (task: T, callback: ErrorCallback<E>): void; }
+interface AsyncVoidFunction<E> { (callback: ErrorCallback<E>): void; }
 
 interface AsyncQueue<T> {
     length(): number;
@@ -26,10 +26,10 @@ interface AsyncQueue<T> {
     running(): number;
     idle(): boolean;
     concurrency: number;
-    push(task: T, callback?: ErrorCallback): void;
-    push(task: T[], callback?: ErrorCallback): void;
-    unshift(task: T, callback?: ErrorCallback): void;
-    unshift(task: T[], callback?: ErrorCallback): void;
+    push<E>(task: T, callback?: ErrorCallback<E>): void;
+    push<E>(task: T[], callback?: ErrorCallback<E>): void;
+    unshift<E>(task: T, callback?: ErrorCallback<E>): void;
+    unshift<E>(task: T[], callback?: ErrorCallback<E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -51,8 +51,8 @@ interface AsyncPriorityQueue<T> {
     concurrency: number;
     started: boolean;
     paused: boolean;
-    push(task: T, priority: number, callback?: AsyncResultArrayCallback<T>): void;
-    push(task: T[], priority: number, callback?: AsyncResultArrayCallback<T>): void;
+    push<E>(task: T, priority: number, callback?: AsyncResultArrayCallback<T, E>): void;
+    push<E>(task: T[], priority: number, callback?: AsyncResultArrayCallback<T, E>): void;
     saturated: () => any;
     empty: () => any;
     drain: () => any;
@@ -88,104 +88,104 @@ interface AsyncCargo {
 interface Async {
 
     // Collections
-    each<T>(arr: T[], iterator: AsyncIterator<T>, callback?: ErrorCallback): void;
-    eachSeries<T>(arr: T[], iterator: AsyncIterator<T>, callback?: ErrorCallback): void;
-    eachLimit<T>(arr: T[], limit: number, iterator: AsyncIterator<T>, callback?: ErrorCallback): void;
-    forEachOf(obj: any, iterator: (item: any, key: string|number, callback?: ErrorCallback) => void, callback: ErrorCallback): void;
-    forEachOf<T>(obj: T[], iterator: AsyncForEachOfIterator<T>, callback?: ErrorCallback): void;
-    forEachOfSeries(obj: any, iterator: (item: any, key: string|number, callback?: ErrorCallback) => void, callback: ErrorCallback): void;
-    forEachOfSeries<T>(obj: T[], iterator: AsyncForEachOfIterator<T>, callback?: ErrorCallback): void;
-    forEachOfLimit(obj: any, limit: number, iterator: (item: any, key: string|number, callback?: ErrorCallback) => void, callback: ErrorCallback): void;
-    forEachOfLimit<T>(obj: T[], limit: number, iterator: AsyncForEachOfIterator<T>, callback?: ErrorCallback): void;
-    map<T, R>(arr: T[], iterator: AsyncResultIterator<T, R>, callback?: AsyncResultArrayCallback<R>): any;
-    mapSeries<T, R>(arr: T[], iterator: AsyncResultIterator<T, R>, callback?: AsyncResultArrayCallback<R>): any;
-    mapLimit<T, R>(arr: T[], limit: number, iterator: AsyncResultIterator<T, R>, callback?: AsyncResultArrayCallback<R>): any;
-    mapValuesLimit<T, R>(obj: {[name: string]: T}, limit: number, iteratee: (value: string, key: T, callback: AsyncResultCallback<R>) => void, callback: AsyncResultCallback<R[]>): void;
-    mapValues<T, R>(obj: {[name: string]: T}, iteratee: (value: string, key: T, callback: AsyncResultCallback<R>) => void, callback: AsyncResultCallback<R[]>): void;
+    each<T, E>(arr: T[], iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+    eachSeries<T, E>(arr: T[], iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+    eachLimit<T, E>(arr: T[], limit: number, iterator: AsyncIterator<T, E>, callback?: ErrorCallback<E>): void;
+    forEachOf<E>(obj: any, iterator: (item: any, key: string|number, callback?: ErrorCallback<E>) => void, callback: ErrorCallback<E>): void;
+    forEachOf<T, E>(obj: T[], iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+    forEachOfSeries<E>(obj: any, iterator: (item: any, key: string|number, callback?: ErrorCallback<E>) => void, callback: ErrorCallback<E>): void;
+    forEachOfSeries<T, E>(obj: T[], iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+    forEachOfLimit<E>(obj: any, limit: number, iterator: (item: any, key: string|number, callback?: ErrorCallback<E>) => void, callback: ErrorCallback<E>): void;
+    forEachOfLimit<T, E>(obj: T[], limit: number, iterator: AsyncForEachOfIterator<T, E>, callback?: ErrorCallback<E>): void;
+    map<T, R, E>(arr: T[], iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): any;
+    mapSeries<T, R, E>(arr: T[], iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): any;
+    mapLimit<T, R, E>(arr: T[], limit: number, iterator: AsyncResultIterator<T, R, E>, callback?: AsyncResultArrayCallback<R, E>): any;
+    mapValuesLimit<T, R, E>(obj: {[name: string]: T}, limit: number, iteratee: (value: string, key: T, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultArrayCallback<R, E>): void;
+    mapValues<T, R, E>(obj: {[name: string]: T}, iteratee: (value: string, key: T, callback: AsyncResultCallback<R, E>) => void, callback: AsyncResultArrayCallback<R, E>): void;
     mapValuesSeries: typeof async.mapValues;
-    filter<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    select<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    filterSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    selectSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    filterLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    selectLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    reject<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    rejectSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    rejectLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultArrayCallback<T>): any;
-    reduce<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback?: AsyncResultCallback<R>): any;
-    inject<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback?: AsyncResultCallback<R>): any;
-    foldl<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback?: AsyncResultCallback<R>): any;
-    reduceRight<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback: AsyncResultCallback<R>): any;
-    foldr<T, R>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R>, callback: AsyncResultCallback<R>): any;
-    detect<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<T>): any;
+    filter<T,E>(arr: T[], iterator: AsyncBooleanIterator<T,E>, callback?: AsyncResultArrayCallback<T,E>): any;
+    select<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    filterSeries<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    selectSeries<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    filterLimit<T, E>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    selectLimit<T, E>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    reject<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    rejectSeries<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    rejectLimit<T, E>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    reduce<T, R, E>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R, E>, callback?: AsyncResultCallback<R, E>): any;
+    inject<T, R, E>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R, E>, callback?: AsyncResultCallback<R, E>): any;
+    foldl<T, R, E>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R, E>, callback?: AsyncResultCallback<R, E>): any;
+    reduceRight<T, R, E>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R, E>, callback: AsyncResultCallback<R, E>): any;
+    foldr<T, R, E>(arr: T[], memo: R, iterator: AsyncMemoIterator<T, R, E>, callback: AsyncResultCallback<R, E>): any;
+    detect<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): any;
     find: typeof async.detect;
-    detectSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<T>): any;
+    detectSeries<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): any;
     findSeries: typeof async.detectSeries;
-    detectLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<T>): any;
+    detectLimit<T, E>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<T, E>): any;
     findLimit: typeof async.detectLimit;
-    sortBy<T, V>(arr: T[], iterator: AsyncResultIterator<T, V>, callback?: AsyncResultArrayCallback<T>): any;
-    some<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
-    someLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
+    sortBy<T, V, E>(arr: T[], iterator: AsyncResultIterator<T, V, E>, callback?: AsyncResultArrayCallback<T, E>): any;
+    some<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<boolean, E>): any;
+    someLimit<T, E>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<boolean, E>): any;
     anyLimit: typeof async.someLimit;
-    someSeries<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
+    someSeries<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<boolean, E>): any;
     anySeries: typeof async.someSeries;
-    any<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
-    every<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
-    everyLimit<T>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
-    all<T>(arr: T[], iterator: AsyncBooleanIterator<T>, callback?: AsyncResultCallback<boolean>): any;
-    concat<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback?: AsyncResultArrayCallback<R>): any;
-    concatSeries<T, R>(arr: T[], iterator: AsyncResultIterator<T, R[]>, callback?: AsyncResultArrayCallback<R>): any;
+    any<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<boolean, E>): any;
+    every<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<boolean, E>): any;
+    everyLimit<T, E>(arr: T[], limit: number, iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<boolean, E>): any;
+    all<T, E>(arr: T[], iterator: AsyncBooleanIterator<T, E>, callback?: AsyncResultCallback<boolean, E>): any;
+    concat<T, R, E>(arr: T[], iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): any;
+    concatSeries<T, R, E>(arr: T[], iterator: AsyncResultIterator<T, R[], E>, callback?: AsyncResultArrayCallback<R, E>): any;
 
     // Control Flow
-    series<T>(tasks: AsyncFunction<T>[], callback?: AsyncResultArrayCallback<T>): void;
-    series<T>(tasks: Dictionary<AsyncFunction<T>>, callback?: AsyncResultObjectCallback<T>): void;
-    parallel<T>(tasks: Array<AsyncFunction<T>>, callback?: AsyncResultArrayCallback<T>): void;
-    parallel<T>(tasks: Dictionary<AsyncFunction<T>>, callback?: AsyncResultObjectCallback<T>): void;
-    parallelLimit<T>(tasks: Array<AsyncFunction<T>>, limit: number, callback?: AsyncResultArrayCallback<T>): void;
-    parallelLimit<T>(tasks: Dictionary<AsyncFunction<T>>, limit: number, callback?: AsyncResultObjectCallback<T>): void;
-    whilst(test: () => boolean, fn: AsyncVoidFunction, callback: (err: any) => void): void;
-    doWhilst(fn: AsyncVoidFunction, test: () => boolean, callback: (err: any) => void): void;
-    until(test: () => boolean, fn: AsyncVoidFunction, callback: (err: any) => void): void;
-    doUntil(fn: AsyncVoidFunction, test: () => boolean, callback: (err: any) => void): void;
-    during(test: (testCallback : (error: Error, truth: boolean) => void) => void, fn: AsyncVoidFunction, callback: (err: any) => void): void;
-    doDuring(fn: AsyncVoidFunction, test: (testCallback: (error: Error, truth: boolean) => void) => void, callback: (err: any) => void): void;
+    series<T, E>(tasks: AsyncFunction<T, E>[], callback?: AsyncResultArrayCallback<T, E>): void;
+    series<T, E>(tasks: Dictionary<AsyncFunction<T, E>>, callback?: AsyncResultObjectCallback<T, E>): void;
+    parallel<T, E>(tasks: Array<AsyncFunction<T, E>>, callback?: AsyncResultArrayCallback<T, E>): void;
+    parallel<T, E>(tasks: Dictionary<AsyncFunction<T, E>>, callback?: AsyncResultObjectCallback<T, E>): void;
+    parallelLimit<T, E>(tasks: Array<AsyncFunction<T, E>>, limit: number, callback?: AsyncResultArrayCallback<T, E>): void;
+    parallelLimit<T, E>(tasks: Dictionary<AsyncFunction<T, E>>, limit: number, callback?: AsyncResultObjectCallback<T, E>): void;
+    whilst<E>(test: () => boolean, fn: AsyncVoidFunction<E>, callback: (err: E) => void): void;
+    doWhilst<E>(fn: AsyncVoidFunction<E>, test: () => boolean, callback: (err: E) => void): void;
+    until<E>(test: () => boolean, fn: AsyncVoidFunction<E>, callback: (err: E) => void): void;
+    doUntil<E>(fn: AsyncVoidFunction<E>, test: () => boolean, callback: (err: E) => void): void;
+    during<E>(test: (testCallback : (error: Error, truth: boolean) => void) => void, fn: AsyncVoidFunction<E>, callback: (err: E) => void): void;
+    doDuring<E>(fn: AsyncVoidFunction<E>, test: (testCallback: (error: Error, truth: boolean) => void) => void, callback: (err: E) => void): void;
     forever(next: (errCallback : (err: Error) => void) => void, errBack: (err: Error) => void) : void;
     waterfall(tasks: Function[], callback?: (err: Error, results?: any) => void): void;
     compose(...fns: Function[]): Function;
     seq(...fns: Function[]): Function;
     applyEach(fns: Function[], argsAndCallback: any[]): void;           // applyEach(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
     applyEachSeries(fns: Function[], argsAndCallback: any[]): void;     // applyEachSeries(fns, args..., callback). TS does not support ... for a middle argument. Callback is optional.
-    queue<T>(worker: AsyncWorker<T>, concurrency?: number): AsyncQueue<T>;
-    priorityQueue<T>(worker: AsyncWorker<T>, concurrency: number): AsyncPriorityQueue<T>;
-    cargo(worker : (tasks: any[], callback : ErrorCallback) => void, payload? : number) : AsyncCargo;
+    queue<T, E>(worker: AsyncWorker<T, E>, concurrency?: number): AsyncQueue<T>;
+    priorityQueue<T, E>(worker: AsyncWorker<T, E>, concurrency: number): AsyncPriorityQueue<T>;
+    cargo<E>(worker : (tasks: any[], callback : ErrorCallback<E>) => void, payload? : number) : AsyncCargo;
     auto(tasks: any, concurrency?: number, callback?: (error: Error, results: any) => void): void;
     autoInject(tasks: any, callback?: (error: Error, results: any) => void): void;
-    retry<T>(opts: number, task: (callback : AsyncResultCallback<T>, results: any) => void, callback: (error: Error, results: any) => void): void;
-    retry<T>(opts: { times: number, interval: number|((retryCount: number) => number) }, task: (callback: AsyncResultCallback<T>, results : any) => void, callback: (error: Error, results: any) => void): void;
-    retryable<T>(opts: number | {times: number, interval: number}, task: AsyncFunction<T>): AsyncFunction<T>;
-    apply(fn: Function, ...arguments: any[]): AsyncFunction<any>;
+    retry<T, E>(opts: number, task: (callback : AsyncResultCallback<T, E>, results: any) => void, callback: (error: Error, results: any) => void): void;
+    retry<T, E>(opts: { times: number, interval: number|((retryCount: number) => number) }, task: (callback: AsyncResultCallback<T, E>, results : any) => void, callback: (error: Error, results: any) => void): void;
+    retryable<T, E>(opts: number | {times: number, interval: number}, task: AsyncFunction<T, E>): AsyncFunction<T, E>;
+    apply(fn: Function, ...arguments: any[]): AsyncFunction<any,any>; // TODO: be more specific
     nextTick(callback: Function, ...args: any[]): void;
     setImmediate: typeof async.nextTick;
 
-    allLimit<T>(arr: T[], limit: number, iteratee: AsyncBooleanIterator<T>, cb?: AsyncResultCallback<boolean>) : any;
-    everySeries<T>(arr: T[], iteratee: AsyncBooleanIterator<T>, cb?: AsyncResultCallback<boolean>) : any
+    allLimit<T, E>(arr: T[], limit: number, iteratee: AsyncBooleanIterator<T, E>, cb?: AsyncResultCallback<boolean, E>) : any;
+    everySeries<T, E>(arr: T[], iteratee: AsyncBooleanIterator<T, E>, cb?: AsyncResultCallback<boolean, E>) : any
     allSeries: typeof async.everySeries;
 
-    reflect<T>(fn: AsyncFunction<T>) : (callback: (err: void, result: {error?: Error, value?: T}) => void) => void;
-    reflectAll<T>(tasks: AsyncFunction<T>[]): ((callback: (err: void, result: {error?: Error, value?: T}) => void) => void)[];
+    reflect<T, E>(fn: AsyncFunction<T, E>) : (callback: (err: void, result: {error?: Error, value?: T}) => void) => void;
+    reflectAll<T, E>(tasks: AsyncFunction<T, E>[]): ((callback: (err: void, result: {error?: Error, value?: T}) => void) => void)[];
 
-    timeout<T>(fn: AsyncFunction<T>, milliseconds: number, info: any): AsyncFunction<T>;
+    timeout<T, E>(fn: AsyncFunction<T, E>, milliseconds: number, info: any): AsyncFunction<T, E>;
 
-    times<T> (n: number, iterator: AsyncResultIterator<number, T>, callback: AsyncResultArrayCallback<T>): void;
-    timesSeries<T>(n: number, iterator: AsyncResultIterator<number, T>, callback: AsyncResultArrayCallback<T>): void;
-    timesLimit<T>(n: number, limit: number, iterator: AsyncResultIterator<number, T>, callback: AsyncResultArrayCallback<T>): void;
+    times<T, E> (n: number, iterator: AsyncResultIterator<number, T, E>, callback: AsyncResultArrayCallback<T, E>): void;
+    timesSeries<T, E>(n: number, iterator: AsyncResultIterator<number, T, E>, callback: AsyncResultArrayCallback<T, E>): void;
+    timesLimit<T, E>(n: number, limit: number, iterator: AsyncResultIterator<number, T, E>, callback: AsyncResultArrayCallback<T, E>): void;
 
-    transform<T, R>(arr: T[], iteratee: (acc: R[], item: T, key: string, callback: (error?: Error) => void) => void): void;
-    transform<T, R>(arr: T[], acc: R[], iteratee: (acc: R[], item: T, key: string, callback: (error?: Error) => void) => void): void;
-    transform<T, R>(arr: {[key: string] : T}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: Error) => void) => void): void;
-    transform<T, R>(arr: {[key: string] : T}, acc: {[key: string] : R}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: Error) => void) => void): void;
+    transform<T, R, E>(arr: T[], iteratee: (acc: R[], item: T, key: string, callback: (error?: E) => void) => void): void;
+    transform<T, R, E>(arr: T[], acc: R[], iteratee: (acc: R[], item: T, key: string, callback: (error?: E) => void) => void): void;
+    transform<T, R, E>(arr: {[key: string] : T}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: E) => void) => void): void;
+    transform<T, R, E>(arr: {[key: string] : T}, acc: {[key: string] : R}, iteratee: (acc: {[key: string] : R}, item: T, key: string, callback: (error?: E) => void) => void): void;
 
-    race<T>(tasks: (AsyncFunction<T>)[], callback: AsyncResultCallback<T>) : void;
+    race<T, E>(tasks: (AsyncFunction<T, E>)[], callback: AsyncResultCallback<T, E>) : void;
 
     // Utils
     memoize(fn: Function, hasher?: Function): Function;

From 85dcd5f0c1a30654eae019d9b916ffd84daaf171 Mon Sep 17 00:00:00 2001
From: Tony Gaetani <tony.gaetani@gmail.com>
Date: Tue, 11 Oct 2016 16:21:50 -0500
Subject: [PATCH 028/245] added duplicate function to redis

---
 redis/redis-tests.ts | 5 ++++-
 redis/redis.d.ts     | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/redis/redis-tests.ts b/redis/redis-tests.ts
index aadaa40f48..903f3517c4 100644
--- a/redis/redis-tests.ts
+++ b/redis/redis-tests.ts
@@ -111,4 +111,7 @@ client.multi(commandArr).exec();
 client.monitor(resCallback);
 
 // Send command
-client.send_command(str, args, resCallback);
\ No newline at end of file
+client.send_command(str, args, resCallback);
+
+// Duplicate
+client.duplicate();
\ No newline at end of file
diff --git a/redis/redis.d.ts b/redis/redis.d.ts
index 5c8fd6b39f..f5cba7c11f 100644
--- a/redis/redis.d.ts
+++ b/redis/redis.d.ts
@@ -386,6 +386,9 @@ declare module "redis" {
         hscan(args:any[], callback?:ResCallbackT<any>): boolean;
         zscan(...args:any[]): boolean;
         zscan(args:any[], callback?:ResCallbackT<any>): boolean;
+
+        // Extras
+        duplicate(options?:any[], callback?:ResCallbackT<any>): RedisClient;
     }
 
     export interface Multi {

From 480ba2b8f3b16f8600d244e7a265a6be4eb1ecd6 Mon Sep 17 00:00:00 2001
From: mreis1 <marcio.reis1@hotmail.com>
Date: Fri, 14 Oct 2016 16:02:00 +0200
Subject: [PATCH 029/245] Update slick-carousel.d.ts

---
 slick-carousel/slick-carousel.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/slick-carousel/slick-carousel.d.ts b/slick-carousel/slick-carousel.d.ts
index 7d79293330..7d5ab41788 100644
--- a/slick-carousel/slick-carousel.d.ts
+++ b/slick-carousel/slick-carousel.d.ts
@@ -45,9 +45,10 @@ interface JQuerySlickOptions {
 
     /**
      * Change where the navigation arrows are attached (Selector, htmlString, Array, Element, jQuery object)
+     * `false` will prevent arrows from being created/appended
      * Default: $(element)
      */
-    appendArrows?: Element | Element[] | JQuery | string;
+    appendArrows?: Element | Element[] | JQuery | string | boolean;
 
     /**
      * Change where the navigation dots are attached (Selector, htmlString, Array, Element, jQuery object)

From f6763e95845d9c4d99de73c7924f44e3bc6e261c Mon Sep 17 00:00:00 2001
From: Brice Theurillat <brice.theurillat@idleweiss.ch>
Date: Fri, 14 Oct 2016 17:21:36 +0200
Subject: [PATCH 030/245] Adding definitions for the "plugapi" package

---
 plugapi/plugapi-tests.ts |  17 ++
 plugapi/plugapi.d.ts     | 420 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 437 insertions(+)
 create mode 100644 plugapi/plugapi-tests.ts
 create mode 100644 plugapi/plugapi.d.ts

diff --git a/plugapi/plugapi-tests.ts b/plugapi/plugapi-tests.ts
new file mode 100644
index 0000000000..352b002094
--- /dev/null
+++ b/plugapi/plugapi-tests.ts
@@ -0,0 +1,17 @@
+/// <reference path="./plugapi.d.ts" />
+
+import * as PlugAPI from "plugapi";
+
+let yolo = new PlugAPI({
+    email: "",
+    password: ""
+}, function (err,bot) {
+    if (!err) {
+        bot.connect("roomslug"); // The part after https://plug.dj 
+        bot.on("roomJoin", function (room) {
+            console.log("Joined " + room);
+        });
+    } else {
+        console.log("Error initializing plugAPI: " + err);
+    }
+});
\ No newline at end of file
diff --git a/plugapi/plugapi.d.ts b/plugapi/plugapi.d.ts
new file mode 100644
index 0000000000..ecbf5f9379
--- /dev/null
+++ b/plugapi/plugapi.d.ts
@@ -0,0 +1,420 @@
+// Type definitions for plugapi
+// Project: https://www.npmjs.com/package/plugapi
+// Definitions by: Brice Theurillat <https://github.com/BNedry/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "plugapi" {
+    interface PlugLogin {
+        email: string;
+        password: string;
+    }
+
+    interface Notification {
+        action: string;
+        id: number;
+        timestamp: string;
+        value: string;
+    }
+
+    interface RawChatMessage {
+        cid: string;
+        message: string;
+        sub: number;
+        uid: number;
+        un: string;
+    }
+
+    interface Media {
+        author: string;
+        format: 1;
+        image: string;
+        cid: string;
+        duration: number;
+        title: string;
+        id: number;
+    }
+
+    interface Score {
+        positive: number;
+        listeners: number;
+        grabs: number;
+        negative: number;
+        skipped: number;
+    }
+
+    interface LastPlay {
+        dj: User.DJ;
+        media: Media;
+        score: Score;
+    }
+
+    interface FollowJoinData {
+        r: number;
+        un: string;
+        id: string;
+    }
+
+    interface LogObject {
+        log: () => void;
+    }
+
+    namespace User {
+        interface Default {
+            username: string;
+            language: string;
+            avatarID: string;
+        }
+
+        interface Extended extends Default {
+            status: number;
+            fans: number;
+            listenerPoints: number;
+            id: string;
+            curatorPoints: number;
+            djPoints: number;
+        }
+
+        interface Update extends Extended {
+            dateJoined: string;
+        }
+
+        interface Room extends Default {
+            sub: number;
+            level: number;
+            joined: string;
+            id: number;
+            badge: string;
+            role: number;
+            gRole: number;
+            slug: string;
+        }
+
+        interface User extends Room {
+            silver: boolean;
+            guest: boolean;
+        }
+
+        interface DJ extends Room {
+            blurp: any;
+            grab: boolean;
+            status: number;
+            vote: number;
+        }
+
+        interface Audience extends DJ {
+            ignores: any[];
+            notifications: Notification[];
+            pp: number;
+            pw: number;
+            xp: number;
+        }
+    }
+
+    namespace Enum {
+        interface RoomRole {
+            NONE: 0,
+            RESIDENTDJ: 1,
+            BOUNCER: 2,
+            MANAGER: 3,
+            COHOST: 4,
+            HOST: 5
+        }
+
+        interface GlobalRole {
+            NONE: 0,
+            VOLUNTEER: 2,
+            AMBASSADOR: 3,
+            LEADER: 4,
+            ADMIN: 5
+        }
+
+        interface Status {
+            OFFLINE: 0,
+            ONLINE: 1
+        }
+
+        interface Ban {
+            HOUR: "h",
+            DAY: "d",
+            PERMA: "f"
+        }
+
+        interface BanReason {
+            SPAMMING_TROLLING: 1,
+            VERBAL_ABUSE: 2,
+            OFFENSIVE_MEDIA: 3,
+            INAPPROPRIATE_GENRE: 4,
+            NEGATIVE_ATTITUDE: 5
+        }
+
+        interface Mute {
+            SHORT: "s",
+            MEDIUM: "m",
+            LONG: "l"
+        }
+
+        interface MuteReason {
+            VIOLATING_COMMUNITY_RULES: 1,
+            VERBAL_ABUSE: 2,
+            SPAMMING_TROLLING: 3,
+            OFFENSIVE_LANGUAGE: 4,
+            NEGATIVE_ATTITUDE: 5
+        }
+
+        interface Events {
+            ADVANCE: "advance",
+            BAN: "ban",
+            BOOTH_LOCKED: "boothLocked",
+            CHAT: "chat",
+            CHAT_COMMAND: "command",
+            CHAT_DELETE: "chatDelete",
+            CHAT_LEVEL_UPDATE: "roomMinChatLevelUpdate",
+            COMMAND: "command",
+            DJ_LIST_CYCLE: "djListCycle",
+            DJ_LIST_UPDATE: "djListUpdate",
+            DJ_LIST_LOCKED: "djListLocked",
+            EARN: "earn",
+            FOLLOW_JOIN: "followJoin",
+            FLOOD_CHAT: "floodChat",
+            FRIEND_REQUEST: "friendRequest",
+            GIFTED: "gifted",
+            GRAB: "grab",
+            KILL_SESSION: "killSession",
+            MAINT_MODE: "plugMaintenance",
+            MAINT_MODE_ALERT: "plugMaintenanceAlert",
+            MODERATE_ADD_DJ: "modAddDJ",
+            MODERATE_ADD_WAITLIST: "modAddWaitList",
+            MODERATE_AMBASSADOR: "modAmbassador",
+            MODERATE_BAN: "modBan",
+            MODERATE_MOVE_DJ: "modMoveDJ",
+            MODERATE_MUTE: "modMute",
+            MODERATE_REMOVE_DJ: "modRemoveDJ",
+            MODERATE_REMOVE_WAITLIST: "modRemoveWaitList",
+            MODERATE_SKIP: "modSkip",
+            MODERATE_STAFF: "modStaff",
+            NOTIFY: "notify",
+            PDJ_MESSAGE: "pdjMessage",
+            PDJ_UPDATE: "pdjUpdate",
+            PING: "ping",
+            PLAYLIST_CYCLE: "playlistCycle",
+            REQUEST_DURATION: "requestDuration",
+            REQUEST_DURATION_RETRY: "requestDurationRetry",
+            ROOM_CHANGE: "roomChanged",
+            ROOM_DESCRIPTION_UPDATE: "roomDescriptionUpdate",
+            ROOM_JOIN: "roomJoin",
+            ROOM_NAME_UPDATE: "roomNameUpdate",
+            ROOM_VOTE_SKIP: "roomVoteSkip",
+            ROOM_WELCOME_UPDATE: "roomWelcomeUpdate",
+            SESSION_CLOSE: "sessionClose",
+            SKIP: "skip",
+            STROBE_TOGGLE: "strobeToggle",
+            USER_COUNTER_UPDATE: "userCounterUpdate",
+            USER_FOLLOW: "userFollow",
+            USER_JOIN: "userJoin",
+            USER_LEAVE: "userLeave",
+            USER_UPDATE: "userUpdate",
+            VOTE: "vote"
+        }
+    }
+
+    namespace Event {
+        interface BoothCycle {
+            moderator: string;
+            cycle: true;
+        }
+        
+        interface BoothLocked {
+            m: string;
+            c: boolean;
+            ml: string;
+            f: boolean;
+        }
+        
+        interface Chat {
+            raw: RawChatMessage;
+            id: string;
+            from: User.User;
+            message: string;
+            mentions: Array<any>;
+            muted: boolean;
+            type: string;
+        }
+        
+        interface ChatDelete {
+            mi: number;
+            chatID: string;
+        }
+        
+        type Grab = number;
+        
+        interface Advance {
+            media: Media;
+            startTime: string;
+            historyID: string;
+            djs: User.DJ[];
+            currentDJ: User.DJ;
+            playlistID: number;
+            lastPlay: LastPlay;
+        }
+        
+        interface DJListUpdate {
+            djs: User.DJ[];
+            remove: string;
+        }
+        
+        interface Emote {
+            fromID: string;
+            message: string;
+            from: string;
+            type: string;
+            chatID: string;
+        }
+        
+        interface FollowJoin {
+            data: FollowJoinData;
+            type: string;
+        }
+        
+        interface ModAddDJ {
+            moderator: string;
+            username: string;
+        }
+        
+        interface ModBan {
+            moderator: string;
+            username: string;
+            duration: number;
+            ref: string;
+            reason: string;
+        }
+        
+        interface ModMoveDJ {
+            moderator: string;
+            index: number;
+            old: number;
+            userID: string;
+        }
+        
+        interface ModRemoveDJ {
+            moderator: string;
+            username: string;
+            userID: string;
+        }
+        
+        interface ModSkip {
+            mi: number;
+            m: string;
+        }
+        
+        interface RoomMinChatLevelUpdate {
+            level: number;
+            id: number;
+            user: User.User;
+        }
+        
+        type RoomJoin = string;
+        
+        type UserJoin = User.User;
+        
+        type UserLeave = User.User;
+        
+        interface UserUpdate {
+            username: string;
+            status: number;
+            fans: number;
+            listenerPoints: number;
+            dateJoined: string;
+            language: string;
+            avatarID: string;
+            id: string;
+            curatorPoints: number;
+            djPoints: number;
+        }
+        
+        interface Vote {
+            i: number;
+            v: number;
+        }
+        
+        interface Command extends Event.Chat {
+            command: string;
+            args: string[];
+            respond: Function;
+            respondTimeout: Function;
+            havePermission: Function;
+            isFrom: Function;
+        }
+    }
+
+    interface PlugAPIInstance {
+        deleteAllChat: boolean;
+        multiLine: boolean;
+        multiLineLimit: number;
+
+        connect(room: string): void;
+        changeDJCycle(enabled: boolean, callback?: () => void): boolean;
+        changeRoom(room: string, callback?: () => void): void;
+        close(): void;
+        getAdmins(): User.Extended[];
+        getAmbassadors(): User.Extended[];
+        getAudience(): User.Audience[];
+        getDJ(): User.DJ;
+        getDJs(): User.DJ[];
+        getHost(): User.Extended;
+        getMedia(): Media;
+        getRoomScore(): Score;
+        getSelf(): User.Audience;
+        getStaff(): User.Extended[];
+        getTimeElapsed(): number;
+        getTimeRemaining(): number;
+        getUser(userID: number): User.DJ;
+        getUsers(): User.DJ[];
+        getWaitList(): User.Extended;
+        getWaitListPosition(userID: number): number;
+        havePermission(userID: number, permission: number, global?: boolean): boolean;
+        joinBooth(callback?: () => void): boolean;
+        leaveBooth(callback?: () => void): boolean;
+        selfSkip(callback?: () => void): boolean;
+        sendChat(msg: string, timeout?: number): void;
+        setLogger(logObject: LogObject): boolean;
+
+        on(event: "boothCycle", callback: (data: Event.BoothCycle) => void): void;
+        on(event: "boothLocked", callback: (data: Event.BoothLocked) => void): void;
+        on(event: "chat", callback: (data: Event.Chat) => void): void;
+        on(event: "chatDelete", callback: (data: Event.ChatDelete) => void): void;
+        on(event: "grab", callback: (data: Event.Grab) => void): void;
+        on(event: "advance", callback: (data: Event.Advance) => void): void;
+        on(event: "djListUpdate", callback: (data: Event.DJListUpdate) => void): void;
+        on(event: "emote", callback: (data: Event.Emote) => void): void;
+        on(event: "followJoin", callback: (data: Event.FollowJoin) => void): void;
+        on(event: "modAddDJ", callback: (data: Event.ModAddDJ) => void): void;
+        on(event: "modBan", callback: (data: Event.ModBan) => void): void;
+        on(event: "modMoveDJ", callback: (data: Event.ModMoveDJ) => void): void;
+        on(event: "modRemoveDJ", callback: (data: Event.ModRemoveDJ) => void): void;
+        on(event: "modSkip", callback: (data: Event.ModSkip) => void): void;
+        on(event: "roomMinChatLevelUpdate", callback: (data: Event.RoomMinChatLevelUpdate) => void): void;
+        on(event: "roomJoin", callback: (data: Event.RoomJoin) => void): void;
+        on(event: "userJoin", callback: (data: Event.UserJoin) => void): void;
+        on(event: "userLeave", callback: (data: Event.UserLeave) => void): void;
+        on(event: "userUpdate", callback: (data: Event.UserUpdate) => void): void;
+        on(event: "vote", callback: (data: Event.Vote) => void): void;
+        on(event: "command", callback: (data: Event.Command) => void): void;
+        on(event: string, callback: (data: any) => void): void;
+    }
+
+    interface PlugAPIStatic {
+        new (login: PlugLogin, callback?: (error: Error, bot: PlugAPIInstance) => void): PlugAPIInstance;
+        new (login: PlugLogin, callback?: (bot: PlugAPIInstance) => void): PlugAPIInstance;
+        ROOM_ROLE: Enum.RoomRole;
+        GLOBAL_ROLES: Enum.GlobalRole;
+        STATUS: Enum.Status;
+        BAN: Enum.Ban;
+        BAN_REASON: Enum.BanReason;
+        MUTE: Enum.Mute;
+        MUTE_REASON: Enum.MuteReason;
+        events: Enum.Events;
+    }
+
+    var PlugAPI: PlugAPIStatic;
+    export = PlugAPI;
+}
\ No newline at end of file

From 78ec017787b192652ada4cccf2b626e4f1407e5a Mon Sep 17 00:00:00 2001
From: Brice Theurillat <brice.theurillat@idleweiss.ch>
Date: Fri, 14 Oct 2016 17:31:53 +0200
Subject: [PATCH 031/245] Correct typings errors

---
 plugapi/plugapi.d.ts | 166 +++++++++++++++++++++----------------------
 1 file changed, 83 insertions(+), 83 deletions(-)

diff --git a/plugapi/plugapi.d.ts b/plugapi/plugapi.d.ts
index ecbf5f9379..90351ac53a 100644
--- a/plugapi/plugapi.d.ts
+++ b/plugapi/plugapi.d.ts
@@ -26,7 +26,7 @@ declare module "plugapi" {
 
     interface Media {
         author: string;
-        format: 1;
+        format: number;
         image: string;
         cid: string;
         duration: number;
@@ -112,115 +112,115 @@ declare module "plugapi" {
 
     namespace Enum {
         interface RoomRole {
-            NONE: 0,
-            RESIDENTDJ: 1,
-            BOUNCER: 2,
-            MANAGER: 3,
-            COHOST: 4,
-            HOST: 5
+            NONE: number;
+            RESIDENTDJ: number;
+            BOUNCER: number;
+            MANAGER: number;
+            COHOST: number;
+            HOST: number;
         }
 
         interface GlobalRole {
-            NONE: 0,
-            VOLUNTEER: 2,
-            AMBASSADOR: 3,
-            LEADER: 4,
-            ADMIN: 5
+            NONE: number;
+            VOLUNTEER: number;
+            AMBASSADOR: number;
+            LEADER: number;
+            ADMIN: number;
         }
 
         interface Status {
-            OFFLINE: 0,
-            ONLINE: 1
+            OFFLINE: number;
+            ONLINE: number;
         }
 
         interface Ban {
-            HOUR: "h",
-            DAY: "d",
-            PERMA: "f"
+            HOUR: "h";
+            DAY: "d";
+            PERMA: "f";
         }
 
         interface BanReason {
-            SPAMMING_TROLLING: 1,
-            VERBAL_ABUSE: 2,
-            OFFENSIVE_MEDIA: 3,
-            INAPPROPRIATE_GENRE: 4,
-            NEGATIVE_ATTITUDE: 5
+            SPAMMING_TROLLING: number;
+            VERBAL_ABUSE: number;
+            OFFENSIVE_MEDIA: number;
+            INAPPROPRIATE_GENRE: number;
+            NEGATIVE_ATTITUDE: number;
         }
 
         interface Mute {
-            SHORT: "s",
-            MEDIUM: "m",
-            LONG: "l"
+            SHORT: "s";
+            MEDIUM: "m";
+            LONG: "l";
         }
 
         interface MuteReason {
-            VIOLATING_COMMUNITY_RULES: 1,
-            VERBAL_ABUSE: 2,
-            SPAMMING_TROLLING: 3,
-            OFFENSIVE_LANGUAGE: 4,
-            NEGATIVE_ATTITUDE: 5
+            VIOLATING_COMMUNITY_RULES: number;
+            VERBAL_ABUSE: number;
+            SPAMMING_TROLLING: number;
+            OFFENSIVE_LANGUAGE: number;
+            NEGATIVE_ATTITUDE: number;
         }
 
         interface Events {
-            ADVANCE: "advance",
-            BAN: "ban",
-            BOOTH_LOCKED: "boothLocked",
-            CHAT: "chat",
-            CHAT_COMMAND: "command",
-            CHAT_DELETE: "chatDelete",
-            CHAT_LEVEL_UPDATE: "roomMinChatLevelUpdate",
-            COMMAND: "command",
-            DJ_LIST_CYCLE: "djListCycle",
-            DJ_LIST_UPDATE: "djListUpdate",
-            DJ_LIST_LOCKED: "djListLocked",
-            EARN: "earn",
-            FOLLOW_JOIN: "followJoin",
-            FLOOD_CHAT: "floodChat",
-            FRIEND_REQUEST: "friendRequest",
-            GIFTED: "gifted",
-            GRAB: "grab",
-            KILL_SESSION: "killSession",
-            MAINT_MODE: "plugMaintenance",
-            MAINT_MODE_ALERT: "plugMaintenanceAlert",
-            MODERATE_ADD_DJ: "modAddDJ",
-            MODERATE_ADD_WAITLIST: "modAddWaitList",
-            MODERATE_AMBASSADOR: "modAmbassador",
-            MODERATE_BAN: "modBan",
-            MODERATE_MOVE_DJ: "modMoveDJ",
-            MODERATE_MUTE: "modMute",
-            MODERATE_REMOVE_DJ: "modRemoveDJ",
-            MODERATE_REMOVE_WAITLIST: "modRemoveWaitList",
-            MODERATE_SKIP: "modSkip",
-            MODERATE_STAFF: "modStaff",
-            NOTIFY: "notify",
-            PDJ_MESSAGE: "pdjMessage",
-            PDJ_UPDATE: "pdjUpdate",
-            PING: "ping",
-            PLAYLIST_CYCLE: "playlistCycle",
-            REQUEST_DURATION: "requestDuration",
-            REQUEST_DURATION_RETRY: "requestDurationRetry",
-            ROOM_CHANGE: "roomChanged",
-            ROOM_DESCRIPTION_UPDATE: "roomDescriptionUpdate",
-            ROOM_JOIN: "roomJoin",
-            ROOM_NAME_UPDATE: "roomNameUpdate",
-            ROOM_VOTE_SKIP: "roomVoteSkip",
-            ROOM_WELCOME_UPDATE: "roomWelcomeUpdate",
-            SESSION_CLOSE: "sessionClose",
-            SKIP: "skip",
-            STROBE_TOGGLE: "strobeToggle",
-            USER_COUNTER_UPDATE: "userCounterUpdate",
-            USER_FOLLOW: "userFollow",
-            USER_JOIN: "userJoin",
-            USER_LEAVE: "userLeave",
-            USER_UPDATE: "userUpdate",
-            VOTE: "vote"
+            ADVANCE: "advance";
+            BAN: "ban";
+            BOOTH_LOCKED: "boothLocked";
+            CHAT: "chat";
+            CHAT_COMMAND: "command";
+            CHAT_DELETE: "chatDelete";
+            CHAT_LEVEL_UPDATE: "roomMinChatLevelUpdate";
+            COMMAND: "command";
+            DJ_LIST_CYCLE: "djListCycle";
+            DJ_LIST_UPDATE: "djListUpdate";
+            DJ_LIST_LOCKED: "djListLocked";
+            EARN: "earn";
+            FOLLOW_JOIN: "followJoin";
+            FLOOD_CHAT: "floodChat";
+            FRIEND_REQUEST: "friendRequest";
+            GIFTED: "gifted";
+            GRAB: "grab";
+            KILL_SESSION: "killSession";
+            MAINT_MODE: "plugMaintenance";
+            MAINT_MODE_ALERT: "plugMaintenanceAlert";
+            MODERATE_ADD_DJ: "modAddDJ";
+            MODERATE_ADD_WAITLIST: "modAddWaitList";
+            MODERATE_AMBASSADOR: "modAmbassador";
+            MODERATE_BAN: "modBan";
+            MODERATE_MOVE_DJ: "modMoveDJ";
+            MODERATE_MUTE: "modMute";
+            MODERATE_REMOVE_DJ: "modRemoveDJ";
+            MODERATE_REMOVE_WAITLIST: "modRemoveWaitList";
+            MODERATE_SKIP: "modSkip";
+            MODERATE_STAFF: "modStaff";
+            NOTIFY: "notify";
+            PDJ_MESSAGE: "pdjMessage";
+            PDJ_UPDATE: "pdjUpdate";
+            PING: "ping";
+            PLAYLIST_CYCLE: "playlistCycle";
+            REQUEST_DURATION: "requestDuration";
+            REQUEST_DURATION_RETRY: "requestDurationRetry";
+            ROOM_CHANGE: "roomChanged";
+            ROOM_DESCRIPTION_UPDATE: "roomDescriptionUpdate";
+            ROOM_JOIN: "roomJoin";
+            ROOM_NAME_UPDATE: "roomNameUpdate";
+            ROOM_VOTE_SKIP: "roomVoteSkip";
+            ROOM_WELCOME_UPDATE: "roomWelcomeUpdate";
+            SESSION_CLOSE: "sessionClose";
+            SKIP: "skip";
+            STROBE_TOGGLE: "strobeToggle";
+            USER_COUNTER_UPDATE: "userCounterUpdate";
+            USER_FOLLOW: "userFollow";
+            USER_JOIN: "userJoin";
+            USER_LEAVE: "userLeave";
+            USER_UPDATE: "userUpdate";
+            VOTE: "vote";
         }
     }
 
     namespace Event {
         interface BoothCycle {
             moderator: string;
-            cycle: true;
+            cycle: boolean;
         }
         
         interface BoothLocked {

From 8f4f35541f60fea1234bea231a213b678b064207 Mon Sep 17 00:00:00 2001
From: Brice Theurillat <brice.theurillat@idleweiss.ch>
Date: Fri, 14 Oct 2016 20:45:50 +0200
Subject: [PATCH 032/245] Modify test file

---
 plugapi/plugapi-tests.ts | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/plugapi/plugapi-tests.ts b/plugapi/plugapi-tests.ts
index 352b002094..279a5b659d 100644
--- a/plugapi/plugapi-tests.ts
+++ b/plugapi/plugapi-tests.ts
@@ -2,15 +2,33 @@
 
 import * as PlugAPI from "plugapi";
 
-let yolo = new PlugAPI({
+new PlugAPI({
     email: "",
     password: ""
-}, function (err,bot) {
+}, function (err, bot) {
     if (!err) {
-        bot.connect("roomslug"); // The part after https://plug.dj 
-        bot.on("roomJoin", function (room) {
+        const ROOM = "roomslug";
+        bot.connect(ROOM); // The part after https://plug.dj 
+
+        bot.on(PlugAPI.events.ROOM_JOIN, function (room) {
             console.log("Joined " + room);
         });
+
+        bot.on("chat", function (data) {
+            if (data.type == "emote") {
+                console.log(data.from + data.message);
+            } else {
+                console.log(data.from + "> " + data.message);
+            }
+        });
+
+        bot.on("error", function () {
+            bot.connect(ROOM);
+        });
+
+        bot.deleteAllChat = false;
+        bot.multiLine = true;
+        bot.multiLineLimit = 5;
     } else {
         console.log("Error initializing plugAPI: " + err);
     }

From 1377488da827ed89f7e549bc18bdd505493b5355 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 13 Oct 2016 10:20:27 -0700
Subject: [PATCH 033/245] Move opentype to opentype.js

---
 maker.js/index.d.ts                           |   4 +-
 maker.js/makerjs-tests.ts                     |  68 ++---
 opentype.js/index.d.ts                        | 240 +++++++++++++++++
 .../opentype.js-tests.ts                      |   0
 {opentype => opentype.js}/tsconfig.json       |   2 +-
 opentype/index.d.ts                           | 248 ------------------
 6 files changed, 277 insertions(+), 285 deletions(-)
 create mode 100644 opentype.js/index.d.ts
 rename opentype/opentype-tests.ts => opentype.js/opentype.js-tests.ts (100%)
 rename {opentype => opentype.js}/tsconfig.json (92%)
 delete mode 100644 opentype/index.d.ts

diff --git a/maker.js/index.d.ts b/maker.js/index.d.ts
index d23fe37c3f..7cf55d0448 100644
--- a/maker.js/index.d.ts
+++ b/maker.js/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="pdfkit" />
 /// <reference types="bezier-js" />
-/// <reference types="opentype" />
+/// <reference types="opentype.js" />
 
 /**
  * Root module for Maker.js.
@@ -2173,6 +2173,6 @@ declare namespace MakerJs.models {
 declare namespace MakerJs.models {
     class Text implements IModel {
         models: IModelMap;
-        constructor(font: opentypejs.Font, text: string, fontSize: number, combine?: boolean);
+        constructor(font: opentype.Font, text: string, fontSize: number, combine?: boolean);
     }
 }
diff --git a/maker.js/makerjs-tests.ts b/maker.js/makerjs-tests.ts
index 534ef9eed7..cc7cc0804d 100644
--- a/maker.js/makerjs-tests.ts
+++ b/maker.js/makerjs-tests.ts
@@ -1,7 +1,7 @@
 
 
 function test() {
-	
+
 	var makerjs: typeof MakerJs;
 
 	var p1: MakerJs.IPoint = [0, 0];
@@ -9,7 +9,7 @@ function test() {
 	var paths = testPaths();
 	var models = testModels();
 	var model: MakerJs.IModel = models[0];
-	
+
 	function testRoot() {
 		makerjs.cloneObject({});
 		makerjs.createRouteKey([]);
@@ -29,7 +29,7 @@ function test() {
 		makerjs.unitType.Millimeter;
 		new makerjs.Collector();
 	}
-	
+
 	function testAngle() {
 		makerjs.angle.mirror(45, true, false);
 		makerjs.angle.noRevolutions(90);
@@ -49,22 +49,22 @@ function test() {
 		makerjs.exporter.toOpenJsCad(model);
 		makerjs.exporter.toPDF({} as PDFKit.PDFDocument, model);
 		makerjs.exporter.toSTL(model);
-		makerjs.exporter.toSVG(model, 
-            { 
-                annotate: true, 
-                fontSize: '', 
-                origin: [], 
-                scale: 9.9, 
-                stroke: '', 
-                strokeWidth: '', 
-                svgAttrs: {}, 
-                units: '', 
+		makerjs.exporter.toSVG(model,
+            {
+                annotate: true,
+                fontSize: '',
+                origin: [],
+                scale: 9.9,
+                stroke: '',
+                strokeWidth: '',
+                svgAttrs: {},
+                units: '',
                 useSvgPathOnly: false,
                 viewBox: false
              });
 		makerjs.exporter.tryGetModelUnits(model);
 	}
-	
+
 	function testImporter() {
 		makerjs.importer.fromSVGPathData('');
 		makerjs.importer.parseNumericList('');
@@ -77,7 +77,7 @@ function test() {
 		(<MakerJs.IKit>{}).metaParameters;
 		(<MakerJs.IKit>{}).notes;
 	}
-	
+
 	function testMeasure() {
 		makerjs.measure.increase(mp, mm);
 		makerjs.measure.isPointEqual(p1, p2);
@@ -102,7 +102,7 @@ function test() {
 		makerjs.measure.isPointOnSlope([], s);
 		makerjs.measure.isSlopeEqual(s, s);
 	}
-	
+
 	function testModel(){
 		makerjs.model.breakPathsAtIntersections(model, { paths:{ } });
 		var opts: MakerJs.ICombineOptions = { trimDeadEnds: true, pointMatchingDistance: 2 };
@@ -153,10 +153,10 @@ function test() {
 			new makerjs.models.Slot([0, 0], [1, 1], 7),
 			new makerjs.models.Square(8),
 			new makerjs.models.Star(5, 10, 5),
-			new makerjs.models.Text({} as opentypejs.Font, 'z', 12)
+			new makerjs.models.Text({} as opentype.Font, 'z', 12)
 		];
 	}
-	
+
 	function testPath() {
 		makerjs.path.breakAtPoint(paths.arc, [0,0]).type;
 		makerjs.path.clone(paths.line);
@@ -174,9 +174,9 @@ function test() {
 		makerjs.path.scale(paths.arc, 8);
 		makerjs.path.straighten(paths.arc);
 	}
-	
+
 	function testPaths() {
-		var paths =  {	
+		var paths =  {
 			arc: new makerjs.paths.Arc([0,0], 7, 0, 180),
 			circle: new MakerJs.paths.Circle([0,0], 5),
 			line: new makerjs.paths.Line([0,0], [1,1])
@@ -184,20 +184,20 @@ function test() {
 
 		new makerjs.paths.Chord(paths.arc);
 		new makerjs.paths.Parallel(paths.line, 4, [1,1]);
-		
+
 		//paths.line.layer = "0";
-		
-		var x: MakerJs.IPathLine = { 
-			type: "line", 
-			origin: [9,9], 
-			end: [8,8], 
+
+		var x: MakerJs.IPathLine = {
+			type: "line",
+			origin: [9,9],
+			end: [8,8],
 			layer: "4"
 		};
-		
+
 		return paths;
 	}
-	
-	function testPoint() {	
+
+	function testPoint() {
 		makerjs.point.add(p1, p2);
 		makerjs.point.average(p1, p2);
 		makerjs.point.clone(p1);
@@ -216,14 +216,14 @@ function test() {
 		makerjs.point.subtract(p2, p1);
 		makerjs.point.zero();
 	}
-	
-	function testSolvers() {	
+
+	function testSolvers() {
 		makerjs.solvers.solveTriangleASA(4, 4, 4);
 		makerjs.solvers.solveTriangleSSS(9, 9, 9);
 	}
-	
-	function testUnits() {	
+
+	function testUnits() {
 		makerjs.units.conversionScale(makerjs.unitType.Centimeter, makerjs.unitType.Foot);
 	}
-		
+
 }
\ No newline at end of file
diff --git a/opentype.js/index.d.ts b/opentype.js/index.d.ts
new file mode 100644
index 0000000000..24df752461
--- /dev/null
+++ b/opentype.js/index.d.ts
@@ -0,0 +1,240 @@
+// Type definitions for opentype.js
+// Project: https://github.com/nodebox/opentype.js
+// Definitions by: Dan Marshall <https://github.com/danmarshall>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace opentype;
+
+interface Contour extends Array<Point> {
+}
+
+export class Encoding {
+    charset: string;
+    charToGlyphIndex(c: string): number;
+    font: Font;
+}
+
+interface Field {
+    name: string;
+    type: string;
+    value: any;
+}
+
+export class Font {
+    private nametoGlyphIndex;
+    private supported;
+    constructor(options: FontOptions);
+    ascender: number;
+    cffEncoding: Encoding;
+    charToGlyph(c: string): Glyph;
+    charToGlyphIndex(s: string): number;
+    descender: number;
+    download(): void;
+    draw(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
+    drawMetrics(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
+    drawPoints(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
+    encoding: Encoding;
+    forEachGlyph(text: string, x: number, y: number, fontSize: number, options: RenderOptions, callback: { (glyph: Glyph, x: number, y: number, fontSize: number, options?: RenderOptions): void; }): void;
+    getEnglishName(name: string): string;
+    getGposKerningValue: { (leftGlyph: Glyph | number, rightGlyph: Glyph | number): number; };
+    getKerningValue(leftGlyph: Glyph | number, rightGlyph: Glyph | number): number;
+    getPath(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path;
+    getPaths(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path[];
+    glyphs: GlyphSet;
+    glyphIndexToName(gid: number): string;
+    glyphNames: GlyphNames;
+    hasChar(c: string): boolean;
+    kerningPairs: KerningPairs;
+    names: FontNames;
+    nameToGlyph(name: string): Glyph;
+    nameToGlyphIndex(name: string): number;
+    numberOfHMetrics: number;
+    numGlyphs: number;
+    outlinesFormat: string;
+    stringToGlyphs(s: string): Glyph[];
+    tables: { [tableName: string]: Table; };
+    toArrayBuffer(): ArrayBuffer;
+    toBuffer(): ArrayBuffer;
+    toTables(): Table;
+    unitsPerEm: number;
+    validate(): void;
+}
+
+interface FontNames {
+    copyright: LocalizedName;
+    description: LocalizedName;
+    designer: LocalizedName;
+    designerURL: LocalizedName;
+    fontFamily: LocalizedName;
+    fontSubfamily: LocalizedName;
+    fullName: LocalizedName;
+    license: LocalizedName;
+    licenseURL: LocalizedName;
+    manufacturer: LocalizedName;
+    manufacturerURL: LocalizedName;
+    postScriptName: LocalizedName;
+    trademark: LocalizedName;
+    version: LocalizedName;
+}
+
+interface FontOptions {
+    copyright?: string;
+    ascender?: number;
+    descender?: number;
+    description?: string;
+    designer?: string;
+    designerURL?: string;
+    empty?: boolean;
+    familyName?: string;
+    fullName?: string;
+    glyphs?: Glyph[] | GlyphSet;
+    license?: string;
+    licenseURL?: string;
+    manufacturer?: string;
+    manufacturerURL?: string;
+    postScriptName?: string;
+    styleName?: string;
+    unitsPerEm?: number;
+    trademark?: string;
+    version?: string;
+}
+
+export class Glyph {
+    private index;
+    private xMin;
+    private xMax;
+    private yMin;
+    private yMax;
+    private points;
+    constructor(options: GlyphOptions);
+    addUnicode(unicode: number): void;
+    advanceWidth: number;
+    bindConstructorValues(options: GlyphOptions): void;
+    draw(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
+    drawMetrics(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
+    drawPoints(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
+    getContours(): Contour[];
+    getMetrics(): Metrics;
+    getPath(x: number, y: number, fontSize: number): Path;
+    name: string;
+    path: Path | { (): Path; };
+    unicode: number;
+    unicodes: number[];
+}
+
+interface GlyphOptions {
+    advanceWidth?: number;
+    index?: number;
+    font?: Font;
+    name?: string;
+    path?: Path;
+    unicode?: number;
+    unicodes?: number[];
+    xMax?: number;
+    xMin?: number;
+    yMax?: number;
+    yMin?: number;
+}
+
+export class GlyphNames {
+    private names;
+    constructor(post: Post);
+    glyphIndexToName(gid: number): string;
+    nameToGlyphIndex(name: string): number;
+}
+
+export class GlyphSet {
+    private font;
+    private glyphs;
+    constructor(font: Font, glyphs: Glyph[] | { (): Glyph; }[]);
+    get(index: number): Glyph;
+    length: number;
+    push(index: number, loader: { (): Glyph; }): void;
+}
+
+interface KerningPairs {
+    [pair: string]: number;
+}
+
+export function load(url: string, callback: { (error: any, font?: Font): void; }): void;
+
+export function loadSync(url: string): Font;
+
+interface LocalizedName {
+    [lang: string]: string;
+}
+
+interface Metrics {
+    leftSideBearing: number;
+    rightSideBearing?: number;
+    xMax: number;
+    xMin: number;
+    yMax: number;
+    yMin: number;
+}
+
+export function parse(buffer: any): Font;
+
+export class Path {
+    private fill;
+    private stroke;
+    private strokeWidth;
+    constructor();
+    bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): void;
+    close: () => void;
+    closePath(): void;
+    commands: PathCommand[];
+    curveTo: (x1: number, y1: number, x2: number, y2: number, x: number, y: number) => void;
+    draw(ctx: CanvasRenderingContext2D): void;
+    extend(pathOrCommands: Path | PathCommand[]): void;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(x1: number, y1: number, x: number, y: number): void;
+    quadTo: (x1: number, y1: number, x: number, y: number) => void;
+    toPathData(decimalPlaces: number): string;
+    toSVG(decimalPlaces: number): string;
+    unitsPerEm: number;
+}
+
+interface PathCommand {
+    type: string;
+    x?: number;
+    y?: number;
+    x1?: number;
+    y1?: number;
+    x2?: number;
+    y2?: number;
+}
+
+interface Point {
+    lastPointOfContour?: boolean;
+}
+
+interface Post {
+    glyphNameIndex?: number[];
+    isFixedPitch: number;
+    italicAngle: number;
+    maxMemType1: number;
+    minMemType1: number;
+    maxMemType42: number;
+    minMemType42: number;
+    names?: string[];
+    numberOfGlyphs?: number;
+    offset?: number[];
+    underlinePosition: number;
+    underlineThickness: number;
+    version: number;
+}
+
+interface RenderOptions {
+    kerning: boolean;
+}
+
+interface Table {
+    [propName: string]: any;
+    encode(): number[];
+    fields: Field[];
+    sizeOf(): number;
+    tables: Table[];
+    tableName: string;
+}
diff --git a/opentype/opentype-tests.ts b/opentype.js/opentype.js-tests.ts
similarity index 100%
rename from opentype/opentype-tests.ts
rename to opentype.js/opentype.js-tests.ts
diff --git a/opentype/tsconfig.json b/opentype.js/tsconfig.json
similarity index 92%
rename from opentype/tsconfig.json
rename to opentype.js/tsconfig.json
index da27df64ea..d46b9ebabf 100644
--- a/opentype/tsconfig.json
+++ b/opentype.js/tsconfig.json
@@ -14,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "opentype-tests.ts"
+        "opentype.js-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/opentype/index.d.ts b/opentype/index.d.ts
deleted file mode 100644
index fec42369a1..0000000000
--- a/opentype/index.d.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-// Type definitions for opentype.js
-// Project: https://github.com/nodebox/opentype.js
-// Definitions by: Dan Marshall <https://github.com/danmarshall>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace opentypejs {
-
-    interface Contour extends Array<Point> {
-    }
-
-    class Encoding {
-        charset: string;
-        charToGlyphIndex(c: string): number;
-        font: Font;
-    }
-
-    interface Field {
-        name: string;
-        type: string;
-        value: any;
-    }
-
-    class Font {
-        private nametoGlyphIndex;
-        private supported;
-        constructor(options: FontOptions);
-        ascender: number;
-        cffEncoding: Encoding;
-        charToGlyph(c: string): Glyph;
-        charToGlyphIndex(s: string): number;
-        descender: number;
-        download(): void;
-        draw(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
-        drawMetrics(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
-        drawPoints(ctx: CanvasRenderingContext2D, text: string, x: number, y: number, fontSize: number, options?: RenderOptions): void;
-        encoding: Encoding;
-        forEachGlyph(text: string, x: number, y: number, fontSize: number, options: RenderOptions, callback: { (glyph: Glyph, x: number, y: number, fontSize: number, options?: RenderOptions): void; }): void;
-        getEnglishName(name: string): string;
-        getGposKerningValue: { (leftGlyph: Glyph | number, rightGlyph: Glyph | number): number; };
-        getKerningValue(leftGlyph: Glyph | number, rightGlyph: Glyph | number): number;
-        getPath(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path;
-        getPaths(text: string, x: number, y: number, fontSize: number, options?: RenderOptions): Path[];
-        glyphs: GlyphSet;
-        glyphIndexToName(gid: number): string;
-        glyphNames: GlyphNames;
-        hasChar(c: string): boolean;
-        kerningPairs: KerningPairs;
-        names: FontNames;
-        nameToGlyph(name: string): Glyph;
-        nameToGlyphIndex(name: string): number;
-        numberOfHMetrics: number;
-        numGlyphs: number;
-        outlinesFormat: string;
-        stringToGlyphs(s: string): Glyph[];
-        tables: { [tableName: string]: Table; };
-        toArrayBuffer(): ArrayBuffer;
-        toBuffer(): ArrayBuffer;
-        toTables(): Table;
-        unitsPerEm: number;
-        validate(): void;
-    }
-
-    interface FontNames {
-        copyright: LocalizedName;
-        description: LocalizedName;
-        designer: LocalizedName;
-        designerURL: LocalizedName;
-        fontFamily: LocalizedName;
-        fontSubfamily: LocalizedName;
-        fullName: LocalizedName;
-        license: LocalizedName;
-        licenseURL: LocalizedName;
-        manufacturer: LocalizedName;
-        manufacturerURL: LocalizedName;
-        postScriptName: LocalizedName;
-        trademark: LocalizedName;
-        version: LocalizedName;
-    }
-
-    interface FontOptions {
-        copyright?: string;
-        ascender?: number;
-        descender?: number;
-        description?: string;
-        designer?: string;
-        designerURL?: string;
-        empty?: boolean;
-        familyName?: string;
-        fullName?: string;
-        glyphs?: Glyph[] | GlyphSet;
-        license?: string;
-        licenseURL?: string;
-        manufacturer?: string;
-        manufacturerURL?: string;
-        postScriptName?: string;
-        styleName?: string;
-        unitsPerEm?: number;
-        trademark?: string;
-        version?: string;
-    }
-
-    class Glyph {
-        private index;
-        private xMin;
-        private xMax;
-        private yMin;
-        private yMax;
-        private points;
-        constructor(options: GlyphOptions);
-        addUnicode(unicode: number): void;
-        advanceWidth: number;
-        bindConstructorValues(options: GlyphOptions): void;
-        draw(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
-        drawMetrics(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
-        drawPoints(ctx: CanvasRenderingContext2D, x: number, y: number, fontSize: number): void;
-        getContours(): Contour[];
-        getMetrics(): Metrics;
-        getPath(x: number, y: number, fontSize: number): Path;
-        name: string;
-        path: Path | { (): Path; };
-        unicode: number;
-        unicodes: number[];
-    }
-
-    interface GlyphOptions {
-        advanceWidth?: number;
-        index?: number;
-        font?: Font;
-        name?: string;
-        path?: Path;
-        unicode?: number;
-        unicodes?: number[];
-        xMax?: number;
-        xMin?: number;
-        yMax?: number;
-        yMin?: number;
-    }
-
-    class GlyphNames {
-        private names;
-        constructor(post: Post);
-        glyphIndexToName(gid: number): string;
-        nameToGlyphIndex(name: string): number;
-    }
-
-    class GlyphSet {
-        private font;
-        private glyphs;
-        constructor(font: Font, glyphs: Glyph[] | { (): Glyph; }[]);
-        get(index: number): Glyph;
-        length: number;
-        push(index: number, loader: { (): Glyph; }): void;
-    }
-
-    interface KerningPairs {
-        [pair: string]: number;
-    }
-
-    function load(url: string, callback: { (error: any, font?: Font): void; }): void;
-
-    function loadSync(url: string): Font;
-
-    interface LocalizedName {
-        [lang: string]: string;
-    }
-
-    interface Metrics {
-        leftSideBearing: number;
-        rightSideBearing?: number;
-        xMax: number;
-        xMin: number;
-        yMax: number;
-        yMin: number;
-    }
-
-    function parse(buffer: any): Font;
-
-    class Path {
-        private fill;
-        private stroke;
-        private strokeWidth;
-        constructor();
-        bezierCurveTo(x1: number, y1: number, x2: number, y2: number, x: number, y: number): void;
-        close: () => void;
-        closePath(): void;
-        commands: PathCommand[];
-        curveTo: (x1: number, y1: number, x2: number, y2: number, x: number, y: number) => void;
-        draw(ctx: CanvasRenderingContext2D): void;
-        extend(pathOrCommands: Path | PathCommand[]): void;
-        lineTo(x: number, y: number): void;
-        moveTo(x: number, y: number): void;
-        quadraticCurveTo(x1: number, y1: number, x: number, y: number): void;
-        quadTo: (x1: number, y1: number, x: number, y: number) => void;
-        toPathData(decimalPlaces: number): string;
-        toSVG(decimalPlaces: number): string;
-        unitsPerEm: number;
-    }
-
-    interface PathCommand {
-        type: string;
-        x?: number;
-        y?: number;
-        x1?: number;
-        y1?: number;
-        x2?: number;
-        y2?: number;
-    }
-
-    interface Point {
-        lastPointOfContour?: boolean;
-    }
-
-    interface Post {
-        glyphNameIndex?: number[];
-        isFixedPitch: number;
-        italicAngle: number;
-        maxMemType1: number;
-        minMemType1: number;
-        maxMemType42: number;
-        minMemType42: number;
-        names?: string[];
-        numberOfGlyphs?: number;
-        offset?: number[];
-        underlinePosition: number;
-        underlineThickness: number;
-        version: number;
-    }
-
-    interface RenderOptions {
-        kerning: boolean;
-    }
-
-    interface Table {
-        [propName: string]: any;
-        encode(): number[];
-        fields: Field[];
-        sizeOf(): number;
-        tables: Table[];
-        tableName: string;
-    }
-
-}
-
-declare var opentype: typeof opentypejs;
-
-declare module "opentype.js" {
-    export = opentype;
-}

From 8e02206508184b877fd7aef4720e4ac76ad1f066 Mon Sep 17 00:00:00 2001
From: Shane Liesegang <shane@techie.net>
Date: Fri, 14 Oct 2016 21:36:10 -0700
Subject: [PATCH 034/245] Adding missing hasInvalidCharacters function

This is in the library, but wasn't getting exported. Might be some other missing stuff, but this one was one I needed. :)
---
 twitter-text/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/twitter-text/index.d.ts b/twitter-text/index.d.ts
index 6ecd657891..e12cfc59a9 100644
--- a/twitter-text/index.d.ts
+++ b/twitter-text/index.d.ts
@@ -93,6 +93,7 @@ export declare function isValidList(usernameList: string): boolean;
 export declare function isValidHashtag(hashtag: string): boolean;
 // Note: unicodeDomainsa and requireProtocol can be null
 export declare function isValidUrl(url: string, unicodeDomains: boolean, requireProtocol: boolean): boolean;
+export declare function hasInvalidCharacters(text: string): boolean;
 export declare function isInvalidTweet(text: string): string;
 
 export declare function getUnicodeTextLength(text: string): number;

From 8a7d1495f85ac8e993f77be351c229aba8512b25 Mon Sep 17 00:00:00 2001
From: Cameron Little <cameron@camlittle.com>
Date: Sat, 15 Oct 2016 13:49:26 -0700
Subject: [PATCH 035/245] Minor fixes to fbsdk ui request params interface

---
 fbsdk/fbsdk.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fbsdk/fbsdk.d.ts b/fbsdk/fbsdk.d.ts
index ddbe4d0264..0b66693347 100644
--- a/fbsdk/fbsdk.d.ts
+++ b/fbsdk/fbsdk.d.ts
@@ -29,13 +29,13 @@ interface PageTabDialogParams {
 
 interface RequestsDialogParams {
     method: string; // "apprequests"
-    app_id: string;
+    app_id?: string;
     redirect_uri?: string;
     to?: string;
     message: string;
     action_type?: string; // "send" | "askfor" | "turn"
     object_id?: string;
-    filters: string /* "app_users" | "app_non_users" */ | {
+    filters: string[] | {
         name: string;
         user_ids: string[];
     };

From 284d313bb02bef830b47bdcab5641aef9cc4a3a2 Mon Sep 17 00:00:00 2001
From: stafford <stafford.williams@gmail.com>
Date: Thu, 8 Sep 2016 16:41:08 +1000
Subject: [PATCH 036/245] optional fields

---
 matter-js/matter-js.d.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index da2c2f3eec..5a350d665b 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -488,7 +488,7 @@ declare namespace Matter {
         * @type boolean
         * @default true
         */
-        visible: boolean;
+        visible?: boolean;
 
         /**
          * An `Object` that defines the sprite properties to use when rendering, if any.
@@ -496,31 +496,31 @@ declare namespace Matter {
         * @property render.sprite
         * @type object
         */
-        sprite: IBodyRenderOptionsSprite;
+        sprite?: IBodyRenderOptionsSprite;
 
         /**
          * A String that defines the fill style to use when rendering the body (if a sprite is not defined). It is the same as when using a canvas, so it accepts CSS style property values.
          Default: a random colour
         */
-        fillStyle: string;
+        fillStyle?: string;
 
         /**
          * A Number that defines the line width to use when rendering the body outline (if a sprite is not defined). A value of 0 means no outline will be rendered.
          Default: 1.5
         */
-        lineWidth: number;
+        lineWidth?: number;
 
         /**
          * A String that defines the stroke style to use when rendering the body outline (if a sprite is not defined). It is the same as when using a canvas, so it accepts CSS style property values.
          Default: a random colour
         */
-        strokeStyle: string;
+        strokeStyle?: string;
 
 
 		/*
 		 * Sets the opacity. 1.0 is fully opaque. 0.0 is fully translucent
 		 */
-		opacity: number;
+		opacity?: number;
     }
 
     export interface IBodyRenderOptionsSprite {

From 814a4bc283a6e6d52b40f4d884f600e3ebeb9969 Mon Sep 17 00:00:00 2001
From: stafford <stafford.williams@gmail.com>
Date: Fri, 9 Sep 2016 14:46:03 +1000
Subject: [PATCH 037/245] add wireframes

---
 matter-js/matter-js.d.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index 5a350d665b..ff5d0dac23 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -2329,9 +2329,12 @@ declare namespace Matter {
         */
         hasBounds?: boolean;
 
-
-
-
+        /**
+         * Render wireframes only
+         * @type boolean
+         * @default true 
+         */
+        wireframes?: boolean;
     }
 
     /**

From eb68425ec4d929950e7c025a73d77254df0d46a9 Mon Sep 17 00:00:00 2001
From: stafford <stafford.williams@gmail.com>
Date: Fri, 9 Sep 2016 14:54:30 +1000
Subject: [PATCH 038/245] added pair clearing

---
 matter-js/matter-js.d.ts | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index ff5d0dac23..623a221bd8 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -1970,6 +1970,11 @@ declare namespace Matter {
         */
         enableSleeping: boolean;
 
+        /**
+         * Collision pair set for this `Engine`.
+         */
+        pairs: any;
+
         /**
          * An integer `Number` that specifies the number of position iterations to perform each update.
          * The higher the value, the higher quality the simulation will be at the expense of performance.
@@ -2174,6 +2179,21 @@ declare namespace Matter {
         type: string;
     }
 
+    /**
+    * The `Matter.Pairs` module contains methods for creating and manipulating collision pair sets.
+    *
+    * @class Pairs
+    */
+    export class Pairs {
+        /**
+         * Clears the given pairs structure.
+         * @method clear
+         * @param {pairs} pairs
+         * @return {pairs} pairs
+         */
+        static clear(pairs: any): any;
+    }
+
     export interface IPair {
         id: number;
         bodyA: Body;

From f0cdf02c2b7bb1316348c6062835bb95897476f2 Mon Sep 17 00:00:00 2001
From: stafford <stafford.williams@gmail.com>
Date: Sun, 16 Oct 2016 19:13:47 +1100
Subject: [PATCH 039/245] event is optional

---
 matter-js/matter-js.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index 623a221bd8..1e07750c19 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -3308,8 +3308,8 @@ declare namespace Matter {
         * @param object
         * @param eventNames
         * @param event
-        */
-        static trigger(object: any, eventNames: string, event: (e: any) => void): void;
+        */
+        static trigger(object: any, eventNames: string, event?: (e: any) => void): void;
 
     }
 }

From d95af2bfb0c6b66e04e3adaac35d79b15a3a5692 Mon Sep 17 00:00:00 2001
From: stafford <stafford.williams@gmail.com>
Date: Sun, 16 Oct 2016 19:14:07 +1100
Subject: [PATCH 040/245] include MouseConstraint

---
 matter-js/matter-js.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index 1e07750c19..2d8e99eb5a 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -2946,8 +2946,8 @@ declare namespace Matter {
          * @param world
          * @param body
          * @returns world
-         */
-        static add(world: World, body: Body | Array<Body> | Composite | Array<Composite> | Constraint | Array<Constraint>): World;
+         */
+        static add(world: World, body: Body | Array<Body> | Composite | Array<Composite> | Constraint | Array<Constraint> | MouseConstraint): World;
 
         /**
          * An alias for Composite.addBody since World is also a Composite
@@ -3308,7 +3308,7 @@ declare namespace Matter {
         * @param object
         * @param eventNames
         * @param event
-        */
+        */
         static trigger(object: any, eventNames: string, event?: (e: any) => void): void;
 
     }

From 661dbeb3b293599abeec8ae4e989838017b0c66e Mon Sep 17 00:00:00 2001
From: stafford <stafford.williams@gmail.com>
Date: Sun, 16 Oct 2016 19:14:37 +1100
Subject: [PATCH 041/245] should be static

---
 matter-js/matter-js.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index 2d8e99eb5a..cc887673ee 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -2129,8 +2129,8 @@ declare namespace Matter {
          * @param {engine} engine
          * @param {} options
          * @return {MouseConstraint} A new MouseConstraint
-         */
-        create(engine: Engine, options: IMouseConstraintDefinition): MouseConstraint;
+         */
+        static create(engine: Engine, options?: IMouseConstraintDefinition): MouseConstraint;
 
         /**
          * The `Constraint` object that is used to move the body during interaction.
@@ -2946,7 +2946,7 @@ declare namespace Matter {
          * @param world
          * @param body
          * @returns world
-         */
+         */
         static add(world: World, body: Body | Array<Body> | Composite | Array<Composite> | Constraint | Array<Constraint> | MouseConstraint): World;
 
         /**

From c3e46db64e69a78f9e5dfbadc22e31dba2a040a0 Mon Sep 17 00:00:00 2001
From: Vincent Jaubert <contact@vjaubert.com>
Date: Sun, 16 Oct 2016 17:20:21 +0200
Subject: [PATCH 042/245] added iteratee shorthand syntax for some usages of
 map and uniq

---
 underscore/underscore.d.ts | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index d8d08a3b75..ef76d966c4 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>, Christopher Currens <https://github.com/ccurrens/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+import IterateeMatcherShorthand = _.IterateeMatcherShorthand;
+import IterateePropertyShorthand = _.IterateePropertyShorthand;
 declare module _ {
 	/**
 	* underscore.js _.throttle options.
@@ -67,6 +69,10 @@ declare module _ {
 		(element: T, key: string, list: Dictionary<T>): TResult;
 	}
 
+	type IterateePropertyShorthand = string | number;
+
+	type IterateeMatcherShorthand<T> = Dictionary<T>;
+
 	interface MemoIterator<T, TResult> {
 		(prev: TResult, curr: T, index: number, list: List<T>): TResult;
 	}
@@ -146,7 +152,7 @@ interface UnderscoreStatic {
 	**/
 	map<T, TResult>(
 		list: _.List<T>,
-		iterator: _.ListIterator<T, TResult>,
+		iterator: _.ListIterator<T, TResult> | _.IterateePropertyShorthand | _.IterateeMatcherShorthand<any>,
 		context?: any): TResult[];
 
 	/**
@@ -158,15 +164,16 @@ interface UnderscoreStatic {
 	**/
 	map<T, TResult>(
 		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, TResult>,
+		iterator: _.ObjectIterator<T, TResult> ,
 		context?: any): TResult[];
 
+
 	/**
 	* @see _.map
 	**/
 	collect<T, TResult>(
 		list: _.List<T>,
-		iterator: _.ListIterator<T, TResult>,
+		iterator: _.ListIterator<T, TResult> | _.IterateePropertyShorthand | _.IterateeMatcherShorthand<any>,
 		context?: any): TResult[];
 
 	/**
@@ -900,7 +907,7 @@ interface UnderscoreStatic {
 	uniq<T, TSort>(
 		array: _.List<T>,
 		isSorted?: boolean,
-		iterator?: _.ListIterator<T, TSort>,
+		iterator?: _.ListIterator<T, TSort> | _.IterateePropertyShorthand,
 		context?: any): T[];
 
 	/**
@@ -916,7 +923,7 @@ interface UnderscoreStatic {
 	**/
 	unique<T, TSort>(
 		array: _.List<T>,
-		iterator?: _.ListIterator<T, TSort>,
+		iterator?: _.ListIterator<T, TSort> | _.IterateePropertyShorthand,
 		context?: any): T[];
 
 	/**

From 0cc6854a1694dcb389a4e6675c0519a828a71418 Mon Sep 17 00:00:00 2001
From: Vincent Jaubert <contact@vjaubert.com>
Date: Sun, 16 Oct 2016 17:43:00 +0200
Subject: [PATCH 043/245] [Underscore] Add Iteratee shorthand syntax for some
 usages of map and uniq

---
 underscore/underscore.d.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index ef76d966c4..23a2494516 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Boris Yankov <https://github.com/borisyankov/>, Josh Baldwin <https://github.com/jbaldwin/>, Christopher Currens <https://github.com/ccurrens/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import IterateeMatcherShorthand = _.IterateeMatcherShorthand;
-import IterateePropertyShorthand = _.IterateePropertyShorthand;
 declare module _ {
 	/**
 	* underscore.js _.throttle options.

From 0d21cc33ca2817d53d06f2ec792579a06ab0a848 Mon Sep 17 00:00:00 2001
From: Vincent Jaubert <contact@vjaubert.com>
Date: Sun, 16 Oct 2016 17:45:29 +0200
Subject: [PATCH 044/245] [Underscore] Add Iteratee shorthand syntax for some
 usages of map and uniq

---
 underscore/underscore.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/underscore/underscore.d.ts b/underscore/underscore.d.ts
index 23a2494516..8f8e32d370 100644
--- a/underscore/underscore.d.ts
+++ b/underscore/underscore.d.ts
@@ -162,7 +162,7 @@ interface UnderscoreStatic {
 	**/
 	map<T, TResult>(
 		object: _.Dictionary<T>,
-		iterator: _.ObjectIterator<T, TResult> ,
+		iterator: _.ObjectIterator<T, TResult>,
 		context?: any): TResult[];
 
 

From 303dd0fb1b76a7dd00c452b68484cc34f177348e Mon Sep 17 00:00:00 2001
From: Endel Dreyer <endel.dreyer@gmail.com>
Date: Sun, 16 Oct 2016 20:13:00 +0200
Subject: [PATCH 045/245] add type definitions for 'random-seed' package

---
 random-seed/random-seed-tests.ts | 20 +++++++++++++++++++
 random-seed/random-seed.d.ts     | 33 ++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+)
 create mode 100644 random-seed/random-seed-tests.ts
 create mode 100644 random-seed/random-seed.d.ts

diff --git a/random-seed/random-seed-tests.ts b/random-seed/random-seed-tests.ts
new file mode 100644
index 0000000000..9cbfda6766
--- /dev/null
+++ b/random-seed/random-seed-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="./random-seed.d.ts" />
+import * as gen from "random-seed";
+
+// these generators produce different numbers
+let rand1 = gen.create(); // method 1
+let rand2 = gen();        // method 3
+
+// these generators will produce
+// the same sequence of numbers
+let seed = 'My Secret String Value';
+let rand3 = gen.create(seed);
+let rand4 = gen(seed);
+
+// API
+rand1.addEntropy();
+rand1.random();
+rand1.range(100);
+rand1.intBetween(0, 10);
+rand1.floatBetween(0, 1);
+rand1.seed("new seed");
diff --git a/random-seed/random-seed.d.ts b/random-seed/random-seed.d.ts
new file mode 100644
index 0000000000..e459a89cf8
--- /dev/null
+++ b/random-seed/random-seed.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for random-seed 0.3.0
+// Project: https://github.com/skratchdot/random-seed/
+// Definitions by: Endel Dreyer <https://github.com/endel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "random-seed" {
+
+  interface RandomSeed {
+    range (range: number): number;
+    random (): number;
+    floatBetween (min: number, max: number): number;
+    intBetween (min: number, max: number): number;
+
+    string (count: number): string;
+    seed (seed: string): void;
+
+    cleanString (inStr: string): string;
+    hashString (inStr: string): string;
+
+    addEntropy (...args: any[]): void;
+    initState (): void;
+
+    done (): void;
+  }
+
+  function create (seed?: string): RandomSeed;
+
+  namespace create {
+    function create(seed?: string): RandomSeed;
+  }
+
+  export = create;
+}

From bb55a1f2d04d7a4d976d9154818d54c4e5b6e711 Mon Sep 17 00:00:00 2001
From: Endel Dreyer <endel.dreyer@gmail.com>
Date: Sun, 16 Oct 2016 21:16:06 +0200
Subject: [PATCH 046/245] export interface and create method instead of default
 export

---
 random-seed/random-seed-tests.ts | 8 +++-----
 random-seed/random-seed.d.ts     | 9 ++-------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/random-seed/random-seed-tests.ts b/random-seed/random-seed-tests.ts
index 9cbfda6766..de49c65e45 100644
--- a/random-seed/random-seed-tests.ts
+++ b/random-seed/random-seed-tests.ts
@@ -1,15 +1,13 @@
 /// <reference path="./random-seed.d.ts" />
-import * as gen from "random-seed";
+import { RandomSeed, create } from "random-seed";
 
 // these generators produce different numbers
-let rand1 = gen.create(); // method 1
-let rand2 = gen();        // method 3
+let rand1: RandomSeed = create(); // method 1
 
 // these generators will produce
 // the same sequence of numbers
 let seed = 'My Secret String Value';
-let rand3 = gen.create(seed);
-let rand4 = gen(seed);
+let rand2 = create(seed);
 
 // API
 rand1.addEntropy();
diff --git a/random-seed/random-seed.d.ts b/random-seed/random-seed.d.ts
index e459a89cf8..2dcb02d1e6 100644
--- a/random-seed/random-seed.d.ts
+++ b/random-seed/random-seed.d.ts
@@ -5,7 +5,7 @@
 
 declare module "random-seed" {
 
-  interface RandomSeed {
+  export interface RandomSeed {
     range (range: number): number;
     random (): number;
     floatBetween (min: number, max: number): number;
@@ -23,11 +23,6 @@ declare module "random-seed" {
     done (): void;
   }
 
-  function create (seed?: string): RandomSeed;
+  export function create (seed?: string): RandomSeed;
 
-  namespace create {
-    function create(seed?: string): RandomSeed;
-  }
-
-  export = create;
 }

From 2f12966efeaa1b93894eec566272c79fc10a4f83 Mon Sep 17 00:00:00 2001
From: rinzeb <rinzeb@users.noreply.github.com>
Date: Tue, 18 Oct 2016 11:06:10 +0200
Subject: [PATCH 047/245] Update kafka-node.d.ts

---
 kafka-node/kafka-node.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/kafka-node/kafka-node.d.ts b/kafka-node/kafka-node.d.ts
index 19d9bc3010..9ce8359d96 100644
--- a/kafka-node/kafka-node.d.ts
+++ b/kafka-node/kafka-node.d.ts
@@ -65,6 +65,8 @@ declare module 'kafka-node' {
         fetch(payloads: Array<OffsetRequest>, cb: (error: any, data: any) => any): void;
         commit(groupId: string, payloads: Array<OffsetCommitRequest>, cb: (error: any, data: any) => any): void;
         fetchCommits(groupId: string, payloads: Array<OffsetFetchRequest>, cb: (error: any, data: any) => any): void;
+        fetchLatestOffsets(topics: Array<string>, cb: (error: any, data: any) => any): void;
+        on(eventName: string, cb: (error: any) => any): void;
     }
 
     export class KeyedMessage {
@@ -99,6 +101,8 @@ declare module 'kafka-node' {
     export interface Topic {
         topic: string;
         offset?: number;
+        encoding?: string;
+        autoCommit?: boolean;
     }
 
     export interface OffsetRequest {

From 0764b9eb9b916a9e422e9b5f071ccb3517830a20 Mon Sep 17 00:00:00 2001
From: cgilboy <colin@gingerlabs.com>
Date: Tue, 18 Oct 2016 11:27:52 -0700
Subject: [PATCH 048/245] Update react-dnd typings to support decorators.

---
 react-dnd/react-dnd-decorator-tests.ts | 313 +++++++++++++++++++++++++
 react-dnd/react-dnd.d.ts               |  12 +-
 2 files changed, 319 insertions(+), 6 deletions(-)
 create mode 100644 react-dnd/react-dnd-decorator-tests.ts

diff --git a/react-dnd/react-dnd-decorator-tests.ts b/react-dnd/react-dnd-decorator-tests.ts
new file mode 100644
index 0000000000..1d7c4b8d18
--- /dev/null
+++ b/react-dnd/react-dnd-decorator-tests.ts
@@ -0,0 +1,313 @@
+///<reference path="react-dnd.d.ts" />
+///<reference path="react-dnd-html5-backend.d.ts" />
+///<reference path="react-dnd-test-backend.d.ts" />
+"use strict";
+
+// Test adapted from the ReactDnD chess game tutorial:
+// http://gaearon.github.io/react-dnd/docs-tutorial.html
+
+import React = require("react");
+import ReactDnd = require("react-dnd");
+
+var r = React.DOM;
+
+import DragSource = ReactDnd.DragSource;
+import DropTarget = ReactDnd.DropTarget;
+import DragLayer = ReactDnd.DragLayer;
+import DragDropContext = ReactDnd.DragDropContext;
+import HTML5Backend, { getEmptyImage, NativeTypes } from "react-dnd-html5-backend";
+import TestBackend from "react-dnd-test-backend";
+
+// Game Component
+// ----------------------------------------------------------------------
+
+namespace Game {
+    var knightPosition = [0, 0];
+    var observer: any = null;
+
+    function emitChange() {
+        observer(knightPosition);
+    }
+
+    export function observe(o: any) {
+        if (observer) {
+            throw new Error("Multiple observers not implemented.");
+        }
+
+        observer = o;
+        emitChange();
+    }
+
+    export function moveKnight(toX: number, toY: number) {
+        knightPosition = [toX, toY];
+        emitChange();
+    }
+
+    export function canMoveKnight(toX: number, toY: number) {
+        const x = knightPosition[0];
+        const y = knightPosition[1];
+        const dx = toX - x;
+        const dy = toY - y;
+
+        return (Math.abs(dx) === 2 && Math.abs(dy) === 1) ||
+               (Math.abs(dx) === 1 && Math.abs(dy) === 2);
+    }
+}
+
+var ItemTypes = {
+    KNIGHT: "knight"
+};
+
+// Knight Component
+// ----------------------------------------------------------------------
+
+namespace Knight {
+    interface KnightP extends React.Props<Knight> {
+        connectDragSource: ReactDnd.ConnectDragSource;
+        connectDragPreview: ReactDnd.ConnectDragPreview;
+        isDragging: boolean;
+    }
+
+    var knightSource: ReactDnd.DragSourceSpec<KnightP> = {
+        beginDrag: (props) => {
+            return {};
+        }
+    };
+
+    function knightCollect(connect: ReactDnd.DragSourceConnector, monitor: ReactDnd.DragSourceMonitor) {
+        return {
+            connectDragSource: connect.dragSource(),
+            connectDragPreview: connect.dragPreview(),
+            isDragging: monitor.isDragging()
+        };
+    }
+
+    @DragSource(ItemTypes.KNIGHT, knightSource, knightCollect)
+    export class Knight extends React.Component<KnightP, {}> {
+        static defaultProps: KnightP;
+
+        static create = React.createFactory(Knight);
+
+        componentDidMount() {
+            var img = getEmptyImage();
+            img.onload = () => this.props.connectDragPreview(img);
+        }
+
+        render() {
+            return this.props.connectDragSource(
+                    r.div({
+                        style: {
+                            opacity: this.props.isDragging ? 0.5 : 1,
+                            fontSize: 25,
+                            fontWeight: 'bold',
+                            cursor: 'move'
+                        }
+                    }, "♘")
+            );
+        }
+    }
+
+    export var create = React.createFactory(Knight);
+}
+
+// Square Component
+// ----------------------------------------------------------------------
+
+namespace Square {
+    interface SquareP extends React.Props<Square> {
+        black: boolean;
+    }
+
+    export class Square extends React.Component<SquareP, {}> {
+        render() {
+            var fill = this.props.black ? 'black' : 'white';
+            return r.div({
+                style: {
+                    backgroundColor: fill
+                }
+            })
+        }
+    }
+
+    export var create = React.createFactory(Square);
+}
+
+// BoardSquare Component
+// ----------------------------------------------------------------------
+
+namespace BoardSquare {
+    interface BoardSquareP extends React.Props<BoardSquare> {
+        x: number;
+        y: number;
+        connectDropTarget?: ReactDnd.ConnectDropTarget;
+        isOver?: boolean;
+        canDrop?: boolean;
+    }
+
+    var boardSquareTarget: ReactDnd.DropTargetSpec<BoardSquareP> = {
+        canDrop: (props) => Game.canMoveKnight(props.x, props.y),
+        drop: (props) => Game.moveKnight(props.x, props.y)
+    };
+
+    function boardSquareCollect(connect: ReactDnd.DropTargetConnector, monitor: ReactDnd.DropTargetMonitor) {
+        return {
+            connectDropTarget: connect.dropTarget(),
+            isOver: monitor.isOver(),
+            canDrop: monitor.canDrop()
+        };
+    }
+
+    @DropTarget(ItemTypes.KNIGHT, boardSquareTarget, boardSquareCollect)
+    @DropTarget(NativeTypes.FILE, boardSquareTarget, boardSquareCollect)
+    export class BoardSquare extends React.Component<BoardSquareP, {}> {
+        static defaultProps: BoardSquareP;
+
+        private _renderOverlay = (color: string) => {
+            return r.div({
+                style: {
+                    position: 'absolute',
+                    top: 0,
+                    left: 0,
+                    height: '100%',
+                    width: '100%',
+                    zIndex: 1,
+                    opacity: 0.5,
+                    backgroundColor: color
+                }
+            });
+        };
+
+        render() {
+            var black = (this.props.x + this.props.y) % 2 === 1;
+            var isOver = this.props.isOver;
+            var canDrop = this.props.canDrop;
+
+            return this.props.connectDropTarget(
+                    r.div({
+                        style: {
+                            position: 'relative',
+                            width: '100%',
+                            height: '100%'
+                        },
+                        children: [
+                            Square.create({
+                                black: black
+                            }),
+                            isOver && !canDrop ? this._renderOverlay('red') : null,
+                            !isOver && canDrop ? this._renderOverlay('yellow') : null,
+                            isOver && canDrop ? this._renderOverlay('green') : null
+                        ]
+                    })
+            );
+        }
+    }
+    
+    export var create = React.createFactory(BoardSquare);
+}
+
+// Custom Drag Layer Component
+// ----------------------------------------------------------------------
+namespace CustomDragLayer {
+    interface CustomDragLayerP extends React.Props<CustomDragLayer> {
+        isDragging?: boolean;
+        item?: Object;
+    }
+
+    function dragLayerCollect(monitor: ReactDnd.DragLayerMonitor) {
+        return {
+            isDragging: monitor.isDragging(),
+            item: monitor.getItem(),
+        };
+    }
+
+    @DragLayer(dragLayerCollect)
+    export class CustomDragLayer extends React.Component<CustomDragLayerP, {}> {
+        render() {
+            return r.div(null, this.props.isDragging ? this.props.item : null);
+        }
+    }
+
+    export var create = React.createFactory(CustomDragLayer);
+}
+
+// Board Component
+// ----------------------------------------------------------------------
+
+namespace Board {
+    interface BoardP extends React.Props<Board> {
+        knightPosition: number[];
+    }
+
+    export class Board extends React.Component<BoardP, {}> {
+        private _renderPiece = (x: number, y: number) => {
+            var knightX = this.props.knightPosition[0];
+            var knightY = this.props.knightPosition[1];
+            return x === knightX && y === knightY ?
+                    Knight.create() :
+                    null;
+        };
+
+        private _renderSquare = (i: number) => {
+            var x = i % 8;
+            var y = Math.floor(i / 8);
+
+            return r.div({
+                key: i,
+                style: {
+                    width: '12.5%',
+                    height: '12.5%'
+                }
+            }, BoardSquare.create({
+                x: x,
+                y: y
+            }, this._renderPiece(x, y)));
+        };
+
+        render() {
+            var squares: React.ReactHTMLElement<HTMLDivElement>[] = [];
+            for (let i = 0; i < 64; i++) {
+                squares.push(this._renderSquare(i));
+            }
+
+            return r.div({
+                children: [
+                    CustomDragLayer.create(),
+                    r.div({
+                        style: {
+                            width: '100%',
+                            height: '100%',
+                            display: 'flex',
+                            flexWrap: 'wrap'
+                        },
+                        children: squares
+                    })
+                ]
+            });
+        }
+    }
+
+    @DragDropContext(HTML5Backend)
+    export class BoardWithHTML5Backend extends Board {
+
+    }
+
+    @DragDropContext(TestBackend)
+    export class BoardWithTestBackend extends Board {
+
+    }
+
+    export var createWithHTMLBackend = React.createFactory(BoardWithHTML5Backend);
+    export var createWithTestBackend = React.createFactory(BoardWithTestBackend);
+}
+
+// Render the Board Component
+// ----------------------------------------------------------------------
+
+Board.createWithHTMLBackend({
+    knightPosition: [0, 0]
+});
+
+
+Board.createWithTestBackend({
+    knightPosition: [0, 0]
+});
diff --git a/react-dnd/react-dnd.d.ts b/react-dnd/react-dnd.d.ts
index 000cd04ee2..37f065ec48 100644
--- a/react-dnd/react-dnd.d.ts
+++ b/react-dnd/react-dnd.d.ts
@@ -11,13 +11,13 @@ declare module __ReactDnd {
     // Decorated React Components
     // ----------------------------------------------------------------------
 
-    class ContextComponent<P, S> extends React.Component<P, S> {
+    interface ContextComponent<P, S> extends React.Component<P, S> {
         getDecoratedComponentInstance(): React.Component<P, S>;
         // Note: getManager is not yet documented on the React DnD docs.
         getManager(): any;
     }
 
-    class DndComponent<P, S> extends React.Component<P, S> {
+    interface DndComponent<P, S> extends React.Component<P, S> {
         getDecoratedComponentInstance(): React.Component<P, S>;
         getHandlerId(): Identifier;
     }
@@ -40,23 +40,23 @@ declare module __ReactDnd {
         spec: DragSourceSpec<P>,
         collect: DragSourceCollector,
         options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
+    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & DndComponentClass<P>;
 
     export function DropTarget<P>(
         types: Identifier | Identifier[] | ((props: P) => Identifier | Identifier[]),
         spec: DropTargetSpec<P>,
         collect: DropTargetCollector,
         options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
+    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & DndComponentClass<P>;
 
     export function DragDropContext<P>(
         backend: Backend
-    ): <P>(componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => ContextComponentClass<P>;
+    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & ContextComponentClass<P>;
 
     export function DragLayer<P>(
         collect: DragLayerCollector,
         options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
+    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & DndComponentClass<P>;
 
     type DragSourceCollector = (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object;
     type DropTargetCollector = (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object;

From a79888b52434e68a69ed5d969105fe941c62fc84 Mon Sep 17 00:00:00 2001
From: Ty Norton <github@bsd.bz>
Date: Tue, 18 Oct 2016 12:19:01 -0700
Subject: [PATCH 049/245] Support for accessing the DataSource.transport
 variable

---
 kendo-ui/kendo-ui.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/kendo-ui/kendo-ui.d.ts b/kendo-ui/kendo-ui.d.ts
index ac6022ecd4..2b9fe5e9c7 100644
--- a/kendo-ui/kendo-ui.d.ts
+++ b/kendo-ui/kendo-ui.d.ts
@@ -1026,6 +1026,8 @@ declare namespace kendo.data {
     class DataSource extends Observable{
         options: DataSourceOptions;
 
+        transport: any;
+
         static create(options?: DataSourceOptions): DataSource;
 
         constructor(options?: DataSourceOptions);

From bbf45b392643c092b34dee262095ced7860be0cc Mon Sep 17 00:00:00 2001
From: Chris Yu <cyu@palantir.com>
Date: Tue, 18 Oct 2016 14:38:10 -0700
Subject: [PATCH 050/245] Fix incorrect react-day-picker modifiers type

---
 react-day-picker/index.d.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/react-day-picker/index.d.ts b/react-day-picker/index.d.ts
index 3e64d2f71a..53e8813a9e 100644
--- a/react-day-picker/index.d.ts
+++ b/react-day-picker/index.d.ts
@@ -74,10 +74,10 @@ declare namespace ReactDayPicker {
         localeUtils?: LocaleUtils;
         locale?: string;
         captionElement?: React.ReactElement<CaptionElementProps>;
-        onDayClick?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: string[]) => any;
-        onDayTouchTap?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: string[]) => any;
-        onDayMouseEnter?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: string[]) => any;
-        onDayMouseLeave?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: string[]) => any;
+        onDayClick?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
+        onDayTouchTap?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
+        onDayMouseEnter?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
+        onDayMouseLeave?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
         onDayTouchEnd?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
         onDayTouchStart?: (e: React.SyntheticEvent<{}>, day: Date, modifiers: DayModifiers) => any;
         navbarElement?: React.ReactElement<NavbarElementProps>;

From 688d43fc9e4ad5dd4ab767087d86df9b6ad89f93 Mon Sep 17 00:00:00 2001
From: mreis1 <marcio.reis1@hotmail.com>
Date: Wed, 19 Oct 2016 01:10:36 +0200
Subject: [PATCH 051/245] Adds test for boolean property `appendArrows`

---
 slick-carousel/slick-carousel-tests.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/slick-carousel/slick-carousel-tests.ts b/slick-carousel/slick-carousel-tests.ts
index 761da66d9d..0c8bc8a925 100644
--- a/slick-carousel/slick-carousel-tests.ts
+++ b/slick-carousel/slick-carousel-tests.ts
@@ -177,7 +177,9 @@ $('.single-item-rtl').slick({
     rtl: true
 });
 
-
+$('.no-arrows-slide').slick({
+    appendArrows: false
+})
 
 // --------------------------------------------------------
 // ---------------- TEST DEFAULT OPTIONS ------------------

From 3e2d1072e115f1fa12ba813e2e8b053f4ca72c43 Mon Sep 17 00:00:00 2001
From: Chris Yu <cyu@palantir.com>
Date: Tue, 18 Oct 2016 19:20:19 -0700
Subject: [PATCH 052/245] Fix unrelated sharepoint test to unbreak build

---
 sharepoint/SharePoint-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sharepoint/SharePoint-tests.ts b/sharepoint/SharePoint-tests.ts
index 7c000e3d21..f753fe2844 100644
--- a/sharepoint/SharePoint-tests.ts
+++ b/sharepoint/SharePoint-tests.ts
@@ -1198,7 +1198,7 @@ namespace CSR {
             return this.onPostRenderField(targetField, (schema, ctx: SPClientTemplates.RenderContext_FieldInForm) => {
                 if (ctx.ControlMode == SPClientTemplates.ClientControlMode.EditForm
                     || ctx.ControlMode == SPClientTemplates.ClientControlMode.NewForm) {
-                    var targetControl = CSR.getControl(schema);
+                    var targetControl = CSR.getControl(<SPClientTemplates.FieldSchema_InForm>schema);
                     sourceField.forEach((field) => {
                         CSR.addUpdatedValueCallback(ctx, field, v => {
                             dependentValues[field] = v;

From b6a21c54e0737293872e7bad241897d89a70704b Mon Sep 17 00:00:00 2001
From: Nick Evans <nick.evans@ortec.com>
Date: Wed, 19 Oct 2016 17:54:00 +0200
Subject: [PATCH 053/245] Added typings for _.defaultTo to lodash.

---
 lodash/lodash-tests.ts | 119 +++++++++++++++++++++++++++++++++++++++++
 lodash/lodash.d.ts     |  28 ++++++++++
 2 files changed, 147 insertions(+)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index f0f958b0c8..8d6a2120fd 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -11109,6 +11109,125 @@ namespace TestConstant {
     }
 }
 
+// _.defaultTo
+namespace TestDefaultTo {
+    {
+        let result: number;
+        result = _.defaultTo<number>(42, 42);
+        result = _.defaultTo<number>(undefined, 42);
+        result = _.defaultTo<number>(null, 42);
+        result = _.defaultTo<number>(NaN, 42);
+    }
+
+    {
+        let result: string;
+        result = _.defaultTo<string>('a', 'default');
+        result = _.defaultTo<string>(undefined, 'default');
+        result = _.defaultTo<string>(null, 'default');
+    }
+
+    {
+        let result: boolean;
+        result = _.defaultTo<boolean>(true, true);
+        result = _.defaultTo<boolean>(undefined, true);
+        result = _.defaultTo<boolean>(null, true);
+    }
+
+    {
+        let result: string[];
+        result = _.defaultTo<string[]>(['a'], ['default']);
+        result = _.defaultTo<string[]>(undefined, ['default']);
+        result = _.defaultTo<string[]>(null, ['default']);
+    }
+
+    {
+        let result: {a: string};
+        result = _.defaultTo<{a: string}>({a: 'a'}, {a: 'a'});
+        result = _.defaultTo<{a: string}>(undefined, {a: 'a'});
+        result = _.defaultTo<{a: string}>(null, {a: 'a'});
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<number>;
+        result = _(42).defaultTo(42);
+        result = _(undefined).defaultTo(42);
+        result = _(null).defaultTo(42);
+        result = _(NaN).defaultTo(42);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<string>;
+        result = _('a').defaultTo('default');
+        result = _(null).defaultTo('default');
+        result = _(NaN).defaultTo('default');
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<boolean>;
+        result = _(true).defaultTo(true);
+        result = _(undefined).defaultTo(true);
+        result = _(null).defaultTo(true);
+        result = _(NaN).defaultTo(true);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<string[]>;
+        result = _(['a']).defaultTo(['default']);
+        result = _(undefined).defaultTo(['default']);
+        result = _(null).defaultTo(['default']);
+        result = _(NaN).defaultTo(['default']);
+    }
+
+    {
+        let result: _.LoDashImplicitObjectWrapper<{ a: string }>;
+        result = _({ a: 'a' }).defaultTo({a : 'a'});
+        result = _(undefined).defaultTo({a : 'a'});
+        result = _(null).defaultTo({a : 'a'});
+        result = _(NaN).defaultTo({a : 'a'});
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<number>;
+        result = _(42).chain().defaultTo(42);
+        result = _(undefined).chain().defaultTo(42);
+        result = _(null).chain().defaultTo(42);
+        result = _(NaN).chain().defaultTo(42);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<string>;
+        result = _('a').chain().defaultTo('default');
+        result = _(undefined).chain().defaultTo('default');
+        result = _(null).chain().defaultTo('default');
+        result = _(NaN).chain().defaultTo('default');
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<boolean>;
+        result = _(true).chain().defaultTo(true);
+        result = _(undefined).chain().defaultTo(true);
+        result = _(null).chain().defaultTo(true);
+        result = _(NaN).chain().defaultTo(true);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<string[]>;
+        result = _(['a']).chain().defaultTo(['default']);
+        result = _(undefined).chain().defaultTo(['default']);
+        result = _(null).chain().defaultTo(['default']);
+        result = _(NaN).chain().defaultTo(['default']);
+    }
+
+    {
+        let result: _.LoDashExplicitObjectWrapper<{ a: string }>;
+        result = _({ a: 'a' }).chain().defaultTo({a : 'a'});
+        result = _(undefined).chain().defaultTo({a : 'a'});
+        result = _(null).chain().defaultTo({a : 'a'});
+        result = _(NaN).chain().defaultTo({a : 'a'});
+    }
+
+}
+
 // _.identity
 namespace TestIdentity {
     {
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 3305528a5e..5033c24e3d 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -18206,6 +18206,34 @@ declare module _ {
         constant<TResult>(): LoDashExplicitObjectWrapper<() => TResult>;
     }
 
+    //_.defaultTo
+    interface LoDashStatic {
+        /**
+         * Checks `value` to determine whether a default value should be returned in
+         * its place. The `defaultValue` is returned if `value` is `NaN`, `null`,
+         * or `undefined`.
+         * 
+         * @param value The value to check.
+         * @param defaultValue The default value.
+         * @returns Returns the resolved value.
+         */
+        defaultTo<T>(value: T, defaultValue: T): T;
+    }
+
+    interface LoDashImplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<TResult>(value: TResult): LoDashImplicitObjectWrapper<TResult>;
+    }
+
+    interface LoDashExplicitWrapperBase<T, TWrapper> {
+        /**
+         * @see _.defaultTo
+         */
+        defaultTo<TResult>(value: TResult): LoDashExplicitObjectWrapper<TResult>;
+    }
+
     //_.identity
     interface LoDashStatic {
         /**

From 603c0225571b0058dbc9084d8a10c4ebee942359 Mon Sep 17 00:00:00 2001
From: Kasper Fromm Pedersen <kasperfromm@protonmail.com>
Date: Thu, 20 Oct 2016 17:29:27 +0200
Subject: [PATCH 054/245] Adding imagePath property

I just added the imagePath property to the L.Icon.Default.imagePath (http://leafletjs.com/reference-1.0.0.html#icon-default-option)
---
 leaflet/leaflet.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts
index c67c02e29b..0cdb84d113 100644
--- a/leaflet/leaflet.d.ts
+++ b/leaflet/leaflet.d.ts
@@ -1343,6 +1343,7 @@ declare namespace L {
     export interface Icon extends Layer {
         createIcon(oldIcon?: HTMLElement): HTMLElement;
         createShadow(oldIcon?: HTMLElement): HTMLElement;
+        imagePath: string;
     }
 
     export namespace Icon {

From 24e1435412e8fdd08b4490ae52a5175152dcc189 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20So=CC=88hnlein?= <soehnlein@nureg.de>
Date: Fri, 21 Oct 2016 14:50:34 +0200
Subject: [PATCH 055/245] [Lodash] Remove outdated documentation for findIndex,
 findLastIndex and findLast.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

thisArg isn’t available in lodash 4 anymore.
---
 lodash/lodash.d.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 3305528a5e..09dd1e74c2 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -1590,7 +1590,6 @@ declare module _ {
          *
          * @param array The array to search.
          * @param predicate The function invoked per iteration.
-         * @param thisArg The this binding of predicate.
          * @return Returns the index of the found element, else -1.
          */
         findIndex<T>(
@@ -1723,7 +1722,6 @@ declare module _ {
          *
          * @param array The array to search.
          * @param predicate The function invoked per iteration.
-         * @param thisArg The function invoked per iteration.
          * @return Returns the index of the found element, else -1.
          */
         findLastIndex<T>(
@@ -6894,7 +6892,6 @@ declare module _ {
         * right to left.
         * @param collection Searches for a value in this list.
         * @param callback The function called per iteration.
-        * @param thisArg The this binding of callback.
         * @return The found element, else undefined.
         **/
         findLast<T>(

From 6d4df3d1661db3175306bd88aab05a74dd4c8369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20So=CC=88hnlein?= <soehnlein@nureg.de>
Date: Fri, 21 Oct 2016 14:52:02 +0200
Subject: [PATCH 056/245] [Lodash] Add fromIndex param to findIndex,
 findLastIndex and findLast.

Param available since loodash 4.13.0, see https://github.com/lodash/lodash/wiki/Changelog#v4130
---
 lodash/lodash-tests.ts |  18 ++++++
 lodash/lodash.d.ts     | 141 +++++++++++++++++++++++++++++------------
 2 files changed, 117 insertions(+), 42 deletions(-)

diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index f0f958b0c8..b23d94f48d 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -681,6 +681,7 @@ namespace TestFindIndex {
     let array: TResult[];
     let list: _.List<TResult>;
     let predicateFn: (value: TResult, index?: number, collection?: _.List<TResult>) => boolean;
+    let fromIndex: number;
 
     {
         let result: number;
@@ -689,21 +690,25 @@ namespace TestFindIndex {
         result = _.findIndex<TResult>(array, predicateFn);
         result = _.findIndex<TResult>(array, '');
         result = _.findIndex<{a: number}, TResult>(array, {a: 42});
+        result = _.findIndex<TResult>(array, predicateFn, fromIndex);
 
         result = _.findIndex<TResult>(list);
         result = _.findIndex<TResult>(list, predicateFn);
         result = _.findIndex<TResult>(list, '');
         result = _.findIndex<{a: number}, TResult>(list, {a: 42});
+        result = _.findIndex<TResult>(list, predicateFn, fromIndex);
 
         result = _<TResult>(array).findIndex();
         result = _<TResult>(array).findIndex(predicateFn);
         result = _<TResult>(array).findIndex('');
         result = _<TResult>(array).findIndex<{a: number}>({a: 42});
+        result = _<TResult>(array).findIndex(predicateFn, fromIndex);
 
         result = _(list).findIndex();
         result = _(list).findIndex<TResult>(predicateFn);
         result = _(list).findIndex('');
         result = _(list).findIndex<{a: number}>({a: 42});
+        result = _(list).findIndex<TResult>(predicateFn, fromIndex);
     }
 
     {
@@ -713,11 +718,13 @@ namespace TestFindIndex {
         result = _<TResult>(array).chain().findIndex(predicateFn);
         result = _<TResult>(array).chain().findIndex('');
         result = _<TResult>(array).chain().findIndex<{a: number}>({a: 42});
+        result = _<TResult>(array).chain().findIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findIndex();
         result = _(list).chain().findIndex<TResult>(predicateFn);
         result = _(list).chain().findIndex('');
         result = _(list).chain().findIndex<{a: number}>({a: 42});
+        result = _(list).chain().findIndex<TResult>(predicateFn, fromIndex);
     }
 }
 
@@ -727,6 +734,7 @@ namespace TestFindLastIndex {
     let list: _.List<TResult>;
 
     let predicateFn: (value: TResult, index?: number, collection?: _.List<TResult>) => boolean;
+    let fromIndex: number;
 
     {
         let result: number;
@@ -735,21 +743,25 @@ namespace TestFindLastIndex {
         result = _.findLastIndex<TResult>(array, predicateFn);
         result = _.findLastIndex<TResult>(array, '');
         result = _.findLastIndex<{a: number}, TResult>(array, {a: 42});
+        result = _.findLastIndex<TResult>(array, predicateFn, fromIndex);
 
         result = _.findLastIndex<TResult>(list);
         result = _.findLastIndex<TResult>(list, predicateFn);
         result = _.findLastIndex<TResult>(list, '');
         result = _.findLastIndex<{a: number}, TResult>(list, {a: 42});
+        result = _.findLastIndex<TResult>(list, predicateFn, fromIndex);
 
         result = _<TResult>(array).findLastIndex();
         result = _<TResult>(array).findLastIndex(predicateFn);
         result = _<TResult>(array).findLastIndex('');
         result = _<TResult>(array).findLastIndex<{a: number}>({a: 42});
+        result = _<TResult>(array).findLastIndex(predicateFn, fromIndex);
 
         result = _(list).findLastIndex();
         result = _(list).findLastIndex<TResult>(predicateFn);
         result = _(list).findLastIndex('');
         result = _(list).findLastIndex<{a: number}>({a: 42});
+        result = _(list).findLastIndex<TResult>(predicateFn, fromIndex);
     }
 
     {
@@ -759,11 +771,13 @@ namespace TestFindLastIndex {
         result = _<TResult>(array).chain().findLastIndex(predicateFn);
         result = _<TResult>(array).chain().findLastIndex('');
         result = _<TResult>(array).chain().findLastIndex<{a: number}>({a: 42});
+        result = _<TResult>(array).chain().findLastIndex(predicateFn, fromIndex);
 
         result = _(list).chain().findLastIndex();
         result = _(list).chain().findLastIndex<TResult>(predicateFn);
         result = _(list).chain().findLastIndex('');
         result = _(list).chain().findLastIndex<{a: number}>({a: 42});
+        result = _(list).chain().findLastIndex<TResult>(predicateFn, fromIndex);
     }
 }
 
@@ -3735,12 +3749,16 @@ result = <number>_.findLast([1, 2, 3, 4], function (num) {
 result = <IFoodCombined>_.findLast(foodsCombined, { 'type': 'vegetable' });
 result = <IFoodCombined>_.findLast(foodsCombined, 'organic');
 
+result = <IFoodCombined>_.findLast(foodsCombined, 'organic', 1);
+
 result = <number>_([1, 2, 3, 4]).findLast(function (num) {
     return num % 2 == 0;
 });
 result = <IFoodCombined>_(foodsCombined).findLast({ 'type': 'vegetable' });
 result = <IFoodCombined>_(foodsCombined).findLast('organic');
 
+result = <IFoodCombined>_(foodsCombined).findLast('organic', 1);
+
 // _.flatMap
 namespace TestFlatMap {
     let numArray: (number|number[])[] = [1, [2, 3]];
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index 09dd1e74c2..d1c8c43633 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -1590,11 +1590,13 @@ declare module _ {
          *
          * @param array The array to search.
          * @param predicate The function invoked per iteration.
+         * @param fromIndex The index to search from.
          * @return Returns the index of the found element, else -1.
          */
         findIndex<T>(
             array: List<T>,
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
         ): number;
 
         /**
@@ -1602,7 +1604,8 @@ declare module _ {
          */
         findIndex<T>(
             array: List<T>,
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): number;
 
         /**
@@ -1610,7 +1613,8 @@ declare module _ {
          */
         findIndex<W, T>(
             array: List<T>,
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): number;
     }
 
@@ -1619,21 +1623,24 @@ declare module _ {
          * @see _.findIndex
          */
         findIndex(
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findIndex
          */
         findIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findIndex
          */
         findIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): number;
     }
 
@@ -1642,21 +1649,24 @@ declare module _ {
          * @see _.findIndex
          */
         findIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>
+            predicate?: ListIterator<TResult, boolean>,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findIndex
          */
         findIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findIndex
          */
         findIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): number;
     }
 
@@ -1665,21 +1675,24 @@ declare module _ {
          * @see _.findIndex
          */
         findIndex(
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findIndex
          */
         findIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findIndex
          */
         findIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
 
@@ -1688,21 +1701,24 @@ declare module _ {
          * @see _.findIndex
          */
         findIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>
+            predicate?: ListIterator<TResult, boolean>,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findIndex
          */
         findIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findIndex
          */
         findIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
 
@@ -1722,11 +1738,13 @@ declare module _ {
          *
          * @param array The array to search.
          * @param predicate The function invoked per iteration.
+         * @param fromIndex The index to search from.
          * @return Returns the index of the found element, else -1.
          */
         findLastIndex<T>(
             array: List<T>,
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
         ): number;
 
         /**
@@ -1734,7 +1752,8 @@ declare module _ {
          */
         findLastIndex<T>(
             array: List<T>,
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): number;
 
         /**
@@ -1742,7 +1761,8 @@ declare module _ {
          */
         findLastIndex<W, T>(
             array: List<T>,
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): number;
     }
 
@@ -1751,21 +1771,24 @@ declare module _ {
          * @see _.findLastIndex
          */
         findLastIndex(
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): number;
     }
 
@@ -1774,21 +1797,24 @@ declare module _ {
          * @see _.findLastIndex
          */
         findLastIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>
+            predicate?: ListIterator<TResult, boolean>,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): number;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): number;
     }
 
@@ -1797,21 +1823,24 @@ declare module _ {
          * @see _.findLastIndex
          */
         findLastIndex(
-            predicate?: ListIterator<T, boolean>
+            predicate?: ListIterator<T, boolean>,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
 
@@ -1820,21 +1849,24 @@ declare module _ {
          * @see _.findLastIndex
          */
         findLastIndex<TResult>(
-            predicate?: ListIterator<TResult, boolean>
+            predicate?: ListIterator<TResult, boolean>,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex(
-            predicate?: string
+            predicate?: string,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
 
         /**
          * @see _.findLastIndex
          */
         findLastIndex<W>(
-            predicate?: W
+            predicate?: W,
+            fromIndex?: number
         ): LoDashExplicitWrapper<number>;
     }
 
@@ -6892,25 +6924,32 @@ declare module _ {
         * right to left.
         * @param collection Searches for a value in this list.
         * @param callback The function called per iteration.
+        * @param fromIndex The index to search from.
         * @return The found element, else undefined.
         **/
         findLast<T>(
             collection: Array<T>,
-            callback: ListIterator<T, boolean>): T;
+            callback: ListIterator<T, boolean>,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
         **/
         findLast<T>(
             collection: List<T>,
-            callback: ListIterator<T, boolean>): T;
+            callback: ListIterator<T, boolean>,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
         **/
         findLast<T>(
             collection: Dictionary<T>,
-            callback: DictionaryIterator<T, boolean>): T;
+            callback: DictionaryIterator<T, boolean>,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
@@ -6918,7 +6957,9 @@ declare module _ {
         **/
         findLast<W, T>(
             collection: Array<T>,
-            whereValue: W): T;
+            whereValue: W,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
@@ -6926,7 +6967,9 @@ declare module _ {
         **/
         findLast<W, T>(
             collection: List<T>,
-            whereValue: W): T;
+            whereValue: W,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
@@ -6934,7 +6977,9 @@ declare module _ {
         **/
         findLast<W, T>(
             collection: Dictionary<T>,
-            whereValue: W): T;
+            whereValue: W,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
@@ -6942,7 +6987,9 @@ declare module _ {
         **/
         findLast<T>(
             collection: Array<T>,
-            pluckValue: string): T;
+            pluckValue: string,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
@@ -6950,7 +6997,9 @@ declare module _ {
         **/
         findLast<T>(
             collection: List<T>,
-            pluckValue: string): T;
+            pluckValue: string,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.find
@@ -6958,7 +7007,9 @@ declare module _ {
         **/
         findLast<T>(
             collection: Dictionary<T>,
-            pluckValue: string): T;
+            pluckValue: string,
+            fromIndex?: number
+        ): T;
     }
 
     interface LoDashImplicitArrayWrapper<T> {
@@ -6966,20 +7017,26 @@ declare module _ {
         * @see _.findLast
         */
         findLast(
-            callback: ListIterator<T, boolean>): T;
+            callback: ListIterator<T, boolean>,
+            fromIndex?: number
+        ): T;
         /**
         * @see _.findLast
         * @param _.where style callback
         */
         findLast<W>(
-            whereValue: W): T;
+            whereValue: W,
+            fromIndex?: number
+        ): T;
 
         /**
         * @see _.findLast
         * @param _.where style callback
         */
         findLast(
-            pluckValue: string): T;
+            pluckValue: string,
+            fromIndex?: number
+        ): T;
     }
 
     //_.flatMap

From b6a6e811efbf030022b211a6e09a6c995ad46435 Mon Sep 17 00:00:00 2001
From: Eric Ferreira <ef183v@att.com>
Date: Fri, 21 Oct 2016 12:12:16 -0400
Subject: [PATCH 057/245] capture the additional parameters that can be passed
 to listeners in cases where parameters are passed when the event is triggered
 (e.g., custom events)

---
 dcjs/dc-1.6.0.d.ts | 12 +++++++++++-
 dcjs/dc.d.ts       | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/dcjs/dc-1.6.0.d.ts b/dcjs/dc-1.6.0.d.ts
index cf410f1659..58aec98beb 100644
--- a/dcjs/dc-1.6.0.d.ts
+++ b/dcjs/dc-1.6.0.d.ts
@@ -58,7 +58,17 @@ export interface ILegendwidget {
   export var events: IEvents;
 
   export interface IListener<T> {
-    on: (eventName: string, fnctn: (c:T) => void) => T;
+    on: {
+        (event: "renderlet", fnctn: (c: T, filter: any) => any): T;
+        (event: "pretransition", fnctn: (c: T, filter: any) => any): T;
+        (event: "preRender", fnctn: (c: T) => any): T;
+        (event: "postRender", fnctn: (c: T) => any): T;
+        (event: "preRedraw", fnctn: (c: T) => any): T;
+        (event: "postRedraw", fnctn: (c: T) => any): T;
+        (event: "filtered", fnctn: (c: T, filter: any) => any): T;
+        (event: "zoomed", fnctn: (c: T, filter: any) => any): T;
+        (event: string, fnctn: (c: T, ...args: any[]) => any): T;
+    };
   }
 
   export interface ImarginObj {
diff --git a/dcjs/dc.d.ts b/dcjs/dc.d.ts
index afb8cc06c2..0d0821096e 100644
--- a/dcjs/dc.d.ts
+++ b/dcjs/dc.d.ts
@@ -160,7 +160,16 @@ declare namespace DC {
         legend: IGetSet<Legend, T>;
         options(optionsObject: any): T;
         renderlet(fn: (chart: T) => any): T;
-        on(event: string, fn: (chart: T) => any): T;
+
+        on(event: "renderlet", fn: (chart: T, filter: any) => any): T;
+        on(event: "pretransition", fn: (chart: T, filter: any) => any): T;
+        on(event: "preRender", fn: (chart: T) => any): T;
+        on(event: "postRender", fn: (chart: T) => any): T;
+        on(event: "preRedraw", fn: (chart: T) => any): T;
+        on(event: "postRedraw", fn: (chart: T) => any): T;
+        on(event: "filtered", fn: (chart: T, filter: any) => any): T;
+        on(event: "zoomed", fn: (chart: T, filter: any) => any): T;
+        on(event: string, fn: (chart: T, ...args: any[]) => any): T;
     }
 
     export interface Margins {

From 7b71d947f15dc76e3c72f70c2cb1ec350b0c85eb Mon Sep 17 00:00:00 2001
From: Eric Ferreira <ef183v@att.com>
Date: Fri, 21 Oct 2016 12:43:31 -0400
Subject: [PATCH 058/245] don't support too much in `stable` version

---
 dcjs/dc-1.6.0.d.ts | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/dcjs/dc-1.6.0.d.ts b/dcjs/dc-1.6.0.d.ts
index 58aec98beb..a390417a3d 100644
--- a/dcjs/dc-1.6.0.d.ts
+++ b/dcjs/dc-1.6.0.d.ts
@@ -59,15 +59,13 @@ export interface ILegendwidget {
 
   export interface IListener<T> {
     on: {
-        (event: "renderlet", fnctn: (c: T, filter: any) => any): T;
-        (event: "pretransition", fnctn: (c: T, filter: any) => any): T;
-        (event: "preRender", fnctn: (c: T) => any): T;
-        (event: "postRender", fnctn: (c: T) => any): T;
-        (event: "preRedraw", fnctn: (c: T) => any): T;
-        (event: "postRedraw", fnctn: (c: T) => any): T;
-        (event: "filtered", fnctn: (c: T, filter: any) => any): T;
-        (event: "zoomed", fnctn: (c: T, filter: any) => any): T;
-        (event: string, fnctn: (c: T, ...args: any[]) => any): T;
+      (event: "preRender", fnctn: (c: T) => any): T;
+      (event: "postRender", fnctn: (c: T) => any): T;
+      (event: "preRedraw", fnctn: (c: T) => any): T;
+      (event: "postRedraw", fnctn: (c: T) => any): T;
+      (event: "filtered", fnctn: (c: T, filter: any) => any): T;
+      (event: "zoomed", fnctn: (c: T, filter: any) => any): T;
+      (event: string, fnctn: (c: T, ...args: any[]) => any): T;
     };
   }
 

From b39197548bb38c7a724b2bb50a8821220553dbc4 Mon Sep 17 00:00:00 2001
From: phijaen <phijaen@users.noreply.github.com>
Date: Tue, 25 Oct 2016 13:41:03 +0200
Subject: [PATCH 059/245] Update the kendo throttle function definition

The return type of the kendo throttle function should be Function instead of void (see usage at : http://docs.telerik.com/kendo-ui/api/javascript/kendo#methods-throttle )
---
 kendo-ui/kendo-ui.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kendo-ui/kendo-ui.d.ts b/kendo-ui/kendo-ui.d.ts
index ac6022ecd4..5ae6f7fe43 100644
--- a/kendo-ui/kendo-ui.d.ts
+++ b/kendo-ui/kendo-ui.d.ts
@@ -16947,7 +16947,7 @@ declare namespace kendo {
         function resize(element: Element, force: boolean): void;
         function saveAs(options: any): void;
         function stringify(value: any): string;
-        function throttle(fn: Function, timeout: number): void;
+        function throttle(fn: Function, timeout: number): Function;
         function touchScroller(element: string): void;
         function touchScroller(element: JQuery): void;
         function touchScroller(element: Element): void;

From d54b6ce42048c50b083fb7c89d11bdc7a42dcff3 Mon Sep 17 00:00:00 2001
From: Diogo do Carmo <diogo@dcarmo.me>
Date: Tue, 25 Oct 2016 15:36:46 -0200
Subject: [PATCH 060/245] Updated NavigationCardStack to not extend from
 NavigationRoute

According to this: https://github.com/facebook/react-native/blob/9ee815f6b52e0c2417c04e5a05e1e31df26daed2/Libraries/NavigationExperimental/NavigationPropTypes.js
---
 react-native/react-native.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-native/react-native.d.ts b/react-native/react-native.d.ts
index 4cc5d47449..713da055ec 100644
--- a/react-native/react-native.d.ts
+++ b/react-native/react-native.d.ts
@@ -7490,7 +7490,7 @@ declare namespace  __React {
       key: string;
     }
 
-    export interface NavigationState extends NavigationRoute {
+    export interface NavigationState {
         index: number;
         routes: NavigationRoute[];
     }

From d1d3362998b75a764f53df32097541166b71c490 Mon Sep 17 00:00:00 2001
From: ofirgeller <ofirgeller22@gmail.com>
Date: Tue, 25 Oct 2016 14:23:32 -0400
Subject: [PATCH 061/245] switch and switchLatest are like a flatMap

a stream of streams of T is mapped to a stream of T.
---
 rx/rx-lite.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rx/rx-lite.d.ts b/rx/rx-lite.d.ts
index f159979204..ecaf1145d6 100644
--- a/rx/rx-lite.d.ts
+++ b/rx/rx-lite.d.ts
@@ -261,8 +261,8 @@ declare namespace Rx {
 		mergeObservable(): Observable<T>;	// alias for mergeAll
 		skipUntil<T2>(other: Observable<T2>): Observable<T>;
 		skipUntil<T2>(other: IPromise<T2>): Observable<T>;
-		switch(): Observable<T>;
-		switchLatest(): Observable<T>;	// alias for switch
+		switch(): T;
+		switchLatest(): T;	// alias for switch
 		takeUntil<T2>(other: Observable<T2>): Observable<T>;
 		takeUntil<T2>(other: IPromise<T2>): Observable<T>;
 		zip<T2>(second: Observable<T2>|IPromise<T2>): Observable<[T, T2]>;

From ad257a2eaa9f4c4a9ee151ca4d4d2ab31dc842c1 Mon Sep 17 00:00:00 2001
From: laszlojakab <laszlo.jakab@binarit.hu>
Date: Tue, 25 Oct 2016 21:12:05 +0200
Subject: [PATCH 062/245] Create math3d.d.ts

---
 math3d/math3d.d.ts | 170 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 170 insertions(+)
 create mode 100644 math3d/math3d.d.ts

diff --git a/math3d/math3d.d.ts b/math3d/math3d.d.ts
new file mode 100644
index 0000000000..4d89db48ac
--- /dev/null
+++ b/math3d/math3d.d.ts
@@ -0,0 +1,170 @@
+// Type definitions for math3.d.ts
+// Project: https://github.com/adragonite/math3d
+// Definitions by: Laszlo Jakab <https://github.com/laszlojakab>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+
+declare module "math3d" {
+    export class Vector3 {
+        constructor(x?: number, y?: number, z?: number);
+
+        public static back: Vector3;
+        public static down: Vector3;
+        public static forward: Vector3;
+        public static left: Vector3;
+        public static one: Vector3;
+        public static right: Vector3;
+        public static up: Vector3;
+        public static zero: Vector3;
+        public static dimension: number;
+        public static FromVector4: (vector4: Vector4) => Vector3;
+
+        public homogeneous: Vector4;
+        public magnitude: number;
+        public values: number[];
+        public vector4: Vector4;
+        public x: number;
+        public y: number;
+        public z: number;
+
+        public add(vector3: Vector3): Vector3;
+        public average(vector3: Vector3): Vector3;
+        public cross(vector3: Vector3): Vector3;
+        public distanceTo(vector3: Vector3): number;
+        public dot(vector3: Vector3): number;
+        public equals(vector3: Vector3): boolean;
+        public mulScalar(scalar: Number): Vector3;
+        public negate(): Vector3;
+        public normalize(): Vector3;
+        public scale(vector3: Vector3): Vector3;
+        public sub(vector3: Vector3): Vector3;
+        public toString(): string;
+    }
+
+    export class Vector4 {
+        constructor(x?: number, y?: number, z?: number, w?: number);
+
+        public static one: Vector4;
+        public static zero: Vector4;
+        public static dimension: number;
+
+        public magnitude: number;
+        public values: number[];
+        public x: number;
+        public y: number;
+        public z: number;
+        public w: number;
+
+        public add(vector4: Vector4): Vector4;
+        public distanceTo(vector4: Vector4): number;
+        public dot(vector4: Vector4): number;
+        public equals(vector4: Vector4): boolean;
+        public mulScalar(scalar: Number): Vector4;
+        public negate(): Vector4;
+        public normalize(): Vector3;
+        public sub(vector4: Vector4): Vector3;
+        public toString(): string;
+    }
+
+    export class Quaternion {
+        constructor(x?: number, y?: number, z?: number, w?: number);
+        public static Euler(x?: number, y?: number, z?: number): Quaternion;
+        public static AngleAxis(axis: Vector3, angle: number): Quaternion;
+
+        public static identity: Quaternion;
+        public static zero: Quaternion;
+
+        public angleAxis: { axis: Vector3, angle: number };
+        public eulerAngles: { x: number, y: number, z: number };
+        public x: number;
+        public y: number;
+        public z: number;
+        public w: number;
+
+        public angleTo(quaternion: Quaternion): number;
+        public conjugate(): Quaternion;
+        public distanceTo(quaternion: Quaternion): number;
+        public dot(quaternion: Quaternion): number;
+        public equals(quaternion: Quaternion): boolean;
+        public inverse(): Quaternion;
+        public mul(quaternion: Quaternion): Quaternion;
+        public mulVector3(vector3: Vector3): Vector3;
+        public toString(): string;
+    }
+
+    export class Matrix4x4 {
+        constructor(data: number[]);
+
+        public static FlipMatrix(flipX: boolean, flipY: boolean, flipZ: boolean): Matrix4x4;
+        public static ScaleMatrix(scale: number | Vector3): Matrix4x4;
+        public static RotationMatrix(quaternion: Quaternion): Matrix4x4;
+        public static TranslationMatrix(translation: Vector3): Matrix4x4;
+        public static TRS(translation: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+        public static LocalToWorldMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+        public static WorldToLocalMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+
+        public static identity: Matrix4x4;
+        public static zero: Matrix4x4;
+
+        public columns: number[][];
+        public m11: number;
+        public m12: number;
+        public m13: number;
+        public m14: number;
+        public m21: number;
+        public m22: number;
+        public m23: number;
+        public m24: number;
+        public m31: number;
+        public m32: number;
+        public m33: number;
+        public m34: number;
+        public m41: number;
+        public m42: number;
+        public m43: number;
+        public m44: number;
+        public rows: number[][];
+        public size: { rows: number, columns: number };
+        public values: number[];
+
+        public determinant(): number
+        public inverse(): Matrix4x4;
+        public negate(): Matrix4x4;
+        public transpose(): Matrix4x4;
+        public add(matrix4x4: Matrix4x4): Matrix4x4;
+        public sub(matrix4x4: Matrix4x4): Matrix4x4;
+        public mul(matrix4x4: Matrix4x4): Matrix4x4;
+        public mulScalar(scalar: Number): Matrix4x4;
+        public mulVector3(vector3: Vector3): Vector3;
+    }
+
+    export class Transform {
+        constructor(position?: Vector3, rotation?: Quaternion);
+
+        public forward: Vector3;
+        public localPosition: Vector3;
+        public localRotation: Quaternion;
+        public localToWorldMatrix: Matrix4x4;
+        public name: string;
+        public parent: Transform;
+        public position: Vector3;
+        public right: Vector3;
+        public root: Transform;
+        public rotation: Vector3;
+        public up: Vector3;
+        public worldToLocalMatrix: Matrix4x4;
+
+        public addChild(child: Transform): void;
+        public inverseTransformPosition(position: Vector3): Vector3;
+        public removeChild(child: Transform): void;
+        public transformPosition(position: Vector3): Vector3;
+        public translate(translation: Vector3, relativeTo?: Transform.Space): Transform;
+        public rotate(x: number, y: number, z: number, relativeTo?: Transform.Space): Transform;
+    }
+
+    export module Transform {
+        export enum Space {
+            Self,
+            World
+        }
+    }
+}

From 7fce8e6ba9634d9092ee42a53c0c56a99b9c75d9 Mon Sep 17 00:00:00 2001
From: Rand Scullard <rand@randscullard.com>
Date: Thu, 27 Oct 2016 15:51:51 -0400
Subject: [PATCH 063/245] node-schedule: Add support for object literal syntax.

---
 node-schedule/node-schedule.d.ts | 79 ++++++++++++++++++++++++++++++--
 1 file changed, 74 insertions(+), 5 deletions(-)

diff --git a/node-schedule/node-schedule.d.ts b/node-schedule/node-schedule.d.ts
index f42213e271..4c85a19b6b 100644
--- a/node-schedule/node-schedule.d.ts
+++ b/node-schedule/node-schedule.d.ts
@@ -216,6 +216,67 @@ declare module 'node-schedule' {
         nextInvocationDate(base: Date): Date;
     }
 
+    /**
+     * Recurrence rule specification.
+     */
+    export interface RecurrenceSpec {
+        /**
+         * Day of the month.
+         *
+         * @public
+         * @type {RecurrenceSegment}
+         */
+        date?: RecurrenceSegment;
+
+        /**
+         * Day of the week.
+         *
+         * @public
+         * @type {RecurrenceSegment}
+         */
+        dayOfWeek?: RecurrenceSegment;
+
+        /**
+         * Hour.
+         *
+         * @public
+         * @type {RecurrenceSegment}
+         */
+        hour?: RecurrenceSegment;
+
+        /**
+         * Minute.
+         *
+         * @public
+         * @type {RecurrenceSegment}
+         */
+        minute?: RecurrenceSegment;
+
+        /**
+         * Month.
+         *
+         * @public
+         * @type {RecurrenceSegment}
+         */
+        month?: RecurrenceSegment;
+
+        /**
+         * Second.
+         *
+         * @public
+         * @type {RecurrenceSegment}
+         */
+        second?: RecurrenceSegment;
+
+        /**
+         * Year.
+         *
+         * @public
+         * @type {RecurrenceSegment}
+         */
+        year?: RecurrenceSegment;
+    }
+
     /**
      * Invocation.
      *
@@ -268,11 +329,19 @@ declare module 'node-schedule' {
     /**
      * Create a schedule job.
      *
-     * @param {string|RecurrenceRule|Date} name     either an optional name for the new Job or scheduling information
-     * @param {RecurrenceRule|Date|string} rule     either the scheduling info or the JobCallback
-     * @param {JobCallback}                callback The callback to be executed on each invocation.
+     * @param {string}                                    name     name for the new Job
+     * @param {RecurrenceRule|RecurrenceSpec|Date|string} rule     scheduling info
+     * @param {JobCallback}                               callback callback to be executed on each invocation
      */
-    export function scheduleJob(name: string | RecurrenceRule | Date, rule: RecurrenceRule | Date | string | JobCallback, callback?: JobCallback): Job;
+    export function scheduleJob(name: string, rule: RecurrenceRule | RecurrenceSpec | Date | string, callback: JobCallback): Job;
+
+    /**
+     * Create a schedule job.
+     *
+     * @param {RecurrenceRule|RecurrenceSpec|Date|string} rule     scheduling info
+     * @param {JobCallback}                               callback callback to be executed on each invocation
+     */
+    export function scheduleJob(rule: RecurrenceRule | RecurrenceSpec | Date | string, callback: JobCallback): Job;
 
     /**
      * Changes the timing of a Job, canceling all pending invocations.
@@ -281,7 +350,7 @@ declare module 'node-schedule' {
      * @param spec {JobCallback} the new timing for this Job
      * @return {Job} if the job could be rescheduled, {null} otherwise.
      */
-    export function rescheduleJob(job: Job | string, spec: RecurrenceRule | Date | string): Job;
+    export function rescheduleJob(job: Job | string, spec: RecurrenceRule | RecurrenceSpec | Date | string): Job;
 
     /**
      * Dictionary of all Jobs, accessible by name.

From 032e4d78931769ea98aa32996765ed314364ac82 Mon Sep 17 00:00:00 2001
From: Rand Scullard <rand@randscullard.com>
Date: Fri, 28 Oct 2016 11:08:51 -0400
Subject: [PATCH 064/245] passport: Added generic versions of serializeUser and
 deserializeUser for strong typing.

---
 passport/passport-tests.ts | 2 ++
 passport/passport.d.ts     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/passport/passport-tests.ts b/passport/passport-tests.ts
index 8b02c96c76..3dea47b940 100644
--- a/passport/passport-tests.ts
+++ b/passport/passport-tests.ts
@@ -29,7 +29,9 @@ const newFramework:passport.Framework = {
 passport.use(new TestStrategy());
 passport.framework(newFramework);
 passport.serializeUser((user, done) => { });
+passport.serializeUser<string, number>((user, done) => { });
 passport.deserializeUser((id, done) => { });
+passport.deserializeUser<string, number>((id, done) => { });
 
 passport.use(new TestStrategy())
   .unuse('test')
diff --git a/passport/passport.d.ts b/passport/passport.d.ts
index 75e8bcbcc5..7b2c94b035 100644
--- a/passport/passport.d.ts
+++ b/passport/passport.d.ts
@@ -45,7 +45,9 @@ declare module 'passport' {
             authorize(strategies: string[], callback?: Function): express.Handler;
             authorize(strategies: string[], options: Object, callback?: Function): express.Handler;
             serializeUser(fn: (user: any, done: (err: any, id: any) => void) => void): void;
+            serializeUser<TUser, TID>(fn: (user: TUser, done: (err: any, id: TID) => void) => void): void;
             deserializeUser(fn: (id: any, done: (err: any, user: any) => void) => void): void;
+            deserializeUser<TUser, TID>(fn: (id: TID, done: (err: any, user: TUser) => void) => void): void;
             transformAuthInfo(fn: (info: any, done: (err: any, info: any) => void) => void): void;
         }
 

From 95d1e7a7161ed10256799b182aa54d8adca0b5af Mon Sep 17 00:00:00 2001
From: anwalkers <andy.walkers@gmail.com>
Date: Mon, 7 Nov 2016 12:06:23 -0800
Subject: [PATCH 065/245] add options to i18next

---
 i18next/i18next.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/i18next/i18next.d.ts b/i18next/i18next.d.ts
index 5ced8aecdb..23a1567373 100644
--- a/i18next/i18next.d.ts
+++ b/i18next/i18next.d.ts
@@ -130,6 +130,8 @@ declare namespace I18next {
         on(languageChanged: 'languageChanged', listener: (lng: string) => void): void;
 
         off(event: string, listener: () => void): void;
+
+        options: I18next.Options;
     }
 }
 

From 6cf5f4af25f4654f74e000367200823376e3233f Mon Sep 17 00:00:00 2001
From: Morgan Benton <registered@morphatic.com>
Date: Mon, 7 Nov 2016 21:02:27 -0500
Subject: [PATCH 066/245] defs for v3.1.1

---
 d3kit/d3kit-tests.ts                    | 1303 ++++-------------------
 d3kit/d3kit-v1.1.0-tests.ts             | 1112 +++++++++++++++++++
 d3kit/{d3kit.d.ts => d3kit-v1.1.0.d.ts} |    0
 d3kit/index.d.ts                        |  117 ++
 d3kit/package.json                      |    2 +-
 d3kit/tsconfig.json                     |    3 +-
 6 files changed, 1424 insertions(+), 1113 deletions(-)
 create mode 100644 d3kit/d3kit-v1.1.0-tests.ts
 rename d3kit/{d3kit.d.ts => d3kit-v1.1.0.d.ts} (100%)
 create mode 100644 d3kit/index.d.ts

diff --git a/d3kit/d3kit-tests.ts b/d3kit/d3kit-tests.ts
index 5eab2a4e79..e9e665b28b 100644
--- a/d3kit/d3kit-tests.ts
+++ b/d3kit/d3kit-tests.ts
@@ -1,1112 +1,195 @@
-/// <reference path="d3kit.d.ts" />
+/// <reference path="index.d.ts" />
 /// <reference types="d3" />
-/// <reference types="mocha" />
-/// <reference types="chai" />
-
-/* jshint expr: true */
-
-var expect = chai.expect;
-describe('Skeleton', function(){
-    var element: Element, $element: d3.Selection<any>, $svg: d3.Selection<any>, skeleton: d3kit.Skeleton;
-
-    beforeEach(function(done){
-      element = document.body.appendChild(document.createElement('div')) as Element;
-      skeleton = new d3kit.Skeleton(element, null, ['custom1', 'custom2']);
-      $element = d3.select(element);
-      $svg = $element.select('svg');
-      done();
-    });
-
-    describe('new Skeleton()', function(){
-      it('should create <svg> inside the element', function(){
-        expect($element.select('svg').size()).to.be.equal(1);
-      });
-      it('should create <g> inside <svg> inside the element', function(){
-        expect($element.select('svg').select('g').size()).to.be.equal(1);
-      });
-    });
-
-    describe('#getCustomEventNames()', function(){
-      it('should return custom event names', function(){
-        expect(skeleton.getCustomEventNames()).to.deep.equal(['custom1', 'custom2']);
-      });
-    });
-
-    describe('#getDispatcher()', function(){
-      it('should return event dispatcher', function(){
-        expect(skeleton.getDispatcher()).to.be.an('Object');
-        expect(skeleton.getDispatcher().data).to.be.a('Function');
-      });
-    });
-
-    describe('#getInnerWidth()', function(){
-      it('should return width of the skeleton excluding margin', function(){
-        skeleton.options({
-          margin: {left: 10, right: 10}
-        });
-        skeleton.width(100);
-        expect(skeleton.getInnerWidth()).to.equal(80);
-      });
-    });
-
-    describe('#getInnerHeight()', function(){
-      it('should return height of the skeleton excluding margin', function(){
-        skeleton.options({
-          margin: {top: 10, bottom: 20}
-        });
-        skeleton.height(100);
-        expect(skeleton.getInnerHeight()).to.equal(70);
-      });
-    });
-
-    describe('#getLayerOrganizer()', function(){
-      it('should return the LayerOrganizer', function(){
-        expect(skeleton.getLayerOrganizer()).to.be.an('Object');
-      });
-    });
-
-    describe('#getRootG()', function(){
-      it('should return d3 selection of the root <g>', function(){
-        var g = skeleton.getRootG();
-        expect(g.size()).to.equal(1);
-        expect((g[0][0] as Element).tagName).to.equal('g');
-      });
-    });
-
-    describe('#getSvg()', function(){
-      it('should return d3 selection of the <svg>', function(){
-        var svg = skeleton.getSvg();
-        expect(svg.size()).to.equal(1);
-        expect((svg[0][0] as Element).tagName).to.equal('svg');
-      });
-    });
-
-    describe('#data(data, doNotDispatch)', function(){
-      it('should return data when called without argument', function(){
-        skeleton.data({a: 1});
-        expect(skeleton.data()).to.deep.equal({a: 1});
-      });
-      it('should set data when called with at least one argument', function(){
-        skeleton.data('test');
-        expect(skeleton.data()).to.equal('test');
-      });
-      it('after setting, should dispatch "data" event', function(done){
-        skeleton.on('data.test', function(){
-          // This block should be reached to pass the test.
-          expect(true).to.be.true;
-          done();
-        });
-        skeleton.data({a: 1});
-      });
-      it('after setting, should not dispatch "data" event if doNotDispatch is true', function(done){
-        skeleton.on('data.test', function(){
-          // This block should not be reached.
-          expect(true).to.be.false;
-          done();
-        });
-        skeleton.data({a: 1}, true);
-        setTimeout(done, 100);
-      });
-    });
-
-    describe('#options(options, doNotDispatch)', function(){
-      it('should return options when called without argument', function(){
-        skeleton.options({a: 2});
-        expect(skeleton.options()).to.include.keys(['a']);
-        expect(skeleton.options().a).to.equal(2);
-      });
-      it('should set options when called with at least one argument', function(){
-        skeleton.options({a: 1});
-        expect(skeleton.options()).to.include.keys(['a']);
-        expect(skeleton.options().a).to.equal(1);
-      });
-      it('should not overwrite but extend existing options when setting', function(){
-        skeleton.options({a: 1});
-        skeleton.options({b: 2});
-        expect(skeleton.options()).to.include.keys(['a', 'b']);
-        expect(skeleton.options().a).to.equal(1);
-        expect(skeleton.options().b).to.equal(2);
-      });
-      it('after setting, should dispatch "options" event', function(done){
-        skeleton.on('options.test', function(){
-          // This block should be reached to pass the test.
-          expect(true).to.be.true;
-          done();
-        });
-        skeleton.options({a: 1});
-      });
-      it('after setting, should not dispatch "options" event if doNotDispatch is true', function(done){
-        skeleton.on('options.test', function(){
-          // This block should not be reached.
-          expect(true).to.be.false;
-          done();
-        });
-        skeleton.options({a: 1}, true);
-        setTimeout(done, 100);
-      });
-    });
-
-    describe('#margin(margin, doNotDispatch)', function(){
-      it('should return margin when called without argument', function(){
-        var margin = {left: 10, right: 10, top: 10, bottom: 10};
-        skeleton.margin(margin);
-        expect(skeleton.margin()).to.deep.equal(margin);
-      });
-      it('should set margin when called with at least one argument', function(){
-        var margin = {left: 10, right: 10, top: 10, bottom: 10};
-        skeleton.margin(margin);
-
-        skeleton.margin({left: 20});
-        expect(skeleton.margin().left).to.equal(20);
-        expect(skeleton.margin().right).to.equal(10);
-        skeleton.margin({right: 20});
-        expect(skeleton.margin().right).to.equal(20);
-        skeleton.margin({top: 20});
-        expect(skeleton.margin().top).to.equal(20);
-        skeleton.margin({bottom: 20});
-        expect(skeleton.margin().bottom).to.equal(20);
-      });
-      it('should update innerWidth after setting margin', function(){
-        skeleton.width(100);
-        skeleton.margin({left: 10, right:10});
-        expect(skeleton.getInnerWidth()).to.equal(80);
-        skeleton.margin({left: 15, right:15});
-        expect(skeleton.getInnerWidth()).to.equal(70);
-      });
-      it('should update innerHeight after setting margin', function(){
-        skeleton.height(100);
-        skeleton.margin({top: 10, bottom:10});
-        expect(skeleton.getInnerHeight()).to.equal(80);
-        skeleton.margin({top: 15, bottom:15});
-        expect(skeleton.getInnerHeight()).to.equal(70);
-      });
-      it('should update the root <g> transform/translate', function(){
-        skeleton.margin({left: 30, top: 30});
-        skeleton.offset([0.5, 0.5]);
-        skeleton.margin({left: 10, top: 10});
-        var translate = skeleton.getRootG().attr('transform');
-        expect(translate).to.equal('translate(10.5,10.5)');
-      });
-      it('after setting, should dispatch "resize" event', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should be reached to pass the test.
-          expect(true).to.be.true;
-          done();
-        });
-        skeleton.margin({left: 33});
-      });
-      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should not be reached.
-          expect(true).to.be.false;
-          done();
-        });
-        skeleton.margin({left: 33}, true);
-        setTimeout(done, 100);
-      });
-    });
-
-    describe('#offset(offset)', function(){
-      it('should return offset when called without argument', function(){
-        var offset = [1,1];
-        skeleton.offset(offset);
-        expect(skeleton.offset()).to.deep.equal(offset);
-      });
-      it('should set offset when called with at least one argument', function(){
-        var offset = [1,1];
-        skeleton.offset(offset);
-        skeleton.offset([2,3]);
-        expect(skeleton.offset()).to.deep.equal([2,3]);
-      });
-      it('should update the root <g> transform/translate', function(){
-        skeleton.offset([0.5, 0.5]);
-        skeleton.margin({left: 10, top: 10});
-        skeleton.offset([2,3]);
-        var translate = skeleton.getRootG().attr('transform');
-        expect(translate).to.equal('translate(12,13)');
-      });
-    });
-
-    describe('#width(width, doNotDispatch)', function(){
-      it('should return <svg> width when called without argument', function(){
-        var w = $svg.attr('width');
-        expect(skeleton.width()).to.equal(+w);
-      });
-      it('should set <svg> width when called with Number as the first argument', function(){
-        skeleton.width(300);
-        expect(+$svg.attr('width')).to.equal(300);
-      });
-      it('should set <svg> width when called with a Number and "px" such as "100px" as the first argument', function(){
-        skeleton.width('299px');
-        expect(+$svg.attr('width')).to.equal(299);
-      });
-      it('should set <svg> width to container\'s width when called with "auto" as the first argument', function(){
-        var w = element.clientWidth;
-        skeleton.width('auto');
-        expect(+$svg.attr('width')).to.equal(w);
-      });
-      it('after setting, should dispatch "resize" event', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should be reached to pass the test.
-          expect(true).to.be.true;
-          done();
-        });
-        skeleton.width(200);
-      });
-      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should not be reached.
-          expect(true).to.be.false;
-          done();
-        });
-        skeleton.width(200, true);
-        setTimeout(done, 100);
-      });
-    });
-
-    describe('#height(height, doNotDispatch)', function(){
-      it('should return <svg> height when called without argument', function(){
-        var w = $svg.attr('height');
-        expect(skeleton.height()).to.equal(+w);
-      });
-      it('should set <svg> height when called with Number as the first argument', function(){
-        skeleton.height(300);
-        expect(+$svg.attr('height')).to.equal(300);
-      });
-      it('should set <svg> height when called with a Number and "px" such as "100px" as the first argument', function(){
-        skeleton.height('299px');
-        expect(+$svg.attr('height')).to.equal(299);
-      });
-      it('should set <svg> height to container\'s height when called with "auto" as the first argument', function(){
-        var w = element.clientHeight;
-        skeleton.height('auto');
-        expect(+$svg.attr('height')).to.equal(w);
-      });
-      it('after setting, should dispatch "resize" event', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should be reached to pass the test.
-          expect(true).to.be.true;
-          done();
-        });
-        skeleton.height(200);
-      });
-      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should not be reached.
-          expect(true).to.be.false;
-          done();
-        });
-        skeleton.height(200, true);
-        setTimeout(done, 100);
-      });
-    });
-
-    describe('#dimension(dimension, doNotDispatch)', function(){
-      it('should return an array [width, height] when called without argument', function(){
-        var dim = [+$svg.attr('width'), +$svg.attr('height')];
-        expect(skeleton.dimension()).to.deep.equal(dim);
-      });
-      it('should set width and height of the <svg> when called with an array [width, height] as the first argument', function(){
-        skeleton.dimension([118, 118]);
-        expect([+$svg.attr('width'), +$svg.attr('height')]).to.deep.equal([118, 118]);
-      });
-      it('after setting, should dispatch "resize" event', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should be reached to pass the test.
-          expect(true).to.be.true;
-          done();
-        });
-        skeleton.dimension([150, 150]);
-      });
-      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
-        skeleton.on('resize.test', function(){
-          // This block should not be reached.
-          expect(true).to.be.false;
-          done();
-        });
-        skeleton.dimension([150, 150], true);
-        setTimeout(done, 100);
-      });
-    });
-
-    describe('#hasData()', function(){
-      it('should return true when data are not null nor undefined', function(){
-        skeleton.data({});
-        expect(skeleton.hasData()).to.be.true;
-        skeleton.data({test: 1});
-        expect(skeleton.hasData()).to.be.true;
-        skeleton.data([]);
-        expect(skeleton.hasData()).to.be.true;
-        skeleton.data(['test']);
-        expect(skeleton.hasData()).to.be.true;
-      });
-      it('should return false when data are null or undefined', function(){
-        skeleton.data(null);
-        expect(skeleton.hasData()).to.be.false;
-        skeleton.data(undefined);
-        expect(skeleton.hasData()).to.be.false;
-      });
-    });
-
-    describe('#hasNonZeroArea()', function(){
-      it('should return true if <svg>\'s width & height excluding margin is more than zero', function(){
-        skeleton.options({
-          margin: {left: 10, right: 10}
-        });
-        skeleton.width(80);
-        skeleton.options({
-          margin: {top: 10, bottom: 20}
-        });
-        skeleton.height(50);
-        expect(skeleton.hasNonZeroArea()).to.be.true;
-      });
-      it('should return false otherwise', function(){
-        skeleton.options({
-          margin: {left: 10, right: 10}
-        });
-        skeleton.width(20);
-        skeleton.options({
-          margin: {top: 10, bottom: 20}
-        });
-        skeleton.height(30);
-        expect(skeleton.hasNonZeroArea()).to.be.false;
-      });
-    });
-
-    describe('#mixin({})', function(){
-      it('should extend this skeleton with new fields/functions', function(){
-        skeleton.mixin({
-          a: 1,
-          b: 2
-        });
-        expect(skeleton).to.include.keys(['a', 'b']);
-        expect((<any>skeleton).a).to.equal(1);
-        expect((<any>skeleton).b).to.equal(2);
-      });
-      it('should overwrite existing fields', function(){
-        skeleton.mixin({
-          b: 2
-        });
-        skeleton.mixin({
-          b: 3
-        });
-        expect(skeleton).to.include.keys(['b']);
-        expect((<any>skeleton).b).to.equal(3);
-      });
-      it('should keep original fields if not overwritten', function(){
-        skeleton.mixin({
-          a: 1,
-          b: 2
-        });
-        skeleton.mixin({
-          c: 20,
-          b: 3
-        });
-        expect(skeleton).to.include.keys(['a', 'b', 'c']);
-        expect((<any>skeleton).a).to.equal(1);
-        expect((<any>skeleton).b).to.equal(3);
-        expect((<any>skeleton).c).to.equal(20);
-      });
-    });
-
-    describe('#resizeToFitContainer(mode)', function(){
-      it('when mode is "all" should resize to fit both width and height', function(){
-        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
-        var w = element.clientWidth;
-        var h = element.clientHeight;
-        skeleton.resizeToFitContainer('all');
-        expect(skeleton.dimension()).to.deep.equal([w, h]);
-      });
-      it('when mode is "both" should resize to fit both width and height', function(){
-        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
-        var w = element.clientWidth;
-        var h = element.clientHeight;
-        skeleton.resizeToFitContainer('both');
-        expect(skeleton.dimension()).to.deep.equal([w, h]);
-      });
-      it('when mode is "full" should resize to fit both width and height', function(){
-        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
-        var w = element.clientWidth;
-        var h = element.clientHeight;
-        skeleton.resizeToFitContainer('full');
-        expect(skeleton.dimension()).to.deep.equal([w, h]);
-      });
-      it('when mode is "width" should resize width to fit container but keep original height', function(){
-        var w1 = element.clientWidth/2;
-        var h1 = element.clientHeight/2;
-
-        skeleton.dimension([w1, h1]);
-
-        var w2 = element.clientWidth;
-        var h2 = element.clientHeight;
-
-        skeleton.resizeToFitContainer('width');
-
-        expect(skeleton.width()).to.equal(Math.floor(w2));
-        expect(skeleton.height()).to.equal(Math.floor(h1));
-        expect(skeleton.width()).to.not.equal(w1);
-        expect(skeleton.height()).to.not.equal(h2);
-      });
-      it('when mode is "height" should resize height to fit container but keep original width', function(){
-        var w1 = element.clientWidth/2;
-        var h1 = element.clientHeight*2;
-
-        skeleton.dimension([w1, h1]);
-
-        var w2 = element.clientWidth;
-        var h2 = element.clientHeight;
-
-        skeleton.resizeToFitContainer('height');
-
-        expect(skeleton.width()).to.equal(Math.floor(w1));
-        expect(skeleton.height()).to.equal(Math.floor(h2));
-        expect(skeleton.width()).to.not.equal(w2);
-        expect(skeleton.height()).to.not.equal(h1);
-      });
-    });
-
-    describe('#resizeToAspectRatio(ratio)', function(){
-      // todo
-    });
-
-    describe('#autoResize(mode)', function(){
-      it('should return current mode when called without argument', function(){
-        skeleton.autoResize(false);
-        expect(skeleton.autoResize()).to.be.false;
-        skeleton.autoResize('width');
-        expect(skeleton.autoResize()).to.equal('width');
-      });
-      it('should enable auto resize when set mode to "width/height/both/etc.", similar to parameters of resizeToFitContainer()', function(done){
-        // set initial size
-        skeleton.width(50);
-        skeleton.autoResize('width');
-        setTimeout(function(){
-          expect(skeleton.width()).to.equal(element.clientWidth);
-          done();
-        }, 500);
-      });
-      it('should disable auto resize when set mode to false', function(done){
-        // set initial size
-        skeleton.width(50);
-        skeleton.autoResize('width');
-        setTimeout(function(){
-          expect(skeleton.width()).to.equal(element.clientWidth);
-          // disable resize and
-          skeleton.autoResize(false);
-          skeleton.width(50);
-          setTimeout(function(){
-            expect(skeleton.width()).to.not.equal(element.clientWidth);
-            done();
-          }, 500);
-        }, 500);
-      });
-    });
-
-    describe('#autoResizeDetection(detection)', function(){
-      // todo
-    });
-
-    describe('#autoResizeToAspectRatio(ratio)', function(){
-      // todo
-    });
-
-
-});
-
-describe.only('LayerOrganizer', function(){
-
-  describe('new LayerOrganizer(container) will create layers as <g> by default', function(){
-    var container: d3.Selection<any>, layers: d3kit.LayerOrganizer;
-    before(function(done){
-      container = d3.select('body').append('svg').append('g');
-      layers = new d3kit.LayerOrganizer(container);
-      done();
-    });
-
-    describe('#create(names)', function(){
-      it('should create single layer given a String', function(){
-        layers.create('single');
-        expect(container.select('g.single-layer').size()).to.be.equal(1);
-      });
-
-      it('should create multiple layers given an array', function(){
-        layers.create(['a', 'b', 'c']);
-        expect(container.select('g.a-layer').size()).to.be.equal(1);
-        expect(container.select('g.b-layer').size()).to.be.equal(1);
-        expect(container.select('g.c-layer').size()).to.be.equal(1);
-      });
-
-      it('should create nested layers given a plain Object with a String inside', function(){
-        layers.create({d: 'e'});
-        expect(container.select('g.d-layer').size()).to.be.equal(1);
-        expect(container.select('g.d-layer g.e-layer').size()).to.be.equal(1);
-      });
-
-      it('should create nested layers given a plain Object with an Array inside', function(){
-        layers.create({f: ['g', 'h']});
-        expect(container.select('g.f-layer').size()).to.be.equal(1);
-        expect(container.select('g.f-layer g.g-layer').size()).to.be.equal(1);
-        expect(container.select('g.f-layer g.h-layer').size()).to.be.equal(1);
-      });
-
-      it('should create multiple nested layers given an array of objects', function(){
-        layers.create([{'i': ['x']}, {'j': 'x'}, {'k': ['x','y']}]);
-        expect(container.select('g.i-layer').size()).to.be.equal(1);
-        expect(container.select('g.j-layer').size()).to.be.equal(1);
-        expect(container.select('g.k-layer').size()).to.be.equal(1);
-        expect(container.select('g.i-layer g.x-layer').size()).to.be.equal(1);
-        expect(container.select('g.i-layer g.x-layer').size()).to.be.equal(1);
-        expect(container.select('g.k-layer g.x-layer').size()).to.be.equal(1);
-        expect(container.select('g.k-layer g.y-layer').size()).to.be.equal(1);
-      });
-
-      it('should create multi-level nested layers given a nested plain Object', function(){
-        layers.create({
-          l: [
-            'm',
-            {'n': [
-              {'o': ['p']}, 'q'
-            ]}
-          ]
-        });
-        expect(container.select('g.l-layer').size()).to.be.equal(1);
-        expect(container.select('g.l-layer g.m-layer').size()).to.be.equal(1);
-        expect(container.select('g.l-layer g.n-layer').size()).to.be.equal(1);
-        expect(container.select('g.l-layer g.n-layer g.o-layer').size()).to.be.equal(1);
-        expect(container.select('g.l-layer g.n-layer g.o-layer g.p-layer').size()).to.be.equal(1);
-        expect(container.select('g.l-layer g.n-layer g.q-layer').size()).to.be.equal(1);
-      });
-
-    });
-
-    describe('#has(name)', function(){
-      it('should be able to check first-level layer', function(){
-        expect(layers.has('single')).to.be.true;
-        expect(layers.has('test')).to.be.false;
-      });
-      it('should be able to check second-level layer', function(){
-        expect(layers.has('l.m')).to.be.true;
-        expect(layers.has('l.x')).to.be.false;
-      });
-      it('should be able to check third-level layer', function(){
-        expect(layers.has('l.n.q')).to.be.true;
-        expect(layers.has('l.n.x')).to.be.false;
-      });
-    });
-
-    describe('#get(name)', function(){
-      it('should be able to get first-level layer', function(){
-        expect(layers.get('single')).to.exist;
-        expect(layers.get('test')).to.be.not.exist;
-      });
-      it('should be able to get second-level layer', function(){
-        expect(layers.get('l.m')).to.exist;
-        expect(layers.get('l.x')).to.not.exist;
-      });
-      it('should be able to get third-level layer', function(){
-        expect(layers.get('l.n.o')).to.exist;
-        expect(layers.get('l.n.x')).to.not.exist;
-      });
-    });
-  });
-
-  describe('new LayerOrganizer(container, tag) will create layers with the given tag instead of <g>', function(){
-    var container: d3.Selection<any>, layers: d3kit.LayerOrganizer;
-    before(function(done){
-      container = d3.select('body').append('div');
-      layers = new d3kit.LayerOrganizer(container, 'div');
-      done();
-    });
-
-    describe('#create(names)', function(){
-      it('should create single layer given a String', function(){
-        layers.create('single');
-        expect(container.select('div.single-layer').size()).to.be.equal(1);
-      });
-
-      it('should create multiple layers given an array', function(){
-        layers.create(['a', 'b', 'c']);
-        expect(container.select('div.a-layer').size()).to.be.equal(1);
-        expect(container.select('div.b-layer').size()).to.be.equal(1);
-        expect(container.select('div.c-layer').size()).to.be.equal(1);
-      });
-
-      it('should create nested layers given a plain Object with a String inside', function(){
-        layers.create({d: 'e'});
-        expect(container.select('div.d-layer').size()).to.be.equal(1);
-        expect(container.select('div.d-layer div.e-layer').size()).to.be.equal(1);
-      });
-
-      it('should create nested layers given a plain Object with an Array inside', function(){
-        layers.create({f: ['g', 'h']});
-        expect(container.select('div.f-layer').size()).to.be.equal(1);
-        expect(container.select('div.f-layer div.g-layer').size()).to.be.equal(1);
-        expect(container.select('div.f-layer div.h-layer').size()).to.be.equal(1);
-      });
-
-      it('should create multiple nested layers given an array of objects', function(){
-        layers.create([{'i': ['x']}, {'j': 'x'}, {'k': ['x','y']}]);
-        expect(container.select('div.i-layer').size()).to.be.equal(1);
-        expect(container.select('div.j-layer').size()).to.be.equal(1);
-        expect(container.select('div.k-layer').size()).to.be.equal(1);
-        expect(container.select('div.i-layer div.x-layer').size()).to.be.equal(1);
-        expect(container.select('div.i-layer div.x-layer').size()).to.be.equal(1);
-        expect(container.select('div.k-layer div.x-layer').size()).to.be.equal(1);
-        expect(container.select('div.k-layer div.y-layer').size()).to.be.equal(1);
-      });
-
-      it('should create multi-level nested layers given a nested plain Object', function(){
-        layers.create({
-          l: [
-            'm',
-            {'n': [
-              {'o': ['p']}, 'q'
-            ]}
-          ]
-        });
-        expect(container.select('div.l-layer').size()).to.be.equal(1);
-        expect(container.select('div.l-layer div.m-layer').size()).to.be.equal(1);
-        expect(container.select('div.l-layer div.n-layer').size()).to.be.equal(1);
-        expect(container.select('div.l-layer div.n-layer div.o-layer').size()).to.be.equal(1);
-        expect(container.select('div.l-layer div.n-layer div.o-layer div.p-layer').size()).to.be.equal(1);
-        expect(container.select('div.l-layer div.n-layer div.q-layer').size()).to.be.equal(1);
-      });
-
-    });
-
-    describe('#has(name)', function(){
-      it('should be able to check first-level layer', function(){
-        expect(layers.has('single')).to.be.true;
-        expect(layers.has('test')).to.be.false;
-      });
-      it('should be able to check second-level layer', function(){
-        expect(layers.has('l.m')).to.be.true;
-        expect(layers.has('l.x')).to.be.false;
-      });
-      it('should be able to check third-level layer', function(){
-        expect(layers.has('l.n.q')).to.be.true;
-        expect(layers.has('l.n.x')).to.be.false;
-      });
-    });
-
-    describe('#get(name)', function(){
-      it('should be able to get first-level layer', function(){
-        expect(layers.get('single')).to.exist;
-        expect(layers.get('test')).to.be.not.exist;
-      });
-      it('should be able to get second-level layer', function(){
-        expect(layers.get('l.m')).to.exist;
-        expect(layers.get('l.x')).to.not.exist;
-      });
-      it('should be able to get third-level layer', function(){
-        expect(layers.get('l.n.o')).to.exist;
-        expect(layers.get('l.n.x')).to.not.exist;
-      });
-    });
-  });
-
-});
-
-describe('Chartlet', function(){
-  interface ConfigureFunction {
-      (parent: d3kit.Chartlet, child: d3kit.Chartlet): void;
-  }
-  var enter: d3kit.ChartletEventFunction, update: d3kit.ChartletEventFunction, exit: d3kit.ChartletEventFunction, chartlet: d3kit.Chartlet;
-  var customEvents: Array<string> = ['fooEvent'];
-  var ChildChartlet: () => d3kit.Chartlet;
-  var ParentChartlet: (configureFunction: ConfigureFunction) => d3kit.Chartlet;
-
-  var callback = function(selection?: d3.Selection<any>, done?: any) { return (sel: d3.Selection<any>) => {done();};};
-  beforeEach(function(done){
-    ChildChartlet = function() {
-      var chartlet = new d3kit.Chartlet(callback, callback, callback);
-      (<any>chartlet).runTest = function (testFunction: any) {
-        testFunction(chartlet);
-      };
-      return chartlet;
-    };
-
-    ParentChartlet = function(configureFunction: ConfigureFunction) {
-      var chartlet = new d3kit.Chartlet(callback, callback, callback);
-      var child = ChildChartlet();
-      configureFunction(chartlet, child);
-      (<any>chartlet).runTest = (<any>child).runTest;
-      return chartlet;
-    };
-
-    enter  = callback;
-    update = callback;
-    exit   = callback;
-    chartlet = new d3kit.Chartlet(enter, update, exit, customEvents);
-    done();
-  });
-
-  describe('new Chartlet(enter, update, exit, customEvents)', function(){
-    it('should create a chartlet', function(){
-      expect(chartlet).to.be.an('Object');
-      expect(chartlet).to.include.keys(['property', 'on']);
-      expect(chartlet.enter).to.be.a('Function');
-      expect(chartlet.update).to.be.a('Function');
-      expect(chartlet.exit).to.be.a('Function');
-      expect(function(){ chartlet.enter(); }).to.not.throw(Error);
-      expect(function(){ chartlet.update(); }).to.not.throw(Error);
-      expect(function(){ chartlet.exit(); }).to.not.throw(Error);
-      expect(chartlet.getCustomEventNames()).to.deep.equal(customEvents);
-    });
-    it('arguments "update", "exit" and "customEvents" are optional', function(){
-      var comp = new d3kit.Chartlet(enter);
-      expect(comp).to.be.an('Object');
-      expect(comp).to.include.keys(['property', 'on']);
-      expect(comp.enter).to.be.a('Function');
-      expect(comp.update).to.be.a('Function');
-      expect(comp.exit).to.be.a('Function');
-      expect(function(){ comp.enter(); }).to.not.throw(Error);
-      expect(function(){ comp.update(); }).to.not.throw(Error);
-      expect(function(){ comp.exit(); }).to.not.throw(Error);
-    });
-  });
-
-  describe('#getDispatcher()', function(){
-    it('should return a dispatcher', function(){
-      var dispatcher = chartlet.getDispatcher();
-      expect(dispatcher).to.exist;
-    });
-    it('returned dispatcher should handle enter/update/exit events', function(){
-      var dispatcher = chartlet.getDispatcher();
-      expect(dispatcher).to.include.keys(['enterDone', 'updateDone', 'exitDone'].concat(customEvents));
-    });
-  });
-
-  describe('#getPropertyValue(name, d, i)', function(){
-    it('should return computed value for specified property name, d and i', function(){
-      var d = {a: 99};
-      var i = 2;
-
-      chartlet.property('foo', 1);
-      chartlet.property('bar', 'two');
-      chartlet.property('baz', function(d:{a:number}, i: number) {return 3;});
-      chartlet.property('qux', function(d:{a:number}, i: number) {return 'four';});
-      chartlet.property('nux', function(d:{a:number}, i: number) {return d.a * i;});
-
-      expect(chartlet.getPropertyValue('foo', d, i)).to.equal(1);
-      expect(chartlet.getPropertyValue('bar', d, i)).to.equal('two');
-      expect(chartlet.getPropertyValue('baz', d, i)).to.equal(3);
-      expect(chartlet.getPropertyValue('qux', d, i)).to.equal('four');
-      expect(chartlet.getPropertyValue('nux', d, i)).to.equal(198);
-    });
-  });
-
-  describe('#property(name, valueOrFn)', function(){
-    describe('should act as a getter when called with one argument', function(){
-      it('should always return a function', function(){
-        chartlet.property('foo', 1);
-        expect(chartlet.property('foo')).to.be.a('Function');
-        chartlet.property('bar', function(){ return 100; });
-        expect(chartlet.property('bar')).to.be.a('Function');
-      });
-      it('should return a function that return undefined for unknown property name', function(){
-        expect(chartlet.property('unknown name')).to.be.a('Function');
-        expect(chartlet.property('unknown name')()).to.equal(undefined);
-      });
-    });
-
-    describe('should act as a setter when called with two arguments', function(){
-      it('should set specified property to a functor of given value', function(){
-        chartlet.property('foo', 1);
-        expect(chartlet.property('foo')).to.be.a('Function');
-        expect(chartlet.property('foo')()).to.equal(1);
-        chartlet.property('bar', function(){ return 100; });
-        expect(chartlet.property('bar')).to.be.a('Function');
-        expect(chartlet.property('bar')()).to.equal(100);
-      });
-      it('should overwrite previous value when set property with the same name', function(){
-        chartlet.property('foo', 1);
-        expect(chartlet.property('foo')()).to.equal(1);
-        chartlet.property('foo', 100);
-        expect(chartlet.property('foo')()).to.equal(100);
-      });
-    });
-  });
-
-  describe('#on(eventName, listener)', function(){
-    it('event "enterDone" should be triggered after chartlet.enter() is completed.', function(done){
-      chartlet.on('enterDone', function(){ return (sel: d3.Selection<any>) => {done();} });
-      chartlet.enter();
-    });
-    it('event "updateDone" should be triggered after chartlet.update() is completed.', function(done){
-      chartlet.on('updateDone', function(){ return (sel: d3.Selection<any>) => {done();} });
-      chartlet.update();
-    });
-    it('event "exitDone" should be triggered after chartlet.exit() is completed.', function(done){
-      chartlet.on('exitDone', function(){ return (sel: d3.Selection<any>) => {done();} });
-      chartlet.exit();
-    });
-  });
-
-  describe('#inheritPropertyFrom(parentChartlet, parentPropertyName, childPropertyName)', function(){
-    it('it should cause a child to inherit a parent property', function() {
-      var parent = ParentChartlet(function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
-          child.inheritPropertyFrom(parent, 'foo', 'bar');
-        })
-        .property('foo', function(d:number) {return 2 * d;});
-
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
-        expect(child.getPropertyValue('bar', 4, 0)).to.be.equal(8);
-      });
-    });
-
-    it('it should default to the parent property name', function() {
-      var parent = ParentChartlet(
-        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
-          child.inheritPropertyFrom(parent, 'foo');
-        })
-        .property('foo', function(d:number) {return 2 * d;});
-
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
-        expect(child.getPropertyValue('foo', 4, 0)).to.be.equal(8);
-      });
-    });
-  });
-
-  describe('#inheritProperties(parentChartlet, parentPropertyNames, childPropertyNames)', function(){
-    it('it should cause a child to inherit many parent properties', function() {
-      var parent = ParentChartlet(
-        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
-          child.inheritPropertiesFrom(parent, ['foo', 'bar', 'baz'], ['foo-x', 'bar-x', 'baz-x']);
-        })
-        .property('foo', function(d:number) {return 2 * d;})
-        .property('bar', function(d:number) {return 3 * d;})
-        .property('baz', function(d:number) {return 4 * d;});
-
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
-        expect(child.getPropertyValue('foo-x', 1, 0)).to.be.equal(2);
-        expect(child.getPropertyValue('bar-x', 1, 0)).to.be.equal(3);
-        expect(child.getPropertyValue('baz-x', 1, 0)).to.be.equal(4);
-      });
-    });
-
-    it('it should default to the parent property names', function() {
-      var parent = ParentChartlet(
-        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
-          child.inheritPropertiesFrom(parent, ['foo', 'bar', 'baz']);
-        })
-        .property('foo', function(d:number) {return 2 * d;})
-        .property('bar', function(d:number) {return 3 * d;})
-        .property('baz', function(d:number) {return 4 * d;});
-
-      (<any>parent).runTest(function(child: d3kit.Chartlet) {
-        expect(child.getPropertyValue('foo', 1, 0)).to.be.equal(2);
-        expect(child.getPropertyValue('bar', 1, 0)).to.be.equal(3);
-        expect(child.getPropertyValue('baz', 1, 0)).to.be.equal(4);
-      });
-    });
-  });
-
-  describe('#publishEventsTo(foreignDispatcher)', function(){
-    it('should map events to a foreignDispatcher', function(done) {
-
-      var parent = new d3kit.Chartlet(callback, callback, callback, ['foo']);
-      parent.getDispatcher().on('foo', function(value:number) {
-        expect(value).to.be.equal(99);
-        done();
-      });
-
-      var child = new d3kit.Chartlet(callback, callback, callback, ['foo'])
-        .publishEventsTo(parent.getDispatcher());
-
-      (<any>child.getDispatcher()).foo(99);
-    });
-  });
-});
-
-describe('#createChart', function(){
-  var Chart = d3kit.factory.createChart({}, ['test'], function(skeleton: d3kit.Skeleton){
-    return skeleton;
-  });
-
-  it('should return a function to create a chart', function(){
-    expect(Chart).to.be.a('Function');
-  });
-
-  // // Don't think it's possible to define these in a d.ts file; skipping
-  // it('results should have function getCustomEvents()', function(){
-  //   expect(Chart.getCustomEvents).to.exist;
-  //   expect(Chart.getCustomEvents()).to.deep.equal(['test']);
-  // });
-});
-
-describe('d3kit.helper', function(){
-
-  describe('#dasherize(str)', function(){
-    it('should convert input to dash-case', function(){
-      expect(d3kit.helper.dasherize('camelCase')).to.equal('camel-case');
-    });
-  });
-
-  describe('#deepExtend(target, src1, src2, ...)', function(){
-    it('should copy fields from sources into target', function(){
-      expect(d3kit.helper.deepExtend({}, {
-        a: 1,
-        b: 2
-      },{
-        b: 3,
-        c: 4
-      })).to.deep.equal({
-        a: 1,
-        b: 3,
-        c: 4
-      });
-
-      expect(d3kit.helper.deepExtend({}, {
-        a: 1,
-        b: 2
-      },{
-        b: 3,
-        c: 4
-      }, null)).to.deep.equal({
-        a: 1,
-        b: 3,
-        c: 4
-      });
-    });
-
-    it('should copy arrays and functions correctly from sources into target', function(){
-      var fn1 = function(d:number){return d + 1;};
-      var fn2 = function(d:number){return d + 2;};
-      expect(d3kit.helper.deepExtend({}, {
-        a: fn1,
-        b: [1,2]
-      },{
-        b: [3,4],
-        c: fn2
-      })).to.deep.equal({
-        a: fn1,
-        b: [3,4],
-        c: fn2
-      });
-    });
-
-    it('should perform "deep" copy', function(){
-      var fn1 = function(d:number){return d + 1;};
-      var fn2 = function(d:number){return d + 2;};
-      expect(d3kit.helper.deepExtend({}, {
-        a: { d: fn1 },
-        b: [1,2],
-        c: { f: 3 },
-        h: { i: [1,2,3], j: [3,4,5] }
-      },{
-        a: { e: 2 },
-        b: [3,4],
-        c: { f: 4, g: fn2 },
-        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
-      })).to.deep.equal({
-        a: { d: fn1, e: 2 },
-        b: [3,4],
-        c: { f: 4, g: fn2 },
-        h: { i: [2,3,4], j: [3,4,5], k: [3,4,5], l: {m: 2} }
-      });
-    });
-  });
-
-  describe('#extend(target, src1, src2, ...)', function(){
-    it('should copy fields from sources into target', function(){
-      expect(d3kit.helper.extend({}, {
-        a: 1,
-        b: 2
-      },{
-        b: 3,
-        c: 4
-      })).to.deep.equal({
-        a: 1,
-        b: 3,
-        c: 4
-      });
-
-      expect(d3kit.helper.extend({}, {
-        a: 1,
-        b: 2
-      },{
-        b: 3,
-        c: 4
-      }, null)).to.deep.equal({
-        a: 1,
-        b: 3,
-        c: 4
-      });
-    });
-
-    it('should copy arrays and functions correctly from sources into target', function(){
-      var fn1 = function(d:number){return d + 1;};
-      var fn2 = function(d:number){return d + 2;};
-      expect(d3kit.helper.extend({}, {
-        a: fn1,
-        b: [1,2]
-      },{
-        b: [3,4],
-        c: fn2
-      })).to.deep.equal({
-        a: fn1,
-        b: [3,4],
-        c: fn2
-      });
-    });
-
-    it('should NOT perform "deep" copy', function(){
-      var fn1 = function(d:number){return d + 1;};
-      var fn2 = function(d:number){return d + 2;};
-      expect(d3kit.helper.extend({}, {
-        a: { d: fn1 },
-        b: [1,2],
-        c: { f: 3 },
-        h: { i: [1,2,3], j: [3,4,5] }
-      },{
-        a: { e: 2 },
-        b: [3,4],
-        c: { f: 4, g: fn2 },
-        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
-      })).to.deep.equal({
-        a: { e: 2 },
-        b: [3,4],
-        c: { f: 4, g: fn2 },
-        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
-      });
-    });
-  });
-
-  describe('#isFunction(function)', function(){
-    it('should return true if the value is a function', function(){
-      var fn1 = function(d:number){return d + 1;};
-      function fn2(d:number){return d + 2;}
-
-      expect(d3kit.helper.isFunction(fn1)).to.be.true;
-      expect(d3kit.helper.isFunction(fn2)).to.be.true;
-    });
-    it('should return false if the value is not a function', function(){
-      expect(d3kit.helper.isFunction(0)).to.be.false;
-      expect(d3kit.helper.isFunction(1)).to.be.false;
-      expect(d3kit.helper.isFunction(true)).to.be.false;
-      expect(d3kit.helper.isFunction('what')).to.be.false;
-      expect(d3kit.helper.isFunction(null)).to.be.false;
-      expect(d3kit.helper.isFunction(undefined)).to.be.false;
-    });
-  });
-
-  describe('#isNumber(value)', function(){
-    it('should return true for number', function(){
-      expect(d3kit.helper.isNumber(1)).to.be.true;
-      expect(d3kit.helper.isNumber(0)).to.be.true;
-      expect(d3kit.helper.isNumber(-1)).to.be.true;
-    });
-    it('should return false for string even if it is a number', function(){
-      expect(d3kit.helper.isNumber('')).to.be.false;
-      expect(d3kit.helper.isNumber('1')).to.be.false;
-      expect(d3kit.helper.isNumber('0')).to.be.false;
-      expect(d3kit.helper.isNumber('what')).to.be.false;
-    });
-    it('should return false for null and undefined', function(){
-      expect(d3kit.helper.isNumber(null)).to.be.false;
-      expect(d3kit.helper.isNumber(undefined)).to.be.false;
-    });
-  });
-});
 
+function test_abstract_chart() {
+    let el: Element,
+        chart: AbstractChart,
+        options: AbstractChart.ChartOptions,
+        margins: AbstractChart.ChartMargin,
+        offsets: AbstractChart.ChartOffset,
+        defopts: AbstractChart.ChartOptions,
+        fitopts: AbstractChart.FitOptions,
+        watchop: AbstractChart.WatchOptions,
+        events: string[],
+        w: number, h:number, d: [number, number], a: any, b: boolean;
+
+    // create a div, append to body, return Node as type Element
+    el = document.body.appendChild(document.createElement('div')) as Element;
+
+    // create examples of margins, offsets, options, fit options, watch options
+    margins = { top: 20, right: 20, bottom: 20, left: 20};
+    offsets = { x: 0.5, y: 0.5 };
+    options = { initialWidth: 400, initialHeight: 300, margin: margins, offset: offsets };
+    fitopts = { mode: 'basic', width: '90%', ratio: 4/3 };
+    watchop = { mode: 'window', target: null, interval: 500 };
+
+    /**
+     * Test constructor
+     */
+    chart = new AbstractChart(el); // with element
+    chart = new AbstractChart('div#chart'); // with selector
+    chart = new AbstractChart(el, options); // with element+options
+    chart = new AbstractChart('div#chart', options); // with selector+options
+
+    /**
+     * Test static functions
+     */
+    defopts = AbstractChart.getDefaultOptions();
+    events  = AbstractChart.getCustomEventNames();
+
+    /**
+     * Test getters
+     */
+    w = chart.getInnerWidth();
+    h = chart.getInnerHeight();
+    w = chart.width();
+    h = chart.height();
+    d = chart.dimension();
+    a = chart.data();
+    margins = chart.margin();
+    offsets = chart.offset();
+    options = chart.options();
+    events  = chart.getCustomEventNames();
+
+    /**
+     * Test setters
+     */
+    chart.width(w);
+    chart.height(h);
+    chart.dimension(d);
+    chart.data([1, 2, 3, 4, 5, 6]);
+    chart.margin(margins);
+    chart.offset(offsets);
+    chart.options(options);
+
+    /**
+     * Test booleans
+     */
+    b = chart.hasData();
+    b = chart.hasNonZeroArea();
+
+    /**
+     * Test events
+     */
+    chart.dimension(d).updateDimensionNow();
+    chart.setupDispatcher(['click', 'mouseover']);
+    chart.fit(fitopts); // without watch options
+    chart.fit(fitopts, watchop); // with watch options
+    chart.stopFitWatcher();
+    chart.on('mouseover', () => { chart.stopFitWatcher(); });
+    chart.off('mouseover');
+    chart.destroy();
+}
+
+function test_svgchart() {
+    let el: Element,
+        chart: SvgChart,
+        options: AbstractChart.ChartOptions,
+        margins: AbstractChart.ChartMargin,
+        offsets: AbstractChart.ChartOffset,
+        svg: SVGElement, rootg: SVGElement, layers: d3kit.LayerOrganizer;
+
+    // create a div, append to body, return Node as type Element
+    el = document.body.appendChild(document.createElement('div')) as Element;
+
+    // create examples of margins, offsets, options, fit options, watch options
+    margins = { top: 20, right: 20, bottom: 20, left: 20};
+    offsets = { x: 0.5, y: 0.5 };
+    options = { initialWidth: 400, initialHeight: 300, margin: margins, offset: offsets };
+
+    /**
+     * Test constructor
+     */
+    chart = new SvgChart(el); // with element
+    chart = new SvgChart('div#chart'); // with selector
+    chart = new SvgChart(el, options); // with element+options
+    chart = new SvgChart('div#chart', options); // with selector+options
+
+    /**
+     * Test properties
+     */
+    svg    = chart.svg;
+    rootg  = chart.rootG;
+    layers = chart.layers;
+}
+
+function test_canvaschart() {
+    let el: Element,
+        chart: CanvasChart,
+        options: AbstractChart.ChartOptions,
+        margins: AbstractChart.ChartMargin,
+        offsets: AbstractChart.ChartOffset,
+        context: CanvasRenderingContext2D;
+
+    // create a div, append to body, return Node as type Element
+    el = document.body.appendChild(document.createElement('div')) as Element;
+
+    // create examples of margins, offsets, options, fit options, watch options
+    margins = { top: 20, right: 20, bottom: 20, left: 20};
+    offsets = { x: 0.5, y: 0.5 };
+    options = { initialWidth: 400, initialHeight: 300, margin: margins, offset: offsets, pixelRatio: 1 };
+
+    /**
+     * Test constructor
+     */
+    chart = new CanvasChart(el); // with element
+    chart = new CanvasChart('div#chart'); // with selector
+    chart = new CanvasChart(el, options); // with element+options
+    chart = new CanvasChart('div#chart', options); // with selector+options
+
+    /**
+     * Test canvas chart functions
+     */
+    context = chart.getContext2d();
+    options = CanvasChart.getDefaultOptions();
+    chart.clear();
+}
+
+function test_layer_organizer() {
+    let selection: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
+        layer: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
+        layers: d3kit.LayerOrganizer,
+        hasXAxis: boolean;
+
+    selection = d3.select('svg');
+
+    /**
+     * Test constructor
+     */
+    layers = new d3kit.LayerOrganizer(selection);        // without specifying tag
+    layers = new d3kit.LayerOrganizer(selection, 'div'); // specifying tag
+
+    /**
+     * Test layer creation
+     */
+    layers.create('graph');
+    layers.create(['graph', 'highlight']);
+    layers.create({'graph': [{'axes':['x-axis', 'y-axis']}, {'labels':['x-label', 'y-label', 'title']}]});
+    layers.create([{'axes':['x-axis', 'y-axis']}, {'labels':['x-label', 'y-label', 'title']}]);
+
+    /**
+     * Test other layer organizer functions
+     */
+    layer    = layers.get('x-axis');
+    hasXAxis = layers.has('x-axis');
+}
+
+function test_helper() {
+    let simple1: Object = { "one": 1 },
+        simple2: Object = { "two": 2 },
+        complex: Object = { "fruit": ["apple", "pear", "grape"], "prez": { "fn": "Barack", "ln": "Obama" } },
+        merged1: Object, merged2: Object,
+        anObject: Object = {"this": "isanobject"}, isObj: boolean,
+        aFuncxn = () => "this is a function", isFunc: boolean,
+        kebabed: string, dbouncd: any, throtld: any;
+
+    dbouncd = helper.debounce(aFuncxn, 300);
+    merged1 = helper.extend(simple1, simple2);
+    merged2 = helper.deepExtend(simple1, complex);
+    aFuncxn = helper.functor(aFuncxn); // with a function argument
+    aFuncxn = helper.functor(simple1); // with a value argument
+    isObj   = helper.isObject(anObject);
+    isFunc  = helper.isFunction(aFuncxn);
+    kebabed = helper.kebabCase("a string to convert to kebab case");
+    throtld = helper.throttle(aFuncxn, 300);
+}
\ No newline at end of file
diff --git a/d3kit/d3kit-v1.1.0-tests.ts b/d3kit/d3kit-v1.1.0-tests.ts
new file mode 100644
index 0000000000..5eab2a4e79
--- /dev/null
+++ b/d3kit/d3kit-v1.1.0-tests.ts
@@ -0,0 +1,1112 @@
+/// <reference path="d3kit.d.ts" />
+/// <reference types="d3" />
+/// <reference types="mocha" />
+/// <reference types="chai" />
+
+/* jshint expr: true */
+
+var expect = chai.expect;
+describe('Skeleton', function(){
+    var element: Element, $element: d3.Selection<any>, $svg: d3.Selection<any>, skeleton: d3kit.Skeleton;
+
+    beforeEach(function(done){
+      element = document.body.appendChild(document.createElement('div')) as Element;
+      skeleton = new d3kit.Skeleton(element, null, ['custom1', 'custom2']);
+      $element = d3.select(element);
+      $svg = $element.select('svg');
+      done();
+    });
+
+    describe('new Skeleton()', function(){
+      it('should create <svg> inside the element', function(){
+        expect($element.select('svg').size()).to.be.equal(1);
+      });
+      it('should create <g> inside <svg> inside the element', function(){
+        expect($element.select('svg').select('g').size()).to.be.equal(1);
+      });
+    });
+
+    describe('#getCustomEventNames()', function(){
+      it('should return custom event names', function(){
+        expect(skeleton.getCustomEventNames()).to.deep.equal(['custom1', 'custom2']);
+      });
+    });
+
+    describe('#getDispatcher()', function(){
+      it('should return event dispatcher', function(){
+        expect(skeleton.getDispatcher()).to.be.an('Object');
+        expect(skeleton.getDispatcher().data).to.be.a('Function');
+      });
+    });
+
+    describe('#getInnerWidth()', function(){
+      it('should return width of the skeleton excluding margin', function(){
+        skeleton.options({
+          margin: {left: 10, right: 10}
+        });
+        skeleton.width(100);
+        expect(skeleton.getInnerWidth()).to.equal(80);
+      });
+    });
+
+    describe('#getInnerHeight()', function(){
+      it('should return height of the skeleton excluding margin', function(){
+        skeleton.options({
+          margin: {top: 10, bottom: 20}
+        });
+        skeleton.height(100);
+        expect(skeleton.getInnerHeight()).to.equal(70);
+      });
+    });
+
+    describe('#getLayerOrganizer()', function(){
+      it('should return the LayerOrganizer', function(){
+        expect(skeleton.getLayerOrganizer()).to.be.an('Object');
+      });
+    });
+
+    describe('#getRootG()', function(){
+      it('should return d3 selection of the root <g>', function(){
+        var g = skeleton.getRootG();
+        expect(g.size()).to.equal(1);
+        expect((g[0][0] as Element).tagName).to.equal('g');
+      });
+    });
+
+    describe('#getSvg()', function(){
+      it('should return d3 selection of the <svg>', function(){
+        var svg = skeleton.getSvg();
+        expect(svg.size()).to.equal(1);
+        expect((svg[0][0] as Element).tagName).to.equal('svg');
+      });
+    });
+
+    describe('#data(data, doNotDispatch)', function(){
+      it('should return data when called without argument', function(){
+        skeleton.data({a: 1});
+        expect(skeleton.data()).to.deep.equal({a: 1});
+      });
+      it('should set data when called with at least one argument', function(){
+        skeleton.data('test');
+        expect(skeleton.data()).to.equal('test');
+      });
+      it('after setting, should dispatch "data" event', function(done){
+        skeleton.on('data.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.data({a: 1});
+      });
+      it('after setting, should not dispatch "data" event if doNotDispatch is true', function(done){
+        skeleton.on('data.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.data({a: 1}, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#options(options, doNotDispatch)', function(){
+      it('should return options when called without argument', function(){
+        skeleton.options({a: 2});
+        expect(skeleton.options()).to.include.keys(['a']);
+        expect(skeleton.options().a).to.equal(2);
+      });
+      it('should set options when called with at least one argument', function(){
+        skeleton.options({a: 1});
+        expect(skeleton.options()).to.include.keys(['a']);
+        expect(skeleton.options().a).to.equal(1);
+      });
+      it('should not overwrite but extend existing options when setting', function(){
+        skeleton.options({a: 1});
+        skeleton.options({b: 2});
+        expect(skeleton.options()).to.include.keys(['a', 'b']);
+        expect(skeleton.options().a).to.equal(1);
+        expect(skeleton.options().b).to.equal(2);
+      });
+      it('after setting, should dispatch "options" event', function(done){
+        skeleton.on('options.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.options({a: 1});
+      });
+      it('after setting, should not dispatch "options" event if doNotDispatch is true', function(done){
+        skeleton.on('options.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.options({a: 1}, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#margin(margin, doNotDispatch)', function(){
+      it('should return margin when called without argument', function(){
+        var margin = {left: 10, right: 10, top: 10, bottom: 10};
+        skeleton.margin(margin);
+        expect(skeleton.margin()).to.deep.equal(margin);
+      });
+      it('should set margin when called with at least one argument', function(){
+        var margin = {left: 10, right: 10, top: 10, bottom: 10};
+        skeleton.margin(margin);
+
+        skeleton.margin({left: 20});
+        expect(skeleton.margin().left).to.equal(20);
+        expect(skeleton.margin().right).to.equal(10);
+        skeleton.margin({right: 20});
+        expect(skeleton.margin().right).to.equal(20);
+        skeleton.margin({top: 20});
+        expect(skeleton.margin().top).to.equal(20);
+        skeleton.margin({bottom: 20});
+        expect(skeleton.margin().bottom).to.equal(20);
+      });
+      it('should update innerWidth after setting margin', function(){
+        skeleton.width(100);
+        skeleton.margin({left: 10, right:10});
+        expect(skeleton.getInnerWidth()).to.equal(80);
+        skeleton.margin({left: 15, right:15});
+        expect(skeleton.getInnerWidth()).to.equal(70);
+      });
+      it('should update innerHeight after setting margin', function(){
+        skeleton.height(100);
+        skeleton.margin({top: 10, bottom:10});
+        expect(skeleton.getInnerHeight()).to.equal(80);
+        skeleton.margin({top: 15, bottom:15});
+        expect(skeleton.getInnerHeight()).to.equal(70);
+      });
+      it('should update the root <g> transform/translate', function(){
+        skeleton.margin({left: 30, top: 30});
+        skeleton.offset([0.5, 0.5]);
+        skeleton.margin({left: 10, top: 10});
+        var translate = skeleton.getRootG().attr('transform');
+        expect(translate).to.equal('translate(10.5,10.5)');
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.margin({left: 33});
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.margin({left: 33}, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#offset(offset)', function(){
+      it('should return offset when called without argument', function(){
+        var offset = [1,1];
+        skeleton.offset(offset);
+        expect(skeleton.offset()).to.deep.equal(offset);
+      });
+      it('should set offset when called with at least one argument', function(){
+        var offset = [1,1];
+        skeleton.offset(offset);
+        skeleton.offset([2,3]);
+        expect(skeleton.offset()).to.deep.equal([2,3]);
+      });
+      it('should update the root <g> transform/translate', function(){
+        skeleton.offset([0.5, 0.5]);
+        skeleton.margin({left: 10, top: 10});
+        skeleton.offset([2,3]);
+        var translate = skeleton.getRootG().attr('transform');
+        expect(translate).to.equal('translate(12,13)');
+      });
+    });
+
+    describe('#width(width, doNotDispatch)', function(){
+      it('should return <svg> width when called without argument', function(){
+        var w = $svg.attr('width');
+        expect(skeleton.width()).to.equal(+w);
+      });
+      it('should set <svg> width when called with Number as the first argument', function(){
+        skeleton.width(300);
+        expect(+$svg.attr('width')).to.equal(300);
+      });
+      it('should set <svg> width when called with a Number and "px" such as "100px" as the first argument', function(){
+        skeleton.width('299px');
+        expect(+$svg.attr('width')).to.equal(299);
+      });
+      it('should set <svg> width to container\'s width when called with "auto" as the first argument', function(){
+        var w = element.clientWidth;
+        skeleton.width('auto');
+        expect(+$svg.attr('width')).to.equal(w);
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.width(200);
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.width(200, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#height(height, doNotDispatch)', function(){
+      it('should return <svg> height when called without argument', function(){
+        var w = $svg.attr('height');
+        expect(skeleton.height()).to.equal(+w);
+      });
+      it('should set <svg> height when called with Number as the first argument', function(){
+        skeleton.height(300);
+        expect(+$svg.attr('height')).to.equal(300);
+      });
+      it('should set <svg> height when called with a Number and "px" such as "100px" as the first argument', function(){
+        skeleton.height('299px');
+        expect(+$svg.attr('height')).to.equal(299);
+      });
+      it('should set <svg> height to container\'s height when called with "auto" as the first argument', function(){
+        var w = element.clientHeight;
+        skeleton.height('auto');
+        expect(+$svg.attr('height')).to.equal(w);
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.height(200);
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.height(200, true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#dimension(dimension, doNotDispatch)', function(){
+      it('should return an array [width, height] when called without argument', function(){
+        var dim = [+$svg.attr('width'), +$svg.attr('height')];
+        expect(skeleton.dimension()).to.deep.equal(dim);
+      });
+      it('should set width and height of the <svg> when called with an array [width, height] as the first argument', function(){
+        skeleton.dimension([118, 118]);
+        expect([+$svg.attr('width'), +$svg.attr('height')]).to.deep.equal([118, 118]);
+      });
+      it('after setting, should dispatch "resize" event', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should be reached to pass the test.
+          expect(true).to.be.true;
+          done();
+        });
+        skeleton.dimension([150, 150]);
+      });
+      it('after setting, should not dispatch "resize" event if doNotDispatch is true', function(done){
+        skeleton.on('resize.test', function(){
+          // This block should not be reached.
+          expect(true).to.be.false;
+          done();
+        });
+        skeleton.dimension([150, 150], true);
+        setTimeout(done, 100);
+      });
+    });
+
+    describe('#hasData()', function(){
+      it('should return true when data are not null nor undefined', function(){
+        skeleton.data({});
+        expect(skeleton.hasData()).to.be.true;
+        skeleton.data({test: 1});
+        expect(skeleton.hasData()).to.be.true;
+        skeleton.data([]);
+        expect(skeleton.hasData()).to.be.true;
+        skeleton.data(['test']);
+        expect(skeleton.hasData()).to.be.true;
+      });
+      it('should return false when data are null or undefined', function(){
+        skeleton.data(null);
+        expect(skeleton.hasData()).to.be.false;
+        skeleton.data(undefined);
+        expect(skeleton.hasData()).to.be.false;
+      });
+    });
+
+    describe('#hasNonZeroArea()', function(){
+      it('should return true if <svg>\'s width & height excluding margin is more than zero', function(){
+        skeleton.options({
+          margin: {left: 10, right: 10}
+        });
+        skeleton.width(80);
+        skeleton.options({
+          margin: {top: 10, bottom: 20}
+        });
+        skeleton.height(50);
+        expect(skeleton.hasNonZeroArea()).to.be.true;
+      });
+      it('should return false otherwise', function(){
+        skeleton.options({
+          margin: {left: 10, right: 10}
+        });
+        skeleton.width(20);
+        skeleton.options({
+          margin: {top: 10, bottom: 20}
+        });
+        skeleton.height(30);
+        expect(skeleton.hasNonZeroArea()).to.be.false;
+      });
+    });
+
+    describe('#mixin({})', function(){
+      it('should extend this skeleton with new fields/functions', function(){
+        skeleton.mixin({
+          a: 1,
+          b: 2
+        });
+        expect(skeleton).to.include.keys(['a', 'b']);
+        expect((<any>skeleton).a).to.equal(1);
+        expect((<any>skeleton).b).to.equal(2);
+      });
+      it('should overwrite existing fields', function(){
+        skeleton.mixin({
+          b: 2
+        });
+        skeleton.mixin({
+          b: 3
+        });
+        expect(skeleton).to.include.keys(['b']);
+        expect((<any>skeleton).b).to.equal(3);
+      });
+      it('should keep original fields if not overwritten', function(){
+        skeleton.mixin({
+          a: 1,
+          b: 2
+        });
+        skeleton.mixin({
+          c: 20,
+          b: 3
+        });
+        expect(skeleton).to.include.keys(['a', 'b', 'c']);
+        expect((<any>skeleton).a).to.equal(1);
+        expect((<any>skeleton).b).to.equal(3);
+        expect((<any>skeleton).c).to.equal(20);
+      });
+    });
+
+    describe('#resizeToFitContainer(mode)', function(){
+      it('when mode is "all" should resize to fit both width and height', function(){
+        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
+        var w = element.clientWidth;
+        var h = element.clientHeight;
+        skeleton.resizeToFitContainer('all');
+        expect(skeleton.dimension()).to.deep.equal([w, h]);
+      });
+      it('when mode is "both" should resize to fit both width and height', function(){
+        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
+        var w = element.clientWidth;
+        var h = element.clientHeight;
+        skeleton.resizeToFitContainer('both');
+        expect(skeleton.dimension()).to.deep.equal([w, h]);
+      });
+      it('when mode is "full" should resize to fit both width and height', function(){
+        skeleton.dimension([element.clientWidth/2, element.clientHeight/2]);
+        var w = element.clientWidth;
+        var h = element.clientHeight;
+        skeleton.resizeToFitContainer('full');
+        expect(skeleton.dimension()).to.deep.equal([w, h]);
+      });
+      it('when mode is "width" should resize width to fit container but keep original height', function(){
+        var w1 = element.clientWidth/2;
+        var h1 = element.clientHeight/2;
+
+        skeleton.dimension([w1, h1]);
+
+        var w2 = element.clientWidth;
+        var h2 = element.clientHeight;
+
+        skeleton.resizeToFitContainer('width');
+
+        expect(skeleton.width()).to.equal(Math.floor(w2));
+        expect(skeleton.height()).to.equal(Math.floor(h1));
+        expect(skeleton.width()).to.not.equal(w1);
+        expect(skeleton.height()).to.not.equal(h2);
+      });
+      it('when mode is "height" should resize height to fit container but keep original width', function(){
+        var w1 = element.clientWidth/2;
+        var h1 = element.clientHeight*2;
+
+        skeleton.dimension([w1, h1]);
+
+        var w2 = element.clientWidth;
+        var h2 = element.clientHeight;
+
+        skeleton.resizeToFitContainer('height');
+
+        expect(skeleton.width()).to.equal(Math.floor(w1));
+        expect(skeleton.height()).to.equal(Math.floor(h2));
+        expect(skeleton.width()).to.not.equal(w2);
+        expect(skeleton.height()).to.not.equal(h1);
+      });
+    });
+
+    describe('#resizeToAspectRatio(ratio)', function(){
+      // todo
+    });
+
+    describe('#autoResize(mode)', function(){
+      it('should return current mode when called without argument', function(){
+        skeleton.autoResize(false);
+        expect(skeleton.autoResize()).to.be.false;
+        skeleton.autoResize('width');
+        expect(skeleton.autoResize()).to.equal('width');
+      });
+      it('should enable auto resize when set mode to "width/height/both/etc.", similar to parameters of resizeToFitContainer()', function(done){
+        // set initial size
+        skeleton.width(50);
+        skeleton.autoResize('width');
+        setTimeout(function(){
+          expect(skeleton.width()).to.equal(element.clientWidth);
+          done();
+        }, 500);
+      });
+      it('should disable auto resize when set mode to false', function(done){
+        // set initial size
+        skeleton.width(50);
+        skeleton.autoResize('width');
+        setTimeout(function(){
+          expect(skeleton.width()).to.equal(element.clientWidth);
+          // disable resize and
+          skeleton.autoResize(false);
+          skeleton.width(50);
+          setTimeout(function(){
+            expect(skeleton.width()).to.not.equal(element.clientWidth);
+            done();
+          }, 500);
+        }, 500);
+      });
+    });
+
+    describe('#autoResizeDetection(detection)', function(){
+      // todo
+    });
+
+    describe('#autoResizeToAspectRatio(ratio)', function(){
+      // todo
+    });
+
+
+});
+
+describe.only('LayerOrganizer', function(){
+
+  describe('new LayerOrganizer(container) will create layers as <g> by default', function(){
+    var container: d3.Selection<any>, layers: d3kit.LayerOrganizer;
+    before(function(done){
+      container = d3.select('body').append('svg').append('g');
+      layers = new d3kit.LayerOrganizer(container);
+      done();
+    });
+
+    describe('#create(names)', function(){
+      it('should create single layer given a String', function(){
+        layers.create('single');
+        expect(container.select('g.single-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple layers given an array', function(){
+        layers.create(['a', 'b', 'c']);
+        expect(container.select('g.a-layer').size()).to.be.equal(1);
+        expect(container.select('g.b-layer').size()).to.be.equal(1);
+        expect(container.select('g.c-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with a String inside', function(){
+        layers.create({d: 'e'});
+        expect(container.select('g.d-layer').size()).to.be.equal(1);
+        expect(container.select('g.d-layer g.e-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with an Array inside', function(){
+        layers.create({f: ['g', 'h']});
+        expect(container.select('g.f-layer').size()).to.be.equal(1);
+        expect(container.select('g.f-layer g.g-layer').size()).to.be.equal(1);
+        expect(container.select('g.f-layer g.h-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple nested layers given an array of objects', function(){
+        layers.create([{'i': ['x']}, {'j': 'x'}, {'k': ['x','y']}]);
+        expect(container.select('g.i-layer').size()).to.be.equal(1);
+        expect(container.select('g.j-layer').size()).to.be.equal(1);
+        expect(container.select('g.k-layer').size()).to.be.equal(1);
+        expect(container.select('g.i-layer g.x-layer').size()).to.be.equal(1);
+        expect(container.select('g.i-layer g.x-layer').size()).to.be.equal(1);
+        expect(container.select('g.k-layer g.x-layer').size()).to.be.equal(1);
+        expect(container.select('g.k-layer g.y-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multi-level nested layers given a nested plain Object', function(){
+        layers.create({
+          l: [
+            'm',
+            {'n': [
+              {'o': ['p']}, 'q'
+            ]}
+          ]
+        });
+        expect(container.select('g.l-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.m-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer g.o-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer g.o-layer g.p-layer').size()).to.be.equal(1);
+        expect(container.select('g.l-layer g.n-layer g.q-layer').size()).to.be.equal(1);
+      });
+
+    });
+
+    describe('#has(name)', function(){
+      it('should be able to check first-level layer', function(){
+        expect(layers.has('single')).to.be.true;
+        expect(layers.has('test')).to.be.false;
+      });
+      it('should be able to check second-level layer', function(){
+        expect(layers.has('l.m')).to.be.true;
+        expect(layers.has('l.x')).to.be.false;
+      });
+      it('should be able to check third-level layer', function(){
+        expect(layers.has('l.n.q')).to.be.true;
+        expect(layers.has('l.n.x')).to.be.false;
+      });
+    });
+
+    describe('#get(name)', function(){
+      it('should be able to get first-level layer', function(){
+        expect(layers.get('single')).to.exist;
+        expect(layers.get('test')).to.be.not.exist;
+      });
+      it('should be able to get second-level layer', function(){
+        expect(layers.get('l.m')).to.exist;
+        expect(layers.get('l.x')).to.not.exist;
+      });
+      it('should be able to get third-level layer', function(){
+        expect(layers.get('l.n.o')).to.exist;
+        expect(layers.get('l.n.x')).to.not.exist;
+      });
+    });
+  });
+
+  describe('new LayerOrganizer(container, tag) will create layers with the given tag instead of <g>', function(){
+    var container: d3.Selection<any>, layers: d3kit.LayerOrganizer;
+    before(function(done){
+      container = d3.select('body').append('div');
+      layers = new d3kit.LayerOrganizer(container, 'div');
+      done();
+    });
+
+    describe('#create(names)', function(){
+      it('should create single layer given a String', function(){
+        layers.create('single');
+        expect(container.select('div.single-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple layers given an array', function(){
+        layers.create(['a', 'b', 'c']);
+        expect(container.select('div.a-layer').size()).to.be.equal(1);
+        expect(container.select('div.b-layer').size()).to.be.equal(1);
+        expect(container.select('div.c-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with a String inside', function(){
+        layers.create({d: 'e'});
+        expect(container.select('div.d-layer').size()).to.be.equal(1);
+        expect(container.select('div.d-layer div.e-layer').size()).to.be.equal(1);
+      });
+
+      it('should create nested layers given a plain Object with an Array inside', function(){
+        layers.create({f: ['g', 'h']});
+        expect(container.select('div.f-layer').size()).to.be.equal(1);
+        expect(container.select('div.f-layer div.g-layer').size()).to.be.equal(1);
+        expect(container.select('div.f-layer div.h-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multiple nested layers given an array of objects', function(){
+        layers.create([{'i': ['x']}, {'j': 'x'}, {'k': ['x','y']}]);
+        expect(container.select('div.i-layer').size()).to.be.equal(1);
+        expect(container.select('div.j-layer').size()).to.be.equal(1);
+        expect(container.select('div.k-layer').size()).to.be.equal(1);
+        expect(container.select('div.i-layer div.x-layer').size()).to.be.equal(1);
+        expect(container.select('div.i-layer div.x-layer').size()).to.be.equal(1);
+        expect(container.select('div.k-layer div.x-layer').size()).to.be.equal(1);
+        expect(container.select('div.k-layer div.y-layer').size()).to.be.equal(1);
+      });
+
+      it('should create multi-level nested layers given a nested plain Object', function(){
+        layers.create({
+          l: [
+            'm',
+            {'n': [
+              {'o': ['p']}, 'q'
+            ]}
+          ]
+        });
+        expect(container.select('div.l-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.m-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer div.o-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer div.o-layer div.p-layer').size()).to.be.equal(1);
+        expect(container.select('div.l-layer div.n-layer div.q-layer').size()).to.be.equal(1);
+      });
+
+    });
+
+    describe('#has(name)', function(){
+      it('should be able to check first-level layer', function(){
+        expect(layers.has('single')).to.be.true;
+        expect(layers.has('test')).to.be.false;
+      });
+      it('should be able to check second-level layer', function(){
+        expect(layers.has('l.m')).to.be.true;
+        expect(layers.has('l.x')).to.be.false;
+      });
+      it('should be able to check third-level layer', function(){
+        expect(layers.has('l.n.q')).to.be.true;
+        expect(layers.has('l.n.x')).to.be.false;
+      });
+    });
+
+    describe('#get(name)', function(){
+      it('should be able to get first-level layer', function(){
+        expect(layers.get('single')).to.exist;
+        expect(layers.get('test')).to.be.not.exist;
+      });
+      it('should be able to get second-level layer', function(){
+        expect(layers.get('l.m')).to.exist;
+        expect(layers.get('l.x')).to.not.exist;
+      });
+      it('should be able to get third-level layer', function(){
+        expect(layers.get('l.n.o')).to.exist;
+        expect(layers.get('l.n.x')).to.not.exist;
+      });
+    });
+  });
+
+});
+
+describe('Chartlet', function(){
+  interface ConfigureFunction {
+      (parent: d3kit.Chartlet, child: d3kit.Chartlet): void;
+  }
+  var enter: d3kit.ChartletEventFunction, update: d3kit.ChartletEventFunction, exit: d3kit.ChartletEventFunction, chartlet: d3kit.Chartlet;
+  var customEvents: Array<string> = ['fooEvent'];
+  var ChildChartlet: () => d3kit.Chartlet;
+  var ParentChartlet: (configureFunction: ConfigureFunction) => d3kit.Chartlet;
+
+  var callback = function(selection?: d3.Selection<any>, done?: any) { return (sel: d3.Selection<any>) => {done();};};
+  beforeEach(function(done){
+    ChildChartlet = function() {
+      var chartlet = new d3kit.Chartlet(callback, callback, callback);
+      (<any>chartlet).runTest = function (testFunction: any) {
+        testFunction(chartlet);
+      };
+      return chartlet;
+    };
+
+    ParentChartlet = function(configureFunction: ConfigureFunction) {
+      var chartlet = new d3kit.Chartlet(callback, callback, callback);
+      var child = ChildChartlet();
+      configureFunction(chartlet, child);
+      (<any>chartlet).runTest = (<any>child).runTest;
+      return chartlet;
+    };
+
+    enter  = callback;
+    update = callback;
+    exit   = callback;
+    chartlet = new d3kit.Chartlet(enter, update, exit, customEvents);
+    done();
+  });
+
+  describe('new Chartlet(enter, update, exit, customEvents)', function(){
+    it('should create a chartlet', function(){
+      expect(chartlet).to.be.an('Object');
+      expect(chartlet).to.include.keys(['property', 'on']);
+      expect(chartlet.enter).to.be.a('Function');
+      expect(chartlet.update).to.be.a('Function');
+      expect(chartlet.exit).to.be.a('Function');
+      expect(function(){ chartlet.enter(); }).to.not.throw(Error);
+      expect(function(){ chartlet.update(); }).to.not.throw(Error);
+      expect(function(){ chartlet.exit(); }).to.not.throw(Error);
+      expect(chartlet.getCustomEventNames()).to.deep.equal(customEvents);
+    });
+    it('arguments "update", "exit" and "customEvents" are optional', function(){
+      var comp = new d3kit.Chartlet(enter);
+      expect(comp).to.be.an('Object');
+      expect(comp).to.include.keys(['property', 'on']);
+      expect(comp.enter).to.be.a('Function');
+      expect(comp.update).to.be.a('Function');
+      expect(comp.exit).to.be.a('Function');
+      expect(function(){ comp.enter(); }).to.not.throw(Error);
+      expect(function(){ comp.update(); }).to.not.throw(Error);
+      expect(function(){ comp.exit(); }).to.not.throw(Error);
+    });
+  });
+
+  describe('#getDispatcher()', function(){
+    it('should return a dispatcher', function(){
+      var dispatcher = chartlet.getDispatcher();
+      expect(dispatcher).to.exist;
+    });
+    it('returned dispatcher should handle enter/update/exit events', function(){
+      var dispatcher = chartlet.getDispatcher();
+      expect(dispatcher).to.include.keys(['enterDone', 'updateDone', 'exitDone'].concat(customEvents));
+    });
+  });
+
+  describe('#getPropertyValue(name, d, i)', function(){
+    it('should return computed value for specified property name, d and i', function(){
+      var d = {a: 99};
+      var i = 2;
+
+      chartlet.property('foo', 1);
+      chartlet.property('bar', 'two');
+      chartlet.property('baz', function(d:{a:number}, i: number) {return 3;});
+      chartlet.property('qux', function(d:{a:number}, i: number) {return 'four';});
+      chartlet.property('nux', function(d:{a:number}, i: number) {return d.a * i;});
+
+      expect(chartlet.getPropertyValue('foo', d, i)).to.equal(1);
+      expect(chartlet.getPropertyValue('bar', d, i)).to.equal('two');
+      expect(chartlet.getPropertyValue('baz', d, i)).to.equal(3);
+      expect(chartlet.getPropertyValue('qux', d, i)).to.equal('four');
+      expect(chartlet.getPropertyValue('nux', d, i)).to.equal(198);
+    });
+  });
+
+  describe('#property(name, valueOrFn)', function(){
+    describe('should act as a getter when called with one argument', function(){
+      it('should always return a function', function(){
+        chartlet.property('foo', 1);
+        expect(chartlet.property('foo')).to.be.a('Function');
+        chartlet.property('bar', function(){ return 100; });
+        expect(chartlet.property('bar')).to.be.a('Function');
+      });
+      it('should return a function that return undefined for unknown property name', function(){
+        expect(chartlet.property('unknown name')).to.be.a('Function');
+        expect(chartlet.property('unknown name')()).to.equal(undefined);
+      });
+    });
+
+    describe('should act as a setter when called with two arguments', function(){
+      it('should set specified property to a functor of given value', function(){
+        chartlet.property('foo', 1);
+        expect(chartlet.property('foo')).to.be.a('Function');
+        expect(chartlet.property('foo')()).to.equal(1);
+        chartlet.property('bar', function(){ return 100; });
+        expect(chartlet.property('bar')).to.be.a('Function');
+        expect(chartlet.property('bar')()).to.equal(100);
+      });
+      it('should overwrite previous value when set property with the same name', function(){
+        chartlet.property('foo', 1);
+        expect(chartlet.property('foo')()).to.equal(1);
+        chartlet.property('foo', 100);
+        expect(chartlet.property('foo')()).to.equal(100);
+      });
+    });
+  });
+
+  describe('#on(eventName, listener)', function(){
+    it('event "enterDone" should be triggered after chartlet.enter() is completed.', function(done){
+      chartlet.on('enterDone', function(){ return (sel: d3.Selection<any>) => {done();} });
+      chartlet.enter();
+    });
+    it('event "updateDone" should be triggered after chartlet.update() is completed.', function(done){
+      chartlet.on('updateDone', function(){ return (sel: d3.Selection<any>) => {done();} });
+      chartlet.update();
+    });
+    it('event "exitDone" should be triggered after chartlet.exit() is completed.', function(done){
+      chartlet.on('exitDone', function(){ return (sel: d3.Selection<any>) => {done();} });
+      chartlet.exit();
+    });
+  });
+
+  describe('#inheritPropertyFrom(parentChartlet, parentPropertyName, childPropertyName)', function(){
+    it('it should cause a child to inherit a parent property', function() {
+      var parent = ParentChartlet(function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertyFrom(parent, 'foo', 'bar');
+        })
+        .property('foo', function(d:number) {return 2 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('bar', 4, 0)).to.be.equal(8);
+      });
+    });
+
+    it('it should default to the parent property name', function() {
+      var parent = ParentChartlet(
+        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertyFrom(parent, 'foo');
+        })
+        .property('foo', function(d:number) {return 2 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('foo', 4, 0)).to.be.equal(8);
+      });
+    });
+  });
+
+  describe('#inheritProperties(parentChartlet, parentPropertyNames, childPropertyNames)', function(){
+    it('it should cause a child to inherit many parent properties', function() {
+      var parent = ParentChartlet(
+        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertiesFrom(parent, ['foo', 'bar', 'baz'], ['foo-x', 'bar-x', 'baz-x']);
+        })
+        .property('foo', function(d:number) {return 2 * d;})
+        .property('bar', function(d:number) {return 3 * d;})
+        .property('baz', function(d:number) {return 4 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('foo-x', 1, 0)).to.be.equal(2);
+        expect(child.getPropertyValue('bar-x', 1, 0)).to.be.equal(3);
+        expect(child.getPropertyValue('baz-x', 1, 0)).to.be.equal(4);
+      });
+    });
+
+    it('it should default to the parent property names', function() {
+      var parent = ParentChartlet(
+        function(parent: d3kit.Chartlet, child: d3kit.Chartlet) {
+          child.inheritPropertiesFrom(parent, ['foo', 'bar', 'baz']);
+        })
+        .property('foo', function(d:number) {return 2 * d;})
+        .property('bar', function(d:number) {return 3 * d;})
+        .property('baz', function(d:number) {return 4 * d;});
+
+      (<any>parent).runTest(function(child: d3kit.Chartlet) {
+        expect(child.getPropertyValue('foo', 1, 0)).to.be.equal(2);
+        expect(child.getPropertyValue('bar', 1, 0)).to.be.equal(3);
+        expect(child.getPropertyValue('baz', 1, 0)).to.be.equal(4);
+      });
+    });
+  });
+
+  describe('#publishEventsTo(foreignDispatcher)', function(){
+    it('should map events to a foreignDispatcher', function(done) {
+
+      var parent = new d3kit.Chartlet(callback, callback, callback, ['foo']);
+      parent.getDispatcher().on('foo', function(value:number) {
+        expect(value).to.be.equal(99);
+        done();
+      });
+
+      var child = new d3kit.Chartlet(callback, callback, callback, ['foo'])
+        .publishEventsTo(parent.getDispatcher());
+
+      (<any>child.getDispatcher()).foo(99);
+    });
+  });
+});
+
+describe('#createChart', function(){
+  var Chart = d3kit.factory.createChart({}, ['test'], function(skeleton: d3kit.Skeleton){
+    return skeleton;
+  });
+
+  it('should return a function to create a chart', function(){
+    expect(Chart).to.be.a('Function');
+  });
+
+  // // Don't think it's possible to define these in a d.ts file; skipping
+  // it('results should have function getCustomEvents()', function(){
+  //   expect(Chart.getCustomEvents).to.exist;
+  //   expect(Chart.getCustomEvents()).to.deep.equal(['test']);
+  // });
+});
+
+describe('d3kit.helper', function(){
+
+  describe('#dasherize(str)', function(){
+    it('should convert input to dash-case', function(){
+      expect(d3kit.helper.dasherize('camelCase')).to.equal('camel-case');
+    });
+  });
+
+  describe('#deepExtend(target, src1, src2, ...)', function(){
+    it('should copy fields from sources into target', function(){
+      expect(d3kit.helper.deepExtend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      })).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+
+      expect(d3kit.helper.deepExtend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      }, null)).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+    });
+
+    it('should copy arrays and functions correctly from sources into target', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.deepExtend({}, {
+        a: fn1,
+        b: [1,2]
+      },{
+        b: [3,4],
+        c: fn2
+      })).to.deep.equal({
+        a: fn1,
+        b: [3,4],
+        c: fn2
+      });
+    });
+
+    it('should perform "deep" copy', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.deepExtend({}, {
+        a: { d: fn1 },
+        b: [1,2],
+        c: { f: 3 },
+        h: { i: [1,2,3], j: [3,4,5] }
+      },{
+        a: { e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
+      })).to.deep.equal({
+        a: { d: fn1, e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], j: [3,4,5], k: [3,4,5], l: {m: 2} }
+      });
+    });
+  });
+
+  describe('#extend(target, src1, src2, ...)', function(){
+    it('should copy fields from sources into target', function(){
+      expect(d3kit.helper.extend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      })).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+
+      expect(d3kit.helper.extend({}, {
+        a: 1,
+        b: 2
+      },{
+        b: 3,
+        c: 4
+      }, null)).to.deep.equal({
+        a: 1,
+        b: 3,
+        c: 4
+      });
+    });
+
+    it('should copy arrays and functions correctly from sources into target', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.extend({}, {
+        a: fn1,
+        b: [1,2]
+      },{
+        b: [3,4],
+        c: fn2
+      })).to.deep.equal({
+        a: fn1,
+        b: [3,4],
+        c: fn2
+      });
+    });
+
+    it('should NOT perform "deep" copy', function(){
+      var fn1 = function(d:number){return d + 1;};
+      var fn2 = function(d:number){return d + 2;};
+      expect(d3kit.helper.extend({}, {
+        a: { d: fn1 },
+        b: [1,2],
+        c: { f: 3 },
+        h: { i: [1,2,3], j: [3,4,5] }
+      },{
+        a: { e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
+      })).to.deep.equal({
+        a: { e: 2 },
+        b: [3,4],
+        c: { f: 4, g: fn2 },
+        h: { i: [2,3,4], k: [3,4,5], l: {m: 2} }
+      });
+    });
+  });
+
+  describe('#isFunction(function)', function(){
+    it('should return true if the value is a function', function(){
+      var fn1 = function(d:number){return d + 1;};
+      function fn2(d:number){return d + 2;}
+
+      expect(d3kit.helper.isFunction(fn1)).to.be.true;
+      expect(d3kit.helper.isFunction(fn2)).to.be.true;
+    });
+    it('should return false if the value is not a function', function(){
+      expect(d3kit.helper.isFunction(0)).to.be.false;
+      expect(d3kit.helper.isFunction(1)).to.be.false;
+      expect(d3kit.helper.isFunction(true)).to.be.false;
+      expect(d3kit.helper.isFunction('what')).to.be.false;
+      expect(d3kit.helper.isFunction(null)).to.be.false;
+      expect(d3kit.helper.isFunction(undefined)).to.be.false;
+    });
+  });
+
+  describe('#isNumber(value)', function(){
+    it('should return true for number', function(){
+      expect(d3kit.helper.isNumber(1)).to.be.true;
+      expect(d3kit.helper.isNumber(0)).to.be.true;
+      expect(d3kit.helper.isNumber(-1)).to.be.true;
+    });
+    it('should return false for string even if it is a number', function(){
+      expect(d3kit.helper.isNumber('')).to.be.false;
+      expect(d3kit.helper.isNumber('1')).to.be.false;
+      expect(d3kit.helper.isNumber('0')).to.be.false;
+      expect(d3kit.helper.isNumber('what')).to.be.false;
+    });
+    it('should return false for null and undefined', function(){
+      expect(d3kit.helper.isNumber(null)).to.be.false;
+      expect(d3kit.helper.isNumber(undefined)).to.be.false;
+    });
+  });
+});
+
diff --git a/d3kit/d3kit.d.ts b/d3kit/d3kit-v1.1.0.d.ts
similarity index 100%
rename from d3kit/d3kit.d.ts
rename to d3kit/d3kit-v1.1.0.d.ts
diff --git a/d3kit/index.d.ts b/d3kit/index.d.ts
new file mode 100644
index 0000000000..64cbb1a3da
--- /dev/null
+++ b/d3kit/index.d.ts
@@ -0,0 +1,117 @@
+// Type definitions for d3Kit v3.1.1
+// Project: https://github.com/twitter/d3kit
+// Definitions by: Morgan Benton <https://github.com/morphatic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="d3" />
+
+declare class AbstractChart {
+    container: Element;
+    constructor(selector: string|Element, options?: AbstractChart.ChartOptions);
+    static getDefaultOptions(): AbstractChart.ChartOptions;
+    static getCustomEventNames(): string[];
+    setupDispatcher(customEventNames?: string[]): void;
+    getCustomEventNames(): string[];
+    getInnerWidth(): number;
+    getInnerHeight(): number;
+    width(value: number): this;
+    width(): number;
+    height(value: number): this;
+    height(): number;
+    dimension(dimensions: [number, number]): this;
+    dimension(): [number, number];
+    data(): any;
+    data(data: any): this;
+    margin(margins: AbstractChart.ChartMargin): this;
+    margin(): AbstractChart.ChartMargin;
+    offset(offset: AbstractChart.ChartOffset): this;
+    offset(): AbstractChart.ChartOffset;
+    options(options: AbstractChart.ChartOptions): this;
+    options(): AbstractChart.ChartOptions;
+    updateDimensionNow(): this;
+    hasData(): boolean;
+    hasNonZeroArea(): boolean;
+    fit(fitOptions: AbstractChart.FitOptions, watchOptions?: AbstractChart.WatchOptions): this;
+    stopFitWatcher(): this;
+    on(name: string, listener: () => void): this;
+    off(name: string): this;
+    destroy(): void;
+}
+
+declare namespace AbstractChart {
+    export interface ChartMargin {
+        top?: number;
+        right?: number;
+        bottom?: number;
+        left?: number;
+    }
+
+    export interface ChartOffset {
+        x: number;
+        y: number;
+    }
+
+    export interface ChartOptions {
+        initialWidth?: number;
+        initialHeight?: number;
+        margin?: ChartMargin;
+        offset?: ChartOffset;
+        pixelRatio?: number;
+    }
+
+    // from https://github.com/kristw/slimfit
+    export interface FitOptions {
+        mode?: string;
+        width?: string|number;
+        height?: string|number;
+        ratio?: number;
+        maxWidth?: string|number;
+        maxHeight?: string|number;
+    }
+
+    // from https://github.com/kristw/slimfit
+    export interface WatchOptions {
+        mode?: string;
+        target?: any; // lazy
+        interval?: number;
+    }
+}
+
+declare class SvgChart extends AbstractChart {
+    svg: SVGElement;
+    rootG: SVGElement;
+    layers: d3kit.LayerOrganizer;
+    constructor(selector: string|Element, options?: AbstractChart.ChartOptions);
+}
+
+declare class CanvasChart extends AbstractChart {
+    constructor(selector: string|Element, options?: AbstractChart.ChartOptions);
+    static getDefaultOptions(): AbstractChart.ChartOptions;
+    getContext2d(): CanvasRenderingContext2D;
+    clear(): this;
+}
+
+declare namespace d3kit {
+    export class LayerOrganizer {
+        constructor(container: d3.Selection<d3.BaseType, any, d3.BaseType, any>, defaultTag?: string);
+        create(layerNames: string|Array<string>|LayerConfig|Array<LayerConfig>): d3.Selection<d3.BaseType, any, d3.BaseType, any>|Array<d3.Selection<d3.BaseType, any, d3.BaseType, any>>;
+        get(name: string): d3.Selection<d3.BaseType, any, d3.BaseType, any>;
+        has(name: string): boolean;
+    }
+
+    interface LayerConfig {
+        [layerName: string]: string|string[]|LayerConfig|Array<LayerConfig>;
+    }
+}
+
+declare namespace helper {
+    function debounce(fn: (...args: Array<any>) => void, delay: number): (...args: Array<any>) => void;
+    function deepExtend(dest: Object, ...args: Object[]): Object;
+    function extend(dest: Object, ...args: Object[]): Object;
+    function functor(value: any): (...args: Array<any>) => any;
+    function rebind(target: Object, source: Object): Object;
+    function isFunction(value: any): boolean;
+    function isObject(value: any): boolean;
+    function kebabCase(str: string): string;
+    function throttle(fn: (...args: Array<any>) => void, delay: number): (...args: Array<any>) => void;
+}
diff --git a/d3kit/package.json b/d3kit/package.json
index 5e771f4dcd..8eabdc01d2 100644
--- a/d3kit/package.json
+++ b/d3kit/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "@types/d3": "^3.5.36"
+    "@types/d3": "^4.2.38"
   }
 }
diff --git a/d3kit/tsconfig.json b/d3kit/tsconfig.json
index 1937b920e2..ba1073cccf 100644
--- a/d3kit/tsconfig.json
+++ b/d3kit/tsconfig.json
@@ -6,7 +6,6 @@
     "strictNullChecks": false,
     "baseUrl": "../",
     "typeRoots": [
-      "node_modules/@types",
       "../"
     ],
     "types": [],
@@ -14,7 +13,7 @@
     "forceConsistentCasingInFileNames": true
   },
   "files": [
-    "d3kit.d.ts",
+    "index.d.ts",
     "d3kit-tests.ts"
   ]
 }

From 027571f7f9affe895f13c80fde2bf73120272202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vidril=20C=C3=A9sar?= <yimiprod@gmail.com>
Date: Wed, 2 Nov 2016 16:11:11 +0100
Subject: [PATCH 067/245] update definition for 3.3.0

---
 CONTRIBUTORS.md                      |   3 +-
 svg-pan-zoom/svg-pan-zoom-2.3.9.d.ts | 151 +++++++++++++++++++++
 svg-pan-zoom/svg-pan-zoom-tests.ts   |  68 ++++++++--
 svg-pan-zoom/svg-pan-zoom.d.ts       | 188 ++++++++++++++++++---------
 4 files changed, 332 insertions(+), 78 deletions(-)
 create mode 100644 svg-pan-zoom/svg-pan-zoom-2.3.9.d.ts

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8b263f19ae..1036be548d 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1665,7 +1665,8 @@ This document generated by [dt-contributors-generator](https://github.com/vvakam
 * [:link:](supertest/supertest.d.ts) [SuperTest](https://github.com/visionmedia/supertest) by [Alex Varju](https://github.com/varju)
 * [:link:](supertest-as-promised/supertest-as-promised.d.ts) [SuperTest as Promised](https://github.com/WhoopInc/supertest-as-promised) by [Tanguy Krotoff](https://github.com/tkrotoff)
 * [:link:](svg-injector/svg-injector.d.ts) [SVG Injector](https://github.com/iconic/SVGInjector) by [Patrick Westerhoff](https://github.com/poke)
-* [:link:](svg-pan-zoom/svg-pan-zoom.d.ts) [svg-pan-zoom](https://github.com/ariutta/svg-pan-zoom) by [Chintan Shah](https://github.com/Promact)
+* [:link:](svg-pan-zoom/svg-pan-zoom-2.3.9.d.ts) [svg-pan-zoom](https://github.com/ariutta/svg-pan-zoom) by [Chintan Shah](https://github.com/Promact)
+* [:link:](svg-pan-zoom/svg-pan-zoom.d.ts) [svg-pan-zoom](https://github.com/ariutta/svg-pan-zoom) by [César Vidril](https://github.com/Yimiprod)
 * [:link:](svg-sprite/svg-sprite.d.ts) [svg-sprite](https://github.com/jkphl/svg-sprite) by [Qubo](https://github.com/tkqubo)
 * [:link:](svgjs/svgjs.d.ts) [svg.js](http://www.svgjs.com) by [Sean Hess](https://seanhess.github.io)
 * [:link:](svg2png/svg2png.d.ts) [svg2png node package](https://github.com/domenic/svg2png) by [hans windhoff](https://github.com/hansrwindhoff)
diff --git a/svg-pan-zoom/svg-pan-zoom-2.3.9.d.ts b/svg-pan-zoom/svg-pan-zoom-2.3.9.d.ts
new file mode 100644
index 0000000000..92b1ffeaa5
--- /dev/null
+++ b/svg-pan-zoom/svg-pan-zoom-2.3.9.d.ts
@@ -0,0 +1,151 @@
+// Type definitions for svg-pan-zoom v2.3.9
+// Project: https://github.com/ariutta/svg-pan-zoom
+// Definitions by: Chintan Shah <https://github.com/Promact>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace SvgPanZoom {
+
+    interface OptionConfig {
+        panEnabled?: boolean; // enable or disable panning (default enabled)
+        controlIconsEnabled?: boolean; // insert icons to give user an option in addition to mouse events to control pan/zoom (default disabled)
+        zoomEnabled?: boolean; // enable or disable zooming (default enabled)
+        dblClickZoomEnabled?: boolean; // enable or disable zooming by double clicking (default enabled)
+        zoomScaleSensitivity?: number; // Zoom sensitivity
+        minZoom?: number; // Minimum Zoom level
+        maxZoom?: number; // Maximum Zoom level
+        fit?: boolean; // enable or disable viewport fit in SVG (default true)
+        center?: boolean; // enable or disable viewport centering in SVG (default true)
+        beforeZoom?: (scale:number) => void;
+        onZoom?: (scale:number) => void;
+        beforePan?: (point:IPoint) => void;
+        onPan?: (x:number, y:number) => void;
+        refreshRate?: any; // in hz
+    }
+
+    interface IPoint {
+        x: number;
+        y: number;
+    }
+
+    interface ISvgPanZoom {
+        /**
+         * Creates a new SvgPanZoom instance with given element selector.
+         *
+         * @param svg selector of the tag on which it is to be applied.
+         * @param options provides customization options at the initialization of the object.
+         */
+        (svg:any, options?:OptionConfig):  ISvgPanZoom;
+
+        /**
+         * Enables Panning on svg element
+         */
+        enablePan(): void;
+
+        /**
+         * Disables panning on svg element
+         */
+        disablePan(): void;
+
+        /**
+         * Checks if Panning is enabled or not
+         * @return true or false based on panning settings
+         */
+        isPanEnabled(): boolean;
+
+
+        setBeforePan(fn: (point:IPoint)=> void): void;
+
+        setOnPan(fn: (x:number, y:number)=> void): void;
+
+        enableZoom(): void;
+
+        disableZoom(): void;
+
+        isZoomEnabled(): boolean;
+
+        enableControlIcons(): void;
+
+        disableControlIcons(): void;
+
+        isControlIconsEnabled(): boolean;
+
+        enableDblClickZoom(): void;
+
+        disableDblClickZoom(): void;
+
+        setZoomScaleSensitivity(scale: number): void;
+
+        setMinZoom(zoom: number): void;
+
+        setMaxZoom(zoom: number): void;
+
+        setBeforeZoom(fn: (scale: number) => void): void;
+
+        setOnZoom(fn: (scale: number) => void): void;
+
+        zoom(scale: number):void;
+
+        zoomIn(): void;
+
+        zoomOut(): void;
+
+        zoomBy(scale: number): void;
+
+        resetZoom(): void;
+
+        /**
+         * Get zoom scale/level
+         *
+         * @return {float} zoom scale
+         */
+        getZoom(): number;
+
+        /**
+         * Adjust viewport size (only) so it will fit in SVG
+         * Does not center image
+         *
+         * @param  {bool} dropCache drop viewBox cache and recalculate SVG's viewport sizes. Default false
+         */
+        fit(dropCache?: boolean): void;
+
+        /**
+         * Adjust viewport pan (only) so it will be centered in SVG
+         * Does not zoom/fit image
+         *
+         * @param  {bool} dropCache drop viewBox cache and recalculate SVG's viewport sizes. Default false
+         */
+        center(dropCache?: boolean): void;
+
+        /**
+         * Recalculates cached svg dimensions and controls position
+         */
+        resize(): void;
+
+        /**
+         * Pan to a rendered position
+         *
+         * @param  {object} point {x: 0, y: 0}
+         */
+        pan(point: IPoint): void;
+
+        /**
+         * Relatively pan the graph by a specified rendered position vector
+         *
+         * @param  {object} point {x: 0, y: 0}
+         */
+        panBy(point: IPoint): void;
+
+        /**
+         * Get pan vector
+         *
+         * @return {object} {x: 0, y: 0}
+         */
+        getPan(): IPoint;
+
+        zoomAtPoint(scale:number, point:IPoint): boolean;
+
+        zoomAtPointBy(scale:number, point:IPoint): boolean;
+    }
+}
+
+declare var svgPanZoom:SvgPanZoom.ISvgPanZoom;
diff --git a/svg-pan-zoom/svg-pan-zoom-tests.ts b/svg-pan-zoom/svg-pan-zoom-tests.ts
index 2cb34b7c5c..3c8a231bf3 100644
--- a/svg-pan-zoom/svg-pan-zoom-tests.ts
+++ b/svg-pan-zoom/svg-pan-zoom-tests.ts
@@ -1,6 +1,6 @@
 /// <reference path="svg-pan-zoom.d.ts" />
 
-var svgPanZoomOptions : SvgPanZoom.OptionConfig = {
+var svgPanZoomOptions : SvgPanZoom.Options = {
     panEnabled: true // enable or disable panning (default enabled)
     , controlIconsEnabled: false // insert icons to give user an option in addition to mouse events to control pan/zoom (default disabled)
     , zoomEnabled: true // enable or disable zooming (default enabled)
@@ -17,9 +17,9 @@ var svgPanZoomOptions : SvgPanZoom.OptionConfig = {
     , refreshRate: 60 // in hz
 };
 
-var panZoomTiger: SvgPanZoom.ISvgPanZoom = svgPanZoom('#demo-tiger');
+var panZoomTiger: SvgPanZoom.Instance = svgPanZoom('#demo-tiger');
 
-var svgElement = document.querySelector('#demo-tiger');
+var svgElement = <SVGElement>document.querySelector('#demo-tiger');
 panZoomTiger = svgPanZoom(svgElement);
 
 panZoomTiger = svgPanZoom('#demo-tiger', {
@@ -27,24 +27,43 @@ panZoomTiger = svgPanZoom('#demo-tiger', {
     , controlIconsEnabled: false
     , zoomEnabled: true
     , dblClickZoomEnabled: true
+    , mouseWheelZoomEnabled: true
+    , preventMouseEventsDefault: true
     , zoomScaleSensitivity: 0.2
     , minZoom: 0.5
     , maxZoom: 10
     , fit: true
+    , contain: false
     , center: true
     , refreshRate: 'auto'
-    , beforeZoom: function(){}
-    , onZoom: function(){}
-    , beforePan: function(){}
-    , onPan: function(){}
+    , beforeZoom: function(oldScale, newScale){ return true; }
+    , onZoom: function(newScale){}
+    , beforePan: function(oldPan, newPan){ return {x: true, y: true}; }
+    , customEventsHandler: null
+    , eventsListenerElement: null
 });
 
+/**
+ * PAN
+ */
 // Pan to rendered point x = 50, y = 50
 panZoomTiger.pan({x: 50, y: 50});
 
 // Pan by x = 50, y = 50 of rendered pixels
 panZoomTiger.panBy({x: 50, y: 50});
 
+panZoomTiger.getPan();
+
+panZoomTiger.resetPan();
+
+panZoomTiger.enablePan();
+panZoomTiger.disablePan();
+
+panZoomTiger.isPanEnabled();
+
+/**
+ * ZOOM
+ */
 // Set zoom level to 2
 panZoomTiger.zoom(2);
 
@@ -59,19 +78,40 @@ panZoomTiger.zoomAtPointBy(1.3, {x: 50, y: 50});
 
 panZoomTiger.zoomIn();
 panZoomTiger.zoomOut();
-panZoomTiger.resetZoom();
 
-panZoomTiger.enablePan();
-panZoomTiger.disablePan();
+panZoomTiger.getZoom();
+
+panZoomTiger.resetZoom();
 
 panZoomTiger.enableZoom();
 panZoomTiger.disableZoom();
 
-panZoomTiger.fit();
+panZoomTiger.isZoomEnabled();
+
+/**
+ * controls
+ */
+panZoomTiger.enableControlIcons();
+panZoomTiger.disableControlIcons();
+panZoomTiger.isControlIconsEnabled();
+
+panZoomTiger.enableDblClickZoom();
+panZoomTiger.disableDblClickZoom();
+panZoomTiger.isDblClickZoomEnabled();
+
+panZoomTiger.enableMouseWheelZoom();
+panZoomTiger.disableMouseWheelZoom();
+panZoomTiger.isMouseWheelZoomEnabled();
+
 panZoomTiger.center();
+panZoomTiger.fit();
+panZoomTiger.contain();
 
 panZoomTiger.resize(); // update SVG cached size and controls positions
-panZoomTiger.fit(true); // dropCache and fit
-panZoomTiger.center(true); // dropCache and center
+panZoomTiger.updateBBox();
 
-delete panZoomTiger;
\ No newline at end of file
+panZoomTiger.fit().center(); // can chain method
+
+panZoomTiger.destroy(); // destroy instance
+
+delete panZoomTiger;
diff --git a/svg-pan-zoom/svg-pan-zoom.d.ts b/svg-pan-zoom/svg-pan-zoom.d.ts
index 92b1ffeaa5..aacf5a5d0a 100644
--- a/svg-pan-zoom/svg-pan-zoom.d.ts
+++ b/svg-pan-zoom/svg-pan-zoom.d.ts
@@ -1,97 +1,158 @@
-// Type definitions for svg-pan-zoom v2.3.9
+// Type definitions for svg-pan-zoom v3.3.0
 // Project: https://github.com/ariutta/svg-pan-zoom
-// Definitions by: Chintan Shah <https://github.com/Promact>
+// Definitions by: César Vidril <https://github.com/Yimiprod>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace SvgPanZoom {
-
-    interface OptionConfig {
+    interface Options {
+        viewportSelector?: string|HTMLElement|SVGElement; // can be querySelector string or SVGElement (default enabled)
         panEnabled?: boolean; // enable or disable panning (default enabled)
         controlIconsEnabled?: boolean; // insert icons to give user an option in addition to mouse events to control pan/zoom (default disabled)
         zoomEnabled?: boolean; // enable or disable zooming (default enabled)
         dblClickZoomEnabled?: boolean; // enable or disable zooming by double clicking (default enabled)
-        zoomScaleSensitivity?: number; // Zoom sensitivity
-        minZoom?: number; // Minimum Zoom level
-        maxZoom?: number; // Maximum Zoom level
+        mouseWheelZoomEnabled?: boolean; // (default enabled)
+        preventMouseEventsDefault?: boolean; // (default enabled)
+        zoomScaleSensitivity?: number; // Zoom sensitivity (Default 0.2)
+        minZoom?: number; // Minimum Zoom level (Default 0.5)
+        maxZoom?: number; // Maximum Zoom level  (Default 10)
         fit?: boolean; // enable or disable viewport fit in SVG (default true)
+        contain?: boolean; // (default true)
         center?: boolean; // enable or disable viewport centering in SVG (default true)
-        beforeZoom?: (scale:number) => void;
-        onZoom?: (scale:number) => void;
-        beforePan?: (point:IPoint) => void;
-        onPan?: (x:number, y:number) => void;
-        refreshRate?: any; // in hz
+        refreshRate?: number | 'auto'; // (default 'auto')
+        beforeZoom?: (oldScale:number, newScale:number) => boolean;
+        onZoom?: (newScale:number) => void;
+        beforePan?: (oldPan:Point, newPan:Point) => boolean | PointModifier;
+        onPan?: (newPan:Point) => void;
+        customEventsHandler?: CustomEventHandler; // (default null)
+        eventsListenerElement?: SVGElement; // (default null)
     }
 
-    interface IPoint {
+    interface CustomEventHandler {
+        haltEventListeners: string[],
+        init: (options: CustomEventOptions) => void,
+        destroy: Function
+    }
+
+    interface CustomEventOptions {
+        svgElement: SVGSVGElement,
+        instance: Instance
+    }
+
+    interface Point {
         x: number;
         y: number;
     }
 
-    interface ISvgPanZoom {
+    interface PointModifier {
+        x: number|boolean;
+        y: number|boolean;
+    }
+
+    interface Instance {
         /**
          * Creates a new SvgPanZoom instance with given element selector.
          *
-         * @param svg selector of the tag on which it is to be applied.
-         * @param options provides customization options at the initialization of the object.
+         * @param  {string|HTMLElement|SVGElement} svg selector of the tag on which it is to be applied.
+         * @param  {Object} options        provides customization options at the initialization of the object.
+         * @return {Instance}              Current instance
          */
-        (svg:any, options?:OptionConfig):  ISvgPanZoom;
+        (svg:string|HTMLElement|SVGElement, options?:Options): Instance;
 
         /**
          * Enables Panning on svg element
+         * @return {Instance} Current instance
          */
-        enablePan(): void;
+        enablePan(): Instance;
 
         /**
          * Disables panning on svg element
+         * @return {Instance} Current instance
          */
-        disablePan(): void;
+        disablePan(): Instance;
 
         /**
          * Checks if Panning is enabled or not
-         * @return true or false based on panning settings
+         * @return {Boolean} true or false based on panning settings
          */
         isPanEnabled(): boolean;
 
+        setBeforePan(fn: (point:Point)=> void): Instance;
 
-        setBeforePan(fn: (point:IPoint)=> void): void;
+        setOnPan(fn: (x:number, y:number)=> void): Instance;
 
-        setOnPan(fn: (x:number, y:number)=> void): void;
+        /**
+         * Pan to a rendered position
+         *
+         * @param  {Object} point {x: 0, y: 0}
+         * @return {Instance}    Current instance
+         */
+        pan(point: Point): Instance;
 
-        enableZoom(): void;
+        /**
+         * Relatively pan the graph by a specified rendered position vector
+         *
+         * @param  {Object} point {x: 0, y: 0}
+         * @return {Instance}    Current instance
+         */
+        panBy(point: Point): Instance;
 
-        disableZoom(): void;
+        /**
+         * Get pan vector
+         *
+         * @return {Object} {x: 0, y: 0}
+         * @return {Instance}    Current instance
+         */
+        getPan(): Point;
+
+        resetPan(): Instance;
+
+        enableZoom(): Instance;
+
+        disableZoom(): Instance;
 
         isZoomEnabled(): boolean;
 
-        enableControlIcons(): void;
+        enableControlIcons(): Instance;
 
-        disableControlIcons(): void;
+        disableControlIcons(): Instance;
 
         isControlIconsEnabled(): boolean;
 
-        enableDblClickZoom(): void;
+        enableDblClickZoom(): Instance;
 
-        disableDblClickZoom(): void;
+        disableDblClickZoom(): Instance;
 
-        setZoomScaleSensitivity(scale: number): void;
+        isDblClickZoomEnabled(): boolean;
 
-        setMinZoom(zoom: number): void;
+        enableMouseWheelZoom(): Instance;
 
-        setMaxZoom(zoom: number): void;
+        disableMouseWheelZoom(): Instance;
 
-        setBeforeZoom(fn: (scale: number) => void): void;
+        isMouseWheelZoomEnabled(): boolean;
 
-        setOnZoom(fn: (scale: number) => void): void;
+        setZoomScaleSensitivity(scale: number): Instance;
+
+        setMinZoom(zoom: number): Instance;
+
+        setMaxZoom(zoom: number): Instance;
+
+        setBeforeZoom(fn: (scale: number) => void): Instance;
+
+        setOnZoom(fn: (scale: number) => void): Instance;
 
         zoom(scale: number):void;
 
-        zoomIn(): void;
+        zoomIn(): Instance;
 
-        zoomOut(): void;
+        zoomOut(): Instance;
 
-        zoomBy(scale: number): void;
+        zoomBy(scale: number): Instance;
 
-        resetZoom(): void;
+        zoomAtPoint(scale:number, point:Point): Instance;
+
+        zoomAtPointBy(scale:number, point:Point): Instance;
+
+        resetZoom(): Instance;
 
         /**
          * Get zoom scale/level
@@ -104,48 +165,49 @@ declare namespace SvgPanZoom {
          * Adjust viewport size (only) so it will fit in SVG
          * Does not center image
          *
-         * @param  {bool} dropCache drop viewBox cache and recalculate SVG's viewport sizes. Default false
+         * @return {Instance}    Current instance
          */
-        fit(dropCache?: boolean): void;
+        fit(): Instance;
+
+        /**
+         * Adjust viewport size (only) so it will contain in SVG
+         * Does not center image
+         *
+         * @return {Instance}    Current instance
+         */
+        contain(): Instance;
 
         /**
          * Adjust viewport pan (only) so it will be centered in SVG
          * Does not zoom/fit image
          *
-         * @param  {bool} dropCache drop viewBox cache and recalculate SVG's viewport sizes. Default false
+         * @return {Instance}    Current instance
          */
-        center(dropCache?: boolean): void;
+        center(): Instance;
 
         /**
          * Recalculates cached svg dimensions and controls position
+         *
+         * @return {Instance}    Current instance
          */
-        resize(): void;
+        resize(): Instance;
+
+        reset(): Instance;
 
         /**
-         * Pan to a rendered position
+         * Update content cached BorderBox
+         * Use when viewport contents change
          *
-         * @param  {object} point {x: 0, y: 0}
+         * @return {Instance}    Current instance
          */
-        pan(point: IPoint): void;
+        updateBBox(): Instance;
 
-        /**
-         * Relatively pan the graph by a specified rendered position vector
-         *
-         * @param  {object} point {x: 0, y: 0}
-         */
-        panBy(point: IPoint): void;
-
-        /**
-         * Get pan vector
-         *
-         * @return {object} {x: 0, y: 0}
-         */
-        getPan(): IPoint;
-
-        zoomAtPoint(scale:number, point:IPoint): boolean;
-
-        zoomAtPointBy(scale:number, point:IPoint): boolean;
+        destroy(): void;
     }
 }
 
-declare var svgPanZoom:SvgPanZoom.ISvgPanZoom;
+declare const svgPanZoom:SvgPanZoom.Instance;
+
+declare module 'svg-pan-zoom' {
+    export = svgPanZoom;
+}

From 9a1a183337cf770766711682c6fa59d705862e03 Mon Sep 17 00:00:00 2001
From: Leo Rudberg <ljrudberg@gmail.com>
Date: Tue, 8 Nov 2016 08:34:45 -0500
Subject: [PATCH 068/245] Add "string enum" types for base config log levels
 (#12520)

See the base/default config options here: https://github.com/winstonjs/winston/tree/master/lib/winston/config
---
 winston/winston.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/winston/winston.d.ts b/winston/winston.d.ts
index deb00be187..8fb9b690f4 100644
--- a/winston/winston.d.ts
+++ b/winston/winston.d.ts
@@ -25,6 +25,10 @@ declare module "winston" {
   export var level: string;
 
   export var log: LogMethod;
+                
+  export type CLILoggingLevel = 'error' | 'warn' | 'help' | 'data' | 'info' | 'debug' | 'prompt' | 'verbose' | 'input' | 'silly';
+  export type NPMLoggingLevel = 'error' | 'warn' | 'info' | 'verbose' | 'debug' | 'silly';
+  export type SyslogLoggingLevel = 'emerg' | 'alert' | 'crit' | 'error' | 'warning' | 'notice' | 'info' | 'debug';
 
   export var silly: LeveledLogMethod;
   export var debug: LeveledLogMethod;

From 2415e742d38c2c5f3c7a05014a8902811ea8702f Mon Sep 17 00:00:00 2001
From: oliverbock <oliver@g7.org>
Date: Wed, 9 Nov 2016 01:36:32 +1100
Subject: [PATCH 069/245] Added manualRowMove (#12464)

* Added manualRowMove

* doc comment
---
 jquery-handsontable/jquery-handsontable.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/jquery-handsontable/jquery-handsontable.d.ts b/jquery-handsontable/jquery-handsontable.d.ts
index 14a6ab1b67..fa979f27f6 100644
--- a/jquery-handsontable/jquery-handsontable.d.ts
+++ b/jquery-handsontable/jquery-handsontable.d.ts
@@ -292,6 +292,11 @@ declare namespace Handsontable {
          */
         manualRowResize?: boolean;
 
+        /**
+         * Turns on Manual row move, if set to a boolean or define initial row order, if set to an array of row indexes.
+         */
+        manualRowMove?: boolean;
+
         /**
          * Setting to true enables the copyPaste plugin, which enables the copying and pasting to the clipboard.
          */

From 8586be09ed97c00cbadc201aa970d6f1e0f7175c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alejandro=20S=C3=A1nchez?=
 <alejo90@users.noreply.github.com>
Date: Tue, 8 Nov 2016 08:59:49 -0600
Subject: [PATCH 070/245] Added missing method definitions and tests to
 DomEvent (#12531)

---
 leaflet/leaflet-tests.ts | 24 +++++++++++++++-----
 leaflet/leaflet.d.ts     | 49 +++++++++++++++++++++-------------------
 2 files changed, 44 insertions(+), 29 deletions(-)

diff --git a/leaflet/leaflet-tests.ts b/leaflet/leaflet-tests.ts
index a6f07eaefe..80d6c35e41 100644
--- a/leaflet/leaflet-tests.ts
+++ b/leaflet/leaflet-tests.ts
@@ -208,12 +208,24 @@ tileLayer = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', tileLayerOpti
 tileLayer = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png?{foo}&{bar}&{abc}', {foo: 'bar', bar: (data: any) => 'foo', abc: () => ''});
 
 let eventHandler = () => {};
-L.DomEvent.on(htmlElement, 'click', eventHandler);
-L.DomEvent.off(htmlElement, 'click', eventHandler);
-L.DomEvent.on(htmlElement, { 'click': eventHandler });
-L.DomEvent.off(htmlElement, { 'click': eventHandler }, eventHandler);
-L.DomEvent.disableScrollPropagation(htmlElement);
-L.DomEvent.disableClickPropagation(htmlElement);
+let domEvent: Event = {} as Event;
+L.DomEvent
+	.on(htmlElement, 'click', eventHandler)
+	.addListener(htmlElement, 'click', eventHandler)
+	.off(htmlElement, 'click', eventHandler)
+	.removeListener(htmlElement, 'click', eventHandler)
+	.on(htmlElement, {'click': eventHandler})
+	.addListener(htmlElement, {'click': eventHandler})
+	.off(htmlElement, {'click': eventHandler}, eventHandler)
+	.removeListener(htmlElement, {'click': eventHandler}, eventHandler)
+	.stopPropagation(domEvent)
+	.disableScrollPropagation(htmlElement)
+	.disableClickPropagation(htmlElement)
+	.preventDefault(domEvent)
+	.stop(domEvent);
+point = L.DomEvent.getMousePosition(domEvent);
+point = L.DomEvent.getMousePosition(domEvent, htmlElement);
+const wheelDelta: number = L.DomEvent.getWheelDelta(domEvent);
 
 map = map
 	// addControl
diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts
index ee2483b752..dd886d8820 100644
--- a/leaflet/leaflet.d.ts
+++ b/leaflet/leaflet.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Leaflet.js 1.0.0-rc3
+// Type definitions for Leaflet.js 1.0.0
 // Project: https://github.com/Leaflet/Leaflet
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -1222,12 +1222,35 @@ declare namespace L {
     }
 
     export namespace DomEvent {
-        export function on(el: HTMLElement, types: string, fn: Function, context?: Object): typeof DomEvent;
+        export function on(el: HTMLElement, types: string, fn: (ev: Event) => any, context?: Object): typeof DomEvent;
+
         export function on(el: HTMLElement, eventMap: {[eventName: string]: Function}, context?: Object): typeof DomEvent;
-        export function off(el: HTMLElement, types: string, fn: Function, context?: Object): typeof DomEvent;
+
+        export function off(el: HTMLElement, types: string, fn: (ev: Event) => any, context?: Object): typeof DomEvent;
+
         export function off(el: HTMLElement, eventMap: {[eventName: string]: Function}, context?: Object): typeof DomEvent;
+
+        export function stopPropagation(ev: Event): typeof DomEvent;
+
         export function disableScrollPropagation(el: HTMLElement): typeof DomEvent;
+
         export function disableClickPropagation(el: HTMLElement): typeof DomEvent;
+
+        export function preventDefault(ev: Event): typeof DomEvent;
+
+        export function stop(ev: Event): typeof DomEvent;
+
+        export function getMousePosition(ev: Event, container?: HTMLElement): Point;
+
+        export function getWheelDelta(ev: Event): number;
+
+        export function addListener(el: HTMLElement, types: string, fn: (ev: Event) => any, context?: Object): typeof DomEvent;
+
+        export function addListener(el: HTMLElement, eventMap: {[eventName: string]: Function}, context?: Object): typeof DomEvent;
+
+        export function removeListener(el: HTMLElement, types: string, fn: (ev: Event) => any, context?: Object): typeof DomEvent;
+
+        export function removeListener(el: HTMLElement, eventMap: {[eventName: string]: Function}, context?: Object): typeof DomEvent;
     }
 
     interface DefaultMapPanes {
@@ -1448,45 +1471,25 @@ declare namespace L {
         export const gecko: boolean;
         export const android: boolean;
         export const android23: boolean;
-
         export const chrome: boolean;
-
         export const safari: boolean;
-
         export const win: boolean;
-
         export const ie3d: boolean;
-
         export const webkit3d: boolean;
-
         export const gecko3d: boolean;
-
         export const opera12: boolean;
-
         export const any3d: boolean;
-
         export const mobile: boolean;
-
         export const mobileWebkit: boolean;
-
         export const mobiWebkit3d: boolean;
-
         export const mobileOpera: boolean;
-
         export const mobileGecko: boolean;
-
         export const touch: boolean;
-
         export const msPointer: boolean;
-
         export const pointer: boolean;
-
         export const retina: boolean;
-
         export const canvas: boolean;
-
         export const vml: boolean;
-
         export const svg: boolean;
     }
 }

From 447dba8df6c7a89f114275a6ac98591f74cbfc56 Mon Sep 17 00:00:00 2001
From: akim95 <m.akmalhakim95@gmail.com>
Date: Tue, 8 Nov 2016 23:13:54 +0800
Subject: [PATCH 071/245] remove billplz typings

---
 billplz/billplz-tests.ts | 46 -----------------------
 billplz/billplz.d.ts     | 80 ----------------------------------------
 2 files changed, 126 deletions(-)
 delete mode 100644 billplz/billplz-tests.ts
 delete mode 100644 billplz/billplz.d.ts

diff --git a/billplz/billplz-tests.ts b/billplz/billplz-tests.ts
deleted file mode 100644
index 4f0e4633a2..0000000000
--- a/billplz/billplz-tests.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/// <reference path="billplz.d.ts" />
-
-import * as Billplz from 'billplz';
-
-const billplz = new Billplz({
-  key: 'your-api-key',
-  endpoint: 'http://localhost/',
-  sandbox: true
-});
-
-// test create collection
-billplz.create_collection({
-  title: 'your-title'
-});
-
-// test create open collection
-billplz.create_collectionOpen({
-  title: 'your-title',
-  description: 'your-description',
-  amount: 100
-});
-
-// test create bill
-billplz.create_bill({
-  collection_id: 'your-collection-id',
-  description: 'your-description',
-  email: 'your-email',
-  mobile: 12345,
-  name: 'your-name',
-  amount: 100,
-  callback_url: 'https://example.com/webhook/',
-  redirect_url: 'https://example.com/done',
-  due_at: '0000-00-00'
-});
-
-// test get bill
-billplz.get_bill('your-bill-id');
-
-// test delete bill
-billplz.delete_bill('your-bill-id');
-
-// test change collection status
-billplz.change_collection_status('your-collection-id', 'status-here');
-
-// test registration check
-billplz.registration_check('your-bank-account-number');
diff --git a/billplz/billplz.d.ts b/billplz/billplz.d.ts
deleted file mode 100644
index 53355f280b..0000000000
--- a/billplz/billplz.d.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-// Type definitions for billplz 1.0.2
-// Project: https://github.com/suhz/node-billplz
-// Definitions by: Akim <https://github.com/Akim95>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module Billplz {
-    // api options type
-    interface BillplzOptions {
-        key: string;
-        endpoint?: string;
-        sandbox?: boolean;
-    }
-
-    // collection type
-    interface CollectionArguments {
-        title: string;
-    }
-
-    // open collection type
-    interface OpenCollectionArguments {
-        title: string;
-        description: string;
-        amount: number;
-        fixed_amount?: boolean;
-        fixed_quantity?: boolean;
-        payment_button?: string;
-        reference_1_label?: string
-        reference_2_label?: string;
-        email_link?: string;
-        tax?: number;
-    }
-
-    // bill type
-    interface BillArguments {
-        collection_id: string;
-        email: string;
-        mobile: number;
-        name: string;
-        amount: number;
-        callback_url: string;
-        description: string;
-        due_at?: string;
-        redirect_url?: string;
-        deliver?: boolean;
-        reference_1_label?: string;
-        reference_1?: string;
-        reference_2_label?: string;
-        reference_2?: string;
-    }
-}
-
-declare class Billplz {
-    // constructor
-    constructor(options: string | Billplz.BillplzOptions);
-
-    // create_collection
-    create_collection(title: Billplz.CollectionArguments, callback?: (res: any, err: any) => void): void;
-
-    // create collectionOpen
-    create_collectionOpen(args: Billplz.OpenCollectionArguments, callback?: (res: any, err: any) => void): void;
-
-    // create bill
-    create_bill(args: Billplz.BillArguments, callback?: (res: any, err: any) => void): void;
-
-    // get bill
-    get_bill(billId: string, callback?: (res: any, err: any) => void): void;
-
-    // delete bill
-    delete_bill(billId: string, callback?: (res: any, err: any) => void): void;
-
-    // change_collection status
-    change_collection_status(collectionId: string, status: string, callback?: (res: any, err: any) => void): void;
-
-    // registration check
-    registration_check(bankAccountNumber: string, callback?: (res: any, err: any) => void): void;
-}
-
-declare module "billplz" {
-    export = Billplz;
-}

From 3abf7a7bd48328caa63a30c0b26467f8c17bff12 Mon Sep 17 00:00:00 2001
From: Martin Helmich <kontakt@martin-helmich.de>
Date: Tue, 8 Nov 2016 16:21:26 +0100
Subject: [PATCH 072/245] Cursor.map returns Cursor, not void (#12560)

---
 mongodb/mongodb.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mongodb/mongodb.d.ts b/mongodb/mongodb.d.ts
index b64868b93f..7aba7ff7a8 100644
--- a/mongodb/mongodb.d.ts
+++ b/mongodb/mongodb.d.ts
@@ -1172,7 +1172,7 @@ declare module "mongodb" {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#limit
     limit(value: number): Cursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#map
-    map(transform: Function): void;
+    map(transform: Function): Cursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#max
     max(max: number): Cursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#maxAwaitTimeMS

From 48c51e234652dbe1557899398aa161fd130e922d Mon Sep 17 00:00:00 2001
From: Kasper Fromm Pedersen <kasperfromm@protonmail.com>
Date: Tue, 8 Nov 2016 20:49:31 +0100
Subject: [PATCH 073/245] Changed to follow the documentation

---
 leaflet/leaflet.d.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/leaflet/leaflet.d.ts b/leaflet/leaflet.d.ts
index 0cdb84d113..7f445d4ac0 100644
--- a/leaflet/leaflet.d.ts
+++ b/leaflet/leaflet.d.ts
@@ -1343,11 +1343,14 @@ declare namespace L {
     export interface Icon extends Layer {
         createIcon(oldIcon?: HTMLElement): HTMLElement;
         createShadow(oldIcon?: HTMLElement): HTMLElement;
-        imagePath: string;
     }
 
+    export interface IconDefault extends Icon {
+        imagePath: string;
+    }
+     
     export namespace Icon {
-        export const Default: Icon;
+        export const Default: IconDefault;
     }
 
     export function icon(options: IconOptions): Icon;

From 657ee7a10e3c3d0778266d7ea2f77d73d2b466de Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 9 Nov 2016 08:42:00 -0800
Subject: [PATCH 074/245] Mention that bundled packages don't need a header

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 8caef8c8e2..1794dea589 100644
--- a/README.md
+++ b/README.md
@@ -186,6 +186,7 @@ Make a PR doing the following:
 * Any other packages in DefinitelyTyped that referenced the deleted package should be updated to reference the bundled types.
     To do this, add a `package.json` with `"dependencies": { "foo": "x.y.z" }`.
 
+When a package is bundled, it no longer needs the header comment – this is only used by DefinitelyTyped, not by the TypeScript compiler.
 
 ## FAQ
 

From 47310a628aa6d2d7e58ac0463a6a2e0918954d9e Mon Sep 17 00:00:00 2001
From: Teruyoshi Kutsuna <cse_t_kutsuna@incrementp.co.jp>
Date: Thu, 10 Nov 2016 14:36:20 +0900
Subject: [PATCH 075/245] fix(angular-ui-router): replace argument of url
 matcher.exec searchParams to search, hash, options (optionally all).

---
 angular-ui-router/angular-ui-router.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/angular-ui-router/angular-ui-router.d.ts b/angular-ui-router/angular-ui-router.d.ts
index 7e4f097c8c..7769a85105 100644
--- a/angular-ui-router/angular-ui-router.d.ts
+++ b/angular-ui-router/angular-ui-router.d.ts
@@ -112,7 +112,7 @@ declare namespace angular.ui {
 
     interface IUrlMatcher {
         concat(pattern: string): IUrlMatcher;
-        exec(path: string, searchParams: {}): {};
+        exec(path: string, search?: any, hash?: string, options?: any): {};
         parameters(): string[];
         format(values: {}): string;
     }

From fd6c85e04f3fbc1acae36e47cdc32f5ccdfb04f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6hn?= <m.koehn@mip-consult.de>
Date: Thu, 10 Nov 2016 07:19:22 +0100
Subject: [PATCH 076/245] fix exported module naming

---
 shopify-buy/shopify-buy.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shopify-buy/shopify-buy.d.ts b/shopify-buy/shopify-buy.d.ts
index 18c9358b3b..c88e1e8107 100644
--- a/shopify-buy/shopify-buy.d.ts
+++ b/shopify-buy/shopify-buy.d.ts
@@ -370,6 +370,6 @@ declare namespace ShopifyBuy {
 
 }
 
-declare module "ShopifyBuy" {
+declare module "shopify-buy" {
     export = ShopifyBuy
 }

From e8f1934fba7e75f1b57a9e39ccc12fc7ca81c714 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=B6hn?= <m.koehn@mip-consult.de>
Date: Thu, 10 Nov 2016 08:19:05 +0100
Subject: [PATCH 077/245] Update typings for shopify-buy v0.4.2

---
 shopify-buy/shopify-buy-tests.ts |  24 +-
 shopify-buy/shopify-buy.d.ts     | 434 ++++++++++++++++++-------------
 2 files changed, 267 insertions(+), 191 deletions(-)

diff --git a/shopify-buy/shopify-buy-tests.ts b/shopify-buy/shopify-buy-tests.ts
index 3d8d1f5988..23dd7b3c68 100644
--- a/shopify-buy/shopify-buy-tests.ts
+++ b/shopify-buy/shopify-buy-tests.ts
@@ -5,7 +5,7 @@
 ============================================================ */
 let client = ShopifyBuy.buildClient({
     apiKey: 'bf081e860bc9dc1ce0654fdfbc20892d',
-    myShopifyDomain: 'embeds',
+    domain: 'embeds',
     appId: '6'
 });
 
@@ -34,7 +34,7 @@ client.fetchProduct('3614436099').then(function (fetchedProduct : ShopifyBuy.Sho
     product = fetchedProduct;
     var selectedVariant : ShopifyBuy.Shopify.ProductVariantModel = product.selectedVariant;
     var selectedVariantImage : any = product.selectedVariantImage;
-    var currentOptions : ShopifyBuy.Shopify.Option[] = product.options;
+    var currentOptions : ShopifyBuy.Shopify.ProductOptionModel[] = product.options;
 
     var variantSelectors = generateSelectors(product);
     $('.variant-selectors').html(""+variantSelectors);
@@ -51,7 +51,7 @@ client.fetchProduct('3614436099').then(function (fetchedProduct : ShopifyBuy.Sho
 /* Generate DOM elements for variant selectors
 ============================================================ */
 function generateSelectors(product : ShopifyBuy.Shopify.ProductModel) {
-    var elements = product.options.map(function(option : ShopifyBuy.Shopify.Option) {
+    var elements = product.options.map(function(option : ShopifyBuy.Shopify.ProductOptionModel) {
         var optionsHtml = option.values.map(function(value : any) {
             return '<option value="' + value + '">' + value + '</option>';
         });
@@ -127,7 +127,7 @@ function attachOnVariantSelectListeners(product : ShopifyBuy.Shopify.ProductMode
         var $element : any = $(event.target);
         var name : string = $element.attr('name');
         var value : string = $element.val();
-        product.options.filter(function(option : ShopifyBuy.Shopify.Option) {
+        product.options.filter(function(option : ShopifyBuy.Shopify.ProductOptionModel) {
             return option.name === name;
         })[0].selected = value;
 
@@ -172,7 +172,7 @@ function buyButtonClickHandler(evt : any) {
     evt.preventDefault();
     var id : string | number = product.selectedVariant.id;
     var quantity : number;
-    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(id);
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItemModel = findCartItemByVariantId(id);
 
     quantity = cartLineItem ? cartLineItem.quantity + 1 : 1;
 
@@ -188,7 +188,7 @@ function updateQuantity(fn : Function, variantId : string | number) {
         return (variant.id === variantId);
     })[0];
     var quantity : number;
-    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(variant.id);
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItemModel = findCartItemByVariantId(variant.id);
     if (cartLineItem) {
         quantity = fn(cartLineItem.quantity);
         updateVariantInCart(cartLineItem, quantity);
@@ -218,7 +218,7 @@ function fieldQuantityHandler(evt : any) {
     var variant : ShopifyBuy.Shopify.ProductVariantModel = product.variants.filter(function (variant : ShopifyBuy.Shopify.ProductVariantModel) {
         return (variant.id === variantId);
     })[0];
-    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(variant.id);
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItemModel = findCartItemByVariantId(variant.id);
     var quantity : number = evt.target.value;
     if (cartLineItem) {
         updateVariantInCart(cartLineItem, quantity);
@@ -267,7 +267,7 @@ function findCartItemByVariantId(variantId : string | number) {
 ============================================================ */
 function addOrUpdateVariant(variant : ShopifyBuy.Shopify.ProductVariantModel, quantity : number) {
     openCart();
-    var cartLineItem : ShopifyBuy.Shopify.CartLineItem = findCartItemByVariantId(variant.id);
+    var cartLineItem : ShopifyBuy.Shopify.CartLineItemModel = findCartItemByVariantId(variant.id);
 
     if (cartLineItem) {
         updateVariantInCart(cartLineItem, quantity);
@@ -280,7 +280,7 @@ function addOrUpdateVariant(variant : ShopifyBuy.Shopify.ProductVariantModel, qu
 
 /* Update details for item already in cart. Remove if necessary
 ============================================================ */
-function updateVariantInCart(cartLineItem : ShopifyBuy.Shopify.CartLineItem, quantity : number) {
+function updateVariantInCart(cartLineItem : ShopifyBuy.Shopify.CartLineItemModel, quantity : number) {
     var variantId : string | number = cartLineItem.variant_id;
     var cartLength : number = cart.lineItems.length;
     cart.updateLineItem(cartLineItem.id, quantity).then(function(updatedCart : ShopifyBuy.Shopify.CartModel) {
@@ -311,7 +311,7 @@ function addVariantToCart(variant : ShopifyBuy.Shopify.ProductVariantModel, quan
     openCart();
 
     cart.addVariants({ variant: variant, quantity: quantity }).then(function() {
-        var cartItem : ShopifyBuy.Shopify.CartLineItem = cart.lineItems.filter(function (item : ShopifyBuy.Shopify.CartLineItem ) {
+        var cartItem : ShopifyBuy.Shopify.CartLineItemModel = cart.lineItems.filter(function (item : ShopifyBuy.Shopify.CartLineItemModel ) {
             return (item.variant_id === variant.id);
         })[0];
         var $cartItem = renderCartItem(cartItem);
@@ -332,7 +332,7 @@ function addVariantToCart(variant : ShopifyBuy.Shopify.ProductVariantModel, quan
 
 /* Return required markup for single item rendering
 ============================================================ */
-function renderCartItem(lineItem : ShopifyBuy.Shopify.CartLineItem) {
+function renderCartItem(lineItem : ShopifyBuy.Shopify.CartLineItemModel) {
     var lineItemEmptyTemplate = $('#CartItemTemplate').html();
     var $lineItemTemplate = $(lineItemEmptyTemplate);
     var itemImage = lineItem.image.src;
@@ -401,6 +401,6 @@ function updateCartTabButton() {
 
 /* Set previously focused item for escape handler
 ============================================================ */
-function setPreviousFocusItem(item : ShopifyBuy.Shopify.CartLineItem) {
+function setPreviousFocusItem(item : ShopifyBuy.Shopify.CartLineItemModel) {
     previousFocusItem = item;
 }
diff --git a/shopify-buy/shopify-buy.d.ts b/shopify-buy/shopify-buy.d.ts
index c88e1e8107..9de8249804 100644
--- a/shopify-buy/shopify-buy.d.ts
+++ b/shopify-buy/shopify-buy.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for shopify-buy
+// Type definitions for shopify-buy 0.4.2
 // Project: http://shopify.github.io/js-buy-sdk/api/
 // Definitions by: Martin Köhn <https://github.com/openminder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -7,39 +7,54 @@
  * The JS Buy SDK is a lightweight library that allows you to build ecommerce into any website.
  * It is based on Shopify’s API and provides the ability to retrieve products and collections from your shop,
  * add products to a cart, and checkout.
+ * It can render data on the client side or server. This will allow you to add ecommerce functionality to any
+ * website or javascript application. This is helpful if you already have a website and need to add ecommerce
+ * or only need a simple buy button on your site.
  */
 declare namespace ShopifyBuy {
     /**
      * Create a ShopClient. This is the main entry point to the SDK.
      */
-    export function buildClient(configAttrs : Shopify.Config) : Shopify.ShopClient
+    export function buildClient(configAttrs: Shopify.Config): Shopify.ShopClient
 
     /**
      * Internal Image description
      */
     interface Image {
-        id : string|number
-        src : string
-        position : number
-        product_id : string
-        variant_ids : Array<string>
-        created_at : string
-        updated_at : string
+        id: string | number
+        created_at: string
+        position: number
+        updated_at: string
+        product_id: string
+        src: string
+        variant_ids: Array<string>
+    }
+
+    interface ImageVariant {
+        name: string,
+        dimensions: string,
+        src: string
+    }
+
+    interface OptionValue {
+        name: string,
+        option_id: string | number,
+        value: any
     }
 
     /**
      * Internal BaseModel class
      */
     class BaseModel {
-        constructor( attrs: any, metaAttrs: any )
+        constructor(attrs: any, metaAttrs: any)
 
-        attrs : any
+        attrs: any
         serializer: any
         adapter: any
         shopClient: any
     }
 
-    var NO_IMAGE_URI : string;
+    var NO_IMAGE_URI: string;
 
     /**
      * This namespace contains all globally accessible classes
@@ -49,89 +64,31 @@ declare namespace ShopifyBuy {
         /**
          * Base Shopify Client config object
          */
-        interface Config
-        {
+        interface Config {
             /**
-             *  Your api client's public token.
+             * An API Key for your store. Documentation how to get an API Key:
+             * https://help.shopify.com/api/sdks/js-buy-sdk/getting-started#api-key
              */
             apiKey: string
 
-            /** The app whose listings the client will be using.
-             * If you are just modifying a buy button, the buy-button's app id is.
-             * Otherwise, obtain the app id of the app you're modifying or extending.
+            /**
+             * Typically will be 6 which is the Buy Button App Id. For more info on App Id see:
+             * https://help.shopify.com/api/sdks/js-buy-sdk/getting-started#app-id
              */
             appId: string
 
-            /** You shop's myshopify.com domain. */
-            myShopifyDomain: string
+            /**
+             * Your shop's full myshopify.com domain. For example: embeds.myshopify.com
+             */
+            domain: string
         }
 
         /**
          * Cart item, that should be added to the card
          */
         interface CartModelItem {
-            variant : Shopify.ProductVariantModel
-            quantity : number
-        }
-
-        class CartLineItem extends BaseModel {
-          constructor()
-
-          /**
-           * Line item unique ID
-           */
-          id : string|number
-
-          /**
-           * Images associated with product.
-           */
-          image : Image
-
-          /**
-           * Product title
-           */
-          title: string
-
-          /**
-           * ID of selected variant
-           */
-          variant_id: string|number
-
-          /**
-           * Title of selected variant
-           */
-          variant_title: string
-
-          /**
-           * Number of selected items
-           */
-          quantity : number
-
-          /**
-           * Variant weight in grams
-           */
-          grams: number
-
-          /**
-           * ID of selected product
-           */
-          product_id: string|number
-
-          /**
-           * Price of variant, formatted as currency
-           */
-          price: string
-
-          /**
-           * Compare at price for variant formatted as currency.
-           */
-          compare_at_price: string
-
-          /**
-           * Calculated price for the number of variant in card
-           */
-          line_price: string
-
+            variant: Shopify.ProductVariantModel
+            quantity: number
         }
 
         /**
@@ -142,95 +99,53 @@ declare namespace ShopifyBuy {
             /**
              * Config data to be used throughout all API interaction
              */
-            constructor( config? : Config )
+            constructor(config?: Config)
             /**
-             * Creates a CartModel instance, optionally including attrs.
+             * Creates a CartModel instance.
              */
-            createCart(attrs? : any) : Promise<CartModel>
+            createCart(): Promise<CartModel>
 
             /**
-             * Updates an existing CartModel instance and persists it to localStorage.
+             * This function will return an Array of collections from your store
              */
-            updateCart(attrs? : any) : Promise<CartModel>
+            fetchAllCollections(): Promise<Array<any>>
+
+            /**
+             * This function will return an Array of products from your store
+             */
+            fetchAllProducts(): Promise<Array<ProductModel>>
 
             /**
              * Retrieve a previously created cart by its key.
              */
-            fetchCart(id : string) : Promise<CartModel>
+            fetchCart(id: string): Promise<CartModel>
 
             /**
              * Fetch one collection by its ID.
              */
-            fetchCollection(id : string|number) : Promise<any> //TODO: Find declaration for Collection
+            fetchCollection(id: string | number): Promise<any>
 
             /**
              * Fetch one product by its ID.
              */
-            fetchProduct(id: string|number) : Promise<ProductModel>
+            fetchProduct(id: string | number): Promise<ProductModel>
 
             /**
              * Fetches a list of collections matching a specified query.
              */
-            fetchQueryCollections(query? : any) : Promise<Array<any>>
+            fetchQueryCollections(query?: any): Promise<Array<any>>
 
             /**
              * Fetches a list of products matching a specified query.
              */
-            fetchQueryProducts(query? : any) : Promise<Array<ProductModel>>
-
-        }
-
-        /**
-         * Class for cart model
-         */
-        class CartModel extends BaseModel {
-
-            constructor()
+            fetchQueryProducts(query?: any): Promise<Array<ProductModel>>
 
             /**
-             * Get checkout URL for current cart
+             * This method looks up a reference in localStorage to the most recent cart.
+             * If one is not found, creates one. If the cart the reference points to doesn't exist,
+             * create one and store the new reference.
              */
-            checkoutUrl : string
-
-            /**
-             * get ID for current cart
-             */
-            id : string|number
-
-            /**
-             * Get current line items for cart
-             */
-            lineItems : Array<CartLineItem>
-
-            /**
-             * Get current subtotal price for all line items
-             */
-            subtotal: string
-
-            /**
-             * Gets the sum quantity of each line item
-             */
-            lineItemCount : number
-
-            /**
-             * Add items to cart. Updates cart's lineItems
-             */
-            addVariants(item : CartModelItem, nextItem? : Array<CartModelItem>) : Promise<CartModel>
-
-            /**
-             * Remove all line items from cart
-             */
-            clearLineItems() : Promise<CartModel>
-
-            /**
-             * Remove line item from cart
-             */
-            removeLineItem(id : string|number) : Promise<CartModel>
-
-            /**
-             * Update line item quantity
-             */
-            updateLineItem(id : string|number, quantitiy : number ) : Promise<CartModel>
+            fetchRecentCart(): Promise<CartModel>
 
         }
 
@@ -241,20 +156,20 @@ declare namespace ShopifyBuy {
 
             constructor()
 
+            /**
+             * A product description.
+             */
+            description: string
+
             /**
              * Product unique ID
              */
-            id : string|number
+            id: string | number
 
             /**
-             * All images associated with product.
+             * An Array of Objects that contain meta data about an image including src of the images.
              */
-            images : Array<Image>
-
-            /**
-             * Product title
-             */
-            title: string
+            images: Array<Image>
 
             /**
              * All variants of a product.
@@ -262,24 +177,34 @@ declare namespace ShopifyBuy {
             variants: Array<ProductVariantModel>
 
             /**
-             * Get array of options with nested values. Useful for creating UI for selecting options.
+             * Get an array of ProductOptionModels. ProductOptionModels can be used to define
+             * the currently selectedVariant from which you can get a checkout url (ProductVariantModel.checkoutUrl)
+             * or can be added to a cart (CartModel.createLineItemsFromVariants).
              */
-            options : Array<Option>
+            options: Array<ProductOptionModel>
 
             /**
-             * Retrieve variant for currently selected options
+             * Retrieve variant for currently selected options. By default the first value in each option is selected
+             * which means selectedVariant will never be null. With a selectedVariant you can
+             * create checkout url (ProductVariantModel.checkoutUrl) or
+             * it can be added to a cart (CartModel.createLineItemsFromVariants).
              */
-            selectedVariant : ProductVariantModel
+            selectedVariant: ProductVariantModel
 
             /**
-             * Retrieve image for currently selected variantImage
+             * Retrieve image for currently selected variantImage.
              */
-            selectedVariantImage : Image
+            selectedVariantImage: Image
 
             /**
-             * Retrieve currently selected option values.
+             * A read only Array of Strings represented currently selected option values. eg. ["Large", "Red"]
              */
-            selections : Option
+            selections: Array<string>
+
+            /**
+             * The product title
+             */
+            title: string
         }
 
         /**
@@ -290,49 +215,67 @@ declare namespace ShopifyBuy {
             constructor()
 
             /*
-             * Checkout URL for purchasing variant with quantity.
+             * Get a checkout url for a specific product variant.
+             * You can optionally pass a quantity.
+             * If no quantity is passed then quantity will default to 1.
              */
-            checkoutUrl( quantitiy : number ) : string
+            checkoutUrl(quantitiy: number): string
 
             /**
-             * Compare at price for variant formatted as currency.
+             * Variant in stock. Always true if inventory tracking is disabled.
              */
-            compareAtPrice : string
+            available: boolean
 
             /**
-             * Variant weight in grams
+             * Compare at price for variant. The compareAtPrice would be the price of the
+             * product previously before the product went on sale.
              */
-            grams : number
+            compareAtPrice: string
+
+            /**
+             * Price of variant, formatted according to shop currency format string. For instance "$10.00"
+             */
+            formattedPrice: string
+
+            /**
+             * Variant weight in grams. If no weight is defined grams will be 0.
+             */
+            grams: number
 
             /**
              * Variant unique ID
              */
-            id : string|number
+            id: string | number
 
             /**
              * Image for variant
              */
-            image : Image
+            image: Image
+
+            /**
+             * Image variants available for a variant.
+             */
+            imageVariant: Array<ImageVariant>
 
             /**
              * Option values associated with this variant, ex {name: "color", value: "Blue"}
             */
-            optionValues : Array<Option>
+            optionValues: Array<OptionValue>
 
             /**
-             * Price of variant, formatted as currency
+             * Price of the variant. The price will be in the following form: "10.00"
              */
-            price : string
+            price: string
 
             /**
              * ID of product variant belongs to
              */
-            productId : string|number
+            productId: string | number
 
             /**
              * Title of product variant belongs to
              */
-            productTitle : string
+            productTitle: string
 
             /**
              * Title of variant
@@ -343,7 +286,7 @@ declare namespace ShopifyBuy {
         /**
          * Class for product option
          */
-        class Option extends BaseModel {
+        class ProductOptionModel extends BaseModel {
 
             constructor()
 
@@ -353,16 +296,149 @@ declare namespace ShopifyBuy {
             name: string
 
             /**
-             * get/set selected option value (ex. "Large").
-             * Setting this will update the selected value on the model.
-             * Throws {Error} if setting selected to value that does not exist for option
+             * get/set the currently selected option value with one of the values from the ProductOptionModel/values array.
+             * For instance if the option values array had the following ["Large", "Medium", "Small"] setting selected to be
+             * "Large", "Medium", or "Small" would be valid any other value would throw an Error.
              */
-            selected : string
+            selected: string
 
             /**
-             * possible values for selection
+             * an Array possible values for option. For instance if this option
+             * is a "Size" option an example value for values could be: ["Large", "Medium", "Small"]
              */
-            values : Array<any>
+            values: Array<any>
+
+        }
+
+        /**
+         * Class for cart model
+         */
+        class CartModel extends BaseModel {
+
+            constructor()
+
+            /**
+             * Remove all line items from cart
+             */
+            clearLineItems(): Promise<CartModel>
+
+            /**
+             * Add items to cart. Updates cart's lineItems
+             */
+            addVariants(item: CartModelItem, nextItem?: Array<CartModelItem>): Promise<CartModel>
+
+            /**
+             * Add items to the cart. Updates cart's lineItems based on variants passed in.
+             */
+            createLineItemsFromVariants(...items: CartModelItem[] ): Promise<CartModel>
+
+            /**
+             * Remove a line item from cart based on line item id
+             */
+            removeLineItem(id: string | number): Promise<CartModel>
+
+            /**
+             * Update a line item quantity based on line item id
+             */
+            updateLineItem(id: string | number, quantitiy: number): Promise<CartModel>
+
+            /**
+             * Force update of cart model on server. This function will only be used in advanced
+             * situations and does not need to be called explicitly to update line items.
+             * It is automatically called after createLineItemsFromVariants, updateLineItem,
+             * removeLineItem, and removeLineItem
+             */
+            updateModel(): Promise<CartModel>
+
+            /**
+             * Get checkout URL for current cart
+             */
+            checkoutUrl: string
+
+            /**
+             * get ID for current cart
+             */
+            id: string | number
+
+            /**
+             * Gets the total quantity of all line items. Example: you've added two variants
+             * with quantities 3 and 2. lineItemCount will be 5.
+             */
+            lineItemCount: number
+
+            /**
+             * Get an Array of CartLineItemModel's
+             */
+            lineItems: Array<CartLineItemModel>
+
+            /**
+             * Get current subtotal price for all line items.
+             * Example: two items have been added to the cart that cost $1.25 then the subtotal will be 2.50
+             */
+            subtotal: string
+
+        }
+
+        class CartLineItemModel extends BaseModel {
+            constructor()
+
+            /**
+             * Compare at price for variant. The compareAtPrice would be the price of the product
+             * previously before the product went on sale.
+             * If no compareAtPrice is set then this value will be null. An example value: "5.00".
+             */
+            compare_at_price: string
+
+            /**
+             * Variant's weight in grams. If no weight is set then 0 is returned.
+             */
+            grams: number
+
+            /**
+             * A line item ID.
+             */
+            id: string | number
+
+            /**
+             * Variant's image.
+             */
+            image: Image
+
+            /**
+             * The total price for this line item. For instance if the variant costs 1.50 and you have a
+             * quantity of 2 then line_price will be 3.00.
+             */
+            line_price: string
+
+            /**
+             * Price of the variant. For example: "5.00".
+             */
+            price: string
+
+            /**
+             * ID of variant's product.
+             */
+            product_id: string | number
+
+            /**
+             * Count of variants to order.
+             */
+            quantity: number
+
+            /**
+             * Product title of variant's parent product.
+             */
+            title: string
+
+            /**
+             * ID of line item variant.
+             */
+            variant_id: string | number
+
+            /**
+             * Title of variant.
+             */
+            variant_title: string
 
         }
 

From d5913e497b75e28ff43643cc85f1b72e3f079d34 Mon Sep 17 00:00:00 2001
From: Hugo Leclerc <hugal.leclerc@gmail.com>
Date: Thu, 10 Nov 2016 09:50:36 +0100
Subject: [PATCH 078/245] Adding error types in explicit calls of async-tests

---
 async/async-tests.ts | 68 ++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/async/async-tests.ts b/async/async-tests.ts
index 63f46c3ae5..37c561e641 100644
--- a/async/async-tests.ts
+++ b/async/async-tests.ts
@@ -440,10 +440,10 @@ async.dir(function (name, callback) {
 
 // each
 
-async.each<number>({
+async.each<number,Error>({
     "a": 1,
     "b": 2
-}, function(val: number, next: ErrorCallback): void {
+}, function(val: number, next: ErrorCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -459,10 +459,10 @@ async.each<number>({
 
 });
 
-async.eachSeries<number>({
+async.eachSeries<number, Error>({
     "a": 1,
     "b": 2
-}, function(val: number, next: ErrorCallback): void {
+}, function(val: number, next: ErrorCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -478,14 +478,14 @@ async.eachSeries<number>({
 
 });
 
-async.eachLimit<number>({
+async.eachLimit<number, Error>({
     "a": 1,
     "b": 2,
     "c": 3,
     "d": 4,
     "e": 5,
     "f": 6
-}, 2, function(val: number, next: ErrorCallback): void {
+}, 2, function(val: number, next: ErrorCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -503,10 +503,10 @@ async.eachLimit<number>({
 
 // forEachOf/eachOf
 
-async.eachOf<number>({
+async.eachOf<number, Error>({
     "a": 1,
     "b": 2
-}, function(val: number, key: string, next: ErrorCallback): void {
+}, function(val: number, key: string, next: ErrorCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -522,10 +522,10 @@ async.eachOf<number>({
 
 });
 
-async.forEachOfSeries<number>({
+async.forEachOfSeries<number, Error>({
     "a": 1,
     "b": 2
-}, function(val: number, key: string, next: ErrorCallback): void {
+}, function(val: number, key: string, next: ErrorCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -541,14 +541,14 @@ async.forEachOfSeries<number>({
 
 });
 
-async.forEachOfLimit<number>({
+async.forEachOfLimit<number, Error>({
     "a": 1,
     "b": 2,
     "c": 3,
     "d": 4,
     "e": 5,
     "f": 6
-}, 2, function(val: number, key: string, next: ErrorCallback): void {
+}, 2, function(val: number, key: string, next: ErrorCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -566,11 +566,11 @@ async.forEachOfLimit<number>({
 
 // map
 
-async.map<number, string>({
+async.map<number, string, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(val: number, next: AsyncResultCallback<string>): void {
+}, function(val: number, next: AsyncResultCallback<string, Error>): void {
 
     setTimeout(function(): void {
 
@@ -586,11 +586,11 @@ async.map<number, string>({
 
 });
 
-async.mapSeries<number, string>({
+async.mapSeries<number, string, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(val: number, next: AsyncResultCallback<string>): void {
+}, function(val: number, next: AsyncResultCallback<string, Error>): void {
 
     setTimeout(function(): void {
 
@@ -606,14 +606,14 @@ async.mapSeries<number, string>({
 
 });
 
-async.mapLimit<number, string>({
+async.mapLimit<number, string, Error>({
     "a": 1,
     "b": 2,
     "c": 3,
     "d": 4,
     "e": 5,
     "f": 6
-}, 2, function(val: number, next: AsyncResultCallback<string>): void {
+}, 2, function(val: number, next: AsyncResultCallback<string, Error>): void {
 
     setTimeout(function(): void {
 
@@ -631,11 +631,11 @@ async.mapLimit<number, string>({
 
 // mapValues
 
-async.mapValues<number, string>({
+async.mapValues<number, string, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(val: number, key: string, next: AsyncResultCallback<string>): void {
+}, function(val: number, key: string, next: AsyncResultCallback<string, Error>): void {
 
     setTimeout(function(): void {
 
@@ -651,11 +651,11 @@ async.mapValues<number, string>({
 
 });
 
-async.mapValuesSeries<number, string>({
+async.mapValuesSeries<number, string, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(val: number, key: string, next: AsyncResultCallback<string>): void {
+}, function(val: number, key: string, next: AsyncResultCallback<string, Error>): void {
 
     setTimeout(function(): void {
 
@@ -673,11 +673,11 @@ async.mapValuesSeries<number, string>({
 
 // filter/select/reject
 
-async.filter<number>({
+async.filter<number, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(val: number, next: AsyncBooleanResultCallback): void {
+}, function(val: number, next: AsyncBooleanResultCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -693,11 +693,11 @@ async.filter<number>({
 
 });
 
-async.reject<number>({
+async.reject<number, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(val: number, next: AsyncBooleanResultCallback): void {
+}, function(val: number, next: AsyncBooleanResultCallback<Error>): void {
 
     setTimeout(function(): void {
 
@@ -715,11 +715,11 @@ async.reject<number>({
 
 // concat
 
-async.concat<string, string>({
+async.concat<string, string, Error>({
     "a": "1",
     "b": "2",
     "c": "3"
-}, function(item: string, next: AsyncResultCallback<string[]>): void {
+}, function(item: string, next: AsyncResultCallback<string[], Error>): void {
 
     console.log(`async.concat: ${item}`);
 
@@ -733,11 +733,11 @@ async.concat<string, string>({
 
 // detect/find
 
-async.detect<number>({
+async.detect<number, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(item: number, next: AsyncBooleanResultCallback): void {
+}, function(item: number, next: AsyncBooleanResultCallback<Error>): void {
 
     console.log(`async.detect/find: ${item}`);
 
@@ -758,11 +758,11 @@ async.detect<number>({
 
 // every/all
 
-async.every<number>({
+async.every<number,Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(item: number, next: AsyncBooleanResultCallback): void {
+}, function(item: number, next: AsyncBooleanResultCallback<Error>): void {
 
     console.log(`async.every/all: ${item}`);
 
@@ -776,11 +776,11 @@ async.every<number>({
 
 // some/any
 
-async.some<number>({
+async.some<number, Error>({
     "a": 1,
     "b": 2,
     "c": 3
-}, function(item: number, next: AsyncBooleanResultCallback): void {
+}, function(item: number, next: AsyncBooleanResultCallback<Error>): void {
 
     console.log(`async.some/any: ${item}`);
 

From 6a320b7569c23bc5fae6f043f0e71b0638997f45 Mon Sep 17 00:00:00 2001
From: JD-Robbs <JD-Robbs@users.noreply.github.com>
Date: Thu, 10 Nov 2016 12:40:41 +0000
Subject: [PATCH 079/245] Adds missing `retained` status to
 `KnockoutArrayChange`

---
 knockout/knockout.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/knockout/knockout.d.ts b/knockout/knockout.d.ts
index f0e9fe023f..a7b4cd6411 100644
--- a/knockout/knockout.d.ts
+++ b/knockout/knockout.d.ts
@@ -332,7 +332,7 @@ interface KnockoutUtils {
 }
 
 interface KnockoutArrayChange<T> {
-    status: "added" | "deleted";
+    status: "added" | "deleted" | "retained";
     value: T;
     index: number;
     moved?: number;

From df8674b001c3c2b12a6645dd547b9b6441ad900b Mon Sep 17 00:00:00 2001
From: More4ever <More4ever@gmail.com>
Date: Thu, 10 Nov 2016 17:09:02 +0200
Subject: [PATCH 080/245] Add length property for UnorderedBulkOperation

---
 mongodb/mongodb.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mongodb/mongodb.d.ts b/mongodb/mongodb.d.ts
index 7aba7ff7a8..e125611c73 100644
--- a/mongodb/mongodb.d.ts
+++ b/mongodb/mongodb.d.ts
@@ -986,6 +986,8 @@ declare module "mongodb" {
 
   //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html
   export interface UnorderedBulkOperation {
+    //http://mongodb.github.io/node-mongodb-native/2.1/api/lib_bulk_unordered.js.html line 339
+    length: number;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/UnorderedBulkOperation.html#execute
     execute(callback: MongoCallback<BulkWriteResult>): void;
     execute(options?: FSyncOptions): Promise<BulkWriteResult>;

From 125165e3c22f28c4cb00525ca1a7b3f83c112e9f Mon Sep 17 00:00:00 2001
From: Lukas Zech <lukas.zech.software@gmail.com>
Date: Thu, 10 Nov 2016 16:05:04 +0100
Subject: [PATCH 081/245] Add 'bytesRead' and 'path' to fs.ReadStream

---
 node/node.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/node/node.d.ts b/node/node.d.ts
index 9abffa79e3..cbdc1d30db 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -1522,7 +1522,7 @@ declare module "child_process" {
         disconnect(): void;
         unref(): void;
         ref(): void;
-    
+
         /**
          * events.EventEmitter
          * 1. close
@@ -2150,6 +2150,8 @@ declare module "fs" {
     export interface ReadStream extends stream.Readable {
         close(): void;
         destroy(): void;
+        bytesRead: number;
+        path: string | Buffer;
 
         /**
          * events.EventEmitter

From 9994b4eb4a845ea7c6e8e3f2e1127cd0ed75cb49 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Thu, 10 Nov 2016 15:20:24 -0800
Subject: [PATCH 082/245] Improve PR template (#12517)

---
 PULL_REQUEST_TEMPLATE.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index 053b2c3eae..a2c9ec9e5b 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,15 @@
 Please fill in this template.
 
 - [ ] Prefer to make your PR against the `types-2.0` branch.
-- [ ] The package does not provide its own types, and you can not add them.
 - [ ] Test the change in your own code.
 - [ ] Follow the advice from the [readme](https://github.com/DefinitelyTyped/DefinitelyTyped#make-a-pull-request).
 - [ ] Avoid [common mistakes](https://github.com/DefinitelyTyped/DefinitelyTyped#common-mistakes).
 
 If adding a new definition:
+- [ ] The package does not provide its own types, and you can not add them.
 - [ ] If this is for an NPM package, match the name. If not, do not conflict with the name of an NPM package.
 - [ ] Run `tsc` without errors.
-- [ ] Include the required [files](https://github.com/DefinitelyTyped/DefinitelyTyped#create-a-new-package) and header.
+- [ ] Include the required [files](https://github.com/DefinitelyTyped/DefinitelyTyped#create-a-new-package) and header. Base these on the README, *not* on an existing project.
 
 If changing an existing definition:
 - [ ] Provide a URL to  documentation or source code which provides context for the suggested changes: <<url here>>

From e14af389ea787c5d57ba39f8c014c1cd115d06fd Mon Sep 17 00:00:00 2001
From: Izik Lisbon <izikl@users.noreply.github.com>
Date: Thu, 10 Nov 2016 17:13:47 -0800
Subject: [PATCH 083/245] [bluebird-retry] Add support the predicate option

https://github.com/demmer/bluebird-retry/blob/master/lib/bluebird-retry.js#L60
---
 bluebird-retry/bluebird-retry.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bluebird-retry/bluebird-retry.d.ts b/bluebird-retry/bluebird-retry.d.ts
index b63a3cf131..695c56cc7d 100644
--- a/bluebird-retry/bluebird-retry.d.ts
+++ b/bluebird-retry/bluebird-retry.d.ts
@@ -16,6 +16,7 @@ declare module "bluebird-retry" {
 			max_interval?:number;
 			timeout?:number;
 			max_tries?:number;
+			predicate?:any;
 		}
 
 	}

From 0d4cb73cc3c90f282f4fd8313b338f29f9e7527a Mon Sep 17 00:00:00 2001
From: Sayan751 <sayan751@gmail.com>
Date: Fri, 11 Nov 2016 09:24:01 +0100
Subject: [PATCH 084/245] Adding type definitions for pikaday-time
 (https://github.com/owenmead/Pikaday, forked from
 https://github.com/dbushell/Pikaday)

---
 pikaday-time/pikaday-time-tests.ts |  84 +++++++
 pikaday-time/pikaday-time.d.ts     | 343 +++++++++++++++++++++++++++++
 2 files changed, 427 insertions(+)
 create mode 100644 pikaday-time/pikaday-time-tests.ts
 create mode 100644 pikaday-time/pikaday-time.d.ts

diff --git a/pikaday-time/pikaday-time-tests.ts b/pikaday-time/pikaday-time-tests.ts
new file mode 100644
index 0000000000..1f64de213d
--- /dev/null
+++ b/pikaday-time/pikaday-time-tests.ts
@@ -0,0 +1,84 @@
+/// <reference path="../jquery/jquery.d.ts" />
+/// <reference path="../moment/moment.d.ts" />
+/// <reference path="pikaday-time.d.ts" />
+
+import * as Pikaday from "pikaday-time";
+
+new Pikaday({field: document.getElementById('datepicker')});
+new Pikaday({field: $('#datepicker')[0]});
+
+(() => {
+    var field:HTMLInputElement = <HTMLInputElement>document.getElementById('datepicker');
+    var picker = new Pikaday({
+        onSelect: function (date:Date) {
+            field.value = picker.toString();
+            console.log(date.toISOString());
+        }
+    });
+    field.parentNode.insertBefore(picker.el, field.nextSibling);
+})();
+
+(() => {
+    var picker = new Pikaday({
+        field: document.getElementById('datepicker'),
+        format: 'D MMM YYYY',
+        onSelect: function () {
+            console.log(this.getMoment().format('Do MMMM YYYY'));
+        }
+    });
+
+    picker.toString();
+    picker.toString('YYYY-MM-DD');
+    picker.getDate();
+    picker.setDate('2015-01-01');
+    picker.getMoment();
+    picker.setMoment(moment('14th February 2014', 'DDo MMMM YYYY'));
+    picker.gotoDate(new Date(2014, 1));
+    picker.gotoToday();
+    picker.gotoMonth(2);
+    picker.nextMonth();
+    picker.prevMonth();
+    picker.gotoYear(2015);
+    picker.setMinDate(new Date);
+    picker.setMaxDate(new Date);
+    picker.setStartRange(new Date);
+    picker.setEndRange(new Date);
+    picker.isVisible();
+    picker.show();
+    picker.adjustPosition();
+    picker.hide();
+    picker.destroy();
+})();
+
+(() => {
+    var i18n: Pikaday.PikadayI18nConfig = {
+        previousMonth: 'Previous Month',
+        nextMonth: 'Next Month',
+        months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
+        weekdays: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
+        weekdaysShort: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat']
+    };
+    new Pikaday({i18n});
+})();
+
+(() => {
+    new Pikaday(
+        {
+            field: document.getElementById('datepicker'),
+            firstDay: 1,
+            minDate: new Date('2000-01-01'),
+            maxDate: new Date('2020-12-31'),
+            yearRange: [2000, 2020]
+        });
+})();
+
+(() => {
+    new Pikaday(
+        {
+            field: document.getElementById('datepicker'),
+            firstDay: 1,
+            minDate: new Date('2000-01-01'),
+            maxDate: new Date('2020-12-31'),
+            showDaysInNextAndPreviousMonths: true
+        });
+})();
diff --git a/pikaday-time/pikaday-time.d.ts b/pikaday-time/pikaday-time.d.ts
new file mode 100644
index 0000000000..3571d5c671
--- /dev/null
+++ b/pikaday-time/pikaday-time.d.ts
@@ -0,0 +1,343 @@
+// Type definitions for pikaday
+// Project: https://github.com/owenmead/Pikaday
+// Definitions by: Sayan Pal <https://github.com/Sayan751>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../moment/moment.d.ts" />
+
+declare class Pikaday {
+    el: HTMLElement;
+
+    constructor(options: Pikaday.PikadayOptions);
+
+    /**
+     * Extends the existing configuration options for Pikaday object with the options provided.
+     * Can be used to change/extend the configurations on runtime.
+     * @param options full/partial configuration options.
+     * @returns {} extended configurations.
+     */
+    config(options: Pikaday.PikadayOptions): Pikaday.PikadayOptions;
+
+    /**
+     * Returns the selected date in a string format. If Moment.js exists
+     * (recommended) then Pikaday can return any format that Moment
+     * understands, otherwise you're stuck with JavaScript's default.
+     */
+    toString(format?: string): string;
+
+    /**
+     * Returns a JavaScript Date object for the selected day, or null if
+     * no date is selected.
+     */
+    getDate(): Date;
+
+    /**
+     * Set the current selection. This will be restricted within the bounds
+     * of minDate and maxDate options if they're specified. A boolean (true)
+     * can optionally be passed as the second parameter to prevent triggering
+     * of the onSelect callback, allowing the date to be set silently.
+     */
+    setDate(date: string | Date, triggerOnSelect?: boolean): void;
+
+    /**
+     * Returns a Moment.js object for the selected date (Moment must be
+     * loaded before Pikaday).
+     */
+    getMoment(): moment.Moment;
+
+    /**
+     * Set the current selection with a Moment.js object (see setDate).
+     */
+    setMoment(moment: any): void;
+
+    /**
+     * Change the current view to see a specific date.
+     */
+    gotoDate(date: Date): void;
+
+    /**
+     * Shortcut for picker.gotoDate(new Date())
+     */
+    gotoToday(): void;
+
+    /**
+     * Change the current view by month (0: January, 1: Februrary, etc).
+     */
+    gotoMonth(monthIndex: number): void;
+
+    /**
+     * Go to the next month (this will change year if necessary).
+     */
+    nextMonth(): void;
+
+    /**
+     * Go to the previous month (this will change year if necessary).
+     */
+    prevMonth(): void;
+
+    /**
+     * Change the year being viewed.
+     */
+    gotoYear(year: number): void;
+
+    /**
+     * Update the minimum/earliest date that can be selected.
+     */
+    setMinDate(date: Date): void;
+
+    /**
+     * Update the maximum/latest date that can be selected.
+     */
+    setMaxDate(date: Date): void;
+
+    /**
+     * Update the range start date. For using two Pikaday instances to
+     * select a date range.
+     */
+    setStartRange(date: Date): void;
+
+    /**
+     * Update the range end date. For using two Pikaday instances to select
+     * a date range.
+     */
+    setEndRange(date: Date): void;
+
+    /**
+     * Update the HTML.
+     */
+    draw(force: boolean): void;
+
+    /**
+     * Returns true if the picker is visible.
+     */
+    isVisible(): boolean;
+
+    /**
+     * Make the picker visible.
+     */
+    show(): void;
+
+    /**
+     * Hide the picker making it invisible.
+     */
+    hide(): void;
+
+    /**
+     * Recalculate and change the position of the picker.
+     */
+    adjustPosition(): void;
+
+    /**
+     * Hide the picker and remove all event listeners - no going back!
+     */
+    destroy(): void;
+}
+
+// merge the Pikaday class declaration with a module
+declare namespace Pikaday {
+    interface PikadayI18nConfig {
+        previousMonth: string;
+        nextMonth: string;
+        months: string[];
+        weekdays: string[];
+        weekdaysShort: string[];
+    }
+
+    interface PikadayOptions {
+        /**
+         * Bind the datepicker to a form field.
+         */
+        field?: HTMLElement;
+
+        /**
+         * The default output format for toString() and field value.
+         * Requires Moment.js for custom formatting.
+         */
+        format?: string;
+
+        /**
+         * Use a different element to trigger opening the datepicker.
+         * Default: field element.
+         */
+        trigger?: HTMLElement;
+
+        /**
+         * Automatically show/hide the datepicker on field focus.
+         * Default: true if field is set.
+         */
+        bound?: boolean;
+
+        /**
+         * Preferred position of the datepicker relative to the form field
+         * (e.g. 'top right'). Automatic adjustment may occur to avoid
+         * displaying outside the viewport. Default: 'bottom left'.
+         */
+        position?: string;
+
+        /**
+         * Can be set to false to not reposition the datepicker within the
+         * viewport, forcing it to take the configured position. Default: true.
+         */
+        reposition?: boolean;
+
+        /**
+         * DOM node to render calendar into, see container example.
+         * Default: undefined.
+         */
+        container?: HTMLElement;
+
+        /**
+         * The initial date to view when first opened.
+         */
+        defaultDate?: Date;
+
+        /**
+         * Make the defaultDate the initial selected value.
+         */
+        setDefaultDate?: boolean;
+
+        /**
+         * First day of the week (0: Sunday, 1: Monday, etc).
+         */
+        firstDay?: number;
+
+        /**
+         * The earliest date that can be selected (this should be a native
+         * Date object - e.g. new Date() or moment().toDate()).
+         */
+        minDate?: Date;
+
+        /**
+         * The latest date that can be selected (this should be a native
+         * Date object - e.g. new Date() or moment().toDate()).
+         */
+        maxDate?: Date;
+
+        /**
+         * Disallow selection of Saturdays and Sundays.
+         */
+        disableWeekends?: boolean;
+
+        /**
+         * Callback function that gets passed a Date object for each day
+         * in view. Should return true to disable selection of that day.
+         */
+        disableDayFn?: (date: Date) => boolean;
+
+        /**
+         * Number of years either side (e.g. 10) or array of upper/lower range
+         * (e.g. [1900, 2015]).
+         */
+        yearRange?: number | number[];
+
+        /**
+         * Show the ISO week number at the head of the row. Default: false.
+         */
+        showWeekNumber?: boolean;
+
+        /**
+         * Reverse the calendar for right-to-left languages. Default: false.
+         */
+        isRTL?: boolean;
+
+        /**
+         * Language defaults for month and weekday names.
+         */
+        i18n?: PikadayI18nConfig;
+
+        /**
+         * Additional text to append to the year in the title.
+         */
+        yearSuffix?: string;
+
+        /**
+         * Render the month after the year in the title. Default: false.
+         */
+        showMonthAfterYear?: boolean;
+
+        /**
+         * Render days of the calendar grid that fall in the next or previous months to the current month instead of rendering an empty table cell. Default: false.
+         */
+        showDaysInNextAndPreviousMonths?: boolean;
+
+        /**
+         * Number of visible calendars.
+         */
+        numberOfMonths?: number;
+
+        /**
+         * When numberOfMonths is used, this will help you to choose where the
+         * main calendar will be (default left, can be set to right). Only used
+         * for the first display or when a selected date is not already visible.
+         */
+        mainCalendar?: string;
+
+        /**
+         * Define a class name that can be used as a hook for styling different
+         * themes. Default: null.
+         */
+        theme?: string;
+
+        /**
+         * Callback function for when a date is selected.
+         */
+        onSelect?: (date: Date) => void;
+
+        /**
+         * Callback function for when the picker becomes visible.
+         */
+        onOpen?: () => void;
+
+        /**
+         * Callback function for when the picker is hidden.
+         */
+        onClose?: () => void;
+
+        /**
+         * Callback function for when the picker draws a new month.
+         */
+        onDraw?: () => void;
+
+        /*--pikaday-time specific addition--*/
+        /**
+         * Optional boolean property to specify whether to show time controls with calendar or not.
+         */
+        showTime?: boolean;
+        /**
+         * Optional boolean property to specify whether to show minute controls with calendar or not.
+         */
+        showMinutes?: boolean;
+        /**
+         * Optional boolean property to specify whether to show second controls with calendar or not.
+         */
+        showSeconds?: boolean;
+        /**
+         * Optional boolean property to specify whether to use 24 hours format or not.
+         */
+        use24hour?: boolean;
+        /**
+         * Optional numeric property to specify the increment step for hour.
+         */        
+        incrementHourBy?: number;
+        /**
+         * Optional numeric property to specify the increment step for minute.
+         */        
+        incrementMinuteBy?: number;
+        /**
+         * Optional numeric property to specify the increment step for second.
+         */                
+        incrementSecondBy?: number;
+        /**
+         * Optional numeric property to prevent calendar from auto-closing after date is selected.
+         */                
+        autoClose?: boolean;
+        /**
+         * Optional string added to left of time select
+         */
+        timeLabel?: string;
+    }
+}
+
+declare module "pikaday-time" {
+    export = Pikaday;
+}
\ No newline at end of file

From 5cd1e799c7994871b6d99f00588f078b4836c0aa Mon Sep 17 00:00:00 2001
From: Federico Caselli <CaselIT@users.noreply.github.com>
Date: Fri, 11 Nov 2016 11:33:51 +0100
Subject: [PATCH 085/245] Added build option to the options

Also items is optional
---
 jquery.contextMenu/jquery.contextMenu.d.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/jquery.contextMenu/jquery.contextMenu.d.ts b/jquery.contextMenu/jquery.contextMenu.d.ts
index 4b52a0ed84..fbfa6b49cc 100644
--- a/jquery.contextMenu/jquery.contextMenu.d.ts
+++ b/jquery.contextMenu/jquery.contextMenu.d.ts
@@ -25,7 +25,8 @@ interface JQueryContextMenuOptions {
         hide?: () => void;
     };
     callback?: (key: any, options: any) => any;
-    items: any;
+    items?: any;
+    build?: (triggerElement: JQuery, e: Event) => any;
     reposition?: boolean;
     className?: string;
     itemClickEvent?: string;

From e27839594aaf058d6dc0852a2b7c443db2af2dd3 Mon Sep 17 00:00:00 2001
From: Ambrus Adrian-Zoltan <aaim1390@scs.ubbcluj.ro>
Date: Fri, 11 Nov 2016 22:11:32 +0200
Subject: [PATCH 086/245] angular-bootstrap-calendar: Added event action
 interface Added event color interface Made Event type optional, as it is not
 obligatory according to the documentation Fixed IOnViewChangeClick, it must
 return a boolean, not void.

---
 .../angular-bootstrap-calendar.d.ts           | 44 ++++++++++++++++++-
 1 file changed, 42 insertions(+), 2 deletions(-)

diff --git a/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts b/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
index e32dcfca68..1ab82dfd7c 100644
--- a/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
+++ b/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
@@ -6,6 +6,34 @@
 /// <reference path="../moment/moment.d.ts" />
 
 declare namespace angular.bootstrap.calendar {
+    interface IEventAction {
+        /**
+         * The label of the action
+         */
+        label: string;
+        /**
+         * CSS class to be added to the action element
+         */
+        cssClass?: string;
+        /**
+         * The action that occurs when it's clicked
+         * @param args - the IEvent whose action was clicked
+         */
+        onClick: (args: IEvent) => void;
+    }
+
+    interface IEventColor {
+        /**
+         * The primary color of the event, should be darker than secondary
+         */
+        primary: string;
+
+        /**
+         * The secondary color of the event, should be lighter than primary
+         */
+        secondary: string;
+    }
+
     interface IEvent {
         /**
          * The title of the event
@@ -14,7 +42,7 @@ declare namespace angular.bootstrap.calendar {
         /**
          * The type of the event (determines its color). Can be important, warning, info, inverse, success or special
          */
-        type: string;
+        type?: string;
         /**
          * A javascript date object for when the event starts
          */
@@ -23,6 +51,14 @@ declare namespace angular.bootstrap.calendar {
          * Optional - a javascript date object for when the event ends
          */
         endsAt?: Date;
+        /**
+         * Color of the Event
+         */
+        color?: IEventColor;
+        /**
+         * Actions of the Event
+         */
+        actions?: Array<IEventAction>;
         /**
          * If edit-event-html is set and this field is explicitly set to false then dont make it editable.
          */
@@ -51,6 +87,10 @@ declare namespace angular.bootstrap.calendar {
          * A CSS class (or more, just separate with spaces) that will be added to the event when it is displayed on each view. Useful for marking an event as selected / active etc
          */
         cssClass?: string;
+        /**
+         * If set the event will display as all-day event
+         */
+        allDay?: boolean;
     }
 
     interface ICalendarConfig {
@@ -132,7 +172,7 @@ declare namespace angular.bootstrap.calendar {
         }
 
         interface IOnViewChangeClick {
-            (calendarDate: Date, calendarNextView: string): void;
+            (calendarDate: Date, calendarNextView: string): boolean;
         }
     }
 }

From 8d14188c4c91006d80961065ca3080decf166b48 Mon Sep 17 00:00:00 2001
From: Vincent Siao <vincentsiao@gmail.com>
Date: Fri, 11 Nov 2016 13:23:35 -0800
Subject: [PATCH 087/245] Revert "Update react-dnd typings to support
 decorators."

---
 react-dnd/react-dnd-decorator-tests.ts | 313 -------------------------
 react-dnd/react-dnd.d.ts               |  12 +-
 2 files changed, 6 insertions(+), 319 deletions(-)
 delete mode 100644 react-dnd/react-dnd-decorator-tests.ts

diff --git a/react-dnd/react-dnd-decorator-tests.ts b/react-dnd/react-dnd-decorator-tests.ts
deleted file mode 100644
index 1d7c4b8d18..0000000000
--- a/react-dnd/react-dnd-decorator-tests.ts
+++ /dev/null
@@ -1,313 +0,0 @@
-///<reference path="react-dnd.d.ts" />
-///<reference path="react-dnd-html5-backend.d.ts" />
-///<reference path="react-dnd-test-backend.d.ts" />
-"use strict";
-
-// Test adapted from the ReactDnD chess game tutorial:
-// http://gaearon.github.io/react-dnd/docs-tutorial.html
-
-import React = require("react");
-import ReactDnd = require("react-dnd");
-
-var r = React.DOM;
-
-import DragSource = ReactDnd.DragSource;
-import DropTarget = ReactDnd.DropTarget;
-import DragLayer = ReactDnd.DragLayer;
-import DragDropContext = ReactDnd.DragDropContext;
-import HTML5Backend, { getEmptyImage, NativeTypes } from "react-dnd-html5-backend";
-import TestBackend from "react-dnd-test-backend";
-
-// Game Component
-// ----------------------------------------------------------------------
-
-namespace Game {
-    var knightPosition = [0, 0];
-    var observer: any = null;
-
-    function emitChange() {
-        observer(knightPosition);
-    }
-
-    export function observe(o: any) {
-        if (observer) {
-            throw new Error("Multiple observers not implemented.");
-        }
-
-        observer = o;
-        emitChange();
-    }
-
-    export function moveKnight(toX: number, toY: number) {
-        knightPosition = [toX, toY];
-        emitChange();
-    }
-
-    export function canMoveKnight(toX: number, toY: number) {
-        const x = knightPosition[0];
-        const y = knightPosition[1];
-        const dx = toX - x;
-        const dy = toY - y;
-
-        return (Math.abs(dx) === 2 && Math.abs(dy) === 1) ||
-               (Math.abs(dx) === 1 && Math.abs(dy) === 2);
-    }
-}
-
-var ItemTypes = {
-    KNIGHT: "knight"
-};
-
-// Knight Component
-// ----------------------------------------------------------------------
-
-namespace Knight {
-    interface KnightP extends React.Props<Knight> {
-        connectDragSource: ReactDnd.ConnectDragSource;
-        connectDragPreview: ReactDnd.ConnectDragPreview;
-        isDragging: boolean;
-    }
-
-    var knightSource: ReactDnd.DragSourceSpec<KnightP> = {
-        beginDrag: (props) => {
-            return {};
-        }
-    };
-
-    function knightCollect(connect: ReactDnd.DragSourceConnector, monitor: ReactDnd.DragSourceMonitor) {
-        return {
-            connectDragSource: connect.dragSource(),
-            connectDragPreview: connect.dragPreview(),
-            isDragging: monitor.isDragging()
-        };
-    }
-
-    @DragSource(ItemTypes.KNIGHT, knightSource, knightCollect)
-    export class Knight extends React.Component<KnightP, {}> {
-        static defaultProps: KnightP;
-
-        static create = React.createFactory(Knight);
-
-        componentDidMount() {
-            var img = getEmptyImage();
-            img.onload = () => this.props.connectDragPreview(img);
-        }
-
-        render() {
-            return this.props.connectDragSource(
-                    r.div({
-                        style: {
-                            opacity: this.props.isDragging ? 0.5 : 1,
-                            fontSize: 25,
-                            fontWeight: 'bold',
-                            cursor: 'move'
-                        }
-                    }, "♘")
-            );
-        }
-    }
-
-    export var create = React.createFactory(Knight);
-}
-
-// Square Component
-// ----------------------------------------------------------------------
-
-namespace Square {
-    interface SquareP extends React.Props<Square> {
-        black: boolean;
-    }
-
-    export class Square extends React.Component<SquareP, {}> {
-        render() {
-            var fill = this.props.black ? 'black' : 'white';
-            return r.div({
-                style: {
-                    backgroundColor: fill
-                }
-            })
-        }
-    }
-
-    export var create = React.createFactory(Square);
-}
-
-// BoardSquare Component
-// ----------------------------------------------------------------------
-
-namespace BoardSquare {
-    interface BoardSquareP extends React.Props<BoardSquare> {
-        x: number;
-        y: number;
-        connectDropTarget?: ReactDnd.ConnectDropTarget;
-        isOver?: boolean;
-        canDrop?: boolean;
-    }
-
-    var boardSquareTarget: ReactDnd.DropTargetSpec<BoardSquareP> = {
-        canDrop: (props) => Game.canMoveKnight(props.x, props.y),
-        drop: (props) => Game.moveKnight(props.x, props.y)
-    };
-
-    function boardSquareCollect(connect: ReactDnd.DropTargetConnector, monitor: ReactDnd.DropTargetMonitor) {
-        return {
-            connectDropTarget: connect.dropTarget(),
-            isOver: monitor.isOver(),
-            canDrop: monitor.canDrop()
-        };
-    }
-
-    @DropTarget(ItemTypes.KNIGHT, boardSquareTarget, boardSquareCollect)
-    @DropTarget(NativeTypes.FILE, boardSquareTarget, boardSquareCollect)
-    export class BoardSquare extends React.Component<BoardSquareP, {}> {
-        static defaultProps: BoardSquareP;
-
-        private _renderOverlay = (color: string) => {
-            return r.div({
-                style: {
-                    position: 'absolute',
-                    top: 0,
-                    left: 0,
-                    height: '100%',
-                    width: '100%',
-                    zIndex: 1,
-                    opacity: 0.5,
-                    backgroundColor: color
-                }
-            });
-        };
-
-        render() {
-            var black = (this.props.x + this.props.y) % 2 === 1;
-            var isOver = this.props.isOver;
-            var canDrop = this.props.canDrop;
-
-            return this.props.connectDropTarget(
-                    r.div({
-                        style: {
-                            position: 'relative',
-                            width: '100%',
-                            height: '100%'
-                        },
-                        children: [
-                            Square.create({
-                                black: black
-                            }),
-                            isOver && !canDrop ? this._renderOverlay('red') : null,
-                            !isOver && canDrop ? this._renderOverlay('yellow') : null,
-                            isOver && canDrop ? this._renderOverlay('green') : null
-                        ]
-                    })
-            );
-        }
-    }
-    
-    export var create = React.createFactory(BoardSquare);
-}
-
-// Custom Drag Layer Component
-// ----------------------------------------------------------------------
-namespace CustomDragLayer {
-    interface CustomDragLayerP extends React.Props<CustomDragLayer> {
-        isDragging?: boolean;
-        item?: Object;
-    }
-
-    function dragLayerCollect(monitor: ReactDnd.DragLayerMonitor) {
-        return {
-            isDragging: monitor.isDragging(),
-            item: monitor.getItem(),
-        };
-    }
-
-    @DragLayer(dragLayerCollect)
-    export class CustomDragLayer extends React.Component<CustomDragLayerP, {}> {
-        render() {
-            return r.div(null, this.props.isDragging ? this.props.item : null);
-        }
-    }
-
-    export var create = React.createFactory(CustomDragLayer);
-}
-
-// Board Component
-// ----------------------------------------------------------------------
-
-namespace Board {
-    interface BoardP extends React.Props<Board> {
-        knightPosition: number[];
-    }
-
-    export class Board extends React.Component<BoardP, {}> {
-        private _renderPiece = (x: number, y: number) => {
-            var knightX = this.props.knightPosition[0];
-            var knightY = this.props.knightPosition[1];
-            return x === knightX && y === knightY ?
-                    Knight.create() :
-                    null;
-        };
-
-        private _renderSquare = (i: number) => {
-            var x = i % 8;
-            var y = Math.floor(i / 8);
-
-            return r.div({
-                key: i,
-                style: {
-                    width: '12.5%',
-                    height: '12.5%'
-                }
-            }, BoardSquare.create({
-                x: x,
-                y: y
-            }, this._renderPiece(x, y)));
-        };
-
-        render() {
-            var squares: React.ReactHTMLElement<HTMLDivElement>[] = [];
-            for (let i = 0; i < 64; i++) {
-                squares.push(this._renderSquare(i));
-            }
-
-            return r.div({
-                children: [
-                    CustomDragLayer.create(),
-                    r.div({
-                        style: {
-                            width: '100%',
-                            height: '100%',
-                            display: 'flex',
-                            flexWrap: 'wrap'
-                        },
-                        children: squares
-                    })
-                ]
-            });
-        }
-    }
-
-    @DragDropContext(HTML5Backend)
-    export class BoardWithHTML5Backend extends Board {
-
-    }
-
-    @DragDropContext(TestBackend)
-    export class BoardWithTestBackend extends Board {
-
-    }
-
-    export var createWithHTMLBackend = React.createFactory(BoardWithHTML5Backend);
-    export var createWithTestBackend = React.createFactory(BoardWithTestBackend);
-}
-
-// Render the Board Component
-// ----------------------------------------------------------------------
-
-Board.createWithHTMLBackend({
-    knightPosition: [0, 0]
-});
-
-
-Board.createWithTestBackend({
-    knightPosition: [0, 0]
-});
diff --git a/react-dnd/react-dnd.d.ts b/react-dnd/react-dnd.d.ts
index 37f065ec48..000cd04ee2 100644
--- a/react-dnd/react-dnd.d.ts
+++ b/react-dnd/react-dnd.d.ts
@@ -11,13 +11,13 @@ declare module __ReactDnd {
     // Decorated React Components
     // ----------------------------------------------------------------------
 
-    interface ContextComponent<P, S> extends React.Component<P, S> {
+    class ContextComponent<P, S> extends React.Component<P, S> {
         getDecoratedComponentInstance(): React.Component<P, S>;
         // Note: getManager is not yet documented on the React DnD docs.
         getManager(): any;
     }
 
-    interface DndComponent<P, S> extends React.Component<P, S> {
+    class DndComponent<P, S> extends React.Component<P, S> {
         getDecoratedComponentInstance(): React.Component<P, S>;
         getHandlerId(): Identifier;
     }
@@ -40,23 +40,23 @@ declare module __ReactDnd {
         spec: DragSourceSpec<P>,
         collect: DragSourceCollector,
         options?: DndOptions<P>
-    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & DndComponentClass<P>;
+    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
 
     export function DropTarget<P>(
         types: Identifier | Identifier[] | ((props: P) => Identifier | Identifier[]),
         spec: DropTargetSpec<P>,
         collect: DropTargetCollector,
         options?: DndOptions<P>
-    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & DndComponentClass<P>;
+    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
 
     export function DragDropContext<P>(
         backend: Backend
-    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & ContextComponentClass<P>;
+    ): <P>(componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => ContextComponentClass<P>;
 
     export function DragLayer<P>(
         collect: DragLayerCollector,
         options?: DndOptions<P>
-    ): <C extends React.ComponentClass<P> | React.StatelessComponent<P>>(componentClass: C) => C & DndComponentClass<P>;
+    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
 
     type DragSourceCollector = (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object;
     type DropTargetCollector = (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object;

From 1ccda2e1c00e1cc3105993ff44be951ffacdcdb1 Mon Sep 17 00:00:00 2001
From: elizabethkilson <elizabethkilson@gmail.com>
Date: Fri, 11 Nov 2016 17:12:02 -0500
Subject: [PATCH 088/245] Adding two constants that are defined in the node
 module

---
 hellosign-embedded/hellosign-embedded.d.ts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/hellosign-embedded/hellosign-embedded.d.ts b/hellosign-embedded/hellosign-embedded.d.ts
index 45b70774ff..c973cbddab 100644
--- a/hellosign-embedded/hellosign-embedded.d.ts
+++ b/hellosign-embedded/hellosign-embedded.d.ts
@@ -169,6 +169,20 @@ declare module HelloSign {
          */
         EVENT_CANCELED: string;
 
+        /**
+         * The user sent a signature request
+         *
+         * @default signature_request_sent
+         */
+        EVENT_SENT: string;
+
+        /**
+         * The template was created or edited
+         *
+         * @default template_created
+         */
+        EVENT_TEMPLATE_CREATED: string;
+
         /**
          * An error occurred in the iFrame
          *

From 1a8b117df1b3c742386f29df635010bb17fc0937 Mon Sep 17 00:00:00 2001
From: elizabethkilson <elizabethkilson@gmail.com>
Date: Fri, 11 Nov 2016 20:10:51 -0500
Subject: [PATCH 089/245] Expanding the MessageEvent type to include all
 properties of different types of events

---
 hellosign-embedded/hellosign-embedded.d.ts | 60 +++++++++++++++++++++-
 1 file changed, 58 insertions(+), 2 deletions(-)

diff --git a/hellosign-embedded/hellosign-embedded.d.ts b/hellosign-embedded/hellosign-embedded.d.ts
index c973cbddab..c1b0a7fd02 100644
--- a/hellosign-embedded/hellosign-embedded.d.ts
+++ b/hellosign-embedded/hellosign-embedded.d.ts
@@ -3,10 +3,66 @@
 // Definitions by: Brian Surowiec <https://github.com/xt0rted/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 declare module HelloSign {
-    interface MessageEvent {
-        event: string;
+    interface SignedMessageEvent {
+        event: 'signature_request_signed';
+        signature_id: string;
     }
 
+    interface DeclinedMessageEvent {
+        event: 'signature_request_declined';
+        signature_id: string;
+    }
+
+    interface CanceledMessageEvent {
+        event: 'signature_request_canceled';
+    }
+
+    interface SentMessageEvent {
+        event: 'signature_request_sent';
+        signature_request_id: string;
+        signature_request_info: {
+            title: string;
+            message: string;
+            signatures: Array<{
+                signature_id: string;
+                signer_email_address: string;
+                signer_name: string;
+                order: number;
+                status_code: string;
+                signed_at: number;
+                last_viewed_at: number;
+                last_reminded_at: number;
+                has_pin: boolean;
+            }>;
+            cc_email_addresses: Array<string>;
+        };
+    }
+
+    interface TemplateCreatedMessageEvent {
+        event: 'template_created';
+        template_id: string;
+        template_info: {
+            title: string;
+            message: string;
+            signer_roles: Array<{
+                name: string;
+                order: number;
+            }>;
+            cc_roles: Array<{
+                name: string;
+            }>;
+        };
+    }
+
+    interface ErrorMessageEvent {
+        event: 'error';
+        description: string;
+    }
+
+    type MessageEvent = SignedMessageEvent | DeclinedMessageEvent |
+        CanceledMessageEvent | SentMessageEvent | TemplateCreatedMessageEvent |
+        ErrorMessageEvent;
+
     interface ClientCultures {
         /**
          * English (United States)

From 25a3664371e1d526b7369316c93e2becac5e2b12 Mon Sep 17 00:00:00 2001
From: Jacob Windsor <jacob.windsor@ymail.com>
Date: Sun, 13 Nov 2016 13:34:07 +0100
Subject: [PATCH 090/245] Update Auth0DecodedHash

The id_token should be in camelCase not snake case (idToken). See fourth code block in https://auth0.com/docs/quickstart/spa/angular2/02-custom-login
---
 auth0-js/auth0-js.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/auth0-js/auth0-js.d.ts b/auth0-js/auth0-js.d.ts
index 250c7a850e..f1b24653b4 100644
--- a/auth0-js/auth0-js.d.ts
+++ b/auth0-js/auth0-js.d.ts
@@ -84,7 +84,7 @@ interface Auth0Identity {
 
 interface Auth0DecodedHash {
     access_token: string;
-    id_token: string;
+    idToken: string;
     profile: Auth0UserProfile;
     state: any;
 }

From f3f097d1c9e88cbc5f18dafd0214ef01421d7d58 Mon Sep 17 00:00:00 2001
From: Dustin Wehr <dustin.wehr@gmail.com>
Date: Sun, 13 Nov 2016 15:15:25 -0400
Subject: [PATCH 091/245] add EventType, few minor fixes/additions

fix CollaborativeMap.size
loadAppDataDocument, loadFromJson
missing handleErrors param  to RealtimeLoader
---
 .../google-drive-realtime-api.d.ts            | 119 ++++++++++++++----
 1 file changed, 93 insertions(+), 26 deletions(-)

diff --git a/google-drive-realtime-api/google-drive-realtime-api.d.ts b/google-drive-realtime-api/google-drive-realtime-api.d.ts
index 025ce08a86..6cfd9b1cc1 100644
--- a/google-drive-realtime-api/google-drive-realtime-api.d.ts
+++ b/google-drive-realtime-api/google-drive-realtime-api.d.ts
@@ -16,8 +16,9 @@
 
 // gapi is a global var introduced by https://apis.google.com/js/api.js
 declare namespace gapi.drive.realtime {
+	export type CollaborativeObjectType = 'EditableString' | 'Map' | 'List'
 
-	type GoogEventHandler = ((evt:ObjectChangedEvent) => void) | ((e:Event) => void) | EventListener;
+	export type GoogEventHandler = ((evt:ObjectChangedEvent) => void) | ((e:Event) => void) | EventListener;
 
 	// Complete
 	// https://developers.google.com/google-apps/realtime/reference/gapi.drive.realtime.Collaborator
@@ -65,7 +66,7 @@ declare namespace gapi.drive.realtime {
 		// see gapi.drive.realtime.CollaborrativeType for possible values; for custom collaborative objects, this value is
 		// application-defined.
 		// Addition: the possible values for standard objects are EditableString, List, and Map.
-		type:string;
+		type:CollaborativeObjectType;
 
 		// Adds an event listener to the event target. The same handler can only be added once per the type.
 		// Even if you add the same handler multiple times using the same type then it will only be called once
@@ -107,9 +108,9 @@ declare namespace gapi.drive.realtime {
 	// Complete
 	// https://developers.google.com/google-apps/realtime/reference/gapi.drive.realtime.CollaborativeMap
 	export class CollaborativeMap<V> extends CollaborativeObject {
-		size:string;
+		size:number;
 
-		static type:string; // equals "Map"
+		static type:'Map';
 
 		// Removes all entries.
 		clear():void;
@@ -154,7 +155,7 @@ declare namespace gapi.drive.realtime {
 		// The text of this collaborative string. Reading from this property is equivalent to calling getText(). Writing to this property is equivalent to calling setText().
 		text:string;
 
-		static type:string; // equals "EditableString"
+		static type:'EditableString';
 
 		// Appends a string to the end of this one.
 		append(text:string):void;
@@ -186,7 +187,7 @@ declare namespace gapi.drive.realtime {
 		// The length of a list cannot be extended in this way.
 		length:number;
 
-		static type:string; // equals "List"
+		static type:"List";
 
 		// Returns a copy of the contents of this collaborative list as an array.
 		// Changes to the returned object will not affect the original collaborative list.
@@ -344,9 +345,68 @@ declare namespace gapi.drive.realtime {
 		undo():void;
 	}
 
+	export type EventType = 'object_changed' | 'values_set' | 'values_added' | 'values_removed' | 'value_changed' |
+		'text_inserted' | 'text_deleted' | 'collaborator_joined' | 'collaborator_left' | 'reference_shifted' |
+		'document_save_state_changed' | 'undo_redo_state_changed' | 'attribute_changed';
+	export const EventType:{
+		// A collaborative object has changed. This event wraps a specific event, and bubbles to ancestors.
+		// Defaults to object_changed.
+		OBJECT_CHANGED:'object_changed'
+
+		// Values in a list are changed in place.
+		// Defaults to values_set.
+		VALUES_SET:'values_set',
+
+		// New values have been added to the list.
+		// values_added
+		VALUES_ADDED:'values_added'
+
+		// Values have been removed from the list.
+		// values_removed
+		VALUES_REMOVED:'values_removed'
+
+		// A map or custom object value has changed. Note this could be a new value or deleted value.
+		// value_changed
+		VALUE_CHANGED:'value_changed'
+
+		// Text has been inserted into a string.
+		// text_inserted
+		TEXT_INSERTED:'text_inserted'
+
+		// Text has been removed from a string.
+		// text_deleted
+		TEXT_DELETED:'text_deleted'
+
+		// A new collaborator joined the document. Listen on the gapi.drive.realtime.Document for these changes.
+		// collaborator_joined
+		COLLABORATOR_JOINED:'collaborator_joined'
+
+		// A collaborator left the document. Listen on the gapi.drive.realtime.Document for these changes.
+		// collaborator_left
+		COLLABORATOR_LEFT:'collaborator_left'
+
+		// An index reference changed.
+		// reference_shifted
+		REFERENCE_SHIFTED:'reference_shifted'
+
+		// The document save state changed. Listen on the gapi.drive.realtime.Document for these changes.
+		// document_save_state_changed
+		DOCUMENT_SAVE_STATE_CHANGED:'document_save_state_changed'
+
+		// The model canUndo/canRedo state changed. Listen on the gapi.drive.realtime.Model for these changes.
+		// undo_redo_state_changed
+		UNDO_REDO_STATE_CHANGED:'undo_redo_state_changed'
+
+		// A metadata attribute of the document changed. This is fired on changes to:
+		// gapi.drive.realtime.Attribute.IS_READ_ONLY
+		// Listen on the gapi.drive.realtime.Document for these changes.
+		// attribute_changed
+		ATTRIBUTE_CHANGED:'attribute_changed'
+	}
+
 	// Complete
 	// https://developers.google.com/google-apps/realtime/reference/gapi.drive.realtime.BaseModelEvent
-	interface BaseModelEvent {
+	export interface BaseModelEvent {
 		// Whether this event bubbles.
 		bubbles :  boolean;
 
@@ -373,7 +433,7 @@ declare namespace gapi.drive.realtime {
 		target :  CollaborativeObject;
 
 		// The type of the event.
-		type :  string;
+		type :  EventType;
 
 		// The user id of the user that initiated this event.
 		userId :  string;
@@ -399,6 +459,7 @@ declare namespace gapi.drive.realtime {
 		 Array of string
 		 The list of names from the hierarchy of compound operations that initiated the event.
 		 Value must not be null.
+
 		 isLocal
 		 boolean
 		 True if the event originated in the local session.
@@ -417,7 +478,7 @@ declare namespace gapi.drive.realtime {
 
 	// Complete
 	// https://developers.google.com/google-apps/realtime/reference/gapi.drive.realtime.ObjectChangedEvent
-	interface ObjectChangedEvent extends BaseModelEvent {
+	export interface ObjectChangedEvent extends BaseModelEvent {
 		// parameters as in BaseModelEvent above except for addition of:
 		// events:
 		// Array of gapi.drive.realtime.BaseModelEvent
@@ -435,7 +496,7 @@ declare namespace gapi.drive.realtime {
 		new (target:CollaborativeObject, sessionId:string, userId:string, compoundOperationNames:string[],
 		     isLocal:boolean, isUndo:boolean, isRedo:boolean, index:number,
 		     values:V[], movedFromList:CollaborativeList<V>, movedFromIndex:number):ValuesAddedEvent<V>;
-	
+
 		// The index of the first added value
 		index:number;
 
@@ -523,7 +584,7 @@ declare namespace gapi.drive.realtime {
 		"missing_property" | "not_found" | "forbidden" | "server_error" | "client_error" |
 		"token_refresh_required" | "invalid_element_type" | "no_write_permission" |
 		"fatal_network_error" | "unexpected_element";
-	export var ErrorType : {
+	export const ErrorType : {
 		// Another user created the document's initial state after
 		// gapi.drive.realtime.load was called but before the local
 		// creation was saved.
@@ -627,12 +688,12 @@ declare namespace gapi.drive.realtime {
 		opt_initializerFn? : (m:Model) => void,
 		opt_errorFn? : (e:gapi.drive.realtime.Error) => void
 	) : Document;
-	
+
 	/* Loads an existing file by id.
 	https://developers.google.com/google-apps/realtime/reference/gapi.drive.realtime#.load
-	
+
 	 @Param fileId {string}  Id of the file to load.
-	 
+
 	 @Param onLoaded {function(non-null gapi.drive.realtime.Document)}
 	 A callback that will be called when the realtime document is ready. The created or opened realtime document
 	 object will be passed to this function.
@@ -649,8 +710,22 @@ declare namespace gapi.drive.realtime {
 		fileId:string,
 		onLoaded? : (d:Document) => void,
 		opt_initializerFn? : (m:Model) => void,
-		opt_errorFn? : (e:gapi.drive.realtime.Error) => void
+		opt_errorFn? : (e:Error) => void
 	):void;
+
+	export function loadAppDataDocument(
+		onLoaded:(x:Document) => void,
+		opt_initializerFn?:(x:Model) => void,
+		opt_errorFn?:(e:Error) => void
+	):void
+
+	// Loads an in-memory document from a json string.
+	// This document does not talk to the server and will only exist in memory for as long as the browser session exists.
+	export function loadFromJson(
+		json:string,
+		opt_errorFn?:(e:Error) => void
+	):Document
+
 }
 
 
@@ -674,29 +749,21 @@ declare namespace gapi.drive.realtime.databinding {
 }
 
 
-declare namespace gapi.drive.realtime.EventType {
-	export var TEXT_INSERTED: string
-	export var TEXT_DELETED: string
-	export var OBJECT_CHANGED: string
-	// List
-	export var VALUES_ADDED:string;
-	export var VALUES_REMOVED:string;
-	export var VALUES_SET:string;
-}
-
-
 // rtclient is a global var introduced by realtime-client-utils.js
 declare namespace rtclient {
 	// INCOMPLETE
 	export interface RealtimeLoader {
 		start():void;
 		load():void;
+		handleErrors(e:gapi.drive.realtime.Error):void;
 	}
 	interface RealtimeLoaderFactory {
 		new (options:LoaderOptions) : RealtimeLoader;
 	}
 
 	// ***********************************
+	// NOTE THIS IS OUT OF DATE. realtime-client-utils.js has been rewritten, with the new version "Realtime Utils 1.0.0".
+	// Will add typings for the new version later.
 	// The remainder of this file types some (not all) things in realtime-client-utils.js, found here:
 	// https://developers.google.com/google-apps/realtime/realtime-quickstart
 	// and

From f50b8998c647fd64e2a21de2a8ffd944f99aee43 Mon Sep 17 00:00:00 2001
From: Tobias Cohen <me@tobiascohen.com>
Date: Mon, 14 Nov 2016 06:42:31 +1100
Subject: [PATCH 092/245] Fix error in icepick defs for getIn/updateIn, improve
 generics

---
 icepick/icepick-tests.ts | 20 ++++++++++++--------
 icepick/index.d.ts       | 22 +++++++++++-----------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/icepick/icepick-tests.ts b/icepick/icepick-tests.ts
index 8c7b654492..5458509d42 100644
--- a/icepick/icepick-tests.ts
+++ b/icepick/icepick-tests.ts
@@ -27,7 +27,7 @@ class Foo {}
 // assoc(collection, key, value)
 {
     let coll = { a: 1, b: 2 };
-    let newColl = i.assoc(coll, "b", 3); // {a: 1, b: 3}
+    let newColl = i.assoc<typeof coll, number>(coll, "b", 3); // {a: 1, b: 3}
 
     let arr = ["a", "b", "c"];
     let newArr = i.assoc(arr, 2, "d"); // ["a", "b", "d"]
@@ -36,7 +36,7 @@ class Foo {}
 // alias: set(collection, key, value)
 {
     let coll = { a: 1, b: 2 };
-    let newColl = i.set(coll, "b", 3); // {a: 1, b: 3}
+    let newColl = i.set<typeof coll, number>(coll, "b", 3); // {a: 1, b: 3}
 
     let arr = ["a", "b", "c"];
     let newArr = i.set(arr, 2, "d"); // ["a", "b", "d"]
@@ -70,7 +70,7 @@ class Foo {}
         }
     };
 
-    let newColl = i.assocIn(coll, ["c", "d"], "baz");
+    let newColl = i.assocIn<typeof coll, string>(coll, ["c", "d"], "baz");
 
     let coll2 = {};
     let newColl2 = i.assocIn(coll2, ["a", "b", "c"], 1);
@@ -86,7 +86,7 @@ class Foo {}
         }
     };
 
-    let newColl = i.setIn(coll, ["c", "d"], "baz");
+    let newColl = i.setIn<typeof coll, string>(coll, ["c", "d"], "baz");
 
     let coll2 = {};
     let newColl2 = i.setIn(coll2, ["a", "b", "c"], 1);
@@ -99,7 +99,7 @@ class Foo {}
         { b: 2 }
     ]);
 
-    let result = i.getIn(coll, [1, "b"]); // 2
+    let result = i.getIn(coll, [1, "b"]) as number; // 2
 }
 
 // updateIn(collection, path, callback)
@@ -166,9 +166,13 @@ class Foo {}
     };
 
     let result = i.chain(o)
-        .assocIn(["a", 2], 4)
+        .assocIn<number>(["a", 2], 4)
+        .setIn<number>(["a", 1], 5)
+        .updateIn<number>(["d"], function(d) { return d * 2 })
         .merge({ b: { c: 2, c2: 3 } })
-        .assoc("e", 2)
+        .assoc<number>("e", 2)
+        .set<number>("f", 3)
         .dissoc("d")
-        .value();
+        .getIn(['a', 0])
+        .value() as number;
 }
diff --git a/icepick/index.d.ts b/icepick/index.d.ts
index 184f0e12b1..bffe424d1b 100644
--- a/icepick/index.d.ts
+++ b/icepick/index.d.ts
@@ -1,15 +1,15 @@
-// Type definitions for icepick v1.1.0
+// Type definitions for icepick v1.3.0
 // Project: https://github.com/aearly/icepick
-// Definitions by: Nathan Brown <https://github.com/ngbrown>
+// Definitions by: Nathan Brown <https://github.com/ngbrown>, Tobias Cohen <https://github.com/tobico>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
 export declare function freeze<T>(collection: T): T;
 export declare function thaw<T>(collection: T): T;
-export declare function assoc<T>(collection: T, key: number | string, value: any): T;
+export declare function assoc<T, V>(collection: T, key: number | string, value: V): T;
 export declare function dissoc<T>(collection: T, key: number | string): T;
-export declare function assocIn<T>(collection: T, path: Array<number | string>, value: any): T;
-export declare function getIn<Result>(collection: any, path: Array<number | string>): Result;
+export declare function assocIn<T, V>(collection: T, path: Array<number | string>, value: V): T;
+export declare function getIn<T>(collection: T, path: Array<number | string>): any;
 export declare function updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): T;
 
 export {assoc as set};
@@ -44,17 +44,17 @@ interface IcepickWrapper<T> {
     freeze(): IcepickWrapper<T>;
     thaw(): IcepickWrapper<T>;
 
-    assoc(key: number | string, value: any): IcepickWrapper<T>;
-    set(key: number | string, value: any): IcepickWrapper<T>;
+    assoc<V>(key: number | string, value: V): IcepickWrapper<T>;
+    set<V>(key: number | string, value: V): IcepickWrapper<T>;
 
     dissoc(key: number | string): IcepickWrapper<T>;
     unset(key: number | string): IcepickWrapper<T>;
 
-    assocIn(path: Array<number | string>, value: any): IcepickWrapper<T>;
-    setIn(path: Array<number | string>, value: any): IcepickWrapper<T>;
+    assocIn<V>(path: Array<number | string>, value: V): IcepickWrapper<T>;
+    setIn<V>(path: Array<number | string>, value: V): IcepickWrapper<T>;
 
-    getIn<Result>(collection: any, path: Array<number | string>): IcepickWrapper<Result>;
-    updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): IcepickWrapper<T>;
+    getIn(path: Array<number | string>): IcepickWrapper<any>;
+    updateIn<V>(path: Array<number | string>, callback: (value: V) => V): IcepickWrapper<T>;
 
     assign<S1>(source1: S1): IcepickWrapper<T & S1>;
     assign<S1, S2>(s1: S1, s2: S2): IcepickWrapper<T & S1 & S2>;

From d813b7f056068ed3457f638bcdac4a0abb7f2d0c Mon Sep 17 00:00:00 2001
From: Morgan Benton <registered@morphatic.com>
Date: Mon, 14 Nov 2016 01:24:17 -0500
Subject: [PATCH 093/245] add module declaration

---
 d3kit/d3kit-tests.ts |  32 ++++++-------
 d3kit/index.d.ts     | 112 +++++++++++++++++++++----------------------
 2 files changed, 71 insertions(+), 73 deletions(-)

diff --git a/d3kit/d3kit-tests.ts b/d3kit/d3kit-tests.ts
index e9e665b28b..cfe1c2aa45 100644
--- a/d3kit/d3kit-tests.ts
+++ b/d3kit/d3kit-tests.ts
@@ -4,12 +4,12 @@
 function test_abstract_chart() {
     let el: Element,
         chart: AbstractChart,
-        options: AbstractChart.ChartOptions,
-        margins: AbstractChart.ChartMargin,
-        offsets: AbstractChart.ChartOffset,
-        defopts: AbstractChart.ChartOptions,
-        fitopts: AbstractChart.FitOptions,
-        watchop: AbstractChart.WatchOptions,
+        options: ChartOptions,
+        margins: ChartMargin,
+        offsets: ChartOffset,
+        defopts: ChartOptions,
+        fitopts: FitOptions,
+        watchop: WatchOptions,
         events: string[],
         w: number, h:number, d: [number, number], a: any, b: boolean;
 
@@ -84,10 +84,10 @@ function test_abstract_chart() {
 function test_svgchart() {
     let el: Element,
         chart: SvgChart,
-        options: AbstractChart.ChartOptions,
-        margins: AbstractChart.ChartMargin,
-        offsets: AbstractChart.ChartOffset,
-        svg: SVGElement, rootg: SVGElement, layers: d3kit.LayerOrganizer;
+        options: ChartOptions,
+        margins: ChartMargin,
+        offsets: ChartOffset,
+        svg: SVGElement, rootg: SVGElement, layers: LayerOrganizer;
 
     // create a div, append to body, return Node as type Element
     el = document.body.appendChild(document.createElement('div')) as Element;
@@ -116,9 +116,9 @@ function test_svgchart() {
 function test_canvaschart() {
     let el: Element,
         chart: CanvasChart,
-        options: AbstractChart.ChartOptions,
-        margins: AbstractChart.ChartMargin,
-        offsets: AbstractChart.ChartOffset,
+        options: ChartOptions,
+        margins: ChartMargin,
+        offsets: ChartOffset,
         context: CanvasRenderingContext2D;
 
     // create a div, append to body, return Node as type Element
@@ -148,7 +148,7 @@ function test_canvaschart() {
 function test_layer_organizer() {
     let selection: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
         layer: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
-        layers: d3kit.LayerOrganizer,
+        layers: LayerOrganizer,
         hasXAxis: boolean;
 
     selection = d3.select('svg');
@@ -156,8 +156,8 @@ function test_layer_organizer() {
     /**
      * Test constructor
      */
-    layers = new d3kit.LayerOrganizer(selection);        // without specifying tag
-    layers = new d3kit.LayerOrganizer(selection, 'div'); // specifying tag
+    layers = new LayerOrganizer(selection);        // without specifying tag
+    layers = new LayerOrganizer(selection, 'div'); // specifying tag
 
     /**
      * Test layer creation
diff --git a/d3kit/index.d.ts b/d3kit/index.d.ts
index 64cbb1a3da..64f52114ff 100644
--- a/d3kit/index.d.ts
+++ b/d3kit/index.d.ts
@@ -5,10 +5,12 @@
 
 /// <reference types="d3" />
 
+declare module "d3kit";
+
 declare class AbstractChart {
     container: Element;
-    constructor(selector: string|Element, options?: AbstractChart.ChartOptions);
-    static getDefaultOptions(): AbstractChart.ChartOptions;
+    constructor(selector: string|Element, options?: ChartOptions);
+    static getDefaultOptions(): ChartOptions;
     static getCustomEventNames(): string[];
     setupDispatcher(customEventNames?: string[]): void;
     getCustomEventNames(): string[];
@@ -20,88 +22,84 @@ declare class AbstractChart {
     height(): number;
     dimension(dimensions: [number, number]): this;
     dimension(): [number, number];
-    data(): any;
     data(data: any): this;
-    margin(margins: AbstractChart.ChartMargin): this;
-    margin(): AbstractChart.ChartMargin;
-    offset(offset: AbstractChart.ChartOffset): this;
-    offset(): AbstractChart.ChartOffset;
-    options(options: AbstractChart.ChartOptions): this;
-    options(): AbstractChart.ChartOptions;
+    data(): any;
+    margin(margins: ChartMargin): this;
+    margin(): ChartMargin;
+    offset(offset: ChartOffset): this;
+    offset(): ChartOffset;
+    options(options: ChartOptions): this;
+    options(): ChartOptions;
     updateDimensionNow(): this;
     hasData(): boolean;
     hasNonZeroArea(): boolean;
-    fit(fitOptions: AbstractChart.FitOptions, watchOptions?: AbstractChart.WatchOptions): this;
+    fit(fitOptions: FitOptions, watchOptions?: WatchOptions): this;
     stopFitWatcher(): this;
     on(name: string, listener: () => void): this;
     off(name: string): this;
     destroy(): void;
 }
 
-declare namespace AbstractChart {
-    export interface ChartMargin {
-        top?: number;
-        right?: number;
-        bottom?: number;
-        left?: number;
-    }
+declare interface ChartMargin {
+    top?: number;
+    right?: number;
+    bottom?: number;
+    left?: number;
+}
 
-    export interface ChartOffset {
-        x: number;
-        y: number;
-    }
+declare interface ChartOffset {
+    x: number;
+    y: number;
+}
 
-    export interface ChartOptions {
-        initialWidth?: number;
-        initialHeight?: number;
-        margin?: ChartMargin;
-        offset?: ChartOffset;
-        pixelRatio?: number;
-    }
+declare interface ChartOptions {
+    initialWidth?: number;
+    initialHeight?: number;
+    margin?: ChartMargin;
+    offset?: ChartOffset;
+    pixelRatio?: number;
+}
 
-    // from https://github.com/kristw/slimfit
-    export interface FitOptions {
-        mode?: string;
-        width?: string|number;
-        height?: string|number;
-        ratio?: number;
-        maxWidth?: string|number;
-        maxHeight?: string|number;
-    }
+// from https://github.com/kristw/slimfit
+declare interface FitOptions {
+    mode?: string;
+    width?: string|number;
+    height?: string|number;
+    ratio?: number;
+    maxWidth?: string|number;
+    maxHeight?: string|number;
+}
 
-    // from https://github.com/kristw/slimfit
-    export interface WatchOptions {
-        mode?: string;
-        target?: any; // lazy
-        interval?: number;
-    }
+// from https://github.com/kristw/slimfit
+declare interface WatchOptions {
+    mode?: string;
+    target?: any; // lazy
+    interval?: number;
 }
 
 declare class SvgChart extends AbstractChart {
     svg: SVGElement;
     rootG: SVGElement;
-    layers: d3kit.LayerOrganizer;
-    constructor(selector: string|Element, options?: AbstractChart.ChartOptions);
+    layers: LayerOrganizer;
+    constructor(selector: string|Element, options?: ChartOptions);
 }
 
 declare class CanvasChart extends AbstractChart {
-    constructor(selector: string|Element, options?: AbstractChart.ChartOptions);
-    static getDefaultOptions(): AbstractChart.ChartOptions;
+    constructor(selector: string|Element, options?: ChartOptions);
+    static getDefaultOptions(): ChartOptions;
     getContext2d(): CanvasRenderingContext2D;
     clear(): this;
 }
 
-declare namespace d3kit {
-    export class LayerOrganizer {
-        constructor(container: d3.Selection<d3.BaseType, any, d3.BaseType, any>, defaultTag?: string);
-        create(layerNames: string|Array<string>|LayerConfig|Array<LayerConfig>): d3.Selection<d3.BaseType, any, d3.BaseType, any>|Array<d3.Selection<d3.BaseType, any, d3.BaseType, any>>;
-        get(name: string): d3.Selection<d3.BaseType, any, d3.BaseType, any>;
-        has(name: string): boolean;
-    }
+declare class LayerOrganizer {
+    constructor(container: d3.Selection<d3.BaseType, any, d3.BaseType, any>, defaultTag?: string);
+    create(layerNames: string|Array<string>|LayerConfig|Array<LayerConfig>): d3.Selection<d3.BaseType, any, d3.BaseType, any>|Array<d3.Selection<d3.BaseType, any, d3.BaseType, any>>;
+    get(name: string): d3.Selection<d3.BaseType, any, d3.BaseType, any>;
+    has(name: string): boolean;
+}
 
-    interface LayerConfig {
-        [layerName: string]: string|string[]|LayerConfig|Array<LayerConfig>;
-    }
+declare interface LayerConfig {
+    [layerName: string]: string|string[]|LayerConfig|Array<LayerConfig>;
 }
 
 declare namespace helper {

From 19854af46f2bcd37cf416341ce74ef03ab1717b9 Mon Sep 17 00:00:00 2001
From: Marius Cristea <marius.cristea@irian.ro>
Date: Mon, 14 Nov 2016 14:36:26 +0200
Subject: [PATCH 094/245] add $cancelRequest to IResourceArray

---
 angularjs/angular-resource.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/angularjs/angular-resource.d.ts b/angularjs/angular-resource.d.ts
index f7e803c1c8..bf983c9a69 100644
--- a/angularjs/angular-resource.d.ts
+++ b/angularjs/angular-resource.d.ts
@@ -52,7 +52,7 @@ declare namespace angular.resource {
              where deleteDescriptor : IActionDescriptor */
             actions?: IActionHash, options?: IResourceOptions): IResourceClass<T>;
     }
-    
+
     // Hash of action descriptors allows custom action names
     interface IActionHash {
         [action: string]: IActionDescriptor
@@ -165,6 +165,8 @@ declare namespace angular.resource {
      * Really just a regular Array object with $promise and $resolve attached to it
      */
     interface IResourceArray<T> extends Array<T & IResource<T>> {
+        $cancelRequest(): void;
+
         /** the promise of the original server interaction that created this collection. **/
         $promise : angular.IPromise<IResourceArray<T>>;
         $resolved : boolean;
@@ -191,7 +193,7 @@ declare namespace angular {
         /** creating a resource service factory */
         factory(name: string, resourceServiceFactoryFunction: angular.resource.IResourceServiceFactoryFunction<any>): IModule;
     }
-    
+
     namespace auto {
     	interface IInjectorService {
     		get(name: '$resource'): ng.resource.IResourceService;

From 6b71a1114d2b7767184d65e718913c96aa4b506b Mon Sep 17 00:00:00 2001
From: Prashant Tiwari <prashaantt@gmail.com>
Date: Mon, 14 Nov 2016 18:21:32 +0530
Subject: [PATCH 095/245] Allow MenuItem to wrap a containerElement

---
 material-ui/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
index c04d673dc9..687cf77dd6 100644
--- a/material-ui/index.d.ts
+++ b/material-ui/index.d.ts
@@ -1116,6 +1116,7 @@ declare namespace __MaterialUI {
             secondaryText?: React.ReactNode;
             style?: React.CSSProperties;
             value?: any;
+            containerElement?: React.ReactNode | string;
         }
         export class MenuItem extends React.Component<MenuItemProps, {}> {
         }

From edccc739be8690390e75f71177d5e5cb9d17c7e6 Mon Sep 17 00:00:00 2001
From: Benton <bentonmc@jmu.edu>
Date: Mon, 14 Nov 2016 11:05:19 -0500
Subject: [PATCH 096/245] npm test runs --changes

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 2bc1eae594..b6d7c05d87 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "node": ">= 0.12.0"
   },
   "scripts": {
-    "test": "dt --all",
+    "test": "dt --changes",
     "changes": "dt --changes",
     "lint": "dt --lint",
     "tscparams": "dt --tscparams --no-tests --no-headers",

From 5e2d11c1e701e2609980b3dce31dcfbb30296e42 Mon Sep 17 00:00:00 2001
From: Bryan Johnson <bjohnson@ancestry.com>
Date: Mon, 14 Nov 2016 10:34:50 -0700
Subject: [PATCH 097/245] Update mapbox-gl to v0.27.0

---
 mapbox-gl/mapbox-gl-0.26.0.d.ts | 948 ++++++++++++++++++++++++++++++++
 mapbox-gl/mapbox-gl.d.ts        |  50 +-
 2 files changed, 980 insertions(+), 18 deletions(-)
 create mode 100644 mapbox-gl/mapbox-gl-0.26.0.d.ts

diff --git a/mapbox-gl/mapbox-gl-0.26.0.d.ts b/mapbox-gl/mapbox-gl-0.26.0.d.ts
new file mode 100644
index 0000000000..ddb6344cbd
--- /dev/null
+++ b/mapbox-gl/mapbox-gl-0.26.0.d.ts
@@ -0,0 +1,948 @@
+// Type definitions for Mapbox GL JS v0.26.0
+// Project: https://github.com/mapbox/mapbox-gl-js
+// Definitions by: Dominik Bruderer <https://github.com/dobrud>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../geojson/geojson.d.ts" />
+
+declare namespace mapboxgl {
+	let accessToken: string;
+	let version: string;
+	export function supported(options?: {failIfMajorPerformanceCaveat?: boolean}): boolean;
+
+	/**
+	 * Map
+	 */
+	export class Map extends Evented {
+		constructor(options?: MapboxOptions);
+
+		addControl(control: Control): this;
+
+		addClass(klass: string, options?: mapboxgl.StyleOptions): this;
+
+		removeClass(klass: string, options?: mapboxgl.StyleOptions): this;
+
+		setClasses(klasses: string[], options?: mapboxgl.StyleOptions): this;
+
+		hasClass(klass: string): boolean;
+
+		getClasses(): string[];
+
+		resize(): this;
+
+		getBounds(): mapboxgl.LngLatBounds;
+
+		setMaxBounds(lnglatbounds?: mapboxgl.LngLatBounds | number[][]): this;
+
+		setMinZoom(minZoom?: number): this;
+
+		setMaxZoom(maxZoom?: number): this;
+
+		project(lnglat: mapboxgl.LngLat | number[]): mapboxgl.Point;
+
+		unproject(point: mapboxgl.Point | number[]): mapboxgl.LngLat;
+
+		queryRenderedFeatures(pointOrBox?: mapboxgl.Point|number[]|mapboxgl.Point[]|number[][], parameters?: {layers?: string[], filter?: any[]}): GeoJSON.Feature<GeoJSON.GeometryObject>[];
+
+		querySourceFeatures(sourceID: string, parameters: {sourceLayer?: string, filter?: any[]}): GeoJSON.Feature<GeoJSON.GeometryObject>[];
+
+		setStyle(style: mapboxgl.Style | string): this;
+
+		getStyle(): mapboxgl.Style;
+
+		addSource(id: string, source: VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw): this;
+
+		removeSource(id: string): this;
+
+		getSource(id: string): VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource;
+
+		addLayer(layer: mapboxgl.Layer, before?: string): this;
+
+		removeLayer(id: string): this;
+
+		getLayer(id: string): mapboxgl.Layer;
+
+		setFilter(layer: string, filter: any[]): this;
+
+		setLayerZoomRange(layerId: string, minzoom: number, maxzoom: number): this;
+
+		getFilter(layer: string): any[];
+
+		setPaintProperty(layer: string, name: string, value: any, klass?: string): this;
+
+		getPaintProperty(layer: string, name: string, klass?: string): any;
+
+		setLayoutProperty(layer: string, name: string, value: any): this;
+
+		getLayoutProperty(layer: string, name: string, klass?: string): any;
+
+		getContainer(): HTMLElement;
+
+		getCanvasContainer(): HTMLElement;
+
+		getCanvas(): HTMLCanvasElement;
+
+		loaded(): boolean;
+
+		remove(): void;
+
+		onError(): void;
+
+		showTileBoundaries: boolean;
+
+		showCollisionBoxes: boolean;
+
+		repaint: boolean;
+
+		getCenter(): mapboxgl.LngLat;
+
+		setCenter(center: LngLat|number[], eventData?: mapboxgl.EventData): this;
+
+		panBy(offset: number[], options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+
+		panTo(lnglat: mapboxgl.LngLat, options?: mapboxgl.AnimationOptions, eventdata?: mapboxgl.EventData): this;
+
+		getZoom(): number;
+
+		setZoom(zoom: number, eventData?: mapboxgl.EventData): this;
+
+		zoomTo(zoom: number, options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+
+		zoomIn(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+
+		zoomOut(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+
+		getBearing(): number;
+
+		setBearing(bearing: number, eventData?: mapboxgl.EventData): this;
+
+		rotateTo(bearing: number, options?: mapboxgl.AnimationOptions, eventData?: EventData): this;
+
+		resetNorth(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+
+		snapToNorth(options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+
+		getPitch(): number;
+
+		setPitch(pitch: number, eventData?: EventData): this;
+
+		fitBounds(bounds: mapboxgl.LngLatBounds | number[][], options?: { linear?: boolean, easing?: Function, padding?: number, offset?: Point|number[],maxZoom?: number }): this;
+
+		jumpTo(options: mapboxgl.CameraOptions, eventData?: mapboxgl.EventData): this;
+
+		easeTo(options: mapboxgl.CameraOptions | mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+
+		flyTo(options: mapboxgl.FlyToOptions, eventData?: mapboxgl.EventData): this;
+
+		stop(): this;
+
+		scrollZoom: ScrollZoomHandler;
+
+		boxZoom: BoxZoomHandler;
+
+		dragRotate: DragRotateHandler;
+
+		dragPan: DragPanHandler;
+
+		keyboard: KeyboardHandler;
+
+		doublClickZoom: DoubleClickZoomHandler;
+
+		touchZoomRotate: TouchZoomRotateHandler;
+	}
+
+	export interface MapboxOptions {
+		/** If true, an attribution control will be added to the map. */
+		attributionControl?: boolean;
+
+		bearing?: number;
+
+		/** Snap to north threshold in degrees. */
+		bearingSnap?: number;
+
+		/** If true, enable the "box zoom" interaction (see BoxZoomHandler) */
+		boxZoom?: boolean;
+
+		/** initial map center */
+		center?: mapboxgl.LngLat | number[];
+
+		/** Style class names with which to initialize the map */
+		classes?: string[];
+
+		/** ID of the container element */
+		container?: string | Element;
+
+		/** If true, enable the "drag to pan" interaction (see DragPanHandler). */
+		dragPan?: boolean;
+
+		/** If true, enable the "drag to rotate" interaction (see DragRotateHandler). */
+		dragRotate?: boolean;
+
+		/** If true, enable the "double click to zoom" interaction (see DoubleClickZoomHandler). */
+		doubleClickZoom?: boolean;
+
+		/** If true, the map will track and update the page URL according to map position */
+		hash?: boolean;
+
+		/** If true, map creation will fail if the implementation determines that the performance of the created WebGL context would be dramatically lower than expected. */
+		failIfMayorPerformanceCaveat?: boolean;
+
+		/** If false, no mouse, touch, or keyboard listeners are attached to the map, so it will not respond to input */
+		interactive?: boolean;
+
+		/** If true, enable keyboard shortcuts (see KeyboardHandler). */
+		keyboard?: boolean;
+
+		/** If set, the map is constrained to the given bounds. */
+		maxBounds?: mapboxgl.LngLatBounds | number[][];
+
+		/** Maximum zoom of the map */
+		maxZoom?: number;
+
+		/** Minimum zoom of the map */
+		minZoom?: number;
+
+		/** If true, The maps canvas can be exported to a PNG using map.getCanvas().toDataURL();. This is false by default as a performance optimization. */
+		preserveDrawingBuffer?: boolean;
+
+		pitch?: number;
+
+		/** If true, enable the "scroll to zoom" interaction */
+		scrollZoom?: boolean;
+
+		/** stylesheet location */
+		style?: mapboxgl.Style | string;
+
+		/** If  true, the map will automatically resize when the browser window resizes */
+		trackResize?: boolean;
+
+		/** If true, enable the "pinch to rotate and zoom" interaction (see TouchZoomRotateHandler). */
+		touchZoomRotate?: boolean;
+
+		/** Initial zoom level */
+		zoom?: number;
+	}
+
+	/**
+	 * BoxZoomHandler
+	 */
+	export class BoxZoomHandler {
+		constructor(map: mapboxgl.Map);
+
+		isEnabled(): boolean;
+
+		isActive(): boolean;
+
+		enable(): void;
+
+		disable(): void;
+	}
+
+	/**
+	 * ScrollZoomHandler
+	 */
+	export class ScrollZoomHandler {
+		constructor(map: mapboxgl.Map);
+
+		isEnabled(): boolean;
+
+		enable(): void;
+
+		disable(): void;
+	}
+
+	/**
+	 * DragPenHandler
+	 */
+	export class DragPanHandler {
+		constructor(map: mapboxgl.Map);
+
+		isEnabled(): boolean;
+
+		isActive(): boolean;
+
+		enable(): void;
+
+		disable(): void;
+	}
+
+	/**
+	 * DragRotateHandler
+	 */
+	export class DragRotateHandler {
+		constructor(map: mapboxgl.Map, options?: {bearingSnap?: number, pitchWithRotate?: boolean});
+
+		isEnabled(): boolean;
+
+		isActive(): boolean;
+
+		enable(): void;
+
+		disable(): void;
+	}
+
+	/**
+	 * KeyboardHandler
+	 */
+	export class KeyboardHandler {
+		constructor(map: mapboxgl.Map);
+
+		isEnabled(): boolean;
+
+		enable(): void;
+
+		disable(): void;
+	}
+
+	/**
+	 * DoubleClickZoomHandler
+	 */
+	export class DoubleClickZoomHandler {
+		constructor(map: mapboxgl.Map);
+
+		isEnabled(): boolean;
+
+		enable(): void;
+
+		disable(): void;
+	}
+
+	/**
+	 * TouchZoomRotateHandler
+	 */
+	export class TouchZoomRotateHandler {
+		constructor(map: mapboxgl.Map);
+
+		isEnabled(): boolean;
+
+		enable(): void;
+
+		disable(): void;
+
+		disableRotation(): void;
+
+		enableRotation(): void;
+	}
+
+	/**
+	 * Control
+	 */
+	export class Control extends Evented {
+		addTo(map: mapboxgl.Map): this;
+
+		remove(): this;
+	}
+
+	/**
+	 * ControlOptions
+	 */
+	export interface ControlOptions {
+		position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left';
+	}
+
+	/**
+	 * Navigation
+	 */
+	export class NavigationControl extends Control {
+		constructor(options?: mapboxgl.ControlOptions);
+	}
+
+	/**
+	 * Geolocate
+	 */
+	export class GeolocateControl extends Control {
+		constructor(options?: mapboxgl.ControlOptions);
+	}
+
+	/**
+	 * Attribution
+	 */
+	export class AttributionControl extends Control {
+		constructor(options?: mapboxgl.ControlOptions);
+	}
+
+	/**
+	 * Scale
+	 */
+	export class ScaleControl extends Control {
+		constructor(options?: {position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left', maxWidth?: number, unit?: string})
+	}
+
+	/**
+	 * Popup
+	 */
+	export class Popup extends Evented {
+		constructor(options?: mapboxgl.PopupOptions);
+
+		addTo(map: mapboxgl.Map): this;
+
+		isOpen(): boolean;
+
+		remove(): this;
+
+		getLngLat(): mapboxgl.LngLat;
+
+		setLngLat(lnglat: mapboxgl.LngLat | number[]): this;
+
+		setText(text: string): this;
+
+		setHTML(html: string): this;
+
+		setDOMContent(htmlNode: Node): this;
+	}
+
+	export interface PopupOptions {
+		closeButton?: boolean;
+
+		closeOnClick?: boolean;
+
+		anchor?: 'top' | 'bottom' | 'left' | 'right' | 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
+
+		offset?: number | Point | number[] | { [key:string]: Point | number[];};
+	}
+
+	export interface Style {
+		bearing?: number;
+		center?: number[];
+		glyphs?: string;
+		layers?: Layer[];
+		metadata?: any;
+		name?: string;
+		pitch?: number;
+		sources?: any;
+		sprite?: string;
+		transition?: Transition;
+		version: number;
+		zoom?: number;
+	}
+
+	export interface Transition {
+		delay?: number;
+		duration?: number;
+	}
+
+	export interface Source {
+		type: "vector" | "raster" | "geojson" | "image" | "video";
+	}
+
+	/**
+	 * GeoJSONSource
+	 */
+
+	export interface GeoJSONSourceRaw extends Source, GeoJSONSourceOptions {
+		type: "geojson";
+	}
+
+	export class GeoJSONSource implements GeoJSONSourceRaw {
+		type: "geojson";
+
+		constructor(options?: mapboxgl.GeoJSONSourceOptions);
+
+		setData(data: GeoJSON.Feature<GeoJSON.GeometryObject> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject> | String): this;
+	}
+
+	export interface GeoJSONSourceOptions {
+		data?: GeoJSON.Feature<GeoJSON.GeometryObject> | GeoJSON.FeatureCollection<GeoJSON.GeometryObject> | string;
+
+		maxzoom?: number;
+
+		buffer?: number;
+
+		tolerance?: number;
+
+		cluster?: number | boolean;
+
+		clusterRadius?: number;
+
+		clusterMaxZoom?: number;
+	}
+
+	/**
+	 * VideoSource
+	 */
+	export class VideoSource implements Source, VideoSourceOptions {
+		type: "video";
+		
+		constructor(options?: mapboxgl.VideoSourceOptions);
+
+		getVideo(): HTMLVideoElement;
+
+		setCoordinates(coordinates: number[][]): this;
+	}
+
+	export interface VideoSourceOptions {
+		urls?: string[];
+
+		coordinates?: number[][];
+	}
+
+	/**
+	 * ImageSource
+	 */
+	export class ImageSource implements Source, ImageSourceOptions {
+		type: "image";
+
+		constructor(options?: mapboxgl.ImageSourceOptions);
+
+		setCoordinates(coordinates: number[][]): this;
+	}
+
+	export interface ImageSourceOptions {
+		url?: string;
+
+		coordinates?: number[][];
+	}
+
+	interface VectorSource extends Source {
+		type: "vector";
+		url?: string;
+		tiles?: string[];
+		minzoom?: number;
+		maxzoom?: number;
+	}
+
+	interface RasterSource extends Source {
+		type: "raster";
+		url: string;
+		tiles?: string[];
+		minzoom?: number;
+		maxzoom?: number;
+		tileSize?: number;
+	}
+
+	/**
+	 * LngLat
+	 */
+	export class LngLat {
+		lng: number;
+		lat: number;
+
+		constructor(lng: number, lat: number);
+
+		/** Return a new LngLat object whose longitude is wrapped to the range (-180, 180). */
+		wrap(): mapboxgl.LngLat;
+
+		/** Return a LngLat as an array */
+		toArray(): number[];
+
+		/** Return a LngLat as a string */
+		toString(): string;
+
+		static convert(input: number[]|mapboxgl.LngLat): mapboxgl.LngLat;
+	}
+
+	/**
+	 * LngLatBounds
+	 */
+	export class LngLatBounds {
+		sw: LngLat | number[];
+		ne: LngLat | number[];
+		constructor(sw?: LngLat, ne?: LngLat);
+
+		/** Extend the bounds to include a given LngLat or LngLatBounds. */
+		extend(obj: mapboxgl.LngLat | mapboxgl.LngLatBounds): this;
+
+		/** Get the point equidistant from this box's corners */
+		getCenter(): mapboxgl.LngLat;
+
+		/** Get southwest corner */
+		getSouthWest(): mapboxgl.LngLat;
+
+		/** Get northeast corner */
+		getNorthEast(): mapboxgl.LngLat;
+
+		/** Get northwest corner */
+		getNorthWest(): mapboxgl.LngLat;
+
+		/** Get southeast corner */
+		getSouthEast(): mapboxgl.LngLat;
+
+		/** Get west edge longitude */
+		getWest(): number;
+
+		/** Get south edge latitude */
+		getSouth(): number;
+
+		/** Get east edge longitude */
+		getEast(): number;
+
+		/** Get north edge latitude */
+		getNorth(): number;
+
+		/** Returns a LngLatBounds as an array */
+		toArray(): number[][];
+
+		/** Return a LngLatBounds as a string */
+		toString(): string;
+
+		/** Convert an array to a LngLatBounds object, or return an existing LngLatBounds object unchanged. */
+		static convert(input: mapboxgl.LngLatBounds | number[] | number[][]): mapboxgl.LngLatBounds;
+	}
+
+	/**
+	 * Point
+	 */
+		// Todo: Pull out class to seperate definition for Module "point-geometry"
+	export class Point {
+		constructor(options?: Object);
+
+		clone(): Point;
+
+		add(p: number): Point;
+
+		sub(p: number): Point;
+
+		mult(k: number): Point;
+
+		div(k: number): Point;
+
+		rotate(a: number): Point;
+
+		matMult(m: number): Point;
+
+		unit(): Point;
+
+		perp(): Point;
+
+		round(): Point;
+
+		mag(): number;
+
+		equals(): boolean;
+
+		dist(): number;
+
+		distSqr(): number;
+
+		angle(): number;
+
+		angleTo(): number;
+
+		angleWidth(): number;
+
+		angleWidthSep(): number;
+	}
+
+	export class Marker {
+		constructor(element?: HTMLElement, options?: { offset?: Point | number[] });
+
+		addTo(map: Map): this;
+
+		remove(): this;
+
+		getLngLat(): LngLat;
+
+		setLngLat(lngLat: LngLat | number[]): this;
+
+		setPopup(popup?: Popup): this;
+
+		getPopup(): Popup;
+
+		togglePopup(): this;
+	}
+
+	/**
+	 * Evented
+	 */
+	export class Evented {
+		on(type: string, listener: Function): this;
+
+		off(type?: string | any, listener?: Function): this;
+
+		once(type: string, listener: Function): this;
+
+		fire(type: string, data?: mapboxgl.EventData | Object): this;
+
+		listens(type: string): boolean;
+	}
+
+	/**
+	 * StyleOptions
+	 */
+	export interface StyleOptions {
+		transition?: boolean;
+	}
+
+	/**
+	 * EventData
+	 */
+	export class EventData {
+		type: string;
+		target: Map;
+		originalEvent: Event;
+		point: mapboxgl.Point;
+		lngLat: mapboxgl.LngLat;
+	}
+
+	export class MapMouseEvent {
+		type: string;
+		target: Map;
+		originalEvent: MouseEvent;
+		point: mapboxgl.Point;
+		lngLat: mapboxgl.LngLat;
+	}
+
+	export class MapTouchEvent {
+		type: string;
+		target: Map;
+		originalEvent: TouchEvent;
+		point: mapboxgl.Point;
+		lngLat: mapboxgl.LngLat;
+		points: Point[];
+		lngLats: LngLat[];
+	}
+
+	export class MapBoxZoomEvent {
+		originalEvent: MouseEvent;
+		boxZoomBounds: LngLatBounds;
+	}
+
+	export class MapDataEvent {
+		type: string;
+		dataType: "source" | "style" | "tile";
+	}
+
+	/**
+	 * AnimationOptions
+	 */
+	export interface AnimationOptions {
+		/** Number in milliseconds */
+		duration?: number;
+		easing?: Function;
+		/** point, origin of movement relative to map center */
+		offset?: Point | number[];
+		/** When set to false, no animation happens */
+		animate?: boolean;
+	}
+
+	/**
+	 * CameraOptions
+	 */
+	export interface CameraOptions {
+		/** Map center */
+		center?: mapboxgl.LngLat | number[];
+		/** Map zoom level */
+		zoom?: number;
+		/** Map rotation bearing in degrees counter-clockwise from north */
+		bearing?: number;
+		/** Map angle in degrees at which the camera is looking at the ground */
+		pitch?: number;
+		/** If zooming, the zoom center (defaults to map center) */
+		around?: mapboxgl.LngLat | number[];
+	}
+
+	/**
+	 * FlyToOptions
+	 */
+	export interface FlyToOptions extends AnimationOptions, CameraOptions {
+		curve?: number;
+		minZoom?: number;
+		speed?: number;
+		screenSpeed?: number;
+		easing?: Function;
+	}
+
+	/**
+	 * MapEvent
+	 */
+	export interface MapEvent {
+		resize?: void;
+		webglcontextlost?: {originalEvent: WebGLContextEvent};
+		webglcontextrestored?: {originalEvent: WebGLContextEvent};
+		remove?: void;
+		dataloading?: {data: mapboxgl.MapDataEvent};
+		data?: {data: mapboxgl.MapDataEvent};
+		render?: void;
+		contextmenu?: {data: mapboxgl.MapMouseEvent};
+		dblclick?: {data: mapboxgl.MapMouseEvent};
+		click?: {data: mapboxgl.MapMouseEvent};
+		touchcancel?: {data: mapboxgl.MapTouchEvent};
+		touchmove?: {data: mapboxgl.MapTouchEvent};
+		touchend?: {data: mapboxgl.MapTouchEvent};
+		touchstart?: {data: mapboxgl.MapTouchEvent};
+		mousemove?: {data: mapboxgl.MapMouseEvent};
+		mouseup?: {data: mapboxgl.MapMouseEvent};
+		mousedown?: {data: mapboxgl.MapMouseEvent};
+		moveend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		move?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		movestart?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		mouseout?:{data: mapboxgl.MapMouseEvent};
+		load?: void;
+		zoomend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		zoom?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		zoomstart?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		boxzoomcancel?: {data: mapboxgl.MapBoxZoomEvent};
+		boxzoomstart?: {data: mapboxgl.MapBoxZoomEvent};
+		boxzoomend?: {data: mapboxgl.MapBoxZoomEvent};
+		rotate?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		rotatestart?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		rotateend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		drag?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		dragend?: {data: mapboxgl.MapMouseEvent | mapboxgl.MapTouchEvent};
+		pitch?: {data: mapboxgl.EventData};
+	}
+
+	export interface Layer {
+		id: string;
+		type?: "fill" | "line" | "symbol" | "circle" | "raster" | "background" | string; //TODO: Ideally we wouldn't accept string here, just these specific strings
+
+		metadata?: any;
+		ref?: string;
+
+		source?: string;
+
+		"source-layer"?: string;
+
+		minzoom?: number;
+		maxzoom?: number;
+
+		interactive?: boolean;
+
+		filter?: any[];
+		layout?: BackgroundLayout | FillLayout | LineLayout | SymbolLayout | RasterLayout | CircleLayout;
+		paint?: BackgroundPaint | FillPaint | LinePaint | SymbolPaint | RasterPaint | CirclePaint;
+	}
+
+	export interface StyleFunction {
+		stops: any[][];
+		property?: string;
+		base?: number;
+		type?: "identity" | "exponential" | "interval" | "categorical";
+		"colorSpace"?: "rgb" | "lab" | "interval";
+	}
+
+	export interface BackgroundLayout {
+		visibility?: "visible" | "none";
+	}
+	export interface BackgroundPaint {
+		"background-color"?: string;
+		"background-pattern"?: string;
+		"background-opacity"?: number;
+	}
+
+	export interface FillLayout {
+		visibility?: "visible" | "none";
+	}
+	export interface FillPaint {
+		"fill-antialias"?: boolean;
+		"fill-opacity"?: number | StyleFunction;
+		"fill-color"?: string | StyleFunction;
+		"fill-outline-color": string | StyleFunction;
+		"fill-translate"?: number[];
+		"fill-translate-anchor"?: "map" | "viewport";
+		"fill-pattern"?: "string";
+		"fill-extrude-height"?: number;
+		"fill-extrude-base"?: number;
+	}
+
+	export interface LineLayout {
+		visibility?: "visible" | "none";
+
+		"line-cap"?: "butt" | "round" | "square";
+		"line-join"?: "bevel" | "round" | "miter";
+		"line-miter-limit"?: number;
+		"line-round-limit"?: number;
+	}
+	export interface LinePaint {
+		"line-opacity"?: number;
+		"line-color"?: string| StyleFunction;
+		"line-translate"?: number[];
+		"line-translate-anchor"?: "map" | "viewport";
+		"line-width"?: number;
+		"line-gap-width"?: number;
+		"line-offset"?: number;
+		"line-blur"?: number;
+		"line-dasharray"?: number[];
+		"line-dasharray-transition"?: Transition;
+		"line-pattern"?: string;
+	}
+
+	export interface SymbolLayout {
+		visibility?: "visible" | "none";
+
+		"symbol-placement"?: "point" | "line";
+		"symbol-spacing"?: number;
+		"symbol-avoid-edges"?: boolean;
+		"icon-allow-overlap"?: boolean;
+		"icon-ignore-placement"?: boolean;
+		"icon-optional"?: boolean;
+		"icon-rotation-alignment"?: "map" | "viewport" | "auto";
+		"icon-size"?: number;
+		"icon-text-fit"?: "none" | "both" | "width" | "height";
+		"icon-text-fit-padding"?: number[];
+		"icon-image"?: string;
+		"icon-rotate"?: number | StyleFunction;
+		"icon-padding"?: number;
+		"icon-keep-upright"?: boolean;
+		"icon-offset"?: number[];
+		"text-pitch-alignment"?: "map" | "viewport" | "auto";
+		"text-rotation-alignment"?: "map" | "viewport" | "auto";
+		"text-field"?: string;
+		"text-font"?: string | string[];
+		"text-size"?: number;
+		"text-max-width"?: number;
+		"text-line-height"?: number;
+		"text-letter-spacing"?: number;
+		"text-justify"?: "left" | "center" | "right";
+		"text-anchor"?: "center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right";
+		"text-max-angle"?: number;
+		"text-rotate"?: number;
+		"text-padding"?: number;
+		"text-keep-upright"?: boolean;
+		"text-transform"?: "none" | "uppercase" | "lowercase";
+		"text-offset"?: number[];
+		"text-allow-overlap"?: boolean;
+		"text-ignore-placement"?: boolean;
+		"text-optional"?: boolean;
+
+	}
+	export interface SymbolPaint {
+		"icon-opacity"?: number;
+		"icon-color"?: string;
+		"icon-halo-color"?: string;
+		"icon-halo-width"?: number;
+		"icon-halo-blur"?: number;
+		"icon-translate"?: number[];
+		"icon-translate-anchor"?: "map" | "viewport";
+		"text-opacity"?: number;
+		"text-color"?: "string";
+		"text-halo-color"?: "string";
+		"text-halo-width"?: number;
+		"text-halo-blur"?: number;
+		"text-translate"?: number[];
+		"text-translate-anchor"?: "map" | "viewport";
+	}
+
+	export interface RasterLayout {
+		visibility?: "visible" | "none";
+	}
+
+	export interface RasterPaint {
+		"raster-opacity"?: number;
+		"raster-hue-rotate"?: number;
+		"raster-brightness-min"?: number;
+		"raster-brightness-max"?: number;
+		"raster-saturation"?: number;
+		"raster-contrast"?: number;
+		"raster-fade-duration"?: number;
+	}
+
+	export interface CircleLayout {
+		visibility?: "visible" | "none";
+	}
+
+	export interface CirclePaint {
+		"circle-radius"?: number | StyleFunction;
+		"circle-radius-transition"?: Transition;
+		"circle-color"?: number | StyleFunction;
+		"circle-blur"?: number | StyleFunction;
+		"circle-opacity"?: number | StyleFunction;
+		"circle-translate"?: number[];
+		"circle-translate-anchor"?: "map" | "viewport";
+		"circle-pitch-scale"?: "map" | "viewport";
+	}
+}
+
+declare module 'mapbox-gl' {
+	export = mapboxgl;
+}
diff --git a/mapbox-gl/mapbox-gl.d.ts b/mapbox-gl/mapbox-gl.d.ts
index ddb6344cbd..d7474e0006 100644
--- a/mapbox-gl/mapbox-gl.d.ts
+++ b/mapbox-gl/mapbox-gl.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mapbox GL JS v0.26.0
+// Type definitions for Mapbox GL JS v0.27.0
 // Project: https://github.com/mapbox/mapbox-gl-js
 // Definitions by: Dominik Bruderer <https://github.com/dobrud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -16,7 +16,9 @@ declare namespace mapboxgl {
 	export class Map extends Evented {
 		constructor(options?: MapboxOptions);
 
-		addControl(control: Control): this;
+		addControl(control: Control, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
+
+		removeControl(control: Control): this;
 
 		addClass(klass: string, options?: mapboxgl.StyleOptions): this;
 
@@ -36,8 +38,12 @@ declare namespace mapboxgl {
 
 		setMinZoom(minZoom?: number): this;
 
+		getMinZoom(): number;
+
 		setMaxZoom(maxZoom?: number): this;
 
+		getMaxZoom(): number;
+
 		project(lnglat: mapboxgl.LngLat | number[]): mapboxgl.Point;
 
 		unproject(point: mapboxgl.Point | number[]): mapboxgl.LngLat;
@@ -328,44 +334,34 @@ declare namespace mapboxgl {
 	 * Control
 	 */
 	export class Control extends Evented {
-		addTo(map: mapboxgl.Map): this;
-
-		remove(): this;
-	}
-
-	/**
-	 * ControlOptions
-	 */
-	export interface ControlOptions {
-		position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left';
 	}
 
 	/**
 	 * Navigation
 	 */
 	export class NavigationControl extends Control {
-		constructor(options?: mapboxgl.ControlOptions);
+		constructor();
 	}
 
 	/**
 	 * Geolocate
 	 */
 	export class GeolocateControl extends Control {
-		constructor(options?: mapboxgl.ControlOptions);
+		constructor();
 	}
 
 	/**
 	 * Attribution
 	 */
 	export class AttributionControl extends Control {
-		constructor(options?: mapboxgl.ControlOptions);
+		constructor();
 	}
 
 	/**
 	 * Scale
 	 */
 	export class ScaleControl extends Control {
-		constructor(options?: {position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left', maxWidth?: number, unit?: string})
+		constructor(options?: {maxWidth?: number, unit?: string})
 	}
 
 	/**
@@ -409,6 +405,7 @@ declare namespace mapboxgl {
 		metadata?: any;
 		name?: string;
 		pitch?: number;
+		light?: Light;
 		sources?: any;
 		sprite?: string;
 		transition?: Transition;
@@ -421,6 +418,13 @@ declare namespace mapboxgl {
 		duration?: number;
 	}
 
+	export interface Light {
+		"anchor"?: "map" | "viewport";
+		"position"?: number[];
+		"color"?: string;
+		"intensity"?: number;
+	}
+
 	export interface Source {
 		type: "vector" | "raster" | "geojson" | "image" | "video";
 	}
@@ -831,8 +835,18 @@ declare namespace mapboxgl {
 		"fill-translate"?: number[];
 		"fill-translate-anchor"?: "map" | "viewport";
 		"fill-pattern"?: "string";
-		"fill-extrude-height"?: number;
-		"fill-extrude-base"?: number;
+	}
+
+	export interface FillExtrusionLayout {
+		visibility?: "visible" | "none";
+	}
+	export interface FillExtrusionPaint {
+		"fill-extrusion-opacity"?: number;
+		"fill-extrusion-color"?: string | StyleFunction;
+		"fill-extrusion-translate"?: number[];
+		"fill-extrusion-translate-anchor"?: "map" | "viewport";
+		"fill-extrusion-height"?: number | StyleFunction;
+		"fill-extrusion-base"?: number;
 	}
 
 	export interface LineLayout {

From 9ef0bc438facbc6a3b827af49dbafabc5a2cb612 Mon Sep 17 00:00:00 2001
From: Bryan Johnson <bjohnson@ancestry.com>
Date: Mon, 14 Nov 2016 10:46:53 -0700
Subject: [PATCH 098/245] Make sure FillExtrusion layer is available

---
 mapbox-gl/mapbox-gl.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mapbox-gl/mapbox-gl.d.ts b/mapbox-gl/mapbox-gl.d.ts
index d7474e0006..bfe5390504 100644
--- a/mapbox-gl/mapbox-gl.d.ts
+++ b/mapbox-gl/mapbox-gl.d.ts
@@ -803,8 +803,8 @@ declare namespace mapboxgl {
 		interactive?: boolean;
 
 		filter?: any[];
-		layout?: BackgroundLayout | FillLayout | LineLayout | SymbolLayout | RasterLayout | CircleLayout;
-		paint?: BackgroundPaint | FillPaint | LinePaint | SymbolPaint | RasterPaint | CirclePaint;
+		layout?: BackgroundLayout | FillLayout | FillExtrusionLayout | LineLayout | SymbolLayout | RasterLayout | CircleLayout;
+		paint?: BackgroundPaint | FillPaint | FillExtrusionPaint | LinePaint | SymbolPaint | RasterPaint | CirclePaint;
 	}
 
 	export interface StyleFunction {

From bd199842097645e051feaf7441fe1418802fbade Mon Sep 17 00:00:00 2001
From: abeall <abeall@decisionlens.com>
Date: Mon, 14 Nov 2016 14:18:09 -0500
Subject: [PATCH 099/245] Added react-overlays

---
 react-overlays/index.d.ts               | 222 ++++++++++++++++++++++++
 react-overlays/react-overlays-tests.tsx |  44 +++++
 react-overlays/tsconfig.json            |  20 +++
 3 files changed, 286 insertions(+)
 create mode 100644 react-overlays/index.d.ts
 create mode 100644 react-overlays/react-overlays-tests.tsx
 create mode 100644 react-overlays/tsconfig.json

diff --git a/react-overlays/index.d.ts b/react-overlays/index.d.ts
new file mode 100644
index 0000000000..e826dc83eb
--- /dev/null
+++ b/react-overlays/index.d.ts
@@ -0,0 +1,222 @@
+// Type definitions for React Overlays v0.6.10
+// Project: https://github.com/react-bootstrap/react-overlays
+// Definitions by: Aaron Beall <https://github.com/aaronbeall>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare module "react-overlays" {
+  import * as React from "react";
+  import * as ReactBootstrap from "react-bootstrap";
+  
+  // <Affix />
+  interface AffixProps {
+    /**
+     * Pixels to offset from top of screen when calculating position
+     */
+    offsetTop?: number;
+  
+    /**
+     * When affixed, pixels to offset from top of viewport
+     */
+    viewportOffsetTop?: number;
+  
+    /**
+     * Pixels to offset from bottom of screen when calculating position
+     */
+    offsetBottom?: number;
+  
+    /**
+     * CSS class or classes to apply when at top
+     */
+    topClassName?: string;
+  
+    /**
+     * Style to apply when at top
+     */
+    topStyle?: React.CSSProperties;
+  
+    /**
+     * CSS class or classes to apply when affixed
+     */
+    affixClassName?: string;
+    
+    /**
+     * Style to apply when affixed
+     */
+    affixStyle?: React.CSSProperties;
+  
+    /**
+     * CSS class or classes to apply when at bottom
+     */
+    bottomClassName?: string;
+  
+    /**
+     * Style to apply when at bottom
+     */
+    bottomStyle?: React.CSSProperties;
+  
+    /**
+     * Callback fired when the right before the `affixStyle` and `affixStyle` props are rendered
+     */
+    onAffix?: () => void;
+    /**
+     * Callback fired after the component `affixStyle` and `affixClassName` props have been rendered.
+     */
+    onAffixed?: () => void;
+  
+    /**
+     * Callback fired when the right before the `topStyle` and `topClassName` props are rendered
+     */
+    onAffixTop?: () => void;
+  
+    /**
+     * Callback fired after the component `topStyle` and `topClassName` props have been rendered.
+     */
+    onAffixedTop?: () => void;
+  
+    /**
+     * Callback fired when the right before the `bottomStyle` and `bottomClassName` props are rendered
+     */
+    onAffixBottom?: () => void;
+  
+    /**
+     * Callback fired after the component `bottomStyle` and `bottomClassName` props have been rendered.
+     */
+    onAffixedBottom?: () => void;
+  }
+  class Affix extends React.Component<AffixProps, {}> { }
+  
+  // <AutoAffix />
+  interface AutoAffixProps extends AffixProps {
+  
+    /**
+     * The logical container node or component for determining offset from bottom
+     * of viewport, or a function that returns it
+     */
+    container?: React.ReactInstance | (() => React.ReactInstance);
+  
+    /**
+     * Automatically set width when affixed
+     */
+    autoWidth?: boolean;
+  }
+  class AutoAffix extends React.Component<AutoAffixProps, {}> { }
+  
+  // <Modal />
+  type Modal = ReactBootstrap.Modal; // Provided already through react-bootstrap
+  
+  // <Overlay />
+  type Overlay = ReactBootstrap.Overlay; // Provided already through react-bootstrap
+  
+  // <Portal />
+  type Portal = ReactBootstrap.Portal; // Provided already through react-bootstrap
+  
+  // <Position />
+  type Position = ReactBootstrap.Position; // Provided already through react-bootstrap
+  
+  // <Transition />
+  interface TransitionProps {
+    className?: string;
+
+    /**
+     * Show the component; triggers the enter or exit animation
+     */
+    in?: boolean;
+  
+    /**
+     * Unmount the component (remove it from the DOM) when it is not shown
+     */
+    unmountOnExit?: boolean;
+  
+    /**
+     * Run the enter animation when the component mounts, if it is initially
+     * shown
+     */
+    transitionAppear?: boolean;
+  
+    /**
+     * A Timeout for the animation, in milliseconds, to ensure that a node doesn't
+     * transition indefinately if the browser transitionEnd events are
+     * canceled or interrupted.
+     *
+     * By default this is set to a high number (5 seconds) as a failsafe. You should consider
+     * setting this to the duration of your animation (or a bit above it).
+     */
+    timeout?: number;
+  
+    /**
+     * CSS class or classes applied when the component is exited
+     */
+    exitedClassName?: string;
+    
+    /**
+     * CSS class or classes applied while the component is exiting
+     */
+    exitingClassName?: string;
+    
+    /**
+     * CSS class or classes applied when the component is entered
+     */
+    enteredClassName?: string;
+    
+    /**
+     * CSS class or classes applied while the component is entering
+     */
+    enteringClassName?: string;
+  
+    /**
+     * Callback fired before the "entering" classes are applied
+     */
+    onEnter?: (element: Element) => void;
+    
+    /**
+     * Callback fired after the "entering" classes are applied
+     */
+    onEntering?: (element: Element) => void;
+    
+    /**
+     * Callback fired after the "enter" classes are applied
+     */
+    onEntered?: (element: Element) => void;
+    
+    /**
+     * Callback fired before the "exiting" classes are applied
+     */
+    onExit?: (element: Element) => void;
+    
+    /**
+     * Callback fired after the "exiting" classes are applied
+     */
+    onExiting?: (element: Element) => void;
+    
+    /**
+     * Callback fired after the "exited" classes are applied
+     */
+    onExited?: (element: Element) => void;
+  }
+  class Transition extends React.Component<TransitionProps, {}> { }
+}
+
+declare module "react-overlays/lib/RootCloseWrapper" {
+  import * as React from "react";
+  
+  // <RootCloseWrapper />
+  interface RootCloseWrapperProps {
+    onRootClose?: () => void;
+    children?: React.ReactNode;
+    
+    /**
+     * Disable the the RootCloseWrapper, preventing it from triggering
+     * `onRootClose`.
+     */
+    disabled?: boolean;
+    
+    /**
+     * Choose which document mouse event to bind to
+     */
+    event?: 'click' | 'mousedown';
+  }
+  class RootCloseWrapper extends React.Component<RootCloseWrapperProps, {}> { }
+  
+  namespace RootCloseWrapper { } // module export workaround: https://github.com/Microsoft/TypeScript/issues/5073
+  export = RootCloseWrapper;
+}
diff --git a/react-overlays/react-overlays-tests.tsx b/react-overlays/react-overlays-tests.tsx
new file mode 100644
index 0000000000..6beee70ea7
--- /dev/null
+++ b/react-overlays/react-overlays-tests.tsx
@@ -0,0 +1,44 @@
+import * as React from "react";
+
+import {Transition, Portal, Modal, Position, Overlay, Affix, AutoAffix} from "react-overlays";
+import * as RootCloseWrapper from "react-overlays/lib/RootCloseWrapper"; 
+
+function testTransition() {
+  return (
+    <Transition
+      in={true}
+      timeout={100}
+      className='fade'
+      enteredClassName='in'
+      enteringClassName='in'
+    >
+      <div>Test</div>
+    </Transition>
+  );
+}
+
+
+class TestAffix extends React.Component<{}, {}> {
+  render(): JSX.Element {
+    return (
+      <div>
+        <AutoAffix viewportOffsetTop={15} container={this}>
+          <div>Test</div>
+        </AutoAffix>
+      </div>
+    );
+  }
+}
+
+class TestRootCloseWrapper extends React.Component<{}, {}> {
+  handleRootClose = () => { };
+  render() {
+    return (
+      <RootCloseWrapper onRootClose={this.handleRootClose} 
+                        disabled={false} 
+                        event="click">
+        <div>Test</div>
+      </RootCloseWrapper>
+    );
+  }
+}
diff --git a/react-overlays/tsconfig.json b/react-overlays/tsconfig.json
new file mode 100644
index 0000000000..ab93e191ad
--- /dev/null
+++ b/react-overlays/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-overlays-tests.tsx"
+    ]
+}
\ No newline at end of file

From 10a64c8124cef3af28dbbe6264354d85b9d00923 Mon Sep 17 00:00:00 2001
From: Pat Sissons <patricksissons@gmail.com>
Date: Sun, 13 Nov 2016 12:15:38 -0800
Subject: [PATCH 100/245] adding fill to TableProps

---
 react-bootstrap/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/react-bootstrap/index.d.ts b/react-bootstrap/index.d.ts
index 2ec9eed50d..7a61fed330 100644
--- a/react-bootstrap/index.d.ts
+++ b/react-bootstrap/index.d.ts
@@ -862,6 +862,7 @@ declare namespace ReactBootstrap {
         hover?: boolean;
         responsive?: boolean;
         striped?: boolean;
+        fill?: boolean;
     }
     type Table = React.ClassicComponent<TableProps, {}>;
     var Table: React.ClassicComponentClass<TableProps>;

From 8349a45d781b5cb7c868f80dfb3017e5bab998ea Mon Sep 17 00:00:00 2001
From: Pat Sissons <patricksissons@gmail.com>
Date: Sun, 13 Nov 2016 12:15:52 -0800
Subject: [PATCH 101/245] adding panel with a filled table to tests

---
 react-bootstrap/react-bootstrap-tests.tsx | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx
index 65ecbca247..21498abcc9 100644
--- a/react-bootstrap/react-bootstrap-tests.tsx
+++ b/react-bootstrap/react-bootstrap-tests.tsx
@@ -274,6 +274,29 @@ export class ReactBootstrapTest extends Component<any, any> {
                   </Panel>
                 </div>
 
+                <div style={style}>
+                  <Panel collapsible defaultExpanded header='Panel heading'>
+                    Some default panel content here.
+                    <Table fill>
+                      <thead>
+                        <tr>
+                          <th>A</th>
+                          <th>B</th>
+                          <th>C</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <tr>
+                          <td>Item 1</td>
+                          <td>Item 2</td>
+                          <td>&hellip;</td>
+                        </tr>
+                      </tbody>
+                    </Table>
+                    Some more panel content here.
+                  </Panel>
+                </div>
+
                 <div style={style}>
                   <Accordion>
                     <Panel header='Collapsible Group Item #1' eventKey='1'>

From 3dba3ee2bd0f590e4b1870a51843f60649bd27dc Mon Sep 17 00:00:00 2001
From: Pat Sissons <patricksissons@gmail.com>
Date: Sun, 13 Nov 2016 12:40:53 -0800
Subject: [PATCH 102/245] adding Navbar.Form

---
 react-bootstrap/index.d.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/react-bootstrap/index.d.ts b/react-bootstrap/index.d.ts
index 2ec9eed50d..c57a6214b4 100644
--- a/react-bootstrap/index.d.ts
+++ b/react-bootstrap/index.d.ts
@@ -535,6 +535,14 @@ declare namespace ReactBootstrap {
     type NavbarText = React.ClassicComponent<NavbarTextProps, {}>;
     const NavbarText: React.ClassicComponentClass<NavbarTextProps>;
 
+    // <Navbar.Form />
+    interface NavbarFormProps extends React.HTMLProps<NavbarForm> {
+        componentClass?: React.ReactType;
+        pullRight?: boolean;
+    }
+    type NavbarForm = React.ClassicComponent<NavbarFormProps, {}>;
+    const NavbarForm: React.ClassicComponentClass<NavbarFormProps>;
+
     // <Navbar />
     interface NavbarProps extends React.HTMLProps<Navbar> {
         brand?: any; // TODO: Add more specific type
@@ -560,6 +568,7 @@ declare namespace ReactBootstrap {
         Toggle: typeof NavbarToggle;
         Link: typeof NavbarLink;
         Text: typeof NavbarText;
+        Form: typeof NavbarForm;
     }
     type Navbar = React.ClassicComponent<NavbarProps, {}>;
     var Navbar: NavbarClass;

From eafc7fc5ffe1e90c219851a7879147a9eca8258a Mon Sep 17 00:00:00 2001
From: Pat Sissons <patricksissons@gmail.com>
Date: Sun, 13 Nov 2016 12:45:40 -0800
Subject: [PATCH 103/245] adding Navbar.Form test

---
 react-bootstrap/react-bootstrap-tests.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/react-bootstrap/react-bootstrap-tests.tsx b/react-bootstrap/react-bootstrap-tests.tsx
index 65ecbca247..f505f08e92 100644
--- a/react-bootstrap/react-bootstrap-tests.tsx
+++ b/react-bootstrap/react-bootstrap-tests.tsx
@@ -522,6 +522,13 @@ export class ReactBootstrapTest extends Component<any, any> {
                       <Navbar.Text>
                           Signed in as: <Navbar.Link href="#">Mark Otto</Navbar.Link>
                       </Navbar.Text>
+                      <Navbar.Form pullRight>
+                        <FormGroup>
+                          <FormControl type='text' placeholder='Search' />
+                        </FormGroup>
+                        {' '}
+                        <Button type='submit'>Submit</Button>
+                      </Navbar.Form>
                       <Navbar.Text pullRight>
                           Have a great day!
                       </Navbar.Text>

From 4882fcb163fd825968d19e698fe74a5f3d96d091 Mon Sep 17 00:00:00 2001
From: Pat Sissons <patricksissons@gmail.com>
Date: Sun, 13 Nov 2016 15:17:42 -0800
Subject: [PATCH 104/245] adding jquery-param typings

---
 jquery-param/index.d.ts            |  9 +++++++++
 jquery-param/jquery-param-tests.ts |  3 +++
 jquery-param/tsconfig.json         | 19 +++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 100644 jquery-param/index.d.ts
 create mode 100644 jquery-param/jquery-param-tests.ts
 create mode 100644 jquery-param/tsconfig.json

diff --git a/jquery-param/index.d.ts b/jquery-param/index.d.ts
new file mode 100644
index 0000000000..4e1031da2f
--- /dev/null
+++ b/jquery-param/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for jquery-param v1.0.0
+// Project: https://github.com/knowledgecode/jquery-param
+// Definitions by: Pat Sissons <http://github.com/patsissons>
+
+export as namespace param;
+
+export = param;
+
+declare function param(obj: any): string;
diff --git a/jquery-param/jquery-param-tests.ts b/jquery-param/jquery-param-tests.ts
new file mode 100644
index 0000000000..cdea4dd342
--- /dev/null
+++ b/jquery-param/jquery-param-tests.ts
@@ -0,0 +1,3 @@
+import param = require('jquery-param');
+
+const test1 = param({ a: 'A', b: 'B', c: 'C' });
diff --git a/jquery-param/tsconfig.json b/jquery-param/tsconfig.json
new file mode 100644
index 0000000000..cd5ade28aa
--- /dev/null
+++ b/jquery-param/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-param-tests.ts"
+    ]
+}
\ No newline at end of file

From 9a9d2f4103c08d455ee5d7a6206308d7dd83905c Mon Sep 17 00:00:00 2001
From: Ivan Popelyshev <ivan.popelyshev@gmail.com>
Date: Sun, 13 Nov 2016 19:43:36 +0300
Subject: [PATCH 105/245] typings for pixi.js-v4. Old v3 is moved to subfolder

---
 pixi.js/index.d.ts          | 3459 ++++++++++++++++++++++-------------
 pixi.js/pixi.js-tests.ts    |   51 +-
 pixi.js/v3/pixi.js-tests.ts | 2761 ++++++++++++++++++++++++++++
 pixi.js/v3/pixi.js.d.ts     | 1748 ++++++++++++++++++
 4 files changed, 6710 insertions(+), 1309 deletions(-)
 create mode 100644 pixi.js/v3/pixi.js-tests.ts
 create mode 100644 pixi.js/v3/pixi.js.d.ts

diff --git a/pixi.js/index.d.ts b/pixi.js/index.d.ts
index 6e8640e91c..bf5ee7c0df 100644
--- a/pixi.js/index.d.ts
+++ b/pixi.js/index.d.ts
@@ -1,100 +1,80 @@
-// Type definitions for Pixi.js 3.0.9 dev
-// Project: https://github.com/GoodBoyDigital/pixi.js/
+// Type definitions for Pixi.js 4.1
+// Project: https://github.com/pixijs/pixi.js/tree/dev
 // Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export = PIXI;
-export as namespace PIXI;
+declare module PIXI {
 
-declare class PIXI {
+    // from CONST
+    export var VERSION: typeof CONST.VERSION;
+    export var PI_2: typeof CONST.PI_2;
+    export var RAD_TO_DEG: typeof CONST.RAD_TO_DEG;
+    export var DEG_TO_RAD: typeof CONST.DEG_TO_RAD;
+    export var TARGET_FPMS: typeof CONST.TARGET_FPMS;
+    export var RENDERER_TYPE: typeof CONST.RENDERER_TYPE;
+    export var BLEND_MODES: typeof CONST.BLEND_MODES;
+    export var DRAW_MODES: typeof CONST.DRAW_MODES;
+    export var SCALE_MODES: typeof CONST.SCALE_MODES;
+    export var WRAP_MODES: typeof CONST.WRAP_MODES;
+    export var TRANSFORM_MODE: typeof CONST.TRANSFORM_MODE;
+    export var SPRITE_MAX_TEXTURES: typeof CONST.SPRITE_MAX_TEXTURES;
+    export var PRECISION: typeof CONST.PRECISION;
+    export var TEXT_STYLE_CHANGED: typeof CONST.TEXT_STYLE_CHANGED;
+    export var GC_MODES: typeof CONST.GC_MODES;
+    export var MIPMAP_TEXTURES: typeof CONST.MIPMAP_TEXTURES;
+    export var RETINA_PREFIX: typeof CONST.RETINA_PREFIX;
+    export var RESOLUTION: typeof CONST.RESOLUTION;
+    export var FILTER_RESOLUTION: typeof CONST.FILTER_RESOLUTION;
+    export var DEFAULT_RENDER_OPTIONS: typeof CONST.DEFAULT_RENDER_OPTIONS;
+    export var SHAPES: typeof CONST.SHAPES;
+    export var SPRITE_BATCH_SIZE: typeof CONST.SPRITE_BATCH_SIZE;
+    export var TEXT_GRADIENT: typeof CONST.TEXT_GRADIENT;
 
-    static VERSION: string;
-    static PI_2: number;
-    static RAD_TO_DEG: number;
-    static DEG_TO_RAD: number;
-    static TARGET_FPMS: number;
-    static RENDERER_TYPE: {
-        UNKNOWN: number;
-        WEBGL: number;
-        CANVAS: number;
-    };
-    static BLEND_MODES: {
-        NORMAL: number;
-        ADD: number;
-        MULTIPLY: number;
-        SCREEN: number;
-        OVERLAY: number;
-        DARKEN: number;
-        LIGHTEN: number;
-        COLOR_DODGE: number;
-        COLOR_BURN: number;
-        HARD_LIGHT: number;
-        SOFT_LIGHT: number;
-        DIFFERENCE: number;
-        EXCLUSION: number;
-        HUE: number;
-        SATURATION: number;
-        COLOR: number;
-        LUMINOSITY: number;
-
-    };
-    static DRAW_MODES: {
-        POINTS: number;
-        LINES: number;
-        LINE_LOOP: number;
-        LINE_STRIP: number;
-        TRIANGLES: number;
-        TRIANGLE_STRIP: number;
-        TRIANGLE_FAN: number;
-    };
-    static SCALE_MODES: {
-        DEFAULT: number;
-        LINEAR: number;
-        NEAREST: number;
-    };
-    static RETINA_PREFIX: string;
-    static RESOLUTION: number;
-    static FILTER_RESOLUTION: number;
-    static DEFAULT_RENDER_OPTIONS: {
-        view: HTMLCanvasElement;
-        resolution: number;
-        antialias: boolean;
-        forceFXAA: boolean;
-        autoResize: boolean;
-        transparent: boolean;
-        backgroundColor: number;
-        clearBeforeRender: boolean;
-        preserveDrawingBuffer: boolean;
-        roundPixels: boolean;
-    };
-    static SHAPES: {
-        POLY: number;
-        RECT: number;
-        CIRC: number;
-        ELIP: number;
-        RREC: number;
-    };
-    static SPRITE_BATCH_SIZE: number;
-
-}
-
-declare namespace PIXI {
-
-    export function autoDetectRenderer(width: number, height: number, options?: PIXI.RendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    export function autoDetectRenderer(width: number, height: number, options?: PIXI.IRendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
     export var loader: PIXI.loaders.Loader;
 
-    //https://github.com/primus/eventemitter3
-    export class EventEmitter {
+    //////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////ACCESSIBILITY////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
 
-        listeners(event: string): Function[];
-        emit(event: string, ...args: any[]): boolean;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        removeListener(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
-        removeAllListeners(event?: string): EventEmitter;
+    export module accessibility {
 
-        off(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
-        addListener(event: string, fn: Function, context?: any): EventEmitter;
+        // accessibility
+        export class AccessibilityManager {
+
+            constructor(renderer: CanvasRenderer | WebGLRenderer);
+
+            protected div: HTMLElement;
+            protected pool: HTMLElement[];
+            protected renderId: number;
+            debug: boolean;
+            renderer: SystemRenderer;
+            protected children: IAccessibleTarget[];
+            protected isActive: boolean;
+
+            protected activate(): void;
+            protected deactivate(): void;
+            protected updateAccessibleObjects(displayObject: DisplayObject): void;
+            protected update(): void;
+            protected capHitArea(hitArea: IHitArea): void;
+            protected addChild(displayObject: DisplayObject): void;
+            protected _onClick(e: interaction.InteractionEvent): void;
+            protected _onFocus(e: interaction.InteractionEvent): void;
+            protected _onFocusOut(e: interaction.InteractionEvent): void;
+            protected _onKeyDown(e: interaction.InteractionEvent): void;
+            protected _onMouseMove(): void;
+
+            destroy(): void;
+
+        }
+        export interface IAccessibleTarget {
+
+            accessible: boolean;
+            accessibleTitle: string;
+            accessibleHint: string;
+            tabIndex: number;
+
+        }
 
     }
 
@@ -102,124 +82,149 @@ declare namespace PIXI {
     ////////////////////////////////CORE//////////////////////////////////////////
     //////////////////////////////////////////////////////////////////////////////
 
-    //display
+    // const
 
-    export class DisplayObject extends EventEmitter implements interaction.InteractiveTarget {
-
-        //begin extras.cacheAsBitmap see https://github.com/pixijs/pixi-typescript/commit/1207b7f4752d79a088d6a9a465a3ec799906b1db
-        protected _originalRenderWebGL: WebGLRenderer;
-        protected _originalRenderCanvas: CanvasRenderer;
-        protected _originalUpdateTransform: boolean;
-        protected _originalHitTest: any;
-        protected _cachedSprite: any;
-        protected _originalDestroy: any;
-
-        cacheAsBitmap: boolean;
-
-        protected _renderCachedWebGL(renderer: WebGLRenderer): void;
-        protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
-        protected _renderCachedCanvas(renderer: CanvasRenderer): void;
-        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
-        protected _getCachedBounds(): Rectangle;
-        protected _destroyCachedDisplayObject(): void;
-        protected _cacheAsBitmapDestroy(): void;
-        //end extras.cacheAsBitmap
-
-        protected _sr: number;
-        protected _cr: number;
-        protected _bounds: Rectangle;
-        protected _currentBounds: Rectangle;
-        protected _mask: Rectangle;
-        protected _cachedObject: any;
-
-        updateTransform(): void;
-
-        position: Point;
-        scale: Point;
-        pivot: Point;
-        rotation: number;
-        renderable: boolean;
-        alpha: number;
-        visible: boolean;
-        parent: Container;
-        worldAlpha: number;
-        worldTransform: Matrix;
-        filterArea: Rectangle;
-
-        x: number;
-        y: number;
-        worldVisible: boolean;
-        mask: Graphics | Sprite;
-        filters: AbstractFilter[];
-        name: string;
-
-        getBounds(matrix?: Matrix): Rectangle;
-        getLocalBounds(): Rectangle;
-        toGlobal(position: Point): Point;
-        toLocal(position: Point, from?: DisplayObject): Point;
-        generateTexture(renderer: CanvasRenderer | WebGLRenderer, scaleMode: number, resolution: number): Texture;
-        setParent(container: Container): Container;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
-        destroy(): void;
-        getChildByName(name: string): DisplayObject;
-        getGlobalPosition(point: Point): Point;
-
-        interactive: boolean;
-        buttonMode: boolean;
-        interactiveChildren: boolean;
-        defaultCursor: string;
-        hitArea: HitArea;
-
-        on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-
-        once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
+    export module CONST {
+        export var VERSION: string;
+        export var PI_2: number;
+        export var RAD_TO_DEG: number;
+        export var DEG_TO_RAD: number;
+        export var TARGET_FPMS: number;
+        export var RENDERER_TYPE: {
+            UNKNOWN: number;
+            WEBGL: number;
+            CANVAS: number;
+        };
+        export var BLEND_MODES: {
+            NORMAL: number;
+            ADD: number;
+            MULTIPLY: number;
+            SCREEN: number;
+            OVERLAY: number;
+            DARKEN: number;
+            LIGHTEN: number;
+            COLOR_DODGE: number;
+            COLOR_BURN: number;
+            HARD_LIGHT: number;
+            SOFT_LIGHT: number;
+            DIFFERENCE: number;
+            EXCLUSION: number;
+            HUE: number;
+            SATURATION: number;
+            COLOR: number;
+            LUMINOSITY: number;
+        };
+        export var DRAW_MODES: {
+            POINTS: number;
+            LINES: number;
+            LINE_LOOP: number;
+            LINE_STRIP: number;
+            TRIANGLES: number;
+            TRIANGLE_STRIP: number;
+            TRIANGLE_FAN: number;
+        };
+        export var SCALE_MODES: {
+            DEFAULT: number,
+            LINEAR: number,
+            NEAREST: number
+        };
+        export var GC_MODES: {
+            DEFAULT: number;
+            AUTO: number;
+            MANUAL: number;
+        };
+        export var WRAP_MODES: {
+            CLAMP: number;
+            DEFAULT: number;
+            MIRRORED_REPEAT: number;
+            REPEAT: number;
+        };
+        export var TRANSFORM_MODE: {
+            DEFAULT: number;
+            DYNAMIC: number;
+            STATIC: number;
+        };
+        export var MIPMAP_TEXTURES: boolean;
+        export var RETINA_PREFIX: RegExp;
+        export var RESOLUTION: number;
+        export var FILTER_RESOLUTION: number;
+        export var DEFAULT_RENDER_OPTIONS: {
+            view: HTMLCanvasElement;
+            antialias: boolean;
+            forceFXAA: boolean;
+            autoResize: boolean;
+            transparent: boolean;
+            backgroundColor: number;
+            clearBeforeRender: boolean;
+            preserveDrawingBuffer: boolean;
+            roundPixels: boolean;
+        };
+        export var URL_FILE_EXTENSION: RegExp | string;
+        export var DATA_URI: RegExp | string;
+        export var SVG_SIZE: RegExp | string;
+        export var SHAPES: {
+            POLY: number;
+            RECT: number;
+            CIRC: number;
+            ELIP: number;
+            RREC: number;
+        };
+        export var PRECISION: {
+            DEFAULT: string;
+            LOW: string;
+            MEDIUM: string;
+            HIGH: string;
+        };
+        export var TEXT_GRADIENT: {
+            LINEAR_VERTICAL: number;
+            LINEAR_HORIZONTAL: number;
+        };
+        export var SPRITE_BATCH_SIZE: number;
+        export var SPRITE_MAX_TEXTURES: number;
+        export var TEXT_STYLE_CHANGED: string;
 
     }
 
+    // display
+
+    export interface IDestroyOptions {
+        children?: boolean;
+        texture?: boolean;
+        baseTexture?: boolean;
+    }
+    export class Bounds {
+
+        minX: number;
+        minY: number;
+        maxX: number;
+        maxY: number;
+        rect: Rectangle;
+
+        isEmpty(): boolean;
+        clear(): void;
+
+        getRectangle(rect?: Rectangle): Rectangle;
+        addPoint(point: Point): void;
+        addQuad(vertices: number[]): Bounds;
+        addFrame(transform: Transform, x0: number, y0: number, x1: number, y1: number): void;
+        addVertices(transform: Transform, vertices: number[], beginOffset: number, endOffset: number): void;
+        addBounds(bounds: Bounds): void;
+        addBoundsMask(bounds: Bounds, mask: Bounds): void;
+        addBoundsArea(bounds: Bounds, area: Rectangle): void;
+
+    }
     export class Container extends DisplayObject {
 
-        protected _renderWebGL(renderer: WebGLRenderer): void;
-        protected _renderCanvas(renderer: CanvasRenderer): void;
-
-        protected onChildrenChange: () => void;
+        // begin extras.getChildByName
+        getChildByName(name: string): DisplayObject;
+        // end extras.getChildByName
 
         children: DisplayObject[];
-
         width: number;
         height: number;
 
+        protected onChildrenChange: (...args: any[]) => void;
+        addChild(child: DisplayObject): DisplayObject;
         addChild(...child: DisplayObject[]): DisplayObject;
         addChildAt(child: DisplayObject, index: number): DisplayObject;
         swapChildren(child: DisplayObject, child2: DisplayObject): void;
@@ -228,58 +233,257 @@ declare namespace PIXI {
         getChildAt(index: number): DisplayObject;
         removeChild(child: DisplayObject): DisplayObject;
         removeChildAt(index: number): DisplayObject;
-        removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[];
-        destroy(destroyChildren?: boolean): void;
-        generateTexture(renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer, resolution?: number, scaleMode?: number): Texture;
-
+        removeChildren(beginIndex?: number, endIndex?: number): DisplayObject | DisplayObject[];
+        updateTransform(): void;
+        calculateBounds(): void;
+        protected _calculateBounds(): void;
+        protected containerUpdateTransform(): void;
         renderWebGL(renderer: WebGLRenderer): void;
+        renderAdvancedWebGL(renderer: WebGLRenderer): void;
+        protected _renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
         renderCanvas(renderer: CanvasRenderer): void;
+        destroy(options?: IDestroyOptions | boolean): void;
 
-        once(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        once(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
-        on(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
-        on(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
+        once(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
+        once(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
+        once(event: string, fn: Function, context?: any): utils.EventEmitter;
+        on(event: "added", fn: (displayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
+        on(event: "removed", fn: (DisplayObject: DisplayObject) => void, context?: any): utils.EventEmitter;
+        on(event: string, fn: Function, context?: any): utils.EventEmitter;
+        off(event: string, fn: Function, context?: any): utils.EventEmitter;
+
+    }
+    export class DisplayObject extends utils.EventEmitter implements interaction.InteractiveTarget {
+
+        // begin extras.cacheAsBitmap
+        protected _cacheAsBitmap: boolean;
+        protected _cacheData: boolean;
+        cacheAsBitmap: boolean;
+        protected _renderCachedWebGL(renderer: WebGLRenderer): void;
+        protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
+        protected _renderCachedCanvas(renderer: CanvasRenderer): void;
+        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
+        protected _calculateCachedBounds(): Rectangle;
+        protected _getCachedLocalBounds(): Rectangle;
+        protected _destroyCachedDisplayObject(): void;
+        protected _cacheAsBitmapDestroy(): void;
+        // end extras.cacheAsBitmap
+
+        // begin extras.getChildByName
+        name: string;
+        // end extras.getChildByName
+
+        // begin extras.getGlobalPosition
+        getGlobalPosition(point?: Point, skipUpdate?: boolean): Point;
+        // end extras.getGlobalPosition
+
+        // begin accessible target
+        accessible: boolean;
+        accessibleTitle: string;
+        accessibleHint: string;
+        tabIndex: number;
+        // end accessible target
+
+        // begin interactive target
+        interactive: boolean;
+        buttonMode: boolean;
+        hitArea: IHitArea;
+        interactiveChildren: boolean;
+        defaultCursor: string;
+        _isRightDown: boolean;
+        _isLeftDown: boolean;
+        // end interactive target
+
+        transform: TransformBase;
+        alpha: number;
+        visible: boolean;
+        renderable: boolean;
+        parent: Container;
+        worldAlpha: number;
+        filterArea: Rectangle;
+        protected _filters: Filter[];
+        protected _enabledFilters: Filter[];
+        protected _bounds: Bounds;
+        protected _boundsID: number;
+        protected _lastBoundsID: number;
+        protected _boundsRect: Rectangle;
+        protected _localBoundsRect: Rectangle;
+        protected _mask: Rectangle;
+        x: number;
+        y: number;
+        worldTransform: Matrix;
+        localTransform: Matrix;
+        position: Point;
+        scale: Point;
+        pivot: Point;
+        skew: Point;
+        rotation: number;
+        worldVisible: boolean;
+        mask: PIXI.Graphics | PIXI.Sprite;
+        filters: Filter[];
+
+        updateTransform(): void;
+        protected displayObjectUpdateTransform(): void;
+        protected _recursivePostUpdateTransform(): void;
+        getBounds(skipUpdate?: boolean, rect?: Rectangle): Rectangle;
+        getLocalBounds(rect?: Rectangle): Rectangle;
+        toGlobal(position: Point, point?: Point, skipUpdate?: boolean): Point;
+        toLocal(position: Point, from?: DisplayObject, point?: Point, skipUpdate?: boolean): Point;
+        protected renderWebGL(renderer: WebGLRenderer): void;
+        protected renderCanvas(renderer: CanvasRenderer): void;
+        setParent(container: Container): Container;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
+        destroy(): void;
+
+        on(event: string, fn: Function, context?: any): utils.EventEmitter;
+        once(event: string, fn: Function, context?: any): utils.EventEmitter;
+        off(event: string, fn: Function, context?: any): utils.EventEmitter;
+
+        /*
+         on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+
+         once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): utils.EventEmitter;
+         */
 
     }
 
-    //graphics
+    export class TransformBase {
+
+        static IDENTITY: TransformBase;
+
+        worldTransform: Matrix;
+        localTransform: Matrix;
+        protected _worldID: number;
+        updateLocalTransform(): void;
+        updateTransform(parentTransform: TransformBase): void;
+        updateWorldTransform(parentTransform: TransformBase): void;
+
+    }
+    export class TransformStatic extends TransformBase {
+
+        position: ObservablePoint;
+        scale: ObservablePoint;
+        pivot: ObservablePoint;
+        skew: ObservablePoint;
+
+        protected _rotation: number;
+        protected _sr: number;
+        protected _cr: number;
+        protected _cy: number;
+        protected _sy: number;
+        protected _nsx: number;
+        protected _cx: number;
+        protected _currentLocalID: number;
+
+        protected onChange(): void;
+        updateSkew(): void;
+        updateLocalTransform(): void;
+        updateTransform(parentTransform: TransformBase): void;
+        setFromMatrix(matrix: Matrix): void;
+
+        rotation: number;
+
+    }
+    export class Transform extends TransformBase {
+
+        constructor();
+
+        position: Point;
+        scale: Point;
+        skew: ObservablePoint;
+        pivot: Point;
+
+        protected _rotation: number;
+        protected _sr: number;
+        protected _cr: number;
+        protected _cy: number;
+        protected _sy: number;
+        protected _nsx: number;
+        protected _cx: number;
+
+        updateSkew(): void;
+        setFromMatrix(matrix: Matrix): void;
+
+        rotation: number;
+
+    }
+
+    // graphics
 
     export class GraphicsData {
 
-        constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, shape: Circle | Rectangle | Ellipse | Polygon);
+        constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon);
 
         lineWidth: number;
         lineColor: number;
         lineAlpha: number;
+        protected _lineTint: number;
         fillColor: number;
         fillAlpha: number;
-        fill: boolean;
-        shape: Circle | Rectangle | Ellipse | Polygon;
-        type: number;
-
-        clone(): GraphicsData;
-
-        protected _lineTint: number;
         protected _fillTint: number;
+        fill: boolean;
+        protected holes: IShape[];
+        shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon;
+        type: number;
+        clone(): GraphicsData;
+        addHole(shape: IShape | Circle | Rectangle | RoundedRectangle | Ellipse | Polygon): void;
+        destroy(options?: IDestroyOptions | boolean): void;
 
     }
     export class Graphics extends Container {
 
-        protected boundsDirty: boolean;
-        protected dirty: boolean;
-        protected glDirty: boolean;
-
         fillAlpha: number;
         lineWidth: number;
         lineColor: number;
+        protected graphicsData: GraphicsData[];
         tint: number;
+        protected _prevTint: number;
         blendMode: number;
+        currentPath: GraphicsData;
+        protected _webGL: any;
         isMask: boolean;
         boundsPadding: number;
+        protected _localBounds: Bounds;
+        dirty: boolean;
+        fastRectDirty: number;
+        clearDirty: number;
+        boundsDirty: number;
+        protected cachedSpriteDirty: boolean;
+        protected _spriteRect: Rectangle;
+        protected _fastRect: boolean;
+
+        static _SPRITE_TEXTURE: Texture;
 
         clone(): Graphics;
         lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
@@ -297,34 +501,93 @@ declare namespace PIXI {
         drawEllipse(x: number, y: number, width: number, height: number): Graphics;
         drawPolygon(path: number[] | Point[]): Graphics;
         clear(): Graphics;
-        //todo
-        generateTexture(renderer: WebGLRenderer | CanvasRenderer, resolution?: number, scaleMode?: number): Texture;
-        getBounds(matrix?: Matrix): Rectangle;
+        isFastRect(): boolean;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+        protected _calculateBounds(): Rectangle;
+        protected _renderSpriteRect(renderer: PIXI.SystemRenderer): void;
         containsPoint(point: Point): boolean;
         updateLocalBounds(): void;
-        drawShape(shape: Circle | Rectangle | Ellipse | Polygon): GraphicsData;
+        drawShape(shape: IShape | Circle | Rectangle | Ellipse | Polygon | RoundedRectangle): GraphicsData;
+        generateCanvasTexture(scaleMode?: number, resolution?: number): Texture;
+        protected closePath(): Graphics;
+        protected addHole(): Graphics;
+        destroy(options?: IDestroyOptions | boolean): void;
 
     }
-    export interface GraphicsRenderer extends ObjectRenderer {
-        //yikes todo
+    export class CanvasGraphicsRenderer {
+
+        constructor(renderer: SystemRenderer);
+        render(graphics: Graphics): void;
+        protected updateGraphicsTint(graphics: Graphics): void;
+        protected renderPolygon(points: Point[], close: boolean, context: CanvasRenderingContext2D): void;
+        destroy(): void;
+
     }
-    export interface WebGLGraphicsData {
-        //yikes todo!
+    export class GraphicsRenderer extends ObjectRenderer {
+
+        constructor(renderer: PIXI.CanvasRenderer);
+
+        protected graphicsDataPool: GraphicsData[];
+        protected primitiveShader: PrimitiveShader;
+        gl: WebGLRenderingContext;
+
+        CONTEXT_UID: number;
+
+        destroy(): void;
+        render(graphics: Graphics): void;
+        protected updateGraphics(graphics: PIXI.Graphics): void;
+        getWebGLData(webGL: WebGLRenderingContext, type: number): WebGLGraphicsData;
+
     }
+    export class WebGLGraphicsData {
 
-    //math
+        constructor(gl: WebGLRenderingContext, shader: glCore.GLShader, attribsState: glCore.IAttribState);
 
-    export class Point {
+        gl: WebGLRenderingContext;
+        color: number[];
+        points: Point[];
+        indices: number[];
+        buffer: WebGLBuffer;
+        indexBuffer: WebGLBuffer;
+        dirty: boolean;
+        glPoints: number[];
+        glIndices: number[];
+        shader: glCore.GLShader;
+        vao: glCore.VertexArrayObject;
 
-        x: number;
-        y: number;
+        reset(): void;
+        upload(): void;
+        destroy(): void;
 
-        constructor(x?: number, y?: number);
+    }
+    export class PrimitiveShader extends glCore.GLShader { }
 
-        clone(): Point;
-        copy(p: Point): void;
-        equals(p: Point): boolean;
-        set(x?: number, y?: number): void;
+    // math
+
+    export module GroupD8 {
+
+        export var E: number;
+        export var SE: number;
+        export var S: number;
+        export var SW: number;
+        export var W: number;
+        export var NW: number;
+        export var N: number;
+        export var NE: number;
+        export var MIRROR_HORIZONTAL: number;
+        export var MIRROR_VERTICAL: number;
+
+        export function uX(ind: number): number;
+        export function uY(ind: number): number;
+        export function vX(ind: number): number;
+        export function vY(ind: number): number;
+        export function inv(rotation: number): number;
+        export function add(rotationSecond: number, rotationFirst: number): number;
+        export function sub(rotationSecond: number, rotationFirst: number): number;
+        export function rotate180(rotation: number): number;
+        export function isSwapWidthHeight(rotation: number): boolean;
+        export function byDirection(dx: number, dy: number): number;
+        export function matrixAppendRotationInv(matrix: Matrix, rotation: number, tx: number, ty: number): void;
 
     }
     export class Matrix {
@@ -337,6 +600,7 @@ declare namespace PIXI {
         ty: number;
 
         fromArray(array: number[]): void;
+        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
         toArray(transpose?: boolean, out?: number[]): number[];
         apply(pos: Point, newPos?: Point): Point;
         applyInverse(pos: Point, newPos?: Point): Point;
@@ -344,26 +608,53 @@ declare namespace PIXI {
         scale(x: number, y: number): Matrix;
         rotate(angle: number): Matrix;
         append(matrix: Matrix): Matrix;
+        setTransform(x: number, y: number, pivotX: number, pivotY: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number): PIXI.Matrix;
         prepend(matrix: Matrix): Matrix;
         invert(): Matrix;
         identity(): Matrix;
+        decompose(transform: TransformBase): TransformBase;
         clone(): Matrix;
         copy(matrix: Matrix): Matrix;
-        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
-        setTransform(a: number, b: number, c: number, d: number, sr: number, cr: number, cy: number, sy: number, nsx: number, cs: number): PIXI.Matrix;
 
         static IDENTITY: Matrix;
         static TEMP_MATRIX: Matrix;
 
     }
+    export class ObservablePoint {
 
-    export interface HitArea {
+        constructor(cb: Function, scope?: any, x?: number, y?: number);
+
+        x: number;
+        y: number;
+        cb: () => void;
+        scope: any;
+
+        set(x?: number, y?: number): void;
+        copy(point: Point | ObservablePoint): void;
+
+    }
+    export class Point {
+
+        constructor(x?: number, y?: number);
+
+        x: number;
+        y: number;
+
+        clone(): Point;
+        copy(p: Point): void;
+        equals(p: Point): boolean;
+        set(x?: number, y?: number): void;
+
+    }
+
+    export interface IShape {
+    }
+    export interface IHitArea extends IShape {
 
         contains(x: number, y: number): boolean;
 
     }
-
-    export class Circle implements HitArea {
+    export class Circle {
 
         constructor(x?: number, y?: number, radius?: number);
 
@@ -377,7 +668,7 @@ declare namespace PIXI {
         getBounds(): Rectangle;
 
     }
-    export class Ellipse implements HitArea {
+    export class Ellipse {
 
         constructor(x?: number, y?: number, width?: number, height?: number);
 
@@ -392,10 +683,9 @@ declare namespace PIXI {
         getBounds(): Rectangle;
 
     }
-    export class Polygon implements HitArea {
+    export class Polygon {
 
-        constructor(points: Point[]);
-        constructor(points: number[]);
+        constructor(points: Point[] | number[]);
         constructor(...points: Point[]);
         constructor(...points: number[]);
 
@@ -405,10 +695,10 @@ declare namespace PIXI {
 
         clone(): Polygon;
         contains(x: number, y: number): boolean;
-
+        close(): void;
 
     }
-    export class Rectangle implements HitArea {
+    export class Rectangle {
 
         constructor(x?: number, y?: number, width?: number, height?: number);
 
@@ -417,14 +707,22 @@ declare namespace PIXI {
         width: number;
         height: number;
         type: number;
+        left: number;
+        right: number;
+        top: number;
+        bottom: number;
 
         static EMPTY: Rectangle;
 
         clone(): Rectangle;
+        copy(rectangle: Rectangle): Rectangle;
         contains(x: number, y: number): boolean;
+        pad(paddingX: number, paddingY: number): void;
+        fit(rectangle: Rectangle): void;
+        enlarge(rect: Rectangle): void;
 
     }
-    export class RoundedRectangle implements HitArea {
+    export class RoundedRectangle {
 
         constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
 
@@ -435,96 +733,29 @@ declare namespace PIXI {
         radius: number;
         type: number;
 
-        static EMPTY: Rectangle;
-
-        clone(): Rectangle;
+        clone(): RoundedRectangle;
         contains(x: number, y: number): boolean;
 
     }
 
-    //particles
+    // renderers
 
-    export interface ParticleContainerProperties {
-
-        scale?: boolean;
-        position?: boolean;
-        rotation?: boolean;
-        uvs?: boolean;
-        alpha?: boolean;
-
-    }
-    export class ParticleContainer extends Container {
-
-        constructor(size?: number, properties?: ParticleContainerProperties, batchSize?: number);
-
-        protected _maxSize: number;
-        protected _batchSize: number;
-        protected _properties: boolean[];
-        protected _buffers: WebGLBuffer[];
-        protected _bufferToUpdate: number;
-
-        protected onChildrenChange: (smallestChildIndex?: number) => void;
-
-        interactiveChildren: boolean;
-        blendMode: number;
-        roundPixels: boolean;
-
-        setProperties(properties: ParticleContainerProperties): void;
-
-    }
-    export interface ParticleBuffer {
-
-        gl: WebGLRenderingContext;
-        vertSize: number;
-        vertByteSize: number;
-        size: number;
-        dynamicProperties: any[];
-        staticProperties: any[];
-
-        staticStride: number;
-        staticBuffer: any;
-        staticData: any;
-        dynamicStride: number;
-        dynamicBuffer: any;
-        dynamicData: any;
-
-        initBuffers(): void;
-        bind(): void;
-        destroy(): void;
-
-    }
-    export interface ParticleRenderer {
-
-    }
-    export interface ParticleShader {
-
-    }
-
-    //renderers
-
-    export interface RendererOptions {
+    export interface IRendererOptions {
 
         view?: HTMLCanvasElement;
         transparent?: boolean;
-        antialias?: boolean;
         autoResize?: boolean;
+        antialias?: boolean;
         resolution?: number;
-        clearBeforeRendering?: boolean;
-        preserveDrawingBuffer?: boolean;
-        forceFXAA?: boolean;
-        roundPixels?: boolean;
+        clearBeforeRender?: boolean;
         backgroundColor?: number;
+        roundPixels?: boolean;
+        context?: WebGLRenderingContext;
 
     }
-    export class SystemRenderer extends EventEmitter {
+    export class SystemRenderer extends utils.EventEmitter {
 
-        protected _backgroundColor: number;
-        protected _backgroundColorRgb: number[];
-        protected _backgroundColorString: string;
-        protected _tempDisplayObjectParent: any;
-        protected _lastObjectRendered: DisplayObject;
-
-        constructor(system: string, width?: number, height?: number, options?: RendererOptions);
+        constructor(system: string, width?: number, height?: number, options?: IRendererOptions);
 
         type: number;
         width: number;
@@ -533,82 +764,107 @@ declare namespace PIXI {
         resolution: number;
         transparent: boolean;
         autoResize: boolean;
-        blendModes: any; //todo?
+        blendModes: any; // todo?
         preserveDrawingBuffer: boolean;
         clearBeforeRender: boolean;
         roundPixels: boolean;
+        protected _backgroundColor: number;
+        protected _backgroundColorRgba: number[];
+        protected _backgroundColorString: string;
+        protected _tempDisplayObjectParent: Container;
+        protected _lastObjectRendered: DisplayObject;
         backgroundColor: number;
 
-        render(object: DisplayObject): void;
         resize(width: number, height: number): void;
+        generateTexture(displayObject: DisplayObject, scaleMode?: number, resolution?: number): RenderTexture;
+        render(...args: any[]): void;
         destroy(removeView?: boolean): void;
 
     }
     export class CanvasRenderer extends SystemRenderer {
 
-        protected renderDisplayObject(displayObject: DisplayObject, context: CanvasRenderingContext2D): void;
-        protected _mapBlendModes(): void;
+        // plugintarget mixin start
+        protected __plugins: any[];
+        plugins: any;
+        registerPlugin(pluginName: string, ctor: Function): void;
+        initPlugins(): void;
+        destroyPlugins(): void;
+        // plugintarget mixin end
 
-        constructor(width?: number, height?: number, options?: RendererOptions);
+        constructor(width?: number, height?: number, options?: IRendererOptions);
 
-        context: CanvasRenderingContext2D;
+        rootContext: CanvasRenderingContext2D;
+        rootResolution: number;
         refresh: boolean;
         maskManager: CanvasMaskManager;
-        roundPixels: boolean;
         smoothProperty: string;
 
-        render(object: DisplayObject): void;
+        render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void
+        setBlendMode(blendMode: number): void;
+        destroy(removeView?: boolean): void;
         resize(w: number, h: number): void;
 
-    }
-    export class CanvasBuffer {
-
-        protected clear(): void;
-
-        constructor(width: number, height: number);
-
-        canvas: HTMLCanvasElement;
-        context: CanvasRenderingContext2D;
-
-        width: number;
-        height: number;
-
-        resize(width: number, height: number): void;
-        destroy(): void;
-
-    }
-    export class CanvasGraphics {
-
-        static renderGraphicsMask(graphics: Graphics, context: CanvasRenderingContext2D): void;
-        static updateGraphicsTint(graphics: Graphics): void;
-
-        static renderGraphics(graphics: Graphics, context: CanvasRenderingContext2D): void;
+        on(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
+        on(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
+        on(event: string, fn: Function, context?: any): utils.EventEmitter;
+        once(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
+        once(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
+        once(event: string, fn: Function, context?: any): utils.EventEmitter;
+        off(event: string, fn: Function, context?: any): utils.EventEmitter;
 
     }
     export class CanvasMaskManager {
 
-        pushMask(maskData: any, renderer: WebGLRenderer | CanvasRenderer): void;
+        constructor(renderer: CanvasRenderer);
+
+        pushMask(maskData: any): void;
+        protected renderGraphicsShape(graphics: Graphics): void;
         popMask(renderer: WebGLRenderer | CanvasRenderer): void;
         destroy(): void;
 
     }
-    export class CanvasTinter {
+    export class CanvasRenderTarget {
 
-        static getTintedTexture(sprite: DisplayObject, color: number): HTMLCanvasElement;
-        static tintWithMultiply(texture: Texture, color: number, canvas: HTMLDivElement): void;
-        static tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        static tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        static roundColor(color: number): number;
-        static cacheStepsPerColorChannel: number;
-        static convertTintToImage: boolean;
-        static vanUseMultiply: boolean;
-        static tintMethod: Function;
+        constructor(width: number, height: number, resolution: number);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+        resolution: number;
+
+        width: number;
+        height: number;
+
+        clear(): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+
+    export interface IWebGLRendererOptions {
+
+        view?: HTMLCanvasElement;
+        transparent?: boolean;
+        autoResize?: boolean;
+        antialias?: boolean;
+        forceFXAA?: boolean;
+        resolution?: number;
+        clearBeforeRender?: boolean;
+        preserveDrawingBuffer?: boolean;
+        roundPixels?: boolean;
 
     }
     export class WebGLRenderer extends SystemRenderer {
 
-        protected _useFXAA: boolean;
-        protected _FXAAFilter: filters.FXAAFilter;
+        // plugintarget mixin start
+        protected __plugins: any[];
+        plugins: any;
+        registerPlugin(pluginName: string, ctor: Function): void;
+        initPlugins(): void;
+        destroyPlugins(): void;
+        // plugintarget mixin end
+
+        constructor(width?: number, height?: number, options?: IWebGLRendererOptions);
+
         protected _contextOptions: {
             alpha: boolean;
             antiAlias: boolean;
@@ -616,363 +872,510 @@ declare namespace PIXI {
             stencil: boolean;
             preseveDrawingBuffer: boolean;
         };
-        protected _renderTargetStack: RenderTarget[];
-
-        protected _initContext(): void;
-        protected _createContext(): void;
-        protected handleContextLost: (event: WebGLContextEvent) => void;
-        protected _mapGlModes(): void;
-        protected _managedTextures: Texture[];
-
-        constructor(width?: number, height?: number, options?: RendererOptions);
-
-        drawCount: number;
-        shaderManager: ShaderManager;
+        protected _backgroundColorRgba: number[];
         maskManager: MaskManager;
         stencilManager: StencilManager;
-        filterManager: FilterManager;
-        blendModeManager: BlendModeManager;
-        currentRenderTarget: RenderTarget;
+        emptyRenderer: ObjectRenderer;
         currentRenderer: ObjectRenderer;
+        gl: WebGLRenderingContext;
+        state: WebGLState;
+        renderingToScreen: boolean;
+        boundTextures: Texture[];
+        filterManager: FilterManager;
+        textureManager: TextureManager;
+        protected drawModes: any;
+        protected _activeShader: Shader;
+        protected _activeRenderTarget: RenderTarget;
+        protected _initContext(): void;
 
-        render(object: DisplayObject): void;
-        renderDisplayObject(displayObject: DisplayObject, renderTarget: RenderTarget, clear: boolean): void;
+        render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void
         setObjectRenderer(objectRenderer: ObjectRenderer): void;
-        setRenderTarget(renderTarget: RenderTarget): void;
-        updateTexture(texture: BaseTexture | Texture): BaseTexture | Texture;
-        destroyTexture(texture: BaseTexture | Texture, _skipRemove?: boolean): void;
+        flush(): void;
+        resize(width: number, height: number): void;
+        setBlendMode(blendMode: number): void;
+        clear(clearColor?: number): void;
+        setTransform(matrix: Matrix): void;
+        bindRenderTexture(renderTexture: RenderTexture, transform: Transform): WebGLRenderer;
+        bindRenderTarget(renderTarget: RenderTarget): WebGLRenderer;
+        bindShader(shader: Shader): WebGLRenderer;
+        bindTexture(texture: Texture, location: number, forceLocation?: boolean): WebGLRenderer;
+        unbindTexture(texture: Texture): WebGLRenderer;
+        protected createVao(): glCore.VertexArrayObject;
+        reset(): WebGLRenderer;
+        handleContextLost: (event: WebGLContextEvent) => void;
+        handleContextRestored: () => void;
+        destroy(removeView?: boolean): void;
+
+        on(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): utils.EventEmitter;
+        on(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
+        on(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
+        on(event: string, fn: Function, context?: any): utils.EventEmitter;
+        once(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): utils.EventEmitter;
+        once(event: "prerender", fn: () => void, context?: any): utils.EventEmitter;
+        once(event: "postrender", fn: () => void, context?: any): utils.EventEmitter;
+        once(event: string, fn: Function, context?: any): utils.EventEmitter;
+        off(event: string, fn: Function, context?: any): utils.EventEmitter;
 
     }
-    export class AbstractFilter {
+    export class WebGLState {
 
-        protected vertexSrc: string[];
-        protected fragmentSrc: string[];
+        constructor(gl: WebGLRenderingContext);
 
-        constructor(vertexSrc?: string | string[], fragmentSrc?: string | string[], uniforms?: any);
+        activeState: number[];
+        defaultState: number[];
+        stackIndex: number;
+        stack: number[];
+        gl: WebGLRenderingContext;
+        maxAttribs: number;
+        attribState: glCore.IAttribState;
+        nativeVaoExtension: any;
 
-        uniforms: any;
-
-        padding: number;
-
-        getShader(renderer: WebGLRenderer): Shader;
-        applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
-        syncUniform(uniform: WebGLUniformLocation): void;
+        push(): void;
+        pop(): void;
+        setState(state: number[]): void;
+        setBlend(value: number): void;
+        setBlendMode(value: number): void;
+        setDepthTest(value: number): void;
+        setCullFace(value: number): void;
+        setFrontFace(value: number): void;
+        resetAttributes(): void;
+        resetToDefault(): void;
 
     }
-    export class SpriteMaskFilter extends AbstractFilter {
-
-        constructor(sprite: Sprite);
-
-        maskSprite: Sprite;
-        maskMatrix: Matrix;
-
-        applyFilter(renderer: WebGLRenderbuffer, input: RenderTarget, output: RenderTarget): void;
-        map: Texture;
-        offset: Point;
-
-    }
-    export class BlendModeManager extends WebGLManager {
+    export class TextureManager {
 
         constructor(renderer: WebGLRenderer);
 
-        setBlendMode(blendMode: number): boolean;
-
-    }
-
-    export class FilterManager extends WebGLManager {
-
-        constructor(renderer: WebGLRenderer);
-
-        filterStack: any[];
         renderer: WebGLRenderer;
-        texturePool: any[];
+        gl: WebGLRenderingContext;
+        protected _managedTextures: WebGLTexture[];
 
-        onContextChange: () => void;
-        setFilterStack(filterStack: any[]): void;
-        pushFilter(target: RenderTarget, filters: any[]): void;
-        popFilter(): AbstractFilter;
-        getRenderTarget(clear?: boolean): RenderTarget;
-        protected returnRenderTarget(renderTarget: RenderTarget): void;
-        applyFilter(shader: Shader | AbstractFilter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
-        calculateMappedMatrix(filterArea: Rectangle, sprite: Sprite, outputMatrix?: Matrix): Matrix;
-        capFilterArea(filterArea: Rectangle): void;
+        bindTexture(): void;
+        getTexture(): WebGLTexture;
+        updateTexture(texture: BaseTexture | Texture): WebGLTexture;
+        destroyTexture(texture: BaseTexture, _skipRemove?: boolean): void;
+        removeAll(): void;
+        destroy(): void;
+
+    }
+    export class TextureGarbageCollector {
+
+        constructor(renderer: WebGLRenderer);
+
+        renderer: WebGLRenderer;
+        count: number;
+        checkCount: number;
+        maxIdle: number;
+        checkCountMax: number;
+        mode: number;
+
+        update(): void;
+        run(): void;
+        unload(): void;
+
+    }
+    export abstract class ObjectRenderer extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        start(): void;
+        stop(): void;
+        flush(): void;
+
+        render(...args: any[]): void;
+
+    }
+    export class Quad {
+
+        constructor(gl: WebGLRenderingContext);
+
+        gl: WebGLRenderingContext;
+        vertices: number[];
+        uvs: number[];
+        interleaved: number[];
+        indices: number[];
+        vertexBuffer: WebGLBuffer;
+        vao: glCore.VertexArrayObject;
+        initVao(shader: glCore.GLShader): void;
+        map(targetTextureFrame: Rectangle, destinationFrame: Rectangle): Quad;
+        draw(): Quad;
+        upload(): Quad;
+        destroy(): void;
+
+    }
+    export class RenderTarget {
+
+        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root?: boolean);
+
+        gl: WebGLRenderingContext;
+        frameBuffer: glCore.GLFramebuffer;
+        texture: Texture;
+        clearColor: number[];
+        size: Rectangle;
+        resolution: number;
+        projectionMatrix: Matrix;
+        transform: Matrix;
+        frame: Rectangle;
+        defaultFrame: Rectangle;
+        destinationFrame: Rectangle;
+        sourceFrame: Rectangle;
+        stencilBuffer: glCore.GLFramebuffer;
+        stencilMaskStack: Graphics[];
+        filterData: {
+            index: number,
+            stack: {
+                renderTarget: RenderTarget,
+                filter: any[];
+                bounds: Rectangle
+            }[]
+        };
+        scaleMode: number;
+        root: boolean;
+
+        clear(clearColor?: number[]): void;
+        attachStencilBuffer(): void;
+        setFrame(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
+        activate(): void;
+        calculateProjection(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
         resize(width: number, height: number): void;
         destroy(): void;
 
     }
 
-    export class MaskManager extends WebGLManager {
-
-        stencilStack: StencilMaskStack;
-        reverse: boolean;
-        count: number;
-        alphaMaskPool: any[];
-
-        pushMask(target: RenderTarget, maskData: any): void;
-        popMask(target: RenderTarget, maskData: any): void;
-        pushSpriteMask(target: RenderTarget, maskData: any): void;
-        popSpriteMask(): void;
-        pushStencilMask(target: RenderTarget, maskData: any): void;
-        popStencilMask(target: RenderTarget, maskData: any): void;
-
-    }
-    export class ShaderManager extends WebGLManager {
-
-        protected _currentId: number;
-        protected currentShader: Shader;
+    export class BlendModeManager extends WebGLManager {
 
         constructor(renderer: WebGLRenderer);
 
-        maxAttibs: number;
-        attribState: any[];
-        tempAttribState: any[];
-        stack: any[];
+        currentBlendMode: number;
 
-        setAttribs(attribs: any[]): void;
-        setShader(shader: Shader): boolean;
-        destroy(): void;
+        setBlendMode(blendMode: number): boolean;
 
     }
-    export class StencilManager extends WebGLManager {
+    export class FilterManager extends WebGLManager {
 
         constructor(renderer: WebGLRenderer);
 
-        setMaskStack(stencilMaskStack: StencilMaskStack): void;
-        pushStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        bindGraphics(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        popStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
-        destroy(): void;
-        pushMask(maskData: any[]): void;
-        popMask(maskData: any[]): void;
-
-    }
-    export class WebGLManager {
-
-        protected onContextChange: () => void;
-
-        constructor(renderer: WebGLRenderer);
-
-        renderer: WebGLRenderer;
-
-        destroy(): void;
-
-    }
-    export class Shader {
-
-        protected attributes: any;
-        protected textureCount: number;
-        protected uniforms: any;
-
-        protected _glCompile(type: any, src: any): Shader;
-
-        constructor(shaderManager: ShaderManager, vertexSrc: string, fragmentSrc: string, uniforms: any, attributes: any);
-
-        uuid: number;
         gl: WebGLRenderingContext;
-        shaderManager: ShaderManager;
-        program: WebGLProgram;
-        vertexSrc: string;
-        fragmentSrc: string;
+        quad: Quad;
+        stack: {
+            renderTarget: RenderTarget;
+            sourceFrame: Rectangle;
+            destinationFrame: Rectangle;
+            filters: Filter[];
+            target: any;
+            resolution: number;
+        }[];
+        stackIndex: number;
+        shaderCache: any;
+        filterData: any;
 
-        init(): void;
-        cacheUniformLocations(keys: string[]): void;
-        cacheAttributeLocations(keys: string[]): void;
-        compile(): WebGLProgram;
-        syncUniform(uniform: any): void;
-        syncUniforms(): void;
-        initSampler2D(uniform: any): void;
+        pushFilter(target: RenderTarget, filters: Filter[]): void;
+        popFilter(): void;
+        applyFilter(shader: glCore.GLShader | Filter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
+        syncUniforms(shader: glCore.GLShader, filter: Filter): void;
+        getRenderTarget(clear?: boolean, resolution?: number): RenderTarget;
+        returnRenderTarget(renderTarget: RenderTarget): RenderTarget;
+        calculateScreenSpaceMatrix(outputMatrix: Matrix): Matrix;
+        calculateNormalisedScreenSpaceMatrix(outputMatrix: Matrix): Matrix;
+        calculateSpriteMatrix(outputMatrix: Matrix, sprite: Sprite): Matrix;
         destroy(): void;
+        emptyPool(): void;
+        getPotRenderTarget(gl: WebGLRenderingContext, minWidth: number, minHeight: number, resolution: number): RenderTarget;
+        freePotRenderTarget(renderTarget: RenderTarget): void;
 
     }
-    export class ComplexPrimitiveShader extends Shader {
-
-        constructor(shaderManager: ShaderManager);
-
-    }
-    export class PrimitiveShader extends Shader {
-
-        constructor(shaderManager: ShaderManager);
-
-    }
-    export class TextureShader extends Shader {
-
-        constructor(shaderManager: ShaderManager, vertexSrc?: string, fragmentSrc?: string, customUniforms?: any, customAttributes?: any);
-
-    }
-    export interface StencilMaskStack {
+    export class StencilMaskStack {
 
         stencilStack: any[];
         reverse: boolean;
         count: number;
 
     }
-    export class ObjectRenderer extends WebGLManager {
+    export class MaskManager extends WebGLManager {
 
-        start(): void;
-        stop(): void;
-        flush(): void;
-        render(object?: any): void;
+        scissor: boolean;
+        scissorData: any;
+        scissorRenderTarget: RenderTarget;
+        enableScissor: boolean;
+        alphaMaskPool: number[];
+        alphaMaskIndex: number;
+        pushMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        popMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        pushSpriteMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        popSpriteMask(): void;
+        pushStencilMask(maskData: Sprite | Graphics): void;
+        popStencilMask(): void;
+        pushScissorMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        popScissorMask(): void;
 
     }
-    export class RenderTarget {
+    export class StencilManager extends WebGLManager {
 
-        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root: boolean);
+        constructor(renderer: WebGLRenderer);
 
-        gl: WebGLRenderingContext;
-        frameBuffer: WebGLFramebuffer;
-        texture: Texture;
-        size: Rectangle;
+        stencilMaskStack: Graphics[];
+
+        setMaskStack(stencilMasStack: Graphics[]): void;
+        pushStencil(graphics: Graphics): void;
+        popStencil(): void;
+        destroy(): void;
+
+    }
+    export class WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        renderer: WebGLRenderer;
+        onContextChange: () => void;
+        destroy(): void;
+
+    }
+    export interface IUniformData {
+
+        type: string;
+        value: any;
+
+        // name is set by pixi if uniforms were automatically extracted from shader code, but not used anywhere
+        name?: string;
+
+    }
+    export class Filter {
+
+        // param uniforms should be an object matching type {[name: string]: IUniformData};
+        // left untyped as there's no way to define the type without requiring an index signature or making this class generic
+        constructor(vertexSrc?: string, fragmentSrc?: string, uniforms?: any);
+
+        vertextSrc: string;
+        fragmentSrc: string;
+        protected uniformData: { [name: string]: IUniformData };
+        uniforms: { [name: string]: any };
+        glShaders: any;
+        glShaderKey: string;
+        padding: number;
         resolution: number;
-        projectionMatrix: Matrix;
-        transform: Matrix;
-        frame: Rectangle;
-        stencilBuffer: WebGLRenderbuffer;
-        stencilMaskStack: StencilMaskStack;
-        filterStack: any[];
-        scaleMode: number;
-        root: boolean;
+        blendMode: number;
+        enabled: boolean;
+        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
 
-        clear(bind?: boolean): void;
-        attachStencilBuffer(): void;
-        activate(): void;
-        calculateProjection(protectionFrame: Matrix): void;
-        resize(width: number, height: number): void;
-        destroy(): void;
+        static defaultVertexSrc: string;
+        static defaultFragmentSrc: string;
 
     }
-    export interface Quad {
+    export class SpriteMaskFilter extends Filter {
 
-        gl: WebGLRenderingContext;
-        vertices: number[];
-        uvs: number[];
-        colors: number[];
-        indices: number[];
-        vertexBuffer: WebGLBuffer;
-        indexBuffer: WebGLBuffer;
+        constructor(sprite: Sprite);
 
-        map(rect: Rectangle, rect2: Rectangle): void;
-        upload(): void;
-        destroy(): void;
+        maskSprite: Sprite;
+        maskMatrix: Matrix;
+        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget): void;
 
     }
 
-    //sprites
+    // sprites
 
     export class Sprite extends Container {
 
-        static fromFrame(frameId: string): Sprite;
-        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+        constructor(texture?: Texture);
 
+        protected _anchor: ObservablePoint;
+        anchor: ObservablePoint;
         protected _texture: Texture;
         protected _width: number;
         protected _height: number;
-        protected cachedTint: number;
-
-        protected _onTextureUpdate(): void;
-
-        constructor(texture?: Texture);
-
-        anchor: Point;
         tint: number;
+        protected _tint: number;
+        protected _tintRGB: number;
         blendMode: number;
-        shader: Shader | AbstractFilter;
+        shader: glCore.GLShader | Filter;
+        protected cachedTint: number;
         texture: Texture;
-
+        protected textureDirty: boolean;
+        protected _textureID: number;
+        protected _transformID: number;
+        protected vertexTrimmedData: Float32Array;
+        vertexData: Float32Array;
         width: number;
         height: number;
 
-        getBounds(matrix?: Matrix): Rectangle;
+        protected _onTextureUpdate(): void;
+        calculateVertices(): void;
+        protected _calculateBounds(): void;
+        protected calculateTrimmedVertices(): void;
+        protected onAnchorUpdate(): void;
+        protected _renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
         getLocalBounds(): Rectangle;
         containsPoint(point: Point): boolean;
-        destroy(destroyTexture?: boolean, destroyBaseTexture?: boolean): void;
+        destroy(options?: IDestroyOptions | boolean): void;
+
+        static from(source: number | string | BaseTexture | HTMLCanvasElement | HTMLVideoElement): Sprite;
+        static fromFrame(frameId: string): Sprite;
+        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+
+    }
+    export class BatchBuffer {
+
+        vertices: ArrayBuffer;
+        float32View: number[];
+        uint32View: number[];
+
+        destroy(): void;
 
     }
     export class SpriteRenderer extends ObjectRenderer {
 
-        protected renderBatch(texture: Texture, size: number, startIndex: number): void;
+        constructor(renderer: PIXI.WebGLRenderer);
 
         vertSize: number;
         vertByteSize: number;
         size: number;
-        vertices: number[];
-        positions: number[];
-        colors: number[];
+        buffers: BatchBuffer[];
         indices: number[];
-        currentBatchSize: number;
+        shaders: Shader[];
+        currentIndex: number;
+        tick: number;
+        groups: any[];
         sprites: Sprite[];
-        shader: Shader | AbstractFilter;
+        vertexBuffers: number[];
+        vaos: glCore.VertexArrayObject[];
+        vaoMax: number;
+        vertexCount: number;
 
+        protected onContextChanged: () => void;
+        protected onPrerender: () => void;
         render(sprite: Sprite): void;
         flush(): void;
         start(): void;
+        stop(): void;
         destroy(): void;
 
     }
+    export class CanvasSpriteRenderer extends ObjectRenderer {
 
-    //text
+        constructor(renderer: WebGLRenderer);
 
-    export interface TextStyle {
+        render(sprite: Sprite): void;
+        destroy(): void;
+
+    }
+    export module CanvasTinter {
+
+        export function getTintedTexture(sprite: Sprite, color: number): HTMLCanvasElement;
+        export function tintWithMultiply(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        export function tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        export function tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        export function roundColor(color: number): number;
+
+        export var cacheStepsPerColorChannel: number;
+        export var convertTintToImage: boolean;
+        export var canUseMultiply: boolean;
+        export var tintMethod: Function;
+
+    }
+
+    // text
+
+    export class TextStyle {
 
-        font?: string;
-        fill?: string | number;
         align?: string;
-        stroke?: string | number;
-        strokeThickness?: number;
-        wordWrap?: boolean;
-        wordWrapWidth?: number;
-        lineHeight?: number;
+        breakWords?: boolean;
         dropShadow?: boolean;
-        dropShadowColor?: string | number;
         dropShadowAngle?: number;
+        dropShadowBlur?: number;
+        dropShadowColor?: string | number;
         dropShadowDistance?: number;
-        padding?: number;
-        textBaseline?: string;
+        fill?: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
+        fillGradientType?: number;
+        fontFamily?: string;
+        fontSize?: number | string;
+        fontStyle?: string;
+        fontVariant?: string;
+        fontWeight?: string;
+        letterSpacing?: number;
+        lineHeight?: number;
         lineJoin?: string;
         miterLimit?: number;
+        padding?: number;
+        stroke?: string | number;
+        strokeThickness?: number;
+        styleID?: number;
+        textBaseline?: string;
+        wordWrap?: boolean;
+        wordWrapWidth?: number;
 
     }
     export class Text extends Sprite {
 
+        static getFontStyle(style: TextStyle): string;
+        static calculateFontProperties(style: string): any;
+
+        constructor(text?: string, style?: TextStyle);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+        resolution: number;
+        protected _text: string;
+        protected _style: TextStyle;
+        protected _styleListener: Function;
+        protected _font: string;
+        protected localStyleID: number;
+
         static fontPropertiesCache: any;
         static fontPropertiesCanvas: HTMLCanvasElement;
         static fontPropertiesContext: CanvasRenderingContext2D;
 
-        protected _text: string;
-        protected _style: TextStyle;
-
-        protected updateText(): void;
-        protected updateTexture(): void;
-        protected determineFontProperties(fontStyle: TextStyle): TextStyle;
-        protected wordWrap(text: string): boolean;
-
-        constructor(text?: string, style?: TextStyle, resolution?: number);
-
-        canvas: HTMLCanvasElement;
-        context: CanvasRenderingContext2D;
-        dirty: boolean;
-        resolution: number;
-        text: string;
-        style: TextStyle;
-
         width: number;
         height: number;
+        style: TextStyle;
+        text: string;
+
+        protected updateText(respectDirty?: boolean): void;
+        protected drawLetterSpacing(text: string, x: number, y: number, isStroke?: boolean): void;
+        protected updateTexture(): void;
+        renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+        protected wordWrap(text: string): string;
+        protected _calculateBounds(): void;
+        protected _onStyleChange: () => void;
+        protected _generateFillStyle(style: string | number | CanvasGradient, lines: number): string | number | CanvasGradient;
+        destroy(options?: IDestroyOptions | boolean): void;
+        dirty: boolean;
 
     }
 
-    //textures
+    // textures
 
-    export class BaseTexture extends EventEmitter {
+    export class BaseRenderTexture extends BaseTexture {
 
-        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number): BaseTexture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
+        constructor(width?: number, height?: number, scaleMode?: number, resolution?: number);
 
-        protected _glTextures: any;
+        height: number;
+        width: number;
+        realHeight: number;
+        realWidth: number;
+        resolution: number;
+        scaleMode: number;
+        hasLoaded: boolean;
+        protected _glRenderTargets: { [n: number]: WebGLTexture; };
+        protected _canvasRenderTarget: { [n: number]: WebGLTexture; };
+        valid: boolean;
 
-        protected _sourceLoaded(): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
 
-        constructor(source: HTMLImageElement | HTMLCanvasElement, scaleMode?: number, resolution?: number);
+        once(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): utils.EventEmitter;
+        once(event: string, fn: Function, context?: any): utils.EventEmitter;
+        on(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): utils.EventEmitter;
+        on(event: string, fn: Function, context?: any): utils.EventEmitter;
+        off(event: string, fn: Function, context?: any): utils.EventEmitter;
 
-        uuid: number;
+    }
+    export class BaseTexture extends utils.EventEmitter {
+
+        constructor(source?: HTMLImageElement | HTMLCanvasElement, scaleMode?: number, resolution?: number);
+
+        protected uuid: number;
+        protected touched: number;
         resolution: number;
         width: number;
         height: number;
@@ -981,90 +1384,104 @@ declare namespace PIXI {
         scaleMode: number;
         hasLoaded: boolean;
         isLoading: boolean;
-        source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
+        wrapMode: number;
+        source: HTMLImageElement | HTMLCanvasElement;
+        origSource: HTMLImageElement;
+        imageType: string;
+        sourceScale: number;
         premultipliedAlpha: boolean;
         imageUrl: string;
-        isPowerOfTwo: boolean;
+        protected isPowerOfTwo: boolean;
         mipmap: boolean;
+        wrap: boolean;
+        protected _glTextures: any;
+        protected _enabled: number;
+        protected _id: number;
 
         update(): void;
+        protected _updateImageType(): void;
+        protected _loadSvgSource(): void;
+        protected _loadSvgSourceUsingDataUri(dataUri: string): void;
+        protected _loadSvgSourceUsingXhr(): void;
+        protected _loadSvgSourceUsingString(svgString: string): void;
         loadSource(source: HTMLImageElement | HTMLCanvasElement): void;
+        protected _sourceLoaded(): void;
         destroy(): void;
         dispose(): void;
         updateSourceImage(newSrc: string): void;
 
-        on(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        on(event: string, fn: Function, context?: any): EventEmitter;
+        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number, sourceScale?: number): BaseTexture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
 
-        once(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
-        once(event: string, fn: Function, context?: any): EventEmitter;
+        on(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        on(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        on(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        on(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        on(event: string, fn: Function, context?: any): utils.EventEmitter;
+        once(event: "update", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        once(event: "loaded", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        once(event: "error", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        once(event: "dispose", fn: (baseTexture: BaseTexture) => void, context?: any): utils.EventEmitter;
+        once(event: string, fn: Function, context?: any): utils.EventEmitter;
+        off(event: string, fn: Function, context?: any): utils.EventEmitter;
 
     }
     export class RenderTexture extends Texture {
 
-        protected renderWebGL(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-        protected renderCanvas(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
+        constructor(baseRenderTexture: BaseRenderTexture, frame?: Rectangle);
 
-        constructor(renderer: CanvasRenderer | WebGLRenderer, width?: number, height?: number, scaleMode?: number, resolution?: number);
-
-        width: number;
-        height: number;
-        resolution: number;
-        renderer: CanvasRenderer | WebGLRenderer;
+        protected legacyRenderer: any;
         valid: boolean;
 
-        render(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
-        resize(width: number, height: number, updateBase?: boolean): void;
-        clear(): void;
-        destroy(): void;
-        getImage(): HTMLImageElement;
-        getPixels(): number[];
-        getPixel(x: number, y: number): number[];
-        getBase64(): string;
-        getCanvas(): HTMLCanvasElement;
+        resize(width: number, height: number, doNotResizeBaseTexture?: boolean): void;
+
+        static create(width?: number, height?: number, scaleMode?: number, resolution?: number): RenderTexture;
 
     }
-    export class Texture extends BaseTexture {
+    export class Texture extends utils.EventEmitter {
 
-        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number): Texture;
+        constructor(baseTexture: BaseTexture, frame?: Rectangle, orig?: Rectangle, trim?: Rectangle, rotate?: number);
+
+        noFrame: boolean;
+        baseTexture: BaseTexture;
+        protected _frame: Rectangle;
+        trim: Rectangle;
+        valid: boolean;
+        requiresUpdate: boolean;
+        protected _uvs: TextureUvs;
+        orig: Rectangle;
+        protected _updateID: number;
+        transform: any;
+
+        update(): void;
+        protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
+        protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
+        destroy(destroyBase?: boolean): void;
+        clone(): Texture;
+        protected _updateUvs(): void;
+
+        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number, sourceScale?: number): Texture;
         static fromFrame(frameId: string): Texture;
         static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
         static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
         static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
+        static from(source: number | string | BaseTexture | HTMLCanvasElement | HTMLVideoElement): Texture;
         static addTextureToCache(texture: Texture, id: string): void;
         static removeTextureFromCache(id: string): Texture;
-        static EMPTY: Texture;
-
-        protected _frame: Rectangle;
-        protected _uvs: TextureUvs;
-
-        protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
-        protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
-        protected _updateUvs(): void;
-
-        constructor(baseTexture: BaseTexture, frame?: Rectangle, crop?: Rectangle, trim?: Rectangle, rotate?: boolean);
-
-        noFrame: boolean;
-        baseTexture: BaseTexture;
-        trim: Rectangle;
-        valid: boolean;
-        requiresUpdate: boolean;
-        width: number;
-        height: number;
-        crop: Rectangle;
-        rotate: boolean;
 
         frame: Rectangle;
+        protected _rotate: boolean;
+        rotate: number;
+        width: number;
+        height: number;
 
-        update(): void;
-        destroy(destroyBase?: boolean): void;
-        clone(): Texture;
+        static EMPTY: Texture;
+
+        on(event: "update", fn: (texture: Texture) => void, context?: any): utils.EventEmitter;
+        on(event: string, fn: Function, context?: any): utils.EventEmitter;
+        once(event: "update", fn: (texture: Texture) => void, context?: any): utils.EventEmitter;
+        once(event: string, fn: Function, context?: any): utils.EventEmitter;
+        off(event: string, fn: Function, context?: any): utils.EventEmitter;
 
     }
     export class TextureUvs {
@@ -1078,645 +1495,43 @@ declare namespace PIXI {
         x3: number;
         y3: number;
 
-        set(frame: Rectangle, baseFrame: Rectangle, rotate: boolean): void;
+        uvsUint32: Uint32Array;
+
+        protected set(frame: Rectangle, baseFrame: Rectangle, rotate: number): void;
 
     }
     export class VideoBaseTexture extends BaseTexture {
 
-        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
-        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
-
-        protected _loaded: boolean;
-        protected _onUpdate(): void;
-        protected _onPlayStart(): void;
-        protected _onPlayStop(): void;
-        protected _onCanPlay(): void;
-
         constructor(source: HTMLVideoElement, scaleMode?: number);
 
         autoUpdate: boolean;
+        autoPlay: boolean;
+        protected _isAutoUpdating: boolean;
 
+        update(): void;
+        protected _onCanPlay(): void;
+        protected _onPlayStart(): void;
+        protected _onPlayStop(): void;
         destroy(): void;
+        protected _isSourcePlaying(): boolean;
+        protected _isSourceReady(): boolean;
+
+        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
+        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
+        static fromUrls(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
 
     }
 
-    //utils
+    // ticker
 
-    export class utils {
-
-        static uuid(): number;
-        static hex2rgb(hex: number, out?: number[]): number[];
-        static hex2string(hex: number): string;
-        static rgb2hex(rgb: Number[]): number;
-        static canUseNewCanvasBlendModel(): boolean;
-        static getNextPowerOfTwo(number: number): number;
-        static isPowerOfTwo(width: number, height: number): boolean;
-        static getResolutionOfUrl(url: string): number;
-        static sayHello(type: string): void;
-        static isWebGLSupported(): boolean;
-        static sign(n: number): number;
-        static TextureCache: any;
-        static BaseTextureCache: any;
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////EXTRAS////////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export module extras {
-
-        export interface BitmapTextStyle {
-
-            font?: string | {
-
-                name?: string;
-                size?: number;
-
-            };
-            align?: string;
-            tint?: number;
-
-        }
-        export class BitmapText extends Container {
-
-            static fonts: any;
-
-            protected _glyphs: Sprite[];
-            protected _font: string | {
-                tint: number;
-                align: string;
-                name: string;
-                size: number;
-            };
-            protected _text: string;
-
-            protected updateText(): void;
-
-            constructor(text: string, style?: BitmapTextStyle);
-
-            textWidth: number;
-            textHeight: number;
-            maxWidth: number;
-            maxLineHeight: number;
-            dirty: boolean;
-
-            tint: number;
-            align: string;
-            font: string | {
-                tint: number;
-                align: string;
-                name: string;
-                size: number;
-            };
-            text: string;
-
-        }
-        export class MovieClip extends Sprite {
-
-            static fromFrames(frame: string[]): MovieClip;
-            static fromImages(images: string[]): MovieClip;
-
-            protected _textures: Texture[];
-            protected _durations: number[];
-            protected _currentTime: number;
-
-            protected update(deltaTime: number): void;
-
-            constructor(textures: Texture[]);
-
-            animationSpeed: number;
-            loop: boolean;
-            onComplete: () => void;
-            currentFrame: number;
-            playing: boolean;
-
-            totalFrames: number;
-            textures: Texture[];
-
-            stop(): void;
-            play(): void;
-            gotoAndStop(frameName: number): void;
-            gotoAndPlay(frameName: number): void;
-            destroy(): void;
-
-        }
-        export class TilingSprite extends Sprite {
-
-            //This is really unclean but is the only way :(
-            //See http://stackoverflow.com/questions/29593905/typescript-declaration-extending-class-with-static-method/29595798#29595798
-            //Thanks bas!
-            static fromFrame(frameId: string): Sprite;
-            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
-
-            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
-            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
-
-            protected _tileScaleOffset: Point;
-            protected _tilingTexture: boolean;
-            protected _refreshTexture: boolean;
-            protected _uvs: TextureUvs[];
-
-            constructor(texture: Texture, width: number, height: number);
-
-            tileScale: Point;
-            tilePosition: Point;
-
-            width: number;
-            height: number;
-            originalTexture: Texture;
-
-            getBounds(): Rectangle;
-            generateTilingTexture(renderer: WebGLRenderer | CanvasRenderer, texture: Texture, forcePowerOfTwo?: boolean): Texture;
-            containsPoint(point: Point): boolean;
-            destroy(): void;
-
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////FILTERS////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    namespace filters {
-
-        export class AsciiFilter extends AbstractFilter {
-            size: number;
-        }
-        export class BloomFilter extends AbstractFilter {
-
-            blur: number;
-            blurX: number;
-            blurY: number;
-
-        }
-        export class BlurFilter extends AbstractFilter {
-
-            protected blurXFilter: BlurXFilter;
-            protected blurYFilter: BlurYFilter;
-
-            blur: number;
-            passes: number;
-            blurX: number;
-            blurY: number;
-
-        }
-        export class BlurXFilter extends AbstractFilter {
-
-            passes: number;
-            strength: number;
-            blur: number;
-
-        }
-        export class BlurYFilter extends AbstractFilter {
-
-            passes: number;
-            strength: number;
-            blur: number;
-
-        }
-        export class SmartBlurFilter extends AbstractFilter {
-
-        }
-        export class ColorMatrixFilter extends AbstractFilter {
-
-            protected _loadMatrix(matrix: number[], multiply: boolean): void;
-            protected _multiply(out: number[], a: number[], b: number[]): void;
-            protected _colorMatrix(matrix: number[]): void;
-
-            matrix: number[];
-
-            brightness(b: number, multiply?: boolean): void;
-            greyscale(scale: number, multiply?: boolean): void;
-            blackAndWhite(multiply?: boolean): void;
-            hue(rotation: number, multiply?: boolean): void;
-            contrast(amount: number, multiply?: boolean): void;
-            saturate(amount: number, multiply?: boolean): void;
-            desaturate(multiply?: boolean): void;
-            negative(multiply?: boolean): void;
-            sepia(multiply?: boolean): void;
-            technicolor(multiply?: boolean): void;
-            polaroid(multiply?: boolean): void;
-            toBGR(multiply?: boolean): void;
-            kodachrome(multiply?: boolean): void;
-            browni(multiply?: boolean): void;
-            vintage(multiply?: boolean): void;
-            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
-            night(intensity: number, multiply?: boolean): void;
-            predator(amount: number, multiply?: boolean): void;
-            lsd(multiply?: boolean): void;
-            reset(): void;
-
-        }
-        export class ColorStepFilter extends AbstractFilter {
-
-            step: number;
-
-        }
-        export class ConvolutionFilter extends AbstractFilter {
-
-            constructor(matrix: number[], width: number, height: number);
-
-            matrix: number[];
-            width: number;
-            height: number;
-
-        }
-        export class CrossHatchFilter extends AbstractFilter {
-
-        }
-        export class DisplacementFilter extends AbstractFilter {
-
-            constructor(sprite: Sprite, scale?: number);
-
-            map: Texture;
-
-            scale: Point;
-
-        }
-        export class DotScreenFilter extends AbstractFilter {
-
-            scale: number;
-            angle: number;
-
-        }
-        export class BlurYTintFilter extends AbstractFilter {
-
-            blur: number;
-
-        }
-        export class DropShadowFilter extends AbstractFilter {
-
-            blur: number;
-            blurX: number;
-            blurY: number;
-            color: number;
-            alpha: number;
-            distance: number;
-            angle: number;
-
-        }
-        export class GrayFilter extends AbstractFilter {
-
-            gray: number;
-
-        }
-        export class InvertFilter extends AbstractFilter {
-
-            invert: number;
-
-        }
-        export class NoiseFilter extends AbstractFilter {
-
-            noise: number;
-
-        }
-        export class PixelateFilter extends AbstractFilter {
-
-            size: Point;
-
-        }
-        export class RGBSplitFilter extends AbstractFilter {
-
-            red: number;
-            green: number;
-            blue: number;
-
-        }
-        export class SepiaFilter extends AbstractFilter {
-
-            sepia: number;
-
-        }
-        export class ShockwaveFilter extends AbstractFilter {
-
-            center: number[];
-            params: any;
-            time: number;
-
-        }
-        export class TiltShiftAxisFilter extends AbstractFilter {
-
-            blur: number;
-            gradientBlur: number;
-            start: number;
-            end: number;
-
-            updateDelta(): void;
-
-        }
-        export class TiltShiftFilter extends AbstractFilter {
-
-            blur: number;
-            gradientBlur: number;
-            start: number;
-            end: number;
-
-        }
-        export class TiltShiftXFilter extends AbstractFilter {
-
-            updateDelta(): void;
-
-        }
-        export class TiltShiftYFilter extends AbstractFilter {
-
-            updateDelta(): void;
-
-        }
-        export class TwistFilter extends AbstractFilter {
-
-            offset: Point;
-            radius: number;
-            angle: number;
-
-        }
-        export class FXAAFilter extends AbstractFilter {
-
-            applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget): void;
-
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ////////////////////////////INTERACTION///////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export module interaction {
-
-        export interface InteractionEvent {
-
-            stopped: boolean;
-            target: any;
-            type: string;
-            data: InteractionData;
-            stopPropagation(): void;
-
-        }
-
-        export class InteractionData {
-
-            global: Point;
-            target: DisplayObject;
-            originalEvent: Event;
-            identifier: number;
-
-            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
-
-        }
-
-        export class InteractionManager {
-
-            protected interactionDOMElement: HTMLElement;
-            protected eventsAdded: boolean;
-            protected _tempPoint: Point;
-
-            protected setTargetElement(element: HTMLElement, resolution: number): void;
-            protected addEvents(): void;
-            protected removeEvents(): void;
-            protected dispatchEvent(displayObject: DisplayObject, eventString: string, eventData: any): void;
-            protected onMouseDown: (event: Event) => void;
-            protected processMouseDown: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseUp: (event: Event) => void;
-            protected processMouseUp: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseMove: (event: Event) => void;
-            protected processMouseMove: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onMouseOut: (event: Event) => void;
-            protected processMouseOverOut: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchStart: (event: Event) => void;
-            protected processTouchStart: (DisplayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchEnd: (event: Event) => void;
-            protected processTouchEnd: (displayObject: DisplayObject, hit: boolean) => void;
-            protected onTouchMove: (event: Event) => void;
-            protected processTouchMove: (displayObject: DisplayObject, hit: boolean) => void;
-            protected getTouchData(touchEvent: InteractionData): InteractionData;
-            protected returnTouchData(touchData: InteractionData): void;
-
-            constructor(renderer: CanvasRenderer | WebGLRenderer, options?: { autoPreventDefault?: boolean; interactionFrequence?: number; });
-
-            renderer: CanvasRenderer | WebGLRenderer;
-            autoPreventDefault: boolean;
-            interactionFrequency: number;
-            mouse: InteractionData;
-            eventData: {
-                stopped: boolean;
-                target: any;
-                type: any;
-                data: InteractionData;
-            };
-            interactiveDataPool: InteractionData[];
-            last: number;
-            currentCursorStyle: string;
-            resolution: number;
-            update(deltaTime: number): void;
-
-            mapPositionToPoint(point: Point, x: number, y: number): void;
-            processInteractive(point: Point, displayObject: DisplayObject, func: (displayObject: DisplayObject, hit: boolean) => void, hitTest: boolean, interactive: boolean): boolean;
-            destroy(): void;
-
-        }
-
-        export interface InteractiveTarget {
-
-            interactive: boolean;
-            buttonMode: boolean;
-            interactiveChildren: boolean;
-            defaultCursor: string;
-            hitArea: HitArea;
-
-        }
-
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////LOADER/////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-    //https://github.com/englercj/resource-loader/blob/master/src/Loader.js
-
-    export module loaders {
-        export interface LoaderOptions {
-
-            crossOrigin?: boolean;
-            loadType?: number;
-            xhrType?: string;
-
-        }
-        export interface ResourceDictionary {
-
-            [index: string]: PIXI.loaders.Resource;
-        }
-        export class Loader extends EventEmitter {
-
-            constructor(baseUrl?: string, concurrency?: number);
-
-            baseUrl: string;
-            progress: number;
-            loading: boolean;
-            resources: ResourceDictionary;
-
-            add(name: string, url: string, options?: LoaderOptions, cb?: () => void): Loader;
-            add(url: string, options?: LoaderOptions, cb?: () => void): Loader;
-            //todo I am not sure of object literal notional (or its options) so just allowing any but would love to improve this
-            add(obj: any, options?: LoaderOptions, cb?: () => void): Loader;
-
-            on(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
-            on(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            on(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
-            on(event: string, fn: Function, context?: any): EventEmitter;
-
-            once(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
-            once(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
-            once(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
-            once(event: string, fn: Function, context?: any): EventEmitter;
-
-            before(fn: Function): Loader;
-            pre(fn: Function): Loader;
-
-            after(fn: Function): Loader;
-            use(fn: Function): Loader;
-
-            reset(): void;
-
-            load(cb?: (loader: loaders.Loader, object: any) => void): Loader;
-
-        }
-        export class Resource extends EventEmitter {
-
-            static LOAD_TYPE: {
-                XHR: number;
-                IMAGE: number;
-                AUDIO: number;
-                VIDEO: number;
-            };
-
-            static XHR_READ_STATE: {
-                UNSENT: number;
-                OPENED: number;
-                HEADERS_RECIEVED: number;
-                LOADING: number;
-                DONE: number;
-            };
-
-            static XHR_RESPONSE_TYPE: {
-                DEFAULT: number;
-                BUFFER: number;
-                BLOB: number;
-                DOCUMENT: number;
-                JSON: number;
-                TEXT: number;
-            };
-
-            constructor(name?: string, url?: string | string[], options?: LoaderOptions);
-
-            name: string;
-            texture: Texture;
-			textures: Texture[];
-            url: string;
-            data: any;
-            crossOrigin: string;
-            loadType: number;
-            xhrType: string;
-            error: Error;
-            xhr: XMLHttpRequest;
-
-            complete(): void;
-            load(cb?: () => void): void;
-
-        }
-    }
-
-    //////////////////////////////////////////////////////////////////////////////
-    ///////////////////////////////MESH///////////////////////////////////////////
-    //////////////////////////////////////////////////////////////////////////////
-
-    export module mesh {
-
-        export class Mesh extends Container {
-
-            static DRAW_MODES: {
-                TRIANGLE_MESH: number;
-                TRIANGLES: number;
-            };
-
-            constructor(texture: Texture, vertices?: number[], uvs?: number[], indices?: number[], drawMode?: number);
-
-            texture: Texture;
-            uvs: number[];
-            vertices: number[];
-            indices: number[];
-            dirty: boolean;
-            blendMode: number;
-            canvasPadding: number;
-            drawMode: number;
-            shader: Shader | AbstractFilter;
-
-            getBounds(matrix?: Matrix): Rectangle;
-            containsPoint(point: Point): boolean;
-
-            protected _texture: Texture;
-
-            protected _renderCanvasTriangleMesh(context: CanvasRenderingContext2D): void;
-            protected _renderCanvasTriangles(context: CanvasRenderingContext2D): void;
-            protected _renderCanvasDrawTriangle(context: CanvasRenderingContext2D, vertices: number, uvs: number, index0: number, index1: number, index2: number): void;
-            protected renderMeshFlat(Mesh: Mesh): void;
-            protected _onTextureUpdate(): void;
-
-        }
-        export class Rope extends Mesh {
-
-            protected _ready: boolean;
-
-            protected getTextureUvs(): TextureUvs;
-
-            constructor(texture: Texture, points: Point[]);
-
-            points: Point[];
-            colors: number[];
-
-            refresh(): void;
-
-        }
-        export class Plane extends Mesh {
-
-            segmentsX: number;
-            segmentsY: number;
-
-            constructor(texture: Texture, segmentsX?: number, segmentsY?: number);
-
-        }
-
-
-        export class MeshRenderer extends ObjectRenderer {
-
-            protected _initWebGL(mesh: Mesh): void;
-
-            indices: number[];
-
-            constructor(renderer: WebGLRenderer);
-
-            render(mesh: Mesh): void;
-            flush(): void;
-            start(): void;
-            destroy(): void;
-
-        }
-
-        export interface MeshShader extends Shader { }
-
-    }
-
-    namespace ticker {
+    module ticker {
 
         export var shared: Ticker;
 
         export class Ticker {
 
             protected _tick(time: number): void;
-            protected _emitter: EventEmitter;
+            protected _emitter: utils.EventEmitter;
             protected _requestId: number;
             protected _maxElapsedMS: number;
 
@@ -1744,4 +1559,1078 @@ declare namespace PIXI {
         }
 
     }
-}
\ No newline at end of file
+
+    // shader
+
+    export class Shader extends glCore.GLShader { }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////EXTRACT///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module extract {
+
+        export class CanvasExtract {
+
+            protected renderer: CanvasRenderer;
+
+            constructor(renderer: CanvasRenderer);
+
+            image(target?: DisplayObject | RenderTexture): HTMLImageElement;
+            base64(target?: DisplayObject | RenderTexture): string;
+            canvas(target?: DisplayObject | RenderTexture): HTMLCanvasElement;
+            pixels(renderTexture?: DisplayObject | RenderTexture): number[];
+
+            destroy(): void;
+
+        }
+        export class WebGLExtract {
+            protected renderer: CanvasRenderer;
+
+            constructor(renderer: CanvasRenderer);
+
+            image(target?: DisplayObject | RenderTexture): HTMLImageElement;
+            base64(target?: DisplayObject | RenderTexture): string;
+            canvas(target?: DisplayObject | RenderTexture): HTMLCanvasElement;
+            pixels(renderTexture?: DisplayObject | RenderTexture): number[];
+
+            destroy(): void;
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////EXTRAS////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module extras {
+
+        export interface IBitmapTextStyle {
+
+            font?: string | {
+
+                name?: string;
+                size?: number;
+
+            };
+            align?: string;
+            tint?: number;
+
+        }
+        export class BitmapText extends Container {
+
+            constructor(text: string, style?: IBitmapTextStyle);
+
+            textWidth: number;
+            textHeight: number;
+            protected _glyphs: Sprite[];
+            protected _font: string | {
+                name?: string;
+                size?: number;
+            };
+            font: string | {
+                name?: string;
+                size?: number;
+            };
+            protected _text: string;
+            maxWidth: number;
+            maxLineHeight: number;
+            dirty: boolean;
+            tint: number;
+            align: string;
+            text: string;
+            anchor: PIXI.Point | number;
+
+            protected updateText(): void;
+            updateTransform(): void;
+            getLocalBounds(): Rectangle;
+            validate(): void;
+
+            static fonts: any;
+
+        }
+        export class AnimatedSprite extends Sprite {
+
+            constructor(textures: Texture[] | { texture: Texture, time?: number }[]);
+
+            protected _textures: Texture[];
+            protected _durations: number[];
+            textures: Texture[] | { texture: Texture, time?: number }[];
+            animationSpeed: number;
+            loop: boolean;
+            onComplete: () => void;
+            onFrameChange: (currentFrame: number) => void;
+            protected _currentTime: number;
+            playing: boolean;
+            totalFrames: number;
+            currentFrame: number;
+            stop(): void;
+            play(): void;
+            gotoAndStop(frameNumber: number): void;
+            gotoAndPlay(frameNumber: number): void;
+            protected update(deltaTime: number): void;
+            destroy(): void;
+
+            static fromFrames(frame: string[]): AnimatedSprite;
+            static fromImages(images: string[]): AnimatedSprite;
+
+        }
+        export class TextureTransform {
+
+            constructor(texture: Texture, clampMargin?: number);
+
+            protected _texture: Texture;
+            protected mapCoord: Matrix;
+            protected uClampFrame: Float32Array;
+            protected uClampOffset: Float32Array;
+            protected _lastTextureID: number;
+
+            clampOffset: number;
+            clampMargin: number;
+
+            texture: Texture;
+
+            update(forceUpdate?: boolean): void;
+
+        }
+        export class TilingSprite extends Sprite {
+
+            constructor(texture: Texture, width?: number, height?: number);
+
+            tileTransform: TransformStatic;
+            protected _width: number;
+            protected _height: number;
+            protected _canvasPattern: CanvasPattern;
+            uvTransform: TextureTransform;
+
+            clampMargin: number;
+            tileScale: Point | ObservablePoint;
+            tilePosition: Point | ObservablePoint;
+
+            protected _onTextureUpdate(): void;
+            protected _renderWebGL(renderer: WebGLRenderer): void;
+            protected _renderCanvas(renderer: CanvasRenderer): void;
+            protected _calculateBounds(): void;
+            getLocalBounds(rect?: Rectangle): Rectangle;
+            containsPoint(point: Point): boolean;
+            destroy(): void;
+
+            static from(source: number | string | BaseTexture | HTMLCanvasElement | HTMLVideoElement, width?: number, height?: number): TilingSprite;
+            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
+            // if you remove the next line, the class will break. https://github.com/pixijs/pixi-typescript/issues/96
+            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
+
+            width: number;
+            height: number;
+
+        }
+        export class TilingSpriteRenderer extends ObjectRenderer {
+
+            constructor(renderer: WebGLRenderer);
+
+            render(ts: TilingSprite): void;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////FILTERS///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module filters {
+
+        export class FXAAFilter extends Filter { }
+        export class BlurFilter extends Filter {
+
+            constructor(strength?: number, quality?: number, resolution?: number);
+
+            blurXFilter: BlurXFilter;
+            blurYFilter: BlurYFilter;
+            resolution: number;
+            padding: number;
+            passes: number;
+            blur: number;
+            blurX: number;
+            blurY: number;
+            quality: number;
+
+        }
+        export class BlurXFilter extends Filter {
+
+            constructor(strength?: number, quality?: number, resolution?: number);
+
+            protected _quality: number;
+
+            quality: number;
+            passes: number;
+            resolution: number;
+            strength: number;
+            firstRun: boolean;
+            blur: number;
+
+        }
+        export class BlurYFilter extends Filter {
+
+            constructor(strength?: number, quality?: number, resolution?: number);
+
+            protected _quality: number;
+
+            quality: number;
+            passes: number;
+            resolution: number;
+            strength: number;
+            firstRun: boolean;
+            blur: number;
+
+        }
+        export class ColorMatrixFilter extends Filter {
+
+            constructor();
+
+            protected _loadMatrix(matrix: number[], multiply?: boolean): void;
+            protected _multiply(out: number[], a: number[], b: number[]): void;
+            protected _colorMatrix(matrix: number[]): void;
+
+            matrix: number[];
+
+            brightness(b: number, multiply?: boolean): void;
+            greyscale(scale: number, multiply?: boolean): void;
+            blackAndWhite(multiply?: boolean): void;
+            hue(rotation: number, multiply?: boolean): void;
+            contrast(amount: number, multiply?: boolean): void;
+            saturate(amount: number, multiply?: boolean): void;
+            desaturate(multiply?: boolean): void;
+            negative(multiply?: boolean): void;
+            sepia(multiply?: boolean): void;
+            technicolor(multiply?: boolean): void;
+            polaroid(multiply?: boolean): void;
+            toBGR(multiply?: boolean): void;
+            kodachrome(multiply?: boolean): void;
+            browni(multiply?: boolean): void;
+            vintage(multiply?: boolean): void;
+            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
+            night(intensity: number, multiply?: boolean): void;
+            predator(amount: number, multiply?: boolean): void;
+            lsd(multiply?: boolean): void;
+            reset(): void;
+
+        }
+        export class DisplacementFilter extends Filter {
+
+            constructor(sprite: Sprite, scale?: number);
+
+            scale: Point;
+            map: Texture;
+
+        }
+        export class VoidFilter extends Filter {
+            glShaderKey: string;
+        }
+
+        // pixi-filters.d.ts todo
+        // https://github.com/pixijs/pixi-filters/
+        export class NoiseFilter extends Filter {
+
+            noise: number;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////INTERACTION///////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module interaction {
+
+        export interface InteractionEvent {
+
+            stopped: boolean;
+            target: DisplayObject;
+            currentTarget: DisplayObject;
+            type: string;
+            data: InteractionData;
+            stopPropagation(): void;
+
+        }
+        export class InteractionData {
+
+            global: Point;
+
+            protected _target: DisplayObject;
+            target: DisplayObject;
+            targetProxy: DisplayObject;
+            originalEvent: Event;
+
+            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
+
+        }
+        export class InteractionManager extends utils.EventEmitter {
+
+            constructor(renderer: SystemRenderer, options?: { autoPreventDefault?: boolean; interactionFrequency?: number; });
+
+            renderer: SystemRenderer;
+            autoPreventDefault: boolean;
+            interactionFrequency: number;
+            mouse: InteractionData;
+            pointer: InteractionData;
+            eventData: {
+                stopped: boolean;
+                target: any;
+                type: any;
+                data: InteractionData;
+                stopPropagination(): void;
+            };
+            interactiveDataPool: InteractionData[];
+            protected interactionDOMElement: HTMLElement;
+            protected moveWhenInside: boolean;
+            protected eventsAdded: boolean;
+            mouseOverRenderer: boolean;
+            supportsTouchEvents: boolean;
+            supportsPointerEvents: boolean;
+            normalizeTouchEvents: boolean;
+            normalizeMouseEvents: boolean;
+
+            protected onMouseUp: (event: MouseEvent) => void;
+            protected processMouseUp: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseDown: (event: MouseEvent) => void;
+            protected processMouseDown: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseMove: (event: MouseEvent) => void;
+            protected processMouseMove: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseOut: (event: MouseEvent) => void;
+            protected processMouseOverOut: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseOver: (event: MouseEvent) => void;
+
+            protected onPointerUp: (event: PointerEvent) => void;
+            protected processPointerUp: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onPointerDown: (event: PointerEvent) => void;
+            protected processPointerDown: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onPointerMove: (event: PointerEvent) => void;
+            protected processPointerMove: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onPointerOut: (event: PointerEvent) => void;
+            protected processPointerOut: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onPointerOver: (event: PointerEvent) => void;
+
+            protected onTouchStart: (event: TouchEvent) => void;
+            protected processTouchStart: (DisplayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchEnd: (event: TouchEvent) => void;
+            protected processTouchEnd: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchMove: (event: TouchEvent) => void;
+            protected processTouchMove: (displayObject: DisplayObject, hit: boolean) => void;
+            defaultCursorStyle: string;
+            currentCursorStyle: string;
+            protected _tempPoint: Point;
+            resolution: number;
+            protected setTargetElement(element: HTMLElement, resolution: number): void;
+            protected addEvents(): void;
+            protected removeEvents(): void;
+            update(deltaTime: number): void;
+            protected dispatchEvent(displayObject: DisplayObject, eventString: string, eventData: any): void;
+            mapPositionToPoint(point: Point, x: number, y: number): void;
+            protected processInteractive(point: Point, displayObject: DisplayObject, func: (displayObject: DisplayObject, hit: boolean) => void, hitTest: boolean, interactive: boolean): boolean;
+            protected _startInteractionProcess(): void;
+            protected _queueAdd(displayObject: DisplayObject, order: number): void;
+            protected _finishInteractionProcess(func: Function): void;
+            protected getTouchData(touchEvent: InteractionData): InteractionData;
+            protected returnTouchData(touchData: InteractionData): void;
+            protected normalizeToPointerData(Event: Event): void;
+
+            destroy(): void;
+
+        }
+        export interface InteractiveTarget {
+
+            interactive: boolean;
+            interactiveChildren: boolean;
+            hitArea: IHitArea;
+            buttonMode: boolean;
+            defaultCursor: string;
+
+        }
+        export interface InteractiveTargetProxy extends InteractiveTarget {
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////LOADER/////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+    // extends
+    // https://github.com/englercj/resource-loader/
+    // 1.6.4
+
+    export module loaders {
+
+        export interface ILoaderOptions {
+
+            crossOrigin?: boolean | string;
+            loadType?: number;
+            xhrType?: string;
+            metaData?: any;
+
+        }
+        export interface IResourceDictionary {
+
+            [index: string]: PIXI.loaders.Resource;
+
+        }
+        export class Loader extends utils.EventEmitter {
+
+            protected static _pixiMiddleware: Function[];
+            static addPixiMiddleware(fn: Function): void;
+
+            constructor(baseUrl?: string, concurrency?: number);
+
+            baseUrl: string;
+            progress: number;
+            loading: boolean;
+            resources: IResourceDictionary;
+
+            add(name: string, url: string, options?: ILoaderOptions, cb?: () => void): Loader;
+            add(url: string, options?: ILoaderOptions, cb?: () => void): Loader;
+            // todo I am not sure of object literal notional (or its options) so just allowing any but would love to improve this
+            add(obj: any, options?: ILoaderOptions, cb?: () => void): Loader;
+
+            on(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): utils.EventEmitter;
+            on(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
+            on(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
+            on(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
+            on(event: "start", fn: (loader: loaders.Loader) => void, context?: any): utils.EventEmitter;
+            on(event: string, fn: Function, context?: any): utils.EventEmitter;
+
+            once(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): utils.EventEmitter;
+            once(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
+            once(event: "load", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
+            once(event: "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): utils.EventEmitter;
+            once(event: "start", fn: (loader: loaders.Loader) => void, context?: any): utils.EventEmitter;
+            once(event: string, fn: Function, context?: any): utils.EventEmitter;
+
+            before(fn: Function): Loader;
+            pre(fn: Function): Loader;
+
+            after(fn: Function): Loader;
+            use(fn: Function): Loader;
+
+            reset(): void;
+
+            load(cb?: (loader: loaders.Loader, object: any) => void): Loader;
+
+        }
+        export interface ITextureDictionary {
+            [index: string]: PIXI.Texture;
+        }
+
+        export class Resource extends utils.EventEmitter {
+
+            static LOAD_TYPE: {
+                XHR: number;
+                IMAGE: number;
+                AUDIO: number;
+                VIDEO: number;
+            };
+
+            static XHR_READ_STATE: {
+                UNSENT: number;
+                OPENED: number;
+                HEADERS_RECIEVED: number;
+                LOADING: number;
+                DONE: number;
+            };
+
+            static XHR_RESPONSE_TYPE: {
+                DEFAULT: number;
+                BUFFER: number;
+                BLOB: number;
+                DOCUMENT: number;
+                JSON: number;
+                TEXT: number;
+            };
+
+            constructor(name?: string, url?: string | string[], options?: ILoaderOptions);
+
+            protected _loadSourceElement(type: string): void;
+            isLoading: boolean;
+            isComplete: boolean;
+
+            isJson: boolean;
+            isXml: boolean;
+            isImage: boolean;
+            isAudio: boolean;
+            isVideo: boolean;
+
+            name: string;
+            texture: Texture;
+            textures: ITextureDictionary;
+            url: string;
+            data: any;
+            crossOrigin: boolean | string;
+            loadType: number;
+            xhrType: string;
+            error: Error;
+            xhr: XMLHttpRequest;
+            SVGMetadataElement: any;
+
+            metadata: any;
+            spineAtlas: any;
+            spineData: any;
+
+            complete(): void;
+            load(cb?: () => void): void;
+            abort(message: string): void;
+
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////MESH///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module mesh {
+
+        export class Mesh extends Container {
+
+            constructor(texture: Texture, vertices?: Float32Array, uvs?: Float32Array, indices?: Uint16Array, drawMode?: number);
+
+            protected _texture: Texture;
+            uvs: Float32Array;
+            vertices: Float32Array;
+            indices: Uint16Array;
+            dirty: number;
+            indexDirty: number;
+            dirtyVertex: boolean;
+            protected _geometryVersion: number;
+            blendMode: number;
+            canvasPadding: number;
+            drawMode: number;
+            texture: Texture;
+            shader: glCore.GLShader;
+            tintRgb: Float32Array;
+            protected _glDatas: { [n: number]: any; };
+            protected _renderWebGL(renderer: WebGLRenderer): void;
+            protected _renderCanvas(renderer: CanvasRenderer): void;
+            protected _onTextureUpdate(): void;
+            protected _calculateBounds(): void;
+            containsPoint(point: Point): boolean;
+            tint: number;
+
+            static DRAW_MODES: {
+                TRIANGLE_MESH: number;
+                TRIANGLES: number;
+            };
+
+        }
+
+        export class CanvasMeshRenderer {
+
+            constructor(renderer: CanvasRenderer);
+
+            renderer: CanvasRenderer;
+
+            render(mesh: Mesh): void;
+            protected _renderTriangleMesh(mesh: Mesh): void;
+            protected _renderTriangles(mesh: Mesh): void;
+            protected _renderDrawTriangle(mesh: Mesh, index0: number, index1: number, index2: number): void;
+            protected renderMeshFlat(mesh: Mesh): void;
+
+            destroy(): void;
+
+        }
+
+        export class MeshRenderer extends ObjectRenderer {
+
+            constructor(renderer: WebGLRenderer);
+
+            shader: Shader;
+            render(mesh: Mesh): void;
+
+        }
+
+        export class Plane extends Mesh {
+
+            constructor(texture: Texture, verticesX?: number, verticesY?: number);
+            protected _ready: boolean;
+            verticesX: number;
+            verticesY: number;
+            drawMode: number;
+
+            refresh(): void;
+
+            protected _onTexureUpdate(): void;
+
+        }
+
+        export class NineSlicePlane extends Plane {
+
+            constructor(texture: Texture, leftWidth?: number, topHeight?: number, rightWidth?: number, bottomHeight?: number);
+
+            width: number;
+            height: number;
+            leftWidth: number;
+            rightWidth: number;
+            topHeight: number;
+            bottomHeight: number;
+
+            protected _leftWidth: number;
+            protected _rightWidth: number;
+            protected _topHeight: number;
+            protected _bottomHeight: number;
+            protected _height: number;
+            protected _width: number;
+            protected _origHeight: number;
+            protected _origWidth: number;
+            protected _uvh: number;
+            protected _uvw: number;
+
+            updateHorizontalVertices(): void;
+            updateVerticalVertices(): void;
+            protected drawSegment(context: CanvasRenderingContext2D | WebGLRenderingContext, textureSource: any, w: number, h: number, x1: number, y1: number, x2: number, y2: number): void;
+
+        }
+
+        export class Rope extends Mesh {
+
+            constructor(texture: Texture, points: Point[]);
+
+            points: Point[];
+            colors: number[];
+            protected _ready: boolean;
+            refresh(): void;
+
+            protected _onTextureUpdate(): void;
+            updateTransform(): void;
+
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////PARTICLES////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module particles {
+
+        export interface IParticleContainerProperties {
+
+            scale?: boolean;
+            position?: boolean;
+            rotation?: boolean;
+            uvs?: boolean;
+            alpha?: boolean;
+
+        }
+        export class ParticleContainer extends Container {
+
+            constructor(size?: number, properties?: IParticleContainerProperties, batchSize?: number);
+
+            protected _properties: boolean[];
+            protected _maxSize: number;
+            protected _batchSize: number;
+            protected _glBuffers: { [n: number]: WebGLBuffer; };
+            protected _bufferToUpdate: number;
+            interactiveChildren: boolean;
+            blendMode: number;
+            roundPixels: boolean;
+            baseTexture: BaseTexture;
+
+            setProperties(properties: IParticleContainerProperties): void;
+            protected onChildrenChange: (smallestChildIndex?: number) => void;
+
+            destroy(options?: IDestroyOptions | boolean): void;
+
+        }
+        export class ParticleBuffer {
+
+            constructor(gl: WebGLRenderingContext, properties: any, dynamicPropertyFlags: any[], size: number);
+
+            gl: WebGLRenderingContext;
+            vertSize: number;
+            vertByteSize: number;
+            size: number;
+            dynamicProperties: any[];
+            staticProperties: any[];
+            staticStride: number;
+            staticBuffer: any;
+            staticData: any;
+            dynamicStride: number;
+            dynamicBuffer: any;
+            dynamicData: any;
+
+            bind(): void;
+            destroy(): void;
+
+        }
+        export interface IParticleRendererProperty {
+            attribute: number;
+            size: number;
+            uploadFunction: (children: PIXI.DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number) => void;
+            offset: number;
+        }
+        export class ParticleRenderer extends ObjectRenderer {
+
+            constructor(renderer: WebGLRenderer);
+
+            shader: glCore.GLShader;
+            indexBuffer: WebGLBuffer;
+            properties: IParticleRendererProperty[];
+            protected tempMatrix: Matrix;
+
+            start(): void;
+            generateBuffers(container: ParticleContainer): ParticleBuffer[];
+            uploadVertices(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadPosition(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadRotation(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadUvs(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadAlpha(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            destroy(): void;
+
+            indices: Uint16Array;
+
+        }
+        export interface IParticleShader extends glCore.GLShader { }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////PREPARE///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module prepare {
+
+        interface addHook {
+            (item: any, queue: any[]): boolean;
+        }
+        interface uploadHook<UploadHookSource> {
+            (prepare: UploadHookSource, item: any): boolean
+        }
+        export abstract class BasePrepare<UploadHookSource extends CanvasPrepare | WebGLRenderer>{
+
+            constructor(renderer: SystemRenderer);
+
+            limiter: CountLimiter | TimeLimiter;
+            protected renderer: SystemRenderer;
+            protected uploadHookHelper: UploadHookSource;
+            protected queue: any[];
+            protected addHooks: addHook[];
+            protected uploadHooks: uploadHook<UploadHookSource>[];
+            protected completes: Function[];
+            protected ticking: boolean;
+            protected delayedTick: () => void;
+
+            upload(item: Function | DisplayObject | Container, done?: () => void): void;
+            protected tick(): void;
+            protected prepareItems(): void;
+            register(addHook?: addHook, uploadHook?: uploadHook<UploadHookSource>): BasePrepare<UploadHookSource>;
+            add(item: DisplayObject | Container | any): BasePrepare<UploadHookSource>;
+            destroy(): void;
+
+        }
+        export class CanvasPrepare extends BasePrepare<CanvasPrepare> {
+
+            constructor(renderer: CanvasRenderer);
+
+            protected canvas: HTMLCanvasElement;
+            protected ctx: CanvasRenderingContext2D;
+
+        }
+        export class WebGLPrepare extends BasePrepare<WebGLRenderer> {
+
+            constructor(renderer: WebGLRenderer);
+
+        }
+        export class CountLimiter {
+
+            constructor(maxItemsPerFrame: number);
+
+            protected maxItemsPerFrame: number;
+            protected itemsLeft: number;
+
+        }
+        export class TimeLimiter {
+
+            constructor(maxMilliseconds: number);
+
+            protected maxMilliseconds: number;
+            protected frameStart: number;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    /////////////////////////////pixi-gl-core/////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+    // pixi-gl-core https://github.com/pixijs/pixi-gl-core
+    // sharedArrayBuffer as a type is not available yet.
+    // need to fully define what an `Attrib` is.
+    export module glCore {
+
+        export interface IContextOptions {
+            /**
+             * Boolean that indicates if the canvas contains an alpha buffer.
+             */
+            alpha?: boolean;
+            /**
+             * Boolean that indicates that the drawing buffer has a depth buffer of at least 16 bits.
+             */
+            depth?: boolean;
+            /**
+             * Boolean that indicates that the drawing buffer has a stencil buffer of at least 8 bits.
+             */
+            stencil?: boolean;
+            /**
+             * Boolean that indicates whether or not to perform anti-aliasing.
+             */
+            antialias?: boolean;
+            /**
+             * Boolean that indicates that the page compositor will assume the drawing buffer contains colors with pre-multiplied alpha.
+             */
+            premultipliedAlpha?: boolean;
+            /**
+             * If the value is true the buffers will not be cleared and will preserve their values until cleared or overwritten by the author.
+             */
+            preserveDrawingBuffer?: boolean;
+            /**
+             *  Boolean that indicates if a context will be created if the system performance is low.
+             */
+            failIfMajorPerformanceCaveat?: boolean;
+        }
+        export function createContext(view: HTMLCanvasElement, options?: IContextOptions): WebGLRenderingContext;
+        export function setVertexAttribArrays(gl: WebGLRenderingContext, attribs: IAttrib[], state?: WebGLState): WebGLRenderingContext;
+        export class GLBuffer {
+
+            static EMPTY_ARRAY_BUFFER: ArrayBuffer;
+
+            constructor(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number);
+
+            protected _updateID: number;
+            gl: WebGLRenderingContext;
+            buffer: WebGLBuffer;
+            type: number;
+            drawType: number;
+            data: ArrayBuffer | ArrayBufferView | any;
+
+            upload(data: ArrayBuffer | ArrayBufferView | any, offset: number, dontBind: boolean): void;
+            bind(): void;
+
+            static createVertexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): WebGLBuffer;
+            static createIndexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): WebGLBuffer;
+            static create(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number): WebGLBuffer;
+
+            destroy(): void;
+
+        }
+        export class GLFramebuffer {
+
+            constructor(gl: WebGLRenderingContext, width: number, height: number);
+
+            gl: WebGLRenderingContext;
+            frameBuffer: WebGLFramebuffer;
+            stencil: WebGLRenderbuffer;
+            texture: GLTexture;
+            width: number;
+            height: number;
+
+            enableTexture(texture: GLTexture): void;
+            enableStencil(): void;
+            clear(r: number, g: number, b: number, a: number): void;
+            bind(): void;
+            unbind(): void;
+            resize(width: number, height: number): void;
+            destroy(): void;
+
+            static createRGBA(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
+            static createFloat32(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
+
+        }
+        export class GLShader {
+
+            constructor(gl: WebGLRenderingContext, vertexSrc: string | string[], fragmentSrc: string | string[]);
+
+            gl: WebGLRenderingContext;
+            program: WebGLProgram;
+            uniforms: any;
+
+            bind(): void;
+            destroy(): void;
+
+        }
+        export class GLTexture {
+
+            constructor(gl: WebGLRenderingContext, width: number, height: number, format: number, type: number);
+
+            gl: WebGLRenderingContext;
+            texture: WebGLTexture;
+            mipmap: boolean;
+            premultiplyAlpha: boolean;
+            width: number;
+            height: number;
+            format: number;
+            type: number;
+
+            upload(source: HTMLImageElement | ImageData | HTMLVideoElement): void;
+            uploadData(data: number, width: number, height: number): void;
+            bind(): void;
+            unbind(): void;
+            minFilter(linear: boolean): void;
+            magFilter(linear: boolean): void;
+            enableMipmap(): void;
+            enableLinearScaling(): void;
+            enableNearestScaling(): void;
+            enableWrapClamp(): void;
+            enableWrapRepeat(): void;
+            enableWrapMirrorRepeat(): void;
+            destroy(): void;
+
+            static fromSource(gl: WebGLRenderingContext, source: HTMLImageElement | ImageData | HTMLVideoElement, premultipleAlpha?: boolean): GLTexture;
+            static fromData(gl: WebGLRenderingContext, data: number[], width: number, height: number): GLTexture;
+
+        }
+        export interface IAttrib {
+
+            attribute: {
+                location: boolean;
+                size: number;
+            };
+            normalized: boolean;
+            stride: number;
+            start: number;
+            buffer: ArrayBuffer;
+
+        }
+        export interface IWebGLRenderingContextAttribute {
+
+            buffer: WebGLBuffer;
+            attribute: any;
+            type: number;
+            normalized: boolean;
+            stride: number;
+            start: number;
+
+        }
+        export interface IAttribState {
+            tempAttribState: IAttrib[];
+            attribState: IAttrib[];
+        }
+
+        export class VertexArrayObject {
+
+            static FORCE_NATIVE: boolean;
+
+            constructor(gl: WebGLRenderingContext, state: WebGLState);
+
+            protected nativeVaoExtension: any;
+            protected nativeState: IAttribState;
+            protected nativeVao: VertexArrayObject;
+            gl: WebGLRenderingContext;
+            attributes: IAttrib[];
+            indexBuffer: GLBuffer;
+            dirty: boolean;
+
+            bind(): VertexArrayObject;
+            unbind(): VertexArrayObject;
+            activate(): VertexArrayObject;
+            addAttribute(buffer: GLBuffer, attribute: IAttrib, type: number, normalized: boolean, stride: number, start: number): VertexArrayObject;
+            addIndex(buffer: GLBuffer, options?: any): VertexArrayObject;
+            clear(): VertexArrayObject;
+            draw(type: number, size: number, start: number): VertexArrayObject;
+            destroy(): void;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////UTILS//////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export interface IDecomposedDataUri {
+        mediaType: string;
+        subType: string;
+        encoding: string;
+        data: any;
+    }
+
+    export module utils {
+
+        export function uid(): number;
+        export function hex2rgb(hex: number, out?: number[]): number[];
+        export function hex2string(hex: number): string;
+        export function rgb2hex(rgb: Number[]): number;
+        export function canUseNewCanvasBlendModes(): boolean;
+        export function getResolutionOfUrl(url: string): number;
+        export function getSvgSize(svgString: string): any;
+        export function decomposeDataUri(dataUri: string): IDecomposedDataUri;
+        export function getUrlFileExtension(url: string): string;
+        export function sayHello(type: string): void;
+        export function skipHello(): void;
+        export function isWebGLSupported(): boolean;
+        export function sign(n: number): number;
+        export function removeItems<T>(arr: T[], startIdx: number, removeCount: number): void;
+        export var TextureCache: any;
+        export var BaseTextureCache: any;
+
+        //https://github.com/kaimallea/isMobile
+        export module isMobile {
+            export var apple: {
+                phone: boolean;
+                ipod: boolean;
+                tablet: boolean;
+                device: boolean;
+            };
+            export var android: {
+                phone: boolean;
+                tablet: boolean;
+                device: boolean;
+            }
+            export var amazon: {
+                phone: boolean;
+                table: boolean;
+                device: boolean;
+            }
+            export var windows: {
+                phone: boolean;
+                tablet: boolean;
+                device: boolean;
+            }
+            export var seven_inch: boolean;
+            export var other: {
+                blackberry_10: boolean;
+                blackberry: boolean;
+                opera: boolean;
+                firefox: boolean;
+                chrome: boolean;
+                device: boolean;
+            }
+            export var any: boolean;
+            export var phone: boolean;
+            export var tablet: boolean;
+        }
+
+        // https://github.com/primus/eventemitter3
+        export class EventEmitter {
+
+            listeners(event: string): Function[];
+            emit(event: string, ...args: any[]): boolean;
+            on(event: string, fn: Function, context?: any): EventEmitter;
+            once(event: string, fn: Function, context?: any): EventEmitter;
+            removeListener(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
+            removeAllListeners(event: string): EventEmitter;
+            eventNames(): string[];
+
+            off(event: string, fn: Function, context?: any, once?: boolean): EventEmitter;
+            addListener(event: string, fn: Function, context?: any): EventEmitter;
+
+        }
+
+    }
+
+}
+
+declare module pixi {
+    export var gl: typeof PIXI.glCore;
+}
+
+declare module "pixi.js" {
+    export = PIXI;
+}
diff --git a/pixi.js/pixi.js-tests.ts b/pixi.js/pixi.js-tests.ts
index 329560d6f7..44f663af9a 100644
--- a/pixi.js/pixi.js-tests.ts
+++ b/pixi.js/pixi.js-tests.ts
@@ -209,7 +209,7 @@ namespace basics {
 
         private animate = (): void => {
 
-            this.filter.uniforms.customUniform.value += 0.04;
+            this.filter.uniforms['customUniform'].value += 0.04;
 
             this.renderer.render(this.stage);
             requestAnimationFrame(this.animate);
@@ -218,9 +218,9 @@ namespace basics {
 
     }
 
-    export class CustomizedFilter extends PIXI.AbstractFilter {
+    export class CustomizedFilter extends PIXI.Filter {
 
-        constructor(fragmentSource: string | string[]) {
+        constructor(fragmentSource: string) {
             super(null, fragmentSource, {
                 customUniform: {
                     type: '1f',
@@ -337,7 +337,7 @@ namespace basics {
 
             };
 
-            this.renderTexture = new PIXI.RenderTexture(this.renderer, 300, 200, PIXI.SCALE_MODES.LINEAR, 0.1);
+            this.renderTexture = PIXI.RenderTexture.create(300, 200, PIXI.SCALE_MODES.LINEAR, 0.1);
 
             this.sprite = new PIXI.Sprite(this.renderTexture);
             this.sprite.x = 450;
@@ -354,7 +354,7 @@ namespace basics {
 
         private animate = (): void => {
 
-            this.renderTexture.render(this.container);
+            this.renderer.render(this.container, this.renderTexture)
 
             requestAnimationFrame(this.animate);
 
@@ -374,7 +374,7 @@ namespace basics {
 
         private stage: PIXI.Container;
 
-        private movie: PIXI.extras.MovieClip;
+        private movie: PIXI.extras.AnimatedSprite;
 
         constructor() {
 
@@ -398,11 +398,11 @@ namespace basics {
                 }
 
 
-                // create a MovieClip (brings back memories from the days of Flash, right ?)
-                this.movie = new PIXI.extras.MovieClip(frames);
+                // create a AnimatedSprite (brings back memories from the days of Flash, right ?)
+                this.movie = new PIXI.extras.AnimatedSprite(frames);
 
                 /*
-                 * A MovieClip inherits all the properties of a PIXI sprite
+                 * A AnimatedSprite inherits all the properties of a PIXI sprite
                  * so you can change its position, its anchor, mask it, etc
                  */
                 this.movie.position.set(300);
@@ -460,8 +460,11 @@ namespace basics {
             this.stage.addChild(this.basicText);
 
             var style: PIXI.TextStyle = {
-                font: '36px Arial bold italic',
-                fill: PIXI.utils.hex2string(0xF7EDCA),
+                fontSize: 36,
+                fontFamily: 'Arial',
+                fontWeight: 'bold',
+                fontStyle: 'italic',
+                fill: '#F7EDCA',
                 stroke: '#4a1850',
                 strokeThickness: 5,
                 dropShadow: true,
@@ -783,7 +786,7 @@ namespace demos {
 
         private stage: PIXI.Container;
 
-        private sprites: PIXI.ParticleContainer;
+        private sprites: PIXI.particles.ParticleContainer;
 
         private maggots: BatchDude[];
 
@@ -799,7 +802,7 @@ namespace demos {
             // create the root of the scene graph
             this.stage = new PIXI.Container();
 
-            this.sprites = new PIXI.ParticleContainer(10000, {
+            this.sprites = new PIXI.particles.ParticleContainer(10000, {
 
                 scale: true,
                 position: true,
@@ -1706,7 +1709,7 @@ namespace demos {
             this.stage.on('click', this.onClick);
             this.stage.on('tap', this.onClick);
 
-            this.help = new PIXI.Text('Click to turn masking on / off.', { font: 'bold 12pt Arial', fill: 'white' });
+            this.help = new PIXI.Text('Click to turn masking on / off.', { fontFamily: 'Arial', fontSize: 12, fontWeight: 'bold', fill: 'white' });
             this.help.position.y = this.renderer.height - 26;
             this.help.position.x = 10;
             this.stage.addChild(this.help);
@@ -1763,7 +1766,7 @@ namespace demos {
 
 namespace demos {
 
-    export class MovieClipDemo {
+    export class AnimatedSpriteDemo {
 
         private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
 
@@ -1801,8 +1804,8 @@ namespace demos {
 
             for (i = 0; i < 50; i++) {
 
-                // create an explosion MovieClip
-                var explosion = new PIXI.extras.MovieClip(explosionTextures);
+                // create an explosion AnimatedSprite
+                var explosion = new PIXI.extras.AnimatedSprite(explosionTextures);
 
                 explosion.position.x = Math.random() * 800;
                 explosion.position.y = Math.random() * 600;
@@ -1862,8 +1865,8 @@ namespace demos {
             this.stage = new PIXI.Container();
 
             // create two render textures... these dynamic textures will be used to draw the scene into itself
-            this.renderTexture = new PIXI.RenderTexture(this.renderer, this.renderer.width, this.renderer.height);
-            this.renderTexture2 = new PIXI.RenderTexture(this.renderer, this.renderer.width, this.renderer.height);
+            this.renderTexture = PIXI.RenderTexture.create(this.renderer.width, this.renderer.height);
+            this.renderTexture2 = PIXI.RenderTexture.create(this.renderer.width, this.renderer.height);
             this.currentTexture = this.renderTexture;
 
             // create a new sprite that uses the render texture we created above
@@ -1946,7 +1949,7 @@ namespace demos {
 
             // render the stage to the texture
             // the 'true' clears the texture before the content is rendered
-            this.renderTexture2.render(this.stage, null, false);
+            this.renderer.render(this.stage, this.renderTexture2, false);
 
             // and finally render the stage
             this.renderer.render(this.stage);
@@ -2087,11 +2090,11 @@ namespace demos {
             this.stage.addChild(this.background);
 
             // create some white text using the Snippet webfont
-            this.textSample = new PIXI.Text('Pixi.js can has\n multiline text!', { font: '35px Snippet', fill: 'white', align: 'left' });
+            this.textSample = new PIXI.Text('Pixi.js can has\n multiline text!', { fontSize: 35, fontFamily: 'Snippet', fill: 'white', align: 'left' });
             this.textSample.position.set(20);
 
             // create a text object with a nice stroke
-            this.spinningText = new PIXI.Text('I\'m fun!', { font: 'bold 60px Arial', fill: '#cc00ff', align: 'center', stroke: '#FFFFFF', strokeThickness: 6 });
+            this.spinningText = new PIXI.Text('I\'m fun!', { fontWeight: 'bold', fontSize: 60, fontFamily: 'Arial', fill: '#cc00ff', align: 'center', stroke: '#FFFFFF', strokeThickness: 6 });
 
             // setting the anchor point to 0.5 will center align the text... great for spinning!
             this.spinningText.anchor.set(0.5);
@@ -2099,7 +2102,7 @@ namespace demos {
             this.spinningText.position.y = 200;
 
             // create a text object that will be updated...
-            this.countingText = new PIXI.Text('COUNT 4EVAR: 0', { font: 'bold italic 60px Arvo', fill: '#3e1707', align: 'center', stroke: '#a4410e', strokeThickness: 7 });
+            this.countingText = new PIXI.Text('COUNT 4EVAR: 0', { fontWeight: 'bold', fontStyle: 'italic', fontSize: 60, fontFamily: 'Arvo', fill: '#3e1707', align: 'center', stroke: '#a4410e', strokeThickness: 7 });
 
             this.countingText.position.x = 310;
             this.countingText.position.y = 320;
@@ -2704,7 +2707,7 @@ namespace filters {
             this.stage.on('tap', this.onClick);
 
 
-            this.help = new PIXI.Text('Click to turn filters on / off.', { font: 'bold 12pt Arial', fill: 'white' });
+            this.help = new PIXI.Text('Click to turn filters on / off.', { fontWeight: 'bold', fontSize: 12, fontFamily: 'Arial', fill: 'white' });
             this.help.position.y = this.renderer.height - 25;
             this.help.position.x = 10;
 
diff --git a/pixi.js/v3/pixi.js-tests.ts b/pixi.js/v3/pixi.js-tests.ts
new file mode 100644
index 0000000000..f54da3fb00
--- /dev/null
+++ b/pixi.js/v3/pixi.js-tests.ts
@@ -0,0 +1,2761 @@
+/// <reference path="pixi.js.d.ts" />
+namespace basics {
+
+    export class Basics {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private bunny: PIXI.Sprite;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            // create a texture from an image path
+            var texture: PIXI.Texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
+
+            // create a new Sprite using the texture
+            this.bunny = new PIXI.Sprite(texture);
+
+            // center the sprite's anchor point
+            this.bunny.anchor.x = 0.5;
+            this.bunny.anchor.y = 0.5;
+
+            // move the sprite to the center of the screen
+            this.bunny.position.x = 200;
+            this.bunny.position.y = 150;
+
+            //add it to the stage
+            this.stage.addChild(this.bunny);
+
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.bunny.rotation += 0.1;
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class Click {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private sprite: PIXI.Sprite;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
+            this.sprite.position.set(230, 264);
+            this.sprite.interactive = true;
+            this.sprite.on('mousedown', this.onDown, this);
+            this.sprite.on('touchstart', this.onDown, this);
+
+            //add it to the stage
+            this.stage.addChild(this.sprite);
+
+            //start animatng
+            this.animate();
+
+        }
+
+        private onDown = (eventData: PIXI.interaction.InteractionData): void => {
+
+            this.sprite.scale.x += 0.3;
+            this.sprite.scale.y += 0.3;
+
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class Container {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private container: PIXI.Container;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.container = new PIXI.Container();
+
+            this.stage.addChild(this.container);
+
+            for (var j = 0; j < 5; j++) {
+
+                for (var i = 0; i < 5; i++) {
+
+                    var bunny: PIXI.Sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
+                    bunny.x = 40 * i;
+                    bunny.y = 40 * j;
+                    this.container.addChild(bunny);
+
+                };
+
+            };
+
+            /*
+             * All the bunnies are added to the container with the addChild method
+             * when you do this, all the bunnies become children of the container, and when a container moves,
+             * so do all its children.
+             * This gives you a lot of flexibility and makes it easier to position elements on the screen
+             */
+            this.container.x = 100;
+            this.container.y = 60;
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class CustomFilter {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private background: PIXI.Sprite;
+
+        private filter: CustomizedFilter;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.background = PIXI.Sprite.fromImage('../../_assets/bkg-grass.jpg');
+            this.background.scale.set(1.3, 1);
+            this.stage.addChild(this.background);
+
+
+            PIXI.loader.add('shader', '../../_assets/basics/shader.frag');
+            PIXI.loader.once('complete', this.onLoaded, this);
+            PIXI.loader.load();
+
+        }
+
+        private onLoaded(loader: PIXI.loaders.Loader, res: any) {
+
+            var fragmentSrc = res.shader.data;
+
+            this.filter = new CustomizedFilter(fragmentSrc);
+            this.background.filters = [this.filter];
+
+            this.animate();
+
+
+        }
+
+        private animate = (): void => {
+
+            this.filter.uniforms.customUniform.value += 0.04;
+
+            this.renderer.render(this.stage);
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+    export class CustomizedFilter extends PIXI.AbstractFilter {
+
+        constructor(fragmentSource: string | string[]) {
+            super(null, fragmentSource, {
+                customUniform: {
+                    type: '1f',
+                    value: 0
+                }
+            })
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class Graphics {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private graphics: PIXI.Graphics;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+            this.stage.interactive = true;
+
+            this.graphics = new PIXI.Graphics();
+
+            // draw a shape
+            this.graphics.moveTo(50, 50);
+            this.graphics.lineTo(250, 50);
+            this.graphics.lineTo(100, 100);
+            this.graphics.lineTo(50, 50);
+            this.graphics.endFill();
+
+            // set a fill and a line style again and draw a rectangle
+            this.graphics.lineStyle(2, 0x0000FF, 1);
+            this.graphics.beginFill(0xFF700B, 1);
+            this.graphics.drawRect(50, 250, 120, 120);
+
+            // draw a rounded rectangle
+            this.graphics.lineStyle(2, 0xFF00FF, 1);
+            this.graphics.beginFill(0xFF00BB, 0.25);
+            this.graphics.drawRoundedRect(150, 450, 300, 100, 15);
+            this.graphics.endFill();
+
+            // draw a circle, set the lineStyle to zero so the circle doesn't have an outline
+            this.graphics.lineStyle(0);
+            this.graphics.beginFill(0xFFFF0B, 0.5);
+            this.graphics.drawCircle(470, 90, 60);
+            this.graphics.endFill();
+
+            this.stage.addChild(this.graphics);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class RenderTexture {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private container: PIXI.Container;
+
+        private renderTexture: PIXI.RenderTexture;
+
+        private sprite: PIXI.Sprite;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.container = new PIXI.Container();
+
+            this.stage.addChild(this.container);
+
+            for (var j = 0; j < 5; j++) {
+
+                for (var i = 0; i < 5; i++) {
+
+                    var bunny: PIXI.Sprite = PIXI.Sprite.fromImage('../../_assets/basics/bunny.png');
+                    bunny.x = 40 * i;
+                    bunny.y = 40 * j;
+                    bunny.rotation = Math.random() * (Math.PI * 2);
+                    this.container.addChild(bunny);
+
+                };
+
+            };
+
+            this.renderTexture = new PIXI.RenderTexture(this.renderer, 300, 200, PIXI.SCALE_MODES.LINEAR, 0.1);
+
+            this.sprite = new PIXI.Sprite(this.renderTexture);
+            this.sprite.x = 450;
+            this.sprite.y = 60;
+            this.stage.addChild(this.sprite);
+
+            this.container.x = 100;
+            this.container.y = 60;
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            this.renderTexture.render(this.container);
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class SpriteSheet {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private movie: PIXI.extras.MovieClip;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            PIXI.loader.add('../../_assets/basics/fighter.json').load((loader: PIXI.loaders.Loader, object: any): void => {
+
+                // create an array of textures from an image path
+                var frames: PIXI.Texture[] = [];
+
+                for (var i = 0; i < 30; i++) {
+
+                    var val = i < 10 ? '0' + i : i;
+
+                    // magically works since the spritesheet was loaded with the pixi loader
+                    frames.push(PIXI.Texture.fromFrame('rollSequence00' + val + '.png'));
+                }
+
+
+                // create a MovieClip (brings back memories from the days of Flash, right ?)
+                this.movie = new PIXI.extras.MovieClip(frames);
+
+                /*
+                 * A MovieClip inherits all the properties of a PIXI sprite
+                 * so you can change its position, its anchor, mask it, etc
+                 */
+                this.movie.position.set(300);
+                this.movie.anchor.set(0.5);
+                this.movie.animationSpeed = 0.5;
+                this.movie.play();
+
+                this.stage.addChild(this.movie);
+
+                this.animate();
+
+            });
+
+        }
+
+        private animate = (): void => {
+
+            this.movie.rotation += 0.01;
+
+            //render the stage container
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class Text {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private basicText: PIXI.Text;
+
+        private richText: PIXI.Text;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.basicText = new PIXI.Text('Basic Text in Pixi');
+            this.basicText.x = 30;
+            this.basicText.y = 90;
+
+            this.stage.addChild(this.basicText);
+
+            var style: PIXI.TextStyle = {
+                font: '36px Arial bold italic',
+                fill: PIXI.utils.hex2string(0xF7EDCA),
+                stroke: '#4a1850',
+                strokeThickness: 5,
+                dropShadow: true,
+                dropShadowColor: '#000000',
+                dropShadowAngle: Math.PI / 6,
+                dropShadowDistance: 6,
+                wordWrap: true,
+                wordWrapWidth: 440
+            };
+
+            this.richText = new PIXI.Text('Rich Text with a lot of options and across multiple lines', style);
+            this.richText.x = 30;
+            this.richText.y = 180;
+
+            this.stage.addChild(this.richText);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class TexturedMesh {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private strip: PIXI.mesh.Rope;
+
+        private graphics: PIXI.Graphics;
+
+        private count: number;
+
+        private points: PIXI.Point[];
+
+        private ropeLength: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.count = 0;
+
+            this.ropeLength = 918 / 20;
+            this.ropeLength = 45;
+
+            this.points = [];
+
+            for (var i = 0; i < 25; i++) {
+                this.points.push(new PIXI.Point(i * this.ropeLength, 0));
+            };
+
+            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage('../../_assets/snake.png'), this.points);
+            this.strip.position.x = -40;
+            this.strip.position.y = 300;
+            this.stage.addChild(this.strip);
+
+            this.graphics = new PIXI.Graphics();
+            this.graphics.x = this.strip.x;
+            this.graphics.y = this.strip.y;
+            this.stage.addChild(this.graphics);
+
+            //start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            this.count += 0.1;
+
+            //make the snake
+            for (var i = 0; i < this.points.length; i++) {
+
+                this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
+
+                this.points[i].x = i * this.ropeLength + Math.cos((i * 0.3) + this.count) * 20;
+
+            };
+
+            //render the stage
+            this.renderer.render(this.stage);
+
+            this.renderPoints();
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+        private renderPoints(): void {
+
+            this.graphics.clear();
+
+            this.graphics.lineStyle(2, 0xffc2c2);
+            this.graphics.moveTo(this.points[0].x, this.points[0].y);
+
+            for (var i = 1; i < this.points.length; i++) {
+                this.graphics.lineTo(this.points[i].x, this.points[i].y);
+            };
+
+            for (var i = 1; i < this.points.length; i++) {
+                this.graphics.beginFill(0xff0022);
+                this.graphics.drawCircle(this.points[i].x, this.points[i].y, 10);
+                this.graphics.endFill();
+            };
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class TilingSprite {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private texture: PIXI.Texture;
+
+        private tilingSprite: PIXI.extras.TilingSprite;
+
+        private count: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            //create a texture from an image path
+            this.texture = PIXI.Texture.fromImage('../../_assets/p2.jpeg');
+
+            /* create a tiling sprite ...
+             * requires a texture, a width and a height
+             * in WebGL the image size should preferably be a power of two
+             */
+            this.tilingSprite = new PIXI.extras.TilingSprite(this.texture, this.renderer.width, this.renderer.height);
+            this.stage.addChild(this.tilingSprite);
+
+            this.count = 0;
+
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            this.count += 0.005;
+
+            this.tilingSprite.tileScale.x = 2 + Math.sin(this.count);
+            this.tilingSprite.tileScale.y = 2 + Math.cos(this.count);
+
+            this.tilingSprite.tilePosition.x += 1;
+            this.tilingSprite.tilePosition.y += 1;
+
+            // render the root container
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace basics {
+
+    export class Video {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private texture: PIXI.Texture;
+
+        private videoSprite: PIXI.Sprite;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            //create a video texture from a path
+            this.texture = PIXI.Texture.fromVideo('../../_assets/testVideo.mp4');
+
+            //create a new sprite using the video texture (yes it's that easy)
+            this.videoSprite = new PIXI.Sprite(this.texture);
+            this.videoSprite.width = this.renderer.width;
+            this.videoSprite.height = this.renderer.height;
+            this.stage.addChild(this.videoSprite);
+
+            this.stage.addChild(this.videoSprite);
+
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            //render the stage
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class AlphaMask {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private background: PIXI.Container;
+
+        private cells: PIXI.Sprite;
+
+        private mask: PIXI.Sprite;
+
+        private target: PIXI.Point;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+            this.stage.interactive = true;
+
+            this.background = PIXI.Sprite.fromImage('../../_assets/bkg.jpg');
+            this.stage.addChild(this.background);
+
+            this.cells = PIXI.Sprite.fromImage('../../_assets/cells.png');
+            this.cells.scale.set(1.5, 1.5);
+
+            this.mask = PIXI.Sprite.fromImage('../../_assets/flowerTop.png');
+            this.mask.anchor.set(0.5);
+            this.mask.position.x = 310;
+            this.mask.position.y = 190;
+
+            this.cells.mask = this.mask;
+
+            this.stage.addChild(this.mask);
+
+            this.stage.addChild(this.cells);
+
+            this.target = new PIXI.Point();
+
+            this.reset();
+
+            this.animate();
+
+        }
+
+        private reset(): void {
+
+            this.target.x = Math.floor(Math.random() * 550);
+            this.target.y = Math.floor(Math.random() * 300);
+
+        }
+
+        private animate = (): void => {
+
+            this.mask.position.x += (this.target.x - this.mask.x) * 0.1;
+            this.mask.position.y += (this.target.y - this.mask.y) * 0.1;
+
+            if (Math.abs(this.mask.x - this.target.x) < 1) {
+                this.reset();
+            }
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class Batch {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private sprites: PIXI.ParticleContainer;
+
+        private maggots: BatchDude[];
+
+        private tick: number;
+
+        private dudeBounds: PIXI.Rectangle;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.sprites = new PIXI.ParticleContainer(10000, {
+
+                scale: true,
+                position: true,
+                rotation: true,
+                uvs: true,
+                alpha: true
+
+            });
+            this.stage.addChild(this.sprites);
+
+            // create an array to store all the sprites
+            this.maggots = [];
+
+            var totalSprites = this.renderer instanceof PIXI.WebGLRenderer ? 10000 : 100;
+
+            for (var i = 0; i < totalSprites; i++) {
+
+                // create a new Sprite
+                var dude = new BatchDude(PIXI.Texture.fromImage('../../_assets/tinyMaggot.png'));
+
+                dude.tint = Math.random() * 0xE8D4CD;
+
+                // set the anchor point so the texture is centerd on the sprite
+                dude.anchor.set(0.5);
+
+                // different maggots, different sizes
+                dude.scale.set(0.8 + Math.random() * 0.3);
+
+                // scatter them all
+                dude.x = Math.random() * this.renderer.width;
+                dude.y = Math.random() * this.renderer.height;
+
+                dude.tint = Math.random() * 0x808080;
+
+                // create a random direction in radians
+                dude.direction = Math.random() * Math.PI * 2;
+
+                // this number will be used to modify the direction of the sprite over time
+                dude.turningSpeed = Math.random() - 0.8;
+
+                // create a random speed between 0 - 2, and these maggots are slooww
+                dude.speed = (2 + Math.random() * 2) * 0.2;
+
+                dude.offset = Math.random() * 100;
+
+                // finally we push the dude into the maggots array so it it can be easily accessed later
+                this.maggots.push(dude);
+
+                this.sprites.addChild(dude);
+
+            }
+
+            // create a bounding box box for the little maggots
+            var dudeBoundsPadding = 100;
+            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
+                -dudeBoundsPadding,
+                this.renderer.width + dudeBoundsPadding * 2,
+                this.renderer.height + dudeBoundsPadding * 2);
+
+            this.tick = 0;
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            // iterate through the sprites and update their position
+            for (var i = 0; i < this.maggots.length; i++) {
+
+                var dude = this.maggots[i];
+                dude.scale.y = 0.95 + Math.sin(this.tick + dude.offset) * 0.05;
+                dude.direction += dude.turningSpeed * 0.01;
+                dude.position.x += Math.sin(dude.direction) * (dude.speed * dude.scale.y);
+                dude.position.y += Math.cos(dude.direction) * (dude.speed * dude.scale.y);
+                dude.rotation = -dude.direction + Math.PI;
+
+                // wrap the maggots
+                if (dude.position.x < this.dudeBounds.x) {
+                    dude.position.x += this.dudeBounds.width;
+                }
+                else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
+                    dude.position.x -= this.dudeBounds.width;
+                }
+
+                if (dude.position.y < this.dudeBounds.y) {
+                    dude.position.y += this.dudeBounds.height;
+                }
+                else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
+                    dude.position.y -= this.dudeBounds.height;
+                }
+            }
+
+            // increment the ticker
+            this.tick += 0.1;
+
+            // time to render the stage !
+            this.renderer.render(this.stage);
+
+            // request another animation frame...
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+    export class BatchDude extends PIXI.Sprite {
+
+        direction: number;
+        speed: number;
+        turningSpeed: number;
+        offset: number;
+
+        constructor(texture: PIXI.Texture) {
+
+            super(texture);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class BlendModes {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private background: PIXI.Sprite;
+
+        private dudeArray: BlendModesDude[];
+
+        private totalDudes: number;
+
+        private dudeBounds: PIXI.Rectangle;
+
+        private tick: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            // create a new background sprite
+            this.background = PIXI.Sprite.fromImage('../../_assets/BGrotate.jpg');
+            this.stage.addChild(this.background);
+
+            // create an array to store a reference to the dudes
+            this.dudeArray = [];
+
+            this.totalDudes = 20;
+
+            for (var i = 0; i < this.totalDudes; i++) {
+
+                // create a new Sprite that uses the image name that we just generated as its source
+                var dude = new BlendModesDude(PIXI.Texture.fromImage('../../_assets/flowerTop.png'));
+
+                dude.anchor.set(0.5);
+
+                // set a random scale for the dude
+                dude.scale.set(0.8 + Math.random() * 0.3);
+
+                // finally let's set the dude to be at a random position...
+                dude.position.x = Math.floor(Math.random() * this.renderer.width);
+                dude.position.y = Math.floor(Math.random() * this.renderer.height);
+
+                // The important bit of this example, this is how you change the default blend mode of the sprite
+                dude.blendMode = PIXI.BLEND_MODES.ADD;
+
+                // create some extra properties that will control movement
+                dude.direction = Math.random() * Math.PI * 2;
+
+                // this number will be used to modify the direction of the dude over time
+                dude.turningSpeed = Math.random() - 0.8;
+
+                // create a random speed for the dude between 0 - 2
+                dude.speed = 2 + Math.random() * 2;
+
+                // finally we push the dude into the dudeArray so it it can be easily accessed later
+                this.dudeArray.push(dude);
+
+                this.stage.addChild(dude);
+
+            }
+
+            // create a bounding box box for the little maggots
+            var dudeBoundsPadding = 100;
+            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
+                -dudeBoundsPadding,
+                this.renderer.width + dudeBoundsPadding * 2,
+                this.renderer.height + dudeBoundsPadding * 2);
+
+            this.tick = 0;
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            // iterate through the dudes and update the positions
+            for (var i = 0; i < this.dudeArray.length; i++) {
+
+                var dude = this.dudeArray[i];
+                dude.direction += dude.turningSpeed * 0.01;
+                dude.position.x += Math.sin(dude.direction) * dude.speed;
+                dude.position.y += Math.cos(dude.direction) * dude.speed;
+                dude.rotation = -dude.direction - Math.PI / 2;
+
+                // wrap the dudes by testing their bounds...
+                if (dude.position.x < this.dudeBounds.x) {
+                    dude.position.x += this.dudeBounds.width;
+                }
+                else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
+                    dude.position.x -= this.dudeBounds.width;
+                }
+
+                if (dude.position.y < this.dudeBounds.y) {
+                    dude.position.y += this.dudeBounds.height;
+                }
+                else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
+                    dude.position.y -= this.dudeBounds.height;
+                }
+            }
+
+            // increment the ticker
+            this.tick += 0.1;
+
+            // time to render the stage !
+            this.renderer.render(this.stage);
+
+            // request another animation frame...
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+    export class BlendModesDude extends PIXI.Sprite {
+
+        direction: number;
+        speed: number;
+        turningSpeed: number;
+        offset: number;
+
+        constructor(texture: PIXI.Texture) {
+
+            super(texture);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class CacheAsBitmap {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private aliens: PIXI.Sprite[];
+
+        private alienContainer: PIXI.Container;
+
+        private count: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            // load resources
+            PIXI.loader
+                .add('spritesheet', '../../_assets/monsters.json')
+                .load(this.onAssetsLoaded);
+
+            // holder to store aliens
+            this.aliens = [];
+
+            this.count = 0;
+
+            // create an empty container
+            this.alienContainer = new PIXI.Container();
+            this.alienContainer.position.x = 400;
+            this.alienContainer.position.y = 300;
+
+            // make the stage interactive
+            this.stage.interactive = true;
+
+            this.stage.addChild(this.alienContainer);
+
+            this.stage.on('click', this.onClick);
+            this.stage.on('tap', this.onClick);
+
+        }
+
+        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
+
+            this.alienContainer.cacheAsBitmap = !this.alienContainer.cacheAsBitmap;
+
+            //feel free to play with what's below
+            //var sprite = new PIXI.Sprite(this.alienContainer.generateTexture());
+            //this.stage.addChild(sprite);
+            //sprite.position.x = Math.random() * 800;
+            //sprite.position.y = Math.random() * 600;
+
+        }
+
+        private onAssetsLoaded = (): void => {
+
+            // add a bunch of aliens with textures from image paths
+
+            var alienFrames = ['eggHead.png', 'flowerTop.png', 'helmlok.png', 'skully.png'];
+
+            for (var i = 0; i < 100; i++) {
+
+                var frameName = alienFrames[i % 4];
+
+                // create an alien using the frame name..
+                var alien = PIXI.Sprite.fromFrame(frameName);
+                alien.tint = Math.random() * 0xFFFFFF;
+
+                /*
+                 * fun fact for the day :)
+                 * another way of doing the above would be
+                 * var texture = PIXI.Texture.fromFrame(frameName);
+                 * var alien = new PIXI.Sprite(texture);
+                 */
+                alien.position.x = Math.random() * 800 - 400;
+                alien.position.y = Math.random() * 600 - 300;
+                alien.anchor.x = 0.5;
+                alien.anchor.y = 0.5;
+                this.aliens.push(alien);
+                this.alienContainer.addChild(alien);
+
+            }
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            // let's rotate the aliens a little bit
+            for (var i = 0; i < 100; i++) {
+                var alien = this.aliens[i];
+                alien.rotation += 0.1;
+            }
+
+            this.count += 0.01;
+
+            this.alienContainer.scale.x = Math.sin(this.count);
+            this.alienContainer.scale.y = Math.sin(this.count);
+
+            this.alienContainer.rotation += 0.01;
+
+            // render the stage
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class DraggableBunny extends PIXI.Sprite {
+
+        //todo I dont know what event.data is at this time
+        private data: any;
+
+        private dragging: boolean;
+
+        constructor(texture?: PIXI.Texture) {
+
+            super(texture);
+
+            // enable the bunny to be interactive... this will allow it to respond to mouse and touch events
+            this.interactive = true;
+
+            // this button mode will mean the hand cursor appears when you roll over the bunny with your mouse
+            this.buttonMode = true;
+
+            // center the bunny's anchor point
+            this.anchor.set(0.5);
+
+            // make it a bit bigger, so it's easier to grab
+            this.scale.set(3);
+
+            // setup events
+            this
+            // events for drag start
+                .on('mousedown', this.onDragStart)
+                .on('touchstart', this.onDragStart)
+            // events for drag end
+                .on('mouseup', this.onDragEnd)
+                .on('mouseupoutside', this.onDragEnd)
+                .on('touchend', this.onDragEnd)
+                .on('touchendoutside', this.onDragEnd)
+            // events for drag move
+                .on('mousemove', this.onDragMove)
+                .on('touchmove', this.onDragMove);
+
+        }
+
+        private onDragStart = (event: PIXI.interaction.InteractionEvent): void => {
+
+            // store a reference to the data
+            // the reason for this is because of multitouch
+            // we want to track the movement of this particular touch
+            this.data = event.data;
+            this.alpha = 0.5;
+            this.dragging = true;
+
+        }
+
+        private onDragEnd = (event: PIXI.interaction.InteractionEvent): void => {
+
+            //set interactiondata to null
+            this.data = null;
+            this.alpha = 1;
+            this.dragging = false;
+
+        }
+
+        private onDragMove = (event: PIXI.interaction.InteractionEvent): void => {
+
+            if (this.dragging) {
+                var newPosition = this.data.getLocalPosition(this.parent);
+                this.position.x = newPosition.x;
+                this.position.y = newPosition.y;
+            }
+
+        }
+
+    }
+
+    export class Dragging {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private texture: PIXI.Texture;
+
+        private data: PIXI.interaction.InteractionData;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            //create a texture from an image
+            this.texture = PIXI.Texture.fromImage('../../_assets/bunny.png');
+
+            for (var i = 0; i < 10; i++) {
+                this.createBunny(Math.floor(Math.random() * 800), Math.floor(Math.random() * 600));
+            }
+
+            // start animating
+            this.animate();
+
+        }
+
+        private createBunny(x: number, y: number): void {
+
+            // create our little bunny friend..
+            var bunny = new DraggableBunny(this.texture);
+
+            // move the sprite to its designated position
+            bunny.position.x = x;
+            bunny.position.y = y;
+
+            // add it to the stage
+            this.stage.addChild(bunny);
+
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class GraphicsDemo {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private thing: PIXI.Graphics;
+
+        private graphics: PIXI.Graphics;
+
+        private count: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+            this.stage.interactive = true;
+
+            this.graphics = new PIXI.Graphics();
+
+            // set a fill and line style
+            this.graphics.beginFill(0xFF3300);
+            this.graphics.lineStyle(10, 0xffd900, 1);
+
+            // draw a shape
+            this.graphics.moveTo(50, 50);
+            this.graphics.lineTo(250, 50);
+            this.graphics.lineTo(100, 100);
+            this.graphics.lineTo(250, 220);
+            this.graphics.lineTo(50, 220);
+            this.graphics.lineTo(50, 50);
+            this.graphics.endFill();
+
+            // set a fill and line style again
+            this.graphics.lineStyle(10, 0xFF0000, 0.8);
+            this.graphics.beginFill(0xFF700B, 1);
+
+            // draw a second shape
+            this.graphics.moveTo(210, 300);
+            this.graphics.lineTo(450, 320);
+            this.graphics.lineTo(570, 350);
+            this.graphics.quadraticCurveTo(600, 0, 480, 100);
+            this.graphics.lineTo(330, 120);
+            this.graphics.lineTo(410, 200);
+            this.graphics.lineTo(210, 300);
+            this.graphics.endFill();
+
+            // draw a rectangle
+            this.graphics.lineStyle(2, 0x0000FF, 1);
+            this.graphics.drawRect(50, 250, 100, 100);
+
+            // draw a circle
+            this.graphics.lineStyle(0);
+            this.graphics.beginFill(0xFFFF0B, 0.5);
+            this.graphics.drawCircle(470, 200, 100);
+            this.graphics.endFill();
+
+            this.graphics.lineStyle(20, 0x33FF00);
+            this.graphics.moveTo(30, 30);
+            this.graphics.lineTo(600, 300);
+
+            this.stage.addChild(this.graphics);
+
+            // let's create a moving shape
+            this.thing = new PIXI.Graphics();
+            this.stage.addChild(this.thing);
+            this.thing.position.x = 620 / 2;
+            this.thing.position.y = 380 / 2;
+
+            this.count = 0;
+
+            // Just click on the stage to draw random lines
+            this.stage.on('click', this.onClick);
+            this.stage.on('tap', this.onClick);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
+
+            this.graphics.lineStyle(Math.random() * 30, Math.random() * 0xFFFFFF, 1);
+            this.graphics.moveTo(Math.random() * 620, Math.random() * 380);
+            this.graphics.bezierCurveTo(Math.random() * 620, Math.random() * 380,
+                Math.random() * 620, Math.random() * 380,
+                Math.random() * 620, Math.random() * 380);
+        }
+
+        private animate = (): void => {
+
+            this.thing.clear();
+
+            this.count += 0.1;
+
+            this.thing.clear();
+            this.thing.lineStyle(10, 0xff0000, 1);
+            this.thing.beginFill(0xffFF00, 0.5);
+
+            this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
+            this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
+            this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
+            this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
+            this.thing.lineTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
+
+            this.thing.rotation = this.count * 0.1;
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class Interactivity {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private background: PIXI.Sprite;
+
+        private buttons: InteractivityButton[];
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            // create a background...
+            this.background = PIXI.Sprite.fromImage('../../_assets/button_test_BG.jpg');
+            this.background.width = this.renderer.width;
+            this.background.height = this.renderer.height;
+
+            // add background to stage...
+            this.stage.addChild(this.background);
+
+            this.buttons = [];
+
+            var buttonPositions = [
+                175, 75,
+                655, 75,
+                410, 325,
+                150, 465,
+                685, 445
+            ];
+
+            function noop(): void {
+                console.log('click');
+            }
+
+            // create some textures from an image path
+            var textureButton = PIXI.Texture.fromImage('../../_assets/button.png');
+            var textureButtonDown = PIXI.Texture.fromImage('../../_assets/buttonDown.png');
+            var textureButtonOver = PIXI.Texture.fromImage('../../_assets/buttonOver.png');
+
+            for (var i = 0; i < 5; i++) {
+
+                var button = new InteractivityButton(textureButton, textureButtonDown, textureButtonOver);
+
+                button.position.x = buttonPositions[i * 2];
+                button.position.y = buttonPositions[i * 2 + 1];
+
+                button.tap = noop;
+                button.click = noop;
+
+                // add it to the stage
+                this.stage.addChild(button);
+
+                // add button to array
+                this.buttons.push(button);
+
+            }
+
+            // set some silly values...
+            this.buttons[0].scale.set(1.2);
+
+            this.buttons[2].rotation = Math.PI / 10;
+
+            this.buttons[3].scale.set(0.8);
+
+            this.buttons[4].scale.set(0.8, 1.2);
+            this.buttons[4].rotation = Math.PI;
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+    export class InteractivityButton extends PIXI.Sprite {
+
+        private textureButton: PIXI.Texture;
+        private textureButtonDown: PIXI.Texture;
+        private textureButtonOver: PIXI.Texture;
+
+        tap: Function;
+        click: Function;
+
+        isdown: boolean;
+        isOver: boolean;
+
+        constructor(textureButton: PIXI.Texture, textureButtonDown: PIXI.Texture, textureButtonOver: PIXI.Texture) {
+
+            super(textureButton);
+
+            // create some textures from an image path
+            this.textureButton = textureButton;
+            this.textureButtonDown = textureButtonDown;
+            this.textureButtonOver = textureButtonOver;
+
+            this.buttonMode = true;
+            this.anchor.set(0.5);
+
+            // make the button interactive...
+            this.interactive = true;
+
+            this
+            // set the mousedown and touchstart callback...
+                .on('mousedown', this.onButtonDown)
+                .on('touchstart', this.onButtonDown)
+
+            // set the mouseup and touchend callback...
+                .on('mouseup', this.onButtonUp)
+                .on('touchend', this.onButtonUp)
+                .on('mouseupoutside', this.onButtonUp)
+                .on('touchendoutside', this.onButtonUp)
+
+            // set the mouseover callback...
+                .on('mouseover', this.onButtonOver)
+
+            // set the mouseout callback...
+                .on('mouseout', this.onButtonOut)
+
+            // you can also listen to click and tap events :
+            //.on('click', this.noop)
+
+        }
+
+        private onButtonDown = (event: PIXI.interaction.InteractionEvent): void => {
+
+            this.isdown = true;
+            this.texture = this.textureButtonDown;
+            this.alpha = 1;
+
+        }
+
+        private onButtonUp = (event: PIXI.interaction.InteractionEvent): void => {
+
+            this.isdown = false;
+
+            if (this.isOver) {
+                this.texture = this.textureButtonOver;
+            }
+            else {
+                this.texture = this.textureButton;
+            }
+        }
+
+        private onButtonOver = (event: PIXI.interaction.InteractionEvent): void => {
+
+            this.isOver = true;
+
+            if (this.isdown) {
+                return;
+            }
+
+            this.texture = this.textureButtonOver;
+
+        }
+
+        private onButtonOut = (event: PIXI.interaction.InteractionEvent): void => {
+
+            this.isOver = false;
+
+            if (this.isdown) {
+                return;
+            }
+
+            this.texture = this.textureButton;
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class Masking {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private bg: PIXI.Sprite;
+
+        private container: PIXI.Container;
+
+        private bgFront: PIXI.Sprite;
+
+        private light1: PIXI.Sprite;
+
+        private light2: PIXI.Sprite;
+
+        private panda: PIXI.Sprite;
+
+        private thing: PIXI.Graphics;
+
+        private count: number;
+
+        private help: PIXI.Text;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb, antialias: true });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+            this.stage.interactive = true;
+
+            this.bg = PIXI.Sprite.fromImage('../../_assets/BGrotate.jpg');
+            this.bg.anchor.x = 0.5;
+            this.bg.anchor.y = 0.5;
+
+            this.bg.position.x = this.renderer.width / 2;
+            this.bg.position.y = this.renderer.height / 2;
+
+            this.stage.addChild(this.bg);
+
+            this.container = new PIXI.Container();
+            this.container.position.x = this.renderer.width / 2;
+            this.container.position.y = this.renderer.height / 2;
+
+            // add a bunch of sprites
+
+            this.bgFront = PIXI.Sprite.fromImage('../../_assets/SceneRotate.jpg');
+            this.bgFront.anchor.x = 0.5;
+            this.bgFront.anchor.y = 0.5;
+
+            this.container.addChild(this.bgFront);
+
+            this.light2 = PIXI.Sprite.fromImage('../../_assets/LightRotate2.png');
+            this.light2.anchor.x = 0.5;
+            this.light2.anchor.y = 0.5;
+            this.container.addChild(this.light2);
+
+            this.light1 = PIXI.Sprite.fromImage('../../_assets/LightRotate1.png');
+            this.light1.anchor.x = 0.5;
+            this.light1.anchor.y = 0.5;
+            this.container.addChild(this.light1);
+
+            this.panda = PIXI.Sprite.fromImage('../../_assets/panda.png');
+            this.panda.anchor.x = 0.5;
+            this.panda.anchor.y = 0.5;
+
+            this.container.addChild(this.panda);
+
+            this.stage.addChild(this.container);
+
+            // let's create a moving shape
+            this.thing = new PIXI.Graphics();
+            this.stage.addChild(this.thing);
+            this.thing.position.x = this.renderer.width / 2;
+            this.thing.position.y = this.renderer.height / 2;
+            this.thing.lineStyle(0);
+
+            this.container.mask = this.thing;
+
+            this.count = 0;
+
+            this.stage.on('click', this.onClick);
+            this.stage.on('tap', this.onClick);
+
+            this.help = new PIXI.Text('Click to turn masking on / off.', { font: 'bold 12pt Arial', fill: 'white' });
+            this.help.position.y = this.renderer.height - 26;
+            this.help.position.x = 10;
+            this.stage.addChild(this.help);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            this.bg.rotation += 0.01;
+            this.bgFront.rotation -= 0.01;
+
+            this.light1.rotation += 0.02;
+            this.light2.rotation += 0.01;
+
+            this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
+            this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
+
+            this.count += 0.1;
+
+            this.thing.clear();
+
+            this.thing.beginFill(0x8bc5ff, 0.4);
+            this.thing.moveTo(-120 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
+            this.thing.lineTo(-320 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
+            this.thing.lineTo(120 + Math.cos(this.count) * 20, -100 + Math.sin(this.count) * 20);
+            this.thing.lineTo(120 + Math.sin(this.count) * 20, 100 + Math.cos(this.count) * 20);
+            this.thing.lineTo(-120 + Math.cos(this.count) * 20, 100 + Math.sin(this.count) * 20);
+            this.thing.lineTo(-120 + Math.sin(this.count) * 20, -300 + Math.cos(this.count) * 20);
+            this.thing.lineTo(-320 + Math.sin(this.count) * 20, -100 + Math.cos(this.count) * 20);
+            this.thing.rotation = this.count * 0.1;
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+        private onClick = (event: PIXI.interaction.InteractionEvent): void => {
+
+            if (!this.container.mask) {
+                this.container.mask = this.thing;
+            }
+            else {
+                this.container.mask = null;
+            }
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class MovieClipDemo {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            PIXI.loader
+                .add('spritesheet', '../../_assets/mc.json')
+                .load(this.onAssetsLoaded);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private onAssetsLoaded = (loader: PIXI.loaders.Loader): void => {
+
+            // create an array to store the textures
+            var explosionTextures: PIXI.Texture[] = [];
+            var i: number;
+
+            for (i = 0; i < 26; i++) {
+
+                var texture = PIXI.Texture.fromFrame('Explosion_Sequence_A ' + (i + 1) + '.png');
+                explosionTextures.push(texture);
+
+            }
+
+            for (i = 0; i < 50; i++) {
+
+                // create an explosion MovieClip
+                var explosion = new PIXI.extras.MovieClip(explosionTextures);
+
+                explosion.position.x = Math.random() * 800;
+                explosion.position.y = Math.random() * 600;
+                explosion.anchor.x = 0.5;
+                explosion.anchor.y = 0.5;
+
+                explosion.rotation = Math.random() * Math.PI;
+
+                explosion.scale.set(0.75 + Math.random() * 0.5);
+
+                explosion.gotoAndPlay(Math.random() * 27);
+
+                this.stage.addChild(explosion);
+
+            }
+
+            // start animating
+            this.animate();
+        }
+
+        private animate = (): void => {
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class RenderTextureDemo {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private renderTexture: PIXI.RenderTexture;
+        private renderTexture2: PIXI.RenderTexture;
+        private currentTexture: PIXI.RenderTexture;
+
+        private outputSprite: PIXI.Sprite;
+        private stuffContainer: PIXI.Container;
+        private items: PIXI.Sprite[];
+
+        private count: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            // create two render textures... these dynamic textures will be used to draw the scene into itself
+            this.renderTexture = new PIXI.RenderTexture(this.renderer, this.renderer.width, this.renderer.height);
+            this.renderTexture2 = new PIXI.RenderTexture(this.renderer, this.renderer.width, this.renderer.height);
+            this.currentTexture = this.renderTexture;
+
+            // create a new sprite that uses the render texture we created above
+            this.outputSprite = new PIXI.Sprite(this.currentTexture);
+
+            // align the sprite
+            this.outputSprite.position.x = 400;
+            this.outputSprite.position.y = 300;
+            this.outputSprite.anchor.set(0.5);
+
+            // add to stage
+            this.stage.addChild(this.outputSprite);
+
+            this.stuffContainer = new PIXI.Container();
+
+            this.stuffContainer.position.x = 400;
+            this.stuffContainer.position.y = 300;
+
+            this.stage.addChild(this.stuffContainer);
+
+            // create an array of image ids..
+            var fruits = [
+                '../../_assets/spinObj_01.png',
+                '../../_assets/spinObj_02.png',
+                '../../_assets/spinObj_03.png',
+                '../../_assets/spinObj_04.png',
+                '../../_assets/spinObj_05.png',
+                '../../_assets/spinObj_06.png',
+                '../../_assets/spinObj_07.png',
+                '../../_assets/spinObj_08.png'
+            ];
+
+            // create an array of items
+            this.items = [];
+
+            // now create some items and randomly position them in the stuff container
+            for (var i = 0; i < 20; i++) {
+
+                var item = PIXI.Sprite.fromImage(fruits[i % fruits.length]);
+                item.position.x = Math.random() * 400 - 200;
+                item.position.y = Math.random() * 400 - 200;
+
+                item.anchor.set(0.5);
+
+                this.stuffContainer.addChild(item);
+
+                this.items.push(item);
+
+            }
+
+            // used for spinning!
+            this.count = 0;
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            for (var i = 0; i < this.items.length; i++) {
+                // rotate each item
+                var item = this.items[i];
+                item.rotation += 0.1;
+            }
+
+            this.count += 0.01;
+
+            // swap the buffers ...
+            var temp = this.renderTexture;
+            this.renderTexture = this.renderTexture2;
+            this.renderTexture2 = temp;
+
+            // set the new texture
+            this.outputSprite.texture = this.renderTexture;
+
+            // twist this up!
+            this.stuffContainer.rotation -= 0.01;
+            this.outputSprite.scale.set(1 + Math.sin(this.count) * 0.2);
+
+            // render the stage to the texture
+            // the 'true' clears the texture before the content is rendered
+            this.renderTexture2.render(this.stage, null, false);
+
+            // and finally render the stage
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class StripDemo {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private count: number;
+
+        private points: PIXI.Point[];
+
+        private strip: PIXI.mesh.Rope;
+
+        private snakeContainer: PIXI.Container;
+
+        private ropeLength: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.count = 0;
+
+            // build a rope!
+            this.ropeLength = 918 / 20;
+
+            this.points = [];
+
+            for (var i = 0; i < 20; i++) {
+                this.points.push(new PIXI.Point(i * this.ropeLength, 0));
+            }
+
+            this.strip = new PIXI.mesh.Rope(PIXI.Texture.fromImage('../../_assets/snake.png'), this.points);
+            this.strip.x = -459;
+
+            this.snakeContainer = new PIXI.Container();
+            this.snakeContainer.position.x = 400;
+            this.snakeContainer.position.y = 300;
+
+            this.snakeContainer.scale.set(800 / 1100);
+            this.stage.addChild(this.snakeContainer);
+
+            this.snakeContainer.addChild(this.strip);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            this.count += 0.1;
+
+            // make the snake
+            for (var i = 0; i < this.points.length; i++) {
+
+                this.points[i].y = Math.sin((i * 0.5) + this.count) * 30;
+
+                this.points[i].x = i * this.ropeLength + Math.cos((i * 0.3) + this.count) * 20;
+
+            }
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class TextDemo {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private bitmapFontText: PIXI.extras.BitmapText;
+
+        private background: PIXI.Sprite;
+
+        private textSample: PIXI.Text;
+
+        private spinningText: PIXI.Text;
+
+        private countingText: PIXI.Text;
+
+        private count: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            PIXI.loader
+                .add('desyrel', '../../_assets/desyrel.xml')
+                .load(this.onAssetsLoaded);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private onAssetsLoaded = (): void  => {
+
+            this.bitmapFontText = new PIXI.extras.BitmapText('bitmap fonts are\n now supported!', { font: '35px Desyrel', align: 'right' });
+
+            this.bitmapFontText.position.x = 600 - this.bitmapFontText.textWidth;
+            this.bitmapFontText.position.y = 20;
+
+            this.stage.addChild(this.bitmapFontText);
+
+            // add a shiny background...
+            this.background = PIXI.Sprite.fromImage('../../_assets/textDemoBG.jpg');
+            this.stage.addChild(this.background);
+
+            // create some white text using the Snippet webfont
+            this.textSample = new PIXI.Text('Pixi.js can has\n multiline text!', { font: '35px Snippet', fill: 'white', align: 'left' });
+            this.textSample.position.set(20);
+
+            // create a text object with a nice stroke
+            this.spinningText = new PIXI.Text('I\'m fun!', { font: 'bold 60px Arial', fill: '#cc00ff', align: 'center', stroke: '#FFFFFF', strokeThickness: 6 });
+
+            // setting the anchor point to 0.5 will center align the text... great for spinning!
+            this.spinningText.anchor.set(0.5);
+            this.spinningText.position.x = 310;
+            this.spinningText.position.y = 200;
+
+            // create a text object that will be updated...
+            this.countingText = new PIXI.Text('COUNT 4EVAR: 0', { font: 'bold italic 60px Arvo', fill: '#3e1707', align: 'center', stroke: '#a4410e', strokeThickness: 7 });
+
+            this.countingText.position.x = 310;
+            this.countingText.position.y = 320;
+            this.countingText.anchor.x = 0.5;
+
+            this.stage.addChild(this.textSample);
+            this.stage.addChild(this.spinningText);
+            this.stage.addChild(this.countingText);
+
+            this.count = 0;
+
+        }
+
+        private animate = (): void => {
+
+
+            this.renderer.render(this.stage);
+
+            this.count += 0.05;
+
+            // update the text with a new string
+            this.countingText.text = 'COUNT 4EVAR: ' + Math.floor(this.count);
+
+            // let's spin the spinning text
+            this.spinningText.rotation += 0.03;
+
+            requestAnimationFrame(this.animate);
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class TextureSwap {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private bol: boolean;
+
+        private texture: PIXI.Texture;
+        private secondTexture: PIXI.Texture;
+
+        private dude: PIXI.Sprite;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.bol = false;
+
+            //an image path
+            this.texture = PIXI.Texture.fromImage('../../_assets/flowerTop.png');
+
+            // create a second texture
+            this.secondTexture = PIXI.Texture.fromImage('../../_assets/eggHead.png');
+
+            // create a new Sprite using the texture
+            this.dude = new PIXI.Sprite(this.texture);
+
+            // center the sprites anchor point
+            this.dude.anchor.set(0.5);
+
+            // move the sprite to the center of the screen
+            this.dude.position.x = this.renderer.width / 2;
+            this.dude.position.y = this.renderer.height / 2;
+
+            this.stage.addChild(this.dude);
+
+            // make the sprite interactive
+            this.dude.interactive = true;
+
+            this.dude.on('click', (): void => {
+                this.bol = !this.bol;
+
+                if (this.bol) {
+                    this.dude.texture = this.secondTexture;
+                }
+                else {
+                    this.dude.texture = this.texture;
+                }
+            });
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            // just for fun, let's rotate mr rabbit a little
+            this.dude.rotation += 0.1;
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class Tinting {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private totalDudes: number = 10;
+        private aliens: TintingDude[];
+
+        private dudeBounds: PIXI.Rectangle;
+
+        private tick: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            // holder to store the aliens
+            this.aliens = [];
+
+            this.tick = 0;
+
+            for (var i = 0; i < this.totalDudes; i++) {
+
+                // create a new Sprite that uses the image name that we just generated as its source
+                var dude = new TintingDude();
+
+                // set the anchor point so the texture is centerd on the sprite
+                dude.anchor.set(0.5);
+
+                // set a random scale for the dude - no point them all being the same size!
+                dude.scale.set(0.8 + Math.random() * 0.3);
+
+                // finally lets set the dude to be at a random position..
+                dude.position.x = Math.random() * this.renderer.width;
+                dude.position.y = Math.random() * this.renderer.height;
+
+                dude.tint = Math.random() * 0xFFFFFF;
+
+                // create some extra properties that will control movement :
+                // create a random direction in radians. This is a number between 0 and PI*2 which is the equivalent of 0 - 360 degrees
+                dude.direction = Math.random() * Math.PI * 2;
+
+                // this number will be used to modify the direction of the dude over time
+                dude.turningSpeed = Math.random() - 0.8;
+
+                // create a random speed for the dude between 0 - 2
+                dude.speed = 2 + Math.random() * 2;
+
+                // finally we push the dude into the aliens array so it it can be easily accessed later
+                this.aliens.push(dude);
+
+                this.stage.addChild(dude);
+
+            }
+
+            // create a bounding box for the little dudes
+            var dudeBoundsPadding = 100;
+            this.dudeBounds = new PIXI.Rectangle(-dudeBoundsPadding,
+                -dudeBoundsPadding,
+                this.renderer.width + dudeBoundsPadding * 2,
+                this.renderer.height + dudeBoundsPadding * 2);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            // iterate through the dudes and update their position
+            for (var i = 0; i < this.aliens.length; i++) {
+
+                var dude = this.aliens[i];
+                dude.direction += dude.turningSpeed * 0.01;
+                dude.position.x += Math.sin(dude.direction) * dude.speed;
+                dude.position.y += Math.cos(dude.direction) * dude.speed;
+                dude.rotation = -dude.direction - Math.PI / 2;
+
+                // wrap the dudes by testing their bounds...
+                if (dude.position.x < this.dudeBounds.x) {
+                    dude.position.x += this.dudeBounds.width;
+                }
+                else if (dude.position.x > this.dudeBounds.x + this.dudeBounds.width) {
+                    dude.position.x -= this.dudeBounds.width;
+                }
+
+                if (dude.position.y < this.dudeBounds.y) {
+                    dude.position.y += this.dudeBounds.height;
+                }
+                else if (dude.position.y > this.dudeBounds.y + this.dudeBounds.height) {
+                    dude.position.y -= this.dudeBounds.height;
+                }
+
+            }
+
+            // increment the ticker
+            this.tick += 0.1;
+
+            requestAnimationFrame(this.animate);
+
+            this.renderer.render(this.stage);
+
+        }
+
+    }
+
+    export class TintingDude extends PIXI.Sprite {
+
+        direction: number;
+        speed: number;
+        turningSpeed: number;
+
+        constructor() {
+            super(PIXI.Texture.fromImage('../../_assets/eggHead.png'));
+        }
+
+    }
+
+}
+
+namespace demos {
+
+    export class TransparentBackground {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private bunny: PIXI.Sprite;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600, { backgroundColor: 0x1099bb, transparent: true });
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            // create a new Sprite from an image path.
+            this.bunny = PIXI.Sprite.fromImage('../../_assets/bunny.png');
+
+            // center the sprite's anchor point
+            this.bunny.anchor.set(0.5);
+
+            // move the sprite to the center of the screen
+            this.bunny.position.x = 200;
+            this.bunny.position.y = 150;
+
+            this.stage.addChild(this.bunny);
+
+            // start animating
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            // just for fun, let's rotate mr rabbit a little
+            this.bunny.rotation += 0.1;
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace filters {
+
+    export class Blur {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private bg: PIXI.Sprite;
+
+        private littleDudes: PIXI.Sprite;
+        private littleRobot: PIXI.Sprite;
+
+        private blurFilter1: PIXI.filters.BlurFilter;
+        private blurFilter2: PIXI.filters.BlurFilter;
+
+        private count: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600);
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+
+            this.bg = PIXI.Sprite.fromImage('../../_assets/depth_blur_BG.jpg');
+            this.bg.width = this.renderer.width;
+            this.bg.height = this.renderer.height;
+            this.stage.addChild(this.bg);
+
+            this.littleDudes = PIXI.Sprite.fromImage('../../_assets/depth_blur_dudes.jpg');
+            this.littleDudes.position.x = (this.renderer.width / 2) - 315;
+            this.littleDudes.position.y = 200;
+            this.stage.addChild(this.littleDudes);
+
+            this.littleRobot = PIXI.Sprite.fromImage('../../_assets/depth_blur_moby.jpg');
+            this.littleRobot.position.x = (this.renderer.width / 2) - 200;
+            this.littleRobot.position.y = 100;
+            this.stage.addChild(this.littleRobot);
+
+            this.blurFilter1 = new PIXI.filters.BlurFilter();
+            this.blurFilter2 = new PIXI.filters.BlurFilter();
+
+            this.littleDudes.filters = [this.blurFilter1];
+            this.littleRobot.filters = [this.blurFilter2];
+
+            this.count = 0;
+
+            //nimate
+            this.animate();
+
+        }
+
+        private animate = (): void => {
+
+            this.count += 0.005;
+
+            var blurAmount = Math.cos(this.count);
+            var blurAmount2 = Math.sin(this.count);
+
+            this.blurFilter1.blur = 20 * (blurAmount);
+            this.blurFilter2.blur = 20 * (blurAmount2);
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
+
+namespace filters {
+
+    export class DisplacementMap {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private container: PIXI.Container;
+
+        private padding: number;
+
+        private bounds: PIXI.Rectangle;
+
+        private maggots: DisplacementMapDude[];
+
+        private displacementSprite: PIXI.Sprite;
+
+        private displacementFilter: PIXI.filters.DisplacementFilter;
+
+        private ring: PIXI.Sprite;
+
+        private bg: PIXI.Sprite;
+
+        private count: number;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600);
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+            this.stage.interactive = true;
+
+            this.container = new PIXI.Container();
+            this.stage.addChild(this.container);
+
+            this.padding = 100;
+
+            this.bounds = new PIXI.Rectangle(-this.padding, -this.padding, this.renderer.width + this.padding * 2, this.renderer.height + this.padding * 2);
+            this.maggots = [];
+
+            for (var i = 0; i < 20; i++) {
+
+                var maggot = new DisplacementMapDude();
+                maggot.anchor.set(0.5);
+                this.container.addChild(maggot);
+
+                maggot.direction = Math.random() * Math.PI * 2;
+                maggot.speed = 1;
+                maggot.turnSpeed = Math.random() - 0.8;
+
+                maggot.position.x = Math.random() * this.bounds.width;
+                maggot.position.y = Math.random() * this.bounds.height;
+
+                maggot.scale.set(1 + Math.random() * 0.3);
+                maggot.original = maggot.scale.clone();
+                this.maggots.push(maggot);
+
+            }
+
+            this.displacementSprite = PIXI.Sprite.fromImage('../../_assets/displace.png');
+            this.displacementFilter = new PIXI.filters.DisplacementFilter(this.displacementSprite);
+
+            this.stage.addChild(this.displacementSprite);
+
+            this.container.filters = [this.displacementFilter];
+
+            this.displacementFilter.scale.x = 110;
+            this.displacementFilter.scale.y = 110;
+
+            this.ring = PIXI.Sprite.fromImage('../../_assets/ring.png');
+
+            this.ring.anchor.set(0.5);
+
+            this.ring.visible = false;
+
+            this.stage.addChild(this.ring);
+
+            this.bg = PIXI.Sprite.fromImage('../../_assets/bkg-grass.jpg');
+            this.bg.width = this.renderer.width;
+            this.bg.height = this.renderer.height;
+
+            this.bg.alpha = 0.4;
+
+            this.container.addChild(this.bg);
+
+            this.stage
+                .on('mousemove', this.onPointerMove)
+                .on('touchmove', this.onPointerMove);
+
+            this.count = 0;
+
+            this.animate();
+
+        }
+
+        private onPointerMove = (eventData: PIXI.interaction.InteractionEvent): void => {
+
+            this.ring.visible = true;
+
+            this.displacementSprite.x = eventData.data.global.x - 100;
+            this.displacementSprite.y = eventData.data.global.y - this.displacementSprite.height / 2;
+
+            this.ring.position.x = eventData.data.global.x - 25;
+            this.ring.position.y = eventData.data.global.y;
+
+        };
+
+        private animate = (): void => {
+
+            this.count += 0.05;
+
+            for (var i = 0; i < this.maggots.length; i++) {
+                var maggot = this.maggots[i];
+
+                maggot.direction += maggot.turnSpeed * 0.01;
+                maggot.position.x += Math.sin(maggot.direction) * maggot.speed;
+                maggot.position.y += Math.cos(maggot.direction) * maggot.speed;
+
+                maggot.rotation = -maggot.direction - Math.PI / 2;
+
+                maggot.scale.x = maggot.original.x + Math.sin(this.count) * 0.2;
+
+                // wrap the maggots around as the crawl
+                if (maggot.position.x < this.bounds.x) {
+                    maggot.position.x += this.bounds.width;
+                }
+                else if (maggot.position.x > this.bounds.x + this.bounds.width) {
+                    maggot.position.x -= this.bounds.width;
+                }
+
+                if (maggot.position.y < this.bounds.y) {
+                    maggot.position.y += this.bounds.height;
+                }
+                else if (maggot.position.y > this.bounds.y + this.bounds.height) {
+                    maggot.position.y -= this.bounds.height;
+                }
+            }
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        };
+
+    }
+
+    export class DisplacementMapDude extends PIXI.Sprite {
+
+        direction: number;
+        speed: number;
+        turnSpeed: number;
+        original: PIXI.Point;
+
+        constructor() {
+
+            super(PIXI.Texture.fromImage('../../_assets/maggot.png'));
+
+        }
+
+    }
+
+}
+
+namespace filters {
+
+    export class Filter {
+
+        private renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer;
+
+        private stage: PIXI.Container;
+
+        private background: PIXI.Sprite;
+
+        private filter: PIXI.filters.ColorMatrixFilter;
+
+        private container: PIXI.Container;
+
+        private bgFront: PIXI.Sprite;
+        private light2: PIXI.Sprite;
+        private light1: PIXI.Sprite;
+        private panda: PIXI.Sprite;
+
+        private count: number;
+        private switchy: boolean;
+
+        private help: PIXI.Text;
+
+        constructor() {
+
+            this.renderer = PIXI.autoDetectRenderer(800, 600);
+            document.body.appendChild(this.renderer.view);
+
+            // create the root of the scene graph
+            this.stage = new PIXI.Container();
+            this.stage.interactive = true;
+
+            // create a texture from an image path
+            var texture: PIXI.Texture = PIXI.Texture.fromImage("../../_assets/basics/bunny.png");
+
+            this.background = PIXI.Sprite.fromImage('_assets/BGrotate.jpg');
+            this.background.anchor.set(0.5);
+
+            this.background.position.x = this.renderer.width / 2;
+            this.background.position.y = this.renderer.height / 2;
+
+            this.filter = new PIXI.filters.ColorMatrixFilter();
+
+            this.container = new PIXI.Container();
+            this.container.position.x = this.renderer.width / 2;
+            this.container.position.y = this.renderer.height / 2;
+
+            this.bgFront = PIXI.Sprite.fromImage('../../_assets/SceneRotate.jpg');
+            this.bgFront.anchor.set(0.5);
+
+            this.container.addChild(this.bgFront);
+
+            this.light2 = PIXI.Sprite.fromImage('../../_assets/LightRotate2.png');
+            this.light2.anchor.set(0.5);
+            this.container.addChild(this.light2);
+
+            this.light1 = PIXI.Sprite.fromImage('../../_assets/LightRotate1.png');
+            this.light1.anchor.set(0.5);
+            this.container.addChild(this.light1);
+
+            this.panda = PIXI.Sprite.fromImage('../../_assets/panda.png');
+            this.panda.anchor.set(0.5);
+
+            this.container.addChild(this.panda);
+
+            this.stage.addChild(this.container);
+
+            this.stage.filters = [this.filter];
+
+            this.count = 0;
+            this.switchy = false;
+
+            this.stage.on('click', this.onClick);
+            this.stage.on('tap', this.onClick);
+
+
+            this.help = new PIXI.Text('Click to turn filters on / off.', { font: 'bold 12pt Arial', fill: 'white' });
+            this.help.position.y = this.renderer.height - 25;
+            this.help.position.x = 10;
+
+            this.stage.addChild(this.help);
+
+            //nimate
+            this.animate();
+
+        }
+
+        private onClick = (): void => {
+
+            this.switchy = !this.switchy;
+
+            if (!this.switchy) {
+                this.stage.filters = [this.filter];
+            }
+            else {
+                this.stage.filters = null;
+            }
+
+        }
+
+        private animate = (): void => {
+
+            this.background.rotation += 0.01;
+            this.bgFront.rotation -= 0.01;
+
+            this.light1.rotation += 0.02;
+            this.light2.rotation += 0.01;
+
+            this.panda.scale.x = 1 + Math.sin(this.count) * 0.04;
+            this.panda.scale.y = 1 + Math.cos(this.count) * 0.04;
+
+            this.count += 0.1;
+
+            var matrix = this.filter.matrix;
+
+            matrix[1] = Math.sin(this.count) * 3;
+            matrix[2] = Math.cos(this.count);
+            matrix[3] = Math.cos(this.count) * 1.5;
+            matrix[4] = Math.sin(this.count / 3) * 2;
+            matrix[5] = Math.sin(this.count / 2);
+            matrix[6] = Math.sin(this.count / 4);
+
+            this.renderer.render(this.stage);
+
+            requestAnimationFrame(this.animate);
+
+        }
+
+    }
+
+}
diff --git a/pixi.js/v3/pixi.js.d.ts b/pixi.js/v3/pixi.js.d.ts
new file mode 100644
index 0000000000..3de0f3f296
--- /dev/null
+++ b/pixi.js/v3/pixi.js.d.ts
@@ -0,0 +1,1748 @@
+// Type definitions for Pixi.js 3.0.9 dev
+// Project: https://github.com/GoodBoyDigital/pixi.js/
+// Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class PIXI {
+
+    static VERSION: string;
+    static PI_2: number;
+    static RAD_TO_DEG: number;
+    static DEG_TO_RAD: number;
+    static TARGET_FPMS: number;
+    static RENDERER_TYPE: {
+        UNKNOWN: number;
+        WEBGL: number;
+        CANVAS: number;
+    };
+    static BLEND_MODES: {
+        NORMAL: number;
+        ADD: number;
+        MULTIPLY: number;
+        SCREEN: number;
+        OVERLAY: number;
+        DARKEN: number;
+        LIGHTEN: number;
+        COLOR_DODGE: number;
+        COLOR_BURN: number;
+        HARD_LIGHT: number;
+        SOFT_LIGHT: number;
+        DIFFERENCE: number;
+        EXCLUSION: number;
+        HUE: number;
+        SATURATION: number;
+        COLOR: number;
+        LUMINOSITY: number;
+
+    };
+    static DRAW_MODES: {
+        POINTS: number;
+        LINES: number;
+        LINE_LOOP: number;
+        LINE_STRIP: number;
+        TRIANGLES: number;
+        TRIANGLE_STRIP: number;
+        TRIANGLE_FAN: number;
+    };
+    static SCALE_MODES: {
+        DEFAULT: number;
+        LINEAR: number;
+        NEAREST: number;
+    };
+    static RETINA_PREFIX: string;
+    static RESOLUTION: number;
+    static FILTER_RESOLUTION: number;
+    static DEFAULT_RENDER_OPTIONS: {
+        view: HTMLCanvasElement;
+        resolution: number;
+        antialias: boolean;
+        forceFXAA: boolean;
+        autoResize: boolean;
+        transparent: boolean;
+        backgroundColor: number;
+        clearBeforeRender: boolean;
+        preserveDrawingBuffer: boolean;
+        roundPixels: boolean;
+    };
+    static SHAPES: {
+        POLY: number;
+        RECT: number;
+        CIRC: number;
+        ELIP: number;
+        RREC: number;
+    };
+    static SPRITE_BATCH_SIZE: number;
+
+}
+
+declare namespace PIXI {
+
+    export function autoDetectRenderer(width: number, height: number, options?: PIXI.RendererOptions, noWebGL?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    export var loader: PIXI.loaders.Loader;
+
+    //https://github.com/primus/eventemitter3
+    export class EventEmitter {
+
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+        removeListener(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
+        removeAllListeners(event?: string): EventEmitter;
+
+        off(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
+        addListener(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////////CORE//////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    //display
+
+    export class DisplayObject extends EventEmitter implements interaction.InteractiveTarget {
+
+        //begin extras.cacheAsBitmap see https://github.com/pixijs/pixi-typescript/commit/1207b7f4752d79a088d6a9a465a3ec799906b1db
+        protected _originalRenderWebGL: WebGLRenderer;
+        protected _originalRenderCanvas: CanvasRenderer;
+        protected _originalUpdateTransform: boolean;
+        protected _originalHitTest: any;
+        protected _cachedSprite: any;
+        protected _originalDestroy: any;
+
+        cacheAsBitmap: boolean;
+
+        protected _renderCachedWebGL(renderer: WebGLRenderer): void;
+        protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
+        protected _renderCachedCanvas(renderer: CanvasRenderer): void;
+        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
+        protected _getCachedBounds(): Rectangle;
+        protected _destroyCachedDisplayObject(): void;
+        protected _cacheAsBitmapDestroy(): void;
+        //end extras.cacheAsBitmap
+
+        protected _sr: number;
+        protected _cr: number;
+        protected _bounds: Rectangle;
+        protected _currentBounds: Rectangle;
+        protected _mask: Rectangle;
+        protected _cachedObject: any;
+
+        updateTransform(): void;
+
+        position: Point;
+        scale: Point;
+        pivot: Point;
+        rotation: number;
+        renderable: boolean;
+        alpha: number;
+        visible: boolean;
+        parent: Container;
+        worldAlpha: number;
+        worldTransform: Matrix;
+        filterArea: Rectangle;
+
+        x: number;
+        y: number;
+        worldVisible: boolean;
+        mask: Graphics | Sprite;
+        filters: AbstractFilter[];
+        name: string;
+
+        getBounds(matrix?: Matrix): Rectangle;
+        getLocalBounds(): Rectangle;
+        toGlobal(position: Point): Point;
+        toLocal(position: Point, from?: DisplayObject): Point;
+        generateTexture(renderer: CanvasRenderer | WebGLRenderer, scaleMode: number, resolution: number): Texture;
+        setParent(container: Container): Container;
+        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
+        destroy(): void;
+        getChildByName(name: string): DisplayObject;
+        getGlobalPosition(point: Point): Point;
+
+        interactive: boolean;
+        buttonMode: boolean;
+        interactiveChildren: boolean;
+        defaultCursor: string;
+        hitArea: HitArea;
+
+        on(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+
+        once(event: 'click', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mousedown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseout', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseover', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'mouseupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightclick', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightdown', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightup', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'rightupoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'tap', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchend', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchendoutside', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchmove', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: 'touchstart', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+
+    export class Container extends DisplayObject {
+
+        protected _renderWebGL(renderer: WebGLRenderer): void;
+        protected _renderCanvas(renderer: CanvasRenderer): void;
+
+        protected onChildrenChange: () => void;
+
+        children: DisplayObject[];
+
+        width: number;
+        height: number;
+
+        addChild(...child: DisplayObject[]): DisplayObject;
+        addChildAt(child: DisplayObject, index: number): DisplayObject;
+        swapChildren(child: DisplayObject, child2: DisplayObject): void;
+        getChildIndex(child: DisplayObject): number;
+        setChildIndex(child: DisplayObject, index: number): void;
+        getChildAt(index: number): DisplayObject;
+        removeChild(child: DisplayObject): DisplayObject;
+        removeChildAt(index: number): DisplayObject;
+        removeChildren(beginIndex?: number, endIndex?: number): DisplayObject[];
+        destroy(destroyChildren?: boolean): void;
+        generateTexture(renderer: PIXI.CanvasRenderer | PIXI.WebGLRenderer, resolution?: number, scaleMode?: number): Texture;
+
+        renderWebGL(renderer: WebGLRenderer): void;
+        renderCanvas(renderer: CanvasRenderer): void;
+
+        once(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+        once(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+        on(event: 'added', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+        on(event: 'removed', fn: (event: interaction.InteractionEvent) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+
+    //graphics
+
+    export class GraphicsData {
+
+        constructor(lineWidth: number, lineColor: number, lineAlpha: number, fillColor: number, fillAlpha: number, fill: boolean, shape: Circle | Rectangle | Ellipse | Polygon);
+
+        lineWidth: number;
+        lineColor: number;
+        lineAlpha: number;
+        fillColor: number;
+        fillAlpha: number;
+        fill: boolean;
+        shape: Circle | Rectangle | Ellipse | Polygon;
+        type: number;
+
+        clone(): GraphicsData;
+
+        protected _lineTint: number;
+        protected _fillTint: number;
+
+    }
+    export class Graphics extends Container {
+
+        protected boundsDirty: boolean;
+        protected dirty: boolean;
+        protected glDirty: boolean;
+
+        fillAlpha: number;
+        lineWidth: number;
+        lineColor: number;
+        tint: number;
+        blendMode: number;
+        isMask: boolean;
+        boundsPadding: number;
+
+        clone(): Graphics;
+        lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
+        moveTo(x: number, y: number): Graphics;
+        lineTo(x: number, y: number): Graphics;
+        quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): Graphics;
+        bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): Graphics;
+        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
+        arc(cx: number, cy: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): Graphics;
+        beginFill(color: number, alpha?: number): Graphics;
+        endFill(): Graphics;
+        drawRect(x: number, y: number, width: number, height: number): Graphics;
+        drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): Graphics;
+        drawCircle(x: number, y: number, radius: number): Graphics;
+        drawEllipse(x: number, y: number, width: number, height: number): Graphics;
+        drawPolygon(path: number[] | Point[]): Graphics;
+        clear(): Graphics;
+        //todo
+        generateTexture(renderer: WebGLRenderer | CanvasRenderer, resolution?: number, scaleMode?: number): Texture;
+        getBounds(matrix?: Matrix): Rectangle;
+        containsPoint(point: Point): boolean;
+        updateLocalBounds(): void;
+        drawShape(shape: Circle | Rectangle | Ellipse | Polygon): GraphicsData;
+
+    }
+    export interface GraphicsRenderer extends ObjectRenderer {
+        //yikes todo
+    }
+    export interface WebGLGraphicsData {
+        //yikes todo!
+    }
+
+    //math
+
+    export class Point {
+
+        x: number;
+        y: number;
+
+        constructor(x?: number, y?: number);
+
+        clone(): Point;
+        copy(p: Point): void;
+        equals(p: Point): boolean;
+        set(x?: number, y?: number): void;
+
+    }
+    export class Matrix {
+
+        a: number;
+        b: number;
+        c: number;
+        d: number;
+        tx: number;
+        ty: number;
+
+        fromArray(array: number[]): void;
+        toArray(transpose?: boolean, out?: number[]): number[];
+        apply(pos: Point, newPos?: Point): Point;
+        applyInverse(pos: Point, newPos?: Point): Point;
+        translate(x: number, y: number): Matrix;
+        scale(x: number, y: number): Matrix;
+        rotate(angle: number): Matrix;
+        append(matrix: Matrix): Matrix;
+        prepend(matrix: Matrix): Matrix;
+        invert(): Matrix;
+        identity(): Matrix;
+        clone(): Matrix;
+        copy(matrix: Matrix): Matrix;
+        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
+        setTransform(a: number, b: number, c: number, d: number, sr: number, cr: number, cy: number, sy: number, nsx: number, cs: number): PIXI.Matrix;
+
+        static IDENTITY: Matrix;
+        static TEMP_MATRIX: Matrix;
+
+    }
+
+    export interface HitArea {
+
+        contains(x: number, y: number): boolean;
+
+    }
+
+    export class Circle implements HitArea {
+
+        constructor(x?: number, y?: number, radius?: number);
+
+        x: number;
+        y: number;
+        radius: number;
+        type: number;
+
+        clone(): Circle;
+        contains(x: number, y: number): boolean;
+        getBounds(): Rectangle;
+
+    }
+    export class Ellipse implements HitArea {
+
+        constructor(x?: number, y?: number, width?: number, height?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        type: number;
+
+        clone(): Ellipse;
+        contains(x: number, y: number): boolean;
+        getBounds(): Rectangle;
+
+    }
+    export class Polygon implements HitArea {
+
+        constructor(points: Point[]);
+        constructor(points: number[]);
+        constructor(...points: Point[]);
+        constructor(...points: number[]);
+
+        closed: boolean;
+        points: number[];
+        type: number;
+
+        clone(): Polygon;
+        contains(x: number, y: number): boolean;
+
+
+    }
+    export class Rectangle implements HitArea {
+
+        constructor(x?: number, y?: number, width?: number, height?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        type: number;
+
+        static EMPTY: Rectangle;
+
+        clone(): Rectangle;
+        contains(x: number, y: number): boolean;
+
+    }
+    export class RoundedRectangle implements HitArea {
+
+        constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
+
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+        radius: number;
+        type: number;
+
+        static EMPTY: Rectangle;
+
+        clone(): Rectangle;
+        contains(x: number, y: number): boolean;
+
+    }
+
+    //particles
+
+    export interface ParticleContainerProperties {
+
+        scale?: boolean;
+        position?: boolean;
+        rotation?: boolean;
+        uvs?: boolean;
+        alpha?: boolean;
+
+    }
+    export class ParticleContainer extends Container {
+
+        constructor(size?: number, properties?: ParticleContainerProperties, batchSize?: number);
+
+        protected _maxSize: number;
+        protected _batchSize: number;
+        protected _properties: boolean[];
+        protected _buffers: WebGLBuffer[];
+        protected _bufferToUpdate: number;
+
+        protected onChildrenChange: (smallestChildIndex?: number) => void;
+
+        interactiveChildren: boolean;
+        blendMode: number;
+        roundPixels: boolean;
+
+        setProperties(properties: ParticleContainerProperties): void;
+
+    }
+    export interface ParticleBuffer {
+
+        gl: WebGLRenderingContext;
+        vertSize: number;
+        vertByteSize: number;
+        size: number;
+        dynamicProperties: any[];
+        staticProperties: any[];
+
+        staticStride: number;
+        staticBuffer: any;
+        staticData: any;
+        dynamicStride: number;
+        dynamicBuffer: any;
+        dynamicData: any;
+
+        initBuffers(): void;
+        bind(): void;
+        destroy(): void;
+
+    }
+    export interface ParticleRenderer {
+
+    }
+    export interface ParticleShader {
+
+    }
+
+    //renderers
+
+    export interface RendererOptions {
+
+        view?: HTMLCanvasElement;
+        transparent?: boolean;
+        antialias?: boolean;
+        autoResize?: boolean;
+        resolution?: number;
+        clearBeforeRendering?: boolean;
+        preserveDrawingBuffer?: boolean;
+        forceFXAA?: boolean;
+        roundPixels?: boolean;
+        backgroundColor?: number;
+
+    }
+    export class SystemRenderer extends EventEmitter {
+
+        protected _backgroundColor: number;
+        protected _backgroundColorRgb: number[];
+        protected _backgroundColorString: string;
+        protected _tempDisplayObjectParent: any;
+        protected _lastObjectRendered: DisplayObject;
+
+        constructor(system: string, width?: number, height?: number, options?: RendererOptions);
+
+        type: number;
+        width: number;
+        height: number;
+        view: HTMLCanvasElement;
+        resolution: number;
+        transparent: boolean;
+        autoResize: boolean;
+        blendModes: any; //todo?
+        preserveDrawingBuffer: boolean;
+        clearBeforeRender: boolean;
+        roundPixels: boolean;
+        backgroundColor: number;
+
+        render(object: DisplayObject): void;
+        resize(width: number, height: number): void;
+        destroy(removeView?: boolean): void;
+
+    }
+    export class CanvasRenderer extends SystemRenderer {
+
+        protected renderDisplayObject(displayObject: DisplayObject, context: CanvasRenderingContext2D): void;
+        protected _mapBlendModes(): void;
+
+        constructor(width?: number, height?: number, options?: RendererOptions);
+
+        context: CanvasRenderingContext2D;
+        refresh: boolean;
+        maskManager: CanvasMaskManager;
+        roundPixels: boolean;
+        smoothProperty: string;
+
+        render(object: DisplayObject): void;
+        resize(w: number, h: number): void;
+
+    }
+    export class CanvasBuffer {
+
+        protected clear(): void;
+
+        constructor(width: number, height: number);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+
+        width: number;
+        height: number;
+
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+    export class CanvasGraphics {
+
+        static renderGraphicsMask(graphics: Graphics, context: CanvasRenderingContext2D): void;
+        static updateGraphicsTint(graphics: Graphics): void;
+
+        static renderGraphics(graphics: Graphics, context: CanvasRenderingContext2D): void;
+
+    }
+    export class CanvasMaskManager {
+
+        pushMask(maskData: any, renderer: WebGLRenderer | CanvasRenderer): void;
+        popMask(renderer: WebGLRenderer | CanvasRenderer): void;
+        destroy(): void;
+
+    }
+    export class CanvasTinter {
+
+        static getTintedTexture(sprite: DisplayObject, color: number): HTMLCanvasElement;
+        static tintWithMultiply(texture: Texture, color: number, canvas: HTMLDivElement): void;
+        static tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        static tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        static roundColor(color: number): number;
+        static cacheStepsPerColorChannel: number;
+        static convertTintToImage: boolean;
+        static vanUseMultiply: boolean;
+        static tintMethod: Function;
+
+    }
+    export class WebGLRenderer extends SystemRenderer {
+
+        protected _useFXAA: boolean;
+        protected _FXAAFilter: filters.FXAAFilter;
+        protected _contextOptions: {
+            alpha: boolean;
+            antiAlias: boolean;
+            premultipliedAlpha: boolean;
+            stencil: boolean;
+            preseveDrawingBuffer: boolean;
+        };
+        protected _renderTargetStack: RenderTarget[];
+
+        protected _initContext(): void;
+        protected _createContext(): void;
+        protected handleContextLost: (event: WebGLContextEvent) => void;
+        protected _mapGlModes(): void;
+        protected _managedTextures: Texture[];
+
+        constructor(width?: number, height?: number, options?: RendererOptions);
+
+        drawCount: number;
+        shaderManager: ShaderManager;
+        maskManager: MaskManager;
+        stencilManager: StencilManager;
+        filterManager: FilterManager;
+        blendModeManager: BlendModeManager;
+        currentRenderTarget: RenderTarget;
+        currentRenderer: ObjectRenderer;
+
+        render(object: DisplayObject): void;
+        renderDisplayObject(displayObject: DisplayObject, renderTarget: RenderTarget, clear: boolean): void;
+        setObjectRenderer(objectRenderer: ObjectRenderer): void;
+        setRenderTarget(renderTarget: RenderTarget): void;
+        updateTexture(texture: BaseTexture | Texture): BaseTexture | Texture;
+        destroyTexture(texture: BaseTexture | Texture, _skipRemove?: boolean): void;
+
+    }
+    export class AbstractFilter {
+
+        protected vertexSrc: string[];
+        protected fragmentSrc: string[];
+
+        constructor(vertexSrc?: string | string[], fragmentSrc?: string | string[], uniforms?: any);
+
+        uniforms: any;
+
+        padding: number;
+
+        getShader(renderer: WebGLRenderer): Shader;
+        applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget, clear?: boolean): void;
+        syncUniform(uniform: WebGLUniformLocation): void;
+
+    }
+    export class SpriteMaskFilter extends AbstractFilter {
+
+        constructor(sprite: Sprite);
+
+        maskSprite: Sprite;
+        maskMatrix: Matrix;
+
+        applyFilter(renderer: WebGLRenderbuffer, input: RenderTarget, output: RenderTarget): void;
+        map: Texture;
+        offset: Point;
+
+    }
+    export class BlendModeManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        setBlendMode(blendMode: number): boolean;
+
+    }
+
+    export class FilterManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        filterStack: any[];
+        renderer: WebGLRenderer;
+        texturePool: any[];
+
+        onContextChange: () => void;
+        setFilterStack(filterStack: any[]): void;
+        pushFilter(target: RenderTarget, filters: any[]): void;
+        popFilter(): AbstractFilter;
+        getRenderTarget(clear?: boolean): RenderTarget;
+        protected returnRenderTarget(renderTarget: RenderTarget): void;
+        applyFilter(shader: Shader | AbstractFilter, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
+        calculateMappedMatrix(filterArea: Rectangle, sprite: Sprite, outputMatrix?: Matrix): Matrix;
+        capFilterArea(filterArea: Rectangle): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+
+    export class MaskManager extends WebGLManager {
+
+        stencilStack: StencilMaskStack;
+        reverse: boolean;
+        count: number;
+        alphaMaskPool: any[];
+
+        pushMask(target: RenderTarget, maskData: any): void;
+        popMask(target: RenderTarget, maskData: any): void;
+        pushSpriteMask(target: RenderTarget, maskData: any): void;
+        popSpriteMask(): void;
+        pushStencilMask(target: RenderTarget, maskData: any): void;
+        popStencilMask(target: RenderTarget, maskData: any): void;
+
+    }
+    export class ShaderManager extends WebGLManager {
+
+        protected _currentId: number;
+        protected currentShader: Shader;
+
+        constructor(renderer: WebGLRenderer);
+
+        maxAttibs: number;
+        attribState: any[];
+        tempAttribState: any[];
+        stack: any[];
+
+        setAttribs(attribs: any[]): void;
+        setShader(shader: Shader): boolean;
+        destroy(): void;
+
+    }
+    export class StencilManager extends WebGLManager {
+
+        constructor(renderer: WebGLRenderer);
+
+        setMaskStack(stencilMaskStack: StencilMaskStack): void;
+        pushStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
+        bindGraphics(graphics: Graphics, webGLData: WebGLGraphicsData): void;
+        popStencil(graphics: Graphics, webGLData: WebGLGraphicsData): void;
+        destroy(): void;
+        pushMask(maskData: any[]): void;
+        popMask(maskData: any[]): void;
+
+    }
+    export class WebGLManager {
+
+        protected onContextChange: () => void;
+
+        constructor(renderer: WebGLRenderer);
+
+        renderer: WebGLRenderer;
+
+        destroy(): void;
+
+    }
+    export class Shader {
+
+        protected attributes: any;
+        protected textureCount: number;
+        protected uniforms: any;
+
+        protected _glCompile(type: any, src: any): Shader;
+
+        constructor(shaderManager: ShaderManager, vertexSrc: string, fragmentSrc: string, uniforms: any, attributes: any);
+
+        uuid: number;
+        gl: WebGLRenderingContext;
+        shaderManager: ShaderManager;
+        program: WebGLProgram;
+        vertexSrc: string;
+        fragmentSrc: string;
+
+        init(): void;
+        cacheUniformLocations(keys: string[]): void;
+        cacheAttributeLocations(keys: string[]): void;
+        compile(): WebGLProgram;
+        syncUniform(uniform: any): void;
+        syncUniforms(): void;
+        initSampler2D(uniform: any): void;
+        destroy(): void;
+
+    }
+    export class ComplexPrimitiveShader extends Shader {
+
+        constructor(shaderManager: ShaderManager);
+
+    }
+    export class PrimitiveShader extends Shader {
+
+        constructor(shaderManager: ShaderManager);
+
+    }
+    export class TextureShader extends Shader {
+
+        constructor(shaderManager: ShaderManager, vertexSrc?: string, fragmentSrc?: string, customUniforms?: any, customAttributes?: any);
+
+    }
+    export interface StencilMaskStack {
+
+        stencilStack: any[];
+        reverse: boolean;
+        count: number;
+
+    }
+    export class ObjectRenderer extends WebGLManager {
+
+        start(): void;
+        stop(): void;
+        flush(): void;
+        render(object?: any): void;
+
+    }
+    export class RenderTarget {
+
+        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root: boolean);
+
+        gl: WebGLRenderingContext;
+        frameBuffer: WebGLFramebuffer;
+        texture: Texture;
+        size: Rectangle;
+        resolution: number;
+        projectionMatrix: Matrix;
+        transform: Matrix;
+        frame: Rectangle;
+        stencilBuffer: WebGLRenderbuffer;
+        stencilMaskStack: StencilMaskStack;
+        filterStack: any[];
+        scaleMode: number;
+        root: boolean;
+
+        clear(bind?: boolean): void;
+        attachStencilBuffer(): void;
+        activate(): void;
+        calculateProjection(protectionFrame: Matrix): void;
+        resize(width: number, height: number): void;
+        destroy(): void;
+
+    }
+    export interface Quad {
+
+        gl: WebGLRenderingContext;
+        vertices: number[];
+        uvs: number[];
+        colors: number[];
+        indices: number[];
+        vertexBuffer: WebGLBuffer;
+        indexBuffer: WebGLBuffer;
+
+        map(rect: Rectangle, rect2: Rectangle): void;
+        upload(): void;
+        destroy(): void;
+
+    }
+
+    //sprites
+
+    export class Sprite extends Container {
+
+        static fromFrame(frameId: string): Sprite;
+        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+
+        protected _texture: Texture;
+        protected _width: number;
+        protected _height: number;
+        protected cachedTint: number;
+
+        protected _onTextureUpdate(): void;
+
+        constructor(texture?: Texture);
+
+        anchor: Point;
+        tint: number;
+        blendMode: number;
+        shader: Shader | AbstractFilter;
+        texture: Texture;
+
+        width: number;
+        height: number;
+
+        getBounds(matrix?: Matrix): Rectangle;
+        getLocalBounds(): Rectangle;
+        containsPoint(point: Point): boolean;
+        destroy(destroyTexture?: boolean, destroyBaseTexture?: boolean): void;
+
+    }
+    export class SpriteRenderer extends ObjectRenderer {
+
+        protected renderBatch(texture: Texture, size: number, startIndex: number): void;
+
+        vertSize: number;
+        vertByteSize: number;
+        size: number;
+        vertices: number[];
+        positions: number[];
+        colors: number[];
+        indices: number[];
+        currentBatchSize: number;
+        sprites: Sprite[];
+        shader: Shader | AbstractFilter;
+
+        render(sprite: Sprite): void;
+        flush(): void;
+        start(): void;
+        destroy(): void;
+
+    }
+
+    //text
+
+    export interface TextStyle {
+
+        font?: string;
+        fill?: string | number;
+        align?: string;
+        stroke?: string | number;
+        strokeThickness?: number;
+        wordWrap?: boolean;
+        wordWrapWidth?: number;
+        lineHeight?: number;
+        dropShadow?: boolean;
+        dropShadowColor?: string | number;
+        dropShadowAngle?: number;
+        dropShadowDistance?: number;
+        padding?: number;
+        textBaseline?: string;
+        lineJoin?: string;
+        miterLimit?: number;
+
+    }
+    export class Text extends Sprite {
+
+        static fontPropertiesCache: any;
+        static fontPropertiesCanvas: HTMLCanvasElement;
+        static fontPropertiesContext: CanvasRenderingContext2D;
+
+        protected _text: string;
+        protected _style: TextStyle;
+
+        protected updateText(): void;
+        protected updateTexture(): void;
+        protected determineFontProperties(fontStyle: TextStyle): TextStyle;
+        protected wordWrap(text: string): boolean;
+
+        constructor(text?: string, style?: TextStyle, resolution?: number);
+
+        canvas: HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+        dirty: boolean;
+        resolution: number;
+        text: string;
+        style: TextStyle;
+
+        width: number;
+        height: number;
+
+    }
+
+    //textures
+
+    export class BaseTexture extends EventEmitter {
+
+        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number): BaseTexture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): BaseTexture;
+
+        protected _glTextures: any;
+
+        protected _sourceLoaded(): void;
+
+        constructor(source: HTMLImageElement | HTMLCanvasElement, scaleMode?: number, resolution?: number);
+
+        uuid: number;
+        resolution: number;
+        width: number;
+        height: number;
+        realWidth: number;
+        realHeight: number;
+        scaleMode: number;
+        hasLoaded: boolean;
+        isLoading: boolean;
+        source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement;
+        premultipliedAlpha: boolean;
+        imageUrl: string;
+        isPowerOfTwo: boolean;
+        mipmap: boolean;
+
+        update(): void;
+        loadSource(source: HTMLImageElement | HTMLCanvasElement): void;
+        destroy(): void;
+        dispose(): void;
+        updateSourceImage(newSrc: string): void;
+
+        on(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        on(event: string, fn: Function, context?: any): EventEmitter;
+
+        once(event: 'dispose', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: 'error', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: 'loaded', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: 'update', fn: (baseTexture: BaseTexture) => void, context?: any): EventEmitter;
+        once(event: string, fn: Function, context?: any): EventEmitter;
+
+    }
+    export class RenderTexture extends Texture {
+
+        protected renderWebGL(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
+        protected renderCanvas(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
+
+        constructor(renderer: CanvasRenderer | WebGLRenderer, width?: number, height?: number, scaleMode?: number, resolution?: number);
+
+        width: number;
+        height: number;
+        resolution: number;
+        renderer: CanvasRenderer | WebGLRenderer;
+        valid: boolean;
+
+        render(displayObject: DisplayObject, matrix?: Matrix, clear?: boolean, updateTransform?: boolean): void;
+        resize(width: number, height: number, updateBase?: boolean): void;
+        clear(): void;
+        destroy(): void;
+        getImage(): HTMLImageElement;
+        getPixels(): number[];
+        getPixel(x: number, y: number): number[];
+        getBase64(): string;
+        getCanvas(): HTMLCanvasElement;
+
+    }
+    export class Texture extends BaseTexture {
+
+        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number): Texture;
+        static fromFrame(frameId: string): Texture;
+        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number): Texture;
+        static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
+        static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
+        static addTextureToCache(texture: Texture, id: string): void;
+        static removeTextureFromCache(id: string): Texture;
+        static EMPTY: Texture;
+
+        protected _frame: Rectangle;
+        protected _uvs: TextureUvs;
+
+        protected onBaseTextureUpdated(baseTexture: BaseTexture): void;
+        protected onBaseTextureLoaded(baseTexture: BaseTexture): void;
+        protected _updateUvs(): void;
+
+        constructor(baseTexture: BaseTexture, frame?: Rectangle, crop?: Rectangle, trim?: Rectangle, rotate?: boolean);
+
+        noFrame: boolean;
+        baseTexture: BaseTexture;
+        trim: Rectangle;
+        valid: boolean;
+        requiresUpdate: boolean;
+        width: number;
+        height: number;
+        crop: Rectangle;
+        rotate: boolean;
+
+        frame: Rectangle;
+
+        update(): void;
+        destroy(destroyBase?: boolean): void;
+        clone(): Texture;
+
+    }
+    export class TextureUvs {
+
+        x0: number;
+        y0: number;
+        x1: number;
+        y1: number;
+        x2: number;
+        y2: number;
+        x3: number;
+        y3: number;
+
+        set(frame: Rectangle, baseFrame: Rectangle, rotate: boolean): void;
+
+    }
+    export class VideoBaseTexture extends BaseTexture {
+
+        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
+        static fromUrl(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
+
+        protected _loaded: boolean;
+        protected _onUpdate(): void;
+        protected _onPlayStart(): void;
+        protected _onPlayStop(): void;
+        protected _onCanPlay(): void;
+
+        constructor(source: HTMLVideoElement, scaleMode?: number);
+
+        autoUpdate: boolean;
+
+        destroy(): void;
+
+    }
+
+    //utils
+
+    export class utils {
+
+        static uuid(): number;
+        static hex2rgb(hex: number, out?: number[]): number[];
+        static hex2string(hex: number): string;
+        static rgb2hex(rgb: Number[]): number;
+        static canUseNewCanvasBlendModel(): boolean;
+        static getNextPowerOfTwo(number: number): number;
+        static isPowerOfTwo(width: number, height: number): boolean;
+        static getResolutionOfUrl(url: string): number;
+        static sayHello(type: string): void;
+        static isWebGLSupported(): boolean;
+        static sign(n: number): number;
+        static TextureCache: any;
+        static BaseTextureCache: any;
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////EXTRAS////////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module extras {
+
+        export interface BitmapTextStyle {
+
+            font?: string | {
+
+                name?: string;
+                size?: number;
+
+            };
+            align?: string;
+            tint?: number;
+
+        }
+        export class BitmapText extends Container {
+
+            static fonts: any;
+
+            protected _glyphs: Sprite[];
+            protected _font: string | {
+                tint: number;
+                align: string;
+                name: string;
+                size: number;
+            };
+            protected _text: string;
+
+            protected updateText(): void;
+
+            constructor(text: string, style?: BitmapTextStyle);
+
+            textWidth: number;
+            textHeight: number;
+            maxWidth: number;
+            maxLineHeight: number;
+            dirty: boolean;
+
+            tint: number;
+            align: string;
+            font: string | {
+                tint: number;
+                align: string;
+                name: string;
+                size: number;
+            };
+            text: string;
+
+        }
+        export class MovieClip extends Sprite {
+
+            static fromFrames(frame: string[]): MovieClip;
+            static fromImages(images: string[]): MovieClip;
+
+            protected _textures: Texture[];
+            protected _durations: number[];
+            protected _currentTime: number;
+
+            protected update(deltaTime: number): void;
+
+            constructor(textures: Texture[]);
+
+            animationSpeed: number;
+            loop: boolean;
+            onComplete: () => void;
+            currentFrame: number;
+            playing: boolean;
+
+            totalFrames: number;
+            textures: Texture[];
+
+            stop(): void;
+            play(): void;
+            gotoAndStop(frameName: number): void;
+            gotoAndPlay(frameName: number): void;
+            destroy(): void;
+
+        }
+        export class TilingSprite extends Sprite {
+
+            //This is really unclean but is the only way :(
+            //See http://stackoverflow.com/questions/29593905/typescript-declaration-extending-class-with-static-method/29595798#29595798
+            //Thanks bas!
+            static fromFrame(frameId: string): Sprite;
+            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+
+            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
+            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
+
+            protected _tileScaleOffset: Point;
+            protected _tilingTexture: boolean;
+            protected _refreshTexture: boolean;
+            protected _uvs: TextureUvs[];
+
+            constructor(texture: Texture, width: number, height: number);
+
+            tileScale: Point;
+            tilePosition: Point;
+
+            width: number;
+            height: number;
+            originalTexture: Texture;
+
+            getBounds(): Rectangle;
+            generateTilingTexture(renderer: WebGLRenderer | CanvasRenderer, texture: Texture, forcePowerOfTwo?: boolean): Texture;
+            containsPoint(point: Point): boolean;
+            destroy(): void;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////FILTERS////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    namespace filters {
+
+        export class AsciiFilter extends AbstractFilter {
+            size: number;
+        }
+        export class BloomFilter extends AbstractFilter {
+
+            blur: number;
+            blurX: number;
+            blurY: number;
+
+        }
+        export class BlurFilter extends AbstractFilter {
+
+            protected blurXFilter: BlurXFilter;
+            protected blurYFilter: BlurYFilter;
+
+            blur: number;
+            passes: number;
+            blurX: number;
+            blurY: number;
+
+        }
+        export class BlurXFilter extends AbstractFilter {
+
+            passes: number;
+            strength: number;
+            blur: number;
+
+        }
+        export class BlurYFilter extends AbstractFilter {
+
+            passes: number;
+            strength: number;
+            blur: number;
+
+        }
+        export class SmartBlurFilter extends AbstractFilter {
+
+        }
+        export class ColorMatrixFilter extends AbstractFilter {
+
+            protected _loadMatrix(matrix: number[], multiply: boolean): void;
+            protected _multiply(out: number[], a: number[], b: number[]): void;
+            protected _colorMatrix(matrix: number[]): void;
+
+            matrix: number[];
+
+            brightness(b: number, multiply?: boolean): void;
+            greyscale(scale: number, multiply?: boolean): void;
+            blackAndWhite(multiply?: boolean): void;
+            hue(rotation: number, multiply?: boolean): void;
+            contrast(amount: number, multiply?: boolean): void;
+            saturate(amount: number, multiply?: boolean): void;
+            desaturate(multiply?: boolean): void;
+            negative(multiply?: boolean): void;
+            sepia(multiply?: boolean): void;
+            technicolor(multiply?: boolean): void;
+            polaroid(multiply?: boolean): void;
+            toBGR(multiply?: boolean): void;
+            kodachrome(multiply?: boolean): void;
+            browni(multiply?: boolean): void;
+            vintage(multiply?: boolean): void;
+            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
+            night(intensity: number, multiply?: boolean): void;
+            predator(amount: number, multiply?: boolean): void;
+            lsd(multiply?: boolean): void;
+            reset(): void;
+
+        }
+        export class ColorStepFilter extends AbstractFilter {
+
+            step: number;
+
+        }
+        export class ConvolutionFilter extends AbstractFilter {
+
+            constructor(matrix: number[], width: number, height: number);
+
+            matrix: number[];
+            width: number;
+            height: number;
+
+        }
+        export class CrossHatchFilter extends AbstractFilter {
+
+        }
+        export class DisplacementFilter extends AbstractFilter {
+
+            constructor(sprite: Sprite, scale?: number);
+
+            map: Texture;
+
+            scale: Point;
+
+        }
+        export class DotScreenFilter extends AbstractFilter {
+
+            scale: number;
+            angle: number;
+
+        }
+        export class BlurYTintFilter extends AbstractFilter {
+
+            blur: number;
+
+        }
+        export class DropShadowFilter extends AbstractFilter {
+
+            blur: number;
+            blurX: number;
+            blurY: number;
+            color: number;
+            alpha: number;
+            distance: number;
+            angle: number;
+
+        }
+        export class GrayFilter extends AbstractFilter {
+
+            gray: number;
+
+        }
+        export class InvertFilter extends AbstractFilter {
+
+            invert: number;
+
+        }
+        export class NoiseFilter extends AbstractFilter {
+
+            noise: number;
+
+        }
+        export class PixelateFilter extends AbstractFilter {
+
+            size: Point;
+
+        }
+        export class RGBSplitFilter extends AbstractFilter {
+
+            red: number;
+            green: number;
+            blue: number;
+
+        }
+        export class SepiaFilter extends AbstractFilter {
+
+            sepia: number;
+
+        }
+        export class ShockwaveFilter extends AbstractFilter {
+
+            center: number[];
+            params: any;
+            time: number;
+
+        }
+        export class TiltShiftAxisFilter extends AbstractFilter {
+
+            blur: number;
+            gradientBlur: number;
+            start: number;
+            end: number;
+
+            updateDelta(): void;
+
+        }
+        export class TiltShiftFilter extends AbstractFilter {
+
+            blur: number;
+            gradientBlur: number;
+            start: number;
+            end: number;
+
+        }
+        export class TiltShiftXFilter extends AbstractFilter {
+
+            updateDelta(): void;
+
+        }
+        export class TiltShiftYFilter extends AbstractFilter {
+
+            updateDelta(): void;
+
+        }
+        export class TwistFilter extends AbstractFilter {
+
+            offset: Point;
+            radius: number;
+            angle: number;
+
+        }
+        export class FXAAFilter extends AbstractFilter {
+
+            applyFilter(renderer: WebGLRenderer, input: RenderTarget, output: RenderTarget): void;
+
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ////////////////////////////INTERACTION///////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module interaction {
+
+        export interface InteractionEvent {
+
+            stopped: boolean;
+            target: any;
+            type: string;
+            data: InteractionData;
+            stopPropagation(): void;
+
+        }
+
+        export class InteractionData {
+
+            global: Point;
+            target: DisplayObject;
+            originalEvent: Event;
+            identifier: number;
+
+            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
+
+        }
+
+        export class InteractionManager {
+
+            protected interactionDOMElement: HTMLElement;
+            protected eventsAdded: boolean;
+            protected _tempPoint: Point;
+
+            protected setTargetElement(element: HTMLElement, resolution: number): void;
+            protected addEvents(): void;
+            protected removeEvents(): void;
+            protected dispatchEvent(displayObject: DisplayObject, eventString: string, eventData: any): void;
+            protected onMouseDown: (event: Event) => void;
+            protected processMouseDown: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseUp: (event: Event) => void;
+            protected processMouseUp: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseMove: (event: Event) => void;
+            protected processMouseMove: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onMouseOut: (event: Event) => void;
+            protected processMouseOverOut: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchStart: (event: Event) => void;
+            protected processTouchStart: (DisplayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchEnd: (event: Event) => void;
+            protected processTouchEnd: (displayObject: DisplayObject, hit: boolean) => void;
+            protected onTouchMove: (event: Event) => void;
+            protected processTouchMove: (displayObject: DisplayObject, hit: boolean) => void;
+            protected getTouchData(touchEvent: InteractionData): InteractionData;
+            protected returnTouchData(touchData: InteractionData): void;
+
+            constructor(renderer: CanvasRenderer | WebGLRenderer, options?: { autoPreventDefault?: boolean; interactionFrequence?: number; });
+
+            renderer: CanvasRenderer | WebGLRenderer;
+            autoPreventDefault: boolean;
+            interactionFrequency: number;
+            mouse: InteractionData;
+            eventData: {
+                stopped: boolean;
+                target: any;
+                type: any;
+                data: InteractionData;
+            };
+            interactiveDataPool: InteractionData[];
+            last: number;
+            currentCursorStyle: string;
+            resolution: number;
+            update(deltaTime: number): void;
+
+            mapPositionToPoint(point: Point, x: number, y: number): void;
+            processInteractive(point: Point, displayObject: DisplayObject, func: (displayObject: DisplayObject, hit: boolean) => void, hitTest: boolean, interactive: boolean): boolean;
+            destroy(): void;
+
+        }
+
+        export interface InteractiveTarget {
+
+            interactive: boolean;
+            buttonMode: boolean;
+            interactiveChildren: boolean;
+            defaultCursor: string;
+            hitArea: HitArea;
+
+        }
+
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////LOADER/////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+    //https://github.com/englercj/resource-loader/blob/master/src/Loader.js
+
+    export module loaders {
+        export interface LoaderOptions {
+
+            crossOrigin?: boolean;
+            loadType?: number;
+            xhrType?: string;
+
+        }
+        export interface ResourceDictionary {
+
+            [index: string]: PIXI.loaders.Resource;
+        }
+        export class Loader extends EventEmitter {
+
+            constructor(baseUrl?: string, concurrency?: number);
+
+            baseUrl: string;
+            progress: number;
+            loading: boolean;
+            resources: ResourceDictionary;
+
+            add(name: string, url: string, options?: LoaderOptions, cb?: () => void): Loader;
+            add(url: string, options?: LoaderOptions, cb?: () => void): Loader;
+            //todo I am not sure of object literal notional (or its options) so just allowing any but would love to improve this
+            add(obj: any, options?: LoaderOptions, cb?: () => void): Loader;
+
+            on(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
+            on(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            on(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            on(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            on(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
+            on(event: string, fn: Function, context?: any): EventEmitter;
+
+            once(event: 'complete', fn: (loader: loaders.Loader, object: any) => void, context?: any): EventEmitter;
+            once(event: 'error', fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            once(event: 'load', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            once(event: 'progress', fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): EventEmitter;
+            once(event: 'start', fn: (loader: loaders.Loader) => void, context?: any): EventEmitter;
+            once(event: string, fn: Function, context?: any): EventEmitter;
+
+            before(fn: Function): Loader;
+            pre(fn: Function): Loader;
+
+            after(fn: Function): Loader;
+            use(fn: Function): Loader;
+
+            reset(): void;
+
+            load(cb?: (loader: loaders.Loader, object: any) => void): Loader;
+
+        }
+        export class Resource extends EventEmitter {
+
+            static LOAD_TYPE: {
+                XHR: number;
+                IMAGE: number;
+                AUDIO: number;
+                VIDEO: number;
+            };
+
+            static XHR_READ_STATE: {
+                UNSENT: number;
+                OPENED: number;
+                HEADERS_RECIEVED: number;
+                LOADING: number;
+                DONE: number;
+            };
+
+            static XHR_RESPONSE_TYPE: {
+                DEFAULT: number;
+                BUFFER: number;
+                BLOB: number;
+                DOCUMENT: number;
+                JSON: number;
+                TEXT: number;
+            };
+
+            constructor(name?: string, url?: string | string[], options?: LoaderOptions);
+
+            name: string;
+            texture: Texture;
+			textures: Texture[];
+            url: string;
+            data: any;
+            crossOrigin: string;
+            loadType: number;
+            xhrType: string;
+            error: Error;
+            xhr: XMLHttpRequest;
+
+            complete(): void;
+            load(cb?: () => void): void;
+
+        }
+    }
+
+    //////////////////////////////////////////////////////////////////////////////
+    ///////////////////////////////MESH///////////////////////////////////////////
+    //////////////////////////////////////////////////////////////////////////////
+
+    export module mesh {
+
+        export class Mesh extends Container {
+
+            static DRAW_MODES: {
+                TRIANGLE_MESH: number;
+                TRIANGLES: number;
+            };
+
+            constructor(texture: Texture, vertices?: number[], uvs?: number[], indices?: number[], drawMode?: number);
+
+            texture: Texture;
+            uvs: number[];
+            vertices: number[];
+            indices: number[];
+            dirty: boolean;
+            blendMode: number;
+            canvasPadding: number;
+            drawMode: number;
+            shader: Shader | AbstractFilter;
+
+            getBounds(matrix?: Matrix): Rectangle;
+            containsPoint(point: Point): boolean;
+
+            protected _texture: Texture;
+
+            protected _renderCanvasTriangleMesh(context: CanvasRenderingContext2D): void;
+            protected _renderCanvasTriangles(context: CanvasRenderingContext2D): void;
+            protected _renderCanvasDrawTriangle(context: CanvasRenderingContext2D, vertices: number, uvs: number, index0: number, index1: number, index2: number): void;
+            protected renderMeshFlat(Mesh: Mesh): void;
+            protected _onTextureUpdate(): void;
+
+        }
+        export class Rope extends Mesh {
+
+            protected _ready: boolean;
+
+            protected getTextureUvs(): TextureUvs;
+
+            constructor(texture: Texture, points: Point[]);
+
+            points: Point[];
+            colors: number[];
+
+            refresh(): void;
+
+        }
+        export class Plane extends Mesh {
+
+            segmentsX: number;
+            segmentsY: number;
+
+            constructor(texture: Texture, segmentsX?: number, segmentsY?: number);
+
+        }
+
+
+        export class MeshRenderer extends ObjectRenderer {
+
+            protected _initWebGL(mesh: Mesh): void;
+
+            indices: number[];
+
+            constructor(renderer: WebGLRenderer);
+
+            render(mesh: Mesh): void;
+            flush(): void;
+            start(): void;
+            destroy(): void;
+
+        }
+
+        export interface MeshShader extends Shader { }
+
+    }
+
+    namespace ticker {
+
+        export var shared: Ticker;
+
+        export class Ticker {
+
+            protected _tick(time: number): void;
+            protected _emitter: EventEmitter;
+            protected _requestId: number;
+            protected _maxElapsedMS: number;
+
+            protected _requestIfNeeded(): void;
+            protected _cancelIfNeeded(): void;
+            protected _startIfPossible(): void;
+
+            autoStart: boolean;
+            deltaTime: number;
+            elapsedMS: number;
+            lastTime: number;
+            speed: number;
+            started: boolean;
+
+            FPS: number;
+            minFPS: number;
+
+            add(fn: (deltaTime: number) => void, context?: any): Ticker;
+            addOnce(fn: (deltaTime: number) => void, context?: any): Ticker;
+            remove(fn: (deltaTime: number) => void, context?: any): Ticker;
+            start(): void;
+            stop(): void;
+            update(): void;
+
+        }
+
+    }
+}
+
+declare module 'pixi.js' {
+    export = PIXI;
+}

From dc00c071696663c7ea727089c1885c3e03c1856a Mon Sep 17 00:00:00 2001
From: Ivan Popelyshev <ivan.popelyshev@gmail.com>
Date: Sun, 13 Nov 2016 21:06:58 +0300
Subject: [PATCH 106/245] Fix problems with pixi-spine

---
 pixi-spine/index.d.ts          | 1843 ++++++++++++++++++--------------
 pixi-spine/pixi-spine-tests.ts |   24 +-
 2 files changed, 1046 insertions(+), 821 deletions(-)

diff --git a/pixi-spine/index.d.ts b/pixi-spine/index.d.ts
index 77415c00a8..432b9f6129 100644
--- a/pixi-spine/index.d.ts
+++ b/pixi-spine/index.d.ts
@@ -1,814 +1,1039 @@
-// Type definitions for pixi-spine 1.0.4
-// Project: https://github.com/pixijs/pixi-spine/
-// Definitions by: martijncroezen <https://github.com/pixijs/pixi-typescript>
+// Type definitions for Pixi-spine v1.3, works with pixi.js v4
+// Project: https://github.com/pixijs/pixi-spine/tree/master
+// Definitions by: Ivan Popelyshev <https://github.com/pixijs/pixi-spine>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="pixi.js" />
-import * as PIXI from 'pixi.js';
-
-declare module 'pixi.js' {
-
-    export module spine {
-
-        export interface Timeline {
-
-            frames: number[];
-
-            getFrameCount(): number;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export interface Attachment {
-
-            name: string;
-            type: number;
-
-        }
-
-        export class Animation {
-
-            constructor(name: string, timelines?: Timeline[], duration?: number);
-
-            apply(skeleton: Skeleton, lastTime: number, time: number, loop?: boolean, events?: Event[]): void;
-            mix(skeleton: Skeleton, lastTime: number, time: number, loop?: boolean, events?: any[], alpha?: number): void;
-            binarySearch(values: number[], target: number, step: number): number;
-            binarySearch1(values: number[], target: number): number;
-            linearSearch(values: number[], target: number, step: number): number;
-
-            name: string;
-            timelines: Timeline[];
-            duration: number;
-
-        }
-
-        export class AnimationState {
-
-            data: AnimationStateData;
-            tracks: TrackEntry[];
-            events: Event[];
-            onStart: (index: number) => void;
-            onEnd: (trackIndex: number) => void;
-            onComplete: (i: number, count: number) => void;
-            onEvent: (i: number, event: Event) => void;
-            timeScale: number;
-
-            constructor(stateData: AnimationStateData);
-
-            update(delta: number): void;
-            apply(skeleton: Skeleton): void;
-            clearTracks(): void;
-            clearTrack(trackIndex: number): void;
-            private _expandToIndex(index: number): TrackEntry;
-            setCurrent(index: number, entry: TrackEntry): void;
-            setAnimationByName(trackIndex: number, animationName: string, loop: boolean): TrackEntry;
-            setAnimation(trackIndex: number, animation: Animation, loop: boolean): TrackEntry;
-            addAnimationByName(trackIndex: number, animationName: string, loop: boolean, delay: number): TrackEntry;
-            addAnimation(trackIndex: number, animation: Animation, loop: boolean, delay: number): TrackEntry;
-            getCurrent(trackIndex: number): TrackEntry;
-
-        }
-
-        export class Spine extends PIXI.Container {
-
-            constructor(spineData: any);
-
-            static fromAtlas(resourceName: string): Spine;
-
-            update(dt: number): void;
-
-            private autoUpdateTransform(): void;
-            private createSprite(slot: Slot, attachment: Attachment): Sprite;
-            private createMesh(slot, attachment)
-
-            spineData: any;
-            skeleton: Skeleton;
-            stateData: AnimationStateData;
-            state: AnimationState;
-            slotContainers: PIXI.Container[];
-            autoUpdate: boolean;
-
-        }
-
-        export class AnimationStateData {
-
-            constructor(skeletonData: SkeletonData);
-
-            private _skelentonData: SkeletonData;
-            private animationToMixTime: number;
-            defaultMix: number;
-            skeletonData: SkeletonData;
-            setMixByName(fromName: string, toName: string, duration: number): void;
-            setMix(from: Animation, to: Animation, duration: number): void;
-            getMix(from: Animation, to: Animation): number;
-
-        }
-
-        export class AttachmentType {
-
-            static region: number;
-            static boundingbox: number;
-            static mesh: number;
-            static skinnedmesh: number;
-
-        }
-
-        export class Bone {
-
-            data: BoneData;
-            skeleton: Skeleton;
-            parent: Bone;
-
-            constructor(boneData: BoneData, skeleton: Skeleton, parent: Bone);
-
-            x: number;
-            y: number;
-            rotation: number;
-            rotationIK: number;
-            scaleX: number;
-            scaleY: number;
-            flipX: boolean;
-            flipY: boolean;
-            m00: number;
-            m01: number;
-            worldX: number;
-            m10: number;
-            m11: number;
-            worldY: number;
-            worldRotation: number;;
-            worldScaleX: number;
-            worldScaleY: number;
-            worldFlipX: boolean;
-            worldFlipY: boolean;
-
-            updateWorldTransform(): void;
-            setToSetupPose(): void;
-            worldToLocal(world: number[]): void;
-            localToWorld(local: number[]): void;
-
-        }
-
-        export class BoneData {
-
-            name: string;
-            parent: Bone;
-
-            constructor(name: string, parent: Bone);
-
-            length: number;
-            x: number;
-            y: number;
-            rotation: number;
-            scaleX: number;
-            scaleY: number;
-            inheritScale: boolean;
-            inheritRotation: boolean;
-            flipX: boolean;
-            flipY: boolean;
-
-        }
-
-        export class BoundingBoxAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            vertices: number[];
-            type: number;
-
-            computeWorldVertices(x: number, y: number, bone: Bone, worldVertices: number[]): void;
-
-        }
-
-        export class ColorTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            slotIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, r: number, g: number, b: number, a: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Curves {
-
-            constructor(frameCount: number[]);
-
-            curves: number[];
-
-            setLinear(frameIndex: number): void;
-            setStepped(frameIndex: number): void;
-            setCurve(frameIndex: number, cx1: number, cy1: number, cx2: number, cy2: number): void;
-            getCurvePercent(frameIndex: number, percent: number): number;
-
-        }
-
-        export class DrawOrderTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            frames: number[];
-            drawOrders: number[];
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, drawOrder: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Event {
-
-            constructor(data: any);
-
-            data: any;
-            intValue: number;
-            floatValue: number;
-            stringValue: string;
-
-        }
-
-        export class EventData {
-
-            constructor(name: string);
-
-            name: string;
-
-            intValue: number;
-            floatValue: number;
-            stringValue: string;
-
-        }
-
-        export class EventTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            frames: number[];
-            events: Event[];
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, event: Event): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-
-        export class FfdTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            frameVertices: number[];
-            slotIndex: number;
-            attachment: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, vertices: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class FlipXTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, vertices: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class FlipYTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, vertices: number[]): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class IkConstraint {
-
-            constructor(data: IkConstraintData, skeleton: Skeleton);
-
-            data: IkConstraintData;
-            mix: number;
-            bendDirection: number;
-            bones: Bone[];
-            target: Bone;
-
-            apply(): void;
-            apply1(bone: Bone, targetX: number, targetY: number, alpha: number): void;
-            apply2(parent: Bone, child: Bone, targetX: number, targetY: number, bendDirection: number, alpha: number): void;
-
-        }
-
-        export class IkConstraintData {
-
-            constructor(name: string);
-
-            name: string;
-            bones: Bone[];
-            target: Bone;
-            bendDirection: number;
-            mix: number;
-
-        }
-
-        export class IkConstraintTimeline implements Timeline {
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            ikConstraintIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class MeshAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            type: number;
-            vertices: number[];
-            uvs: number[]
-            regionUVs: number[]
-            triangles: number[]
-            hullLength: number;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            path: string;
-            rendererObject: any;
-            regionU: number;
-            regionV: number;
-            regionU2: number;
-            regionV2: number;
-            regionRotate: boolean;
-            regionOffsetX: number;
-            regionOffsetY: number;
-            regionWidth: number;
-            regionHeight: number;
-            regionOriginalWidth: number;
-            regionOriginalHeight: number;
-            edges: number[];
-            width: number;
-            height: number;
-
-            updateUVs(): void;
-            computeWorldVertices(x: number, y: number, slot: Slot, worldVertices: number[]): void;
-
-        }
-
-        export class RegionAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            offset: number[];
-            uvs: number[]
-            type: number;
-            x: number;
-            y: number;
-            rotation: number;
-            scaleX: number;
-            scaleY: number;
-            width: number;
-            height: number;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            path: string;
-            rendererObject: any;
-            regionOffsetX: number;
-            regionOffsetY: number;
-            regionWidth: number;
-            regionHeight: number;
-            regionOriginalWidth: number;
-            regionOriginalHeight: number;
-
-            updateOffset(): void;
-            setUVs(u: number, v: number, u2: number, v2: number, rotate: number): void;
-            computeVertices(x: number, y: number, bone: Bone, vertices: number[]): void;
-
-        }
-
-        export class RotateTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class ScaleTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves;
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Skeleton {
-
-            constructor(skeletonData: SkeletonData);
-
-            data: SkeletonData;
-            bones: Bone[];
-            slots: Slot[];
-            drawOrder: Slot[];
-            ikConstraints: IkConstraint[];
-            boneCache: Bone[][];
-            x: number;
-            y: number;
-            skin: Skin;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            time: number;
-            flipX: boolean;
-            flipY: boolean;
-
-            updateCache(): void;
-            updateWorldTransform(): void;
-            setToSetupPose(): void;
-            setBonesToSetupPose(): void;
-            setSlotsToSetupPose(): void;
-            getRootBone(): Bone;
-            findBone(boneName: string): Bone;
-            findBoneIndex(boneName: string): number;
-            findSlot(slotName: string): Slot;
-            findSlotIndex(slotName: string): number;
-            setSkinByName(skinName: string): Skin;
-            setSkin(newSkin: Skin): void;
-            getAttachmentBySlotName(slotName: string, attachmentName: string): Attachment;
-            getAttachmentBySlotIndex(slotIndex: number, attachmentName: string): Attachment
-            setAttachment(slotName: string, attachmentName: string): void;
-            findIkConstraint(ikConstraintName: string): IkConstraint;
-            update(delta: number): void;
-            resetDrawOrder(): void;
-
-        }
-
-        export class SkeletonBounds {
-
-            polygonPool: Polygon[];
-            polygons: Polygon[];
-            boundingBoxes: BoundingBoxAttachment[];
-            minX: number;
-            minY: number;
-            maxX: number;
-            maxY: number;
-
-            update(skeleton: Skeleton, updateAabb: boolean): void;
-            aabbCompute(): void;
-            aabbContainsPoint(x: number, y: number): void;
-            aabbIntersectsSegment(x1: number, y1: number, x2: number, y2: number): boolean;
-            aabbIntersectsSkeleton(bounds: SkeletonBounds): boolean;
-            containsPoint(x: number, y: number): BoundingBoxAttachment;
-            intersectsSegment(x1: number, y1: number, x2: number, y2: number): BoundingBoxAttachment;
-            polygonContainsPoint(polygon: Polygon, x: number, y: number): boolean;
-            polygonIntersectsSegment(polygon: Polygon, x1: number, y1: number, x2: number, y2: number): boolean;
-            getPolygon(attachment: Attachment): Polygon;
-            getWidth(): number;
-            getHeight(): number;
-
-        }
-
-        export class SkeletonData {
-
-            bones: Bone[];
-            slots: Slot[];
-            skins: Skin[];
-            events: Event[];
-            animations: Animation[];
-            ikConstraints: IkConstraint[];
-            name: string;
-            defaultSkin: Skin;
-            width: number;
-            height: number;
-            version: any;
-            hash: any;
-
-            findBone(boneName: string): Bone;
-            findBoneIndex(boneName: string): number;
-            findSlot(slotName: string): Slot;
-            findSlotIndex(slotName: string): number;
-            findSkin(skinName: string): Skin;
-            findEvent(eventName: string): Event;
-            findAnimation(animationName: string): Animation
-            findIkConstraint(ikConstraintName: string): IkConstraint;
-
-        }
-
-        export class SkeletonJsonParser {
-
-            constructor(attachmentLoader: any);
-
-            attachmentLoader: any;
-            scale: number;
-
-            readSkeletonData(root: Bone, name: string): void;
-            readAttachment(skin: Skin, name: string, map: any): void;
-            readAnimation(name: string, map: any, skeletonData: SkeletonData): void;
-            readCurve(timeline: Timeline, frameIndex: number, valueMap: any): void;
-            toColor(hexString: string, colorIndex: string): number;
-            getFloatArray(map: any, name: string, scale: number): number[];
-            getIntArray(map: any, name: string): number[];
-
-        }
-
-        export class Skin {
-
-            constructor(name: string);
-
-            name: string;
-            attachments: Attachment[];
-            addAttachment(slotIndex: number, name: string, attachment: Attachment): void;
-            getAttachment(slotIndex: number, name: string): Attachment;
-
-            protected _attachAll(skeleton: Skeleton, oldSkin: Skin): void;
-
-        }
-
-        export class SkinnedMeshAttachment implements Attachment {
-
-            constructor(name: string);
-
-            name: string;
-            type: number;
-            bones: number[];
-            weights: number[];
-            uvs: number[];
-            regionUVs: number[];
-            triangles: number[];
-            hullLength: number;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            path: string;
-            rendererObject: any;
-            regionU: number;
-            regionV: number;
-            regionU2: number;
-            regionV2: number;
-            regionRotate: boolean;
-            regionOffsetX: number;
-            regionOffsetY: number;
-            regionWidth: number;
-            regionHeight: number;
-            regionOriginalWidth: number;
-            regionOriginalHeight: number;
-            edges: number[];
-            width: number;
-            height: number;
-
-            updateUVs(u: number, v: number, u2: number, v2: number, rotate: boolean): void;
-            computeWorldVertices(x: number, y: number, slot: Slot, worldVertices: number[]): void;
-
-        }
-
-        export class Slot {
-
-            constructor(slotData: SlotData, bone: Bone);
-
-            data: SlotData;
-            bone: Bone;
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            _attachmentTime: number;
-            attachment: Attachment;
-            attachmentVertices: number[];
-            setAttachment(attachment: Attachment): void;
-            setAttachmentTime(time: number): void;
-            getAttachmentTime(): number;
-            setToSetupPose(): void;
-
-        }
-
-        export class SlotData {
-
-            constructor(name: string, boneData: BoneData);
-
-            name: string;
-            boneData: BoneData;
-
-            static PIXI_BLEND_MODE_MAP: {
-                multiply: number;
-                screen: number;
-                additive: number;
-                normal: number;
-            };
-            r: number;
-            g: number;
-            b: number;
-            a: number;
-            attachmentName: string;
-            blendMode: number;
-
-        }
-
-        export class TrackEntry {
-
-            next: TrackEntry;
-            previous: TrackEntry;
-            animation: Animation;
-            loop: boolean;
-            delay: number;
-            time: number;
-            lastTime: number;
-            endTime: number;
-            timeScale: number;
-            mixTime: number;
-            mixDuration: number;
-            mix: number;
-            onStart: (index: number) => void;
-            onEnd: (trackIndex: number) => void;
-            onComplete: (i: number, count: number) => void;
-            onEvent: (i: number, event: Event) => void;
-
-        }
-
-        export class TranslateTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            curves: Curves[];
-            frames: number[];
-            boneIndex: number;
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, x: number, y: number): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class Atlas {
-
-            constructor(atlasText: string, baseUrl: string, crossOrigin: any);
-
-            pages: AtlasPage[];
-            regions: AtlasRegion[];
-            texturesLoading: number;
-
-            findRegion(name: string): AtlasRegion;
-            dispose(): void;
-            updateUVs(page: AtlasPage): void;
-
-            Format: {
-
-                alpha: number;
-                intensity: number;
-                luminanceAlpha: number;
-                rgb565: number;
-                rgba4444: number;
-                rgb888: number;
-                rgba8888: number;
-
-            };
-
-            TextureFilter: {
-
-                nearest: number;
-                linear: number;
-                mipMap: number;
-                mipMapNearestNearest: number;
-                mipMapLinearNearest: number;
-                mipMapNearestLinear: number;
-                mipMapLinearLinear: number;
-
-            };
-
-            TextureWrap: {
-
-                mirroredRepeat: number;
-                clampToEdge: number;
-                repeat: number;
-
-            };
-
-        }
-
-        export class AtlasAttachmentParser {
-
-            constructor(atlas: Atlas);
-
-            newRegionAttachment(skin: Skin, name: string, path: string): RegionAttachment;
-            newMeshAttachment(skin: Skin, name: string, path: string): SkinnedMeshAttachment;
-            newSkinnedMeshAttachment(skin: Skin, name: string, path: string): SkinnedMeshAttachment;
-            newBoundingBoxAttachment(skin: Skin, name: string): BoundingBoxAttachment;
-
-        }
-
-        export class AtlasPage {
-            name: string;
-            format: any;
-            minFilter: any;
-            magFilter: any;
-            uWrap: any;
-            vWrap: any;
-            rendererObject: any;
-            width: number;
-            height: number;
-
-        }
-
-        export class AtlasReader {
-            constructor(text: string);
-
-            lines: string[];
-            index: number;
-
-            trim(value: string): string;
-            readLine(): string;
-            readValue(): string;
-            readTuple(tuple: number): number;
-
-        }
-
-        export class AtlasRegion {
-
-            page: AtlasPage;
-            name: string;
-            x: number;
-            y: number;
-            width: number;
-            height: number;
-            u: number;
-            v: number;
-            u2: number;
-            v2: number;
-            offsetX: number;
-            offsetY: number;
-            originalWidth: number;
-            originalHeight: number;
-            index: number;
-            rotate: boolean;
-            splits: any;
-            pads: any;
-
-
-        }
-
-        export class AttachmentTimeline implements Timeline {
-
-            constructor(frameCount: number);
-
-            slotIndex: number;
-            frames: number[];
-            attachmentNames: string[];
-
-            getFrameCount(): number;
-            setFrame(frameIndex: number, time: number, attachmentName: string): void;
-            apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Event[], alpha: number): void;
-
-        }
-
-        export class atlasParser {
-
-            constructor(resource: any, next: any);
-
-            AnimCache: any;
-            enableCaching: boolean;
-
-        }
-
+declare module PIXI.spine.core {
+    class Animation {
+        name: string;
+        timelines: Array<Timeline>;
+        duration: number;
+        constructor(name: string, timelines: Array<Timeline>, duration: number);
+        apply(skeleton: Skeleton, lastTime: number, time: number, loop: boolean, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+        static binarySearch(values: ArrayLike<number>, target: number, step?: number): number;
+        static linearSearch(values: ArrayLike<number>, target: number, step: number): number;
+    }
+    interface Timeline {
+        apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+        getPropertyId(): number;
+    }
+    enum TimelineType {
+        rotate = 0,
+        translate = 1,
+        scale = 2,
+        shear = 3,
+        attachment = 4,
+        color = 5,
+        deform = 6,
+        event = 7,
+        drawOrder = 8,
+        ikConstraint = 9,
+        transformConstraint = 10,
+        pathConstraintPosition = 11,
+        pathConstraintSpacing = 12,
+        pathConstraintMix = 13,
+    }
+    abstract class CurveTimeline implements Timeline {
+        static LINEAR: number;
+        static STEPPED: number;
+        static BEZIER: number;
+        static BEZIER_SIZE: number;
+        private curves;
+        abstract getPropertyId(): number;
+        constructor(frameCount: number);
+        getFrameCount(): number;
+        setLinear(frameIndex: number): void;
+        setStepped(frameIndex: number): void;
+        getCurveType(frameIndex: number): number;
+        setCurve(frameIndex: number, cx1: number, cy1: number, cx2: number, cy2: number): void;
+        getCurvePercent(frameIndex: number, percent: number): number;
+        abstract apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class RotateTimeline extends CurveTimeline {
+        static ENTRIES: number;
+        static PREV_TIME: number;
+        static PREV_ROTATION: number;
+        static ROTATION: number;
+        boneIndex: number;
+        frames: ArrayLike<number>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, degrees: number): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class TranslateTimeline extends CurveTimeline {
+        static ENTRIES: number;
+        static PREV_TIME: number;
+        static PREV_X: number;
+        static PREV_Y: number;
+        static X: number;
+        static Y: number;
+        boneIndex: number;
+        frames: ArrayLike<number>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, x: number, y: number): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class ScaleTimeline extends TranslateTimeline {
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class ShearTimeline extends TranslateTimeline {
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class ColorTimeline extends CurveTimeline {
+        static ENTRIES: number;
+        static PREV_TIME: number;
+        static PREV_R: number;
+        static PREV_G: number;
+        static PREV_B: number;
+        static PREV_A: number;
+        static R: number;
+        static G: number;
+        static B: number;
+        static A: number;
+        slotIndex: number;
+        frames: ArrayLike<number>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, r: number, g: number, b: number, a: number): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class AttachmentTimeline implements Timeline {
+        slotIndex: number;
+        frames: ArrayLike<number>;
+        attachmentNames: Array<string>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        getFrameCount(): number;
+        setFrame(frameIndex: number, time: number, attachmentName: string): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, events: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class DeformTimeline extends CurveTimeline {
+        slotIndex: number;
+        attachment: VertexAttachment;
+        frames: ArrayLike<number>;
+        frameVertices: Array<ArrayLike<number>>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, vertices: ArrayLike<number>): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class EventTimeline implements Timeline {
+        frames: ArrayLike<number>;
+        events: Array<Event>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        getFrameCount(): number;
+        setFrame(frameIndex: number, event: Event): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class DrawOrderTimeline implements Timeline {
+        frames: ArrayLike<number>;
+        drawOrders: Array<Array<number>>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        getFrameCount(): number;
+        setFrame(frameIndex: number, time: number, drawOrder: Array<number>): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class IkConstraintTimeline extends CurveTimeline {
+        static ENTRIES: number;
+        static PREV_TIME: number;
+        static PREV_MIX: number;
+        static PREV_BEND_DIRECTION: number;
+        static MIX: number;
+        static BEND_DIRECTION: number;
+        ikConstraintIndex: number;
+        frames: ArrayLike<number>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, mix: number, bendDirection: number): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class TransformConstraintTimeline extends CurveTimeline {
+        static ENTRIES: number;
+        static PREV_TIME: number;
+        static PREV_ROTATE: number;
+        static PREV_TRANSLATE: number;
+        static PREV_SCALE: number;
+        static PREV_SHEAR: number;
+        static ROTATE: number;
+        static TRANSLATE: number;
+        static SCALE: number;
+        static SHEAR: number;
+        transformConstraintIndex: number;
+        frames: ArrayLike<number>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, rotateMix: number, translateMix: number, scaleMix: number, shearMix: number): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class PathConstraintPositionTimeline extends CurveTimeline {
+        static ENTRIES: number;
+        static PREV_TIME: number;
+        static PREV_VALUE: number;
+        static VALUE: number;
+        pathConstraintIndex: number;
+        frames: ArrayLike<number>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, value: number): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class PathConstraintSpacingTimeline extends PathConstraintPositionTimeline {
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+    class PathConstraintMixTimeline extends CurveTimeline {
+        static ENTRIES: number;
+        static PREV_TIME: number;
+        static PREV_ROTATE: number;
+        static PREV_TRANSLATE: number;
+        static ROTATE: number;
+        static TRANSLATE: number;
+        pathConstraintIndex: number;
+        frames: ArrayLike<number>;
+        constructor(frameCount: number);
+        getPropertyId(): number;
+        setFrame(frameIndex: number, time: number, rotateMix: number, translateMix: number): void;
+        apply(skeleton: Skeleton, lastTime: number, time: number, firedEvents: Array<Event>, alpha: number, setupPose: boolean, mixingOut: boolean): void;
+    }
+}
+declare module PIXI.spine.core {
+    class AnimationState {
+        static emptyAnimation: Animation;
+        data: AnimationStateData;
+        tracks: TrackEntry[];
+        events: Event[];
+        listeners: AnimationStateListener2[];
+        queue: EventQueue;
+        propertyIDs: IntSet;
+        animationsChanged: boolean;
+        timeScale: number;
+        trackEntryPool: Pool<TrackEntry>;
+        constructor(data: AnimationStateData);
+        update(delta: number): void;
+        updateMixingFrom(entry: TrackEntry, delta: number, canEnd: boolean): void;
+        apply(skeleton: Skeleton): void;
+        applyMixingFrom(entry: TrackEntry, skeleton: Skeleton): number;
+        applyRotateTimeline(timeline: Timeline, skeleton: Skeleton, time: number, alpha: number, setupPose: boolean, timelinesRotation: Array<number>, i: number, firstFrame: boolean): void;
+        queueEvents(entry: TrackEntry, animationTime: number): void;
+        clearTracks(): void;
+        clearTrack(trackIndex: number): void;
+        setCurrent(index: number, current: TrackEntry): void;
+        setAnimation(trackIndex: number, animationName: string, loop: boolean): TrackEntry;
+        setAnimationWith(trackIndex: number, animation: Animation, loop: boolean): TrackEntry;
+        addAnimation(trackIndex: number, animationName: string, loop: boolean, delay: number): TrackEntry;
+        addAnimationWith(trackIndex: number, animation: Animation, loop: boolean, delay: number): TrackEntry;
+        setEmptyAnimation(trackIndex: number, mixDuration: number): TrackEntry;
+        addEmptyAnimation(trackIndex: number, mixDuration: number, delay: number): TrackEntry;
+        setEmptyAnimations(mixDuration: number): void;
+        expandToIndex(index: number): TrackEntry;
+        trackEntry(trackIndex: number, animation: Animation, loop: boolean, last: TrackEntry): TrackEntry;
+        disposeNext(entry: TrackEntry): void;
+        _animationsChanged(): void;
+        setTimelinesFirst(entry: TrackEntry): void;
+        checkTimelinesFirst(entry: TrackEntry): void;
+        checkTimelinesUsage(entry: TrackEntry, usageArray: Array<boolean>): void;
+        getCurrent(trackIndex: number): TrackEntry;
+        addListener(listener: AnimationStateListener2): void;
+        removeListener(listener: AnimationStateListener2): void;
+        clearListeners(): void;
+        clearListenerNotifications(): void;
+        onComplete: (trackIndex: number, loopCount: number) => any;
+        onEvent: (trackIndex: number, event: Event) => any;
+        onStart: (trackIndex: number) => any;
+        onEnd: (trackIndex: number) => any;
+        private static deprecatedWarning1;
+        setAnimationByName(trackIndex: number, animationName: string, loop: boolean): void;
+        private static deprecatedWarning2;
+        addAnimationByName(trackIndex: number, animationName: string, loop: boolean, delay: number): void;
+        private static deprecatedWarning3;
+        hasAnimationByName(animationName: string): boolean;
+    }
+    class TrackEntry {
+        animation: Animation;
+        next: TrackEntry;
+        mixingFrom: TrackEntry;
+        listener: AnimationStateListener2;
+        trackIndex: number;
+        loop: boolean;
+        eventThreshold: number;
+        attachmentThreshold: number;
+        drawOrderThreshold: number;
+        animationStart: number;
+        animationEnd: number;
+        animationLast: number;
+        nextAnimationLast: number;
+        delay: number;
+        trackTime: number;
+        trackLast: number;
+        nextTrackLast: number;
+        trackEnd: number;
+        timeScale: number;
+        alpha: number;
+        mixTime: number;
+        mixDuration: number;
+        mixAlpha: number;
+        timelinesFirst: boolean[];
+        timelinesRotation: number[];
+        reset(): void;
+        getAnimationTime(): number;
+        setAnimationLast(animationLast: number): void;
+        isComplete(): boolean;
+        resetRotationDirections(): void;
+        onComplete: (trackIndex: number, loopCount: number) => any;
+        onEvent: (trackIndex: number, event: Event) => any;
+        onStart: (trackIndex: number) => any;
+        onEnd: (trackIndex: number) => any;
+        private static deprecatedWarning1;
+        private static deprecatedWarning2;
+        time: number;
+        endTime: number;
+        loopsCount(): number;
+    }
+    class EventQueue {
+        objects: Array<any>;
+        drainDisabled: boolean;
+        animState: AnimationState;
+        constructor(animState: AnimationState);
+        start(entry: TrackEntry): void;
+        interrupt(entry: TrackEntry): void;
+        end(entry: TrackEntry): void;
+        dispose(entry: TrackEntry): void;
+        complete(entry: TrackEntry): void;
+        event(entry: TrackEntry, event: Event): void;
+        private static deprecatedWarning1;
+        deprecateStuff(): boolean;
+        drain(): void;
+        clear(): void;
+    }
+    enum EventType {
+        start = 0,
+        interrupt = 1,
+        end = 2,
+        dispose = 3,
+        complete = 4,
+        event = 5,
+    }
+    interface AnimationStateListener2 {
+        start(entry: TrackEntry): void;
+        interrupt(entry: TrackEntry): void;
+        end(entry: TrackEntry): void;
+        dispose(entry: TrackEntry): void;
+        complete(entry: TrackEntry): void;
+        event(entry: TrackEntry, event: Event): void;
+    }
+    abstract class AnimationStateAdapter2 implements AnimationStateListener2 {
+        start(entry: TrackEntry): void;
+        interrupt(entry: TrackEntry): void;
+        end(entry: TrackEntry): void;
+        dispose(entry: TrackEntry): void;
+        complete(entry: TrackEntry): void;
+        event(entry: TrackEntry, event: Event): void;
+    }
+}
+declare module PIXI.spine.core {
+    class AnimationStateData {
+        skeletonData: SkeletonData;
+        animationToMixTime: Map<number>;
+        defaultMix: number;
+        constructor(skeletonData: SkeletonData);
+        setMix(fromName: string, toName: string, duration: number): void;
+        private static deprecatedWarning1;
+        setMixByName(fromName: string, toName: string, duration: number): void;
+        setMixWith(from: Animation, to: Animation, duration: number): void;
+        getMix(from: Animation, to: Animation): number;
+    }
+}
+declare module PIXI.spine.core {
+    class AtlasAttachmentLoader implements AttachmentLoader {
+        atlas: TextureAtlas;
+        constructor(atlas: TextureAtlas);
+        newRegionAttachment(skin: Skin, name: string, path: string): RegionAttachment;
+        newMeshAttachment(skin: Skin, name: string, path: string): MeshAttachment;
+        newBoundingBoxAttachment(skin: Skin, name: string): BoundingBoxAttachment;
+        newPathAttachment(skin: Skin, name: string): PathAttachment;
+    }
+}
+declare module PIXI.spine.core {
+    abstract class Attachment {
+        name: string;
+        constructor(name: string);
+    }
+    abstract class VertexAttachment extends Attachment {
+        bones: Array<number>;
+        vertices: ArrayLike<number>;
+        worldVerticesLength: number;
+        constructor(name: string);
+        computeWorldVertices(slot: Slot, worldVertices: ArrayLike<number>): void;
+        computeWorldVerticesWith(slot: Slot, start: number, count: number, worldVertices: ArrayLike<number>, offset: number): void;
+        applyDeform(sourceAttachment: VertexAttachment): boolean;
+    }
+}
+declare module PIXI.spine.core {
+    interface AttachmentLoader {
+        newRegionAttachment(skin: Skin, name: string, path: string): RegionAttachment;
+        newMeshAttachment(skin: Skin, name: string, path: string): MeshAttachment;
+        newBoundingBoxAttachment(skin: Skin, name: string): BoundingBoxAttachment;
+        newPathAttachment(skin: Skin, name: string): PathAttachment;
+    }
+}
+declare module PIXI.spine.core {
+    enum AttachmentType {
+        Region = 0,
+        BoundingBox = 1,
+        Mesh = 2,
+        LinkedMesh = 3,
+        Path = 4,
+    }
+}
+declare module PIXI.spine.core {
+    class BoundingBoxAttachment extends VertexAttachment {
+        color: Color;
+        constructor(name: string);
+    }
+}
+declare module PIXI.spine.core {
+    class MeshAttachment extends VertexAttachment {
+        region: TextureRegion;
+        path: string;
+        regionUVs: ArrayLike<number>;
+        triangles: Array<number>;
+        color: Color;
+        hullLength: number;
+        private parentMesh;
+        inheritDeform: boolean;
+        tempColor: Color;
+        constructor(name: string);
+        updateWorldVertices(slot: Slot, premultipliedAlpha: boolean): ArrayLike<number>;
+        updateUVs(region: TextureRegion, uvs: ArrayLike<number>): ArrayLike<number>;
+        applyDeform(sourceAttachment: VertexAttachment): boolean;
+        getParentMesh(): MeshAttachment;
+        setParentMesh(parentMesh: MeshAttachment): void;
+    }
+}
+declare module PIXI.spine.core {
+    class PathAttachment extends VertexAttachment {
+        lengths: Array<number>;
+        closed: boolean;
+        constantSpeed: boolean;
+        color: Color;
+        constructor(name: string);
+    }
+}
+declare module PIXI.spine.core {
+    class RegionAttachment extends Attachment {
+        x: number;
+        y: number;
+        scaleX: number;
+        scaleY: number;
+        rotation: number;
+        width: number;
+        height: number;
+        color: Color;
+        path: string;
+        region: TextureRegion;
+        constructor(name: string);
+        updateWorldVertices(slot: Slot, premultipliedAlpha: boolean): ArrayLike<number>;
+    }
+}
+declare module PIXI.spine.core {
+    enum BlendMode {
+        Normal = 0,
+        Additive = 1,
+        Multiply = 2,
+        Screen = 3,
+    }
+}
+declare module PIXI.spine.core {
+    class Bone implements Updatable {
+        static yDown: boolean;
+        matrix: Matrix;
+        readonly worldX: number;
+        readonly worldY: number;
+        data: BoneData;
+        skeleton: Skeleton;
+        parent: Bone;
+        children: Bone[];
+        x: number;
+        y: number;
+        rotation: number;
+        scaleX: number;
+        scaleY: number;
+        shearX: number;
+        shearY: number;
+        ax: number;
+        ay: number;
+        arotation: number;
+        ascaleX: number;
+        ascaleY: number;
+        ashearX: number;
+        ashearY: number;
+        appliedValid: boolean;
+        sorted: boolean;
+        constructor(data: BoneData, skeleton: Skeleton, parent: Bone);
+        update(): void;
+        updateWorldTransform(): void;
+        updateWorldTransformWith(x: number, y: number, rotation: number, scaleX: number, scaleY: number, shearX: number, shearY: number): void;
+        setToSetupPose(): void;
+        getWorldRotationX(): number;
+        getWorldRotationY(): number;
+        getWorldScaleX(): number;
+        getWorldScaleY(): number;
+        worldToLocalRotationX(): number;
+        worldToLocalRotationY(): number;
+        rotateWorld(degrees: number): void;
+        updateAppliedTransform(): void;
+        worldToLocal(world: Vector2): Vector2;
+        localToWorld(local: Vector2): Vector2;
+    }
+}
+declare module PIXI.spine.core {
+    class BoneData {
+        index: number;
+        name: string;
+        parent: BoneData;
+        length: number;
+        x: number;
+        y: number;
+        rotation: number;
+        scaleX: number;
+        scaleY: number;
+        shearX: number;
+        shearY: number;
+        transformMode: TransformMode;
+        constructor(index: number, name: string, parent: BoneData);
+    }
+    enum TransformMode {
+        Normal = 0,
+        OnlyTranslation = 1,
+        NoRotationOrReflection = 2,
+        NoScale = 3,
+        NoScaleOrReflection = 4,
+    }
+}
+declare module PIXI.spine.core {
+    interface Constraint extends Updatable {
+        getOrder(): number;
+    }
+}
+declare module PIXI.spine.core {
+    class Event {
+        data: EventData;
+        intValue: number;
+        floatValue: number;
+        stringValue: string;
+        time: number;
+        constructor(time: number, data: EventData);
+    }
+}
+declare module PIXI.spine.core {
+    class EventData {
+        name: string;
+        intValue: number;
+        floatValue: number;
+        stringValue: string;
+        constructor(name: string);
+    }
+}
+declare module PIXI.spine.core {
+    class IkConstraint implements Constraint {
+        data: IkConstraintData;
+        bones: Array<Bone>;
+        target: Bone;
+        mix: number;
+        bendDirection: number;
+        level: number;
+        constructor(data: IkConstraintData, skeleton: Skeleton);
+        getOrder(): number;
+        apply(): void;
+        update(): void;
+        apply1(bone: Bone, targetX: number, targetY: number, alpha: number): void;
+        apply2(parent: Bone, child: Bone, targetX: number, targetY: number, bendDir: number, alpha: number): void;
+    }
+}
+declare module PIXI.spine.core {
+    class IkConstraintData {
+        name: string;
+        order: number;
+        bones: BoneData[];
+        target: BoneData;
+        bendDirection: number;
+        mix: number;
+        constructor(name: string);
+    }
+}
+declare module PIXI.spine.core {
+    class PathConstraint implements Constraint {
+        static NONE: number;
+        static BEFORE: number;
+        static AFTER: number;
+        data: PathConstraintData;
+        bones: Array<Bone>;
+        target: Slot;
+        position: number;
+        spacing: number;
+        rotateMix: number;
+        translateMix: number;
+        spaces: number[];
+        positions: number[];
+        world: number[];
+        curves: number[];
+        lengths: number[];
+        segments: number[];
+        constructor(data: PathConstraintData, skeleton: Skeleton);
+        apply(): void;
+        update(): void;
+        computeWorldPositions(path: PathAttachment, spacesCount: number, tangents: boolean, percentPosition: boolean, percentSpacing: boolean): number[];
+        addBeforePosition(p: number, temp: Array<number>, i: number, out: Array<number>, o: number): void;
+        addAfterPosition(p: number, temp: Array<number>, i: number, out: Array<number>, o: number): void;
+        addCurvePosition(p: number, x1: number, y1: number, cx1: number, cy1: number, cx2: number, cy2: number, x2: number, y2: number, out: Array<number>, o: number, tangents: boolean): void;
+        getOrder(): number;
+    }
+}
+declare module PIXI.spine.core {
+    class PathConstraintData {
+        name: string;
+        order: number;
+        bones: BoneData[];
+        target: SlotData;
+        positionMode: PositionMode;
+        spacingMode: SpacingMode;
+        rotateMode: RotateMode;
+        offsetRotation: number;
+        position: number;
+        spacing: number;
+        rotateMix: number;
+        translateMix: number;
+        constructor(name: string);
+    }
+    enum PositionMode {
+        Fixed = 0,
+        Percent = 1,
+    }
+    enum SpacingMode {
+        Length = 0,
+        Fixed = 1,
+        Percent = 2,
+    }
+    enum RotateMode {
+        Tangent = 0,
+        Chain = 1,
+        ChainScale = 2,
+    }
+}
+declare module PIXI.spine.core {
+    class Skeleton {
+        data: SkeletonData;
+        bones: Array<Bone>;
+        slots: Array<Slot>;
+        drawOrder: Array<Slot>;
+        ikConstraints: Array<IkConstraint>;
+        transformConstraints: Array<TransformConstraint>;
+        pathConstraints: Array<PathConstraint>;
+        _updateCache: Updatable[];
+        updateCacheReset: Updatable[];
+        skin: Skin;
+        color: Color;
+        time: number;
+        flipX: boolean;
+        flipY: boolean;
+        x: number;
+        y: number;
+        constructor(data: SkeletonData);
+        updateCache(): void;
+        sortIkConstraint(constraint: IkConstraint): void;
+        sortPathConstraint(constraint: PathConstraint): void;
+        sortTransformConstraint(constraint: TransformConstraint): void;
+        sortPathConstraintAttachment(skin: Skin, slotIndex: number, slotBone: Bone): void;
+        sortPathConstraintAttachmentWith(attachment: Attachment, slotBone: Bone): void;
+        sortBone(bone: Bone): void;
+        sortReset(bones: Array<Bone>): void;
+        updateWorldTransform(): void;
+        setToSetupPose(): void;
+        setBonesToSetupPose(): void;
+        setSlotsToSetupPose(): void;
+        getRootBone(): Bone;
+        findBone(boneName: string): Bone;
+        findBoneIndex(boneName: string): number;
+        findSlot(slotName: string): Slot;
+        findSlotIndex(slotName: string): number;
+        setSkinByName(skinName: string): void;
+        setSkin(newSkin: Skin): void;
+        getAttachmentByName(slotName: string, attachmentName: string): Attachment;
+        getAttachment(slotIndex: number, attachmentName: string): Attachment;
+        setAttachment(slotName: string, attachmentName: string): void;
+        findIkConstraint(constraintName: string): IkConstraint;
+        findTransformConstraint(constraintName: string): TransformConstraint;
+        findPathConstraint(constraintName: string): PathConstraint;
+        getBounds(offset: Vector2, size: Vector2): void;
+        update(delta: number): void;
+    }
+}
+declare module PIXI.spine.core {
+    class SkeletonBounds {
+        minX: number;
+        minY: number;
+        maxX: number;
+        maxY: number;
+        boundingBoxes: BoundingBoxAttachment[];
+        polygons: ArrayLike<number>[];
+        private polygonPool;
+        update(skeleton: Skeleton, updateAabb: boolean): void;
+        aabbCompute(): void;
+        aabbContainsPoint(x: number, y: number): boolean;
+        aabbIntersectsSegment(x1: number, y1: number, x2: number, y2: number): boolean;
+        aabbIntersectsSkeleton(bounds: SkeletonBounds): boolean;
+        containsPoint(x: number, y: number): BoundingBoxAttachment;
+        containsPointPolygon(polygon: ArrayLike<number>, x: number, y: number): boolean;
+        intersectsSegment(x1: number, y1: number, x2: number, y2: number): BoundingBoxAttachment;
+        intersectsSegmentPolygon(polygon: ArrayLike<number>, x1: number, y1: number, x2: number, y2: number): boolean;
+        getPolygon(boundingBox: BoundingBoxAttachment): ArrayLike<number>;
+        getWidth(): number;
+        getHeight(): number;
+    }
+}
+declare module PIXI.spine.core {
+    class SkeletonData {
+        name: string;
+        bones: BoneData[];
+        slots: SlotData[];
+        skins: Skin[];
+        defaultSkin: Skin;
+        events: EventData[];
+        animations: Animation[];
+        ikConstraints: IkConstraintData[];
+        transformConstraints: TransformConstraintData[];
+        pathConstraints: PathConstraintData[];
+        width: number;
+        height: number;
+        version: string;
+        hash: string;
+        fps: number;
+        imagesPath: string;
+        findBone(boneName: string): BoneData;
+        findBoneIndex(boneName: string): number;
+        findSlot(slotName: string): SlotData;
+        findSlotIndex(slotName: string): number;
+        findSkin(skinName: string): Skin;
+        findEvent(eventDataName: string): EventData;
+        findAnimation(animationName: string): Animation;
+        findIkConstraint(constraintName: string): IkConstraintData;
+        findTransformConstraint(constraintName: string): TransformConstraintData;
+        findPathConstraint(constraintName: string): PathConstraintData;
+        findPathConstraintIndex(pathConstraintName: string): number;
+    }
+}
+declare module PIXI.spine.core {
+    class SkeletonJson {
+        attachmentLoader: AttachmentLoader;
+        scale: number;
+        private linkedMeshes;
+        constructor(attachmentLoader: AttachmentLoader);
+        readSkeletonData(json: string | any): SkeletonData;
+        readAttachment(map: any, skin: Skin, slotIndex: number, name: string): Attachment;
+        readVertices(map: any, attachment: VertexAttachment, verticesLength: number): void;
+        readAnimation(map: any, name: string, skeletonData: SkeletonData): void;
+        readCurve(map: any, timeline: CurveTimeline, frameIndex: number): void;
+        getValue(map: any, prop: string, defaultValue: any): any;
+        static blendModeFromString(str: string): number;
+        static positionModeFromString(str: string): PositionMode;
+        static spacingModeFromString(str: string): SpacingMode;
+        static rotateModeFromString(str: string): RotateMode;
+        static transformModeFromString(str: string): TransformMode;
+        static transformModeLegacy(inheritRotation: boolean, inheritScale: boolean): TransformMode;
+    }
+}
+declare module PIXI.spine.core {
+    class Skin {
+        name: string;
+        attachments: Map<Attachment>[];
+        constructor(name: string);
+        addAttachment(slotIndex: number, name: string, attachment: Attachment): void;
+        getAttachment(slotIndex: number, name: string): Attachment;
+        attachAll(skeleton: Skeleton, oldSkin: Skin): void;
+    }
+}
+declare module PIXI.spine.core {
+    class Slot {
+        currentMesh: any;
+        currentSprite: any;
+        meshes: any;
+        currentMeshName: String;
+        sprites: any;
+        currentSpriteName: String;
+        blendMode: number;
+        tempRegion: TextureRegion;
+        tempAttachment: Attachment;
+        data: SlotData;
+        bone: Bone;
+        color: Color;
+        attachment: Attachment;
+        private attachmentTime;
+        attachmentVertices: number[];
+        constructor(data: SlotData, bone: Bone);
+        getAttachment(): Attachment;
+        setAttachment(attachment: Attachment): void;
+        setAttachmentTime(time: number): void;
+        getAttachmentTime(): number;
+        setToSetupPose(): void;
+    }
+}
+declare module PIXI.spine.core {
+    class SlotData {
+        index: number;
+        name: string;
+        boneData: BoneData;
+        color: Color;
+        attachmentName: string;
+        blendMode: number;
+        constructor(index: number, name: string, boneData: BoneData);
+    }
+}
+declare module PIXI.spine.core {
+    abstract class Texture {
+        protected _image: HTMLImageElement;
+        constructor(image: HTMLImageElement);
+        getImage(): HTMLImageElement;
+        abstract setFilters(minFilter: TextureFilter, magFilter: TextureFilter): void;
+        abstract setWraps(uWrap: TextureWrap, vWrap: TextureWrap): void;
+        abstract dispose(): void;
+        static filterFromString(text: string): TextureFilter;
+        static wrapFromString(text: string): TextureWrap;
+    }
+    enum TextureFilter {
+        Nearest = 9728,
+        Linear = 9729,
+        MipMap = 9987,
+        MipMapNearestNearest = 9984,
+        MipMapLinearNearest = 9985,
+        MipMapNearestLinear = 9986,
+        MipMapLinearLinear = 9987,
+    }
+    enum TextureWrap {
+        MirroredRepeat = 33648,
+        ClampToEdge = 33071,
+        Repeat = 10497,
+    }
+    class TextureRegion {
+        texture: PIXI.Texture;
+        size: PIXI.Rectangle;
+        readonly width: number;
+        readonly height: number;
+        readonly u: number;
+        readonly v: number;
+        readonly u2: number;
+        readonly v2: number;
+        readonly offsetX: number;
+        readonly offsetY: number;
+        readonly pixiOffsetY: number;
+        readonly spineOffsetY: number;
+        readonly originalWidth: number;
+        readonly originalHeight: number;
+        readonly x: number;
+        readonly y: number;
+        readonly rotate: boolean;
+    }
+}
+declare module PIXI.spine.core {
+    class TextureAtlas implements Disposable {
+        pages: TextureAtlasPage[];
+        regions: TextureAtlasRegion[];
+        constructor(atlasText: string, textureLoader: (path: string, loaderFunction: (tex: PIXI.BaseTexture) => any) => any, callback: (obj: TextureAtlas) => any);
+        addTexture(name: string, texture: PIXI.Texture): TextureAtlasRegion;
+        addTextureHash(textures: Map<PIXI.Texture>, stripExtension: boolean): void;
+        addSpineAtlas(atlasText: string, textureLoader: (path: string, loaderFunction: (tex: PIXI.BaseTexture) => any) => any, callback: (obj: TextureAtlas) => any): void;
+        private load(atlasText, textureLoader, callback);
+        findRegion(name: string): TextureAtlasRegion;
+        dispose(): void;
+    }
+    class TextureAtlasPage {
+        name: string;
+        minFilter: TextureFilter;
+        magFilter: TextureFilter;
+        uWrap: TextureWrap;
+        vWrap: TextureWrap;
+        baseTexture: PIXI.BaseTexture;
+        width: number;
+        height: number;
+        setFilters(): void;
+    }
+    class TextureAtlasRegion extends TextureRegion {
+        page: TextureAtlasPage;
+        name: string;
+        index: number;
+    }
+}
+declare module PIXI.spine.core {
+    class TransformConstraint implements Constraint {
+        data: TransformConstraintData;
+        bones: Array<Bone>;
+        target: Bone;
+        rotateMix: number;
+        translateMix: number;
+        scaleMix: number;
+        shearMix: number;
+        temp: Vector2;
+        constructor(data: TransformConstraintData, skeleton: Skeleton);
+        apply(): void;
+        update(): void;
+        getOrder(): number;
+    }
+}
+declare module PIXI.spine.core {
+    class TransformConstraintData {
+        name: string;
+        order: number;
+        bones: BoneData[];
+        target: BoneData;
+        rotateMix: number;
+        translateMix: number;
+        scaleMix: number;
+        shearMix: number;
+        offsetRotation: number;
+        offsetX: number;
+        offsetY: number;
+        offsetScaleX: number;
+        offsetScaleY: number;
+        offsetShearY: number;
+        constructor(name: string);
+    }
+}
+declare module PIXI.spine.core {
+    interface Updatable {
+        update(): void;
+    }
+}
+declare module PIXI.spine.core {
+    interface Map<T> {
+        [key: string]: T;
+    }
+    class IntSet {
+        array: number[];
+        add(value: number): boolean;
+        contains(value: number): boolean;
+        remove(value: number): void;
+        clear(): void;
+    }
+    interface Disposable {
+        dispose(): void;
+    }
+    class Color {
+        r: number;
+        g: number;
+        b: number;
+        a: number;
+        static WHITE: Color;
+        static RED: Color;
+        static GREEN: Color;
+        static BLUE: Color;
+        static MAGENTA: Color;
+        constructor(r?: number, g?: number, b?: number, a?: number);
+        set(r: number, g: number, b: number, a: number): this;
+        setFromColor(c: Color): this;
+        setFromString(hex: string): this;
+        add(r: number, g: number, b: number, a: number): this;
+        clamp(): this;
+    }
+    class MathUtils {
+        static PI: number;
+        static PI2: number;
+        static radiansToDegrees: number;
+        static radDeg: number;
+        static degreesToRadians: number;
+        static degRad: number;
+        static clamp(value: number, min: number, max: number): number;
+        static cosDeg(degrees: number): number;
+        static sinDeg(degrees: number): number;
+        static signum(value: number): number;
+        static toInt(x: number): number;
+        static cbrt(x: number): number;
+    }
+    class Utils {
+        static SUPPORTS_TYPED_ARRAYS: boolean;
+        static arrayCopy<T>(source: ArrayLike<T>, sourceStart: number, dest: ArrayLike<T>, destStart: number, numElements: number): void;
+        static setArraySize<T>(array: Array<T>, size: number, value?: any): Array<T>;
+        static ensureArrayCapacity<T>(array: Array<T>, size: number, value?: any): Array<T>;
+        static newArray<T>(size: number, defaultValue: T): Array<T>;
+        static newFloatArray(size: number): ArrayLike<number>;
+        static toFloatArray(array: Array<number>): number[] | Float32Array;
+    }
+    class DebugUtils {
+        static logBones(skeleton: Skeleton): void;
+    }
+    class Pool<T> {
+        private items;
+        private instantiator;
+        constructor(instantiator: () => T);
+        obtain(): T;
+        free(item: T): void;
+        freeAll(items: ArrayLike<T>): void;
+        clear(): void;
+    }
+    class Vector2 {
+        x: number;
+        y: number;
+        constructor(x?: number, y?: number);
+        set(x: number, y: number): Vector2;
+        length(): number;
+        normalize(): this;
+    }
+    class TimeKeeper {
+        maxDelta: number;
+        framesPerSecond: number;
+        delta: number;
+        totalTime: number;
+        private lastTime;
+        private frameCount;
+        private frameTime;
+        update(): void;
+    }
+    interface ArrayLike<T> {
+        length: number;
+        [n: number]: T;
+    }
+}
+declare module PIXI.spine {
+    function atlasParser(): (resource: loaders.Resource, next: () => any) => any;
+    function imageLoaderAdapter(loader: any, namePrefix: any, baseUrl: any, imageOptions: any): (line: String, callback: (baseTexture: BaseTexture) => any) => void;
+    function syncImageLoaderAdapter(baseUrl: any, crossOrigin: any): (line: any, callback: any) => void;
+}
+declare module PIXI.spine {
+    class SpineSprite extends PIXI.Sprite {
+        region: core.TextureRegion;
+        constructor(tex: PIXI.Texture);
+    }
+    class SpineMesh extends PIXI.mesh.Mesh {
+        region: core.TextureRegion;
+        constructor(texture: PIXI.Texture, vertices?: Float32Array, uvs?: Float32Array, indices?: Uint16Array, drawMode?: number);
+    }
+    class Spine extends PIXI.Container {
+        static globalAutoUpdate: boolean;
+        tintRgb: ArrayLike<number>;
+        spineData: core.SkeletonData;
+        skeleton: core.Skeleton;
+        stateData: core.AnimationStateData;
+        state: core.AnimationState;
+        slotContainers: Array<PIXI.Container>;
+        constructor(spineData: core.SkeletonData);
+        autoUpdate: boolean;
+        tint: number;
+        update(dt: number): void;
+        private setSpriteRegion(attachment, sprite, region);
+        private setMeshRegion(attachment, mesh, region);
+        protected lastTime: number;
+        autoUpdateTransform(): void;
+        createSprite(slot: core.Slot, attachment: core.RegionAttachment, defName: string): SpineSprite;
+        createMesh(slot: core.Slot, attachment: core.MeshAttachment): SpineMesh;
+        hackTextureBySlotIndex(slotIndex: number, texture?: PIXI.Texture, size?: PIXI.Rectangle): boolean;
+        hackTextureBySlotName: (slotName: String, texture?: Texture, size?: Rectangle) => any;
     }
-
 }
diff --git a/pixi-spine/pixi-spine-tests.ts b/pixi-spine/pixi-spine-tests.ts
index 473e49ae29..55478c3392 100644
--- a/pixi-spine/pixi-spine-tests.ts
+++ b/pixi-spine/pixi-spine-tests.ts
@@ -1,5 +1,5 @@
 /// <reference types="pixi.js" />
-
+/// <reference types="pixi-spine" />
 
 namespace Spine {
 
@@ -48,7 +48,7 @@ namespace Spine {
             this.stage.addChild(dragonCage);
 
             // once position and scaled, set the animation to play
-            this.dragon.state.setAnimationByName(0, 'flying', true);
+            this.dragon.state.setAnimation(0, 'flying', true);
 
             this.animate();
 
@@ -186,10 +186,10 @@ namespace Spine {
 
             this.stage.addChild(this.pixie);
 
-            this.pixie.stateData.setMixByName('running', 'jump', 0.2);
-            this.pixie.stateData.setMixByName('jump', 'running', 0.4);
+            this.pixie.stateData.setMix('running', 'jump', 0.2);
+            this.pixie.stateData.setMix('jump', 'running', 0.4);
 
-            this.pixie.state.setAnimationByName(0, 'running', true);
+            this.pixie.state.setAnimation(0, 'running', true);
 
             this.stage.on('mousedown', this.onTouchStart);
             this.stage.on('touchstart', this.onTouchStart);
@@ -200,8 +200,8 @@ namespace Spine {
 
         private onTouchStart = (): void => {
 
-            this.pixie.state.setAnimationByName(0, 'jump', false);
-            this.pixie.state.addAnimationByName(0, 'running', true, 0);
+            this.pixie.state.setAnimation(0, 'jump', false);
+            this.pixie.state.addAnimation(0, 'running', true, 0);
 
         }
 
@@ -277,19 +277,19 @@ namespace Spine {
                 this.spineboy.scale.set(1.5);
 
                 // set up the mixes!
-                this.spineboy.stateData.setMixByName('walk', 'jump', 0.2);
-                this.spineboy.stateData.setMixByName('jump', 'walk', 0.4);
+                this.spineboy.stateData.setMix('walk', 'jump', 0.2);
+                this.spineboy.stateData.setMix('jump', 'walk', 0.4);
 
                 // play animation
-                this.spineboy.state.setAnimationByName(0, 'walk', true);
+                this.spineboy.state.setAnimation(0, 'walk', true);
 
                 this.stage.addChild(this.spineboy);
 
 
                 this.stage.on('click', () => {
 
-                    this.spineboy.state.setAnimationByName(0, 'jump', false);
-                    this.spineboy.state.addAnimationByName(0, 'walk', true, 0);
+                    this.spineboy.state.setAnimation(0, 'jump', false);
+                    this.spineboy.state.addAnimation(0, 'walk', true, 0);
 
                 });
 

From 785ec847ef82c07addcf6ed782bb84290b1d0e2a Mon Sep 17 00:00:00 2001
From: Michael Lamparski <diagonaldevice@gmail.com>
Date: Sun, 13 Nov 2016 11:30:48 -0500
Subject: [PATCH 107/245] Make gl-matrix null-aware

Got bitten by nulls arising from matrix inverses.

Pretty much every change in this commit came from a simple textual
search for explicit appearances of "null" and "undefined" in
https://github.com/toji/gl-matrix/blob/master/src/gl-matrix.js.

Additional things I checked: (all of which turned up nothing)

* Checked each null-returning function for others that call it.
* Glanced through for other suspicious places where null/undefined
  might crop up implicitly. However, almost every function in the
  library simply mutates one of its arguments in a manner that should
  respect the type invariants, and returns it. Nothing stuck out to me.
* Double-checked newer files in
  https://github.com/toji/gl-matrix/tree/master/src/gl-matrix
---
 gl-matrix/gl-matrix-tests.ts | 33 +++++++++++++++++++--------------
 gl-matrix/index.d.ts         | 10 +++++-----
 gl-matrix/tsconfig.json      |  4 ++--
 3 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/gl-matrix/gl-matrix-tests.ts b/gl-matrix/gl-matrix-tests.ts
index 5df2220f72..6325ff5cd4 100644
--- a/gl-matrix/gl-matrix-tests.ts
+++ b/gl-matrix/gl-matrix-tests.ts
@@ -33,6 +33,11 @@ let outMat3 = mat3.create();
 let outMat4 = mat4.create();
 let outQuat = quat.create();
 
+let outMat2Null: mat2 | null;
+let outMat2dNull: mat2d | null;
+let outMat3Null: mat3 | null;
+let outMat4Null: mat4 | null;
+
 // vec2
 outVec2 = vec2.create();
 outVec2 = vec2.clone(vec2A);
@@ -180,7 +185,7 @@ outMat2 = mat2.identity(outMat2);
 outMat2 = mat2.fromValues(1, 2, 3, 4);
 outMat2 = mat2.set(outMat2, 1, 2, 3, 4);
 outMat2 = mat2.transpose(outMat2, mat2A);
-outMat2 = mat2.invert(outMat2, mat2A);
+outMat2Null = mat2.invert(outMat2, mat2A);
 outMat2 = mat2.adjoint(outMat2, mat2A);
 outVal = mat2.determinant(mat2A);
 outMat2 = mat2.multiply(outMat2, mat2A, mat2B);
@@ -210,7 +215,7 @@ outMat2d = mat2d.copy(outMat2d, mat2dA);
 outMat2d = mat2d.identity(outMat2d);
 outMat2d = mat2d.fromValues(1, 2, 3, 4, 5, 6);
 outMat2d = mat2d.set(outMat2d, 1, 2, 3, 4, 5, 6);
-outMat2d = mat2d.invert(outMat2d, mat2dA);
+outMat2dNull = mat2d.invert(outMat2d, mat2dA);
 outVal = mat2d.determinant(mat2dA);
 outMat2d = mat2d.multiply(outMat2d, mat2dA, mat2dB);
 outMat2d = mat2d.mul(outMat2d, mat2dA, mat2dB);
@@ -239,7 +244,7 @@ outMat3 = mat3.fromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
 outMat3 = mat3.set(outMat3, 1, 2, 3, 4, 5, 6, 7, 8, 9);
 outMat3 = mat3.identity(outMat3);
 outMat3 = mat3.transpose(outMat3, mat3A);
-outMat3 = mat3.invert(outMat3, mat3A);
+outMat3Null = mat3.invert(outMat3, mat3A);
 outMat3 = mat3.adjoint(outMat3, mat3A);
 outVal = mat3.determinant(mat3A);
 outMat3 = mat3.multiply(outMat3, mat3A, mat3B);
@@ -252,7 +257,7 @@ outMat3 = mat3.fromRotation(outMat3, Math.PI);
 outMat3 = mat3.fromScaling(outMat3, vec2A);
 outMat3 = mat3.fromMat2d(outMat3, mat2dA);
 outMat3 = mat3.fromQuat(outMat3, quatA);
-outMat3 = mat3.normalFromMat4(outMat3, mat4A);
+outMat3Null = mat3.normalFromMat4(outMat3, mat4A);
 outStr = mat3.str(mat3A);
 outVal = mat3.frob(mat3A);
 outMat3 = mat3.add(outMat3, mat3A, mat3B);
@@ -271,19 +276,19 @@ outMat4 = mat4.fromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16)
 outMat4 = mat4.set(outMat4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 outMat4 = mat4.identity(outMat4);
 outMat4 = mat4.transpose(outMat4, mat4A);
-outMat4 = mat4.invert(outMat4, mat4A);
+outMat4Null = mat4.invert(outMat4, mat4A);
 outMat4 = mat4.adjoint(outMat4, mat4A);
 outVal = mat4.determinant(mat4A);
 outMat4 = mat4.multiply(outMat4, mat4A, mat4B);
 outMat4 = mat4.mul(outMat4, mat4A, mat4B);
 outMat4 = mat4.translate(outMat4, mat4A, vec3A);
 outMat4 = mat4.scale(outMat4, mat4A, vec3A);
-outMat4 = mat4.rotate(outMat4, mat4A, Math.PI, vec3A);
+outMat4Null = mat4.rotate(outMat4, mat4A, Math.PI, vec3A);
 outMat4 = mat4.rotateX(outMat4, mat4A, Math.PI);
 outMat4 = mat4.rotateY(outMat4, mat4A, Math.PI);
 outMat4 = mat4.rotateZ(outMat4, mat4A, Math.PI);
 outMat4 = mat4.fromTranslation(outMat4, vec3A);
-outMat4 = mat4.fromRotation(outMat4, Math.PI, vec3A);
+outMat4Null = mat4.fromRotation(outMat4, Math.PI, vec3A);
 outMat4 = mat4.fromScaling(outMat4, vec3A);
 outMat4 = mat4.fromXRotation(outMat4, Math.PI);
 outMat4 = mat4.fromYRotation(outMat4, Math.PI);
@@ -529,7 +534,7 @@ outMat2 = _mat2.identity(outMat2);
 outMat2 = _mat2.fromValues(1, 2, 3, 4);
 outMat2 = _mat2.set(outMat2, 1, 2, 3, 4);
 outMat2 = _mat2.transpose(outMat2, mat2A);
-outMat2 = _mat2.invert(outMat2, mat2A);
+outMat2Null = _mat2.invert(outMat2, mat2A);
 outMat2 = _mat2.adjoint(outMat2, mat2A);
 outVal = _mat2.determinant(mat2A);
 outMat2 = _mat2.multiply(outMat2, mat2A, mat2B);
@@ -559,7 +564,7 @@ outMat2d = _mat2d.copy(outMat2d, mat2dA);
 outMat2d = _mat2d.identity(outMat2d);
 outMat2d = _mat2d.fromValues(1, 2, 3, 4, 5, 6);
 outMat2d = _mat2d.set(outMat2d, 1, 2, 3, 4, 5, 6);
-outMat2d = _mat2d.invert(outMat2d, mat2dA);
+outMat2dNull = _mat2d.invert(outMat2d, mat2dA);
 outVal = _mat2d.determinant(mat2dA);
 outMat2d = _mat2d.multiply(outMat2d, mat2dA, mat2dB);
 outMat2d = _mat2d.mul(outMat2d, mat2dA, mat2dB);
@@ -588,7 +593,7 @@ outMat3 = _mat3.fromValues(1, 2, 3, 4, 5, 6, 7, 8, 9);
 outMat3 = _mat3.set(outMat3, 1, 2, 3, 4, 5, 6, 7, 8, 9);
 outMat3 = _mat3.identity(outMat3);
 outMat3 = _mat3.transpose(outMat3, mat3A);
-outMat3 = _mat3.invert(outMat3, mat3A);
+outMat3Null = _mat3.invert(outMat3, mat3A);
 outMat3 = _mat3.adjoint(outMat3, mat3A);
 outVal = _mat3.determinant(mat3A);
 outMat3 = _mat3.multiply(outMat3, mat3A, mat3B);
@@ -601,7 +606,7 @@ outMat3 = _mat3.fromRotation(outMat3, Math.PI);
 outMat3 = _mat3.fromScaling(outMat3, vec2A);
 outMat3 = _mat3.fromMat2d(outMat3, mat2dA);
 outMat3 = _mat3.fromQuat(outMat3, quatA);
-outMat3 = _mat3.normalFromMat4(outMat3, mat4A);
+outMat3Null = _mat3.normalFromMat4(outMat3, mat4A);
 outStr = _mat3.str(mat3A);
 outVal = _mat3.frob(mat3A);
 outMat3 = _mat3.add(outMat3, mat3A, mat3B);
@@ -620,19 +625,19 @@ outMat4 = _mat4.fromValues(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16
 outMat4 = _mat4.set(outMat4, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16);
 outMat4 = _mat4.identity(outMat4);
 outMat4 = _mat4.transpose(outMat4, mat4A);
-outMat4 = _mat4.invert(outMat4, mat4A);
+outMat4Null = _mat4.invert(outMat4, mat4A);
 outMat4 = _mat4.adjoint(outMat4, mat4A);
 outVal = _mat4.determinant(mat4A);
 outMat4 = _mat4.multiply(outMat4, mat4A, mat4B);
 outMat4 = _mat4.mul(outMat4, mat4A, mat4B);
 outMat4 = _mat4.translate(outMat4, mat4A, vec3A);
 outMat4 = _mat4.scale(outMat4, mat4A, vec3A);
-outMat4 = _mat4.rotate(outMat4, mat4A, Math.PI, vec3A);
+outMat4Null = _mat4.rotate(outMat4, mat4A, Math.PI, vec3A);
 outMat4 = _mat4.rotateX(outMat4, mat4A, Math.PI);
 outMat4 = _mat4.rotateY(outMat4, mat4A, Math.PI);
 outMat4 = _mat4.rotateZ(outMat4, mat4A, Math.PI);
 outMat4 = _mat4.fromTranslation(outMat4, vec3A);
-outMat4 = _mat4.fromRotation(outMat4, Math.PI, vec3A);
+outMat4Null = _mat4.fromRotation(outMat4, Math.PI, vec3A);
 outMat4 = _mat4.fromScaling(outMat4, vec3A);
 outMat4 = _mat4.fromXRotation(outMat4, Math.PI);
 outMat4 = _mat4.fromYRotation(outMat4, Math.PI);
diff --git a/gl-matrix/index.d.ts b/gl-matrix/index.d.ts
index b8a6694e40..89f28934b8 100644
--- a/gl-matrix/index.d.ts
+++ b/gl-matrix/index.d.ts
@@ -1384,7 +1384,7 @@ declare module 'gl-matrix' {
          * @param a the source matrix
          * @returns out
          */
-        public static invert(out: mat2, a: mat2): mat2;
+        public static invert(out: mat2, a: mat2): mat2 | null;
 
         /**
          * Calculates the adjugate of a mat2
@@ -1638,7 +1638,7 @@ declare module 'gl-matrix' {
          * @param a the source matrix
          * @returns out
          */
-        public static invert(out: mat2d, a: mat2d): mat2d;
+        public static invert(out: mat2d, a: mat2d): mat2d | null;
 
         /**
          * Calculates the determinant of a mat2d
@@ -1918,7 +1918,7 @@ declare module 'gl-matrix' {
          * @param a the source matrix
          * @returns out
          */
-        public static invert(out: mat3, a: mat3): mat3;
+        public static invert(out: mat3, a: mat3): mat3 | null;
 
         /**
          * Calculates the adjugate of a mat3
@@ -2054,7 +2054,7 @@ declare module 'gl-matrix' {
          *
          * @returns out
          */
-        public static normalFromMat4(out: mat3, a: mat4): mat3;
+        public static normalFromMat4(out: mat3, a: mat4): mat3 | null;
 
         /**
          * Returns a string representation of a mat3
@@ -2242,7 +2242,7 @@ declare module 'gl-matrix' {
          * @param a the source matrix
          * @returns out
          */
-        public static invert(out: mat4, a: mat4): mat4;
+        public static invert(out: mat4, a: mat4): mat4 | null;
 
         /**
          * Calculates the adjugate of a mat4
diff --git a/gl-matrix/tsconfig.json b/gl-matrix/tsconfig.json
index 5350b55fb6..4a5a2ae6bb 100644
--- a/gl-matrix/tsconfig.json
+++ b/gl-matrix/tsconfig.json
@@ -3,7 +3,7 @@
         "module": "commonjs",
         "target": "es6",
         "noImplicitAny": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -16,4 +16,4 @@
         "index.d.ts",
         "gl-matrix-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 4c0c558430b6a5f407e3c0a0daa8bf94be66590f Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fschott@google.com>
Date: Thu, 10 Nov 2016 16:37:21 -0800
Subject: [PATCH 108/245] winston: add missing transport properties

---
 winston/index.d.ts | 65 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 61 insertions(+), 4 deletions(-)

diff --git a/winston/index.d.ts b/winston/index.d.ts
index 6fccfe514c..bf98f07944 100644
--- a/winston/index.d.ts
+++ b/winston/index.d.ts
@@ -11,6 +11,8 @@
 ///  Winston v2.2.x
 ///******************
 
+import {Agent} from 'http';
+
 declare var winston: winston.Winston;
 export = winston;
 
@@ -159,6 +161,15 @@ declare namespace winston {
     }
 
     export interface TransportInstance extends TransportStatic, NodeJS.EventEmitter {
+        silent: boolean;
+        raw: boolean;
+        name: string;
+        formatter?: Function;
+        level?: string;
+        handleExceptions: boolean;
+        exceptionsLevel: string;
+        humanReadableUnhandledException: boolean;
+
         formatQuery(query: (string | Object)): (string | Object);
         normalizeQuery(options: QueryOptions): QueryOptions;
         formatResults(results: (Object | Array<any>), options?: Object): (Object | Array<any>);
@@ -166,23 +177,69 @@ declare namespace winston {
     }
 
     export interface ConsoleTransportInstance extends TransportInstance {
+        json: boolean;
+        colorize: boolean;
+        prettyPrint: boolean;
+        timestamp: boolean;
+        showLevel: boolean;
+        label: string|null;
+        logstash: boolean;
+        depth: string|null;
+        align: boolean;
+        stderrLevels: {[key: string]: LeveledLogMethod;}
+        eol: string;
+        stringify?: (obj: Object) => string;
+
         new (options?: ConsoleTransportOptions): ConsoleTransportInstance;
     }
 
-    export interface DailyRotateFileTransportInstance extends TransportInstance {
-        new (options?: DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
-    }
-
     export interface FileTransportInstance extends TransportInstance {
+        json: boolean;
+        logstash: boolean;
+        colorize: boolean;
+        maxsize: number|null;
+        rotationFormat: boolean;
+        zippedArchive: boolean;
+        maxFiles: number|null;
+        prettyPrint: boolean;
+        label: string|null;
+        timestamp: boolean;
+        eol: string;
+        tailable: boolean;
+        depth: string|null;
+        showLevel: boolean;
+        maxRetries: number;
+        stringify?: (obj: Object) => string;
+
         new (options?: FileTransportOptions): FileTransportInstance;
         close(): void;
     }
 
     export interface HttpTransportInstance extends TransportInstance {
+        name: string;
+        ssl: boolean;
+        host: string;
+        port: number;
+        auth?: {username: string, password: string};
+        path: string;
+        agent?: Agent|null;
+
         new (options?: HttpTransportOptions): HttpTransportInstance;
     }
 
     export interface MemoryTransportInstance extends TransportInstance {
+        errorOutput: GenericTextTransportOptions[];
+        writeOutput: GenericTextTransportOptions[];
+
+        json: boolean;
+        colorize: boolean;
+        prettyPrint: boolean;
+        timestamp: boolean;
+        showLevel: boolean;
+        label: string|null;
+        depth: string|null;
+        stringify?: (obj: Object) => string;
+
         new (options?: MemoryTransportOptions): MemoryTransportInstance;
     }
 

From 447629b22957ba91ddac9abe667e5c6cfad24dfb Mon Sep 17 00:00:00 2001
From: "Fred K. Schott" <fschott@google.com>
Date: Fri, 11 Nov 2016 09:54:08 -0800
Subject: [PATCH 109/245] add back missing DailyRotateFileTransportInstance
 definition

---
 winston/index.d.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/winston/index.d.ts b/winston/index.d.ts
index bf98f07944..0b10766d10 100644
--- a/winston/index.d.ts
+++ b/winston/index.d.ts
@@ -193,6 +193,10 @@ declare namespace winston {
         new (options?: ConsoleTransportOptions): ConsoleTransportInstance;
     }
 
+    export interface DailyRotateFileTransportInstance extends TransportInstance {
+        new (options?: DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
+    }
+
     export interface FileTransportInstance extends TransportInstance {
         json: boolean;
         logstash: boolean;

From 27b98d0580fd39f4b99041191ee57373c71998c5 Mon Sep 17 00:00:00 2001
From: Kyle Herock <kherock@gmail.com>
Date: Sat, 12 Nov 2016 04:29:20 -0500
Subject: [PATCH 110/245] More accurate hinted and inferred types for
 react-redux connect()

- Cleaned up and made the typings and tests consistent stylewise
- Support typings for the mergeProps parameter
- Allow mapStateToProps and mapDispatchToProps to be optional when type parameters are provided
- Make static members accessible on the wrapped component
- Use stricter typings in the quick start counter tests
- Added a single type variable form for connect to specify TOwnProps
---
 react-redux/index.d.ts            | 187 +++++-----
 react-redux/react-redux-tests.tsx | 594 ++++++++++++++++--------------
 2 files changed, 411 insertions(+), 370 deletions(-)

diff --git a/react-redux/index.d.ts b/react-redux/index.d.ts
index 3303908a01..ecdd84bb59 100644
--- a/react-redux/index.d.ts
+++ b/react-redux/index.d.ts
@@ -6,102 +6,119 @@
 import * as React from 'react';
 import * as Redux from 'redux';
 
-type ComponentClass<P> = React.ComponentClass<P>;
-type StatelessComponent<P> = React.StatelessComponent<P>;
-type ReactNode = React.ReactNode;
-type Store<S> = Redux.Store<S>;
-type Dispatch<S> = Redux.Dispatch<S>;
-type ActionCreator<A> = Redux.ActionCreator<A>;
+export = ReactRedux;
 
-interface ComponentDecorator<TOriginalProps, TOwnProps> {
-    (component: ComponentClass<TOriginalProps> | StatelessComponent<TOriginalProps>): ComponentClass<TOwnProps>;
-}
+declare namespace ReactRedux {
 
-/**
- * Decorator that infers the type from the original component
- *
- * Can't use the above decorator because it would default the type to {}
- */
-export interface InferableComponentDecorator {
-    <P, TComponentConstruct extends (ComponentClass<P> | StatelessComponent<P>)>(component: TComponentConstruct): TComponentConstruct;
-}
+    type ComponentType<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
 
-/**
- * Connects a React component to a Redux store.
- *
- * - Without arguments, just wraps the component, without changing the behavior / props
- *
- * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
- * is to override ownProps (as stated in the docs), so what remains is everything that's
- * not a state or dispatch prop
- *
- * - When 3rd param is passed, we don't know if ownProps propagate and whether they
- * should be valid component props, because it depends on mergeProps implementation.
- * As such, it is the user's responsibility to extend ownProps interface from state or
- * dispatch props or both when applicable
- *
- * @param mapStateToProps
- * @param mapDispatchToProps
- * @param mergeProps
- * @param options
- */
-export declare function connect(): InferableComponentDecorator;
+    interface ComponentDecorator<M, P> {
+        <TargetClass extends ComponentType<M>>(component: TargetClass): TargetClass & ConnectClass<P, TargetClass>;
+    }
 
-export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
-    mapStateToProps: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
-    mapDispatchToProps?: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>
-): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+    interface ConnectState<S> {
+        storeState: S
+    }
 
-export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
-    mapStateToProps: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
-    mapDispatchToProps: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>,
-    mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps>,
-    options?: Options
-): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+    class Connect<P, S> extends React.Component<P, ConnectState<S>> {
+        version: number;
+        store: Redux.Store<S>;
+        state: ConnectState<S>;
+    }
 
-type FuncOrSelf<T> = T | (() => T);
+    interface ConnectClass<P, W> extends React.ComponentClass<P> {
+        constructor<S>(props?: P, context?: any): Connect<P, S>;
+        WrappedComponent: W;
+    }
 
-interface MapStateToProps<TStateProps, TOwnProps> {
-    (state: any, ownProps?: TOwnProps): TStateProps;
-}
+    export type DefaultStateProps = {};
+    export type DefaultDispatchProps = { dispatch: Redux.Dispatch<any> };
+    export type DefaultMergedProps<TStateProps, TDispatchProps, TOwnProps> = TOwnProps & TStateProps & TDispatchProps;
 
-interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
-    (dispatch: Dispatch<any>, ownProps?: TOwnProps): TDispatchProps;
-}
-
-interface MapDispatchToPropsObject {
-    [name: string]: ActionCreator<any>;
-}
-
-interface MergeProps<TStateProps, TDispatchProps, TOwnProps> {
-    (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TStateProps & TDispatchProps;
-}
-
-interface Options {
     /**
-     * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
-     * preventing unnecessary updates, assuming that the component is a “pure” component
-     * and does not rely on any input or state other than its props and the selected Redux store’s state.
-     * Defaults to true.
-     * @default true
+     * Connects a React component to a Redux store.
+     *
+     * - Without arguments, just wraps the component, without changing the behavior / props
+     *
+     * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
+     * is to override ownProps (as stated in the docs), so what remains is everything that's
+     * not a state or dispatch prop
+     *
+     * - When 3rd param is passed, we don't know if ownProps propagate and whether they
+     * should be valid component props, because it depends on mergeProps implementation.
+     * As such, it is the user's responsibility to extend ownProps interface from state or
+     * dispatch props or both when applicable
+     *
+     * @param mapStateToProps
+     * @param mapDispatchToProps
+     * @param mergeProps
+     * @param options
      */
-    pure?: boolean;
-    /**
-    * If true, stores a ref to the wrapped component instance and makes it available via 
-    * getWrappedInstance() method. Defaults to false.
-    */
-    withRef?: boolean;
-}
+    export function connect<TOwnProps>(
+        mapStateToProps?: FuncOrSelf<InferableMapStateToProps<TOwnProps>>,
+        mapDispatchToProps?: FuncOrSelf<InferableMapDispatchToPropsFunction<TOwnProps> | MapDispatchToPropsObject>,
+        mergeProps?: void,
+        options?: Options
+    ): ComponentDecorator<any, TOwnProps>;
+
+    export function connect<TStateProps, TDispatchProps, TOwnProps>(
+        mapStateToProps?: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
+        mapDispatchToProps?: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>,
+        mergeProps?: void,
+        options?: Options
+    ): ComponentDecorator<DefaultMergedProps<TStateProps, TDispatchProps, TOwnProps>, TOwnProps>;
+
+    export function connect<TStateProps, TDispatchProps, TOwnProps, TMergedProps>(
+        mapStateToProps?: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
+        mapDispatchToProps?: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>,
+        mergeProps?: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
+        options?: Options
+    ): ComponentDecorator<TMergedProps, TOwnProps>;
+
+    type FuncOrSelf<T> = (() => T) | T;
+
+    type MapStateToProps<TStateProps, TOwnProps> = (state: any, ownProps?: TOwnProps) => TStateProps;
+
+    type InferableMapStateToProps<TOwnProps> = <TStateProps>(state: any, ownProps?: TOwnProps) => TStateProps;
+
+    type MapDispatchToPropsFunction<TDispatchProps, TOwnProps> = (dispatch: Redux.Dispatch<any>, ownProps?: TOwnProps) => TDispatchProps;
+
+    type InferableMapDispatchToPropsFunction<TOwnProps> = <TDispatchProps>(dispatch: Redux.Dispatch<any>, ownProps?: TOwnProps) => TDispatchProps;
+
+    type MapDispatchToPropsObject = {
+        [name: string]: Redux.ActionCreator<any>;
+    }
+
+    type MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> =
+        (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps) => TMergedProps;
+
+    export interface Options {
+        /**
+         * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
+         * preventing unnecessary updates, assuming that the component is a “pure” component
+         * and does not rely on any input or state other than its props and the selected Redux store’s state.
+         * Defaults to true.
+         * @default true
+         */
+        pure?: boolean;
+        /**
+         * If true, stores a ref to the wrapped component instance and makes it available via
+         * getWrappedInstance() method. Defaults to false.
+         */
+        withRef?: boolean;
+    }
+
+    export interface ProviderProps {
+        /**
+         * The single Redux store in your application.
+         */
+        store?: Redux.Store<any>;
+        children?: React.ReactNode;
+    }
 
-export interface ProviderProps {
     /**
-     * The single Redux store in your application.
+     * Makes the Redux store available to the connect() calls in the component hierarchy below.
      */
-    store?: Store<any>;
-    children?: ReactNode;
+    export class Provider extends React.Component<ProviderProps, {}> {
+    }
 }
-
-/**
- * Makes the Redux store available to the connect() calls in the component hierarchy below.
- */
-export class Provider extends React.Component<ProviderProps, {}> { }
diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index 8c552c8272..e8aac5dfb3 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -8,7 +8,7 @@ import { Component, ReactElement } from 'react';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { Router, RouterState } from 'react-router';
-import { Store, Dispatch, bindActionCreators } from 'redux';
+import { ActionCreator, Store, Dispatch, bindActionCreators } from 'redux';
 import { connect, Provider } from 'react-redux';
 import objectAssign = require('object-assign');
 import * as History from 'history';
@@ -17,302 +17,324 @@ import * as History from 'history';
 // Quick Start
 // https://github.com/rackt/react-redux/blob/master/docs/quick-start.md#quick-start
 //
-
-interface CounterState {
-    counter: number;
-}
-declare var increment: Function;
-
-class Counter extends Component<any, any> {
-    render() {
-        return (
-            <button onClick={this.props.onIncrement}>
-                {this.props.value}
-            </button>
-        );
+namespace TestQuickStartExample {
+    interface CounterStateProps {
+        value: number;
     }
-}
+    interface CounterDispatchProps {
+        onIncrement: ActionCreator<CounterState>;
+    }
+    interface CounterState {
+        counter: number;
+    }
+    declare var increment: Function;
 
-function mapStateToProps(state: CounterState) {
-    return {
+    class Counter extends Component<CounterStateProps & CounterDispatchProps, CounterState> {
+        render() {
+            return (
+                <button onClick={this.props.onIncrement}>
+                    {this.props.value}
+                </button>
+            );
+        }
+    }
+
+    const mapStateToProps = (state: CounterState) => ({
         value: state.counter
-    };
-}
-
-// Which action creators does it want to receive by props?
-function mapDispatchToProps(dispatch: Dispatch<CounterState>) {
-    return {
-        onIncrement: () => dispatch(increment())
-    };
-}
-
-connect(
-    mapStateToProps,
-    mapDispatchToProps
-)(Counter);
-
-
-@connect(mapStateToProps)
-class CounterContainer extends Component<any, any> {
-
-}
-
-// Ensure connect's first two arguments can be replaced by wrapper functions
-interface ICounterStateProps {
-    value: number
-}
-interface ICounterDispatchProps {
-    onIncrement: () => void
-}
-connect<ICounterStateProps, ICounterDispatchProps, {}>(
-    () => mapStateToProps,
-    () => mapDispatchToProps
-)(Counter);
-// only first argument
-connect<ICounterStateProps, {}, {}>(
-    () => mapStateToProps
-)(Counter);
-// wrap only one argument
-connect<ICounterStateProps, ICounterDispatchProps, {}>(
-    mapStateToProps,
-    () => mapDispatchToProps
-)(Counter);
-// with extra arguments
-connect<ICounterStateProps, ICounterDispatchProps, {}>(
-    () => mapStateToProps,
-    () => mapDispatchToProps,
-    (s: ICounterStateProps, d: ICounterDispatchProps) =>
-        objectAssign({}, s, d),
-    { pure: true }
-)(Counter);
-
-
-class App extends Component<any, any> {
-    render(): JSX.Element {
-        // ...
-        return null;
-    }
-}
-
-const targetEl = document.getElementById('root');
-
-ReactDOM.render((
-    <Provider store={store}>
-        {() => <App />}
-    </Provider>
-), targetEl);
-
-//
-// API
-// https://github.com/rackt/react-redux/blob/master/docs/api.md
-//
-declare var store: Store<TodoState>;
-declare var routerState: RouterState;
-declare var history: History.History;
-class MyRootComponent extends Component<any, any> {
-
-}
-class TodoApp extends Component<any, any> {
-
-}
-interface TodoState {
-    todos: string[]|string;
-}
-interface TodoProps {
-    userId: number;
-}
-interface DispatchProps {
-    addTodo(userId: number, text: string): void;
-    action: Function;
-}
-declare var actionCreators: () => {
-    action: Function;
-}
-declare var addTodo: () => { type: string; };
-declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
-declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
-
-ReactDOM.render(
-  <Provider store={store}>
-    {() => <MyRootComponent />}
-  </Provider>,
-  document.body
-);
-
-//TODO: for React Router 0.13
-////TODO: error TS2339: Property 'run' does not exist on type 'typeof "react-router"'.
-////TODO: error TS2339: Property 'HistoryLocation' does not exist on type 'typeof "react-router"'.
-//declare var routes: any;
-//Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
-//    ReactDOM.render(
-//        <Provider store={store}>
-//            {/*
-//             //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
-//             {() => <Handler routerState={routerState} />} // note "routerState" here: important to pass it down
-//            */}
-//        </Provider>,
-//        document.getElementById('root')
-//    );
-//});
-
-
-//TODO: for React Router 1.0
-ReactDOM.render(
-    <Provider store={store}>
-        {() => <Router history={history}>...</Router>}
-    </Provider>,
-    targetEl
-);
-
-// Inject just dispatch and don't listen to store
-
-connect()(TodoApp);
-
-// Inject dispatch and every field in the global state
-
-connect((state: TodoState) => state)(TodoApp);
-
-// Inject dispatch and todos
-
-function mapStateToProps2(state: TodoState) {
-    return { todos: state.todos };
-}
-
-export default connect(mapStateToProps2)(TodoApp);
-
-// Inject todos and all action creators (addTodo, completeTodo, ...)
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
-connect(mapStateToProps2, actionCreators)(TodoApp);
-
-// Inject todos and all action creators (addTodo, completeTodo, ...) as actions
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
-function mapDispatchToProps2(dispatch: Dispatch<TodoState>) {
-    return { actions: bindActionCreators(actionCreators, dispatch) };
-}
-
-connect(mapStateToProps2, mapDispatchToProps2)(TodoApp);
-
-// Inject todos and a specific action creator (addTodo)
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
-function mapDispatchToProps3(dispatch: Dispatch<TodoState>) {
-    return bindActionCreators({ addTodo }, dispatch);
-}
-
-connect(mapStateToProps2, mapDispatchToProps3)(TodoApp);
-
-// Inject todos, todoActionCreators as todoActions, and counterActionCreators as counterActions
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
-function mapDispatchToProps4(dispatch: Dispatch<TodoState>) {
-    return {
-        todoActions: bindActionCreators(todoActionCreators, dispatch),
-        counterActions: bindActionCreators(counterActionCreators, dispatch)
-    };
-}
-
-connect(mapStateToProps2, mapDispatchToProps4)(TodoApp);
-
-// Inject todos, and todoActionCreators and counterActionCreators together as actions
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
-function mapDispatchToProps5(dispatch: Dispatch<TodoState>) {
-    return {
-        actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
-    };
-}
-
-connect(mapStateToProps2, mapDispatchToProps5)(TodoApp);
-
-// Inject todos, and all todoActionCreators and counterActionCreators directly as props
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
-function mapDispatchToProps6(dispatch: Dispatch<TodoState>) {
-    return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
-}
-
-connect(mapStateToProps2, mapDispatchToProps6)(TodoApp);
-
-// Inject todos of a specific user depending on props
-
-function mapStateToProps3(state: TodoState, ownProps: TodoProps): TodoState {
-    return { todos: state.todos[ownProps.userId] };
-}
-
-connect(mapStateToProps3)(TodoApp);
-
-// Inject todos of a specific user depending on props, and inject props.userId into the action
-
-//function mapStateToProps(state) {
-//    return { todos: state.todos };
-//}
-
-function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
-    return objectAssign({}, ownProps, dispatchProps, {
-        todos: stateProps.todos[ownProps.userId],
-        addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
     });
+
+    // Which action creators does it want to receive by props?
+    const mapDispatchToProps = (dispatch: Dispatch<CounterState>) => ({
+        onIncrement: () => dispatch(increment())
+    });
+
+    connect(
+        mapStateToProps,
+        mapDispatchToProps
+    )(Counter);
+
+    // https://github.com/Microsoft/TypeScript/issues/4881
+    //@connect(mapStateToProps)
+    //class WrappedCounter extends Component<CounterStateProps & CounterDispatchProps, CounterState> {
+    //}
+    //React.createElement(WrappedCounter, {});
+    // As a workaround, declare state and dispatch props as optional
+    interface OptionalCounterStateProps {
+        value?: number;
+    }
+    interface OptionalCounterDispatchProps {
+        onIncrement?: ActionCreator<CounterState>;
+    }
+    interface Props {
+        requiredOwnProp: string
+    }
+    @connect(mapStateToProps)
+    class WrappedCounter extends Component<Props & OptionalCounterStateProps & OptionalCounterDispatchProps, CounterState> {
+    }
+    React.createElement(WrappedCounter, { requiredOwnProp: 'here I am' });
+
+    // Ensure connect's first two arguments can be replaced by wrapper functions
+    connect<CounterStateProps, CounterDispatchProps, {}>(
+        () => mapStateToProps,
+        () => mapDispatchToProps
+    )(Counter);
+    // only first argument
+    connect<CounterStateProps, {}, {}>(
+        () => mapStateToProps
+    )(Counter);
+    // wrap only one argument
+    connect<CounterStateProps, CounterDispatchProps, {}>(
+        mapStateToProps,
+        () => mapDispatchToProps
+    )(Counter);
+    // with extra arguments
+    connect<CounterStateProps, CounterDispatchProps, {}, CounterStateProps & CounterDispatchProps>(
+        () => mapStateToProps,
+        () => mapDispatchToProps,
+        (stateProps: CounterStateProps, dispatchProps: CounterDispatchProps) =>
+            objectAssign({}, stateProps, dispatchProps),
+        { pure: true }
+    )(Counter);
 }
 
-connect(mapStateToProps2, actionCreators, mergeProps)(TodoApp);
+namespace TestTodosApp {
+
+    class App extends Component<any, any> {
+        render(): JSX.Element {
+            // ...
+            return null;
+        }
+    }
+
+    const targetEl = document.getElementById('root');
+
+    ReactDOM.render((
+        <Provider store={store}>
+            {() => <App />}
+        </Provider>
+    ), targetEl);
+
+    //
+    // API
+    // https://github.com/rackt/react-redux/blob/master/docs/api.md
+    //
+    declare var store: Store<TodoState>;
+    declare var routerState: RouterState;
+    declare var history: History.History;
+    class MyRootComponent extends Component<{}, RouterState> {
+    }
+    class TodoApp extends Component<any, TodoState> {
+    }
+    interface TodoState {
+        todos: string[] | string;
+    }
+    interface TodoProps {
+        userId: number;
+    }
+    interface DispatchProps {
+        addTodo(userId: number, text: string): void;
+        action: Function;
+    }
+    declare var actionCreators: () => {
+        action: Function;
+    }
+    declare var addTodo: () => { type: string; };
+    declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
+    declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
+
+    ReactDOM.render(
+        <Provider store={store}>
+            {() => <MyRootComponent />}
+        </Provider>,
+        document.body
+    );
+
+    //TODO: for React Router 0.13
+    ////TODO: error TS2339: Property 'run' does not exist on type 'typeof "react-router"'.
+    ////TODO: error TS2339: Property 'HistoryLocation' does not exist on type 'typeof "react-router"'.
+    //declare var routes: any;
+    //Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
+    //    ReactDOM.render(
+    //        <Provider store={store}>
+    //            {/*
+    //             //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
+    //             {() => <Handler routerState={routerState} />} // note "routerState" here: important to pass it down
+    //            */}
+    //        </Provider>,
+    //        document.getElementById('root')
+    //    );
+    //});
 
 
+    //TODO: for React Router 1.0
+    ReactDOM.render(
+        <Provider store={store}>
+            {() => <Router history={history}>...</Router>}
+        </Provider>,
+        targetEl
+    );
 
+    // Inject just dispatch and don't listen to store
 
+    connect()(TodoApp);
 
-interface TestProp {
-    property1: number;
-    someOtherProperty?: string;
+    // Inject dispatch and every field in the global state
+
+    connect((state: TodoState) => state)(TodoApp);
+
+    // Inject dispatch and todos
+
+    function mapStateToProps(state: TodoState) {
+        return { todos: state.todos };
+    }
+
+    connect(mapStateToProps)(TodoApp);
+
+    // Inject todos and all action creators (addTodo, completeTodo, ...)
+
+    //function mapStateToProps(state) {
+    //    return { todos: state.todos };
+    //}
+
+    connect(mapStateToProps, actionCreators)(TodoApp);
+
+    // Inject todos and all action creators (addTodo, completeTodo, ...) as actions
+
+    //function mapStateToProps(state) {
+    //    return { todos: state.todos };
+    //}
+
+    function mapDispatchToProps(dispatch: Dispatch<TodoState>) {
+        return { actions: bindActionCreators(actionCreators, dispatch) };
+    }
+
+    connect(mapStateToProps, mapDispatchToProps)(TodoApp);
+
+    // Inject todos and a specific action creator (addTodo)
+
+    //function mapStateToProps(state) {
+    //    return { todos: state.todos };
+    //}
+
+    function mapDispatchToProps2(dispatch: Dispatch<TodoState>) {
+        return bindActionCreators({ addTodo }, dispatch);
+    }
+
+    connect(mapStateToProps, mapDispatchToProps2)(TodoApp);
+
+    // Inject todos, todoActionCreators as todoActions, and counterActionCreators as counterActions
+
+    //function mapStateToProps(state) {
+    //    return { todos: state.todos };
+    //}
+
+    function mapDispatchToProps3(dispatch: Dispatch<TodoState>) {
+        return {
+            todoActions: bindActionCreators(todoActionCreators, dispatch),
+            counterActions: bindActionCreators(counterActionCreators, dispatch)
+        };
+    }
+
+    connect(mapStateToProps, mapDispatchToProps3)(TodoApp);
+
+    // Inject todos, and todoActionCreators and counterActionCreators together as actions
+
+    //function mapStateToProps(state) {
+    //    return { todos: state.todos };
+    //}
+
+    function mapDispatchToProps4(dispatch: Dispatch<TodoState>) {
+        return {
+            actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
+        };
+    }
+
+    connect(mapStateToProps, mapDispatchToProps4)(TodoApp);
+
+    // Inject todos, and all todoActionCreators and counterActionCreators directly as props
+
+    //function mapStateToProps(state) {
+    //    return { todos: state.todos };
+    //}
+
+    function mapDispatchToProps5(dispatch: Dispatch<TodoState>) {
+        return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
+    }
+
+    connect(mapStateToProps, mapDispatchToProps5)(TodoApp);
+
+    // Inject todos of a specific user depending on props
+
+    function mapStateToProps2(state: TodoState, ownProps: TodoProps): TodoState {
+        return { todos: state.todos[ownProps.userId] };
+    }
+
+    connect(mapStateToProps2)(TodoApp);
+
+    // Inject todos of a specific user depending on props, and inject props.userId into the action
+
+    //function mapStateToProps(state) {
+    //    return { todos: state.todos };
+    //}
+
+    function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
+        return objectAssign({}, ownProps, dispatchProps, {
+            todos: stateProps.todos[ownProps.userId],
+            addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
+        });
+    }
+
+    connect(mapStateToProps, actionCreators, mergeProps)(TodoApp);
 }
-interface TestState {
-    isLoaded: boolean;
-    state1: number;
+
+namespace TestComponent {
+    declare var store: Store<TestState>;
+    interface TestProps {
+        property1: number;
+        someOtherProperty?: string;
+    }
+    interface TestState {
+        isLoaded: boolean;
+        state1: number;
+    }
+    class TestComponent extends Component<TestProps, TestState> {
+        static staticMethod(): number {
+            return 0;
+        }
+    }
+    // Own properties can't be always be inferred, so a single type parameter will do
+    const WrappedTestComponent = connect<TestProps>()(TestComponent);
+
+    // return value of the connect()(TestComponent) is of the type TestComponent
+    let ATestComponent: typeof TestComponent = null;
+    ATestComponent = TestComponent;
+    ATestComponent = WrappedTestComponent;
+    // Wrapped component is accessible
+    WrappedTestComponent.WrappedComponent === TestComponent
+    // Static properties are accessible
+    WrappedTestComponent.staticMethod();
+
+    <TestComponent property1={42}/>;
+    <WrappedTestComponent property1={42}/>;
+    <ATestComponent property1={42}/>;
+
+    class NonComponent {
+    }
+    // this doesn't compile
+    //connect()(NonComponent);
+
+    // stateless functions
+    interface HelloMessageProps {
+        name: string;
+    }
+    function HelloMessage(props: HelloMessageProps) {
+        return <div>Hello {props.name}</div>;
+    }
+
+    const ConnectedHelloMessage = connect<HelloMessageProps>()(HelloMessage);
+    ReactDOM.render(<HelloMessage name="Sebastian"/>, document.getElementById('content'));
+    ReactDOM.render(<ConnectedHelloMessage name="Sebastian"/>, document.getElementById('content'));
 }
-class TestComponent extends Component<TestProp, TestState> { }
-const WrappedTestComponent = connect()(TestComponent);
-
-// return value of the connect()(TestComponent) is of the type TestComponent
-let ATestComponent: typeof TestComponent = null;
-ATestComponent = TestComponent;
-ATestComponent = WrappedTestComponent;
-
-let anElement: ReactElement<TestProp>;
-<TestComponent property1={42} />;
-<WrappedTestComponent property1={42} />;
-<ATestComponent property1={42} />;
-
-class NonComponent {}
-// this doesn't compile
-//connect()(NonComponent);
-
-// stateless functions
-interface HelloMessageProps { name: string; }
-function HelloMessage(props: HelloMessageProps) {
-    return <div>Hello {props.name}</div>;
-}
-let ConnectedHelloMessage = connect()(HelloMessage);
-ReactDOM.render(<HelloMessage name="Sebastian" />, document.getElementById('content'));
-ReactDOM.render(<ConnectedHelloMessage name="Sebastian" />, document.getElementById('content'));
 
 // stateless functions that uses mapStateToProps and mapDispatchToProps
 namespace TestStatelessFunctionWithMapArguments {
@@ -343,6 +365,8 @@ namespace TestStatelessFunctionWithMapArguments {
         mapStateToProps,
         mapDispatchToProps
     )(Greeting);
+
+    React.createElement(ConnectedGreeting, { name: 'hello', onClick: () => undefined });
 }
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8787
@@ -374,7 +398,7 @@ namespace TestTOwnPropsInference {
     const ConnectedWithTypeHint = connect<StateProps, {}, OwnProps>(mapStateToPropsWithoutOwnProps)(OwnPropsComponent);
 
     // This compiles, which is bad.
-    React.createElement(ConnectedWithoutOwnProps, { anything: 'goes!' });
+    // React.createElement(ConnectedWithoutOwnProps, { anything: 'goes!' });
 
     // This compiles, as expected.
     React.createElement(ConnectedWithOwnProps, { own: 'string' });

From afd2957d82451dbfe589fb36470311915f98bee2 Mon Sep 17 00:00:00 2001
From: groetzi <simon.groetzinger@gmail.com>
Date: Mon, 14 Nov 2016 17:50:08 -0600
Subject: [PATCH 111/245] Update xlsx.d.ts

added signatures for decode_[cell|range]
---
 xlsx/xlsx.d.ts | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/xlsx/xlsx.d.ts b/xlsx/xlsx.d.ts
index 68f89b545a..6f29ac2095 100644
--- a/xlsx/xlsx.d.ts
+++ b/xlsx/xlsx.d.ts
@@ -134,6 +134,11 @@ declare module 'xlsx' {
         r: number;
     }
 
+    export interface IRange {
+        s: ICell;
+        e: ICell;
+    }
+
     export interface IUtils {
         sheet_to_json<T>(worksheet:IWorkSheet, opts?: {
             raw?: boolean;
@@ -144,6 +149,8 @@ declare module 'xlsx' {
         sheet_to_formulae(worksheet: IWorkSheet):any;
         encode_cell(cell: ICell): any;
         encode_range(s: ICell, e: ICell): any;
+        decode_cell(address: string): ICell;
+        decode_range(range: string): IRange;
     }
 
 }

From 65cca47c83c44a776dd2daa3ac741bc897c3dbf3 Mon Sep 17 00:00:00 2001
From: KyleMcNutt <mcnuttkyle93@gmail.com>
Date: Mon, 14 Nov 2016 17:06:58 -0800
Subject: [PATCH 112/245] Updating HostedFields.on to take the event param

---
 braintree-web/index.d.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/braintree-web/index.d.ts b/braintree-web/index.d.ts
index e58cf7455b..d62ec01fd1 100644
--- a/braintree-web/index.d.ts
+++ b/braintree-web/index.d.ts
@@ -97,7 +97,7 @@ declare namespace BraintreeWeb {
 //  billingContact
 //  Billing contact information for the user.
 //    countryCode
-//Required.The merchant�s two- letter ISO 3166 country code.
+//Required.The merchant’s two- letter ISO 3166 country code.
 //    currencyCode
 //  Required.The three- letter ISO 4217 currency code for the payment.
 //    lineItems
@@ -782,7 +782,7 @@ declare namespace BraintreeWeb {
      * });
      * @returns {void}
      */
-    on(event: string, handler: (() => any)): void;
+    on(event: string, handler: ((event: any) => any)): void;
 
     /**
      * Cleanly tear down anything set up by {@link module:braintree-web/hosted-fields.create|create}
@@ -1740,4 +1740,4 @@ interface BraintreeStatic {
   VERSION: string;
 }
 
-declare var braintree: BraintreeStatic;
\ No newline at end of file
+declare var braintree: BraintreeStatic;

From db7a40ef1bf5c497e3f12019b983a9f66e9cf242 Mon Sep 17 00:00:00 2001
From: beginor <beginor@qq.com>
Date: Tue, 15 Nov 2016 11:29:55 +0800
Subject: [PATCH 113/245] add gettype to ol.geom.Geometry

---
 openlayers/openlayers.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/openlayers/openlayers.d.ts b/openlayers/openlayers.d.ts
index e516793fb2..a48e26071b 100644
--- a/openlayers/openlayers.d.ts
+++ b/openlayers/openlayers.d.ts
@@ -3728,6 +3728,12 @@ declare module ol {
              */
             transform(source: ol.ProjectionLike, destination: ol.ProjectionLike): ol.geom.Geometry;
 
+            /**
+             * Get the type of this geometry.
+             * @abstract
+             * @return {ol.geom.GeometryType} Geometry type.
+             */
+            getType(): ol.geom.GeometryType;
         }
 
         /**

From d80f2e301ef22d4309027468b684a6d4bd4948c4 Mon Sep 17 00:00:00 2001
From: hovvahan94 <hovvahan94@users.noreply.github.com>
Date: Tue, 15 Nov 2016 16:00:52 +0400
Subject: [PATCH 114/245] Update react-day-picker.d.ts

---
 react-day-picker/react-day-picker.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/react-day-picker/react-day-picker.d.ts b/react-day-picker/react-day-picker.d.ts
index c9714261e3..a2ad472e43 100644
--- a/react-day-picker/react-day-picker.d.ts
+++ b/react-day-picker/react-day-picker.d.ts
@@ -67,6 +67,7 @@ declare namespace ReactDayPicker {
         numberOfMonths?: number;
         renderDay?: (date: Date) => number | string | JSX.Element;
         enableOutsideDays?: boolean;
+        firstDayOfWeek?:number;
         canChangeMonth?: boolean;
         disabledDays?: (date: Date) => boolean;
         fixedWeeks?: boolean;

From 6980db6a373e8e9f2e860046fd7f87182d4b7609 Mon Sep 17 00:00:00 2001
From: Rogier Schouten <r.schouten@spiritit.com>
Date: Tue, 15 Nov 2016 14:47:30 +0100
Subject: [PATCH 115/245] Improve typings for form-data

---
 form-data/form-data-tests.ts | 7 +++++++
 form-data/index.d.ts         | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/form-data/form-data-tests.ts b/form-data/form-data-tests.ts
index 2df21510c0..6d1b9d6cb9 100644
--- a/form-data/form-data-tests.ts
+++ b/form-data/form-data-tests.ts
@@ -132,3 +132,10 @@ import * as ImportUsingES6Syntax from 'form-data';
             console.log(json);
         });
 }
+
+() => {
+    var form = new FormData();
+	form.getLength((err: Error, length: number): void => {
+		// nothing
+	});
+}
diff --git a/form-data/index.d.ts b/form-data/index.d.ts
index 606ffdbd4a..e4bd6ca2e1 100644
--- a/form-data/index.d.ts
+++ b/form-data/index.d.ts
@@ -5,15 +5,18 @@
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/form-data.d.ts
 
+/// <reference types="node" />
+
 export = FormData;
 
-declare class FormData {
+import * as stream from "stream";
+
+declare class FormData extends stream.Readable {
     append(key: string, value: any, options?: any): void;
     getHeaders(): FormData.Dictionary<string>;
-    // TODO expand pipe
-    pipe(to: any): any;
     submit(params: string | Object, callback: (error: any, response: any) => void): any;
     getBoundary(): string;
+    getLength(callback: (err: Error, length: number) => void): void;
 }
 
 declare namespace FormData {

From 27a1db59ce14906a5a6d86d3e0a06adacecd5c2c Mon Sep 17 00:00:00 2001
From: Steve Jenkins <steve@skysteve.com>
Date: Tue, 15 Nov 2016 14:30:59 +0000
Subject: [PATCH 116/245] promise-polyfill types

---
 promise-polyfill/index.d.ts                | 23 ++++++++++++++++++++++
 promise-polyfill/promise-polyfill-tests.ts | 18 +++++++++++++++++
 promise-polyfill/tsconfig.json             | 19 ++++++++++++++++++
 3 files changed, 60 insertions(+)
 create mode 100644 promise-polyfill/index.d.ts
 create mode 100644 promise-polyfill/promise-polyfill-tests.ts
 create mode 100644 promise-polyfill/tsconfig.json

diff --git a/promise-polyfill/index.d.ts b/promise-polyfill/index.d.ts
new file mode 100644
index 0000000000..442e8461ec
--- /dev/null
+++ b/promise-polyfill/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for promise v6.0.2
+// Project: https://www.npmjs.com/package/promise-polyfill
+// Definitions by: Steve Jenkins <https://github.com/skysteve>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace Promise;
+
+export = Promise;
+declare var Promise: Promise.IPromise;
+
+declare namespace Promise {
+	export interface IPromise {
+		new <T>(resolver: (resolve: (value: T) => void, reject: (reason: any) => void) => void): IThenable<T>;
+		resolve: <T>(value: T) => IThenable<T>;
+		reject: <T>(value: T) => IThenable<T>;
+		all: (array: Array<IThenable<any>>) => IThenable<Array<any>>;
+	}
+
+	export interface IThenable<T> {
+		then<R>(onFulfilled?: (value: T) => IThenable<R>|R, onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
+		catch<R>(onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
+	}
+}
diff --git a/promise-polyfill/promise-polyfill-tests.ts b/promise-polyfill/promise-polyfill-tests.ts
new file mode 100644
index 0000000000..280a2bebdf
--- /dev/null
+++ b/promise-polyfill/promise-polyfill-tests.ts
@@ -0,0 +1,18 @@
+const prom1 = new Promise<number>((resolve, reject) => {
+	resolve(12);
+});
+
+const prom2 = new Promise<string>((resolve, reject) => {
+	reject('an error');
+}).then((val) => {
+  console.log(val);
+  return val;
+}).catch((err) => {
+	console.error(err);
+});
+
+Promise.all([prom1, prom2])
+.then(result => {
+	console.log(result);
+}, (exception) => console.error(exception))
+.catch((ex) => console.error(ex));
\ No newline at end of file
diff --git a/promise-polyfill/tsconfig.json b/promise-polyfill/tsconfig.json
new file mode 100644
index 0000000000..d411c896d5
--- /dev/null
+++ b/promise-polyfill/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "promise-polyfill-tests.ts"
+    ]
+}
\ No newline at end of file

From da1c2e6faa833c8a336426f8bf69b335550835e2 Mon Sep 17 00:00:00 2001
From: Morgan Benton <registered@morphatic.com>
Date: Tue, 15 Nov 2016 13:06:29 -0500
Subject: [PATCH 117/245] fixed module declaration

---
 d3kit/d3kit-tests.ts | 86 ++++++++++++++++++++++----------------------
 d3kit/index.d.ts     | 24 ++++++-------
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/d3kit/d3kit-tests.ts b/d3kit/d3kit-tests.ts
index cfe1c2aa45..70c9ba1672 100644
--- a/d3kit/d3kit-tests.ts
+++ b/d3kit/d3kit-tests.ts
@@ -3,13 +3,13 @@
 
 function test_abstract_chart() {
     let el: Element,
-        chart: AbstractChart,
-        options: ChartOptions,
-        margins: ChartMargin,
-        offsets: ChartOffset,
-        defopts: ChartOptions,
-        fitopts: FitOptions,
-        watchop: WatchOptions,
+        chart: d3kit.AbstractChart,
+        options: d3kit.ChartOptions,
+        margins: d3kit.ChartMargin,
+        offsets: d3kit.ChartOffset,
+        defopts: d3kit.ChartOptions,
+        fitopts: d3kit.FitOptions,
+        watchop: d3kit.WatchOptions,
         events: string[],
         w: number, h:number, d: [number, number], a: any, b: boolean;
 
@@ -26,16 +26,16 @@ function test_abstract_chart() {
     /**
      * Test constructor
      */
-    chart = new AbstractChart(el); // with element
-    chart = new AbstractChart('div#chart'); // with selector
-    chart = new AbstractChart(el, options); // with element+options
-    chart = new AbstractChart('div#chart', options); // with selector+options
+    chart = new d3kit.AbstractChart(el); // with element
+    chart = new d3kit.AbstractChart('div#chart'); // with selector
+    chart = new d3kit.AbstractChart(el, options); // with element+options
+    chart = new d3kit.AbstractChart('div#chart', options); // with selector+options
 
     /**
      * Test static functions
      */
-    defopts = AbstractChart.getDefaultOptions();
-    events  = AbstractChart.getCustomEventNames();
+    defopts = d3kit.AbstractChart.getDefaultOptions();
+    events  = d3kit.AbstractChart.getCustomEventNames();
 
     /**
      * Test getters
@@ -83,11 +83,11 @@ function test_abstract_chart() {
 
 function test_svgchart() {
     let el: Element,
-        chart: SvgChart,
-        options: ChartOptions,
-        margins: ChartMargin,
-        offsets: ChartOffset,
-        svg: SVGElement, rootg: SVGElement, layers: LayerOrganizer;
+        chart: d3kit.SvgChart,
+        options: d3kit.ChartOptions,
+        margins: d3kit.ChartMargin,
+        offsets: d3kit.ChartOffset,
+        svg: SVGElement, rootg: SVGElement, layers: d3kit.LayerOrganizer;
 
     // create a div, append to body, return Node as type Element
     el = document.body.appendChild(document.createElement('div')) as Element;
@@ -100,10 +100,10 @@ function test_svgchart() {
     /**
      * Test constructor
      */
-    chart = new SvgChart(el); // with element
-    chart = new SvgChart('div#chart'); // with selector
-    chart = new SvgChart(el, options); // with element+options
-    chart = new SvgChart('div#chart', options); // with selector+options
+    chart = new d3kit.SvgChart(el); // with element
+    chart = new d3kit.SvgChart('div#chart'); // with selector
+    chart = new d3kit.SvgChart(el, options); // with element+options
+    chart = new d3kit.SvgChart('div#chart', options); // with selector+options
 
     /**
      * Test properties
@@ -115,10 +115,10 @@ function test_svgchart() {
 
 function test_canvaschart() {
     let el: Element,
-        chart: CanvasChart,
-        options: ChartOptions,
-        margins: ChartMargin,
-        offsets: ChartOffset,
+        chart: d3kit.CanvasChart,
+        options: d3kit.ChartOptions,
+        margins: d3kit.ChartMargin,
+        offsets: d3kit.ChartOffset,
         context: CanvasRenderingContext2D;
 
     // create a div, append to body, return Node as type Element
@@ -132,23 +132,23 @@ function test_canvaschart() {
     /**
      * Test constructor
      */
-    chart = new CanvasChart(el); // with element
-    chart = new CanvasChart('div#chart'); // with selector
-    chart = new CanvasChart(el, options); // with element+options
-    chart = new CanvasChart('div#chart', options); // with selector+options
+    chart = new d3kit.CanvasChart(el); // with element
+    chart = new d3kit.CanvasChart('div#chart'); // with selector
+    chart = new d3kit.CanvasChart(el, options); // with element+options
+    chart = new d3kit.CanvasChart('div#chart', options); // with selector+options
 
     /**
      * Test canvas chart functions
      */
     context = chart.getContext2d();
-    options = CanvasChart.getDefaultOptions();
+    options = d3kit.CanvasChart.getDefaultOptions();
     chart.clear();
 }
 
 function test_layer_organizer() {
     let selection: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
         layer: d3.Selection<d3.BaseType, any, d3.BaseType, any>,
-        layers: LayerOrganizer,
+        layers: d3kit.LayerOrganizer,
         hasXAxis: boolean;
 
     selection = d3.select('svg');
@@ -156,8 +156,8 @@ function test_layer_organizer() {
     /**
      * Test constructor
      */
-    layers = new LayerOrganizer(selection);        // without specifying tag
-    layers = new LayerOrganizer(selection, 'div'); // specifying tag
+    layers = new d3kit.LayerOrganizer(selection);        // without specifying tag
+    layers = new d3kit.LayerOrganizer(selection, 'div'); // specifying tag
 
     /**
      * Test layer creation
@@ -183,13 +183,13 @@ function test_helper() {
         aFuncxn = () => "this is a function", isFunc: boolean,
         kebabed: string, dbouncd: any, throtld: any;
 
-    dbouncd = helper.debounce(aFuncxn, 300);
-    merged1 = helper.extend(simple1, simple2);
-    merged2 = helper.deepExtend(simple1, complex);
-    aFuncxn = helper.functor(aFuncxn); // with a function argument
-    aFuncxn = helper.functor(simple1); // with a value argument
-    isObj   = helper.isObject(anObject);
-    isFunc  = helper.isFunction(aFuncxn);
-    kebabed = helper.kebabCase("a string to convert to kebab case");
-    throtld = helper.throttle(aFuncxn, 300);
+    dbouncd = d3kit.helper.debounce(aFuncxn, 300);
+    merged1 = d3kit.helper.extend(simple1, simple2);
+    merged2 = d3kit.helper.deepExtend(simple1, complex);
+    aFuncxn = d3kit.helper.functor(aFuncxn); // with a function argument
+    aFuncxn = d3kit.helper.functor(simple1); // with a value argument
+    isObj   = d3kit.helper.isObject(anObject);
+    isFunc  = d3kit.helper.isFunction(aFuncxn);
+    kebabed = d3kit.helper.kebabCase("a string to convert to kebab case");
+    throtld = d3kit.helper.throttle(aFuncxn, 300);
 }
\ No newline at end of file
diff --git a/d3kit/index.d.ts b/d3kit/index.d.ts
index 64f52114ff..077cdb1ddf 100644
--- a/d3kit/index.d.ts
+++ b/d3kit/index.d.ts
@@ -5,9 +5,9 @@
 
 /// <reference types="d3" />
 
-declare module "d3kit";
+export as namespace d3kit;
 
-declare class AbstractChart {
+export class AbstractChart {
     container: Element;
     constructor(selector: string|Element, options?: ChartOptions);
     static getDefaultOptions(): ChartOptions;
@@ -40,19 +40,19 @@ declare class AbstractChart {
     destroy(): void;
 }
 
-declare interface ChartMargin {
+export interface ChartMargin {
     top?: number;
     right?: number;
     bottom?: number;
     left?: number;
 }
 
-declare interface ChartOffset {
+export interface ChartOffset {
     x: number;
     y: number;
 }
 
-declare interface ChartOptions {
+export interface ChartOptions {
     initialWidth?: number;
     initialHeight?: number;
     margin?: ChartMargin;
@@ -61,7 +61,7 @@ declare interface ChartOptions {
 }
 
 // from https://github.com/kristw/slimfit
-declare interface FitOptions {
+export interface FitOptions {
     mode?: string;
     width?: string|number;
     height?: string|number;
@@ -71,38 +71,38 @@ declare interface FitOptions {
 }
 
 // from https://github.com/kristw/slimfit
-declare interface WatchOptions {
+export interface WatchOptions {
     mode?: string;
     target?: any; // lazy
     interval?: number;
 }
 
-declare class SvgChart extends AbstractChart {
+export class SvgChart extends AbstractChart {
     svg: SVGElement;
     rootG: SVGElement;
     layers: LayerOrganizer;
     constructor(selector: string|Element, options?: ChartOptions);
 }
 
-declare class CanvasChart extends AbstractChart {
+export class CanvasChart extends AbstractChart {
     constructor(selector: string|Element, options?: ChartOptions);
     static getDefaultOptions(): ChartOptions;
     getContext2d(): CanvasRenderingContext2D;
     clear(): this;
 }
 
-declare class LayerOrganizer {
+export class LayerOrganizer {
     constructor(container: d3.Selection<d3.BaseType, any, d3.BaseType, any>, defaultTag?: string);
     create(layerNames: string|Array<string>|LayerConfig|Array<LayerConfig>): d3.Selection<d3.BaseType, any, d3.BaseType, any>|Array<d3.Selection<d3.BaseType, any, d3.BaseType, any>>;
     get(name: string): d3.Selection<d3.BaseType, any, d3.BaseType, any>;
     has(name: string): boolean;
 }
 
-declare interface LayerConfig {
+export interface LayerConfig {
     [layerName: string]: string|string[]|LayerConfig|Array<LayerConfig>;
 }
 
-declare namespace helper {
+export namespace helper {
     function debounce(fn: (...args: Array<any>) => void, delay: number): (...args: Array<any>) => void;
     function deepExtend(dest: Object, ...args: Object[]): Object;
     function extend(dest: Object, ...args: Object[]): Object;

From 8d44b7df0e8a4f28faad0aa5c25bc7d484949c54 Mon Sep 17 00:00:00 2001
From: "Derek C. Finlinson" <derek.finlinson@journeyteam.com>
Date: Tue, 15 Nov 2016 13:37:36 -0700
Subject: [PATCH 118/245] Update SuccessCallbackDelegate definition

---
 xrm/xrm.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/xrm/xrm.d.ts b/xrm/xrm.d.ts
index 986ce7e78a..1d8aa521ff 100644
--- a/xrm/xrm.d.ts
+++ b/xrm/xrm.d.ts
@@ -483,8 +483,10 @@ declare namespace Xrm
     {
         /**
          * Called when the operation is successful.
+         * Currently, only the Xrm.Utility.openQuickCreate successCallback
+         * is passed a parameter so an optional parameter for it is included
          */
-        export type SuccessCallbackDelegate = ( object: any ) => void;
+        export type SuccessCallbackDelegate = ( savedEntityReference?: Page.LookupValue ) => void;
 
         /**
          * Called when the operation fails.

From a90abe4d4f067c2cbb6274ee97762f35fb2d276c Mon Sep 17 00:00:00 2001
From: "Derek C. Finlinson" <derek.finlinson@journeyteam.com>
Date: Tue, 15 Nov 2016 13:49:12 -0700
Subject: [PATCH 119/245] Fix ErrorCallbackDelegate signature

---
 xrm/xrm-tests.ts |  2 +-
 xrm/xrm.d.ts     | 14 +++++++++++---
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/xrm/xrm-tests.ts b/xrm/xrm-tests.ts
index ac0f115154..64fb9e8c22 100644
--- a/xrm/xrm-tests.ts
+++ b/xrm/xrm-tests.ts
@@ -72,7 +72,7 @@ if (Xrm.Page.data.process != null)
 
 /// Demonstrate v7.1 Quick Create form
 
-Xrm.Utility.openQuickCreate("account").then(( newRecord: Xrm.Page.LookupValue ) => { alert( `Newly created record Id: ${newRecord.id}` ); }, (code, message) => {console.log(message)});
+Xrm.Utility.openQuickCreate("account").then(( newRecord: Xrm.Page.LookupValue ) => { alert( `Newly created record Id: ${newRecord.id}` ); }, (error) => {console.log(`Code: ${error.errorCode}, Message: ${error.message}`)});
 
 /// Make all controls visible.
 
diff --git a/xrm/xrm.d.ts b/xrm/xrm.d.ts
index ff42d8f005..b78174523a 100644
--- a/xrm/xrm.d.ts
+++ b/xrm/xrm.d.ts
@@ -481,6 +481,15 @@ declare namespace Xrm
      */
     export module Async
     {
+        /**
+         * Object passed to ErrorCallbackDelegate
+         */
+        export interface ErrorCallbackObject
+        {
+            errorCode: number;
+            message: string;
+        }
+
         /**
          * Called when the operation is successful.
          * Currently, only the Xrm.Utility.openQuickCreate successCallback
@@ -491,10 +500,9 @@ declare namespace Xrm
         /**
          * Called when the operation fails.
          *
-         * @param   {number}    errorCode   The error code.
-         * @param   {string}    message     The message.
+         * @param   {ErrorCallbackObject}    error   The error object         
          */
-        export type ErrorCallbackDelegate = ( errorCode: number, message: string ) => void;
+        export type ErrorCallbackDelegate = ( error: ErrorCallbackObject ) => void;
 
         /**
          * Interface for Xrm.Page.data promises.

From 601c75781682d7cc23400957d3cf3a2f2711cc48 Mon Sep 17 00:00:00 2001
From: Andrew Crites <acrites@mobiquityinc.com>
Date: Tue, 15 Nov 2016 16:53:32 -0500
Subject: [PATCH 120/245] aws4 sign returns object with various properties, not
 RequestSigner

---
 aws4/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/aws4/index.d.ts b/aws4/index.d.ts
index 88f54f2a3f..6028be5334 100644
--- a/aws4/index.d.ts
+++ b/aws4/index.d.ts
@@ -30,4 +30,4 @@ export class RequestSigner {
     formatPath(): string;
 }
 
-export function sign(options?: any, credentials?: any): RequestSigner;
+export function sign(options?: any, credentials?: any): any;

From 21c369c8578038a5850063302bcfd70aab457ea5 Mon Sep 17 00:00:00 2001
From: Michael Zlatkovsky <Zlatkovsky@users.noreply.github.com>
Date: Tue, 15 Nov 2016 15:30:34 -0800
Subject: [PATCH 121/245] Update ExcelApi 1.3 and OfficeExtension module
 (#12677)

* Updated Excel 1.3 APIs and OfficeExtension module
Also organized the file better, to have the new APIs (common OfficeExtension.Runtime, Excel, Word, OneNote) in one block.
Also removed private and meant-to-be-private (underscore-prefixed) members on Excel APIs.

* Removed all "readonly"-s to make the d.ts TS-1.8-compliant

* Fixed implicit-any issue:

office-js/office-js.d.ts(2182,28): error TS7006: Parameter 'resolve' implicitly has an 'any' type.
office-js/office-js.d.ts(2182,37): error TS7006: Parameter 'reject' implicitly has an 'any' type.
---
 office-js/office-js.d.ts | 2647 ++++++++++++++++++++------------------
 1 file changed, 1427 insertions(+), 1220 deletions(-)

diff --git a/office-js/office-js.d.ts b/office-js/office-js.d.ts
index 59510c6ffa..e10836528f 100644
--- a/office-js/office-js.d.ts
+++ b/office-js/office-js.d.ts
@@ -112,284 +112,6 @@ declare namespace Office {
     }
 }
 
-declare module OfficeExtension {
-    /** An abstract proxy object that represents an object in an Office document. You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the proxy object state with the document by calling "context.sync()". */
-    class ClientObject {
-        /** The request context associated with the object */
-        context: ClientRequestContext;
-        /** Returns a boolean value for whether the corresponding object is null. You must call "context.sync()" before reading the isNull property. [Api set: ExcelApi 1.3 (Preview), WordApi 1.3] */
-        isNull: boolean;
-    }
-}
-declare module OfficeExtension {
-    interface LoadOption {
-        select?: string | string[];
-        expand?: string | string[];
-        top?: number;
-        skip?: number;
-    }
-    /** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
-    class ClientRequestContext {
-        constructor(url?: string);
-        /** Collection of objects that are tracked for automatic adjustments based on surrounding changes in the document. */
-        trackedObjects: TrackedObjects;
-        /** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
-        load(object: ClientObject, option?: string | string[] | LoadOption): void;
-        /** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
-        trace(message: string): void;
-        /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code. This method returns a promise, which is resolved when the synchronization is complete. */
-        sync<T>(passThroughValue?: T): IPromise<T>;
-    }
-}
-declare module OfficeExtension {
-    /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
-    class ClientResult<T> {
-        /** The value of the result that is retrieved from the document after "context.sync()" is invoked. */
-        value: T;
-    }
-}
-declare module OfficeExtension {
-    /** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
-    class Error {
-        /** Error name: "OfficeExtension.Error".*/
-        name: string;
-        /** The error message passed through from the host Office application. */
-        message: string;
-        /** Stack trace, if applicable. */
-        stack: string;
-        /** Error code string, such as "InvalidArgument". */
-        code: string;
-        /** Trace messages (if any) that were added via a "context.trace()" invocation before calling "context.sync()". If there was an error, this contains all trace messages that were executed before the error occurred. These messages can help you monitor the program execution sequence and detect the case of the error. */
-        traceMessages: Array<string>;
-        /** Debug info, if applicable. The ".errorLocation" property can describe the object and method or property that caused the error. */
-        debugInfo: {
-            /** If applicable, will return the object type and the name of the method or property that caused the error. */
-            errorLocation?: string;
-        };
-    }
-}
-declare module OfficeExtension {
-    class ErrorCodes {
-        static accessDenied: string;
-        static generalException: string;
-        static activityLimitReached: string;
-        static invalidObjectPath: string;
-        static propertyNotLoaded: string;
-        static valueNotLoaded: string;
-        static invalidRequestContext: string;
-        static invalidArgument: string;
-        static runMustReturnPromise: string;
-        static cannotRegisterEvent: string;
-    }
-}
-declare module OfficeExtension {
-    /** An IPromise object that represents a deferred interaction with the host Office application. */
-    interface IPromise<R> {
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
-
-
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
-
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
-    }
-
-    /** An Promise object that represents a deferred interaction with the host Office application. The publically-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a "native" Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
-    export class Promise<R> implements IPromise<R>
-    {
-        /**
-         * Creates a new promise based on a function that accepts resolve and reject handlers.
-         */
-        constructor(func: (resolve: (value?: R | IPromise<R>) => void, reject: (error?: any) => void) => void);
-
-        /**
-         * Creates a promise that resolves when all of the child promises resolve.
-         */
-        static all<U>(promises: OfficeExtension.IPromise<U>[]): IPromise<U[]>;
-
-        /**
-         * Creates a promise that is resolved.
-         */
-        static resolve<U>(value: U): IPromise<U>;
-
-        /**
-         * Creates a promise that is rejected.
-         */
-        static reject<U>(error: any): IPromise<U>;
-
-        /* This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
-
-        /**
-         * This method will be called once the previous promise has been resolved.
-         * Both the onFulfilled on onRejected callbacks are optional.
-         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
-
-         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
-         */
-        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
-
-
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
-
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
-
-        /**
-         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
-         * @param onRejected function to be called if or when the promise rejects.
-         */
-        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
-    }
-}
-
-declare module OfficeExtension {
-    /** Collection of tracked objects, contained within a request context. See "context.trackedObjects" for more information. */
-    class TrackedObjects {
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
-        add(object: ClientObject): void;
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
-        add(objects: ClientObject[]): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
-        remove(object: ClientObject): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
-        remove(objects: ClientObject[]): void;
-    }
-}
-
-declare module OfficeExtension {
-    export class EventHandlers<T> {
-        constructor(context: ClientRequestContext, parentObject: ClientObject, name: string, eventInfo: EventInfo<T>);
-        add(handler: (args: T) => IPromise<any>): EventHandlerResult<T>;
-        remove(handler: (args: T) => IPromise<any>): void;
-        removeAll(): void;
-    }
-
-    export class EventHandlerResult<T> {
-        constructor(context: ClientRequestContext, handlers: EventHandlers<T>, handler: (args: T) => IPromise<any>);
-        remove(): void;
-    }
-
-    export interface EventInfo<T> {
-        registerFunc: (callback: (args: any) => void) => IPromise<any>;
-        unregisterFunc: (callback: (args: any) => void) => IPromise<any>;
-        eventArgsTransformFunc: (args: any) => IPromise<T>;
-    }
-}
-
 declare namespace Office {
     /**
      * Returns a promise of an object described in the expression. Callback is invoked only if method fails.
@@ -1660,6 +1382,958 @@ declare namespace Office {
         getWSSUrlAsync(options?: any, callback?: (result: AsyncResult) => void): void;
     }
 }
+
+
+
+
+////////////////////////////////////////////////////////////////
+////////////////////// Begin Exchange APIs /////////////////////
+////////////////////////////////////////////////////////////////
+
+
+declare namespace Office.MailboxEnums {
+    export enum BodyType {
+        /**
+         * The body is in HTML format
+         */
+        Html,
+        /**
+         * The body is in text format
+         */
+        text
+    }
+    export enum EntityType {
+        /**
+         * Specifies that the entity is a meeting suggestion
+         */
+        MeetingSuggestion,
+        /**
+         * Specifies that the entity is a task suggestion
+         */
+        TaskSuggestion,
+        /**
+         * Specifies that the entity is a postal address
+         */
+        Address,
+        /**
+         * Specifies that the entity is SMTP email address
+         */
+        EmailAddress,
+        /**
+         * Specifies that the entity is an Internet URL
+         */
+        Url,
+        /**
+         * Specifies that the entity is US phone number
+         */
+        PhoneNumber,
+        /**
+         * Specifies that the entity is a contact
+         */
+        Contact
+    }
+    export enum ItemType {
+        /**
+         * A meeting request, response, or cancellation
+         */
+        Message,
+        /**
+         * Specifies an appointment item
+         */
+        Appointment
+    }
+    export enum ResponseType {
+        /**
+         * There has been no response from the attendee
+         */
+        None,
+        /**
+         * The attendee is the meeting organizer
+         */
+        Organizer,
+        /**
+         * The meeting request was tentatively accepted by the attendee
+         */
+        Tentative,
+        /**
+         * The meeting request was accepted by the attendee
+         */
+        Accepted,
+        /**
+         * The meeting request was declined by the attendee
+         */
+        Declined
+    }
+    export enum RecipientType {
+        /**
+         * Specifies that the recipient is not one of the other recipient types
+         */
+        Other,
+        /**
+         * Specifies that the recipient is a distribution list containing a list of email addresses
+         */
+        DistributionList,
+        /**
+         * Specifies that the recipient is an SMTP email address that is on the Exchange server
+         */
+        User,
+        /**
+         * Specifies that the recipient is an SMTP email address that is not on the Exchange server
+         */
+        ExternalUser
+    }
+    export enum AttachmentType {
+        /**
+         * The attachment is a file
+         */
+        File,
+        /**
+         * The attachment is an Exchange item
+         */
+        Item
+    }
+}
+declare namespace Office {
+    export module Types {
+        export interface ItemRead extends Office.Item {
+            subject: any;
+            /**
+             * Displays a reply form that includes the sender and all the recipients of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyAllForm(htmlBody: string): void;
+            /**
+             * Displays a reply form that includes only the sender of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyForm(htmlBody: string): void;
+            /**
+             * Gets an array of entities found in an message
+             */
+            getEntities(): Office.Entities;
+            /**
+             * Gets an array of entities of the specified entity type found in an message
+             * @param entityType One of the EntityType enumeration values
+             */
+            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
+            /**
+             * Returns well-known entities that pass the named filter defined in the manifest XML file
+             * @param name  A TableData object with the headers and rows
+             */
+            getFilteredEntitiesByName(name: string): Office.Entities;
+            /**
+             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
+             */
+            getRegExMatches(): string[];
+            /**
+             * Returns string values that match the named regular expression defined in the manifest XML file
+             */
+            getRegExMatchesByName(name: string): string[];
+        }
+        export interface ItemCompose extends Office.Item {
+            body: Office.Body;
+            subject: any;
+            /**
+             * Adds a file to a message as an attachment
+             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Adds an Exchange item, such as a message, as an attachment to the message
+             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Removes an attachment from a message
+             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
+        }
+        export interface MessageCompose extends Office.Message {
+            attachments: Office.AttachmentDetails[];
+            body: Office.Body;
+            bcc: Office.Recipients;
+            cc: Office.Recipients;
+            subject: Office.Subject;
+            to: Office.Recipients;
+            /**
+             * Adds a file to a message as an attachment
+             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Adds an Exchange item, such as a message, as an attachment to the message
+             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Removes an attachment from a message
+             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
+        }
+        export interface MessageRead extends Office.Message {
+            cc: Office.EmailAddressDetails[];
+            from: Office.EmailAddressDetails;
+            internetMessageId: string;
+            normalizedSubject: string;
+            sender: Office.EmailAddressDetails;
+            subject: string;
+            to: Office.EmailAddressDetails;
+            /**
+             * Displays a reply form that includes the sender and all the recipients of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyAllForm(htmlBody: string): void;
+            /**
+             * Displays a reply form that includes only the sender of the selected message
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyForm(htmlBody: string): void;
+            /**
+             * Gets an array of entities found in an message
+             */
+            getEntities(): Office.Entities;
+            /**
+             * Gets an array of entities of the specified entity type found in an message
+             * @param entityType One of the EntityType enumeration values
+             */
+            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
+            /**
+             * Returns well-known entities that pass the named filter defined in the manifest XML file
+             * @param name  A TableData object with the headers and rows
+             */
+            getFilteredEntitiesByName(name: string): Office.Entities;
+            /**
+             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
+             */
+            getRegExMatches(): string[];
+            /**
+             * Returns string values that match the named regular expression defined in the manifest XML file
+             */
+            getRegExMatchesByName(name: string): string[];
+        }
+        export interface AppointmentCompose extends Office.Appointment {
+            body: Office.Body;
+            end: Office.Time;
+            location: Office.Location;
+            optionalAttendees: Office.Recipients;
+            requiredAttendees: Office.Recipients;
+            start: Office.Time;
+            subject: Office.Subject;
+            /**
+             * Adds a file to an appointment as an attachment
+             * @param uri The URI that provides the location of the file to attach to the appointment. The maximum length is 2048 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Adds an Exchange item, such as a message, as an attachment to the appointment
+             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
+             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
+            /**
+             * Removes an attachment from a appointment
+             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
+             * @param options Any optional parameters or state data passed to the method
+             * @param callback The optional callback method
+             */
+            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
+        }
+        export interface AppointmentRead extends Office.Appointment {
+            attachments: Office.AttachmentDetails[];
+            end: Date;
+            location: string;
+            normalizedSubject: string;
+            optionalAttendees: Office.EmailAddressDetails;
+            organizer: Office.EmailAddressDetails;
+            requiredAttendees: Office.EmailAddressDetails;
+            resources: string[];
+            start: Date;
+            subject: string;
+            /**
+             * Displays a reply form that includes the organizer and all the attendees of the selected appointment item
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyAllForm(htmlBody: string): void;
+            /**
+             * Displays a reply form that includes only the organizer of the selected appointment item
+             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+             */
+            displayReplyForm(htmlBody: string): void;
+            /**
+             * Gets an array of entities found in an appointment
+             */
+            getEntities(): Office.Entities;
+            /**
+             * Gets an array of entities of the specified entity type found in an appointment
+             * @param entityType One of the EntityType enumeration values
+             */
+            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
+            /**
+             * Returns well-known entities that pass the named filter defined in the manifest XML file
+             * @param name  A TableData object with the headers and rows
+             */
+            getFilteredEntitiesByName(name: string): Office.Entities;
+            /**
+             * Returns string values in the currently selected appointment object that match the regular expressions defined in the manifest XML file
+             */
+            getRegExMatches(): string[];
+            /**
+             * Returns string values that match the named regular expression defined in the manifest XML file
+             */
+            getRegExMatchesByName(name: string): string[];
+        }
+    }
+    export module cast {
+        export module item {
+            function toAppointmentCompose(item: Office.Item): Office.Types.AppointmentCompose;
+            function toAppointmentRead(item: Office.Item): Office.Types.AppointmentRead;
+            function toAppointment(item: Office.Item): Office.Appointment;
+            function toMessageCompose(item: Office.Item): Office.Types.MessageCompose;
+            function toMessageRead(item: Office.Item): Office.Types.MessageRead;
+            function toMessage(item: Office.Item): Office.Message;
+            function toItemCompose(item: Office.Item): Office.Types.ItemCompose;
+            function toItemRead(item: Office.Item): Office.Types.ItemRead;
+        }
+    }
+    export interface AttachmentDetails {
+        attachmentType: Office.MailboxEnums.AttachmentType;
+        contentType: string;
+        id: string;
+        isInline: boolean;
+        name: string;
+        size: number;
+    }
+    export interface Contact {
+        personName: string;
+        businessName: string;
+        phoneNumbers: PhoneNumber[];
+        emailAddresses: string[];
+        urls: string[];
+        addresses: string[];
+        contactString: string;
+    }
+
+    export interface Context {
+        mailbox: Mailbox;
+        roamingSettings: RoamingSettings;
+    }
+    export interface CustomProperties {
+        /**
+         * Returns the value of the specified custom property
+         * @param name The name of the property to be returned
+         */
+        get(name: string): any;
+        /**
+         * Sets the specified property to the specified value
+         * @param name The name of the property to be set
+         * @param value The value of the property to be set
+         */
+        set(name: string, value: string): void;
+        /**
+         * Removes the specified property from the custom property collection.
+         * @param name The name of the property to be removed
+         */
+        remove(name: string): void;
+        /**
+         * Saves the custom property collection to the server
+         * @param callback The optional callback method
+         * @param userContext Optional variable for any state data that is passed to the saveAsync method
+         */
+        saveAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+    }
+    export interface EmailAddressDetails {
+        emailAddress: string;
+        displayName: string;
+        appointmentResponse: Office.MailboxEnums.ResponseType;
+        recipientType: Office.MailboxEnums.RecipientType;
+    }
+    export interface EmailUser {
+        name: string;
+        userId: string;
+    }
+    export interface Entities {
+        addresses: string[];
+        taskSuggestions: string[];
+        meetingSuggestions: MeetingSuggestion[];
+        emailAddresses: string[];
+        urls: string[];
+        phoneNumbers: PhoneNumber[];
+        contacts: Contact[];
+    }
+    export interface Item {
+        dateTimeCreated: Date;
+        dateTimeModified: Date;
+        itemClass: string;
+        itemId: string;
+        itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Asynchronously loads custom properties that are specific to the item and a app for Office
+         * @param callback The optional callback method
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        loadCustomPropertiesAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+    }
+    export interface Appointment extends Item {
+    }
+    export interface Body {
+        /**
+         * Gets a value that indicates whether the content is in HTML or text format
+         * @param tableData  A TableData object with the headers and rows
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the getTypeAsync method returns
+         */
+        getTypeAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Adds the specified content to the beginning of the item body
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        prependAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Replaces the selection in the body with the specified text
+         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setSelectedDataAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface Location {
+        /**
+         * Begins an asynchronous request for the location of an appointment
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to set the location of an appointment
+         * @param data The location of the appointment. The string is limited to 255 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the location is set
+         */
+        setAsync(location: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface Mailbox {
+        item: Item;
+        userProfile: UserProfile;
+        /**
+         * Gets a Date object from a dictionary containing time information
+         * @param timeValue A Date object
+         */
+        convertToLocalClientTime(timeValue: Date): any;
+        /**
+         * Gets a dictionary containing time information in local client time
+         * @param input A dictionary containing a date. The dictionary should contain the following fields: year, month, date, hours, minutes, seconds, time zone, time zone offset
+         */
+        convertToUtcClientTime(input: any): Date;
+        /**
+         * Displays an existing calendar appointment
+         * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment
+         */
+        displayAppointmentForm(itemId: any): void;
+        /**
+         * Displays an existing message
+         * @param itemId The Exchange Web Services (EWS) identifier for an existing message
+         */
+        displayMessageForm(itemId: any): void;
+        /**
+         * Displays a form for creating a new calendar appointment
+         * @param requiredAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the required attendees for the appointment. The array is limited to a maximum of 100 entries
+         * @param optionalAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the optional attendees for the appointment. The array is limited to a maximum of 100 entries
+         * @param start A Date object specifying the start date and time of the appointment
+         * @param end A Date object specifying the end date and time of the appointment
+         * @param location A string containing the location of the appointment. The string is limited to a maximum of 255 characters
+         * @param resources An array of strings containing the resources required for the appointment. The array is limited to a maximum of 100 entries
+         * @param subject A string containing the subject of the appointment. The string is limited to a maximum of 255 characters
+         * @param body The body of the appointment message. The body content is limited to a maximum size of 32 KB
+         */
+        displayNewAppointmentForm(requiredAttendees: any, optionalAttendees: any, start: Date, end: Date, location: string, resources: string[], subject: string, body: string): void;
+        /**
+         * Gets a string that contains a token used to get an attachment or item from an Exchange Server
+         * @param callback The optional method to call when the string is inserted
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        getCallbackTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        /**
+         * Gets a token identifying the user and the app for Office
+         * @param callback The optional method to call when the string is inserted
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        getUserIdentityTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
+        /**
+         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user’s mailbox
+         * @param data The EWS request
+         * @param callback The optional method to call when the string is inserted
+         * @param userContext Optional variable for any state data that is passed to the asynchronous method
+         */
+        makeEwsRequestAsync(data: any, callback?: (result: AsyncResult) => void, userContext?: any): void;
+    }
+    export interface Message extends Item {
+        conversationId: string;
+    }
+    export interface MeetingRequest extends Message {
+        start: Date;
+        end: Date;
+        location: string;
+        optionalAttendees: EmailAddressDetails[];
+        requiredAttendees: EmailAddressDetails[];
+    }
+    export interface MeetingSuggestion {
+        meetingString: string;
+        attendees: EmailAddressDetails[];
+        location: string;
+        subject: string;
+        start: Date;
+        end: Date;
+    }
+    export interface PhoneNumber {
+        phoneString: string;
+        originalPhoneString: string;
+        type: string;
+    }
+    export interface Recipients {
+        /**
+         * Begins an asynchronous request to add a recipient list to an appointment or message
+         * @param recipients The recipients to add to the recipients list
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        addAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to get the recipient list for an appointment or message
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to set the recipient list for an appointment or message
+         * @param recipients The recipients to add to the recipients list
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface RoamingSettings {
+        /**
+         * Retrieves the specified setting
+         * @param name The case-sensitive name of the setting to retrieve
+         */
+        get(name: string): any;
+        /**
+         * Removes the specified setting
+         * @param name The case-sensitive name of the setting to remove
+         */
+        remove(name: string): void;
+        /**
+         * Saves the settings
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult
+         */
+        saveAsync(callback?: (result: AsyncResult) => void): void;
+        /**
+         * Sets or creates the specified setting
+         * @param name The case-sensitive name of the setting to set or create
+         * @param value Specifies the value to be stored
+         */
+        set(name: string, value: any): void;
+    }
+    export interface Subject {
+        /**
+         * Begins an asynchronous request to get the subject of an appointment or message
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous call to set the subject of an appointment or message
+         * @param data The subject of the appointment. The string is limited to 255 characters
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface TaskSuggestion {
+        assignees: EmailUser[];
+        taskString: string;
+    }
+    export interface Time {
+        /**
+         * Begins an asynchronous request to get the start or end time
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
+        /**
+         * Begins an asynchronous request to set the start or end time
+         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
+         * @param options Any optional parameters or state data passed to the method
+         * @param callback The optional method to call when the string is inserted
+         */
+        setAsync(dateTime: Date, options?: any, callback?: (result: AsyncResult) => void): void;
+    }
+    export interface UserProfile {
+        displayName: string;
+        emailAddress: string;
+        timeZone: string;
+    }
+}
+
+
+////////////////////////////////////////////////////////////////
+/////////////////////// End Exchange APIs //////////////////////
+////////////////////////////////////////////////////////////////
+
+
+
+///////////////////////////////////////////////////////////////
+
+
+
+////////////////////////////////////////////////////////////////
+///////////////// Begin OfficeExtension runtime ////////////////
+////////////////////////////////////////////////////////////////
+
+
+declare module OfficeExtension {
+    /** An abstract proxy object that represents an object in an Office document. You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the proxy object state with the document by calling "context.sync()". */
+    class ClientObject {
+        /** The request context associated with the object */
+        context: ClientRequestContext;
+        /** Returns a boolean value for whether the corresponding object is a null object. You must call "context.sync()" before reading the isNullObject property. */
+        isNullObject: boolean;
+    }
+}
+declare module OfficeExtension {
+    interface LoadOption {
+        select?: string | string[];
+        expand?: string | string[];
+        top?: number;
+        skip?: number;
+    }
+    /** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
+    class ClientRequestContext {
+        constructor(url?: string);
+
+        /** Collection of objects that are tracked for automatic adjustments based on surrounding changes in the document. */
+        trackedObjects: TrackedObjects;
+
+        /** Request headers */
+        requestHeaders: { [name: string]: string };
+
+        /** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
+        load(object: ClientObject, option?: string | string[]| LoadOption): void;
+
+        /**
+        * Queues up a command to recursively load the specified properties of the object and its navigation properties.
+        * You must call "context.sync()" before reading the properties.
+        * 
+        * @param object The object to be loaded.
+        * @param options The key-value pairing of load options for the types, such as { "Workbook": "worksheets,tables",  "Worksheet": "tables",  "Tables": "name" }
+        * @param maxDepth The maximum recursive depth.
+        */
+        loadRecursive(object: ClientObject, options: { [typeName: string]: string | string[] | LoadOption }, maxDepth?: number): void;
+
+        /** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
+        trace(message: string): void;
+
+        /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code. This method returns a promise, which is resolved when the synchronization is complete. */
+        sync<T>(passThroughValue?: T): IPromise<T>;
+    }
+}
+declare module OfficeExtension {
+    /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
+    class ClientResult<T> {
+        /** The value of the result that is retrieved from the document after "context.sync()" is invoked. */
+        value: T;
+    }
+}
+declare module OfficeExtension {
+    /** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
+    class Error {
+        /** Error name: "OfficeExtension.Error".*/
+        name: string;
+        /** The error message passed through from the host Office application. */
+        message: string;
+        /** Stack trace, if applicable. */
+        stack: string;
+        /** Error code string, such as "InvalidArgument". */
+        code: string;
+        /** Trace messages (if any) that were added via a "context.trace()" invocation before calling "context.sync()". If there was an error, this contains all trace messages that were executed before the error occurred. These messages can help you monitor the program execution sequence and detect the case of the error. */
+        traceMessages: Array<string>;
+        /** Debug info, if applicable. The ".errorLocation" property can describe the object and method or property that caused the error. */
+        debugInfo: {
+            /** If applicable, will return the object type and the name of the method or property that caused the error. */
+            errorLocation?: string;
+        };
+    }
+}
+declare module OfficeExtension {
+    class ErrorCodes {
+        static accessDenied: string;
+        static generalException: string;
+        static activityLimitReached: string;
+    }
+}
+declare module OfficeExtension {
+    /** An IPromise object that represents a deferred interaction with the host Office application. */
+    interface IPromise<R> {
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
+
+
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
+
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
+    }
+
+    /** An Promise object that represents a deferred interaction with the host Office application. The publically-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a "native" Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
+    export class Promise<R> implements IPromise<R>
+    {
+        /**
+         * Creates a new promise based on a function that accepts resolve and reject handlers.
+         */
+        constructor(func: (resolve: (value?: R | IPromise<R>) => void, reject: (error?: any) => void) => void);
+
+        /**
+         * Creates a promise that resolves when all of the child promises resolve.
+         */
+        static all<U>(promises: OfficeExtension.IPromise<U>[]): IPromise<U[]>;
+
+        /**
+         * Creates a promise that is resolved.
+         */
+        static resolve<U>(value: U): IPromise<U>;
+
+        /**
+         * Creates a promise that is rejected.
+         */
+        static reject<U>(error: any): IPromise<U>;
+
+        /* This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => U): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => IPromise<U>, onRejected?: (error: any) => void): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => U): IPromise<U>;
+
+        /**
+         * This method will be called once the previous promise has been resolved.
+         * Both the onFulfilled on onRejected callbacks are optional.
+         * If either or both are omitted, the next onFulfilled/onRejected in the chain will be called called.
+
+         * @returns A new promise for the value or error that was returned from onFulfilled/onRejected.
+         */
+        then<U>(onFulfilled?: (value: R) => U, onRejected?: (error: any) => void): IPromise<U>;
+
+
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => IPromise<U>): IPromise<U>;
+
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => U): IPromise<U>;
+
+        /**
+         * Catches failures or exceptions from actions within the promise, or from an unhandled exception earlier in the call stack.
+         * @param onRejected function to be called if or when the promise rejects.
+         */
+        catch<U>(onRejected?: (error: any) => void): IPromise<U>;
+    }
+}
+
+declare module OfficeExtension {
+    /** Collection of tracked objects, contained within a request context. See "context.trackedObjects" for more information. */
+    class TrackedObjects {
+        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+        add(object: ClientObject): void;
+        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+        add(objects: ClientObject[]): void;
+        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+        remove(object: ClientObject): void;
+        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+        remove(objects: ClientObject[]): void;
+    }
+}
+
+declare module OfficeExtension {
+    export class EventHandlers<T> {
+        constructor(context: ClientRequestContext, parentObject: ClientObject, name: string, eventInfo: EventInfo<T>);
+        add(handler: (args: T) => IPromise<any>): EventHandlerResult<T>;
+        remove(handler: (args: T) => IPromise<any>): void;
+        removeAll(): void;
+    }
+
+    export class EventHandlerResult<T> {
+        constructor(context: ClientRequestContext, handlers: EventHandlers<T>, handler: (args: T) => IPromise<any>);
+        remove(): void;
+    }
+
+    export interface EventInfo<T> {
+        registerFunc: (callback: (args: any) => void) => IPromise<any>;
+        unregisterFunc: (callback: (args: any) => void) => IPromise<any>;
+        eventArgsTransformFunc: (args: any) => IPromise<T>;
+    }
+}
+declare module OfficeExtension {
+    /**
+    * Request URL and headers 
+    */
+    interface RequestUrlAndHeaderInfo {
+        /** Request URL */
+        url: string;
+        /** Request headers */
+        headers?: {
+            [name: string]: string;
+        };
+    }
+}
+
+
+
+////////////////////////////////////////////////////////////////
+////////////////// End OfficeExtension runtime /////////////////
+////////////////////////////////////////////////////////////////
+
+
+
+////////////////////////////////////////////////////////////////
+
+
+
+////////////////////////////////////////////////////////////////
+//////////////// Begin Excel APIs (latest = 1.3) ///////////////
+////////////////////////////////////////////////////////////////
+
+
 declare module Excel {
     interface ThreeArrowsSet {
         [index: number]: Icon;
@@ -1899,7 +2573,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class Application extends OfficeExtension.ClientObject {
-        private m_calculationMode;
         /**
          *
          * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details. Read-only.
@@ -1920,6 +2593,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Application;
+        toJSON(): {
+            "calculationMode": string;
+        };
     }
     /**
      *
@@ -1928,14 +2604,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class Workbook extends OfficeExtension.ClientObject {
-        private m_application;
-        private m_bindings;
-        private m_functions;
-        private m_names;
-        private m_pivotTables;
-        private m_tables;
-        private m_worksheets;
-        private m_selectionChanged;
         /**
          *
          * Represents Excel application instance that contains this workbook. Read-only.
@@ -1968,7 +2636,7 @@ declare module Excel {
          *
          * Represents a collection of PivotTables associated with the workbook. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         pivotTables: Excel.PivotTableCollection;
         /**
@@ -2003,6 +2671,7 @@ declare module Excel {
          * [Api set: ExcelApi 1.2]
          */
         onSelectionChanged: OfficeExtension.EventHandlers<Excel.SelectionChangedEventArgs>;
+        toJSON(): {};
     }
     /**
      *
@@ -2011,14 +2680,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class Worksheet extends OfficeExtension.ClientObject {
-        private m_charts;
-        private m_id;
-        private m_name;
-        private m_pivotTables;
-        private m_position;
-        private m_protection;
-        private m_tables;
-        private m_visibility;
         /**
          *
          * Returns collection of charts that are part of the worksheet. Read-only.
@@ -2030,7 +2691,7 @@ declare module Excel {
          *
          * Collection of PivotTables that are part of the worksheet. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         pivotTables: Excel.PivotTableCollection;
         /**
@@ -2121,6 +2782,13 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Worksheet;
+        toJSON(): {
+            "id": string;
+            "name": string;
+            "position": number;
+            "protection": WorksheetProtection;
+            "visibility": string;
+        };
     }
     /**
      *
@@ -2129,7 +2797,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class WorksheetCollection extends OfficeExtension.ClientObject {
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.Worksheet>;
         /**
@@ -2157,19 +2824,11 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getItem(key: string): Excel.Worksheet;
-        /**
-         *
-         * Gets a worksheet object using its Name or ID. If the worksheet does not exist, the returned object's isNull property will be true.
-         *
-         * @param key The Name or ID of the worksheet.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getItemOrNull(key: string): Excel.Worksheet;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetCollection;
+        toJSON(): {};
     }
     /**
      *
@@ -2178,11 +2837,9 @@ declare module Excel {
      * [Api set: ExcelApi 1.2]
      */
     class WorksheetProtection extends OfficeExtension.ClientObject {
-        private m_options;
-        private m_protected;
         /**
          *
-         * Sheet protection options.
+         * Sheet protection options. Read-Only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -2214,6 +2871,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.WorksheetProtection;
+        toJSON(): {
+            "options": WorksheetProtectionOptions;
+            "protected": boolean;
+        };
     }
     /**
      *
@@ -2307,29 +2968,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class Range extends OfficeExtension.ClientObject {
-        private m_address;
-        private m_addressLocal;
-        private m_cellCount;
-        private m_columnCount;
-        private m_columnHidden;
-        private m_columnIndex;
-        private m_format;
-        private m_formulas;
-        private m_formulasLocal;
-        private m_formulasR1C1;
-        private m_hidden;
-        private m_numberFormat;
-        private m_rowCount;
-        private m_rowHidden;
-        private m_rowIndex;
-        private m_sort;
-        private m_text;
-        private m_valueTypes;
-        private m_values;
-        private m_worksheet;
-        private m__ReferenceId;
-        private _ensureInteger(num, methodName);
-        private _getAdjacentRange(functionName, count, referenceRange, rowDirection, columnDirection);
         /**
          *
          * Returns a format object, encapsulating the range's font, fill, borders, alignment, and other properties. Read-only.
@@ -2367,7 +3005,7 @@ declare module Excel {
         addressLocal: string;
         /**
          *
-         * Number of cells in the range. Read-only.
+         * Number of cells in the range. This API will return -1 if the cell count exceeds 2^31-1 (2,147,483,647). Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -2557,15 +3195,6 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getIntersection(anotherRange: Excel.Range | string): Excel.Range;
-        /**
-         *
-         * Gets the range object that represents the rectangular intersection of the given ranges. If no intersection is found, will return a null object.
-         *
-         * @param anotherRange The range object or range address that will be used to determine the intersection of ranges.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getIntersectionOrNull(anotherRange: Excel.Range | string): Excel.Range;
         /**
          *
          * Gets the last cell within the range. For example, the last cell of "B2:D5" is "D5".
@@ -2647,7 +3276,7 @@ declare module Excel {
          *
          * Represents the visible rows of the current range.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         getVisibleView(): Excel.RangeView;
         /**
@@ -2686,6 +3315,34 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Range;
+        /**
+         * Track the object for automatic adjustment based on surrounding changes in the document. This call is a shorthand for context.trackedObjects.add(thisObject). If you are using this object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created.
+         */
+        track(): Excel.Range;
+        /**
+         * Release the memory associated with this object, if it has previously been tracked. This call is shorthand for context.trackedObjects.remove(thisObject). Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect.
+         */
+        untrack(): Excel.Range;
+        toJSON(): {
+            "address": string;
+            "addressLocal": string;
+            "cellCount": number;
+            "columnCount": number;
+            "columnHidden": boolean;
+            "columnIndex": number;
+            "format": RangeFormat;
+            "formulas": any[][];
+            "formulasLocal": any[][];
+            "formulasR1C1": any[][];
+            "hidden": boolean;
+            "numberFormat": any[][];
+            "rowCount": number;
+            "rowHidden": boolean;
+            "rowIndex": number;
+            "text": any[][];
+            "values": any[][];
+            "valueTypes": string[][];
+        };
     }
     /**
      *
@@ -2700,109 +3357,125 @@ declare module Excel {
      *
      * RangeView represents a set of visible cells of the parent range.
      *
-     * [Api set: ExcelApi 1.3 (Preview)]
+     * [Api set: ExcelApi 1.3]
      */
     class RangeView extends OfficeExtension.ClientObject {
-        private m_columnCount;
-        private m_formulas;
-        private m_formulasLocal;
-        private m_formulasR1C1;
-        private m_numberFormat;
-        private m_rowCount;
-        private m_rows;
-        private m_text;
-        private m_valueTypes;
-        private m_values;
         /**
          *
          * Represents a collection of range views associated with the range. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         rows: Excel.RangeViewCollection;
+        /**
+         *
+         * Represents the cell addresses of the RangeView.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        cellAddresses: Array<Array<any>>;
         /**
          *
          * Returns the number of visible columns. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         columnCount: number;
         /**
          *
          * Represents the formula in A1-style notation.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         formulas: Array<Array<any>>;
         /**
          *
          * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         formulasLocal: Array<Array<any>>;
         /**
          *
          * Represents the formula in R1C1-style notation.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         formulasR1C1: Array<Array<any>>;
         /**
          *
-         * Represents Excel's number format code for the given cell. Read-only.
+         * Returns a value that represents the index of the RangeView. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
+         */
+        index: number;
+        /**
+         *
+         * Represents Excel's number format code for the given cell.
+         *
+         * [Api set: ExcelApi 1.3]
          */
         numberFormat: Array<Array<any>>;
         /**
          *
          * Returns the number of visible rows. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         rowCount: number;
         /**
          *
          * Text values of the specified range. The Text value will not depend on the cell width. The # sign substitution that happens in Excel UI will not affect the text value returned by the API. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         text: Array<Array<any>>;
         /**
          *
          * Represents the type of data of each cell. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         valueTypes: Array<Array<string>>;
         /**
          *
          * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         values: Array<Array<any>>;
         /**
          *
          * Gets the parent range associated with the current RangeView.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         getRange(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeView;
+        toJSON(): {
+            "cellAddresses": any[][];
+            "columnCount": number;
+            "formulas": any[][];
+            "formulasLocal": any[][];
+            "formulasR1C1": any[][];
+            "index": number;
+            "numberFormat": any[][];
+            "rowCount": number;
+            "text": any[][];
+            "values": any[][];
+            "valueTypes": string[][];
+        };
     }
     /**
      *
      * Represents a collection of worksheet objects that are part of the workbook.
      *
-     * [Api set: ExcelApi 1.3 (Preview)]
+     * [Api set: ExcelApi 1.3]
      */
     class RangeViewCollection extends OfficeExtension.ClientObject {
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.RangeView>;
         /**
@@ -2811,22 +3484,58 @@ declare module Excel {
          *
          * @param index Index of the visible row.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
-        getItem(index: number): Excel.RangeView;
+        getItemAt(index: number): Excel.RangeView;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeViewCollection;
+        toJSON(): {};
     }
     /**
      *
-     * A collection of all the nameditem objects that are part of the workbook.
+     * Setting represents a key-value pair of a setting persisted to the document.
+     *
+     * [Api set: ExcelApi 1.3]
+     */
+    class Setting extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Represents the value stored for this setting.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        value: any;
+        /**
+         *
+         * Returns the key that represents the id of the Setting. Read-only.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        key: string;
+        /**
+         *
+         * Deletes the setting.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        delete(): void;
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         */
+        load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Setting;
+        toJSON(): {
+            "key": string;
+        };
+    }
+    /**
+     *
+     * A collection of all the nameditem objects that are part of the workbook or worksheet, depending on how it was reached.
      *
      * [Api set: ExcelApi 1.1]
      */
     class NamedItemCollection extends OfficeExtension.ClientObject {
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.NamedItem>;
         /**
@@ -2838,19 +3547,11 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getItem(name: string): Excel.NamedItem;
-        /**
-         *
-         * Gets a nameditem object using its name. If the nameditem object does not exist, the returned object's isNull property will be true.
-         *
-         * @param name nameditem name.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getItemOrNull(name: string): Excel.NamedItem;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItemCollection;
+        toJSON(): {};
     }
     /**
      *
@@ -2859,11 +3560,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class NamedItem extends OfficeExtension.ClientObject {
-        private m_name;
-        private m_type;
-        private m_value;
-        private m_visible;
-        private m__Id;
         /**
          *
          * The name of the object. Read-only.
@@ -2873,14 +3569,14 @@ declare module Excel {
         name: string;
         /**
          *
-         * Indicates what type of reference is associated with the name. See Excel.NamedItemType for details. Read-only.
+         * Indicates the type of the value returned by the name's formula. See Excel.NamedItemType for details. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         type: string;
         /**
          *
-         * Represents the formula that the name is defined to refer to. E.g. =Sheet14!$B$2:$H$12, =4.75, etc. Read-only.
+         * Represents the value computed by the name's formula. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -2899,10 +3595,23 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getRange(): Excel.Range;
+        /**
+         *
+         * Returns the range object that is associated with the name. Returns a null object if the named item's type is not a range
+         *
+         * [Api set: ExcelApi 1.1]
+         */
+        getRangeOrNullObject(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.NamedItem;
+        toJSON(): {
+            "name": string;
+            "type": string;
+            "value": any;
+            "visible": boolean;
+        };
     }
     /**
      *
@@ -2911,10 +3620,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class Binding extends OfficeExtension.ClientObject {
-        private m_id;
-        private m_type;
-        private m_dataChanged;
-        private m_selectionChanged;
         /**
          *
          * Represents binding identifier. Read-only.
@@ -2929,6 +3634,13 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         type: string;
+        /**
+         *
+         * Deletes the binding.
+         *
+         * [Api set: ExcelApi 1.3]
+         */
+        delete(): void;
         /**
          *
          * Returns the range represented by the binding. Will throw an error if binding is not of the correct type.
@@ -2956,7 +3668,7 @@ declare module Excel {
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Binding;
         /**
          *
-         * Occurs when data within the binding is changed.
+         * Occurs when data or formatting within the binding is changed.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -2968,6 +3680,10 @@ declare module Excel {
          * [Api set: ExcelApi 1.2]
          */
         onSelectionChanged: OfficeExtension.EventHandlers<Excel.BindingSelectionChangedEventArgs>;
+        toJSON(): {
+            "id": string;
+            "type": string;
+        };
     }
     /**
      *
@@ -2976,8 +3692,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class BindingCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.Binding>;
         /**
@@ -2995,7 +3709,7 @@ declare module Excel {
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         add(range: Excel.Range | string, bindingType: string, id: string): Excel.Binding;
         /**
@@ -3006,7 +3720,7 @@ declare module Excel {
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         addFromNamedItem(name: string, bindingType: string, id: string): Excel.Binding;
         /**
@@ -3016,7 +3730,7 @@ declare module Excel {
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         addFromSelection(bindingType: string, id: string): Excel.Binding;
         /**
@@ -3037,29 +3751,21 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getItemAt(index: number): Excel.Binding;
-        /**
-         *
-         * Gets a binding object by ID. If the binding object does not exist, the return object's isNull property will be true.
-         *
-         * @param id Id of the binding object to be retrieved.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getItemOrNull(id: string): Excel.Binding;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.BindingCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
-     * Represents a collection of all the tables that are part of the workbook.
+     * Represents a collection of all the tables that are part of the workbook or worksheet, depending on how it was reached.
      *
      * [Api set: ExcelApi 1.1]
      */
     class TableCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.Table>;
         /**
@@ -3071,14 +3777,14 @@ declare module Excel {
         count: number;
         /**
          *
-         * Create a new table. The range source address determines the worksheet under which the table will be added. If the table cannot be added (e.g., because the address is invalid, or the table would overlap with another table), an error will be thrown.
+         * Create a new table. The range object or source address determines the worksheet under which the table will be added. If the table cannot be added (e.g., because the address is invalid, or the table would overlap with another table), an error will be thrown.
          *
-         * @param address Address or name of the range object representing the data source. If the address does not contain a sheet name, the currently-active sheet is used.
+         * @param address A Range object, or a string address or name of the range representing the data source. If the address does not contain a sheet name, the currently-active sheet is used. [Api set: ExcelApi 1.1 for string parameter; 1.3 for accepting a Range object as well]
          * @param hasHeaders Boolean value that indicates whether the data being imported has column labels. If the source does not contain headers (i.e,. when this property set to false), Excel will automatically generate header shifting the data down by one row.
          *
          * [Api set: ExcelApi 1.1]
          */
-        add(address: string, hasHeaders: boolean): Excel.Table;
+        add(address: Excel.Range | string, hasHeaders: boolean): Excel.Table;
         /**
          *
          * Gets a table by Name or ID.
@@ -3097,19 +3803,13 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getItemAt(index: number): Excel.Table;
-        /**
-         *
-         * Gets a table by Name or ID. If the table does not exist, the return object's isNull property will be true.
-         *
-         * @param key Name or ID of the table to be retrieved.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getItemOrNull(key: number | string): Excel.Table;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
@@ -3118,20 +3818,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class Table extends OfficeExtension.ClientObject {
-        private m_columns;
-        private m_highlightFirstColumn;
-        private m_highlightLastColumn;
-        private m_id;
-        private m_name;
-        private m_rows;
-        private m_showBandedColumns;
-        private m_showBandedRows;
-        private m_showFilterButton;
-        private m_showHeaders;
-        private m_showTotals;
-        private m_sort;
-        private m_style;
-        private m_worksheet;
         /**
          *
          * Represents a collection of all the columns in the table. Read-only.
@@ -3164,14 +3850,14 @@ declare module Excel {
          *
          * Indicates whether the first column contains special formatting.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         highlightFirstColumn: boolean;
         /**
          *
          * Indicates whether the last column contains special formatting.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         highlightLastColumn: boolean;
         /**
@@ -3192,21 +3878,21 @@ declare module Excel {
          *
          * Indicates whether the columns show banded formatting in which odd columns are highlighted differently from even ones to make reading the table easier.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         showBandedColumns: boolean;
         /**
          *
          * Indicates whether the rows show banded formatting in which odd rows are highlighted differently from even ones to make reading the table easier.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         showBandedRows: boolean;
         /**
          *
          * Indicates whether the filter buttons are visible at the top of each column header. Setting this is only allowed if the table contains a header row.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         showFilterButton: boolean;
         /**
@@ -3290,6 +3976,18 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Table;
+        toJSON(): {
+            "highlightFirstColumn": boolean;
+            "highlightLastColumn": boolean;
+            "id": number;
+            "name": string;
+            "showBandedColumns": boolean;
+            "showBandedRows": boolean;
+            "showFilterButton": boolean;
+            "showHeaders": boolean;
+            "showTotals": boolean;
+            "style": string;
+        };
     }
     /**
      *
@@ -3298,8 +3996,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class TableColumnCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.TableColumn>;
         /**
@@ -3313,12 +4009,13 @@ declare module Excel {
          *
          * Adds a new column to the table.
          *
-         * @param index Specifies the relative position of the new column. The previous column at this position is shifted to the right. The index value should be equal to or less than the last column's index value, so it cannot be used to append a column at the end of the table. Zero-indexed.
+         * @param index Specifies the relative position of the new column. If null or -1, the addition happens at the end. Columns with a higher index will be shifted to the side. Zero-indexed.
          * @param values A 2-dimensional array of unformatted values of the table column.
+         * @param name Specifies the name of the new column. If null, the default name will be used.
          *
-         * [Api set: ExcelApi 1.1]
+         * [Api set: ExcelApi 1.1 requires an index smaller than the total column count; 1.4 allows index to be optional (null or -1) and will append a column at the end; 1.4 allows name parameter at creation time.]
          */
-        add(index: number, values?: Array<Array<boolean | string | number>> | boolean | string | number): Excel.TableColumn;
+        add(index?: number, values?: Array<Array<boolean | string | number>> | boolean | string | number, name?: string): Excel.TableColumn;
         /**
          *
          * Gets a column object by Name or ID.
@@ -3337,19 +4034,13 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getItemAt(index: number): Excel.TableColumn;
-        /**
-         *
-         * Gets a column object by Name or ID. If the column does not exist, the returned object's isNull property will be true.
-         *
-         * @param key Column Name or ID.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getItemOrNull(key: number | string): Excel.TableColumn;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumnCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
@@ -3358,11 +4049,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class TableColumn extends OfficeExtension.ClientObject {
-        private m_filter;
-        private m_id;
-        private m_index;
-        private m_name;
-        private m_values;
         /**
          *
          * Retrieve the filter applied to the column.
@@ -3386,9 +4072,9 @@ declare module Excel {
         index: number;
         /**
          *
-         * Returns the name of the table column. Read-only.
+         * Represents the name of the table column.
          *
-         * [Api set: ExcelApi 1.1]
+         * [Api set: ExcelApi 1.1 for getting the name; 1.4 for setting it.]
          */
         name: string;
         /**
@@ -3437,6 +4123,12 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableColumn;
+        toJSON(): {
+            "id": number;
+            "index": number;
+            "name": string;
+            "values": any[][];
+        };
     }
     /**
      *
@@ -3445,8 +4137,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class TableRowCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.TableRow>;
         /**
@@ -3458,12 +4148,12 @@ declare module Excel {
         count: number;
         /**
          *
-         * Adds a new row to the table.
+         * Adds one or more rows to the table. The return object will be the top of the newly added row(s).
          *
-         * @param index Specifies the relative position of the new row. If null, the addition happens at the end. Any rows below the inserted row are shifted downwards. Zero-indexed.
+         * @param index Specifies the relative position of the new row. If null or -1, the addition happens at the end. Any rows below the inserted row are shifted downwards. Zero-indexed.
          * @param values A 2-dimensional array of unformatted values of the table row.
          *
-         * [Api set: ExcelApi 1.1]
+         * [Api set: ExcelApi 1.1 for adding a single row; 1.4 allows adding of multiple rows.]
          */
         add(index?: number, values?: Array<Array<boolean | string | number>> | boolean | string | number): Excel.TableRow;
         /**
@@ -3479,6 +4169,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRowCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
@@ -3487,8 +4180,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class TableRow extends OfficeExtension.ClientObject {
-        private m_index;
-        private m_values;
         /**
          *
          * Returns the index number of the row within the rows collection of the table. Zero-indexed. Read-only.
@@ -3521,6 +4212,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableRow;
+        toJSON(): {
+            "index": number;
+            "values": any[][];
+        };
     }
     /**
      *
@@ -3529,18 +4224,9 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class RangeFormat extends OfficeExtension.ClientObject {
-        private m_borders;
-        private m_columnWidth;
-        private m_fill;
-        private m_font;
-        private m_horizontalAlignment;
-        private m_protection;
-        private m_rowHeight;
-        private m_verticalAlignment;
-        private m_wrapText;
         /**
          *
-         * Collection of border objects that apply to the overall range selected Read-only.
+         * Collection of border objects that apply to the overall range. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -3554,7 +4240,7 @@ declare module Excel {
         fill: Excel.RangeFill;
         /**
          *
-         * Returns the font object defined on the overall range selected Read-only.
+         * Returns the font object defined on the overall range. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -3619,6 +4305,16 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFormat;
+        toJSON(): {
+            "columnWidth": number;
+            "fill": RangeFill;
+            "font": RangeFont;
+            "horizontalAlignment": string;
+            "protection": FormatProtection;
+            "rowHeight": number;
+            "verticalAlignment": string;
+            "wrapText": boolean;
+        };
     }
     /**
      *
@@ -3627,8 +4323,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.2]
      */
     class FormatProtection extends OfficeExtension.ClientObject {
-        private m_formulaHidden;
-        private m_locked;
         /**
          *
          * Indicates if Excel hides the formula for the cells in the range. A null value indicates that the entire range doesn't have uniform formula hidden setting.
@@ -3647,6 +4341,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.FormatProtection;
+        toJSON(): {
+            "formulaHidden": boolean;
+            "locked": boolean;
+        };
     }
     /**
      *
@@ -3655,7 +4353,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class RangeFill extends OfficeExtension.ClientObject {
-        private m_color;
         /**
          *
          * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange")
@@ -3674,6 +4371,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFill;
+        toJSON(): {
+            "color": string;
+        };
     }
     /**
      *
@@ -3682,10 +4382,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class RangeBorder extends OfficeExtension.ClientObject {
-        private m_color;
-        private m_sideIndex;
-        private m_style;
-        private m_weight;
         /**
          *
          * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
@@ -3718,6 +4414,12 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorder;
+        toJSON(): {
+            "color": string;
+            "sideIndex": string;
+            "style": string;
+            "weight": string;
+        };
     }
     /**
      *
@@ -3726,8 +4428,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class RangeBorderCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.RangeBorder>;
         /**
@@ -3759,6 +4459,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeBorderCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
@@ -3767,12 +4470,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class RangeFont extends OfficeExtension.ClientObject {
-        private m_bold;
-        private m_color;
-        private m_italic;
-        private m_name;
-        private m_size;
-        private m_underline;
         /**
          *
          * Represents the bold status of font.
@@ -3819,6 +4516,14 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.RangeFont;
+        toJSON(): {
+            "bold": boolean;
+            "color": string;
+            "italic": boolean;
+            "name": string;
+            "size": number;
+            "underline": string;
+        };
     }
     /**
      *
@@ -3827,8 +4532,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.Chart>;
         /**
@@ -3867,20 +4570,13 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         getItemAt(index: number): Excel.Chart;
-        /**
-         *
-         * Gets a chart using its name. If there are multiple charts with the same name, the first one will be returned.
-            If the chart does not exist, the returned object's isNull property will be true.
-         *
-         * @param name Name of the chart to be retrieved.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getItemOrNull(name: string): Excel.Chart;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
@@ -3889,18 +4585,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class Chart extends OfficeExtension.ClientObject {
-        private m_axes;
-        private m_dataLabels;
-        private m_format;
-        private m_height;
-        private m_left;
-        private m_legend;
-        private m_name;
-        private m_series;
-        private m_title;
-        private m_top;
-        private m_width;
-        private m_worksheet;
         /**
          *
          * Represents chart axes. Read-only.
@@ -4028,6 +4712,18 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Chart;
+        toJSON(): {
+            "axes": ChartAxes;
+            "dataLabels": ChartDataLabels;
+            "format": ChartAreaFormat;
+            "height": number;
+            "left": number;
+            "legend": ChartLegend;
+            "name": string;
+            "title": ChartTitle;
+            "top": number;
+            "width": number;
+        };
     }
     /**
      *
@@ -4036,8 +4732,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartAreaFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
         /**
          *
          * Represents the fill format of an object, which includes background formatting information. Read-only.
@@ -4056,6 +4750,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAreaFormat;
+        toJSON(): {
+            "fill": ChartFill;
+            "font": ChartFont;
+        };
     }
     /**
      *
@@ -4064,8 +4762,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartSeriesCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.ChartSeries>;
         /**
@@ -4088,6 +4784,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
@@ -4096,9 +4795,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartSeries extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_name;
-        private m_points;
         /**
          *
          * Represents the formatting of a chart series, which includes fill and line formatting. Read-only.
@@ -4124,6 +4820,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeries;
+        toJSON(): {
+            "format": ChartSeriesFormat;
+            "name": string;
+        };
     }
     /**
      *
@@ -4132,8 +4832,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartSeriesFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_line;
         /**
          *
          * Represents the fill format of a chart series, which includes background formating information. Read-only.
@@ -4152,6 +4850,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartSeriesFormat;
+        toJSON(): {
+            "fill": ChartFill;
+            "line": ChartLineFormat;
+        };
     }
     /**
      *
@@ -4160,8 +4862,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartPointsCollection extends OfficeExtension.ClientObject {
-        private m_count;
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.ChartPoint>;
         /**
@@ -4184,6 +4884,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointsCollection;
+        toJSON(): {
+            "count": number;
+        };
     }
     /**
      *
@@ -4192,8 +4895,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartPoint extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_value;
         /**
          *
          * Encapsulates the format properties chart point. Read-only.
@@ -4212,6 +4913,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPoint;
+        toJSON(): {
+            "format": ChartPointFormat;
+            "value": any;
+        };
     }
     /**
      *
@@ -4220,7 +4925,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartPointFormat extends OfficeExtension.ClientObject {
-        private m_fill;
         /**
          *
          * Represents the fill format of a chart, which includes background formating information. Read-only.
@@ -4232,6 +4936,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartPointFormat;
+        toJSON(): {
+            "fill": ChartFill;
+        };
     }
     /**
      *
@@ -4240,9 +4947,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartAxes extends OfficeExtension.ClientObject {
-        private m_categoryAxis;
-        private m_seriesAxis;
-        private m_valueAxis;
         /**
          *
          * Represents the category axis in a chart. Read-only.
@@ -4268,6 +4972,11 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxes;
+        toJSON(): {
+            "categoryAxis": ChartAxis;
+            "seriesAxis": ChartAxis;
+            "valueAxis": ChartAxis;
+        };
     }
     /**
      *
@@ -4276,14 +4985,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartAxis extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_majorGridlines;
-        private m_majorUnit;
-        private m_maximum;
-        private m_minimum;
-        private m_minorGridlines;
-        private m_minorUnit;
-        private m_title;
         /**
          *
          * Represents the formatting of a chart object, which includes line and font formatting. Read-only.
@@ -4344,6 +5045,16 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxis;
+        toJSON(): {
+            "format": ChartAxisFormat;
+            "majorGridlines": ChartGridlines;
+            "majorUnit": any;
+            "maximum": any;
+            "minimum": any;
+            "minorGridlines": ChartGridlines;
+            "minorUnit": any;
+            "title": ChartAxisTitle;
+        };
     }
     /**
      *
@@ -4352,8 +5063,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartAxisFormat extends OfficeExtension.ClientObject {
-        private m_font;
-        private m_line;
         /**
          *
          * Represents the font attributes (font name, font size, color, etc.) for a chart axis element. Read-only.
@@ -4372,6 +5081,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisFormat;
+        toJSON(): {
+            "font": ChartFont;
+            "line": ChartLineFormat;
+        };
     }
     /**
      *
@@ -4380,9 +5093,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartAxisTitle extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_text;
-        private m_visible;
         /**
          *
          * Represents the formatting of chart axis title. Read-only.
@@ -4408,6 +5118,11 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitle;
+        toJSON(): {
+            "format": ChartAxisTitleFormat;
+            "text": string;
+            "visible": boolean;
+        };
     }
     /**
      *
@@ -4416,7 +5131,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartAxisTitleFormat extends OfficeExtension.ClientObject {
-        private m_font;
         /**
          *
          * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object. Read-only.
@@ -4428,6 +5142,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartAxisTitleFormat;
+        toJSON(): {
+            "font": ChartFont;
+        };
     }
     /**
      *
@@ -4436,15 +5153,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartDataLabels extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_position;
-        private m_separator;
-        private m_showBubbleSize;
-        private m_showCategoryName;
-        private m_showLegendKey;
-        private m_showPercentage;
-        private m_showSeriesName;
-        private m_showValue;
         /**
          *
          * Represents the format of chart data labels, which includes fill and font formatting. Read-only.
@@ -4512,6 +5220,17 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabels;
+        toJSON(): {
+            "format": ChartDataLabelFormat;
+            "position": string;
+            "separator": string;
+            "showBubbleSize": boolean;
+            "showCategoryName": boolean;
+            "showLegendKey": boolean;
+            "showPercentage": boolean;
+            "showSeriesName": boolean;
+            "showValue": boolean;
+        };
     }
     /**
      *
@@ -4520,8 +5239,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartDataLabelFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
         /**
          *
          * Represents the fill format of the current chart data label. Read-only.
@@ -4540,6 +5257,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartDataLabelFormat;
+        toJSON(): {
+            "fill": ChartFill;
+            "font": ChartFont;
+        };
     }
     /**
      *
@@ -4548,8 +5269,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartGridlines extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_visible;
         /**
          *
          * Represents the formatting of chart gridlines. Read-only.
@@ -4568,6 +5287,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlines;
+        toJSON(): {
+            "format": ChartGridlinesFormat;
+            "visible": boolean;
+        };
     }
     /**
      *
@@ -4576,7 +5299,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartGridlinesFormat extends OfficeExtension.ClientObject {
-        private m_line;
         /**
          *
          * Represents chart line formatting. Read-only.
@@ -4588,6 +5310,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartGridlinesFormat;
+        toJSON(): {
+            "line": ChartLineFormat;
+        };
     }
     /**
      *
@@ -4596,10 +5321,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartLegend extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_overlay;
-        private m_position;
-        private m_visible;
         /**
          *
          * Represents the formatting of a chart legend, which includes fill and font formatting. Read-only.
@@ -4632,6 +5353,12 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegend;
+        toJSON(): {
+            "format": ChartLegendFormat;
+            "overlay": boolean;
+            "position": string;
+            "visible": boolean;
+        };
     }
     /**
      *
@@ -4640,8 +5367,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartLegendFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
         /**
          *
          * Represents the fill format of an object, which includes background formating information. Read-only.
@@ -4660,6 +5385,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLegendFormat;
+        toJSON(): {
+            "fill": ChartFill;
+            "font": ChartFont;
+        };
     }
     /**
      *
@@ -4668,10 +5397,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartTitle extends OfficeExtension.ClientObject {
-        private m_format;
-        private m_overlay;
-        private m_text;
-        private m_visible;
         /**
          *
          * Represents the formatting of a chart title, which includes fill and font formatting. Read-only.
@@ -4704,6 +5429,12 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitle;
+        toJSON(): {
+            "format": ChartTitleFormat;
+            "overlay": boolean;
+            "text": string;
+            "visible": boolean;
+        };
     }
     /**
      *
@@ -4712,8 +5443,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartTitleFormat extends OfficeExtension.ClientObject {
-        private m_fill;
-        private m_font;
         /**
          *
          * Represents the fill format of an object, which includes background formating information. Read-only.
@@ -4732,6 +5461,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartTitleFormat;
+        toJSON(): {
+            "fill": ChartFill;
+            "font": ChartFont;
+        };
     }
     /**
      *
@@ -4760,6 +5493,7 @@ declare module Excel {
          * [Api set: ExcelApi 1.1]
          */
         setSolidColor(color: string): void;
+        toJSON(): {};
     }
     /**
      *
@@ -4768,7 +5502,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartLineFormat extends OfficeExtension.ClientObject {
-        private m_color;
         /**
          *
          * HTML color code representing the color of lines in the chart.
@@ -4787,6 +5520,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartLineFormat;
+        toJSON(): {
+            "color": string;
+        };
     }
     /**
      *
@@ -4795,12 +5531,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.1]
      */
     class ChartFont extends OfficeExtension.ClientObject {
-        private m_bold;
-        private m_color;
-        private m_italic;
-        private m_name;
-        private m_size;
-        private m_underline;
         /**
          *
          * Represents the bold status of font.
@@ -4847,6 +5577,14 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.ChartFont;
+        toJSON(): {
+            "bold": boolean;
+            "color": string;
+            "italic": boolean;
+            "name": string;
+            "size": number;
+            "underline": string;
+        };
     }
     /**
      *
@@ -4868,6 +5606,7 @@ declare module Excel {
          * [Api set: ExcelApi 1.2]
          */
         apply(fields: Array<Excel.SortField>, matchCase?: boolean, hasHeaders?: boolean, orientation?: string, method?: string): void;
+        toJSON(): {};
     }
     /**
      *
@@ -4876,9 +5615,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.2]
      */
     class TableSort extends OfficeExtension.ClientObject {
-        private m_fields;
-        private m_matchCase;
-        private m_method;
         /**
          *
          * Represents the current conditions used to last sort the table.
@@ -4929,6 +5665,11 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.TableSort;
+        toJSON(): {
+            "fields": SortField[];
+            "matchCase": boolean;
+            "method": string;
+        };
     }
     /**
      *
@@ -4987,7 +5728,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.2]
      */
     class Filter extends OfficeExtension.ClientObject {
-        private m_criteria;
         /**
          *
          * The currently applied filter on the given column.
@@ -5107,6 +5847,9 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.Filter;
+        toJSON(): {
+            "criteria": FilterCriteria;
+        };
     }
     /**
      *
@@ -5223,10 +5966,9 @@ declare module Excel {
      *
      * Represents a collection of all the PivotTables that are part of the workbook or worksheet.
      *
-     * [Api set: ExcelApi 1.3 (Preview)]
+     * [Api set: ExcelApi 1.3]
      */
     class PivotTableCollection extends OfficeExtension.ClientObject {
-        private m__items;
         /** Gets the loaded child items in this collection. */
         items: Array<Excel.PivotTable>;
         /**
@@ -5235,64 +5977,57 @@ declare module Excel {
          *
          * @param name Name of the PivotTable to be retrieved.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         getItem(name: string): Excel.PivotTable;
-        /**
-         *
-         * Gets a PivotTable by name. If the PivotTable does not exist, the return object's isNull property will be true.
-         *
-         * @param name Name of the PivotTable to be retrieved.
-         *
-         * [Api set: ExcelApi 1.3 (Preview)]
-         */
-        getItemOrNull(name: string): Excel.PivotTable;
         /**
          *
          * Refreshes all the PivotTables in the collection.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         refreshAll(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.PivotTableCollection;
+        toJSON(): {};
     }
     /**
      *
      * Represents an Excel PivotTable.
      *
-     * [Api set: ExcelApi 1.3 (Preview)]
+     * [Api set: ExcelApi 1.3]
      */
     class PivotTable extends OfficeExtension.ClientObject {
-        private m_name;
-        private m_worksheet;
         /**
          *
          * The worksheet containing the current PivotTable. Read-only.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         worksheet: Excel.Worksheet;
         /**
          *
          * Name of the PivotTable.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         name: string;
         /**
          *
          * Refreshes the PivotTable.
          *
-         * [Api set: ExcelApi 1.3 (Preview)]
+         * [Api set: ExcelApi 1.3]
          */
         refresh(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): Excel.PivotTable;
+        toJSON(): {
+            "name": string;
+        };
     }
     /**
      * [Api set: ExcelApi 1.1]
@@ -5635,6 +6370,7 @@ declare module Excel {
         var double: string;
         var boolean: string;
         var range: string;
+        var error: string;
     }
     /**
      * [Api set: ExcelApi 1.1]
@@ -5713,8 +6449,6 @@ declare module Excel {
      * [Api set: ExcelApi 1.2]
      */
     class FunctionResult<T> extends OfficeExtension.ClientObject {
-        private m_error;
-        private m_value;
         /**
          *
          * Error value (such as "#DIV/0") representing the error. If the error string is not set, then the function succeeded, and its result is written to the Value field. The error is always in the English locale.
@@ -5724,7 +6458,7 @@ declare module Excel {
         error: string;
         /**
          *
-         * The value of function evaluation. The value field will be populated only if no error has occured (i.e., the Error property is not set).
+         * The value of function evaluation. The value field will be populated only if no error has occurred (i.e., the Error property is not set).
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -5733,6 +6467,10 @@ declare module Excel {
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
          */
         load(option?: string | string[] | OfficeExtension.LoadOption): FunctionResult<T>;
+        toJSON(): {
+            "error": string;
+            "value": T;
+        };
     }
     /**
      *
@@ -9477,9 +10215,11 @@ declare module Excel {
          * [Api set: ExcelApi 1.2]
          */
         z_Test(array: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, x: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>, sigma?: number | Excel.Range | Excel.RangeReference | Excel.FunctionResult<any>): FunctionResult<number>;
+        toJSON(): {};
     }
     module ErrorCodes {
         var accessDenied: string;
+        var apiNotFound: string;
         var generalException: string;
         var insertDeleteConflict: string;
         var invalidArgument: string;
@@ -9498,17 +10238,67 @@ declare module Excel {
      * The RequestContext object facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
      */
     class RequestContext extends OfficeExtension.ClientRequestContext {
-        private m_workbook;
         constructor(url?: string);
         workbook: Workbook;
     }
     /**
-     * Executes a batch script that performs actions on the Excel object model. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
-     * @param batch - A function that takes in an Excel.RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the request context is required to get access to the Excel object model from the add-in.
+     * Executes a batch script that performs actions on the Excel object model, using a new RequestContext. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
     function run<T>(batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Excel object model, using a new remote RequestContext. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
+     */
+    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo, batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Excel object model, using the RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param object - A previously-created API object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
+     */
+    function run<T>(object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Excel object model, using the remote RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
+     * @param object - A previously-created API object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
+     */
+    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo, object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Excel object model, using the RequestContext of previously-created API objects.
+     * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
+     */
+    function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
+    /**
+     * Executes a batch script that performs actions on the Excel object model, using the remote RequestContext of previously-created API objects.
+     * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
+     * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
+     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
+     */
+    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo, objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
 }
 
+
+
+////////////////////////////////////////////////////////////////
+//////////////////////// End Excel APIs ////////////////////////
+////////////////////////////////////////////////////////////////
+
+
+
+
+////////////////////////////////////////////////////////////////
+
+
+
+
+////////////////////////////////////////////////////////////////
+//////////////////////// Begin Word APIs ///////////////////////
+////////////////////////////////////////////////////////////////
+
+
 declare namespace Word {
     /**
      *
@@ -12914,614 +13704,26 @@ declare namespace Word {
     function run<T>(batch: (context: Word.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
 }
 
-declare namespace Office.MailboxEnums {
-    export enum BodyType {
-        /**
-         * The body is in HTML format
-         */
-        Html,
-        /**
-         * The body is in text format
-         */
-        text
-    }
-    export enum EntityType {
-        /**
-         * Specifies that the entity is a meeting suggestion
-         */
-        MeetingSuggestion,
-        /**
-         * Specifies that the entity is a task suggestion
-         */
-        TaskSuggestion,
-        /**
-         * Specifies that the entity is a postal address
-         */
-        Address,
-        /**
-         * Specifies that the entity is SMTP email address
-         */
-        EmailAddress,
-        /**
-         * Specifies that the entity is an Internet URL
-         */
-        Url,
-        /**
-         * Specifies that the entity is US phone number
-         */
-        PhoneNumber,
-        /**
-         * Specifies that the entity is a contact
-         */
-        Contact
-    }
-    export enum ItemType {
-        /**
-         * A meeting request, response, or cancellation
-         */
-        Message,
-        /**
-         * Specifies an appointment item
-         */
-        Appointment
-    }
-    export enum ResponseType {
-        /**
-         * There has been no response from the attendee
-         */
-        None,
-        /**
-         * The attendee is the meeting organizer
-         */
-        Organizer,
-        /**
-         * The meeting request was tentatively accepted by the attendee
-         */
-        Tentative,
-        /**
-         * The meeting request was accepted by the attendee
-         */
-        Accepted,
-        /**
-         * The meeting request was declined by the attendee
-         */
-        Declined
-    }
-    export enum RecipientType {
-        /**
-         * Specifies that the recipient is not one of the other recipient types
-         */
-        Other,
-        /**
-         * Specifies that the recipient is a distribution list containing a list of email addresses
-         */
-        DistributionList,
-        /**
-         * Specifies that the recipient is an SMTP email address that is on the Exchange server
-         */
-        User,
-        /**
-         * Specifies that the recipient is an SMTP email address that is not on the Exchange server
-         */
-        ExternalUser
-    }
-    export enum AttachmentType {
-        /**
-         * The attachment is a file
-         */
-        File,
-        /**
-         * The attachment is an Exchange item
-         */
-        Item
-    }
-}
-declare namespace Office {
-    export module Types {
-        export interface ItemRead extends Office.Item {
-            subject: any;
-            /**
-             * Displays a reply form that includes the sender and all the recipients of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyAllForm(htmlBody: string): void;
-            /**
-             * Displays a reply form that includes only the sender of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyForm(htmlBody: string): void;
-            /**
-             * Gets an array of entities found in an message
-             */
-            getEntities(): Office.Entities;
-            /**
-             * Gets an array of entities of the specified entity type found in an message
-             * @param entityType One of the EntityType enumeration values
-             */
-            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
-            /**
-             * Returns well-known entities that pass the named filter defined in the manifest XML file
-             * @param name  A TableData object with the headers and rows
-             */
-            getFilteredEntitiesByName(name: string): Office.Entities;
-            /**
-             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
-             */
-            getRegExMatches(): string[];
-            /**
-             * Returns string values that match the named regular expression defined in the manifest XML file
-             */
-            getRegExMatchesByName(name: string): string[];
-        }
-        export interface ItemCompose extends Office.Item {
-            body: Office.Body;
-            subject: any;
-            /**
-             * Adds a file to a message as an attachment
-             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Adds an Exchange item, such as a message, as an attachment to the message
-             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Removes an attachment from a message
-             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
-        }
-        export interface MessageCompose extends Office.Message {
-            attachments: Office.AttachmentDetails[];
-            body: Office.Body;
-            bcc: Office.Recipients;
-            cc: Office.Recipients;
-            subject: Office.Subject;
-            to: Office.Recipients;
-            /**
-             * Adds a file to a message as an attachment
-             * @param uri The URI that provides the location of the file to attach to the message. The maximum length is 2048 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Adds an Exchange item, such as a message, as an attachment to the message
-             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Removes an attachment from a message
-             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
-        }
-        export interface MessageRead extends Office.Message {
-            cc: Office.EmailAddressDetails[];
-            from: Office.EmailAddressDetails;
-            internetMessageId: string;
-            normalizedSubject: string;
-            sender: Office.EmailAddressDetails;
-            subject: string;
-            to: Office.EmailAddressDetails;
-            /**
-             * Displays a reply form that includes the sender and all the recipients of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyAllForm(htmlBody: string): void;
-            /**
-             * Displays a reply form that includes only the sender of the selected message
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyForm(htmlBody: string): void;
-            /**
-             * Gets an array of entities found in an message
-             */
-            getEntities(): Office.Entities;
-            /**
-             * Gets an array of entities of the specified entity type found in an message
-             * @param entityType One of the EntityType enumeration values
-             */
-            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
-            /**
-             * Returns well-known entities that pass the named filter defined in the manifest XML file
-             * @param name  A TableData object with the headers and rows
-             */
-            getFilteredEntitiesByName(name: string): Office.Entities;
-            /**
-             * Returns string values in the currently selected message object that match the regular expressions defined in the manifest XML file
-             */
-            getRegExMatches(): string[];
-            /**
-             * Returns string values that match the named regular expression defined in the manifest XML file
-             */
-            getRegExMatchesByName(name: string): string[];
-        }
-        export interface AppointmentCompose extends Office.Appointment {
-            body: Office.Body;
-            end: Office.Time;
-            location: Office.Location;
-            optionalAttendees: Office.Recipients;
-            requiredAttendees: Office.Recipients;
-            start: Office.Time;
-            subject: Office.Subject;
-            /**
-             * Adds a file to an appointment as an attachment
-             * @param uri The URI that provides the location of the file to attach to the appointment. The maximum length is 2048 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addFileAttachmentAsync(uri: string, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Adds an Exchange item, such as a message, as an attachment to the appointment
-             * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters
-             * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            addItemAttachmentAsync(itemId: any, attachmentName: string, options?: any, callback?: (result: AsyncResult) => void): void;
-            /**
-             * Removes an attachment from a appointment
-             * @param attachmentIndex The index of the attachment to remove. The maximum length of the string is 100 characters
-             * @param options Any optional parameters or state data passed to the method
-             * @param callback The optional callback method
-             */
-            removeAttachmentAsync(attachmentIndex: string, option?: any, callback?: (result: AsyncResult) => void): void;
-        }
-        export interface AppointmentRead extends Office.Appointment {
-            attachments: Office.AttachmentDetails[];
-            end: Date;
-            location: string;
-            normalizedSubject: string;
-            optionalAttendees: Office.EmailAddressDetails;
-            organizer: Office.EmailAddressDetails;
-            requiredAttendees: Office.EmailAddressDetails;
-            resources: string[];
-            start: Date;
-            subject: string;
-            /**
-             * Displays a reply form that includes the organizer and all the attendees of the selected appointment item
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyAllForm(htmlBody: string): void;
-            /**
-             * Displays a reply form that includes only the organizer of the selected appointment item
-             * @param htmlBody A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
-             */
-            displayReplyForm(htmlBody: string): void;
-            /**
-             * Gets an array of entities found in an appointment
-             */
-            getEntities(): Office.Entities;
-            /**
-             * Gets an array of entities of the specified entity type found in an appointment
-             * @param entityType One of the EntityType enumeration values
-             */
-            getEntitiesByType(entityType: Office.MailboxEnums.EntityType): Office.Entities;
-            /**
-             * Returns well-known entities that pass the named filter defined in the manifest XML file
-             * @param name  A TableData object with the headers and rows
-             */
-            getFilteredEntitiesByName(name: string): Office.Entities;
-            /**
-             * Returns string values in the currently selected appointment object that match the regular expressions defined in the manifest XML file
-             */
-            getRegExMatches(): string[];
-            /**
-             * Returns string values that match the named regular expression defined in the manifest XML file
-             */
-            getRegExMatchesByName(name: string): string[];
-        }
-    }
-    export module cast {
-        export module item {
-            function toAppointmentCompose(item: Office.Item): Office.Types.AppointmentCompose;
-            function toAppointmentRead(item: Office.Item): Office.Types.AppointmentRead;
-            function toAppointment(item: Office.Item): Office.Appointment;
-            function toMessageCompose(item: Office.Item): Office.Types.MessageCompose;
-            function toMessageRead(item: Office.Item): Office.Types.MessageRead;
-            function toMessage(item: Office.Item): Office.Message;
-            function toItemCompose(item: Office.Item): Office.Types.ItemCompose;
-            function toItemRead(item: Office.Item): Office.Types.ItemRead;
-        }
-    }
-    export interface AttachmentDetails {
-        attachmentType: Office.MailboxEnums.AttachmentType;
-        contentType: string;
-        id: string;
-        isInline: boolean;
-        name: string;
-        size: number;
-    }
-    export interface Contact {
-        personName: string;
-        businessName: string;
-        phoneNumbers: PhoneNumber[];
-        emailAddresses: string[];
-        urls: string[];
-        addresses: string[];
-        contactString: string;
-    }
 
-    export interface Context {
-        mailbox: Mailbox;
-        roamingSettings: RoamingSettings;
-    }
-    export interface CustomProperties {
-        /**
-         * Returns the value of the specified custom property
-         * @param name The name of the property to be returned
-         */
-        get(name: string): any;
-        /**
-         * Sets the specified property to the specified value
-         * @param name The name of the property to be set
-         * @param value The value of the property to be set
-         */
-        set(name: string, value: string): void;
-        /**
-         * Removes the specified property from the custom property collection.
-         * @param name The name of the property to be removed
-         */
-        remove(name: string): void;
-        /**
-         * Saves the custom property collection to the server
-         * @param callback The optional callback method
-         * @param userContext Optional variable for any state data that is passed to the saveAsync method
-         */
-        saveAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-    }
-    export interface EmailAddressDetails {
-        emailAddress: string;
-        displayName: string;
-        appointmentResponse: Office.MailboxEnums.ResponseType;
-        recipientType: Office.MailboxEnums.RecipientType;
-    }
-    export interface EmailUser {
-        name: string;
-        userId: string;
-    }
-    export interface Entities {
-        addresses: string[];
-        taskSuggestions: string[];
-        meetingSuggestions: MeetingSuggestion[];
-        emailAddresses: string[];
-        urls: string[];
-        phoneNumbers: PhoneNumber[];
-        contacts: Contact[];
-    }
-    export interface Item {
-        dateTimeCreated: Date;
-        dateTimeModified: Date;
-        itemClass: string;
-        itemId: string;
-        itemType: Office.MailboxEnums.ItemType;
-        /**
-         * Asynchronously loads custom properties that are specific to the item and a app for Office
-         * @param callback The optional callback method
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        loadCustomPropertiesAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-    }
-    export interface Appointment extends Item {
-    }
-    export interface Body {
-        /**
-         * Gets a value that indicates whether the content is in HTML or text format
-         * @param tableData  A TableData object with the headers and rows
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the getTypeAsync method returns
-         */
-        getTypeAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Adds the specified content to the beginning of the item body
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        prependAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Replaces the selection in the body with the specified text
-         * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setSelectedDataAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface Location {
-        /**
-         * Begins an asynchronous request for the location of an appointment
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the location of an appointment
-         * @param data The location of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the location is set
-         */
-        setAsync(location: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface Mailbox {
-        item: Item;
-        userProfile: UserProfile;
-        /**
-         * Gets a Date object from a dictionary containing time information
-         * @param timeValue A Date object
-         */
-        convertToLocalClientTime(timeValue: Date): any;
-        /**
-         * Gets a dictionary containing time information in local client time
-         * @param input A dictionary containing a date. The dictionary should contain the following fields: year, month, date, hours, minutes, seconds, time zone, time zone offset
-         */
-        convertToUtcClientTime(input: any): Date;
-        /**
-         * Displays an existing calendar appointment
-         * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment
-         */
-        displayAppointmentForm(itemId: any): void;
-        /**
-         * Displays an existing message
-         * @param itemId The Exchange Web Services (EWS) identifier for an existing message
-         */
-        displayMessageForm(itemId: any): void;
-        /**
-         * Displays a form for creating a new calendar appointment
-         * @param requiredAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the required attendees for the appointment. The array is limited to a maximum of 100 entries
-         * @param optionalAttendees An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the optional attendees for the appointment. The array is limited to a maximum of 100 entries
-         * @param start A Date object specifying the start date and time of the appointment
-         * @param end A Date object specifying the end date and time of the appointment
-         * @param location A string containing the location of the appointment. The string is limited to a maximum of 255 characters
-         * @param resources An array of strings containing the resources required for the appointment. The array is limited to a maximum of 100 entries
-         * @param subject A string containing the subject of the appointment. The string is limited to a maximum of 255 characters
-         * @param body The body of the appointment message. The body content is limited to a maximum size of 32 KB
-         */
-        displayNewAppointmentForm(requiredAttendees: any, optionalAttendees: any, start: Date, end: Date, location: string, resources: string[], subject: string, body: string): void;
-        /**
-         * Gets a string that contains a token used to get an attachment or item from an Exchange Server
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        getCallbackTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-        /**
-         * Gets a token identifying the user and the app for Office
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        getUserIdentityTokenAsync(callback?: (result: AsyncResult) => void, userContext?: any): void;
-        /**
-         * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user’s mailbox
-         * @param data The EWS request
-         * @param callback The optional method to call when the string is inserted
-         * @param userContext Optional variable for any state data that is passed to the asynchronous method
-         */
-        makeEwsRequestAsync(data: any, callback?: (result: AsyncResult) => void, userContext?: any): void;
-    }
-    export interface Message extends Item {
-        conversationId: string;
-    }
-    export interface MeetingRequest extends Message {
-        start: Date;
-        end: Date;
-        location: string;
-        optionalAttendees: EmailAddressDetails[];
-        requiredAttendees: EmailAddressDetails[];
-    }
-    export interface MeetingSuggestion {
-        meetingString: string;
-        attendees: EmailAddressDetails[];
-        location: string;
-        subject: string;
-        start: Date;
-        end: Date;
-    }
-    export interface PhoneNumber {
-        phoneString: string;
-        originalPhoneString: string;
-        type: string;
-    }
-    export interface Recipients {
-        /**
-         * Begins an asynchronous request to add a recipient list to an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        addAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to get the recipient list for an appointment or message
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the recipient list for an appointment or message
-         * @param recipients The recipients to add to the recipients list
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(recipients: any, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface RoamingSettings {
-        /**
-         * Retrieves the specified setting
-         * @param name The case-sensitive name of the setting to retrieve
-         */
-        get(name: string): any;
-        /**
-         * Removes the specified setting
-         * @param name The case-sensitive name of the setting to remove
-         */
-        remove(name: string): void;
-        /**
-         * Saves the settings
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult
-         */
-        saveAsync(callback?: (result: AsyncResult) => void): void;
-        /**
-         * Sets or creates the specified setting
-         * @param name The case-sensitive name of the setting to set or create
-         * @param value Specifies the value to be stored
-         */
-        set(name: string, value: any): void;
-    }
-    export interface Subject {
-        /**
-         * Begins an asynchronous request to get the subject of an appointment or message
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous call to set the subject of an appointment or message
-         * @param data The subject of the appointment. The string is limited to 255 characters
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(data: string, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface TaskSuggestion {
-        assignees: EmailUser[];
-        taskString: string;
-    }
-    export interface Time {
-        /**
-         * Begins an asynchronous request to get the start or end time
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        getAsync(options?: any, callback?: (result: AsyncResult) => void): void;
-        /**
-         * Begins an asynchronous request to set the start or end time
-         * @param dateTime A date-time object in Coordinated Universal Time (UTC)
-         * @param options Any optional parameters or state data passed to the method
-         * @param callback The optional method to call when the string is inserted
-         */
-        setAsync(dateTime: Date, options?: any, callback?: (result: AsyncResult) => void): void;
-    }
-    export interface UserProfile {
-        displayName: string;
-        emailAddress: string;
-        timeZone: string;
-    }
-}
+
+
+
+////////////////////////////////////////////////////////////////
+///////////////////////// End Word APIs ////////////////////////
+////////////////////////////////////////////////////////////////
+
+
+
+
+////////////////////////////////////////////////////////////////
+
+
+
+
+////////////////////////////////////////////////////////////////
+////////////////////// Begin OneNote APIs //////////////////////
+////////////////////////////////////////////////////////////////
+
 
 declare namespace OneNote {
     /**
@@ -15696,3 +15898,8 @@ declare namespace OneNote {
  */
     function run<T>(batch: (context: OneNote.RequestContext) => OfficeExtension.IPromise<T>): OfficeExtension.IPromise<T>;
 }
+
+
+////////////////////////////////////////////////////////////////
+/////////////////////// End OneNote APIs ///////////////////////
+////////////////////////////////////////////////////////////////
\ No newline at end of file

From 34ad2b8bb844fe993b94130111c74067b8a86bdf Mon Sep 17 00:00:00 2001
From: Brent Traut <brent@traut.com>
Date: Tue, 15 Nov 2016 18:29:13 -0800
Subject: [PATCH 122/245] =?UTF-8?q?Updated=20=E2=80=9Cassert=E2=80=9D=20ty?=
 =?UTF-8?q?pes=20to=20match=20that=20of=20npm=E2=80=99s=20=E2=80=9Cassert?=
 =?UTF-8?q?=E2=80=9D=20module.=20(#11695)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Updated “assert” types to match that of npm’s “assert” module.

* Changed comment format in assert.d.ts header.

* Changed comment format in assert.d.ts header (again).

* Removed assert definition inclusion from fbemitter-tests. Those definitions are already included in node.d.ts.
---
 assert/assert.d.ts           | 21 ++++++++++-----------
 fbemitter/fbemitter-tests.ts |  1 -
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/assert/assert.d.ts b/assert/assert.d.ts
index d7cb02eb38..35220dbb87 100644
--- a/assert/assert.d.ts
+++ b/assert/assert.d.ts
@@ -1,10 +1,15 @@
-// Type definitions for assert and power-assert
-// Project: https://github.com/Jxck/assert
-// Project: https://github.com/twada/power-assert
+// Type definitions for assert
+// Project: https://github.com/defunctzombie/commonjs-assert
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// copy from assert external module in node.d.ts
+// Definitions for commonjs-assert match that of node.js' assert module,
+// but commonjs-assert is intended to be used as an independent module,
+// for instance when making a stand-alone site or app that doesn't have
+// access to node modules. For that reason, these definitions define a
+// "assert" module. This will conflict with node.d.ts and other assert
+// modules such as "power-assert", but a project should realistically
+// only be using one of these at a time.
 
 declare function assert(value:any, message?:string):void;
 declare namespace assert {
@@ -52,12 +57,6 @@ declare namespace assert {
     export function ifError(value:any):void;
 }
 
-// duplicate to node.d.ts
-// declare module "assert" {
-//     export = assert;
-// }
-
-// move to power-assert.d.ts. do not use this definition file.
-declare module "power-assert" {
+declare module "assert" {
     export = assert;
 }
diff --git a/fbemitter/fbemitter-tests.ts b/fbemitter/fbemitter-tests.ts
index 614d579634..ce36e4fd01 100644
--- a/fbemitter/fbemitter-tests.ts
+++ b/fbemitter/fbemitter-tests.ts
@@ -1,7 +1,6 @@
 ///<reference path="fbemitter.d.ts" />
 ///<reference path="../node/node.d.ts" />
 ///<reference path="../mocha/mocha.d.ts" />
-///<reference path="../assert/assert.d.ts" />
 'use strict';
 
 /**

From 2681fb04c1bfe98a1b630d1dda2fef99897f9786 Mon Sep 17 00:00:00 2001
From: Derek Finlinson <dcfinlinson@gmail.com>
Date: Tue, 15 Nov 2016 20:12:37 -0700
Subject: [PATCH 123/245] Correct SuccessCallbackDelegate parameter

---
 xrm/xrm.d.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/xrm/xrm.d.ts b/xrm/xrm.d.ts
index b78174523a..393594da19 100644
--- a/xrm/xrm.d.ts
+++ b/xrm/xrm.d.ts
@@ -489,13 +489,18 @@ declare namespace Xrm
             errorCode: number;
             message: string;
         }
+        
+        export interface SuccessCallbackObject
+        { 
+            savedEntityReference: Page.LookupValue;
+        }
 
         /**
          * Called when the operation is successful.
          * Currently, only the Xrm.Utility.openQuickCreate successCallback
          * is passed a parameter so an optional parameter for it is included
          */
-        export type SuccessCallbackDelegate = ( savedEntityReference?: Page.LookupValue ) => void;
+        export type SuccessCallbackDelegate = (object?: SuccessCallbackObject ) => void;
 
         /**
          * Called when the operation fails.

From 67ba8bbf82b139fcbf4f78971f7e75c39bf64e1e Mon Sep 17 00:00:00 2001
From: "Derek C. Finlinson" <derek.finlinson@journeyteam.com>
Date: Tue, 15 Nov 2016 20:16:36 -0700
Subject: [PATCH 124/245] Update openQuickCreate success test

---
 xrm/xrm-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xrm/xrm-tests.ts b/xrm/xrm-tests.ts
index 64fb9e8c22..68ed23abb1 100644
--- a/xrm/xrm-tests.ts
+++ b/xrm/xrm-tests.ts
@@ -72,7 +72,7 @@ if (Xrm.Page.data.process != null)
 
 /// Demonstrate v7.1 Quick Create form
 
-Xrm.Utility.openQuickCreate("account").then(( newRecord: Xrm.Page.LookupValue ) => { alert( `Newly created record Id: ${newRecord.id}` ); }, (error) => {console.log(`Code: ${error.errorCode}, Message: ${error.message}`)});
+Xrm.Utility.openQuickCreate("account").then(( object ) => { alert( `Newly created record Id: ${object.savedEntityReference.id}` ); }, (error) => {console.log(`Code: ${error.errorCode}, Message: ${error.message}`)});
 
 /// Make all controls visible.
 

From 0626316f99a24b696f9fb1b3b73bc218b9275036 Mon Sep 17 00:00:00 2001
From: Morgan Benton <registered@morphatic.com>
Date: Tue, 15 Nov 2016 22:27:50 -0500
Subject: [PATCH 125/245] update types for svgchart props

---
 d3kit/d3kit-tests.ts | 4 +++-
 d3kit/index.d.ts     | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/d3kit/d3kit-tests.ts b/d3kit/d3kit-tests.ts
index 70c9ba1672..f37da01fce 100644
--- a/d3kit/d3kit-tests.ts
+++ b/d3kit/d3kit-tests.ts
@@ -87,7 +87,9 @@ function test_svgchart() {
         options: d3kit.ChartOptions,
         margins: d3kit.ChartMargin,
         offsets: d3kit.ChartOffset,
-        svg: SVGElement, rootg: SVGElement, layers: d3kit.LayerOrganizer;
+        svg: d3.Selection<d3.BaseType, any, d3.BaseType, any>, 
+        rootg: d3.Selection<d3.BaseType, any, d3.BaseType, any>, 
+        layers: d3kit.LayerOrganizer;
 
     // create a div, append to body, return Node as type Element
     el = document.body.appendChild(document.createElement('div')) as Element;
diff --git a/d3kit/index.d.ts b/d3kit/index.d.ts
index 077cdb1ddf..18adf3c6c0 100644
--- a/d3kit/index.d.ts
+++ b/d3kit/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for d3Kit v3.1.1
+// Type definitions for d3Kit v3.1.2
 // Project: https://github.com/twitter/d3kit
 // Definitions by: Morgan Benton <https://github.com/morphatic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -78,8 +78,8 @@ export interface WatchOptions {
 }
 
 export class SvgChart extends AbstractChart {
-    svg: SVGElement;
-    rootG: SVGElement;
+    svg: d3.Selection<d3.BaseType, any, d3.BaseType, any>;
+    rootG: d3.Selection<d3.BaseType, any, d3.BaseType, any>;
     layers: LayerOrganizer;
     constructor(selector: string|Element, options?: ChartOptions);
 }

From 0bc0127fea5438ad72aea70fc5fd47168b9e6383 Mon Sep 17 00:00:00 2001
From: Noah Chen <nchen@palantir.com>
Date: Wed, 16 Nov 2016 00:11:31 -0500
Subject: [PATCH 126/245] Update `update-notifier` typings

---
 update-notifier/index.d.ts               | 66 ++++++++++++++----------
 update-notifier/update-notifier-tests.ts |  8 +--
 2 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/update-notifier/index.d.ts b/update-notifier/index.d.ts
index 9818b3aeab..4d102de3fd 100644
--- a/update-notifier/index.d.ts
+++ b/update-notifier/index.d.ts
@@ -3,33 +3,43 @@
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
-declare function t(settings?: t.ISettings): t.IResult;
-
-declare namespace t {
-
-    export interface IResult {
-        update: IUpdateInfo;
-        notify(message?: string): void;
-    }
-
-    export interface ISettings {
-        callback?: (error: any, update?: IUpdateInfo) => any; // default null
-        packagePath?: string; // default 'package.json'
-        packageName?: string; // default Inferred from packageFile
-        packageVersion?: string; // default Inferred from packageFile
-        updateCheckInterval?: number; // default 1000 * 60 * 60 * 24 (1 day)
-        updateCheckTimeout?: number; // default 20000 (20 secs)
-        registryUrl?: string; // default 'http://registry.npmjs.org/%s'
-    }
-
-    export interface IUpdateInfo {
-        latest: string;
-        current: string;
-        type: string;
-        date: string;
-        name: string;
-    }
+export interface ISettings {
+    pkg?: IPackage;
+    callback?: (update?: IUpdateInfo) => any;
+    packageName?: string; 
+    packageVersion?: string; 
+    updateCheckInterval?: number; // default 1000 * 60 * 60 * 24 (1 day)
 }
 
-export = t;
+export interface IBoxenOptions {
+    padding: number;
+    margin: number;
+    align: string;
+    borderColor: string;
+    borderStyle: string;
+}
+
+export interface INotifyOptions {
+    message: string;
+    defer?: boolean;
+    boxenOpts?: IBoxenOptions;
+}   
+
+export interface IPackage {
+    name: string;
+    version: string;
+}
+
+export interface IUpdateInfo {
+    latest: string;
+    current: string;
+    type: string;
+    name: string;
+}
+
+export declare class UpdateNotifier {
+    constructor(settings?: ISettings);
+    
+    update: IUpdateInfo;
+    notify(message?: INotifyOptions): void;
+}
diff --git a/update-notifier/update-notifier-tests.ts b/update-notifier/update-notifier-tests.ts
index 585f2c421e..0bca5a85ca 100644
--- a/update-notifier/update-notifier-tests.ts
+++ b/update-notifier/update-notifier-tests.ts
@@ -1,7 +1,7 @@
 
-import updateNotifier = require('update-notifier');
+import { UpdateNotifier } from "update-notifier";
 
-var notifier = updateNotifier();
+var notifier = new UpdateNotifier();
 
 if (notifier.update) {
 	notifier.notify();
@@ -9,10 +9,10 @@ if (notifier.update) {
 
 console.log(notifier.update);
 
-var notifier = updateNotifier({
+var notifier = new UpdateNotifier({
 	updateCheckInterval: 1000 * 60 * 60 * 24 * 7 // 1 week
 });
 
 if (notifier.update) {
-	notifier.notify('Update available: ' + notifier.update.latest);
+    notifier.notify({ message: 'Update available: ' + notifier.update.latest });
 }

From 2fb77a5dfb87b928801d061ee5232ad84a153870 Mon Sep 17 00:00:00 2001
From: pushplay <pushplay@gmail.com>
Date: Tue, 15 Nov 2016 21:27:43 -0800
Subject: [PATCH 127/245] Fix timespan typings in elasticsearch.

---
 elasticsearch/elasticsearch-tests.ts |  31 ++++-
 elasticsearch/index.d.ts             | 162 ++++++++++++++-------------
 2 files changed, 113 insertions(+), 80 deletions(-)

diff --git a/elasticsearch/elasticsearch-tests.ts b/elasticsearch/elasticsearch-tests.ts
index 62e45dfd58..c9be3c01ef 100644
--- a/elasticsearch/elasticsearch-tests.ts
+++ b/elasticsearch/elasticsearch-tests.ts
@@ -46,12 +46,12 @@ client.create({
 });
 
 client.cluster.getSettings({
-  masterTimeout: 100
+  masterTimeout: '100s'
 }, (err, response) => {
 });
 
 client.cluster.health({
-  masterTimeout: 100
+  masterTimeout: '100s'
 }, (err, response) => {
 });
 
@@ -208,6 +208,33 @@ client.suggest({
 }, function (error, response) {
 });
 
+
+// first we do a search, and specify a scroll timeout
+var allTitles: string[] = [];
+client.search({
+  index: 'myindex',
+  // Set to 30 seconds because we are calling right back
+  scroll: '30s',
+  searchType: 'query_then_fetch',
+  docvalueFields: ['title'],
+  q: 'title:test'
+}, function getMoreUntilDone(error, response) {
+  // collect the title from each response
+  response.hits.hits.forEach(function (hit) {
+    allTitles.push(hit.fields.title);
+  });
+
+  if (response.hits.total !== allTitles.length) {
+    // now we can call scroll over and over
+    client.scroll({
+      scrollId: response._scroll_id,
+      scroll: '30s'
+    }, getMoreUntilDone);
+  } else {
+    console.log('every "test" title', allTitles);
+  }
+});
+
 client.indices.updateAliases({
   body: {
     actions: [
diff --git a/elasticsearch/index.d.ts b/elasticsearch/index.d.ts
index d7df27565f..f3ac0992c6 100644
--- a/elasticsearch/index.d.ts
+++ b/elasticsearch/index.d.ts
@@ -131,8 +131,14 @@ declare module Elasticsearch {
         failed: number;
     }
 
+    /**
+     * A string of a number and a time unit.  A time unit is one of
+     * [d, h, m, s, ms, micros, nanos].  eg: "30s" for 30 seconds.
+     * These are incorrectly identified as `Date | number` in the docs as of 2016-11-15.
+     */
+    export type TimeSpan = string;
+
     export type NameList = string | string[] | boolean;
-    export type DateLike = Date | number;
     export type Refresh = boolean | "true" | "false" | "wait_for" | "";
     export type VersionType = "internal" | "external" | "external_gte" | "force";
     export type ExpandWildcards = "open" | "closed" | "none" | "all";
@@ -142,7 +148,7 @@ declare module Elasticsearch {
         waitForActiveShards?: string;
         refresh?: Refresh;
         routing?: string;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         type?: string;
         fields?: NameList;
         _source?: NameList;
@@ -183,9 +189,9 @@ declare module Elasticsearch {
         waitForActiveShards?: string;
         parent?: string;
         refresh?: Refresh;
-        timeout?: DateLike;
-        timestamp?: DateLike;
-        ttl?: DateLike;
+        timeout?: TimeSpan;
+        timestamp?: Date | number;
+        ttl?: TimeSpan;
         version?: number;
         versionType?: VersionType;
         pipeline?: string;
@@ -209,7 +215,7 @@ declare module Elasticsearch {
         parent?: string;
         refresh?: Refresh;
         routing?: string;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         version?: number;
         versionType?: VersionType;
         index: string;
@@ -232,7 +238,7 @@ declare module Elasticsearch {
         parent?: string;
         refresh?: Refresh;
         routing?: string;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         version?: number;
         versionType?: VersionType;
         index: string;
@@ -399,9 +405,9 @@ declare module Elasticsearch {
         parent?: string;
         refresh?: string;
         routing?: string;
-        timeout?: DateLike;
-        timestamp?: DateLike;
-        ttl?: DateLike;
+        timeout?: TimeSpan;
+        timestamp?: Date | number;
+        ttl?: TimeSpan;
         version?: number;
         versionType?: VersionType;
         pipeline?: string;
@@ -481,7 +487,7 @@ declare module Elasticsearch {
 
     export interface ReindexParams extends GenericParams {
         refresh?: boolean;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         waitForActiveShards?: string;
         waitForCompletion?: boolean;
         requestsPerSecond?: number;
@@ -537,7 +543,7 @@ declare module Elasticsearch {
     }
 
     export interface ScrollParams extends GenericParams {
-        scroll: DateLike;
+        scroll: TimeSpan;
         scrollId: string;
     }
 
@@ -559,7 +565,7 @@ declare module Elasticsearch {
         preference?: string;
         q?: string;
         routing?: NameList;
-        scroll?: DateLike;
+        scroll?: TimeSpan;
         searchType?: "query_then_fetch" | "dfs_query_then_fetch";
         size?: number;
         sort?: NameList;
@@ -572,7 +578,7 @@ declare module Elasticsearch {
         suggestMode?: "missing" | "popular" | "always";
         suggestSize?: number;
         suggestText?: string;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         trackScores?: boolean;
         version?: boolean;
         requestCache?: boolean;
@@ -638,7 +644,7 @@ declare module Elasticsearch {
         expandWildcards?: ExpandWildcards;
         preference?: string;
         routing?: NameList;
-        scroll?: DateLike;
+        scroll?: TimeSpan;
         searchType?: "query_then_fetch" | "query_and_fetch" | "dfs_query_then_fetch" | "dfs_query_and_fetch";
         index: NameList;
         type: NameList;
@@ -682,9 +688,9 @@ declare module Elasticsearch {
         refresh?: Refresh;
         retryOnConflict?: number;
         routing?: string;
-        timeout?: DateLike;
-        timestamp?: DateLike;
-        ttl?: DateLike;
+        timeout?: TimeSpan;
+        timestamp?: Date | number;
+        ttl?: TimeSpan;
         version?: number;
         versionType?: "internal" | "force";
         id: string;
@@ -712,9 +718,9 @@ declare module Elasticsearch {
         preference?: string;
         q?: string;
         routing?: NameList;
-        scroll?: DateLike;
+        scroll?: TimeSpan;
         searchType?: "query_then_fetch" | "dfs_query_then_fetch";
-        searchTimeout?: DateLike;
+        searchTimeout?: TimeSpan;
         size?: number;
         sort?: NameList;
         _source?: NameList;
@@ -726,7 +732,7 @@ declare module Elasticsearch {
         suggestMode?: "missing" | "popular" | "always";
         suggestSize?: number;
         suggestText?: string;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         trackScores?: boolean;
         version?: boolean;
         versionType?: boolean;
@@ -786,7 +792,7 @@ declare module Elasticsearch {
     export interface CatCommonParams extends GenericParams {
         format: string;
         local?: boolean;
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         h?: NameList;
         help?: boolean;
         v?: boolean;
@@ -828,7 +834,7 @@ declare module Elasticsearch {
     export interface CatRecoveryParams extends GenericParams {
         format: string;
         bytes?: CatBytes;
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         h?: NameList;
         help?: boolean;
         v?: boolean;
@@ -849,7 +855,7 @@ declare module Elasticsearch {
     export interface CatSnapshotsParams extends GenericParams {
         format: string;
         ignoreUnavailable?: boolean;
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         h?: NameList;
         help?: boolean;
         v?: boolean;
@@ -899,15 +905,15 @@ declare module Elasticsearch {
 
     export interface ClusterGetSettingsParams extends GenericParams {
         flatSettings?: boolean;
-        masterTimeout?: DateLike;
-        timeout?: DateLike;
+        masterTimeout?: TimeSpan;
+        timeout?: TimeSpan;
         includeDefaults?: boolean;
     }
 
     export interface ClusterHealthParams extends GenericParams {
         level?: "cluster" | "indices" | "shards";
         local?: boolean;
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         waitForActiveShards?: string;
         waitForNodes?: string;
         waitForEvents?: "immediate" | "urgent" | "high" | "normal" | "low" | "languid";
@@ -918,13 +924,13 @@ declare module Elasticsearch {
 
     export interface ClusterPendingTasksParams extends GenericParams {
         local?: boolean;
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
     }
 
     export interface ClusterPutSettingsParams extends GenericParams {
         flatSettings?: boolean;
-        masterTimeout?: DateLike;
-        timeout?: DateLike;
+        masterTimeout?: TimeSpan;
+        timeout?: TimeSpan;
     }
 
     export interface ClusterRerouteParams extends GenericParams {
@@ -932,13 +938,13 @@ declare module Elasticsearch {
         explain?: boolean;
         retryFailed?: boolean;
         metric?: NameList;
-        masterTimeout?: DateLike;
-        timeout?: DateLike;
+        masterTimeout?: TimeSpan;
+        timeout?: TimeSpan;
     }
 
     export interface ClusterStateParams extends GenericParams {
         local?: boolean;
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         flatSettings?: boolean;
         ignoreUnavailable?: boolean;
         allowNoIndices?: boolean;
@@ -950,7 +956,7 @@ declare module Elasticsearch {
     export interface ClusterStatsParams extends GenericParams {
         flatSettings?: boolean;
         human?: boolean;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         nodeId?: NameList;
     }
 
@@ -1057,8 +1063,8 @@ declare module Elasticsearch {
     }
 
     export interface IndicesCloseParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         ignoreUnavailable?: boolean;
         allowNoIndices?: boolean;
         expandWildcards?: ExpandWildcards;
@@ -1067,28 +1073,28 @@ declare module Elasticsearch {
 
     export interface IndicesCreateParams extends GenericParams {
         waitForActiveShards?: string;
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         updateAllTypes?: boolean;
         index: string;
     }
 
     export interface IndicesDeleteParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         index: NameList;
     }
 
     export interface IndicesDeleteAliasParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         index: NameList;
         name: NameList;
     }
 
     export interface IndicesDeleteTemplateParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         name: string;
     }
 
@@ -1105,8 +1111,8 @@ declare module Elasticsearch {
     }
 
     export interface IndicesExistsTemplateParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         name: NameList;
     }
 
@@ -1197,7 +1203,7 @@ declare module Elasticsearch {
 
     export interface IndicesGetTemplateParams extends GenericParams {
         flatSettings?: boolean;
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         local?: boolean;
         name?: NameList;
     }
@@ -1211,8 +1217,8 @@ declare module Elasticsearch {
     }
 
     export interface IndicesOpenParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         ignoreUnavailable?: boolean;
         allowNoIndices?: boolean;
         expandWildcards?: ExpandWildcards;
@@ -1220,15 +1226,15 @@ declare module Elasticsearch {
     }
 
     export interface IndicesPutAliasParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         index?: NameList;
         name: NameList;
     }
 
     export interface IndicesPutMappingParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         ignoreUnavailable?: boolean;
         allowNoIndices?: boolean;
         expandWildcards?: ExpandWildcards;
@@ -1239,7 +1245,7 @@ declare module Elasticsearch {
     }
 
     export interface IndicesPutSettingsParams extends GenericParams {
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         preserveExisting?: boolean;
         ignoreUnavailable?: boolean;
         allowNoIndices?: boolean;
@@ -1252,8 +1258,8 @@ declare module Elasticsearch {
     export interface IndicesPutTemplateParams extends GenericParams {
         order?: number;
         create?: boolean;
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         flatSettings?: boolean;
         name: string;
         body: any;
@@ -1276,8 +1282,8 @@ declare module Elasticsearch {
     }
 
     export interface IndicesRolloverParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         waitForActiveShards?: number | string;
         alias?: string;
         newIndex?: string;
@@ -1313,8 +1319,8 @@ declare module Elasticsearch {
     }
 
     export interface IndicesShrinkParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         waitForActiveShards?: string | number;
         index: string;
         target: string;
@@ -1333,8 +1339,8 @@ declare module Elasticsearch {
     }
 
     export interface IndicesUpdateAliasesParams extends GenericParams {
-        timeout?: DateLike;
-        masterTimeout?: DateLike;
+        timeout?: TimeSpan;
+        masterTimeout?: TimeSpan;
         body: {
             actions: IndicesUpdateAliasesParamsAction[];
         }
@@ -1426,19 +1432,19 @@ declare module Elasticsearch {
     }
 
     export interface NodesHotThreadsParams extends GenericParams {
-        interval?: DateLike;
+        interval?: TimeSpan;
         snapshots?: number;
         threads?: number;
         ignoreIdleThreads?: boolean;
         type?: "cpu" | "wait" | "blocked";
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         nodeId: NameList;
     }
 
     export interface NodesInfoParams extends GenericParams {
         flatSettings?: boolean;
         human?: boolean;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         nodeId: NameList;
         metric?: NameList;
     }
@@ -1451,7 +1457,7 @@ declare module Elasticsearch {
         human?: boolean;
         level?: "indices" | "node" | "shards";
         types?: NameList;
-        timeout?: DateLike;
+        timeout?: TimeSpan;
         metric?: NameList;
         indexMetric?: NameList;
         nodeId?: NameList;
@@ -1479,61 +1485,61 @@ declare module Elasticsearch {
     }
 
     export interface SnapshotCreateParams extends GenericParams {
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         waitForCompletion?: boolean;
         repository: string;
         snapshot: string;
     }
 
     export interface SnapshotCreateRepositoryParams extends GenericParams {
-        masterTimeout?: DateLike;
-        timeout?: DateLike;
+        masterTimeout?: TimeSpan;
+        timeout?: TimeSpan;
         verify?: boolean;
         repository: string;
     }
 
     export interface SnapshotDeleteParams extends GenericParams {
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         repository: string;
         snapshot: string;
     }
 
     export interface SnapshotDeleteRepositoryParams extends GenericParams {
-        masterTimeout?: DateLike;
-        timeout?: DateLike;
+        masterTimeout?: TimeSpan;
+        timeout?: TimeSpan;
         repository: string;
     }
 
     export interface SnapshotGetParams extends GenericParams {
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         ignoreUnavailable?: boolean;
         repository: string;
         snapshot: NameList;
     }
 
     export interface SnapshotGetRepositoryParams extends GenericParams {
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         local?: boolean;
         repository: NameList;
     }
 
     export interface SnapshotRestoreParams extends GenericParams {
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         waitForCompletion?: boolean;
         repository: string;
         snapshot: string;
     }
 
     export interface SnapshotStatusParams extends GenericParams {
-        masterTimeout?: DateLike;
+        masterTimeout?: TimeSpan;
         ignoreUnavailable?: boolean;
         repository: string;
         snapshot: NameList;
     }
 
     export interface SnapshotVerifyRepositoryParams extends GenericParams {
-        masterTimeout?: DateLike;
-        timeout?: DateLike;
+        masterTimeout?: TimeSpan;
+        timeout?: TimeSpan;
         repository: string;
     }
 

From 8a087da260f4d46ab13450cf531417b940c11797 Mon Sep 17 00:00:00 2001
From: Ushio Shugo <ushio.s@gmail.com>
Date: Wed, 16 Nov 2016 17:07:03 +0900
Subject: [PATCH 128/245] Add extraHeaders option to
 socket.io-client.ConnectOpts.

---
 socket.io-client/index.d.ts | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/socket.io-client/index.d.ts b/socket.io-client/index.d.ts
index f4aef879a8..0859c58e08 100644
--- a/socket.io-client/index.d.ts
+++ b/socket.io-client/index.d.ts
@@ -611,6 +611,11 @@ declare namespace SocketIOClient {
 		 */
 		onlyBinaryUpgrades?: boolean;
 
+		/**
+		 * Header options for Node.js client
+		 */
+		extraHeaders?: Object;
+
 		/**
 		 * (SSL) Certificate, Private key and CA certificates to use for SSL.
 		 * Can be used in Node.js client environment to manually specify

From 7f912d1af6ebacd5332c98473c139d236150cd59 Mon Sep 17 00:00:00 2001
From: Alan Agius <alan.agius4@gmail.com>
Date: Wed, 16 Nov 2016 09:11:54 +0100
Subject: [PATCH 129/245] feat(fuse-js): update types as per version 2.5.0

---
 fuse/fuse.d.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/fuse/fuse.d.ts b/fuse/fuse.d.ts
index 9f1de6ff03..5376144e22 100644
--- a/fuse/fuse.d.ts
+++ b/fuse/fuse.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Fuse.js 2.2.0
+// Type definitions for Fuse.js 2.5.0
 // Project: https://github.com/krisk/Fuse
 // Definitions by: Greg Smith <https://github.com/smrq/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,7 +9,8 @@ declare class Fuse {
 }
 
 declare namespace fuse {
-	interface IFuseOptions extends ISearchOptions {
+	interface IFuseOptions {
+		id?: string;
 		caseSensitive?: boolean;
 		include?: string[];
 		shouldSort?: boolean;
@@ -18,9 +19,9 @@ declare namespace fuse {
 		getFn?: (obj: any, path: string) => any;
 		keys?: string[] | { name:string; weight:number} [];
         	verbose?:boolean;
-	}
-
-	interface ISearchOptions {
+		tokenize?: boolean;
+		tokenSeparator? : RegExp;
+		matchAllTokens?: boolean;
 		location?: number;
 		distance?: number;
 		threshold?: number;

From 7afa33f2d9e1893839d015ca5a8cdd914ac041f6 Mon Sep 17 00:00:00 2001
From: Marvin Bredal Lillehaug <marvin.lillehaug@kantega.no>
Date: Wed, 16 Nov 2016 09:45:40 +0100
Subject: [PATCH 130/245] Added rowSelection property

---
 react-data-grid/react-data-grid.d.ts | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/react-data-grid/react-data-grid.d.ts b/react-data-grid/react-data-grid.d.ts
index 0748270a57..20d5b72b6a 100644
--- a/react-data-grid/react-data-grid.d.ts
+++ b/react-data-grid/react-data-grid.d.ts
@@ -8,7 +8,10 @@
 
 declare namespace AdazzleReactDataGrid {
     import React = __React;
-
+    interface __SelectionParams {
+        rowIdx: number,
+        row: any
+    }
     interface GridProps {
         /**
          * Gets the data to render in each row. Required.
@@ -173,6 +176,20 @@ declare namespace AdazzleReactDataGrid {
          * @default 0
          */
         rowScrollTimeout?: number
+        /**
+         * Options object for selecting rows
+         */
+        rowSelection?: {
+            showCheckbox?: boolean
+            enableShiftSelect?: boolean
+            onRowsSelected?: (rows: Array<__SelectionParams>) => void,
+            onRowsDeselected?: (rows: Array<__SelectionParams>) => void,
+            selectBy?: {
+                indexes?: Array<number>
+                keys: { rowKey: string, values: Array<any> }
+                isSelectedKey: string
+            }
+        }
     }
 
     /**

From 8827725a2e254b5e0dd0b6c5ff2955d9523872f4 Mon Sep 17 00:00:00 2001
From: Greg Deane <greg.james.deane@zalando.de>
Date: Wed, 16 Nov 2016 10:17:55 +0100
Subject: [PATCH 131/245] refactor(types): add new user service url

---
 solution-center-communicator/index.d.ts                    | 7 ++++++-
 .../solution-center-communicator-tests.ts                  | 4 +++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/solution-center-communicator/index.d.ts b/solution-center-communicator/index.d.ts
index 5351e7f72e..fbd821872b 100644
--- a/solution-center-communicator/index.d.ts
+++ b/solution-center-communicator/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Solution Center Communicator 2.2.0
+// Type definitions for Solution Center Communicator 2.3.0
 // Project: https://github.com/zalando-incubator/solution-center-communicator
 // Definitions by: Damián García <https://github.com/dami-gg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -50,6 +50,11 @@ declare namespace ScCommunicator {
      * URL where to reach the module service API
      */
     MODULE_SERVICE?: string;
+
+    /**
+     * URL where to reach the new user service API
+     */
+    USER_SERVICE_NEW?: string;
   }
 
   interface Environments {
diff --git a/solution-center-communicator/solution-center-communicator-tests.ts b/solution-center-communicator/solution-center-communicator-tests.ts
index f3822db4ed..c57682794e 100644
--- a/solution-center-communicator/solution-center-communicator-tests.ts
+++ b/solution-center-communicator/solution-center-communicator-tests.ts
@@ -7,7 +7,9 @@ var environment: ScCommunicator.Environment = {
   PORT: '',
   USER_SERVICE: 'https://um.norris.test.zalan.do',
   TOKEN_SERVICE: 'https://tm.norris.test.zalan.do',
-  MODULE_SERVICE: 'https://ms.norris.test.zalan.do'
+  MERCHANT_SERVICE: 'https://merch.norris.test.zalan.do',
+  MODULE_SERVICE: 'https://ms.norris.test.zalan.do',
+  USER_SERVICE_NEW: 'https://us2.norris.test.zalan.do'
 };
 
 var environments: ScCommunicator.Environments;

From 2bdf986666196e54f7b230476b5509c71288d47d Mon Sep 17 00:00:00 2001
From: Fedor Nezhivoi <gyzerok@gmail.com>
Date: Wed, 16 Nov 2016 11:13:37 +0200
Subject: [PATCH 132/245] fix type definitions for prop injection

---
 react-intl/index.d.ts           | 22 +++++++++----------
 react-intl/react-intl-tests.tsx | 38 +++++++++++++++++++--------------
 2 files changed, 33 insertions(+), 27 deletions(-)

diff --git a/react-intl/index.d.ts b/react-intl/index.d.ts
index 76df84469e..1d6412defa 100644
--- a/react-intl/index.d.ts
+++ b/react-intl/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for react-intl 2.0.0
+// Type definitions for react-intl 2.1.5
 // Project: http://formatjs.io/react/
-// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Christian Droulers <https://github.com/cdroulers>
+// Definitions by: Bruno Grieder <https://github.com/bgrieder>, Christian Droulers <https://github.com/cdroulers>, Fedor Nezhivoi <https://github.com/gyzerok>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 ///<reference types="react" />
@@ -12,7 +12,7 @@ declare namespace ReactIntl {
         pluralRuleFunction?: (n: number, ord: boolean) => string;
     }
 
-    function injectIntl<T>(clazz: T): T;
+    function injectIntl<TOriginalProps, TOwnProps>(component: React.ComponentClass<TOriginalProps> | React.StatelessComponent<TOriginalProps>): React.ComponentClass<TOwnProps>;
 
     function addLocaleData(data: Locale[] | Locale): void;
 
@@ -34,14 +34,14 @@ declare namespace ReactIntl {
         formats?: any;
     }
 
-    interface InjectedIntlProps {
-        formatDate?: (date: Date, options?: FormattedDate.PropsBase) => string;
-        formatTime?: (date: Date, options?: FormattedTime.PropsBase) => string;
-        formatRelative?: (value: number, options?: FormattedRelative.PropsBase) => string;
-        formatNumber?: (value: number, options?: FormattedNumber.PropsBase) => string;
-        formatPlural?: (value: number, options?: FormattedPlural.PropsBase) => string;
-        formatMessage?: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
-        formatHTMLMessage?: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
+    interface InjectedIntl {
+        formatDate: (date: Date, options?: FormattedDate.PropsBase) => string;
+        formatTime: (date: Date, options?: FormattedTime.PropsBase) => string;
+        formatRelative: (value: number, options?: FormattedRelative.PropsBase) => string;
+        formatNumber: (value: number, options?: FormattedNumber.PropsBase) => string;
+        formatPlural: (value: number, options?: FormattedPlural.PropsBase) => string;
+        formatMessage: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
+        formatHTMLMessage: (messageDescriptor: FormattedMessage.MessageDescriptor, values?: Object) => string;
     }
 
     namespace IntlComponent {
diff --git a/react-intl/react-intl-tests.tsx b/react-intl/react-intl-tests.tsx
index f140dd95d1..cd484c17b4 100644
--- a/react-intl/react-intl-tests.tsx
+++ b/react-intl/react-intl-tests.tsx
@@ -1,5 +1,6 @@
 /**
  * Created by Bruno Grieder and Christian Droulers
+ * Updated by Fedor Nezhivoi
  */
 
 ///<reference types="react" />
@@ -9,7 +10,7 @@ import * as reactMixin from "react-mixin"
 
 import {
 IntlProvider,
-InjectedIntlProps,
+InjectedIntl,
 addLocaleData,
 hasLocaleData,
 injectIntl,
@@ -29,22 +30,23 @@ import reactIntlEn = require("react-intl/locale-data/en");
 addLocaleData(reactIntlEn);
 console.log(hasLocaleData("en"));
 
-interface SomeComponentProps extends InjectedIntlProps {
-
+interface SomeComponentProps {
+  intl: InjectedIntl
 }
 
-class SomeComponent extends React.Component<SomeComponentProps, {}> {
+class SomeComponent extends React.Component<SomeComponentProps, void> {
     static propTypes: React.ValidationMap<any> = {
         intl: intlShape.isRequired
     };
     public render(): React.ReactElement<{}> {
-        const formattedDate = this.props.formatDate(new Date(), { format: "short" });
-        const formattedTime = this.props.formatTime(new Date(), { format: "short" });
-        const formattedRelative = this.props.formatRelative(new Date().getTime(), { format: "short" });
-        const formattedNumber = this.props.formatNumber(123, { format: "short" });
-        const formattedPlural = this.props.formatPlural(1, { one: "hai!" });
-        const formattedMessage = this.props.formatMessage({ id: "hello", defaultMessage: "Hello {name}!" }, { name: "Roger" });
-        const formattedHTMLMessage = this.props.formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{name}</strong>!" }, { name: "Roger" });
+        const intl = this.props.intl;
+        const formattedDate = intl.formatDate(new Date(), { format: "short" });
+        const formattedTime = intl.formatTime(new Date(), { format: "short" });
+        const formattedRelative = intl.formatRelative(new Date().getTime(), { format: "short" });
+        const formattedNumber = intl.formatNumber(123, { format: "short" });
+        const formattedPlural = intl.formatPlural(1, { one: "hai!" });
+        const formattedMessage = intl.formatMessage({ id: "hello", defaultMessage: "Hello {name}!" }, { name: "Roger" });
+        const formattedHTMLMessage = intl.formatHTMLMessage({ id: "hello", defaultMessage: "Hello <strong>{name}</strong>!" }, { name: "Roger" });
         return <div>
             <FormattedRelative
                 value={new Date().getTime() }
@@ -142,6 +144,8 @@ class SomeComponent extends React.Component<SomeComponentProps, {}> {
     }
 }
 
+const SomeComponentWithIntl = injectIntl(SomeComponent);
+
 class TestApp extends React.Component<{}, {}> {
     public render(): React.ReactElement<{}> {
         const definedMessages = defineMessages({
@@ -153,14 +157,16 @@ class TestApp extends React.Component<{}, {}> {
 
         const messages = {
             "hello": "Hello, {name}!"
-        }
-        return (<IntlProvider locale="en" formats={{}} messages={messages} defaultLocale="en" defaultFormats={messages}>
-            <SomeComponent />
-            </IntlProvider>)
+        };
+        return (
+          <IntlProvider locale="en" formats={{}} messages={messages} defaultLocale="en" defaultFormats={messages}>
+            <SomeComponentWithIntl />
+          </IntlProvider>
+        );
     }
 }
 
 export default {
     TestApp,
-    SomeComponent: injectIntl(SomeComponent)
+    SomeComponent: SomeComponentWithIntl
 }

From 896d675b6d9dae75656e499a80ae733d904350bb Mon Sep 17 00:00:00 2001
From: Marvin Bredal Lillehaug <marvin.lillehaug@kantega.no>
Date: Wed, 16 Nov 2016 11:00:48 +0100
Subject: [PATCH 133/245] Updated tests for react-data-grid

---
 react-data-grid/react-data-grid-tests.tsx | 21 +++++++++++++++++++++
 react-data-grid/react-data-grid.d.ts      | 15 +++++++++------
 2 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/react-data-grid/react-data-grid-tests.tsx b/react-data-grid/react-data-grid-tests.tsx
index 1b95fa8cc7..1895e1781e 100644
--- a/react-data-grid/react-data-grid-tests.tsx
+++ b/react-data-grid/react-data-grid-tests.tsx
@@ -247,7 +247,19 @@ class Example extends React.Component<any, any> {
         return this.state.rows.length;
     }
 
+    onRowsSelected(rows: Array<ReactDataGrid.SelectionParams>) {
+        var selectedIndexes = this.state.selectedIndexes as Array<number>;
+
+        this.setState({selectedIndexes: selectedIndexes.concat(rows.map(r => r.rowIdx))});
+    }
+    onRowsDeselected(rows: Array<ReactDataGrid.SelectionParams>) {
+        var rowIndexes = rows.map(r => r.rowIdx);
+        var selectedIndexes = this.state.selectedIndexes as Array<number>;
+        this.setState({selectedIndexes: selectedIndexes.filter(i => rowIndexes.indexOf(i) === -1 )});
+    }
+
     render() {
+        let selectedRows = ['id1', 'id2'];
         return (
             <ReactDataGrid
                 ref='grid'
@@ -261,6 +273,15 @@ class Example extends React.Component<any, any> {
                 rowHeight={50}
                 minHeight={600}
                 rowScrollTimeout={200}
+                rowSelection={{
+                    showCheckbox: true,
+                    enableShiftSelect: true,
+                    onRowsSelected: this.onRowsSelected,
+                    onRowsDeselected: this.onRowsDeselected,
+                    selectBy: {
+                        keys: {rowKey: 'id', values: selectedRows}
+                    }
+                }}
             />
 
         );
diff --git a/react-data-grid/react-data-grid.d.ts b/react-data-grid/react-data-grid.d.ts
index 20d5b72b6a..0c512c9c70 100644
--- a/react-data-grid/react-data-grid.d.ts
+++ b/react-data-grid/react-data-grid.d.ts
@@ -8,10 +8,12 @@
 
 declare namespace AdazzleReactDataGrid {
     import React = __React;
-    interface __SelectionParams {
+
+    interface SelectionParams {
         rowIdx: number,
         row: any
     }
+
     interface GridProps {
         /**
          * Gets the data to render in each row. Required.
@@ -182,12 +184,12 @@ declare namespace AdazzleReactDataGrid {
         rowSelection?: {
             showCheckbox?: boolean
             enableShiftSelect?: boolean
-            onRowsSelected?: (rows: Array<__SelectionParams>) => void,
-            onRowsDeselected?: (rows: Array<__SelectionParams>) => void,
+            onRowsSelected?: (rows: Array<SelectionParams>) => void,
+            onRowsDeselected?: (rows: Array<SelectionParams>) => void,
             selectBy?: {
-                indexes?: Array<number>
-                keys: { rowKey: string, values: Array<any> }
-                isSelectedKey: string
+                indexes?: Array<number>;
+                keys?: { rowKey: string, values: Array<any> };
+                isSelectedKey?: string;
             }
         }
     }
@@ -413,6 +415,7 @@ declare namespace AdazzleReactDataGrid {
 
         // Various events
         export import RowUpdateEvent = AdazzleReactDataGrid.RowUpdateEvent;
+        export import SelectionParams = AdazzleReactDataGrid.SelectionParams;
         export import CellDragEvent = AdazzleReactDataGrid.CellDragEvent;
         export import DragHandleDoubleClickEvent = AdazzleReactDataGrid.DragHandleDoubleClickEvent;
         export import CellCopyPasteEvent = AdazzleReactDataGrid.CellCopyPasteEvent;

From 7bf1a7fb2cae3df889e4f1228aa379d771f49021 Mon Sep 17 00:00:00 2001
From: Philip Ottesen <philip.ottesen@yodle.com>
Date: Wed, 16 Nov 2016 10:18:59 -0500
Subject: [PATCH 134/245] Adding optional theme parameters, optional onBlur
 with focusedSuggestion, setting strictNullChecks = true

---
 react-autosuggest/react-autosuggest-tests.tsx | 13 +++++--
 react-autosuggest/react-autosuggest.d.ts      | 35 ++++++++++++-------
 react-autosuggest/tsconfig.json               |  2 +-
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/react-autosuggest/react-autosuggest-tests.tsx b/react-autosuggest/react-autosuggest-tests.tsx
index 5a107fe525..d3d4278829 100644
--- a/react-autosuggest/react-autosuggest-tests.tsx
+++ b/react-autosuggest/react-autosuggest-tests.tsx
@@ -55,12 +55,21 @@ export class ReactAutosuggestBasicTest extends React.Component<any, any> {
             onChange: this.onChange.bind(this)
         };
 
+        const theme = {
+            input: 'themed-input-class',
+            container: 'themed-container-class',
+            suggestionFocused: 'active'
+        }
+
         return <Autosuggest suggestions={suggestions}
                             onSuggestionsUpdateRequested={this.onSuggestionsUpdateRequested.bind(this)}
                             getSuggestionValue={this.getSuggestionValue}
                             renderSuggestion={this.renderSuggestion}
                             onSuggestionSelected={this.onSuggestionsSelected}
-                            inputProps={inputProps}/>;
+                            alwaysRenderSuggestions={true}
+                            inputProps={inputProps}
+                            theme={theme}
+                            />;
     }
 
     protected onSuggestionsSelected(event: React.FormEvent<any>, data: ReactAutosuggest.ExplicitSuggestionSelectedEventData<Language>): void {
@@ -306,7 +315,7 @@ export class ReactAutosuggestCustomTest extends React.Component<any, any> {
             <span className="name">
             {
                 parts.map((part, index) => {
-                    const className = part.highlight ? 'highlight' : null;
+                    const className = part.highlight ? 'highlight' : undefined;
 
                     return <span className={className} key={index}>{part.text}</span>;
                     })
diff --git a/react-autosuggest/react-autosuggest.d.ts b/react-autosuggest/react-autosuggest.d.ts
index cfec62d047..1a144ea44f 100644
--- a/react-autosuggest/react-autosuggest.d.ts
+++ b/react-autosuggest/react-autosuggest.d.ts
@@ -16,14 +16,24 @@ declare namespace ReactAutosuggest {
     valueBeforeUpDown?: string;
   }
 
+  interface ChangeEvent {
+    newValue: string;
+    method: 'down' | 'up' | 'escape' | 'enter' | 'click' | 'type';
+  }
+
+  interface BlurEvent {
+    focusedSuggestion: any;
+  }
+
   interface InputProps extends React.HTMLAttributes<any> {
     value: string;
-    onChange: (event: React.FormEvent<any>, params?: {newValue: string, method: string}) => void;
+    onChange: (event: React.FormEvent<any>, params?: ChangeEvent) => void;
+    onBlur?: (event: React.FormEvent<any>, params?: BlurEvent) => void;
   }
 
   interface ExplicitSuggestionSelectedEventData<TSuggestion> {
-    method: string;
-    sectionIndex: number;
+    method: 'click' | 'enter';
+    sectionIndex: number | null;
     suggestion: TSuggestion;
     suggestionValue: string;
   }
@@ -32,15 +42,15 @@ declare namespace ReactAutosuggest {
   }
 
   interface Theme {
-    container: string;
-    containerOpen: string;
-    input: string;
-    sectionContainer: string;
-    sectionSuggestionsContainer: string;
-    sectionTitle: string;
-    suggestion: string;
-    suggestionFocused: string;
-    suggestionsContainer: string;
+    container?: string;
+    containerOpen?: string;
+    input?: string;
+    sectionContainer?: string;
+    sectionSuggestionsContainer?: string;
+    sectionTitle?: string;
+    suggestion?: string;
+    suggestionFocused?: string;
+    suggestionsContainer?: string;
   }
 
   interface AutosuggestProps extends React.Props<Autosuggest> {
@@ -49,6 +59,7 @@ declare namespace ReactAutosuggest {
     getSuggestionValue: (suggestion: any) => string;
     renderSuggestion: (suggestion: any, inputValues: InputValues) => JSX.Element;
     inputProps: InputProps;
+    alwaysRenderSuggestions?: boolean;
     shouldRenderSuggestions?: (value: string) => boolean;
     multiSection?: boolean;
     renderSectionTitle?: (section: any, inputValues: InputValues) => JSX.Element;
diff --git a/react-autosuggest/tsconfig.json b/react-autosuggest/tsconfig.json
index 3f2805e714..c7b874872f 100644
--- a/react-autosuggest/tsconfig.json
+++ b/react-autosuggest/tsconfig.json
@@ -3,7 +3,7 @@
         "module": "commonjs",
         "target": "es6",
         "noImplicitAny": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"

From bcf581c29925fe19dd6445856ce9787425565524 Mon Sep 17 00:00:00 2001
From: maghis <massimoandreasi@gmail.com>
Date: Wed, 16 Nov 2016 10:30:28 -0500
Subject: [PATCH 135/245] Added Buffers as return types of zlib helpers

---
 node/index.d.ts    | 28 +++++++--------
 node/node-tests.ts | 85 +++++++++++++++++++++++++++-------------------
 2 files changed, 64 insertions(+), 49 deletions(-)

diff --git a/node/index.d.ts b/node/index.d.ts
index c9f672ec9f..e46694d236 100644
--- a/node/index.d.ts
+++ b/node/index.d.ts
@@ -1045,20 +1045,20 @@ declare module "zlib" {
     export function createInflateRaw(options?: ZlibOptions): InflateRaw;
     export function createUnzip(options?: ZlibOptions): Unzip;
 
-    export function deflate(buf: Buffer, callback: (error: Error, result: any) => void): void;
-    export function deflateSync(buf: Buffer, options?: ZlibOptions): any;
-    export function deflateRaw(buf: Buffer, callback: (error: Error, result: any) => void): void;
-    export function deflateRawSync(buf: Buffer, options?: ZlibOptions): any;
-    export function gzip(buf: Buffer, callback: (error: Error, result: any) => void): void;
-    export function gzipSync(buf: Buffer, options?: ZlibOptions): any;
-    export function gunzip(buf: Buffer, callback: (error: Error, result: any) => void): void;
-    export function gunzipSync(buf: Buffer, options?: ZlibOptions): any;
-    export function inflate(buf: Buffer, callback: (error: Error, result: any) => void): void;
-    export function inflateSync(buf: Buffer, options?: ZlibOptions): any;
-    export function inflateRaw(buf: Buffer, callback: (error: Error, result: any) => void): void;
-    export function inflateRawSync(buf: Buffer, options?: ZlibOptions): any;
-    export function unzip(buf: Buffer, callback: (error: Error, result: any) => void): void;
-    export function unzipSync(buf: Buffer, options?: ZlibOptions): any;
+    export function deflate(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function deflateSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function deflateRaw(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function deflateRawSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function gzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function gzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function gunzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function gunzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function inflate(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function inflateSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function inflateRaw(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function inflateRawSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function unzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
+    export function unzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
 
     // Constants
     export var Z_NO_FLUSH: number;
diff --git a/node/node-tests.ts b/node/node-tests.ts
index 4083c826ae..506616ae87 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -33,33 +33,33 @@ import {Buffer as ImportedBuffer, SlowBuffer as ImportedSlowBuffer} from "buffer
 namespace assert_tests {
     {
         assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
-        
+
         assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
-        
+
         assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
-        
+
         assert.doesNotThrow(() => {
             const b = false;
             if (b) { throw "a hammer at your face"; }
         }, undefined, "What the...*crunch*");
-        
+
         assert.equal(3, "3", "uses == comparator");
 
         assert.fail(1, 2, undefined, '>');
-        
+
         assert.ifError(0);
-        
+
         assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
-        
+
         assert.notEqual(1, 2, "uses != comparator");
-        
+
         assert.notStrictEqual(2, "2", "uses === comparator");
-        
+
         assert.ok(true);
         assert.ok(1);
-        
+
         assert.strictEqual(1, 1,  "uses === comparator");
-        
+
         assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
     }
 }
@@ -139,21 +139,21 @@ namespace fs_tests {
         fs.writeFile("thebible.txt",
             "Do unto others as you would have them do unto you.",
             assert.ifError);
-        
+
         fs.write(1234, "test");
-        
+
         fs.writeFile("Harry Potter",
             "\"You be wizzing, Harry,\" jived Dumbledore.",
             {
                 encoding: "ascii"
             },
-            assert.ifError);	
+            assert.ifError);
     }
 
     {
         var content: string;
         var buffer: Buffer;
-        
+
         content = fs.readFileSync('testfile', 'utf8');
         content = fs.readFileSync('testfile', { encoding: 'utf8' });
         buffer = fs.readFileSync('testfile');
@@ -163,7 +163,7 @@ namespace fs_tests {
         fs.readFile('testfile', (err, data) => buffer = data);
         fs.readFile('testfile', { flag: 'r' }, (err, data) => buffer = data);
     }
-    
+
     {
         var errno: string;
         fs.readFile('testfile', (err, data) => {
@@ -172,28 +172,28 @@ namespace fs_tests {
             }
         });
     }
-    
+
     {
         fs.mkdtemp('/tmp/foo-', (err, folder) => {
             console.log(folder);
             // Prints: /tmp/foo-itXde2
         });
     }
-    
+
     {
         var tempDir: string;
         tempDir = fs.mkdtempSync('/tmp/foo-');
     }
-    
+
     {
         fs.watch('/tmp/foo-', (event, filename) => {
           console.log(event, filename);
         });
-        
+
         fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
           console.log(event, filename);
         });
-        
+
         fs.watch('/tmp/foo-', {
           recursive: true,
           persistent: true,
@@ -202,22 +202,22 @@ namespace fs_tests {
           console.log(event, filename);
         });
     }
-    
+
     {
         fs.access('/path/to/folder', (err) => { });
-        
+
         fs.access(Buffer.from(''), (err) => { });
-        
+
         fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => { });
-        
+
         fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => { });
-        
+
         fs.accessSync('/path/to/folder');
-        
+
         fs.accessSync(Buffer.from(''));
-        
+
         fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK);
-        
+
         fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK);
     }
 }
@@ -386,14 +386,14 @@ function bufferTests() {
 namespace url_tests {
     {
         url.format(url.parse('http://www.example.com/xyz'));
-        
+
         // https://google.com/search?q=you're%20a%20lizard%2C%20gary
         url.format({
             protocol: 'https',
             host: "google.com",
             pathname: 'search',
             query: { q: "you're a lizard, gary" }
-        });   
+        });
     }
 
     {
@@ -410,7 +410,7 @@ namespace util_tests {
     {
         // Old and new util.inspect APIs
         util.inspect(["This is nice"], false, 5);
-        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });    
+        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
     }
 }
 
@@ -427,6 +427,21 @@ function stream_readable_pipe_test() {
     r.close();
 }
 
+// helpers
+const compressMe = new Buffer("some data");
+
+zlib.deflate(compressMe, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
+const inflated = zlib.inflateSync(zlib.deflateSync(compressMe));
+
+zlib.deflateRaw(compressMe, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
+const inflatedRaw: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMe));
+
+zlib.gzip(compressMe, (err: Error, result: Buffer) => zlib.gunzip(result, (err: Error, result: Buffer) => result));
+const gunzipped: Buffer = zlib.gunzipSync(zlib.gzipSync(compressMe));
+
+zlib.unzip(compressMe, (err: Error, result: Buffer) => result);
+const unzipped: Buffer = zlib.unzipSync(compressMe);
+
 // Simplified constructors
 function simplified_stream_ctor_test() {
     new stream.Readable({
@@ -750,7 +765,7 @@ namespace tls_tests {
             let _response: Buffer = response;
         })
         _TLSSocket = _TLSSocket.prependOnceListener("secureConnect", () => { });
-    } 
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -1230,7 +1245,7 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
-        childProcess.spawnSync("echo test");    
+        childProcess.spawnSync("echo test");
     }
 }
 
@@ -1393,7 +1408,7 @@ namespace process_tests {
     {
         var eventEmitter: events.EventEmitter;
         eventEmitter = process;                // Test that process implements EventEmitter...
-        
+
         var _p: NodeJS.Process = process;
         _p = p;
     }

From e8171dca7f90197c55a3a66c5952929ff0a67135 Mon Sep 17 00:00:00 2001
From: Philip Ottesen <philip.ottesen@yodle.com>
Date: Wed, 16 Nov 2016 10:37:09 -0500
Subject: [PATCH 136/245] Updating authors

---
 react-autosuggest/react-autosuggest.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-autosuggest/react-autosuggest.d.ts b/react-autosuggest/react-autosuggest.d.ts
index 1a144ea44f..739509bdef 100644
--- a/react-autosuggest/react-autosuggest.d.ts
+++ b/react-autosuggest/react-autosuggest.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for react-autosuggest v3.7.3
 // Project: http://react-autosuggest.js.org/
-// Definitions by: Nicolas Schmitt <https://github.com/nicolas-schmitt>
+// Definitions by: Nicolas Schmitt <https://github.com/nicolas-schmitt>, Philip Ottesen <https://github.com/pjo256>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="react"/>

From b18b48560cf45ff6e5ea1453467743975fb1b657 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 16 Nov 2016 10:02:19 -0800
Subject: [PATCH 137/245] Copy `README.md` and `PULL_REQUEST_TEMPLATE.md` from
 `types-2.0`

---
 PULL_REQUEST_TEMPLATE.md |  1 +
 README.md                | 61 ++++++++++++++++------------------------
 2 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index a2c9ec9e5b..a864dbcb13 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -4,6 +4,7 @@ Please fill in this template.
 - [ ] Test the change in your own code.
 - [ ] Follow the advice from the [readme](https://github.com/DefinitelyTyped/DefinitelyTyped#make-a-pull-request).
 - [ ] Avoid [common mistakes](https://github.com/DefinitelyTyped/DefinitelyTyped#common-mistakes).
+- [ ] Run `npm run lint -- package-name` if a `tslint.json` is present.
 
 If adding a new definition:
 - [ ] The package does not provide its own types, and you can not add them.
diff --git a/README.md b/README.md
index 1794dea589..d3e6c0e27c 100644
--- a/README.md
+++ b/README.md
@@ -109,48 +109,15 @@ Your package should have this structure:
 | foo-tests.ts | This contains sample code which tests the typings. This code does *not* run, but it is type-checked. |
 | tsconfig.json | This allows you to run `tsc` within the package. |
 
-`index.d.ts` should start with a header looking like:
+Generate these by running `npm run new-package -- new-package-name`.
 
-```ts
-// Type definitions for foo 1.2
-// Project: https://github.com/baz/foo
-// Definitions by: My Self <https://github.com/me>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-```
-
-The `Project` link does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.
-
-`tsconfig.json` should look like this:
-
-```json
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "noImplicitAny": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "foo-tests.ts"
-    ]
-}
-```
-
-These should be identical accross projects except that `foo-tests` will be replaced with the name of your test file,
-and you may also add the `"jsx"` compiler option if your library needs it.
+You may edit the `tsconfig.json` to add new files or to add the `"jsx"` compiler option.
 
 DefinitelyTyped members routinely monitor for new PRs, though keep in mind that the number of other PRs may slow things down.
 
 For a good example package, see [base64-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/types-2.0/base64-js).
 
+
 #### Common mistakes
 
 * First, follow advice from the [handbook](http://www.typescriptlang.org/docs/handbook/declaration-files/do-s-and-don-ts.html).
@@ -186,7 +153,27 @@ Make a PR doing the following:
 * Any other packages in DefinitelyTyped that referenced the deleted package should be updated to reference the bundled types.
     To do this, add a `package.json` with `"dependencies": { "foo": "x.y.z" }`.
 
-When a package is bundled, it no longer needs the header comment – this is only used by DefinitelyTyped, not by the TypeScript compiler.
+
+#### Lint
+
+To lint a package, just add a `tslint.json` to that package containing `{ "extends": "../tslint.json" }`. All new packages must be linted.
+If a `tslint.json` turns rules off, this is because that hasn't been fixed yet. For example:
+
+```json
+{
+    "extends": "../tslint.json",
+    "rules": {
+        // This package uses the Function type, and it will take effort to fix.
+        "forbidden-types": false
+    }
+}
+```
+
+(To indicate that a lint rule truly does not apply, use `// tslint:disable:rule-name` or better, `//tslint:disable-next-line:rule-name`.)
+
+Only `.d.ts` files are linted.
+Test the linter by running `npm run lint -- package-name`. Do not use a globally installed tslint.
+
 
 ## FAQ
 

From f04b4be809ab52d85e782c6a0d52b1f8cc7e6aa9 Mon Sep 17 00:00:00 2001
From: Ambrus Adrian-Zoltan <aaim1390@scs.ubbcluj.ro>
Date: Wed, 16 Nov 2016 20:11:41 +0200
Subject: [PATCH 138/245] angular-bootstrap-calendar: Changed onClick function
 parameter type to any

---
 angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts b/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
index 1ab82dfd7c..34c7876897 100644
--- a/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
+++ b/angular-bootstrap-calendar/angular-bootstrap-calendar.d.ts
@@ -19,7 +19,7 @@ declare namespace angular.bootstrap.calendar {
          * The action that occurs when it's clicked
          * @param args - the IEvent whose action was clicked
          */
-        onClick: (args: IEvent) => void;
+        onClick: (args: any) => void;
     }
 
     interface IEventColor {

From 72c953d99ac407ce6b336f10a8c44e8c39e9843e Mon Sep 17 00:00:00 2001
From: Tim Whidden <twhid@twhid.com>
Date: Wed, 16 Nov 2016 14:44:05 -0500
Subject: [PATCH 139/245] Relay.DefaultNetworkLayer 2nd arg is optional

https://facebook.github.io/relay/docs/guides-network-layer.html

> Relay.DefaultNetworkLayer takes an optional second argument that accepts any valid initialization property that fetch accepts.
---
 react-relay/react-relay.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-relay/react-relay.d.ts b/react-relay/react-relay.d.ts
index 5aad6d4e4e..3731f9ca5d 100644
--- a/react-relay/react-relay.d.ts
+++ b/react-relay/react-relay.d.ts
@@ -52,7 +52,7 @@ declare module "react-relay" {
     }
 
     class DefaultNetworkLayer implements RelayNetworkLayer {
-        constructor(host: string, options: any)
+        constructor(host: string, options?: any)
         supports(...options: string[]): boolean
     }
 

From 085fc5f4c3b68cf9257bfd3eda576a378fd1482c Mon Sep 17 00:00:00 2001
From: kwiateusz <kwiateusz@users.noreply.github.com>
Date: Wed, 16 Nov 2016 20:53:40 +0100
Subject: [PATCH 140/245] Updated eventemmiter2 config options

---
 eventemitter2/eventemitter2.d.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/eventemitter2/eventemitter2.d.ts b/eventemitter2/eventemitter2.d.ts
index de1be0d064..d0b0b545b1 100644
--- a/eventemitter2/eventemitter2.d.ts
+++ b/eventemitter2/eventemitter2.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for EventEmitter2 v0.14.4
+// Type definitions for EventEmitter2 v2.2.0
 // Project: https://github.com/asyncly/EventEmitter2
 // Definitions by: ryiwamoto <https://github.com/ryiwamoto/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -23,6 +23,10 @@ interface EventEmitter2Configuration {
      * max listeners that can be assigned to an event, default 10.
      */
     maxListeners?: number;
+    /**
+     * show event name in memory leak message when more than maximum amount of listeners is assigned, default false
+    */
+    verboseMemoryLeak?: boolean;
 }
 
 declare class EventEmitter2 {

From 681b829f01ee54c1dcde9a3f23bef6032a92540d Mon Sep 17 00:00:00 2001
From: kwiateusz <kwiateusz@users.noreply.github.com>
Date: Wed, 16 Nov 2016 20:55:40 +0100
Subject: [PATCH 141/245] Updated eventemmiter2 tests

---
 eventemitter2/eventemitter2-tests.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/eventemitter2/eventemitter2-tests.ts b/eventemitter2/eventemitter2-tests.ts
index 747f2e87b6..840944675c 100644
--- a/eventemitter2/eventemitter2-tests.ts
+++ b/eventemitter2/eventemitter2-tests.ts
@@ -20,7 +20,8 @@ function testConfiguration() {
         wildcard: true,
         delimiter: '::',
         newListener: false,
-        maxListeners: 20
+        maxListeners: 20,
+        verboseMemoryLeak: true
     });
     var bar = new EventEmitter2({});
     var bazz = new EventEmitter2();

From 8797f321463dcf5f048d87ac2f7bf9ade113b911 Mon Sep 17 00:00:00 2001
From: jdwilkin <jared.wilkin@gmail.com>
Date: Wed, 16 Nov 2016 14:24:12 -0600
Subject: [PATCH 142/245] Update request.d.ts (#12731)

adding some missing valid options to type definitions relating to query string handling
---
 request/request.d.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/request/request.d.ts b/request/request.d.ts
index 20be3dca31..539a7d40ca 100644
--- a/request/request.d.ts
+++ b/request/request.d.ts
@@ -85,6 +85,8 @@ declare module 'request' {
 			aws?: AWSOptions;
 			hawk?: HawkOptions;
 			qs?: any;
+		        qsStringifyOptions?: any;
+			qsParseOptions?: any;
 			json?: any;
 			multipart?: RequestPart[] | Multipart;
 			agent?: http.Agent | https.Agent;

From 9b22189cbea3fef9512b8b2bf6d0243065e931de Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Wed, 16 Nov 2016 12:36:42 -0800
Subject: [PATCH 143/245] Convert `accounting` to an external module

---
 accounting/index.d.ts  | 139 ++++++++++++++++++++---------------------
 accounting/tslint.json |   1 +
 2 files changed, 68 insertions(+), 72 deletions(-)
 create mode 100644 accounting/tslint.json

diff --git a/accounting/index.d.ts b/accounting/index.d.ts
index b8187e41c4..b437a63c36 100644
--- a/accounting/index.d.ts
+++ b/accounting/index.d.ts
@@ -3,77 +3,72 @@
 // Definitions by: Sergey Gerasimov <https://github.com/gerich-home/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface IAccountingCurrencyFormat {
-    pos: string;         // for positive values, eg. "$ 1.00"
-	neg?: string;        // for negative values, eg. "$ (1.00)"
-	zero?: string;       // for zero values, eg. "$  --"
+declare namespace accounting {
+    interface IAccountingCurrencyFormat {
+        pos: string;         // for positive values, eg. "$ 1.00"
+        neg?: string;        // for negative values, eg. "$ (1.00)"
+        zero?: string;       // for zero values, eg. "$  --"
+    }
+
+    interface IAccountingCurrencySettings<TFormat> {
+        symbol?: string;     // default currency symbol is '$'
+        format?: TFormat;    // controls output: %s = symbol, %v = value/number
+        decimal?: string;    // decimal point separator
+        thousand?: string;   // thousands separator
+        precision?: number;   // decimal places
+    }
+
+    interface IAccountingNumberSettings {
+        precision?: number;  // default precision on numbers is 0
+        thousand?: string;
+        decimal?: string;
+    }
+
+    interface IAccountingSettings {
+        currency: IAccountingCurrencySettings<any>; // IAccountingCurrencySettings<string> or IAccountingCurrencySettings<IAccountingCurrencyFormat>
+        number: IAccountingNumberSettings;
+    }
+
+    interface IAccountingStatic {
+        // format any number into currency
+        formatMoney(number: number, symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string;
+        formatMoney(number: number, options: IAccountingCurrencySettings<string> | IAccountingCurrencySettings<IAccountingCurrencyFormat>): string;
+
+        formatMoney(numbers: number[], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string[];
+        formatMoney(numbers: number[], options: IAccountingCurrencySettings<string> | IAccountingCurrencySettings<IAccountingCurrencyFormat>): string[];
+
+        // generic case (any array of numbers)
+        formatMoney(numbers: any[], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): any[];
+        formatMoney(numbers: any[], options: IAccountingCurrencySettings<string> | IAccountingCurrencySettings<IAccountingCurrencyFormat>): any[];
+
+        // format a list of values for column-display
+        formatColumn(numbers: number[], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string[];
+        formatColumn(numbers: number[], options: IAccountingCurrencySettings<string> | IAccountingCurrencySettings<IAccountingCurrencyFormat>): string[];
+
+        formatColumn(numbers: number[][], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string[][];
+        formatColumn(numbers: number[][], options: IAccountingCurrencySettings<string> | IAccountingCurrencySettings<IAccountingCurrencyFormat>): string[][];
+
+        // format a number with custom precision and localisation
+        formatNumber(number: number, precision?: number, thousand?: string, decimal?: string): string;
+        formatNumber(number: number, options: IAccountingNumberSettings): string;
+
+        formatNumber(number: number[], precision?: number, thousand?: string, decimal?: string): string[];
+        formatNumber(number: number[], options: IAccountingNumberSettings): string[];
+
+        formatNumber(number: any[], precision?: number, thousand?: string, decimal?: string): any[];
+        formatNumber(number: any[], options: IAccountingNumberSettings): any[];
+
+        // better rounding for floating point numbers
+        toFixed(number: number, precision?: number): string;
+
+        // get a value from any formatted number/currency string
+        unformat(string: string, decimal?: string): number;
+
+        // settings object that controls default parameters for library methods
+        settings: IAccountingSettings;
+    }
 }
 
-interface IAccountingCurrencySettings<TFormat> {
-    symbol?: string;     // default currency symbol is '$'
-    format?: TFormat;    // controls output: %s = symbol, %v = value/number
-    decimal?: string;    // decimal point separator
-    thousand?: string;   // thousands separator
-    precision?: number   // decimal places
-}
-
-interface IAccountingNumberSettings {
-    precision?: number;  // default precision on numbers is 0
-    thousand?: string;
-    decimal?: string;
-}
-
-interface IAccountingSettings {
-    currency: IAccountingCurrencySettings<any>; // IAccountingCurrencySettings<string> or IAccountingCurrencySettings<IAccountingCurrencyFormat>
-    number: IAccountingNumberSettings;
-}
-
-interface IAccountingStatic {
-    // format any number into currency
-    formatMoney(number: number, symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string;
-    formatMoney(number: number, options: IAccountingCurrencySettings<string>): string;
-    formatMoney(number: number, options: IAccountingCurrencySettings<IAccountingCurrencyFormat>): string;
-
-    formatMoney(numbers: number[], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string[];
-    formatMoney(numbers: number[], options: IAccountingCurrencySettings<string>): string[];
-    formatMoney(numbers: number[], options: IAccountingCurrencySettings<IAccountingCurrencyFormat>): string[];
-
-    // generic case (any array of numbers)
-    formatMoney(numbers: any[], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): any[];
-    formatMoney(numbers: any[], options: IAccountingCurrencySettings<string>): any[];
-    formatMoney(numbers: any[], options: IAccountingCurrencySettings<IAccountingCurrencyFormat>): any[];
-
-    // format a list of values for column-display
-    formatColumn(numbers: number[], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string[];
-    formatColumn(numbers: number[], options: IAccountingCurrencySettings<string>): string[];
-    formatColumn(numbers: number[], options: IAccountingCurrencySettings<IAccountingCurrencyFormat>): string[];
-
-    formatColumn(numbers: number[][], symbol?: string, precision?: number, thousand?: string, decimal?: string, format?: string): string[][];
-    formatColumn(numbers: number[][], options: IAccountingCurrencySettings<string>): string[][];
-    formatColumn(numbers: number[][], options: IAccountingCurrencySettings<IAccountingCurrencyFormat>): string[][];
-
-    // format a number with custom precision and localisation
-    formatNumber(number: number, precision?: number, thousand?: string, decimal?: string): string;
-    formatNumber(number: number, options: IAccountingNumberSettings): string;
-
-    formatNumber(number: number[], precision?: number, thousand?: string, decimal?: string): string[];
-    formatNumber(number: number[], options: IAccountingNumberSettings): string[];
-
-    formatNumber(number: any[], precision?: number, thousand?: string, decimal?: string): any[];
-    formatNumber(number: any[], options: IAccountingNumberSettings): any[];
-
-    // better rounding for floating point numbers
-    toFixed(number: number, precision?: number): string;
-
-    // get a value from any formatted number/currency string
-    unformat(string: string, decimal?: string): number;
-
-    // settings object that controls default parameters for library methods
-    settings: IAccountingSettings;
-}
-
-declare var accounting: IAccountingStatic;
-
-declare module "accounting" {
-    export = accounting;
-}
+declare var accounting: accounting.IAccountingStatic;
+export = accounting;
+export as namespace accounting;
diff --git a/accounting/tslint.json b/accounting/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/accounting/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file

From a1cab07bb10b32eddb9c4278cc2c0a9c77c82ac2 Mon Sep 17 00:00:00 2001
From: Dominic Watson <domwatson@live.co.uk>
Date: Wed, 16 Nov 2016 23:34:23 +0100
Subject: [PATCH 144/245] Update GraphQL to 0.7.2

---
 graphql/index.d.ts | 107 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 102 insertions(+), 5 deletions(-)

diff --git a/graphql/index.d.ts b/graphql/index.d.ts
index 0e93923c1d..4fb2bb1716 100644
--- a/graphql/index.d.ts
+++ b/graphql/index.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for graphql v0.7.0
+// Type definitions for graphql v0.7.2
 // Project: https://www.npmjs.com/package/graphql
-// Definitions by: TonyYang <https://github.com/TonyPythoneer>, Caleb Meredith <https://github.com/calebmer>
+// Definitions by: TonyYang <https://github.com/TonyPythoneer>, Caleb Meredith <https://github.com/calebmer>, Dominic Watson <https://github.com/intellix>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*************************************
- *                                   * 
- *               MODULES             * 
+ *                                   *
+ *               MODULES             *
  *                                   *
  *************************************/
 ///////////////////////////
@@ -2150,6 +2150,9 @@ declare module "graphql/utilities/index" {
 
     // Asserts that a string is a valid GraphQL name
     export { assertValidName } from 'graphql/utilities/assertValidName';
+
+    // Compares two GraphQLSchemas and detects breaking changes.
+    export { findBreakingChanges } from 'graphql/utilities/findBreakingChanges';
 }
 
 declare module "graphql/utilities/assertValidName" {
@@ -2284,6 +2287,100 @@ declare module "graphql/utilities/extendSchema" {
     ): GraphQLSchema;
 }
 
+declare module "graphql/utilities/findBreakingChanges" {
+    import {
+        getNamedType,
+        GraphQLScalarType,
+        GraphQLEnumType,
+        GraphQLInputObjectType,
+        GraphQLInterfaceType,
+        GraphQLObjectType,
+        GraphQLUnionType,
+        GraphQLNamedType,
+    } from 'graphql/type/definition';
+    import { GraphQLSchema } from 'graphql/type/schema';
+
+    export const BreakingChangeType: {
+        FIELD_CHANGED_KIND: 'FIELD_CHANGED_KIND',
+        FIELD_REMOVED: 'FIELD_REMOVED',
+        TYPE_CHANGED_KIND: 'TYPE_CHANGED_KIND',
+        TYPE_REMOVED: 'TYPE_REMOVED',
+        TYPE_REMOVED_FROM_UNION: 'TYPE_REMOVED_FROM_UNION',
+        VALUE_REMOVED_FROM_ENUM: 'VALUE_REMOVED_FROM_ENUM',
+    };
+
+    type BreakingChangeKey = 'FIELD_CHANGED_KIND'
+        | 'FIELD_REMOVED'
+        | 'TYPE_CHANGED_KIND'
+        | 'TYPE_REMOVED'
+        | 'TYPE_REMOVED_FROM_UNION'
+        | 'VALUE_REMOVED_FROM_ENUM';
+
+    export type BreakingChange = {
+        type: BreakingChangeKey;
+        description: string;
+    };
+
+    /**
+     * Given two schemas, returns an Array containing descriptions of all the types
+     * of breaking changes covered by the other functions down below.
+     */
+    export function findBreakingChanges(
+        oldSchema: GraphQLSchema,
+        newSchema: GraphQLSchema
+    ): Array<BreakingChange>
+
+    /**
+     * Given two schemas, returns an Array containing descriptions of any breaking
+     * changes in the newSchema related to removing an entire type.
+     */
+    export function findRemovedTypes(
+        oldSchema: GraphQLSchema,
+        newSchema: GraphQLSchema
+    ): Array<BreakingChange>
+
+    function typeKindName(type: GraphQLNamedType): string
+
+    /**
+     * Given two schemas, returns an Array containing descriptions of any breaking
+     * changes in the newSchema related to changing the type of a type.
+     */
+    export function findTypesThatChangedKind(
+        oldSchema: GraphQLSchema,
+        newSchema: GraphQLSchema
+    ): Array<BreakingChange>
+
+    function typeKindName(type: GraphQLNamedType): string;
+
+    /**
+     * Given two schemas, returns an Array containing descriptions of any breaking
+     * changes in the newSchema related to the fields on a type. This includes if
+     * a field has been removed from a type or if a field has changed type.
+     */
+    export function findFieldsThatChangedType(
+        oldSchema: GraphQLSchema,
+        newSchema: GraphQLSchema
+    ): Array<BreakingChange>;
+
+    /**
+     * Given two schemas, returns an Array containing descriptions of any breaking
+     * changes in the newSchema related to removing types from a union type.
+     */
+    export function findTypesRemovedFromUnions(
+        oldSchema: GraphQLSchema,
+        newSchema: GraphQLSchema
+    ): Array<BreakingChange>;
+
+    /**
+     * Given two schemas, returns an Array containing descriptions of any breaking
+     * changes in the newSchema related to removing values from an enum type.
+     */
+    export function findValuesRemovedFromEnums(
+        oldSchema: GraphQLSchema,
+        newSchema: GraphQLSchema
+    ): Array<BreakingChange>;
+}
+
 declare module "graphql/utilities/getOperationAST" {
     import { Document, OperationDefinition } from 'graphql/language/ast';
 
@@ -2627,7 +2724,7 @@ declare module "graphql/utilities/valueFromAST" {
     } from 'graphql/language/ast';
 
     function valueFromAST(
-        valueAST: Value, 
+        valueAST: Value,
         type: GraphQLInputType,
         variables?: {
             [key: string]: any

From 78d94473f1275126930e0fa46b6b6bfb20c03735 Mon Sep 17 00:00:00 2001
From: Dibyo Majumdar <dibyo.majumdar@gmail.com>
Date: Wed, 16 Nov 2016 15:55:59 -0800
Subject: [PATCH 145/245] Add xmlns and other attributes to SVGAttributes

---
 react/react-tests.ts | 5 ++++-
 react/react.d.ts     | 6 ++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/react/react-tests.ts b/react/react-tests.ts
index a1adc611cf..cf7bb1e2a8 100644
--- a/react/react-tests.ts
+++ b/react/react-tests.ts
@@ -325,7 +325,10 @@ React.DOM.div(htmlAttr);
 React.DOM.span(htmlAttr);
 React.DOM.input(htmlAttr);
 
-React.DOM.svg({ viewBox: "0 0 48 48" },
+React.DOM.svg({
+        viewBox: "0 0 48 48",
+        xmlns: "http://www.w3.org/2000/svg"
+    },
     React.DOM.rect({
       x: 22,
       y: 10,
diff --git a/react/react.d.ts b/react/react.d.ts
index 5cba332275..364d1a478f 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -2123,6 +2123,7 @@ declare namespace __React {
         x1?: number | string;
         x2?: number | string;
         x?: number | string;
+        xChannelSelector?: string;
         xlinkActuate?: string;
         xlinkArcrole?: string;
         xlinkHref?: string;
@@ -2132,10 +2133,15 @@ declare namespace __React {
         xlinkType?: string;
         xmlBase?: string;
         xmlLang?: string;
+        xmlns?: string;
+        xmlnsXlink?: string;
         xmlSpace?: string;
         y1?: number | string;
         y2?: number | string;
         y?: number | string;
+        yChannelSelector?: string;
+        z?: number | string;
+        zoomAndPan?: string;
     }
 
     //

From 844c913df0b862b23697afd93c89e58d351dd924 Mon Sep 17 00:00:00 2001
From: ersimont <xemnosyst@yahoo.com>
Date: Wed, 16 Nov 2016 22:31:40 -0500
Subject: [PATCH 146/245] Add animate.IAnimateService

---
 angular-mocks/index.d.ts | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/angular-mocks/index.d.ts b/angular-mocks/index.d.ts
index 3c24ed1cf6..b14cf70a3b 100644
--- a/angular-mocks/index.d.ts
+++ b/angular-mocks/index.d.ts
@@ -301,6 +301,25 @@ declare module 'angular' {
     whenPUT(url: string | RegExp | ((url: string) => boolean), data?: string | RegExp | Object | ((data: string) => boolean), headers?: Object | ((object: Object) => boolean), keys?: Object[]): mock.IRequestHandler;
   }
 
+  ///////////////////////////////////////////////////////////////////////////
+  // AnimateService
+  // see https://docs.angularjs.org/api/ngMock/service/$animate
+  ///////////////////////////////////////////////////////////////////////////
+  module animate {
+    interface IAnimateService {
+
+      /**
+       * This method will close all pending animations (both Javascript and CSS) and it will also flush any remaining animation frames and/or callbacks.
+       */
+      closeAndFlush();
+
+      /**
+       * This method is used to flush the pending callbacks and animation frames to either start an animation or conclude an animation. Note that this will not actually close an actively running animation (see `closeAndFlush()` for that).
+       */
+      flush(): void;
+    }
+  }
+
   export module mock {
     // returned interface by the the mocked HttpBackendService expect/when methods
     interface IRequestHandler {

From 70ce0b9229875b0898355830b4035bf0d4c50133 Mon Sep 17 00:00:00 2001
From: Dominic Watson <domwatson@live.co.uk>
Date: Thu, 17 Nov 2016 01:27:45 +0100
Subject: [PATCH 147/245] Update GraphQL to 0.8.0

---
 graphql/index.d.ts | 684 +++++++++++++++++++++++++--------------------
 1 file changed, 377 insertions(+), 307 deletions(-)

diff --git a/graphql/index.d.ts b/graphql/index.d.ts
index 4fb2bb1716..b156afa6cf 100644
--- a/graphql/index.d.ts
+++ b/graphql/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for graphql v0.7.2
+// Type definitions for graphql v0.8.0
 // Project: https://www.npmjs.com/package/graphql
 // Definitions by: TonyYang <https://github.com/TonyPythoneer>, Caleb Meredith <https://github.com/calebmer>, Dominic Watson <https://github.com/intellix>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -29,6 +29,9 @@ declare module "graphql" {
     // Execute GraphQL queries.
     export {
         execute,
+        defaultFieldResolver,
+        responsePathAsArray,
+        ExecutionResult,
     } from 'graphql/execution';
 
 
@@ -43,6 +46,8 @@ declare module "graphql" {
     export {
         GraphQLError,
         formatError,
+        GraphQLFormattedError,
+        GraphQLErrorLocation,
     } from 'graphql/error';
 
 
@@ -70,6 +75,9 @@ declare module "graphql" {
         // Print a GraphQLSchema to GraphQL Schema language.
         printSchema,
 
+        // Print a GraphQLType to GraphQL Schema language.
+        printType,
+
         // Create a GraphQLType from a GraphQL language AST.
         typeFromAST,
 
@@ -102,12 +110,32 @@ declare module "graphql" {
 
         // Asserts a string is a valid GraphQL name.
         assertValidName,
+
+        BreakingChange,
+
+        IntrospectionDirective,
+        IntrospectionEnumType,
+        IntrospectionEnumValue,
+        IntrospectionField,
+        IntrospectionInputObjectType,
+        IntrospectionInputValue,
+        IntrospectionInterfaceType,
+        IntrospectionListTypeRef,
+        IntrospectionNamedTypeRef,
+        IntrospectionNonNullTypeRef,
+        IntrospectionObjectType,
+        IntrospectionQuery,
+        IntrospectionScalarType,
+        IntrospectionSchema,
+        IntrospectionType,
+        IntrospectionTypeRef,
+        IntrospectionUnionType,
     } from 'graphql/utilities';
 }
 
 declare module "graphql/graphql" {
-    import { GraphQLError } from 'graphql/error/GraphQLError';
     import { GraphQLSchema } from 'graphql/type/schema';
+    import { ExecutionResult } from 'graphql/execution/execute';
 
     /**
      * This is the primary entry point function for fulfilling GraphQL operations
@@ -142,18 +170,7 @@ declare module "graphql/graphql" {
             [key: string]: any
         },
         operationName?: string
-    ): Promise<GraphQLResult>;
-
-    /**
-     * The result of a GraphQL parse, validation and execution.
-     *
-     * `data` is the result of a successful execution of the query.
-     * `errors` is included when any errors occurred as a non-empty array.
-     */
-    type GraphQLResult = {
-        data?: Object;
-        errors?: Array<GraphQLError>;
-    }
+    ): Promise<ExecutionResult>;
 }
 
 ///////////////////////////
@@ -177,7 +194,7 @@ declare module "graphql/language/index" {
     export { getLocation } from 'graphql/language/location';
     import * as Kind from 'graphql/language/kinds';
     export { Kind };
-    export { createLexer, TokenKind } from 'graphql/language/lexer';
+    export { createLexer, TokenKind, Lexer } from 'graphql/language/lexer';
     export { parse, parseValue, parseType } from 'graphql/language/parser';
     export { print } from 'graphql/language/printer';
     export { Source } from 'graphql/language/source';
@@ -286,46 +303,46 @@ declare module "graphql/language/ast" {
     /**
      * The list of all possible AST node types.
      */
-    export type Node = Name
-        | Document
-        | OperationDefinition
-        | VariableDefinition
-        | Variable
-        | SelectionSet
-        | Field
-        | Argument
-        | FragmentSpread
-        | InlineFragment
-        | FragmentDefinition
-        | IntValue
-        | FloatValue
-        | StringValue
-        | BooleanValue
-        | EnumValue
-        | ListValue
-        | ObjectValue
-        | ObjectField
-        | Directive
-        | NamedType
-        | ListType
-        | NonNullType
-        | SchemaDefinition
-        | OperationTypeDefinition
-        | ScalarTypeDefinition
-        | ObjectTypeDefinition
-        | FieldDefinition
-        | InputValueDefinition
-        | InterfaceTypeDefinition
-        | UnionTypeDefinition
-        | EnumTypeDefinition
-        | EnumValueDefinition
-        | InputObjectTypeDefinition
-        | TypeExtensionDefinition
-        | DirectiveDefinition
+    export type ASTNode = NameNode
+        | DocumentNode
+        | OperationDefinitionNode
+        | VariableDefinitionNode
+        | VariableNode
+        | SelectionSetNode
+        | FieldNode
+        | ArgumentNode
+        | FragmentSpreadNode
+        | InlineFragmentNode
+        | FragmentDefinitionNode
+        | IntValueNode
+        | FloatValueNode
+        | StringValueNode
+        | BooleanValueNode
+        | EnumValueNode
+        | ListValueNode
+        | ObjectValueNode
+        | ObjectFieldNode
+        | DirectiveNode
+        | NamedTypeNode
+        | ListTypeNode
+        | NonNullTypeNode
+        | SchemaDefinitionNode
+        | OperationTypeDefinitionNode
+        | ScalarTypeDefinitionNode
+        | ObjectTypeDefinitionNode
+        | FieldDefinitionNode
+        | InputValueDefinitionNode
+        | InterfaceTypeDefinitionNode
+        | UnionTypeDefinitionNode
+        | EnumTypeDefinitionNode
+        | EnumValueDefinitionNode
+        | InputObjectTypeDefinitionNode
+        | TypeExtensionDefinitionNode
+        | DirectiveDefinitionNode;
 
     // Name
 
-    export type Name = {
+    export type NameNode = {
         kind: 'Name';
         loc?: Location;
         value: string;
@@ -333,306 +350,306 @@ declare module "graphql/language/ast" {
 
     // Document
 
-    export type Document = {
+    export type DocumentNode = {
         kind: 'Document';
         loc?: Location;
-        definitions: Array<Definition>;
+        definitions: Array<DefinitionNode>;
     }
 
-    export type Definition = OperationDefinition
-        | FragmentDefinition
-        | TypeSystemDefinition // experimental non-spec addition.
+    export type DefinitionNode = OperationDefinitionNode
+        | FragmentDefinitionNode
+        | TypeSystemDefinitionNode // experimental non-spec addition.
 
-    export type OperationDefinition = {
+    export type OperationDefinitionNode = {
         kind: 'OperationDefinition';
         loc?: Location;
-        operation: OperationType;
-        name?: Name;
-        variableDefinitions?: Array<VariableDefinition>;
-        directives?: Array<Directive>;
-        selectionSet: SelectionSet;
+        operation: OperationTypeNode;
+        name?: NameNode;
+        variableDefinitions?: Array<VariableDefinitionNode>;
+        directives?: Array<DirectiveNode>;
+        selectionSet: SelectionSetNode;
     }
 
     // Note: subscription is an experimental non-spec addition.
-    export type OperationType = 'query' | 'mutation' | 'subscription';
+    export type OperationTypeNode = 'query' | 'mutation' | 'subscription';
 
-    export type VariableDefinition = {
+    export type VariableDefinitionNode = {
         kind: 'VariableDefinition';
         loc?: Location;
-        variable: Variable;
-        type: Type;
-        defaultValue?: Value;
+        variable: VariableNode;
+        type: TypeNode;
+        defaultValue?: ValueNode;
     }
 
-    export type Variable = {
+    export type VariableNode = {
         kind: 'Variable';
         loc?: Location;
-        name: Name;
+        name: NameNode;
     }
 
-    export type SelectionSet = {
+    export type SelectionSetNode = {
         kind: 'SelectionSet';
         loc?: Location;
-        selections: Array<Selection>;
+        selections: Array<SelectionNode>;
     }
 
-    export type Selection = Field
-        | FragmentSpread
-        | InlineFragment
+    export type SelectionNode = FieldNode
+        | FragmentSpreadNode
+        | InlineFragmentNode
 
-    export type Field = {
+    export type FieldNode = {
         kind: 'Field';
         loc?: Location;
-        alias?: Name;
-        name: Name;
-        arguments?: Array<Argument>;
-        directives?: Array<Directive>;
-        selectionSet?: SelectionSet;
+        alias?: NameNode;
+        name: NameNode;
+        arguments?: Array<ArgumentNode>;
+        directives?: Array<DirectiveNode>;
+        selectionSet?: SelectionSetNode;
     }
 
-    export type Argument = {
+    export type ArgumentNode = {
         kind: 'Argument';
         loc?: Location;
-        name: Name;
-        value: Value;
+        name: NameNode;
+        value: ValueNode;
     }
 
 
     // Fragments
 
-    export type FragmentSpread = {
+    export type FragmentSpreadNode = {
         kind: 'FragmentSpread';
         loc?: Location;
-        name: Name;
-        directives?: Array<Directive>;
+        name: NameNode;
+        directives?: Array<DirectiveNode>;
     }
 
-    export type InlineFragment = {
+    export type InlineFragmentNode = {
         kind: 'InlineFragment';
         loc?: Location;
-        typeCondition?: NamedType;
-        directives?: Array<Directive>;
-        selectionSet: SelectionSet;
+        typeCondition?: NamedTypeNode;
+        directives?: Array<DirectiveNode>;
+        selectionSet: SelectionSetNode;
     }
 
-    export type FragmentDefinition = {
+    export type FragmentDefinitionNode = {
         kind: 'FragmentDefinition';
         loc?: Location;
-        name: Name;
-        typeCondition: NamedType;
-        directives?: Array<Directive>;
-        selectionSet: SelectionSet;
+        name: NameNode;
+        typeCondition: NamedTypeNode;
+        directives?: Array<DirectiveNode>;
+        selectionSet: SelectionSetNode;
     }
 
 
     // Values
 
-    export type Value = Variable
-        | IntValue
-        | FloatValue
-        | StringValue
-        | BooleanValue
-        | EnumValue
-        | ListValue
-        | ObjectValue
+    export type ValueNode = VariableNode
+        | IntValueNode
+        | FloatValueNode
+        | StringValueNode
+        | BooleanValueNode
+        | EnumValueNode
+        | ListValueNode
+        | ObjectValueNode
 
-    export type IntValue = {
+    export type IntValueNode = {
         kind: 'IntValue';
         loc?: Location;
         value: string;
     }
 
-    export type FloatValue = {
+    export type FloatValueNode = {
         kind: 'FloatValue';
         loc?: Location;
         value: string;
     }
 
-    export type StringValue = {
+    export type StringValueNode = {
         kind: 'StringValue';
         loc?: Location;
         value: string;
     }
 
-    export type BooleanValue = {
+    export type BooleanValueNode = {
         kind: 'BooleanValue';
         loc?: Location;
         value: boolean;
     }
 
-    export type EnumValue = {
+    export type EnumValueNode = {
         kind: 'EnumValue';
         loc?: Location;
         value: string;
     }
 
-    export type ListValue = {
+    export type ListValueNode = {
         kind: 'ListValue';
         loc?: Location;
-        values: Array<Value>;
+        values: Array<ValueNode>;
     }
 
-    export type ObjectValue = {
+    export type ObjectValueNode = {
         kind: 'ObjectValue';
         loc?: Location;
-        fields: Array<ObjectField>;
+        fields: Array<ObjectFieldNode>;
     }
 
-    export type ObjectField = {
+    export type ObjectFieldNode = {
         kind: 'ObjectField';
         loc?: Location;
-        name: Name;
-        value: Value;
+        name: NameNode;
+        value: ValueNode;
     }
 
 
     // Directives
 
-    export type Directive = {
+    export type DirectiveNode = {
         kind: 'Directive';
         loc?: Location;
-        name: Name;
-        arguments?: Array<Argument>;
+        name: NameNode;
+        arguments?: Array<ArgumentNode>;
     }
 
 
     // Type Reference
 
-    export type Type = NamedType
-        | ListType
-        | NonNullType
+    export type TypeNode = NamedTypeNode
+        | ListTypeNode
+        | NonNullTypeNode
 
-    export type NamedType = {
+    export type NamedTypeNode = {
         kind: 'NamedType';
         loc?: Location;
-        name: Name;
+        name: NameNode;
     };
 
-    export type ListType = {
+    export type ListTypeNode = {
         kind: 'ListType';
         loc?: Location;
-        type: Type;
+        type: TypeNode;
     }
 
-    export type NonNullType = {
+    export type NonNullTypeNode = {
         kind: 'NonNullType';
         loc?: Location;
-        type: NamedType | ListType;
+        type: NamedTypeNode | ListTypeNode;
     }
 
     // Type System Definition
 
-    export type TypeSystemDefinition = SchemaDefinition
-        | TypeDefinition
-        | TypeExtensionDefinition
-        | DirectiveDefinition
+    export type TypeSystemDefinitionNode = SchemaDefinitionNode
+        | TypeDefinitionNode
+        | TypeExtensionDefinitionNode
+        | DirectiveDefinitionNode
 
-    export type SchemaDefinition = {
+    export type SchemaDefinitionNode = {
         kind: 'SchemaDefinition';
         loc?: Location;
-        directives: Array<Directive>;
-        operationTypes: Array<OperationTypeDefinition>;
+        directives: Array<DirectiveNode>;
+        operationTypes: Array<OperationTypeDefinitionNode>;
     }
 
-    export type OperationTypeDefinition = {
+    export type OperationTypeDefinitionNode = {
         kind: 'OperationTypeDefinition';
         loc?: Location;
-        operation: OperationType;
-        type: NamedType;
+        operation: OperationTypeNode;
+        type: NamedTypeNode;
     }
 
-    export type TypeDefinition = ScalarTypeDefinition
-        | ObjectTypeDefinition
-        | InterfaceTypeDefinition
-        | UnionTypeDefinition
-        | EnumTypeDefinition
-        | InputObjectTypeDefinition
+    export type TypeDefinitionNode = ScalarTypeDefinitionNode
+        | ObjectTypeDefinitionNode
+        | InterfaceTypeDefinitionNode
+        | UnionTypeDefinitionNode
+        | EnumTypeDefinitionNode
+        | InputObjectTypeDefinitionNode
 
-    export type ScalarTypeDefinition = {
+    export type ScalarTypeDefinitionNode = {
         kind: 'ScalarTypeDefinition';
         loc?: Location;
-        name: Name;
-        directives?: Array<Directive>;
+        name: NameNode;
+        directives?: Array<DirectiveNode>;
     }
 
-    export type ObjectTypeDefinition = {
+    export type ObjectTypeDefinitionNode = {
         kind: 'ObjectTypeDefinition';
         loc?: Location;
-        name: Name;
-        interfaces?: Array<NamedType>;
-        directives?: Array<Directive>;
-        fields: Array<FieldDefinition>;
+        name: NameNode;
+        interfaces?: Array<NamedTypeNode>;
+        directives?: Array<DirectiveNode>;
+        fields: Array<FieldDefinitionNode>;
     }
 
-    export type FieldDefinition = {
+    export type FieldDefinitionNode = {
         kind: 'FieldDefinition';
         loc?: Location;
-        name: Name;
-        arguments: Array<InputValueDefinition>;
-        type: Type;
-        directives?: Array<Directive>;
+        name: NameNode;
+        arguments: Array<InputValueDefinitionNode>;
+        type: TypeNode;
+        directives?: Array<DirectiveNode>;
     }
 
-    export type InputValueDefinition = {
+    export type InputValueDefinitionNode = {
         kind: 'InputValueDefinition';
         loc?: Location;
-        name: Name;
-        type: Type;
-        defaultValue?: Value;
-        directives?: Array<Directive>;
+        name: NameNode;
+        type: TypeNode;
+        defaultValue?: ValueNode;
+        directives?: Array<DirectiveNode>;
     }
 
-    export type InterfaceTypeDefinition = {
+    export type InterfaceTypeDefinitionNode = {
         kind: 'InterfaceTypeDefinition';
         loc?: Location;
-        name: Name;
-        directives?: Array<Directive>;
-        fields: Array<FieldDefinition>;
+        name: NameNode;
+        directives?: Array<DirectiveNode>;
+        fields: Array<FieldDefinitionNode>;
     }
 
-    export type UnionTypeDefinition = {
+    export type UnionTypeDefinitionNode = {
         kind: 'UnionTypeDefinition';
         loc?: Location;
-        name: Name;
-        directives?: Array<Directive>;
-        types: Array<NamedType>;
+        name: NameNode;
+        directives?: Array<DirectiveNode>;
+        types: Array<NamedTypeNode>;
     }
 
-    export type EnumTypeDefinition = {
+    export type EnumTypeDefinitionNode = {
         kind: 'EnumTypeDefinition';
         loc?: Location;
-        name: Name;
-        directives?: Array<Directive>;
-        values: Array<EnumValueDefinition>;
+        name: NameNode;
+        directives?: Array<DirectiveNode>;
+        values: Array<EnumValueDefinitionNode>;
     }
 
-    export type EnumValueDefinition = {
+    export type EnumValueDefinitionNode = {
         kind: 'EnumValueDefinition';
         loc?: Location;
-        name: Name;
-        directives?: Array<Directive>;
+        name: NameNode;
+        directives?: Array<DirectiveNode>;
     }
 
-    export type InputObjectTypeDefinition = {
+    export type InputObjectTypeDefinitionNode = {
         kind: 'InputObjectTypeDefinition';
         loc?: Location;
-        name: Name;
-        directives?: Array<Directive>;
-        fields: Array<InputValueDefinition>;
+        name: NameNode;
+        directives?: Array<DirectiveNode>;
+        fields: Array<InputValueDefinitionNode>;
     }
 
-    export type TypeExtensionDefinition = {
+    export type TypeExtensionDefinitionNode = {
         kind: 'TypeExtensionDefinition';
         loc?: Location;
-        definition: ObjectTypeDefinition;
+        definition: ObjectTypeDefinitionNode;
     }
 
-    export type DirectiveDefinition = {
+    export type DirectiveDefinitionNode = {
         kind: 'DirectiveDefinition';
         loc?: Location;
-        name: Name;
-        arguments?: Array<InputValueDefinition>;
-        locations: Array<Name>;
+        name: NameNode;
+        arguments?: Array<InputValueDefinitionNode>;
+        locations: Array<NameNode>;
     }
 
 }
@@ -664,6 +681,7 @@ declare module "graphql/language/kinds" {
     const FLOAT: 'FloatValue';
     const STRING: 'StringValue';
     const BOOLEAN: 'BooleanValue';
+    const NULL: 'NullValue';
     const ENUM: 'EnumValue';
     const LIST: 'ListValue';
     const OBJECT: 'ObjectValue';
@@ -801,7 +819,7 @@ declare module "graphql/language/location" {
 }
 
 declare module "graphql/language/parser" {
-    import { NamedType, Type, Value, Document } from "graphql/language/ast";
+    import { NamedTypeNode, TypeNode, ValueNode, DocumentNode } from "graphql/language/ast";
     import { Source } from "graphql/language/source";
     import { Lexer } from "graphql/language/lexer";
 
@@ -824,7 +842,7 @@ declare module "graphql/language/parser" {
     function parse(
         source: string | Source,
         options?: ParseOptions
-    ): Document;
+    ): DocumentNode;
 
     /**
      * Given a string containing a GraphQL value, parse the AST for that value.
@@ -836,9 +854,9 @@ declare module "graphql/language/parser" {
     function parseValue(
         source: Source | string,
         options?: ParseOptions
-    ): Value;
+    ): ValueNode;
 
-    function parseConstValue<TOptions>(lexer: Lexer<TOptions>): Value;
+    function parseConstValue<TOptions>(lexer: Lexer<TOptions>): ValueNode;
 
     /**
      * Type :
@@ -846,12 +864,20 @@ declare module "graphql/language/parser" {
      *   - ListType
      *   - NonNullType
      */
-    function parseType<TOptions>(lexer: Lexer<TOptions>): Type;
+    function parseType<TOptions>(lexer: Lexer<TOptions>): TypeNode;
+
+    /**
+     * Type :
+     *   - NamedType
+     *   - ListType
+     *   - NonNullType
+     */
+    function parseTypeReference<TOptions>(lexer: Lexer<TOptions>): TypeNode;
 
     /**
      * NamedType : Name
      */
-    function parseNamedType<TOptions>(lexer: Lexer<TOptions>): NamedType;
+    function parseNamedType<TOptions>(lexer: Lexer<TOptions>): NamedTypeNode;
 }
 
 declare module "graphql/language/printer" {
@@ -889,6 +915,7 @@ declare module "graphql/language/visitor" {
         FloatValue: number[];
         StringValue: string[];
         BooleanValue: boolean[];
+        NullValue: null[],
         EnumValue: any[];
         ListValue: string[];
         ObjectValue: string[];
@@ -980,14 +1007,15 @@ declare module "graphql/type/index" {
         TypeNameMetaFieldDef,
     } from 'graphql/type/introspection';
 
+    export { DirectiveLocationEnum } from 'graphql/type/directives';
 }
 
 declare module "graphql/type/definition" {
     import {
-        OperationDefinition,
-        Field,
-        FragmentDefinition,
-        Value,
+        OperationDefinitionNode,
+        FieldNode,
+        FragmentDefinitionNode,
+        ValueNode,
     } from 'graphql/language/ast';
     import { GraphQLSchema } from 'graphql/type/schema';
 
@@ -1136,7 +1164,7 @@ declare module "graphql/type/definition" {
         parseValue(value: any): any;
 
         // Parses an externally provided literal value to use as an input.
-        parseLiteral(valueAST: Value): any;
+        parseLiteral(valueNode: ValueNode): any;
 
         toString(): string;
     }
@@ -1146,7 +1174,7 @@ declare module "graphql/type/definition" {
         description?: string;
         serialize: (value: any) => TInternal;
         parseValue?: (value: any) => TExternal;
-        parseLiteral?: (valueAST: Value) => TInternal;
+        parseLiteral?: (valueNode: ValueNode) => TInternal;
     }
 
     /**
@@ -1192,7 +1220,7 @@ declare module "graphql/type/definition" {
         isTypeOf: GraphQLIsTypeOfFn;
 
         constructor(config: GraphQLObjectTypeConfig<any>);
-        getFields(): GraphQLFieldDefinitionMap;
+        getFields(): GraphQLFieldMap;
         getInterfaces(): Array<GraphQLInterfaceType>;
         toString(): string;
     }
@@ -1207,7 +1235,7 @@ declare module "graphql/type/definition" {
         description?: string
     }
 
-    export type GraphQLTypeResolveFn = (
+    export type GraphQLTypeResolver = (
         value: any,
         context: any,
         info: GraphQLResolveInfo
@@ -1219,7 +1247,7 @@ declare module "graphql/type/definition" {
         info: GraphQLResolveInfo
     ) => boolean;
 
-    export type GraphQLFieldResolveFn<TSource> = (
+    export type GraphQLFieldResolver<TSource> = (
         source: TSource,
         args: { [argName: string]: any },
         context: any,
@@ -1228,21 +1256,23 @@ declare module "graphql/type/definition" {
 
     export interface GraphQLResolveInfo {
         fieldName: string;
-        fieldASTs: Array<Field>;
+        fieldNodes: Array<FieldNode>;
         returnType: GraphQLOutputType;
         parentType: GraphQLCompositeType;
-        path: Array<string | number>;
+        path: ResponsePath;
         schema: GraphQLSchema;
-        fragments: { [fragmentName: string]: FragmentDefinition };
+        fragments: { [fragmentName: string]: FragmentDefinitionNode };
         rootValue: any;
-        operation: OperationDefinition;
+        operation: OperationDefinitionNode;
         variableValues: { [variableName: string]: any };
     }
 
+    export type ResponsePath = { prev: ResponsePath, key: string | number } | void;
+
     export interface GraphQLFieldConfig<TSource> {
         type: GraphQLOutputType;
         args?: GraphQLFieldConfigArgumentMap;
-        resolve?: GraphQLFieldResolveFn<TSource>;
+        resolve?: GraphQLFieldResolver<TSource>;
         deprecationReason?: string;
         description?: string;
     }
@@ -1261,12 +1291,12 @@ declare module "graphql/type/definition" {
         [fieldName: string]: GraphQLFieldConfig<TSource>;
     }
 
-    export interface GraphQLFieldDefinition {
+    export interface GraphQLField {
         name: string;
         description: string;
         type: GraphQLOutputType;
         args: Array<GraphQLArgument>;
-        resolve: GraphQLFieldResolveFn<any>;
+        resolve: GraphQLFieldResolver<any>;
         isDeprecated: boolean;
         deprecationReason: string;
     }
@@ -1278,8 +1308,8 @@ declare module "graphql/type/definition" {
         description?: string;
     }
 
-    export interface GraphQLFieldDefinitionMap {
-        [fieldName: string]: GraphQLFieldDefinition;
+    export interface GraphQLFieldMap {
+        [fieldName: string]: GraphQLField;
     }
 
     /**
@@ -1303,11 +1333,11 @@ declare module "graphql/type/definition" {
     class GraphQLInterfaceType {
         name: string;
         description: string;
-        resolveType: GraphQLTypeResolveFn;
+        resolveType: GraphQLTypeResolver;
 
         constructor(config: GraphQLInterfaceTypeConfig);
 
-        getFields(): GraphQLFieldDefinitionMap;
+        getFields(): GraphQLFieldMap;
 
         toString(): string;
     }
@@ -1320,7 +1350,7 @@ declare module "graphql/type/definition" {
          * the default implementation will call `isTypeOf` on each implementing
          * Object type.
          */
-        resolveType?: GraphQLTypeResolveFn,
+        resolveType?: GraphQLTypeResolver,
         description?: string
     }
 
@@ -1350,7 +1380,7 @@ declare module "graphql/type/definition" {
     class GraphQLUnionType {
         name: string;
         description: string;
-        resolveType: GraphQLTypeResolveFn;
+        resolveType: GraphQLTypeResolver;
 
         constructor(config: GraphQLUnionTypeConfig);
 
@@ -1367,7 +1397,7 @@ declare module "graphql/type/definition" {
          * the default implementation will call `isTypeOf` on each implementing
          * Object type.
          */
-        resolveType?: GraphQLTypeResolveFn;
+        resolveType?: GraphQLTypeResolver;
         description?: string;
     }
 
@@ -1397,10 +1427,10 @@ declare module "graphql/type/definition" {
         description: string;
 
         constructor(config: GraphQLEnumTypeConfig);
-        getValues(): Array<GraphQLEnumValueDefinition>;
+        getValues(): Array<GraphQLEnumValue>;
         serialize(value: any): string;
         parseValue(value: any): any;
-        parseLiteral(valueAST: Value): any;
+        parseLiteral(valueNode: ValueNode): any;
         toString(): string;
     }
 
@@ -1420,7 +1450,7 @@ declare module "graphql/type/definition" {
         description?: string;
     }
 
-    export interface GraphQLEnumValueDefinition {
+    export interface GraphQLEnumValue {
         name: string;
         description: string;
         deprecationReason: string;
@@ -1451,7 +1481,7 @@ declare module "graphql/type/definition" {
         name: string;
         description: string;
         constructor(config: GraphQLInputObjectTypeConfig);
-        getFields(): GraphQLInputFieldDefinitionMap;
+        getFields(): GraphQLInputFieldMap;
         toString(): string;
     }
 
@@ -1471,15 +1501,15 @@ declare module "graphql/type/definition" {
         [fieldName: string]: GraphQLInputFieldConfig;
     }
 
-    export interface GraphQLInputFieldDefinition {
+    export interface GraphQLInputField {
         name: string;
         type: GraphQLInputType;
         defaultValue?: any;
         description?: string;
     }
 
-    export interface GraphQLInputFieldDefinitionMap {
-        [fieldName: string]: GraphQLInputFieldDefinition;
+    export interface GraphQLInputFieldMap {
+        [fieldName: string]: GraphQLInputField;
     }
 
     /**
@@ -1623,7 +1653,7 @@ declare module "graphql/type/introspection" {
         GraphQLList,
         GraphQLNonNull,
     } from 'graphql/type/definition';
-    import { GraphQLFieldDefinition } from 'graphql/type/definition';
+    import { GraphQLField } from 'graphql/type/definition';
 
     const __Schema: GraphQLObjectType;
     const __Directive: GraphQLObjectType;
@@ -1647,12 +1677,12 @@ declare module "graphql/type/introspection" {
     const __TypeKind: GraphQLEnumType;
 
     /**
-     * Note that these are GraphQLFieldDefinition and not GraphQLFieldConfig,
+     * Note that these are GraphQLField and not GraphQLFieldConfig,
      * so the format for args is different.
      */
-    const SchemaMetaFieldDef: GraphQLFieldDefinition;
-    const TypeMetaFieldDef: GraphQLFieldDefinition;
-    const TypeNameMetaFieldDef: GraphQLFieldDefinition;
+    const SchemaMetaFieldDef: GraphQLField;
+    const TypeMetaFieldDef: GraphQLField;
+    const TypeNameMetaFieldDef: GraphQLField;
 }
 
 declare module "graphql/type/scalars" {
@@ -1765,19 +1795,19 @@ declare module "graphql/validation/specifiedRules" {
 declare module "graphql/validation/validate" {
     import { GraphQLError } from 'graphql/error';
     import {
-        Document,
-        OperationDefinition,
-        Variable,
-        SelectionSet,
-        FragmentSpread,
-        FragmentDefinition,
+        DocumentNode,
+        OperationDefinitionNode,
+        VariableNode,
+        SelectionSetNode,
+        FragmentSpreadNode,
+        FragmentDefinitionNode,
     } from 'graphql/language/ast';
     import { GraphQLSchema } from 'graphql/type/schema';
     import {
         GraphQLInputType,
         GraphQLOutputType,
         GraphQLCompositeType,
-        GraphQLFieldDefinition,
+        GraphQLField,
         GraphQLArgument
     } from 'graphql/type/definition';
     import { GraphQLDirective } from 'graphql/type/directives';
@@ -1801,7 +1831,7 @@ declare module "graphql/validation/validate" {
      */
     function validate(
         schema: GraphQLSchema,
-        ast: Document,
+        ast: DocumentNode,
         rules?: Array<any>
     ): Array<GraphQLError>;
 
@@ -1814,13 +1844,13 @@ declare module "graphql/validation/validate" {
     function visitUsingRules(
         schema: GraphQLSchema,
         typeInfo: TypeInfo,
-        documentAST: Document,
+        documentAST: DocumentNode,
         rules: Array<any>
     ): Array<GraphQLError>;
 
-    type HasSelectionSet = OperationDefinition | FragmentDefinition;
+    type NodeWithSelectionSet = OperationDefinitionNode | FragmentDefinitionNode;
     interface VariableUsage {
-        node: Variable,
+        node: VariableNode,
         type: GraphQLInputType
     }
 
@@ -1830,27 +1860,27 @@ declare module "graphql/validation/validate" {
      * validation rule.
      */
     export class ValidationContext {
-        constructor(schema: GraphQLSchema, ast: Document, typeInfo: TypeInfo);
+        constructor(schema: GraphQLSchema, ast: DocumentNode, typeInfo: TypeInfo);
         reportError(error: GraphQLError): void;
 
         getErrors(): Array<GraphQLError>;
 
         getSchema(): GraphQLSchema;
 
-        getDocument(): Document;
+        getDocument(): DocumentNode;
 
-        getFragment(name: string): FragmentDefinition;
+        getFragment(name: string): FragmentDefinitionNode;
 
-        getFragmentSpreads(node: SelectionSet): Array<FragmentSpread>;
+        getFragmentSpreads(node: SelectionSetNode): Array<FragmentSpreadNode>;
 
         getRecursivelyReferencedFragments(
-            operation: OperationDefinition
-        ): Array<FragmentDefinition>;
+            operation: OperationDefinitionNode
+        ): Array<FragmentDefinitionNode>;
 
-        getVariableUsages(node: HasSelectionSet): Array<VariableUsage>;
+        getVariableUsages(node: NodeWithSelectionSet): Array<VariableUsage>;
 
         getRecursiveVariableUsages(
-            operation: OperationDefinition
+            operation: OperationDefinitionNode
         ): Array<VariableUsage>;
 
         getType(): GraphQLOutputType;
@@ -1859,7 +1889,7 @@ declare module "graphql/validation/validate" {
 
         getInputType(): GraphQLInputType;
 
-        getFieldDef(): GraphQLFieldDefinition;
+        getFieldDef(): GraphQLField;
 
         getDirective(): GraphQLDirective;
 
@@ -1877,20 +1907,21 @@ declare module "graphql/execution" {
 }
 
 declare module "graphql/execution/index" {
-    export { execute } from 'graphql/execution/execute';
+    export { execute, defaultFieldResolver, responsePathAsArray, ExecutionResult } from 'graphql/execution/execute';
 }
 
 declare module "graphql/execution/execute" {
     import { GraphQLError, locatedError } from 'graphql/error';
     import { GraphQLSchema } from 'graphql/type/schema';
+    import { GraphQLField, GraphQLFieldResolver, ResponsePath } from 'graphql/type/definition';
     import {
-        Directive,
-        Document,
-        OperationDefinition,
-        SelectionSet,
-        Field,
-        InlineFragment,
-        FragmentDefinition
+        DirectiveNode,
+        DocumentNode,
+        OperationDefinitionNode,
+        SelectionSetNode,
+        FieldNode,
+        InlineFragmentNode,
+        FragmentDefinitionNode,
     } from 'graphql/language/ast';
     /**
      * Data that must be available at all points during query execution.
@@ -1900,9 +1931,9 @@ declare module "graphql/execution/execute" {
      */
     interface ExecutionContext {
         schema: GraphQLSchema;
-        fragments: { [key: string]: FragmentDefinition };
+        fragments: { [key: string]: FragmentDefinitionNode };
         rootValue: any;
-        operation: OperationDefinition;
+        operation: OperationDefinitionNode;
         variableValues: { [key: string]: any };
         errors: Array<GraphQLError>;
     }
@@ -1912,8 +1943,8 @@ declare module "graphql/execution/execute" {
      * query, `errors` is null if no errors occurred, and is a
      * non-empty array if an error occurred.
      */
-    interface ExecutionResult {
-        data: Object;
+    export interface ExecutionResult {
+        data: {[key: string]: any};
         errors?: Array<GraphQLError>;
     }
 
@@ -1927,20 +1958,39 @@ declare module "graphql/execution/execute" {
      */
     function execute(
         schema: GraphQLSchema,
-        documentAST: Document,
+        document: DocumentNode,
         rootValue?: any,
         contextValue?: any,
         variableValues?: {
             [key: string]: any
         },
         operationName?: string
-    ): Promise<ExecutionResult>
+    ): Promise<ExecutionResult>;
+
+    /**
+     * Given a ResponsePath (found in the `path` entry in the information provided
+     * as the last argument to a field resolver), return an Array of the path keys.
+     */
+    export function responsePathAsArray(
+        path: ResponsePath
+    ): Array<string | number>;
+
+    function addPath(prev: ResponsePath, key: string | number): any;
+
+    /**
+     * If a resolve function is not given, then a default resolve behavior is used
+     * which takes the property of the source object of the same name as the field
+     * and returns it as the result, or if it's a function, returns the result
+     * of calling that function while passing along args and context.
+     */
+    export const defaultFieldResolver: GraphQLFieldResolver<any>;
 }
 
 declare module "graphql/execution/values" {
-    import { GraphQLInputType, GraphQLArgument } from 'graphql/type/definition';
+    import { GraphQLInputType, GraphQLField, GraphQLArgument } from 'graphql/type/definition';
+    import { GraphQLDirective } from 'graphql/type/directives';
     import { GraphQLSchema } from 'graphql/type/schema';
-    import { Argument, VariableDefinition } from 'graphql/language/ast';
+    import { FieldNode, DirectiveNode, VariableDefinitionNode } from 'graphql/language/ast';
     /**
      * Prepares an object map of variableValues of the correct type based on the
      * provided variable definitions and arbitrary input. If the input cannot be
@@ -1948,7 +1998,7 @@ declare module "graphql/execution/values" {
      */
     function getVariableValues(
         schema: GraphQLSchema,
-        definitionASTs: Array<VariableDefinition>,
+        varDefNodes: Array<VariableDefinitionNode>,
         inputs: { [key: string]: any }
     ): { [key: string]: any }
 
@@ -1957,8 +2007,8 @@ declare module "graphql/execution/values" {
      * definitions and list of argument AST nodes.
      */
     function getArgumentValues(
-        argDefs: Array<GraphQLArgument>,
-        argASTs: Array<Argument>,
+        def: GraphQLField | GraphQLDirective,
+        node: FieldNode | DirectiveNode,
         variableValues?: { [key: string]: any }
     ): { [key: string]: any };
 }
@@ -1974,7 +2024,7 @@ declare module "graphql/error/index" {
     export { GraphQLError } from 'graphql/error/GraphQLError';
     export { syntaxError } from 'graphql/error/syntaxError';
     export { locatedError } from 'graphql/error/locatedError';
-    export { formatError } from 'graphql/error/formatError';
+    export { formatError, GraphQLFormattedError, GraphQLErrorLocation } from 'graphql/error/formatError';
 }
 
 declare module "graphql/error/formatError" {
@@ -1988,7 +2038,8 @@ declare module "graphql/error/formatError" {
 
     type GraphQLFormattedError = {
         message: string,
-        locations: Array<GraphQLErrorLocation>
+        locations: Array<GraphQLErrorLocation>,
+        path: Array<string | number>
     };
 
     type GraphQLErrorLocation = {
@@ -1999,7 +2050,7 @@ declare module "graphql/error/formatError" {
 
 declare module "graphql/error/GraphQLError" {
     import { getLocation } from 'graphql/language';
-    import { Node } from 'graphql/language/ast';
+    import { ASTNode } from 'graphql/language/ast';
     import { Source } from 'graphql/language/source';
 
     /**
@@ -2040,7 +2091,7 @@ declare module "graphql/error/GraphQLError" {
         /**
          * An array of GraphQL AST Nodes corresponding to this error.
          */
-        nodes: Array<Node> | void;
+        nodes: Array<ASTNode> | void;
 
         /**
          * The source GraphQL document corresponding to this error.
@@ -2100,6 +2151,25 @@ declare module "graphql/utilities" {
 declare module "graphql/utilities/index" {
     // The GraphQL query recommended for a full schema introspection.
     export { introspectionQuery } from 'graphql/utilities/introspectionQuery';
+    export {
+        IntrospectionQuery,
+        IntrospectionSchema,
+        IntrospectionType,
+        IntrospectionScalarType,
+        IntrospectionObjectType,
+        IntrospectionInterfaceType,
+        IntrospectionUnionType,
+        IntrospectionEnumType,
+        IntrospectionInputObjectType,
+        IntrospectionTypeRef,
+        IntrospectionNamedTypeRef,
+        IntrospectionListTypeRef,
+        IntrospectionNonNullTypeRef,
+        IntrospectionField,
+        IntrospectionInputValue,
+        IntrospectionEnumValue,
+        IntrospectionDirective,
+    } from 'graphql/utilities/introspectionQuery';
 
     // Gets the target Operation from a Document
     export { getOperationAST } from 'graphql/utilities/getOperationAST';
@@ -2114,7 +2184,7 @@ declare module "graphql/utilities/index" {
     export { extendSchema } from 'graphql/utilities/extendSchema';
 
     // Print a GraphQLSchema to GraphQL Schema language.
-    export { printSchema, printIntrospectionSchema } from 'graphql/utilities/schemaPrinter';
+    export { printSchema, printType, printIntrospectionSchema } from 'graphql/utilities/schemaPrinter';
 
     // Create a GraphQLType from a GraphQL language AST.
     export { typeFromAST } from 'graphql/utilities/typeFromAST';
@@ -2153,6 +2223,7 @@ declare module "graphql/utilities/index" {
 
     // Compares two GraphQLSchemas and detects breaking changes.
     export { findBreakingChanges } from 'graphql/utilities/findBreakingChanges';
+    export { BreakingChange } from 'graphql/utilities/findBreakingChanges';
 }
 
 declare module "graphql/utilities/assertValidName" {
@@ -2162,14 +2233,14 @@ declare module "graphql/utilities/assertValidName" {
 
 declare module "graphql/utilities/astFromValue" {
     import {
-        Value,
-        //IntValue,
-        //FloatValue,
-        //StringValue,
-        //BooleanValue,
-        //EnumValue,
-        //ListValue,
-        //ObjectValue,
+        ValueNode,
+        //IntValueNode,
+        //FloatValueNode,
+        //StringValueNode,
+        //BooleanValueNode,
+        //EnumValueNode,
+        //ListValueNode,
+        //ObjectValueNode,
     } from 'graphql/language/ast';
     import { GraphQLInputType } from 'graphql/type/definition';
 
@@ -2193,11 +2264,11 @@ declare module "graphql/utilities/astFromValue" {
     export function astFromValue(
         value: any,
         type: GraphQLInputType
-    ): Value // Warning: there is a code in bottom: throw new TypeError
+    ): ValueNode // Warning: there is a code in bottom: throw new TypeError
 }
 
 declare module "graphql/utilities/buildASTSchema" {
-    import { Document, Location } from 'graphql/language/ast';
+    import { DocumentNode, Location } from 'graphql/language/ast';
     import { Source } from 'graphql/language/source';
     import { GraphQLSchema } from 'graphql/type/schema';
 
@@ -2211,7 +2282,7 @@ declare module "graphql/utilities/buildASTSchema" {
      * Given that AST it constructs a GraphQLSchema. The resulting schema
      * has no resolve methods, so execution will use default resolvers.
      */
-    function buildASTSchema(ast: Document): GraphQLSchema;
+    function buildASTSchema(ast: DocumentNode): GraphQLSchema;
 
     /**
      * Given an ast node, returns its string description based on a contiguous
@@ -2256,17 +2327,17 @@ declare module "graphql/utilities/buildClientSchema" {
 }
 
 declare module "graphql/utilities/concatAST" {
-    import { Document } from 'graphql/language/ast';
+    import { DocumentNode } from 'graphql/language/ast';
     /**
      * Provided a collection of ASTs, presumably each from different files,
      * concatenate the ASTs together into batched AST, useful for validating many
      * GraphQL source files which together represent one conceptual application.
      */
-    function concatAST(asts: Array<Document>): Document;
+    function concatAST(asts: Array<DocumentNode>): DocumentNode;
 }
 
 declare module "graphql/utilities/extendSchema" {
-    import { Document } from 'graphql/language/ast';
+    import { DocumentNode } from 'graphql/language/ast';
     import { GraphQLSchema } from 'graphql/type/schema';
 
     /**
@@ -2283,7 +2354,7 @@ declare module "graphql/utilities/extendSchema" {
      */
     function extendSchema(
         schema: GraphQLSchema,
-        documentAST: Document
+        documentAST: DocumentNode
     ): GraphQLSchema;
 }
 
@@ -2339,8 +2410,6 @@ declare module "graphql/utilities/findBreakingChanges" {
         newSchema: GraphQLSchema
     ): Array<BreakingChange>
 
-    function typeKindName(type: GraphQLNamedType): string
-
     /**
      * Given two schemas, returns an Array containing descriptions of any breaking
      * changes in the newSchema related to changing the type of a type.
@@ -2350,8 +2419,6 @@ declare module "graphql/utilities/findBreakingChanges" {
         newSchema: GraphQLSchema
     ): Array<BreakingChange>
 
-    function typeKindName(type: GraphQLNamedType): string;
-
     /**
      * Given two schemas, returns an Array containing descriptions of any breaking
      * changes in the newSchema related to the fields on a type. This includes if
@@ -2382,7 +2449,7 @@ declare module "graphql/utilities/findBreakingChanges" {
 }
 
 declare module "graphql/utilities/getOperationAST" {
-    import { Document, OperationDefinition } from 'graphql/language/ast';
+    import { DocumentNode, OperationDefinitionNode } from 'graphql/language/ast';
 
     /**
      * Returns an operation AST given a document AST and optionally an operation
@@ -2390,9 +2457,9 @@ declare module "graphql/utilities/getOperationAST" {
      * provided in the document.
      */
     export function getOperationAST(
-        documentAST: Document,
+        documentAST: DocumentNode,
         operationName: string
-    ): OperationDefinition;
+    ): OperationDefinitionNode;
 }
 
 declare module "graphql/utilities/introspectionQuery" {
@@ -2623,7 +2690,7 @@ declare module "graphql/utilities/isValidJSValue" {
 }
 
 declare module "graphql/utilities/isValidLiteralValue" {
-    import { Value } from 'graphql/language/ast';
+    import { ValueNode } from 'graphql/language/ast';
     import { GraphQLInputType } from 'graphql/type/definition';
 
     /**
@@ -2635,27 +2702,30 @@ declare module "graphql/utilities/isValidLiteralValue" {
      */
     function isValidLiteralValue(
         type: GraphQLInputType,
-        valueAST: Value
+        valueNode: ValueNode
     ): Array<string>
 }
 
 declare module "graphql/utilities/schemaPrinter" {
     import { GraphQLSchema } from 'graphql/type/schema';
+    import { GraphQLType } from 'graphql/type/definition';
 
     function printSchema(schema: GraphQLSchema): string;
 
     function printIntrospectionSchema(schema: GraphQLSchema): string;
+
+    function printType(type: GraphQLType): string
 }
 
 declare module "graphql/utilities/separateOperations" {
     import {
-        Document,
-        OperationDefinition,
+        DocumentNode,
+        OperationDefinitionNode,
     } from 'graphql/language/ast';
 
     function separateOperations(
-        documentAST: Document
-    ): { [operationName: string]: Document }
+        documentAST: DocumentNode
+    ): { [operationName: string]: DocumentNode }
 }
 
 declare module "graphql/utilities/typeComparators" {
@@ -2700,13 +2770,13 @@ declare module "graphql/utilities/typeComparators" {
 }
 
 declare module "graphql/utilities/typeFromAST" {
-    import { Type } from 'graphql/language/ast';
+    import { TypeNode } from 'graphql/language/ast';
     import { GraphQLType, GraphQLNullableType } from 'graphql/type/definition';
     import { GraphQLSchema } from 'graphql/type/schema';
 
     function typeFromAST(
         schema: GraphQLSchema,
-        inputTypeAST: Type
+        typeNode: TypeNode
     ): GraphQLType
 }
 
@@ -2717,14 +2787,14 @@ declare module "graphql/utilities/TypeInfo" {
 declare module "graphql/utilities/valueFromAST" {
     import { GraphQLInputType } from 'graphql/type/definition';
     import {
-        Value,
-        Variable,
-        ListValue,
-        ObjectValue
+        ValueNode,
+        VariableNode,
+        ListValueNode,
+        ObjectValueNode
     } from 'graphql/language/ast';
 
     function valueFromAST(
-        valueAST: Value,
+        valueNode: ValueNode,
         type: GraphQLInputType,
         variables?: {
             [key: string]: any

From 4499a752a51c9b97334e5b83cfd7fbfdfa3b2dab Mon Sep 17 00:00:00 2001
From: Shi Yan <yenshih95@gmail.com>
Date: Thu, 17 Nov 2016 15:08:46 +0800
Subject: [PATCH 148/245] Fixed LocationDescriptor and pathOrLoc types.

---
 react-router/react-router.d.ts | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index 321adf9bb7..80a071f18d 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -28,8 +28,15 @@ declare namespace ReactRouter {
 
     type ParseQueryString = (queryString: H.QueryString) => H.Query
 
+    type LocationDescriptor = {
+        pathname?: H.Pathname
+        query?: H.Query
+        hash?: H.Hash
+        state?: H.LocationState
+    }
+
     interface RedirectFunction {
-        (location: H.LocationDescriptor): void;
+        (location: LocationDescriptor): void;
         /**
         * @deprecated `replaceState(state, pathname, query) is deprecated; Use `replace(location)` with a location descriptor instead. http://tiny.cc/router-isActivedeprecated
         */
@@ -116,9 +123,7 @@ declare namespace ReactRouter {
         activeStyle?: React.CSSProperties
         activeClassName?: string
         onlyActiveOnIndex?: boolean
-        to: RoutePattern | H.LocationDescriptor
-        query?: H.Query
-        state?: H.LocationState
+        to: RoutePattern | LocationDescriptor | ((...args: any[]) => LocationDescriptor)
     }
     interface Link extends React.ComponentClass<LinkProps> {}
     interface LinkElement extends React.ReactElement<LinkProps> {}
@@ -216,7 +221,7 @@ declare namespace ReactRouter {
 
     interface RouterOnContext extends H.History {
         setRouteLeaveHook(route: PlainRoute, hook?: RouteHook): () => void;
-        isActive(pathOrLoc: H.LocationDescriptor, indexOnly?: boolean): boolean;
+        isActive(pathOrLoc: H.Path | LocationDescriptor, indexOnly?: boolean): boolean;
     }
 
     /* mixins */
@@ -244,15 +249,15 @@ declare namespace ReactRouter {
     // https://github.com/reactjs/react-router/blob/v2.4.0/upgrade-guides/v2.4.0.md
 
     interface InjectedRouter {
-        push: (pathOrLoc: H.LocationDescriptor) => void
-        replace: (pathOrLoc: H.LocationDescriptor) => void
+        push: (pathOrLoc: H.Path | LocationDescriptor) => void
+        replace: (pathOrLoc: H.Path | LocationDescriptor) => void
         go: (n: number) => void
         goBack: () => void
         goForward: () => void
         setRouteLeaveHook(route: PlainRoute, callback: RouteHook): void
         createPath(path: H.Path, query?: H.Query): H.Path
         createHref(path: H.Path, query?: H.Query): H.Href
-        isActive: (pathOrLoc: H.LocationDescriptor, indexOnly?: boolean) => boolean
+        isActive: (pathOrLoc: H.Path | LocationDescriptor, indexOnly?: boolean) => boolean
     }
 
     function withRouter<C extends React.ComponentClass<any> | React.StatelessComponent<any> | React.PureComponent<any, any>>(component: C): C
@@ -520,7 +525,8 @@ declare module "react-router" {
     export type LeaveHook = ReactRouter.LeaveHook
     export type ParseQueryString = ReactRouter.ParseQueryString
     export type RedirectFunction = ReactRouter.RedirectFunction
-    export type RouteComponentProps<P, R> = ReactRouter.RouteComponentProps<P, R>;
+    export type RouteComponentProps<P, R> = ReactRouter.RouteComponentProps<P, R>
+    export type RouteConfig = ReactRouter.RouteConfig
     export type RouteHook = ReactRouter.RouteHook
     export type StringifyQuery = ReactRouter.StringifyQuery
     export type RouterListener = ReactRouter.RouterListener

From 1dbe3a80d4cafdbe0a5f477b3ece587c2b59ae21 Mon Sep 17 00:00:00 2001
From: TonyYang <tonypythoneer@gmail.com>
Date: Thu, 17 Nov 2016 15:22:08 +0800
Subject: [PATCH 149/245] Meet types-2.0 style

---
 response-time/index.d.ts | 43 +++++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/response-time/index.d.ts b/response-time/index.d.ts
index 8ab91c86ec..d652e8fa0b 100644
--- a/response-time/index.d.ts
+++ b/response-time/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for response-time 2.2.0
+// Type definitions for response-time 2.3.2
 // Project: https://github.com/expressjs/response-time
-// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>
+// Definitions by: Uros Smolnik <https://github.com/urossmolnik/>, TonyYang <https://github.com/TonyPythoneer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+
 /* =================== USAGE ===================
 
     import responseTime = require('response-time');
@@ -11,27 +12,33 @@
  =============================================== */
 
 
+/// <reference types="express" />
+/// <reference types="node" />
+
+import express = require("express");
+import http = require("http");
 
 
-import express = require('express');
+export = responseTime;
 
 /**
  * Response time header for node.js
  * Returns middleware that adds a X-Response-Time header to responses.
  */
-declare function responseTime(options?: {
-    /**
-    * The fixed number of digits to include in the output, which is always in milliseconds, defaults to 3 (ex: 2.300ms).
-    */
-    digits?: number;
-    /**
-     * The name of the header to set, defaults to X-Response-Time.
-     */
-    header?: string;
-    /**
-     * Boolean to indicate if units of measurement suffix should be added to the output, defaults to true (ex: 2.300ms vs 2.300).
-     */
-    suffix?: boolean;
-}): express.RequestHandler;
+declare function responseTime(options?: responseTime.ResponseTimeOptions):
+    (request: http.IncomingMessage, response: http.ServerResponse, callback: (err: any) => void) => any;
+declare function responseTime(fn: responseTime.ResponseTimeFunction):
+    (request: http.IncomingMessage, response: http.ServerResponse, callback: (err: any) => void) => any;
 
-export = responseTime;
+
+declare namespace responseTime {
+    export interface ResponseTimeOptions {
+        digits?: number;
+        header?: string;
+        suffix?: boolean;
+    }
+
+    export interface ResponseTimeFunction {
+        (request: http.IncomingMessage, response: http.ServerResponse, time: number ): any;
+    }
+}

From b6b49f736fa3f4d72e3ec7909a2332562da0a436 Mon Sep 17 00:00:00 2001
From: TonyYang <tonypythoneer@gmail.com>
Date: Thu, 17 Nov 2016 15:23:31 +0800
Subject: [PATCH 150/245] Use official examples as tests

---
 response-time/response-time-tests.ts | 48 ++++++++++++++++++++++------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/response-time/response-time-tests.ts b/response-time/response-time-tests.ts
index 8c5e9595dd..b6a9b4a2af 100644
--- a/response-time/response-time-tests.ts
+++ b/response-time/response-time-tests.ts
@@ -1,11 +1,41 @@
-
-import express = require('express');
 import responseTime = require('response-time');
-var app = express();
 
-app.use(responseTime());
-app.use(responseTime({
-    digits: 3,
-    header: 'X-Response-Time',
-    suffix: true
-}));
+
+////////////////////////////////////////////////////////////////////////////////////
+// expressconnect tests https://github.com/expressjs/response-time#expressconnect //
+////////////////////////////////////////////////////////////////////////////////////
+import express = require('express')
+namespace express_connect_tests {
+    const app = express()
+    app.use(responseTime())
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////
+// vanilla http server tests https://github.com/expressjs/response-time#vanilla-http-server //
+//////////////////////////////////////////////////////////////////////////////////////////////
+import http = require('http')
+namespace vanilla_http_server_tests {
+    // create "middleware"
+    var _responseTime = responseTime()
+    http.createServer(function (req, res) {
+        _responseTime(req, res, function (err) {
+            if (err) return console.log(err);
+
+            // respond to request
+            res.setHeader('content-type', 'text/plain')
+            res.end('hello, world!')
+        })
+    })
+}
+
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// response time metrics tests https://github.com/expressjs/response-time#response-time-metrics //
+//////////////////////////////////////////////////////////////////////////////////////////////////
+namespace response_time_metrics_tests {
+    const app = express()
+    app.use(responseTime(function (req, res, time) {
+        let num: number = time;
+    }));
+}

From c531f05b6263d58da32b1ec395b8ee52baa496b1 Mon Sep 17 00:00:00 2001
From: TonyYang <tonypythoneer@gmail.com>
Date: Thu, 17 Nov 2016 15:35:32 +0800
Subject: [PATCH 151/245] Unused express

---
 response-time/index.d.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/response-time/index.d.ts b/response-time/index.d.ts
index d652e8fa0b..5f3e86e6bb 100644
--- a/response-time/index.d.ts
+++ b/response-time/index.d.ts
@@ -12,10 +12,9 @@
  =============================================== */
 
 
-/// <reference types="express" />
 /// <reference types="node" />
 
-import express = require("express");
+
 import http = require("http");
 
 

From ea0856e3a382d5a6957f6f0a581a1331a19223ad Mon Sep 17 00:00:00 2001
From: Mike Masey <mike.masey@yoyodesign.com>
Date: Thu, 17 Nov 2016 12:50:05 +0000
Subject: [PATCH 152/245] Add module declaration

---
 swiper/index.d.ts | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/swiper/index.d.ts b/swiper/index.d.ts
index 3bbe90267f..cbb35e003f 100644
--- a/swiper/index.d.ts
+++ b/swiper/index.d.ts
@@ -194,3 +194,12 @@ declare class Swiper {
     getLastSlide(): SwiperSlide;
     getFirstSlide(): SwiperSlide;
 }
+
+declare module "swiper" {
+    const swiper: {
+		new (element: Element, options?: SwiperOptions): Swiper;
+		new (element: string, options?: SwiperOptions): Swiper;
+	};
+
+    export = swiper;
+}
\ No newline at end of file

From fe1706d38fcbfb3d1af981ec7556d640d464ab00 Mon Sep 17 00:00:00 2001
From: Mike Masey <mike.masey@yoyodesign.com>
Date: Thu, 17 Nov 2016 13:16:14 +0000
Subject: [PATCH 153/245] Add newline at end of file.

---
 swiper/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/swiper/index.d.ts b/swiper/index.d.ts
index cbb35e003f..cb6ff159f1 100644
--- a/swiper/index.d.ts
+++ b/swiper/index.d.ts
@@ -202,4 +202,4 @@ declare module "swiper" {
 	};
 
     export = swiper;
-}
\ No newline at end of file
+}

From d4b2e37e1c71085aeb69401a8ccd45c1a4c36b74 Mon Sep 17 00:00:00 2001
From: Shi Yan <yenshih95@gmail.com>
Date: Thu, 17 Nov 2016 21:43:53 +0800
Subject: [PATCH 154/245] Export LocationDescriptor

---
 react-router/react-router.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index 80a071f18d..930273bf7f 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -524,6 +524,7 @@ declare module "react-router" {
     export type EnterHook = ReactRouter.EnterHook
     export type LeaveHook = ReactRouter.LeaveHook
     export type ParseQueryString = ReactRouter.ParseQueryString
+    export type LocationDescriptor = ReactRouter.LocationDescriptor
     export type RedirectFunction = ReactRouter.RedirectFunction
     export type RouteComponentProps<P, R> = ReactRouter.RouteComponentProps<P, R>
     export type RouteConfig = ReactRouter.RouteConfig

From 1b8b8676802cc56e122ebe484296020aed48b819 Mon Sep 17 00:00:00 2001
From: Artur Eshenbrener <strate@yandex.ru>
Date: Thu, 17 Nov 2016 17:32:10 +0300
Subject: [PATCH 155/245] react-virtualized: improve types of WindowScroller

Added module, which exported together with class, which exports neede types.
Also, there should be typing for children, bu typescript does not support it.
---
 react-virtualized/index.d.ts                  | 21 +++++++++++++++++--
 react-virtualized/react-virtualized-tests.tsx | 11 ++++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/react-virtualized/index.d.ts b/react-virtualized/index.d.ts
index f00215ffd2..345dcc79db 100644
--- a/react-virtualized/index.d.ts
+++ b/react-virtualized/index.d.ts
@@ -118,6 +118,23 @@ declare module "react-virtualized" {
     type ScrollSyncProps = any;
     export class ScrollSync extends React.Component<ScrollSyncProps, {}> { }
 
-    type WindowScrollerProps = any;
-    export class WindowScroller extends React.Component<WindowScrollerProps, {}> { }
+    export module WindowScroller {
+        export type OnResizeArg = {
+            height: number;
+        }
+        export type OnScrollArg = {
+            scrollTop: number;
+        }
+        export type RenderCallbackArg = {
+            height: number;
+            scrollTop: number;
+            isScrolling: boolean;
+        }
+        export type Props = {
+            onScroll?: (arg: OnScrollArg) => void;
+            onResize?: (arg: OnResizeArg) => void;
+            // TODO `children` should be typed here
+        };
+    }
+    export class WindowScroller extends React.Component<WindowScroller.Props, {}> { }
 }
diff --git a/react-virtualized/react-virtualized-tests.tsx b/react-virtualized/react-virtualized-tests.tsx
index 1cb9d97c1b..6c799746fd 100644
--- a/react-virtualized/react-virtualized-tests.tsx
+++ b/react-virtualized/react-virtualized-tests.tsx
@@ -291,9 +291,11 @@ function ScrollSyncTest() {
 }
 
 function WindowScrollerTest() {
+    const onScroll = function({scrollTop}: WindowScroller.OnScrollArg) {};
+    const onResize = function({height}: WindowScroller.OnResizeArg) {};
     ReactDOM.render(
-        <WindowScroller>
-            {({ height, isScrolling, scrollTop }) => (
+        <WindowScroller onScroll={onScroll} onResize={onResize}>
+            {({ height, isScrolling, scrollTop }: WindowScroller.RenderCallbackArg) => (
                 <VirtualScroll
                     autoHeight
                     height={height}
@@ -306,4 +308,9 @@ function WindowScrollerTest() {
         </WindowScroller>,
         document.getElementById('example')
     );
+    // test that onScroll & onResize are optional
+    ReactDOM.render(
+        <WindowScroller />,
+        document.getElementById('example')
+    );
 }

From 9a6e6c2d5f40ffd7ccee5b75b8ca237b69226114 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 7 Oct 2016 13:49:54 -0700
Subject: [PATCH 156/245] Linqsharp provides its own types

---
 linqsharp/index.d.ts         | 498 -----------------------------------
 linqsharp/linqsharp-tests.ts |  91 -------
 linqsharp/tsconfig.json      |  19 --
 notNeededPackages.json       |   6 +
 4 files changed, 6 insertions(+), 608 deletions(-)
 delete mode 100644 linqsharp/index.d.ts
 delete mode 100644 linqsharp/linqsharp-tests.ts
 delete mode 100644 linqsharp/tsconfig.json

diff --git a/linqsharp/index.d.ts b/linqsharp/index.d.ts
deleted file mode 100644
index 742698ed86..0000000000
--- a/linqsharp/index.d.ts
+++ /dev/null
@@ -1,498 +0,0 @@
-// Type definitions for linqsharp
-// Project: https://www.npmjs.com/package/linqsharp
-// Definitions by: Bruno Leonardo Michels <https://github.com/brunolm>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// JSDoc: Extracted and adapted from .NET source code.
-
-/**
- * LinqSharp module defines a helper class with
- * .NET's Linq methods.
- *
- * @module linqsharp
- */
-
-export declare namespace LinqSharp {
-    /**
-     * Defines methods to support the comparison of objects for equality.
-     *
-     * {T} The type of objects to compare.
-     */
-    export interface IEqualityComparer<T> {
-        Equals(x: T, y: T): boolean;
-        GetHashCode(obj: T): number;
-    }
-
-    /**
-     * Represents a collection of objects that have a common key.
-     *
-     * {TKey} The type of the key.
-     * {T} The type of the values.
-     */
-    export interface IGrouping<TKey, T> {
-        Key: TKey;
-        Elements: T[];
-    }
-
-    /**
-     * Gets the HashCode of the object.
-     *
-     * @param e Object to compute hash.
-     * @returns A computed HashCode for the object.
-     */
-    export function GetHashCode(e: any): any;
-
-    /**
-     * Transforms a object into a string replacing circular
-     * references by reference tokens.
-     *
-     * @param obj Object to convert to string.
-     * @returns String representation of the object.
-     */
-    export function StringifyNonCircular(obj: any): string;
-}
-
-/**
- * Wrapper class for an array that provides Linq functionallity.
- *
- * @class Linq<T>
- */
-declare class Linq<T> {
-    /** {T[]} Internal array reference. */
-    private a: T[];
-
-    /**
-     * Creates a new instance holding an array of <T>.
-     * @constructor
-     *
-     * @param {Array} a Array.
-     */
-    constructor(a?: T[]);
-
-    /**
-     * Applies an accumulator function over a sequence.
-     *
-     * @param func An accumulator function to be
-     * invoked on each element.
-     * @param {T} [initialValue] The initial accumulator value.
-     *
-     * @throws Error if array is empty.
-     *
-     * @returns {T} The final accumulator value.
-     */
-    Aggregate<TResult>(func: (previous: T, next: T) => TResult, initialValue?: T): T;
-
-    /**
-     * Determines whether all elements of a sequence satisfy a condition.
-     *
-     * @param predicate A function to test each element for a condition.
-     *
-     * @returns true if every element of the source sequence passes the test in the specified
-     * predicate, or if the sequence is empty; otherwise, false.
-     */
-    All(predicate: (value: T) => boolean): boolean;
-
-    /**
-     * Determines whether a sequence contains any elements.
-     *
-     * @param [predicate] A function to test each element for a condition.
-     *
-     * @returns true if any elements in the source sequence pass the test in the specified predicate;
-     * otherwise, false. If no predicate is specified return true if the source sequence contains any elements;
-     * otherwise, false.
-     */
-    Any(predicate?: (value: T) => boolean): boolean;
-
-    /**
-     * Computes the average of a sequence of {number} values.
-     *
-     * @param [selector] A transform function to apply to each element.
-     *
-     * @returns The average of the sequence of values.
-     */
-    Average(selector?: (value: T) => number): number;
-
-    /**
-     * Concatenates two sequences.
-     *
-     * @param array The sequence to concatenate to the first sequence.
-     *
-     * @returns An array that contains the concatenated elements of the two input sequences.
-     */
-    Concat(array: T[]): Linq<T>;
-
-    /**
-     * Determines whether a sequence contains a specified element by using a specified comparer.
-     *
-     * @param value The value to locate in the sequence.
-     * @param [comparer] An IEqualityComparer<T> to compare values.
-     *
-     * @returns true if the source sequence contains an element that has the specified value;
-     * otherwise, false.
-     */
-    Contains(value: T, comparer?: LinqSharp.IEqualityComparer<T>): boolean;
-
-    /**
-     * Returns a number that represents how many elements in the specified sequence satisfy a condition.
-     *
-     * @param [selector] A function to test each element for a condition.
-     *
-     * @returns A number that represents how many elements in the sequence satisfy the condition
-     * in the predicate function.
-     */
-    Count(selector?: (value: T) => boolean): number;
-
-    /**
-     * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
-     * to compare values.
-     *
-     * @param [comparer] An IEqualityComparer<T> to compare values.
-     *
-     * @returns An array that contains distinct elements from the source sequence.
-     */
-    Distinct(comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-    /**
-     * Returns distinct elements from a sequence by using a specified IEqualityComparer<T>
-     * to compare values.
-     *
-     * @param selector A function to test each element for a condition.
-     * @param [comparer] An IEqualityComparer<T> to compare values.
-     *
-     * @returns An array that contains distinct elements from the source sequence.
-     */
-    DistinctBy<U>(selector: (e: T) => U, comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-    /**
-     * Returns the element at a specified index in a sequence.
-     *
-     * @param index The zero-based index of the element to retrieve.
-     *
-     * @throws index is less than 0 or greater than or equal to the number of elements in source.
-     *
-     * @returns The element at the specified position in the source sequence.
-     */
-    ElementAt(index: number): T;
-
-    /**
-     * Returns the element at a specified index in a sequence or a default value if
-     * the index is out of range.
-     *
-     * @param index The zero-based index of the element to retrieve.
-     * @param defaultValue A default value if no element is found.
-     *
-     * @returns defaultValue if the index is outside the bounds of the source sequence;
-     * otherwise, the element at the specified position in the source sequence.
-     */
-    ElementAtOrDefault(index: number, defaultValue: T): T;
-
-    /**
-     * Produces the set difference of two sequences by using the specified IEqualityComparer<T>
-     * to compare values.
-     *
-     * @param except An array whose elements that also occur in the first sequence will cause
-     * those elements to be removed from the returned sequence.
-     * @param [comparer] An IEqualityComparer<T> to compare values.
-     *
-     * @returns A sequence that contains the set difference of the elements of two sequences.
-     */
-    Except(except: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-    /**
-     * Returns the first element in a sequence that satisfies a specified condition.
-     *
-     * @param [selector] A function to test each element for a condition.
-     *
-     * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
-     *
-     * @returns The first element in the sequence that passes the test in the specified predicate function.
-     */
-    First(selector?: (e: T) => boolean): T;
-
-    /**
-     * Returns the first element of the sequence that satisfies a condition or a default
-     * value if no such element is found.
-     *
-     * @param [selector] A function to test each element for a condition.
-     * @param [defaultValue] A default value to return if no element is found.
-     *
-     * @returns defaultValue if source is empty or if no element passes the test specified by predicate;
-     * otherwise, the first element in source that passes the test specified by predicate.
-     */
-    FirstOrDefault(selector?: (e: T) => boolean, defaultValue?: T): T;
-
-    /**
-     * Performs the specified action on each element of the array.
-     *
-     * @param callback The function delegate to perform on each element of the array.
-     */
-    ForEach(callback: (e: T, index: number) => any): void;
-
-    /**
-     * Groups the elements of a sequence according to a specified key selector function.
-     *
-     * @param keySelector A function to extract the key for each element.
-     * @param [elementSelector] A function to create a result value from each group.
-     * @param [comparer] An IEqualityComparer<TKey> to compare keys with.
-     *
-     * @returns A collection of elements of type TResult where each element represents a projection
-     * over a group and its key.
-     */
-    GroupBy<TKey, TElement>(keySelector: (e: T) => TKey, elementSelector?: (e: T) => TElement, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<any>;
-
-    /**
-     * Searches for the specified object and returns the zero-based index of the first
-     * occurrence within the entire array.
-     *
-     * @param e The object to locate in the array.
-     * @param [comparer] An IEqualityComparer<T> to compare elements with.
-     *
-     * @returns The zero-based index of the first occurrence of item within the entire array, if found;
-     * otherwise, –1.
-     */
-    IndexOf(e: T, comparer?: LinqSharp.IEqualityComparer<T>): number;
-
-    /**
-     * Produces the set intersection of two sequences by using the specified IEqualityComparer<T>
-     * to compare values.
-     *
-     * @param array An array whose distinct elements that also appear in the first sequence will be returned.
-     * @param [comparer] An IEqualityComparer<T> to compare values.
-     *
-     * @returns A sequence that contains the elements that form the set intersection of two sequences.
-     */
-    Intersect(array: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-    /**
-     * Correlates the elements of two sequences based on matching keys. A specified IEqualityComparer<T> is used to compare keys.
-     *
-     * @param array The sequence to join to the first sequence.
-     * @param outerKeySelector A function to extract the join key from each element of the first sequence.
-     * @param innerKeySelector A function to extract the join key from each element of the second sequence.
-     * @param resultSelector A function to create a result element from two matching elements.
-     * @param [comparer] An IEqualityComparer<T> to hash and compare keys.
-     *
-     * @returns An array that has elements of type TResult that are obtained by performing an inner join on two sequences.
-     */
-    Join<TInner, TKey, TResult>(array: TInner[], outerKeySelector: (e: T) => TKey, innerKeySelector: (e: TInner) => TKey, resultSelector: (outer: T, inner: TInner) => TResult, comparer?: LinqSharp.IEqualityComparer<TKey>): Linq<TResult>;
-
-    /**
-     * Returns the last element of a sequence that satisfies a specified condition.
-     *
-     * @param [predicate] A function to test each element for a condition.
-     *
-     * @throws No element satisfies the condition in predicate.-or-The source sequence is empty.
-     *
-     * @returns The last element in the sequence that passes the test in the specified predicate function.
-     */
-    Last(predicate?: (e: T) => boolean): T;
-
-    /**
-     * Returns the last element of a sequence that satisfies a condition or a default
-     * value if no such element is found.
-     *
-     * @param [predicate] A function to test each element for a condition.
-     * @param [defaultValue] A default value to return if no element is found.
-     *
-     * @returns defaultValue if the sequence is empty or if no elements pass the test in
-     * the predicate function; otherwise, the last element that passes the test in the
-     * predicate function.
-     */
-    LastOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
-
-    /**
-     * Returns the maximum value in a sequence of System.Double values.
-     *
-     * @param [selector] A transform function to apply to each element.
-     *
-     * @returns The maximum value in the sequence.
-     */
-    Max(): T;
-    Max<TResult>(selector?: (e: T) => TResult): TResult;
-
-    /**
-     * Returns the minimum value in a sequence of System.Int64 values.
-     *
-     * @param [selector] A transform function to apply to each element.
-     *
-     * @returns The minimum value in the sequence.
-     */
-    Min(): T;
-    Min<TResult>(selector?: (e: T) => TResult): TResult;
-
-    /**
-     * Sorts the elements of a sequence in ascending order according to a key.
-     *
-     * @param keySelector A function to extract a key from an element.
-     * @param [comparer] An IEqualityComparer<T> to compare values.
-     *
-     * @returns An array whose elements are sorted according to a key.
-     */
-    OrderBy<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
-
-    /**
-     * Sorts the elements of a sequence in descending order according to a key.
-     *
-     * @param keySelector A function to extract a key from an element.
-     * @param [comparer] An IEqualityComparer<T> to compare values.
-     *
-     * @returns An array whose elements are sorted in descending order according to a key.
-     */
-    OrderByDescending<TKey>(keySelector: (e: T) => TKey, comparer?: (a: TKey, b: TKey) => number): Linq<T>;
-
-    /**
-     * Inverts the order of the elements in a sequence.
-     *
-     * @returns A sequence whose elements correspond to those of the input sequence in reverse order.
-     */
-    Reverse(): Linq<T>;
-
-    /**
-     * Projects each element of a sequence into a new form.
-     *
-     * @param selector A transform function to apply to each element.
-     *
-     * @returns An array whose elements are the result of invoking the transform function on each element of source.
-     */
-    Select<TResult>(selector: (e: T, i?: number) => TResult): Linq<TResult>;
-
-    /**
-     * Projects each element of a sequence to an array flattens the resulting sequences into one sequence,
-     * and invokes a result selector function on each element therein.
-     *
-     * @param selector A transform function to apply to each element of the input sequence.
-     * @param [resultSelector] A transform function to apply to each element of the intermediate sequence.
-     *
-     * @returns An array whose elements are the result of invoking the one-to-many transform function
-     * selector on each element of source and then mapping each of those sequence elements and
-     * their corresponding source element to a result element.
-     */
-    SelectMany<TResult>(selector: (e: T) => T[], resultSelector?: (e: T) => TResult): Linq<TResult>;
-
-    /**
-     * Determines whether two sequences are equal by comparing their elements by using
-     * a specified IEqualityComparer<T>.
-     *
-     * @param second An array to compare to the first sequence.
-     * @param [comparer] An equality comparer to compare values.
-     *
-     * @returns true if the two source sequences are of equal length and their corresponding
-     * elements compare equal according to comparer; otherwise, false.
-     */
-    SequenceEqual(second: T[], comparer?: (a: T, b: T) => boolean): boolean;
-
-    /**
-     * Returns the only element of a sequence that satisfies a specified condition,
-     * and throws an exception if more than one such element exists.
-     *
-     * @param [predicate] A function to test an element for a condition.
-     *
-     * @returns The single element of the input sequence that satisfies a condition.
-     */
-    Single(predicate?: (e: T) => boolean): T;
-
-    /**
-     * Returns the only element of a sequence that satisfies a specified condition or
-     * a default value if no such element exists; this method throws an exception if
-     * more than one element satisfies the condition.
-     *
-     * @param [predicate] A function to test an element for a condition.
-     * @param [defaultValue] A default value if no element is found.
-     *
-     * @returns The single element of the input sequence that satisfies the condition,
-     * or defaultValue if no such element is found.
-     */
-    SingleOrDefault(predicate?: (e: T) => boolean, defaultValue?: T): T;
-
-    /**
-     * Bypasses a specified number of elements in a sequence and then returns the remaining
-     * elements.
-     *
-     * @param count The number of elements to skip before returning the remaining elements.
-     *
-     * @returns An array that contains the elements that occur
-     * after the specified index in the input sequence.
-     */
-    Skip(count: number): Linq<T>;
-
-    /**
-     * Bypasses elements in a sequence as long as a specified condition is true and
-     * then returns the remaining elements.
-     *
-     * @param predicate A function to test an element for a condition.
-     *
-     * @returns An array that contains the elements from the
-     * input sequence starting at the first element in the linear series that does not
-     * pass the test specified by predicate.
-     */
-    SkipWhile(predicate: (e: T) => boolean): Linq<T>;
-
-    /**
-     * Computes the sum of a sequence values.
-     *
-     * @param [selector] A transform function to apply to each element.
-     *
-     * @returns The sum of the values in the sequence.
-     */
-    Sum(selector?: (value: T) => number): number;
-
-    /**
-     * Returns a specified number of contiguous elements from the start of a sequence.
-     *
-     * @param count The number of elements to skip before returning the remaining elements.
-     *
-     * @returns An array that contains the specified number of elements from the start
-     * of the input sequence.
-     */
-    Take(count: number): Linq<T>;
-
-    /**
-     * Returns elements from a sequence as long as a specified condition is true.
-     *
-     * @param predicate A function to test an element for a condition.
-     *
-     * @returns An array that contains the elements from the
-     * input sequence that occur before the element at which the test no longer passes.
-     */
-    TakeWhile(predicate: (e: T) => boolean): Linq<T>;
-
-    /**
-     * Produces the set union of two sequences by using a specified IEqualityComparer<T>.
-     *
-     * @param second An array whose distinct elements form the second set for the union.
-     * @param [comparer] An equality comparer to compare values.
-     *
-     * @returns An array that contains the elements from both
-     * input sequences, excluding duplicates.
-     */
-    Union(second: T[], comparer?: LinqSharp.IEqualityComparer<T>): Linq<T>;
-
-    /**
-     * Filters a sequence of values based on a predicate.
-     *
-     * @param selector A transform function to apply to each element.
-     *
-     * @returns  An array that contains elements from the input sequence
-     * that satisfy the condition.
-     */
-    Where(selector: (value: T) => boolean): Linq<T>;
-
-    /**
-     * Applies a specified function to the corresponding elements of two sequences,
-     * producing a sequence of the results.
-     *
-     * @param array The second sequence to merge.
-     * @param resultSelector A function that specifies how to merge the elements from the two sequences.
-     *
-     * @returns An array that contains merged elements of two input sequences.
-     */
-    Zip<TInner, TResult>(array: TInner[], resultSelector: (o: T, i: TInner) => TResult): Linq<TResult>;
-
-    /**
-     * Retrieves the internal array.
-     *
-     * @returns Internal array.
-     */
-    ToArray(): T[];
-}
-export default Linq;
diff --git a/linqsharp/linqsharp-tests.ts b/linqsharp/linqsharp-tests.ts
deleted file mode 100644
index 1fda5716b8..0000000000
--- a/linqsharp/linqsharp-tests.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-
-import Linq, { LinqSharp } from "linqsharp";
-
-var linq: Linq<number> = new Linq<number>([0, 1, 2, 3]);
-
-var linqResult: Linq<number>;
-var linqAny: Linq<any>;
-var arrayResult: number[];
-
-var numberResult: number;
-var boolResult: boolean;
-
-var comparer: LinqSharp.IEqualityComparer<number> = {
-	Equals: (x: number, y: number): boolean =>
-	{
-		return x === y;
-	},
-	GetHashCode: (obj: number): number =>
-	{
-		return obj.valueOf();
-	}
-};
-var comparer2: (o: number, i: number) => number;
-var comparer3: (o: number, i: number) => boolean;
-
-numberResult = linq.Aggregate<number>((prev: number, next: number) => { return prev + next; });
-boolResult = linq.All((value: number) => value == 0);
-boolResult = linq.Any();
-boolResult = linq.Any((value: number) => value == 0);
-numberResult = linq.Average();
-numberResult = linq.Average((value: number) => value);
-linqResult = linq.Concat([4, 5, 6]);
-boolResult = linq.Contains(0);
-boolResult = linq.Contains(0, comparer);
-numberResult = linq.Count();
-numberResult = linq.Count((value: number) => value == 0);
-linqResult = linq.Distinct();
-linqResult = linq.Distinct(comparer);
-linqResult = linq.DistinctBy((value: number) => value);
-numberResult = linq.ElementAt(0);
-numberResult = linq.ElementAtOrDefault(0, 1);
-linqResult = linq.Except([2]);
-linqResult = linq.Except([2], comparer);
-numberResult = linq.First();
-numberResult = linq.First((value: number) => value == 0);
-numberResult = linq.FirstOrDefault();
-numberResult = linq.FirstOrDefault((value: number) => value == 0);
-linq.ForEach((value: number, index: number) => { });
-linqAny = linq.GroupBy((value: number) => value % 2);
-linqAny = linq.GroupBy((value: number) => value % 2, (value: number) => value * 2);
-linqAny = linq.GroupBy((value: number) => value % 2, (value: number) => value * 2, comparer);
-numberResult = linq.IndexOf(0);
-numberResult = linq.IndexOf(0, comparer);
-linqResult = linq.Intersect([0]);
-linqResult = linq.Intersect([0], comparer);
-linqResult = linq.Join([0], (outer: number) => outer, (inner: number) => inner, (outer: number, inner: number) => outer + inner);
-linqResult = linq.Join([0], (outer: number) => outer, (inner: number) => inner, (outer: number, inner: number) => outer + inner, comparer);
-numberResult = linq.Last();
-numberResult = linq.Last((value: number) => value == 0);
-numberResult = linq.LastOrDefault();
-numberResult = linq.LastOrDefault((value: number) => value == 0);
-numberResult = linq.Max();
-numberResult = linq.Max((value: number) => value);
-numberResult = linq.Min();
-numberResult = linq.Min((value: number) => value);
-linqResult = linq.OrderBy((value: number) => value);
-linqResult = linq.OrderBy((value: number) => value, comparer2);
-linqResult = linq.OrderByDescending((value: number) => value);
-linqResult = linq.OrderByDescending((value: number) => value, comparer2);
-linqResult = linq.Reverse();
-linqResult = linq.Select((value: number) => value);
-linqResult = linq.Select((value: number, index: number) => value + index);
-linqResult = linq.SelectMany<number>((value: number) => [ value ]);
-linqResult = linq.SelectMany<number>((value: number) => [ value ], (value: number) => value);
-boolResult = linq.SequenceEqual([0]);
-boolResult = linq.SequenceEqual([0], comparer3);
-numberResult = linq.Single();
-numberResult = linq.Single((value: number) => value == 0);
-numberResult = linq.SingleOrDefault();
-numberResult = linq.SingleOrDefault((value: number) => value == 0);
-linqResult = linq.Skip(0);
-linqResult = linq.SkipWhile((value: number) => value < 2);
-numberResult = linq.Sum();
-numberResult = linq.Sum((value: number) => value * 2);
-linqResult = linq.Take(2);
-linqResult = linq.TakeWhile((value: number) => value < 2);
-arrayResult = linq.ToArray();
-linqResult = linq.Union([0]);
-linqResult = linq.Union([0], comparer);
-linqResult = linq.Where((value: number) => value > 0);
-linqResult = linq.Zip([0], (outer: number, inner: number) => outer + inner);
\ No newline at end of file
diff --git a/linqsharp/tsconfig.json b/linqsharp/tsconfig.json
deleted file mode 100644
index 84a6339e79..0000000000
--- a/linqsharp/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "noImplicitAny": true,
-        "strictNullChecks": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "linqsharp-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/notNeededPackages.json b/notNeededPackages.json
index 0f32a6dcad..90ba710778 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -34,6 +34,12 @@
             "typingsPackageName": "protractor",
             "sourceRepoURL": "https://github.com/angular/protractor",
             "asOfVersion": "4.0.0"
+        },
+        {
+            "libraryName": "LinqSharp",
+            "typingsPackageName": "linqsharp",
+            "sourceRepoURL": "https://github.com/brunolm/LinqSharp",
+            "asOfVersion": "1.0.0"
         }
     ]
 }

From 24ecbf08394ba567f3ae0cf23064d27de6f445c8 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 7 Oct 2016 13:44:02 -0700
Subject: [PATCH 157/245] Deprecate `typescript` and `typescript-services`
 packages

---
 notNeededPackages.json                        |   12 +
 typescript-services/index.d.ts                | 2148 -----------------
 typescript-services/tsconfig.json             |   19 -
 .../typescriptServices-tests.ts               |   21 -
 typescript/index.d.ts                         | 2148 -----------------
 typescript/tsconfig.json                      |   18 -
 6 files changed, 12 insertions(+), 4354 deletions(-)
 delete mode 100644 typescript-services/index.d.ts
 delete mode 100644 typescript-services/tsconfig.json
 delete mode 100644 typescript-services/typescriptServices-tests.ts
 delete mode 100644 typescript/index.d.ts
 delete mode 100644 typescript/tsconfig.json

diff --git a/notNeededPackages.json b/notNeededPackages.json
index 90ba710778..b2c8de0dfe 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -40,6 +40,18 @@
             "typingsPackageName": "linqsharp",
             "sourceRepoURL": "https://github.com/brunolm/LinqSharp",
             "asOfVersion": "1.0.0"
+        },
+        {
+            "libraryName": "TypeScript",
+            "typingsPackageName": "typescript",
+            "sourceRepoURL": "https://github.com/Microsoft/TypeScript",
+            "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "TypeScript",
+            "typingsPackageName": "typescript-services",
+            "sourceRepoURL": "https://github.com/Microsoft/TypeScript",
+            "asOfVersion": "2.0.0"
         }
     ]
 }
diff --git a/typescript-services/index.d.ts b/typescript-services/index.d.ts
deleted file mode 100644
index 0711e70e9c..0000000000
--- a/typescript-services/index.d.ts
+++ /dev/null
@@ -1,2148 +0,0 @@
-// Type definitions for TypeScript API v0.4.0
-// Project: http://www.typescriptlang.org/
-// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-declare namespace ts {
-    interface Map<T> {
-        [index: string]: T;
-    }
-    interface FileMap<T> {
-        get(fileName: string): T;
-        set(fileName: string, value: T): void;
-        contains(fileName: string): boolean;
-        remove(fileName: string): void;
-        forEachValue(f: (v: T) => void): void;
-        clear(): void;
-    }
-    interface TextRange {
-        pos: number;
-        end: number;
-    }
-    const enum SyntaxKind {
-        Unknown = 0,
-        EndOfFileToken = 1,
-        SingleLineCommentTrivia = 2,
-        MultiLineCommentTrivia = 3,
-        NewLineTrivia = 4,
-        WhitespaceTrivia = 5,
-        ShebangTrivia = 6,
-        ConflictMarkerTrivia = 7,
-        NumericLiteral = 8,
-        StringLiteral = 9,
-        RegularExpressionLiteral = 10,
-        NoSubstitutionTemplateLiteral = 11,
-        TemplateHead = 12,
-        TemplateMiddle = 13,
-        TemplateTail = 14,
-        OpenBraceToken = 15,
-        CloseBraceToken = 16,
-        OpenParenToken = 17,
-        CloseParenToken = 18,
-        OpenBracketToken = 19,
-        CloseBracketToken = 20,
-        DotToken = 21,
-        DotDotDotToken = 22,
-        SemicolonToken = 23,
-        CommaToken = 24,
-        LessThanToken = 25,
-        LessThanSlashToken = 26,
-        GreaterThanToken = 27,
-        LessThanEqualsToken = 28,
-        GreaterThanEqualsToken = 29,
-        EqualsEqualsToken = 30,
-        ExclamationEqualsToken = 31,
-        EqualsEqualsEqualsToken = 32,
-        ExclamationEqualsEqualsToken = 33,
-        EqualsGreaterThanToken = 34,
-        PlusToken = 35,
-        MinusToken = 36,
-        AsteriskToken = 37,
-        SlashToken = 38,
-        PercentToken = 39,
-        PlusPlusToken = 40,
-        MinusMinusToken = 41,
-        LessThanLessThanToken = 42,
-        GreaterThanGreaterThanToken = 43,
-        GreaterThanGreaterThanGreaterThanToken = 44,
-        AmpersandToken = 45,
-        BarToken = 46,
-        CaretToken = 47,
-        ExclamationToken = 48,
-        TildeToken = 49,
-        AmpersandAmpersandToken = 50,
-        BarBarToken = 51,
-        QuestionToken = 52,
-        ColonToken = 53,
-        AtToken = 54,
-        EqualsToken = 55,
-        PlusEqualsToken = 56,
-        MinusEqualsToken = 57,
-        AsteriskEqualsToken = 58,
-        SlashEqualsToken = 59,
-        PercentEqualsToken = 60,
-        LessThanLessThanEqualsToken = 61,
-        GreaterThanGreaterThanEqualsToken = 62,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 63,
-        AmpersandEqualsToken = 64,
-        BarEqualsToken = 65,
-        CaretEqualsToken = 66,
-        Identifier = 67,
-        BreakKeyword = 68,
-        CaseKeyword = 69,
-        CatchKeyword = 70,
-        ClassKeyword = 71,
-        ConstKeyword = 72,
-        ContinueKeyword = 73,
-        DebuggerKeyword = 74,
-        DefaultKeyword = 75,
-        DeleteKeyword = 76,
-        DoKeyword = 77,
-        ElseKeyword = 78,
-        EnumKeyword = 79,
-        ExportKeyword = 80,
-        ExtendsKeyword = 81,
-        FalseKeyword = 82,
-        FinallyKeyword = 83,
-        ForKeyword = 84,
-        FunctionKeyword = 85,
-        IfKeyword = 86,
-        ImportKeyword = 87,
-        InKeyword = 88,
-        InstanceOfKeyword = 89,
-        NewKeyword = 90,
-        NullKeyword = 91,
-        ReturnKeyword = 92,
-        SuperKeyword = 93,
-        SwitchKeyword = 94,
-        ThisKeyword = 95,
-        ThrowKeyword = 96,
-        TrueKeyword = 97,
-        TryKeyword = 98,
-        TypeOfKeyword = 99,
-        VarKeyword = 100,
-        VoidKeyword = 101,
-        WhileKeyword = 102,
-        WithKeyword = 103,
-        ImplementsKeyword = 104,
-        InterfaceKeyword = 105,
-        LetKeyword = 106,
-        PackageKeyword = 107,
-        PrivateKeyword = 108,
-        ProtectedKeyword = 109,
-        PublicKeyword = 110,
-        StaticKeyword = 111,
-        YieldKeyword = 112,
-        AbstractKeyword = 113,
-        AsKeyword = 114,
-        AnyKeyword = 115,
-        AsyncKeyword = 116,
-        AwaitKeyword = 117,
-        BooleanKeyword = 118,
-        ConstructorKeyword = 119,
-        DeclareKeyword = 120,
-        GetKeyword = 121,
-        IsKeyword = 122,
-        ModuleKeyword = 123,
-        NamespaceKeyword = 124,
-        RequireKeyword = 125,
-        NumberKeyword = 126,
-        SetKeyword = 127,
-        StringKeyword = 128,
-        SymbolKeyword = 129,
-        TypeKeyword = 130,
-        FromKeyword = 131,
-        OfKeyword = 132,
-        QualifiedName = 133,
-        ComputedPropertyName = 134,
-        TypeParameter = 135,
-        Parameter = 136,
-        Decorator = 137,
-        PropertySignature = 138,
-        PropertyDeclaration = 139,
-        MethodSignature = 140,
-        MethodDeclaration = 141,
-        Constructor = 142,
-        GetAccessor = 143,
-        SetAccessor = 144,
-        CallSignature = 145,
-        ConstructSignature = 146,
-        IndexSignature = 147,
-        TypePredicate = 148,
-        TypeReference = 149,
-        FunctionType = 150,
-        ConstructorType = 151,
-        TypeQuery = 152,
-        TypeLiteral = 153,
-        ArrayType = 154,
-        TupleType = 155,
-        UnionType = 156,
-        IntersectionType = 157,
-        ParenthesizedType = 158,
-        ObjectBindingPattern = 159,
-        ArrayBindingPattern = 160,
-        BindingElement = 161,
-        ArrayLiteralExpression = 162,
-        ObjectLiteralExpression = 163,
-        PropertyAccessExpression = 164,
-        ElementAccessExpression = 165,
-        CallExpression = 166,
-        NewExpression = 167,
-        TaggedTemplateExpression = 168,
-        TypeAssertionExpression = 169,
-        ParenthesizedExpression = 170,
-        FunctionExpression = 171,
-        ArrowFunction = 172,
-        DeleteExpression = 173,
-        TypeOfExpression = 174,
-        VoidExpression = 175,
-        AwaitExpression = 176,
-        PrefixUnaryExpression = 177,
-        PostfixUnaryExpression = 178,
-        BinaryExpression = 179,
-        ConditionalExpression = 180,
-        TemplateExpression = 181,
-        YieldExpression = 182,
-        SpreadElementExpression = 183,
-        ClassExpression = 184,
-        OmittedExpression = 185,
-        ExpressionWithTypeArguments = 186,
-        AsExpression = 187,
-        TemplateSpan = 188,
-        SemicolonClassElement = 189,
-        Block = 190,
-        VariableStatement = 191,
-        EmptyStatement = 192,
-        ExpressionStatement = 193,
-        IfStatement = 194,
-        DoStatement = 195,
-        WhileStatement = 196,
-        ForStatement = 197,
-        ForInStatement = 198,
-        ForOfStatement = 199,
-        ContinueStatement = 200,
-        BreakStatement = 201,
-        ReturnStatement = 202,
-        WithStatement = 203,
-        SwitchStatement = 204,
-        LabeledStatement = 205,
-        ThrowStatement = 206,
-        TryStatement = 207,
-        DebuggerStatement = 208,
-        VariableDeclaration = 209,
-        VariableDeclarationList = 210,
-        FunctionDeclaration = 211,
-        ClassDeclaration = 212,
-        InterfaceDeclaration = 213,
-        TypeAliasDeclaration = 214,
-        EnumDeclaration = 215,
-        ModuleDeclaration = 216,
-        ModuleBlock = 217,
-        CaseBlock = 218,
-        ImportEqualsDeclaration = 219,
-        ImportDeclaration = 220,
-        ImportClause = 221,
-        NamespaceImport = 222,
-        NamedImports = 223,
-        ImportSpecifier = 224,
-        ExportAssignment = 225,
-        ExportDeclaration = 226,
-        NamedExports = 227,
-        ExportSpecifier = 228,
-        MissingDeclaration = 229,
-        ExternalModuleReference = 230,
-        JsxElement = 231,
-        JsxSelfClosingElement = 232,
-        JsxOpeningElement = 233,
-        JsxText = 234,
-        JsxClosingElement = 235,
-        JsxAttribute = 236,
-        JsxSpreadAttribute = 237,
-        JsxExpression = 238,
-        CaseClause = 239,
-        DefaultClause = 240,
-        HeritageClause = 241,
-        CatchClause = 242,
-        PropertyAssignment = 243,
-        ShorthandPropertyAssignment = 244,
-        EnumMember = 245,
-        SourceFile = 246,
-        JSDocTypeExpression = 247,
-        JSDocAllType = 248,
-        JSDocUnknownType = 249,
-        JSDocArrayType = 250,
-        JSDocUnionType = 251,
-        JSDocTupleType = 252,
-        JSDocNullableType = 253,
-        JSDocNonNullableType = 254,
-        JSDocRecordType = 255,
-        JSDocRecordMember = 256,
-        JSDocTypeReference = 257,
-        JSDocOptionalType = 258,
-        JSDocFunctionType = 259,
-        JSDocVariadicType = 260,
-        JSDocConstructorType = 261,
-        JSDocThisType = 262,
-        JSDocComment = 263,
-        JSDocTag = 264,
-        JSDocParameterTag = 265,
-        JSDocReturnTag = 266,
-        JSDocTypeTag = 267,
-        JSDocTemplateTag = 268,
-        SyntaxList = 269,
-        Count = 270,
-        FirstAssignment = 55,
-        LastAssignment = 66,
-        FirstReservedWord = 68,
-        LastReservedWord = 103,
-        FirstKeyword = 68,
-        LastKeyword = 132,
-        FirstFutureReservedWord = 104,
-        LastFutureReservedWord = 112,
-        FirstTypeNode = 149,
-        LastTypeNode = 158,
-        FirstPunctuation = 15,
-        LastPunctuation = 66,
-        FirstToken = 0,
-        LastToken = 132,
-        FirstTriviaToken = 2,
-        LastTriviaToken = 7,
-        FirstLiteralToken = 8,
-        LastLiteralToken = 11,
-        FirstTemplateToken = 11,
-        LastTemplateToken = 14,
-        FirstBinaryOperator = 25,
-        LastBinaryOperator = 66,
-        FirstNode = 133,
-    }
-    const enum NodeFlags {
-        Export = 1,
-        Ambient = 2,
-        Public = 16,
-        Private = 32,
-        Protected = 64,
-        Static = 128,
-        Abstract = 256,
-        Async = 512,
-        Default = 1024,
-        MultiLine = 2048,
-        Synthetic = 4096,
-        DeclarationFile = 8192,
-        Let = 16384,
-        Const = 32768,
-        OctalLiteral = 65536,
-        Namespace = 131072,
-        ExportContext = 262144,
-        Modifier = 2035,
-        AccessibilityModifier = 112,
-        BlockScoped = 49152,
-    }
-    const enum JsxFlags {
-        None = 0,
-        IntrinsicNamedElement = 1,
-        IntrinsicIndexedElement = 2,
-        ClassElement = 4,
-        UnknownElement = 8,
-        IntrinsicElement = 3,
-    }
-    interface Node extends TextRange {
-        kind: SyntaxKind;
-        flags: NodeFlags;
-        decorators?: NodeArray<Decorator>;
-        modifiers?: ModifiersArray;
-        parent?: Node;
-    }
-    interface NodeArray<T> extends Array<T>, TextRange {
-        hasTrailingComma?: boolean;
-    }
-    interface ModifiersArray extends NodeArray<Node> {
-        flags: number;
-    }
-    interface Identifier extends PrimaryExpression {
-        text: string;
-        originalKeywordKind?: SyntaxKind;
-    }
-    interface QualifiedName extends Node {
-        left: EntityName;
-        right: Identifier;
-    }
-    type EntityName = Identifier | QualifiedName;
-    type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern;
-    interface Declaration extends Node {
-        _declarationBrand: any;
-        name?: DeclarationName;
-    }
-    interface ComputedPropertyName extends Node {
-        expression: Expression;
-    }
-    interface Decorator extends Node {
-        expression: LeftHandSideExpression;
-    }
-    interface TypeParameterDeclaration extends Declaration {
-        name: Identifier;
-        constraint?: TypeNode;
-        expression?: Expression;
-    }
-    interface SignatureDeclaration extends Declaration {
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        parameters: NodeArray<ParameterDeclaration>;
-        type?: TypeNode;
-    }
-    interface VariableDeclaration extends Declaration {
-        parent?: VariableDeclarationList;
-        name: Identifier | BindingPattern;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface VariableDeclarationList extends Node {
-        declarations: NodeArray<VariableDeclaration>;
-    }
-    interface ParameterDeclaration extends Declaration {
-        dotDotDotToken?: Node;
-        name: Identifier | BindingPattern;
-        questionToken?: Node;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface BindingElement extends Declaration {
-        propertyName?: Identifier;
-        dotDotDotToken?: Node;
-        name: Identifier | BindingPattern;
-        initializer?: Expression;
-    }
-    interface PropertyDeclaration extends Declaration, ClassElement {
-        name: DeclarationName;
-        questionToken?: Node;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface ObjectLiteralElement extends Declaration {
-        _objectLiteralBrandBrand: any;
-    }
-    interface PropertyAssignment extends ObjectLiteralElement {
-        _propertyAssignmentBrand: any;
-        name: DeclarationName;
-        questionToken?: Node;
-        initializer: Expression;
-    }
-    interface ShorthandPropertyAssignment extends ObjectLiteralElement {
-        name: Identifier;
-        questionToken?: Node;
-    }
-    interface VariableLikeDeclaration extends Declaration {
-        propertyName?: Identifier;
-        dotDotDotToken?: Node;
-        name: DeclarationName;
-        questionToken?: Node;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface BindingPattern extends Node {
-        elements: NodeArray<BindingElement>;
-    }
-    /**
-     * Several node kinds share function-like features such as a signature,
-     * a name, and a body. These nodes should extend FunctionLikeDeclaration.
-     * Examples:
-     * - FunctionDeclaration
-     * - MethodDeclaration
-     * - AccessorDeclaration
-     */
-    interface FunctionLikeDeclaration extends SignatureDeclaration {
-        _functionLikeDeclarationBrand: any;
-        asteriskToken?: Node;
-        questionToken?: Node;
-        body?: Block | Expression;
-    }
-    interface FunctionDeclaration extends FunctionLikeDeclaration, Statement {
-        name?: Identifier;
-        body?: Block;
-    }
-    interface MethodDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
-        body?: Block;
-    }
-    interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {
-        body?: Block;
-    }
-    interface SemicolonClassElement extends ClassElement {
-        _semicolonClassElementBrand: any;
-    }
-    interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
-        _accessorDeclarationBrand: any;
-        body: Block;
-    }
-    interface IndexSignatureDeclaration extends SignatureDeclaration, ClassElement {
-        _indexSignatureDeclarationBrand: any;
-    }
-    interface TypeNode extends Node {
-        _typeNodeBrand: any;
-    }
-    interface FunctionOrConstructorTypeNode extends TypeNode, SignatureDeclaration {
-        _functionOrConstructorTypeNodeBrand: any;
-    }
-    interface TypeReferenceNode extends TypeNode {
-        typeName: EntityName;
-        typeArguments?: NodeArray<TypeNode>;
-    }
-    interface TypePredicateNode extends TypeNode {
-        parameterName: Identifier;
-        type: TypeNode;
-    }
-    interface TypeQueryNode extends TypeNode {
-        exprName: EntityName;
-    }
-    interface TypeLiteralNode extends TypeNode, Declaration {
-        members: NodeArray<Node>;
-    }
-    interface ArrayTypeNode extends TypeNode {
-        elementType: TypeNode;
-    }
-    interface TupleTypeNode extends TypeNode {
-        elementTypes: NodeArray<TypeNode>;
-    }
-    interface UnionOrIntersectionTypeNode extends TypeNode {
-        types: NodeArray<TypeNode>;
-    }
-    interface UnionTypeNode extends UnionOrIntersectionTypeNode {
-    }
-    interface IntersectionTypeNode extends UnionOrIntersectionTypeNode {
-    }
-    interface ParenthesizedTypeNode extends TypeNode {
-        type: TypeNode;
-    }
-    interface StringLiteral extends LiteralExpression, TypeNode {
-        _stringLiteralBrand: any;
-    }
-    interface Expression extends Node {
-        _expressionBrand: any;
-        contextualType?: Type;
-    }
-    interface UnaryExpression extends Expression {
-        _unaryExpressionBrand: any;
-    }
-    interface PrefixUnaryExpression extends UnaryExpression {
-        operator: SyntaxKind;
-        operand: UnaryExpression;
-    }
-    interface PostfixUnaryExpression extends PostfixExpression {
-        operand: LeftHandSideExpression;
-        operator: SyntaxKind;
-    }
-    interface PostfixExpression extends UnaryExpression {
-        _postfixExpressionBrand: any;
-    }
-    interface LeftHandSideExpression extends PostfixExpression {
-        _leftHandSideExpressionBrand: any;
-    }
-    interface MemberExpression extends LeftHandSideExpression {
-        _memberExpressionBrand: any;
-    }
-    interface PrimaryExpression extends MemberExpression {
-        _primaryExpressionBrand: any;
-    }
-    interface DeleteExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface TypeOfExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface VoidExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface AwaitExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface YieldExpression extends Expression {
-        asteriskToken?: Node;
-        expression?: Expression;
-    }
-    interface BinaryExpression extends Expression {
-        left: Expression;
-        operatorToken: Node;
-        right: Expression;
-    }
-    interface ConditionalExpression extends Expression {
-        condition: Expression;
-        questionToken: Node;
-        whenTrue: Expression;
-        colonToken: Node;
-        whenFalse: Expression;
-    }
-    interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration {
-        name?: Identifier;
-        body: Block | Expression;
-    }
-    interface ArrowFunction extends Expression, FunctionLikeDeclaration {
-        equalsGreaterThanToken: Node;
-    }
-    interface LiteralExpression extends PrimaryExpression {
-        text: string;
-        isUnterminated?: boolean;
-        hasExtendedUnicodeEscape?: boolean;
-    }
-    interface TemplateExpression extends PrimaryExpression {
-        head: LiteralExpression;
-        templateSpans: NodeArray<TemplateSpan>;
-    }
-    interface TemplateSpan extends Node {
-        expression: Expression;
-        literal: LiteralExpression;
-    }
-    interface ParenthesizedExpression extends PrimaryExpression {
-        expression: Expression;
-    }
-    interface ArrayLiteralExpression extends PrimaryExpression {
-        elements: NodeArray<Expression>;
-    }
-    interface SpreadElementExpression extends Expression {
-        expression: Expression;
-    }
-    interface ObjectLiteralExpression extends PrimaryExpression, Declaration {
-        properties: NodeArray<ObjectLiteralElement>;
-    }
-    interface PropertyAccessExpression extends MemberExpression {
-        expression: LeftHandSideExpression;
-        dotToken: Node;
-        name: Identifier;
-    }
-    interface ElementAccessExpression extends MemberExpression {
-        expression: LeftHandSideExpression;
-        argumentExpression?: Expression;
-    }
-    interface CallExpression extends LeftHandSideExpression {
-        expression: LeftHandSideExpression;
-        typeArguments?: NodeArray<TypeNode>;
-        arguments: NodeArray<Expression>;
-    }
-    interface ExpressionWithTypeArguments extends TypeNode {
-        expression: LeftHandSideExpression;
-        typeArguments?: NodeArray<TypeNode>;
-    }
-    interface NewExpression extends CallExpression, PrimaryExpression {
-    }
-    interface TaggedTemplateExpression extends MemberExpression {
-        tag: LeftHandSideExpression;
-        template: LiteralExpression | TemplateExpression;
-    }
-    type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator;
-    interface AsExpression extends Expression {
-        expression: Expression;
-        type: TypeNode;
-    }
-    interface TypeAssertion extends UnaryExpression {
-        type: TypeNode;
-        expression: UnaryExpression;
-    }
-    type AssertionExpression = TypeAssertion | AsExpression;
-    interface JsxElement extends PrimaryExpression {
-        openingElement: JsxOpeningElement;
-        children: NodeArray<JsxChild>;
-        closingElement: JsxClosingElement;
-    }
-    interface JsxOpeningElement extends Expression {
-        _openingElementBrand?: any;
-        tagName: EntityName;
-        attributes: NodeArray<JsxAttribute | JsxSpreadAttribute>;
-    }
-    interface JsxSelfClosingElement extends PrimaryExpression, JsxOpeningElement {
-        _selfClosingElementBrand?: any;
-    }
-    type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
-    interface JsxAttribute extends Node {
-        name: Identifier;
-        initializer?: Expression;
-    }
-    interface JsxSpreadAttribute extends Node {
-        expression: Expression;
-    }
-    interface JsxClosingElement extends Node {
-        tagName: EntityName;
-    }
-    interface JsxExpression extends Expression {
-        expression?: Expression;
-    }
-    interface JsxText extends Node {
-        _jsxTextExpressionBrand: any;
-    }
-    type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement;
-    interface Statement extends Node {
-        _statementBrand: any;
-    }
-    interface Block extends Statement {
-        statements: NodeArray<Statement>;
-    }
-    interface VariableStatement extends Statement {
-        declarationList: VariableDeclarationList;
-    }
-    interface ExpressionStatement extends Statement {
-        expression: Expression;
-    }
-    interface IfStatement extends Statement {
-        expression: Expression;
-        thenStatement: Statement;
-        elseStatement?: Statement;
-    }
-    interface IterationStatement extends Statement {
-        statement: Statement;
-    }
-    interface DoStatement extends IterationStatement {
-        expression: Expression;
-    }
-    interface WhileStatement extends IterationStatement {
-        expression: Expression;
-    }
-    interface ForStatement extends IterationStatement {
-        initializer?: VariableDeclarationList | Expression;
-        condition?: Expression;
-        incrementor?: Expression;
-    }
-    interface ForInStatement extends IterationStatement {
-        initializer: VariableDeclarationList | Expression;
-        expression: Expression;
-    }
-    interface ForOfStatement extends IterationStatement {
-        initializer: VariableDeclarationList | Expression;
-        expression: Expression;
-    }
-    interface BreakOrContinueStatement extends Statement {
-        label?: Identifier;
-    }
-    interface ReturnStatement extends Statement {
-        expression?: Expression;
-    }
-    interface WithStatement extends Statement {
-        expression: Expression;
-        statement: Statement;
-    }
-    interface SwitchStatement extends Statement {
-        expression: Expression;
-        caseBlock: CaseBlock;
-    }
-    interface CaseBlock extends Node {
-        clauses: NodeArray<CaseOrDefaultClause>;
-    }
-    interface CaseClause extends Node {
-        expression?: Expression;
-        statements: NodeArray<Statement>;
-    }
-    interface DefaultClause extends Node {
-        statements: NodeArray<Statement>;
-    }
-    type CaseOrDefaultClause = CaseClause | DefaultClause;
-    interface LabeledStatement extends Statement {
-        label: Identifier;
-        statement: Statement;
-    }
-    interface ThrowStatement extends Statement {
-        expression: Expression;
-    }
-    interface TryStatement extends Statement {
-        tryBlock: Block;
-        catchClause?: CatchClause;
-        finallyBlock?: Block;
-    }
-    interface CatchClause extends Node {
-        variableDeclaration: VariableDeclaration;
-        block: Block;
-    }
-    interface ClassLikeDeclaration extends Declaration {
-        name?: Identifier;
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        heritageClauses?: NodeArray<HeritageClause>;
-        members: NodeArray<ClassElement>;
-    }
-    interface ClassDeclaration extends ClassLikeDeclaration, Statement {
-    }
-    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
-    }
-    interface ClassElement extends Declaration {
-        _classElementBrand: any;
-    }
-    interface InterfaceDeclaration extends Declaration, Statement {
-        name: Identifier;
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        heritageClauses?: NodeArray<HeritageClause>;
-        members: NodeArray<Declaration>;
-    }
-    interface HeritageClause extends Node {
-        token: SyntaxKind;
-        types?: NodeArray<ExpressionWithTypeArguments>;
-    }
-    interface TypeAliasDeclaration extends Declaration, Statement {
-        name: Identifier;
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        type: TypeNode;
-    }
-    interface EnumMember extends Declaration {
-        name: DeclarationName;
-        initializer?: Expression;
-    }
-    interface EnumDeclaration extends Declaration, Statement {
-        name: Identifier;
-        members: NodeArray<EnumMember>;
-    }
-    interface ModuleDeclaration extends Declaration, Statement {
-        name: Identifier | LiteralExpression;
-        body: ModuleBlock | ModuleDeclaration;
-    }
-    interface ModuleBlock extends Node, Statement {
-        statements: NodeArray<Statement>;
-    }
-    interface ImportEqualsDeclaration extends Declaration, Statement {
-        name: Identifier;
-        moduleReference: EntityName | ExternalModuleReference;
-    }
-    interface ExternalModuleReference extends Node {
-        expression?: Expression;
-    }
-    interface ImportDeclaration extends Statement {
-        importClause?: ImportClause;
-        moduleSpecifier: Expression;
-    }
-    interface ImportClause extends Declaration {
-        name?: Identifier;
-        namedBindings?: NamespaceImport | NamedImports;
-    }
-    interface NamespaceImport extends Declaration {
-        name: Identifier;
-    }
-    interface ExportDeclaration extends Declaration, Statement {
-        exportClause?: NamedExports;
-        moduleSpecifier?: Expression;
-    }
-    interface NamedImportsOrExports extends Node {
-        elements: NodeArray<ImportOrExportSpecifier>;
-    }
-    type NamedImports = NamedImportsOrExports;
-    type NamedExports = NamedImportsOrExports;
-    interface ImportOrExportSpecifier extends Declaration {
-        propertyName?: Identifier;
-        name: Identifier;
-    }
-    type ImportSpecifier = ImportOrExportSpecifier;
-    type ExportSpecifier = ImportOrExportSpecifier;
-    interface ExportAssignment extends Declaration, Statement {
-        isExportEquals?: boolean;
-        expression: Expression;
-    }
-    interface FileReference extends TextRange {
-        fileName: string;
-    }
-    interface CommentRange extends TextRange {
-        hasTrailingNewLine?: boolean;
-        kind: SyntaxKind;
-    }
-    interface JSDocTypeExpression extends Node {
-        type: JSDocType;
-    }
-    interface JSDocType extends TypeNode {
-        _jsDocTypeBrand: any;
-    }
-    interface JSDocAllType extends JSDocType {
-        _JSDocAllTypeBrand: any;
-    }
-    interface JSDocUnknownType extends JSDocType {
-        _JSDocUnknownTypeBrand: any;
-    }
-    interface JSDocArrayType extends JSDocType {
-        elementType: JSDocType;
-    }
-    interface JSDocUnionType extends JSDocType {
-        types: NodeArray<JSDocType>;
-    }
-    interface JSDocTupleType extends JSDocType {
-        types: NodeArray<JSDocType>;
-    }
-    interface JSDocNonNullableType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocNullableType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocRecordType extends JSDocType, TypeLiteralNode {
-        members: NodeArray<JSDocRecordMember>;
-    }
-    interface JSDocTypeReference extends JSDocType {
-        name: EntityName;
-        typeArguments: NodeArray<JSDocType>;
-    }
-    interface JSDocOptionalType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocFunctionType extends JSDocType, SignatureDeclaration {
-        parameters: NodeArray<ParameterDeclaration>;
-        type: JSDocType;
-    }
-    interface JSDocVariadicType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocConstructorType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocThisType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocRecordMember extends PropertyDeclaration {
-        name: Identifier | LiteralExpression;
-        type?: JSDocType;
-    }
-    interface JSDocComment extends Node {
-        tags: NodeArray<JSDocTag>;
-    }
-    interface JSDocTag extends Node {
-        atToken: Node;
-        tagName: Identifier;
-    }
-    interface JSDocTemplateTag extends JSDocTag {
-        typeParameters: NodeArray<TypeParameterDeclaration>;
-    }
-    interface JSDocReturnTag extends JSDocTag {
-        typeExpression: JSDocTypeExpression;
-    }
-    interface JSDocTypeTag extends JSDocTag {
-        typeExpression: JSDocTypeExpression;
-    }
-    interface JSDocParameterTag extends JSDocTag {
-        preParameterName?: Identifier;
-        typeExpression?: JSDocTypeExpression;
-        postParameterName?: Identifier;
-        isBracketed: boolean;
-    }
-    interface SourceFile extends Declaration {
-        statements: NodeArray<Statement>;
-        endOfFileToken: Node;
-        fileName: string;
-        text: string;
-        amdDependencies: {
-            path: string;
-            name: string;
-        }[];
-        moduleName: string;
-        referencedFiles: FileReference[];
-        languageVariant: LanguageVariant;
-        /**
-         * lib.d.ts should have a reference comment like
-         *
-         *  /// <reference no-default-lib="true"/>
-         *
-         * If any other file has this comment, it signals not to include lib.d.ts
-         * because this containing file is intended to act as a default library.
-         */
-        hasNoDefaultLib: boolean;
-        languageVersion: ScriptTarget;
-    }
-    interface ScriptReferenceHost {
-        getCompilerOptions(): CompilerOptions;
-        getSourceFile(fileName: string): SourceFile;
-        getCurrentDirectory(): string;
-    }
-    interface ParseConfigHost extends ModuleResolutionHost {
-        readDirectory(rootDir: string, extension: string, exclude: string[]): string[];
-    }
-    interface WriteFileCallback {
-        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
-    }
-    class OperationCanceledException {
-    }
-    interface CancellationToken {
-        isCancellationRequested(): boolean;
-        /** @throws OperationCanceledException if isCancellationRequested is true */
-        throwIfCancellationRequested(): void;
-    }
-    interface Program extends ScriptReferenceHost {
-        /**
-         * Get a list of root file names that were passed to a 'createProgram'
-         */
-        getRootFileNames(): string[];
-        /**
-         * Get a list of files in the program
-         */
-        getSourceFiles(): SourceFile[];
-        /**
-         * Emits the JavaScript and declaration files.  If targetSourceFile is not specified, then
-         * the JavaScript and declaration files will be produced for all the files in this program.
-         * If targetSourceFile is specified, then only the JavaScript and declaration for that
-         * specific file will be generated.
-         *
-         * If writeFile is not specified then the writeFile callback from the compiler host will be
-         * used for writing the JavaScript and declaration files.  Otherwise, the writeFile parameter
-         * will be invoked when writing the JavaScript and declaration files.
-         */
-        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken): EmitResult;
-        getOptionsDiagnostics(cancellationToken?: CancellationToken): Diagnostic[];
-        getGlobalDiagnostics(cancellationToken?: CancellationToken): Diagnostic[];
-        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-        getDeclarationDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-        /**
-         * Gets a type checker that can be used to semantically analyze source fils in the program.
-         */
-        getTypeChecker(): TypeChecker;
-    }
-    interface SourceMapSpan {
-        /** Line number in the .js file. */
-        emittedLine: number;
-        /** Column number in the .js file. */
-        emittedColumn: number;
-        /** Line number in the .ts file. */
-        sourceLine: number;
-        /** Column number in the .ts file. */
-        sourceColumn: number;
-        /** Optional name (index into names array) associated with this span. */
-        nameIndex?: number;
-        /** .ts file (index into sources array) associated with this span */
-        sourceIndex: number;
-    }
-    interface SourceMapData {
-        sourceMapFilePath: string;
-        jsSourceMappingURL: string;
-        sourceMapFile: string;
-        sourceMapSourceRoot: string;
-        sourceMapSources: string[];
-        sourceMapSourcesContent?: string[];
-        inputSourceFileNames: string[];
-        sourceMapNames?: string[];
-        sourceMapMappings: string;
-        sourceMapDecodedMappings: SourceMapSpan[];
-    }
-    /** Return code used by getEmitOutput function to indicate status of the function */
-    enum ExitStatus {
-        Success = 0,
-        DiagnosticsPresent_OutputsSkipped = 1,
-        DiagnosticsPresent_OutputsGenerated = 2,
-    }
-    interface EmitResult {
-        emitSkipped: boolean;
-        diagnostics: Diagnostic[];
-    }
-    interface TypeChecker {
-        getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
-        getDeclaredTypeOfSymbol(symbol: Symbol): Type;
-        getPropertiesOfType(type: Type): Symbol[];
-        getPropertyOfType(type: Type, propertyName: string): Symbol;
-        getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
-        getIndexTypeOfType(type: Type, kind: IndexKind): Type;
-        getBaseTypes(type: InterfaceType): ObjectType[];
-        getReturnTypeOfSignature(signature: Signature): Type;
-        getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
-        getSymbolAtLocation(node: Node): Symbol;
-        getShorthandAssignmentValueSymbol(location: Node): Symbol;
-        getTypeAtLocation(node: Node): Type;
-        typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
-        symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;
-        getSymbolDisplayBuilder(): SymbolDisplayBuilder;
-        getFullyQualifiedName(symbol: Symbol): string;
-        getAugmentedPropertiesOfType(type: Type): Symbol[];
-        getRootSymbols(symbol: Symbol): Symbol[];
-        getContextualType(node: Expression): Type;
-        getResolvedSignature(node: CallLikeExpression, candidatesOutArray?: Signature[]): Signature;
-        getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature;
-        isImplementationOfOverload(node: FunctionLikeDeclaration): boolean;
-        isUndefinedSymbol(symbol: Symbol): boolean;
-        isArgumentsSymbol(symbol: Symbol): boolean;
-        getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean;
-        getAliasedSymbol(symbol: Symbol): Symbol;
-        getExportsOfModule(moduleSymbol: Symbol): Symbol[];
-        getJsxElementAttributesType(elementNode: JsxOpeningLikeElement): Type;
-        getJsxIntrinsicTagNames(): Symbol[];
-        isOptionalParameter(node: ParameterDeclaration): boolean;
-    }
-    interface SymbolDisplayBuilder {
-        buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildSymbolDisplay(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags): void;
-        buildSignatureDisplay(signatures: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildParameterDisplay(parameter: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags): void;
-        buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-    }
-    interface SymbolWriter {
-        writeKeyword(text: string): void;
-        writeOperator(text: string): void;
-        writePunctuation(text: string): void;
-        writeSpace(text: string): void;
-        writeStringLiteral(text: string): void;
-        writeParameter(text: string): void;
-        writeSymbol(text: string, symbol: Symbol): void;
-        writeLine(): void;
-        increaseIndent(): void;
-        decreaseIndent(): void;
-        clear(): void;
-        trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;
-    }
-    const enum TypeFormatFlags {
-        None = 0,
-        WriteArrayAsGenericType = 1,
-        UseTypeOfFunction = 2,
-        NoTruncation = 4,
-        WriteArrowStyleSignature = 8,
-        WriteOwnNameForAnyLike = 16,
-        WriteTypeArgumentsOfSignature = 32,
-        InElementType = 64,
-        UseFullyQualifiedType = 128,
-    }
-    const enum SymbolFormatFlags {
-        None = 0,
-        WriteTypeParametersOrArguments = 1,
-        UseOnlyExternalAliasing = 2,
-    }
-    interface TypePredicate {
-        parameterName: string;
-        parameterIndex: number;
-        type: Type;
-    }
-    const enum SymbolFlags {
-        None = 0,
-        FunctionScopedVariable = 1,
-        BlockScopedVariable = 2,
-        Property = 4,
-        EnumMember = 8,
-        Function = 16,
-        Class = 32,
-        Interface = 64,
-        ConstEnum = 128,
-        RegularEnum = 256,
-        ValueModule = 512,
-        NamespaceModule = 1024,
-        TypeLiteral = 2048,
-        ObjectLiteral = 4096,
-        Method = 8192,
-        Constructor = 16384,
-        GetAccessor = 32768,
-        SetAccessor = 65536,
-        Signature = 131072,
-        TypeParameter = 262144,
-        TypeAlias = 524288,
-        ExportValue = 1048576,
-        ExportType = 2097152,
-        ExportNamespace = 4194304,
-        Alias = 8388608,
-        Instantiated = 16777216,
-        Merged = 33554432,
-        Transient = 67108864,
-        Prototype = 134217728,
-        SyntheticProperty = 268435456,
-        Optional = 536870912,
-        ExportStar = 1073741824,
-        Enum = 384,
-        Variable = 3,
-        Value = 107455,
-        Type = 793056,
-        Namespace = 1536,
-        Module = 1536,
-        Accessor = 98304,
-        FunctionScopedVariableExcludes = 107454,
-        BlockScopedVariableExcludes = 107455,
-        ParameterExcludes = 107455,
-        PropertyExcludes = 107455,
-        EnumMemberExcludes = 107455,
-        FunctionExcludes = 106927,
-        ClassExcludes = 899519,
-        InterfaceExcludes = 792960,
-        RegularEnumExcludes = 899327,
-        ConstEnumExcludes = 899967,
-        ValueModuleExcludes = 106639,
-        NamespaceModuleExcludes = 0,
-        MethodExcludes = 99263,
-        GetAccessorExcludes = 41919,
-        SetAccessorExcludes = 74687,
-        TypeParameterExcludes = 530912,
-        TypeAliasExcludes = 793056,
-        AliasExcludes = 8388608,
-        ModuleMember = 8914931,
-        ExportHasLocal = 944,
-        HasExports = 1952,
-        HasMembers = 6240,
-        BlockScoped = 418,
-        PropertyOrAccessor = 98308,
-        Export = 7340032,
-    }
-    interface Symbol {
-        flags: SymbolFlags;
-        name: string;
-        declarations?: Declaration[];
-        valueDeclaration?: Declaration;
-        members?: SymbolTable;
-        exports?: SymbolTable;
-    }
-    interface SymbolTable {
-        [index: string]: Symbol;
-    }
-    const enum TypeFlags {
-        Any = 1,
-        String = 2,
-        Number = 4,
-        Boolean = 8,
-        Void = 16,
-        Undefined = 32,
-        Null = 64,
-        Enum = 128,
-        StringLiteral = 256,
-        TypeParameter = 512,
-        Class = 1024,
-        Interface = 2048,
-        Reference = 4096,
-        Tuple = 8192,
-        Union = 16384,
-        Intersection = 32768,
-        Anonymous = 65536,
-        Instantiated = 131072,
-        ObjectLiteral = 524288,
-        ESSymbol = 16777216,
-        StringLike = 258,
-        NumberLike = 132,
-        ObjectType = 80896,
-        UnionOrIntersection = 49152,
-        StructuredType = 130048,
-    }
-    interface Type {
-        flags: TypeFlags;
-        symbol?: Symbol;
-    }
-    interface StringLiteralType extends Type {
-        text: string;
-    }
-    interface ObjectType extends Type {
-    }
-    interface InterfaceType extends ObjectType {
-        typeParameters: TypeParameter[];
-        outerTypeParameters: TypeParameter[];
-        localTypeParameters: TypeParameter[];
-    }
-    interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
-        declaredProperties: Symbol[];
-        declaredCallSignatures: Signature[];
-        declaredConstructSignatures: Signature[];
-        declaredStringIndexType: Type;
-        declaredNumberIndexType: Type;
-    }
-    interface TypeReference extends ObjectType {
-        target: GenericType;
-        typeArguments: Type[];
-    }
-    interface GenericType extends InterfaceType, TypeReference {
-    }
-    interface TupleType extends ObjectType {
-        elementTypes: Type[];
-        baseArrayType: TypeReference;
-    }
-    interface UnionOrIntersectionType extends Type {
-        types: Type[];
-    }
-    interface UnionType extends UnionOrIntersectionType {
-    }
-    interface IntersectionType extends UnionOrIntersectionType {
-    }
-    interface TypeParameter extends Type {
-        constraint: Type;
-    }
-    const enum SignatureKind {
-        Call = 0,
-        Construct = 1,
-    }
-    interface Signature {
-        declaration: SignatureDeclaration;
-        typeParameters: TypeParameter[];
-        parameters: Symbol[];
-        typePredicate?: TypePredicate;
-    }
-    const enum IndexKind {
-        String = 0,
-        Number = 1,
-    }
-    interface DiagnosticMessage {
-        key: string;
-        category: DiagnosticCategory;
-        code: number;
-    }
-    /**
-     * A linked list of formatted diagnostic messages to be used as part of a multiline message.
-     * It is built from the bottom up, leaving the head to be the "main" diagnostic.
-     * While it seems that DiagnosticMessageChain is structurally similar to DiagnosticMessage,
-     * the difference is that messages are all preformatted in DMC.
-     */
-    interface DiagnosticMessageChain {
-        messageText: string;
-        category: DiagnosticCategory;
-        code: number;
-        next?: DiagnosticMessageChain;
-    }
-    interface Diagnostic {
-        file: SourceFile;
-        start: number;
-        length: number;
-        messageText: string | DiagnosticMessageChain;
-        category: DiagnosticCategory;
-        code: number;
-    }
-    enum DiagnosticCategory {
-        Warning = 0,
-        Error = 1,
-        Message = 2,
-    }
-    const enum ModuleResolutionKind {
-        Classic = 1,
-        NodeJs = 2,
-    }
-    interface CompilerOptions {
-        allowNonTsExtensions?: boolean;
-        charset?: string;
-        declaration?: boolean;
-        diagnostics?: boolean;
-        emitBOM?: boolean;
-        help?: boolean;
-        init?: boolean;
-        inlineSourceMap?: boolean;
-        inlineSources?: boolean;
-        jsx?: JsxEmit;
-        listFiles?: boolean;
-        locale?: string;
-        mapRoot?: string;
-        module?: ModuleKind;
-        newLine?: NewLineKind;
-        noEmit?: boolean;
-        noEmitHelpers?: boolean;
-        noEmitOnError?: boolean;
-        noErrorTruncation?: boolean;
-        noImplicitAny?: boolean;
-        noLib?: boolean;
-        noResolve?: boolean;
-        out?: string;
-        outFile?: string;
-        outDir?: string;
-        preserveConstEnums?: boolean;
-        project?: string;
-        removeComments?: boolean;
-        rootDir?: string;
-        sourceMap?: boolean;
-        sourceRoot?: string;
-        suppressExcessPropertyErrors?: boolean;
-        suppressImplicitAnyIndexErrors?: boolean;
-        target?: ScriptTarget;
-        version?: boolean;
-        watch?: boolean;
-        isolatedModules?: boolean;
-        experimentalDecorators?: boolean;
-        experimentalAsyncFunctions?: boolean;
-        emitDecoratorMetadata?: boolean;
-        moduleResolution?: ModuleResolutionKind;
-        [option: string]: string | number | boolean;
-    }
-    const enum ModuleKind {
-        None = 0,
-        CommonJS = 1,
-        AMD = 2,
-        UMD = 3,
-        System = 4,
-    }
-    const enum JsxEmit {
-        None = 0,
-        Preserve = 1,
-        React = 2,
-    }
-    const enum NewLineKind {
-        CarriageReturnLineFeed = 0,
-        LineFeed = 1,
-    }
-    interface LineAndCharacter {
-        line: number;
-        character: number;
-    }
-    const enum ScriptTarget {
-        ES3 = 0,
-        ES5 = 1,
-        ES6 = 2,
-        Latest = 2,
-    }
-    const enum LanguageVariant {
-        Standard = 0,
-        JSX = 1,
-    }
-    interface ParsedCommandLine {
-        options: CompilerOptions;
-        fileNames: string[];
-        errors: Diagnostic[];
-    }
-    interface ModuleResolutionHost {
-        fileExists(fileName: string): boolean;
-        readFile(fileName: string): string;
-    }
-    interface ResolvedModule {
-        resolvedFileName: string;
-        isExternalLibraryImport?: boolean;
-    }
-    interface ResolvedModuleWithFailedLookupLocations {
-        resolvedModule: ResolvedModule;
-        failedLookupLocations: string[];
-    }
-    interface CompilerHost extends ModuleResolutionHost {
-        getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;
-        getCancellationToken?(): CancellationToken;
-        getDefaultLibFileName(options: CompilerOptions): string;
-        writeFile: WriteFileCallback;
-        getCurrentDirectory(): string;
-        getCanonicalFileName(fileName: string): string;
-        useCaseSensitiveFileNames(): boolean;
-        getNewLine(): string;
-        resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
-    }
-    interface TextSpan {
-        start: number;
-        length: number;
-    }
-    interface TextChangeRange {
-        span: TextSpan;
-        newLength: number;
-    }
-}
-declare namespace ts {
-    interface System {
-        args: string[];
-        newLine: string;
-        useCaseSensitiveFileNames: boolean;
-        write(s: string): void;
-        readFile(path: string, encoding?: string): string;
-        writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: string, callback: (path: string) => void): FileWatcher;
-        resolvePath(path: string): string;
-        fileExists(path: string): boolean;
-        directoryExists(path: string): boolean;
-        createDirectory(path: string): void;
-        getExecutingFilePath(): string;
-        getCurrentDirectory(): string;
-        readDirectory(path: string, extension?: string, exclude?: string[]): string[];
-        getMemoryUsage?(): number;
-        exit(exitCode?: number): void;
-    }
-    interface FileWatcher {
-        close(): void;
-    }
-    var sys: System;
-}
-declare namespace ts {
-    interface ErrorCallback {
-        (message: DiagnosticMessage, length: number): void;
-    }
-    interface Scanner {
-        getStartPos(): number;
-        getToken(): SyntaxKind;
-        getTextPos(): number;
-        getTokenPos(): number;
-        getTokenText(): string;
-        getTokenValue(): string;
-        hasExtendedUnicodeEscape(): boolean;
-        hasPrecedingLineBreak(): boolean;
-        isIdentifier(): boolean;
-        isReservedWord(): boolean;
-        isUnterminated(): boolean;
-        reScanGreaterToken(): SyntaxKind;
-        reScanSlashToken(): SyntaxKind;
-        reScanTemplateToken(): SyntaxKind;
-        scanJsxIdentifier(): SyntaxKind;
-        reScanJsxToken(): SyntaxKind;
-        scanJsxToken(): SyntaxKind;
-        scan(): SyntaxKind;
-        setText(text: string, start?: number, length?: number): void;
-        setOnError(onError: ErrorCallback): void;
-        setScriptTarget(scriptTarget: ScriptTarget): void;
-        setLanguageVariant(variant: LanguageVariant): void;
-        setTextPos(textPos: number): void;
-        lookAhead<T>(callback: () => T): T;
-        tryScan<T>(callback: () => T): T;
-    }
-    function tokenToString(t: SyntaxKind): string;
-    function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
-    function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
-    function isWhiteSpace(ch: number): boolean;
-    function isLineBreak(ch: number): boolean;
-    function couldStartTrivia(text: string, pos: number): boolean;
-    function getLeadingCommentRanges(text: string, pos: number): CommentRange[];
-    function getTrailingCommentRanges(text: string, pos: number): CommentRange[];
-    /** Optionally, get the shebang */
-    function getShebang(text: string): string;
-    function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
-    function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
-    function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant?: LanguageVariant, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
-}
-declare namespace ts {
-    function getDefaultLibFileName(options: CompilerOptions): string;
-    function textSpanEnd(span: TextSpan): number;
-    function textSpanIsEmpty(span: TextSpan): boolean;
-    function textSpanContainsPosition(span: TextSpan, position: number): boolean;
-    function textSpanContainsTextSpan(span: TextSpan, other: TextSpan): boolean;
-    function textSpanOverlapsWith(span: TextSpan, other: TextSpan): boolean;
-    function textSpanOverlap(span1: TextSpan, span2: TextSpan): TextSpan;
-    function textSpanIntersectsWithTextSpan(span: TextSpan, other: TextSpan): boolean;
-    function textSpanIntersectsWith(span: TextSpan, start: number, length: number): boolean;
-    function decodedTextSpanIntersectsWith(start1: number, length1: number, start2: number, length2: number): boolean;
-    function textSpanIntersectsWithPosition(span: TextSpan, position: number): boolean;
-    function textSpanIntersection(span1: TextSpan, span2: TextSpan): TextSpan;
-    function createTextSpan(start: number, length: number): TextSpan;
-    function createTextSpanFromBounds(start: number, end: number): TextSpan;
-    function textChangeRangeNewSpan(range: TextChangeRange): TextSpan;
-    function textChangeRangeIsUnchanged(range: TextChangeRange): boolean;
-    function createTextChangeRange(span: TextSpan, newLength: number): TextChangeRange;
-    let unchangedTextChangeRange: TextChangeRange;
-    /**
-     * Called to merge all the changes that occurred across several versions of a script snapshot
-     * into a single change.  i.e. if a user keeps making successive edits to a script we will
-     * have a text change from V1 to V2, V2 to V3, ..., Vn.
-     *
-     * This function will then merge those changes into a single change range valid between V1 and
-     * Vn.
-     */
-    function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
-    function getTypeParameterOwner(d: Declaration): Declaration;
-}
-declare namespace ts {
-    function getNodeConstructor(kind: SyntaxKind): new () => Node;
-    function createNode(kind: SyntaxKind): Node;
-    function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
-    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
-    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
-}
-declare namespace ts {
-    const version: string;
-    function findConfigFile(searchPath: string): string;
-    function resolveTripleslashReference(moduleName: string, containingFile: string): string;
-    function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function nodeModuleNameResolver(moduleName: string, containingFile: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
-    function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
-    function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program;
-}
-declare namespace ts {
-    function parseCommandLine(commandLine: string[], readFile?: (path: string) => string): ParsedCommandLine;
-    /**
-      * Read tsconfig.json file
-      * @param fileName The path to the config file
-      */
-    function readConfigFile(fileName: string): {
-        config?: any;
-        error?: Diagnostic;
-    };
-    /**
-      * Parse the text of the tsconfig.json file
-      * @param fileName The path to the config file
-      * @param jsonText The text of the config file
-      */
-    function parseConfigFileText(fileName: string, jsonText: string): {
-        config?: any;
-        error?: Diagnostic;
-    };
-    /**
-      * Parse the contents of a config file (tsconfig.json).
-      * @param json The contents of the config file to parse
-      * @param basePath A root directory to resolve relative path entries in the config
-      *    file to. e.g. outDir
-      */
-    function parseConfigFile(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine;
-}
-declare namespace ts {
-    /** The version of the language service API */
-    let servicesVersion: string;
-    interface Node {
-        getSourceFile(): SourceFile;
-        getChildCount(sourceFile?: SourceFile): number;
-        getChildAt(index: number, sourceFile?: SourceFile): Node;
-        getChildren(sourceFile?: SourceFile): Node[];
-        getStart(sourceFile?: SourceFile): number;
-        getFullStart(): number;
-        getEnd(): number;
-        getWidth(sourceFile?: SourceFile): number;
-        getFullWidth(): number;
-        getLeadingTriviaWidth(sourceFile?: SourceFile): number;
-        getFullText(sourceFile?: SourceFile): string;
-        getText(sourceFile?: SourceFile): string;
-        getFirstToken(sourceFile?: SourceFile): Node;
-        getLastToken(sourceFile?: SourceFile): Node;
-    }
-    interface Symbol {
-        getFlags(): SymbolFlags;
-        getName(): string;
-        getDeclarations(): Declaration[];
-        getDocumentationComment(): SymbolDisplayPart[];
-    }
-    interface Type {
-        getFlags(): TypeFlags;
-        getSymbol(): Symbol;
-        getProperties(): Symbol[];
-        getProperty(propertyName: string): Symbol;
-        getApparentProperties(): Symbol[];
-        getCallSignatures(): Signature[];
-        getConstructSignatures(): Signature[];
-        getStringIndexType(): Type;
-        getNumberIndexType(): Type;
-        getBaseTypes(): ObjectType[];
-    }
-    interface Signature {
-        getDeclaration(): SignatureDeclaration;
-        getTypeParameters(): Type[];
-        getParameters(): Symbol[];
-        getReturnType(): Type;
-        getDocumentationComment(): SymbolDisplayPart[];
-    }
-    interface SourceFile {
-        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
-        getLineStarts(): number[];
-        getPositionOfLineAndCharacter(line: number, character: number): number;
-        update(newText: string, textChangeRange: TextChangeRange): SourceFile;
-    }
-    /**
-     * Represents an immutable snapshot of a script at a specified time.Once acquired, the
-     * snapshot is observably immutable. i.e. the same calls with the same parameters will return
-     * the same values.
-     */
-    interface IScriptSnapshot {
-        /** Gets a portion of the script snapshot specified by [start, end). */
-        getText(start: number, end: number): string;
-        /** Gets the length of this script snapshot. */
-        getLength(): number;
-        /**
-         * Gets the TextChangeRange that describe how the text changed between this text and
-         * an older version.  This information is used by the incremental parser to determine
-         * what sections of the script need to be re-parsed.  'undefined' can be returned if the
-         * change range cannot be determined.  However, in that case, incremental parsing will
-         * not happen and the entire document will be re - parsed.
-         */
-        getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange;
-        /** Releases all resources held by this script snapshot */
-        dispose?(): void;
-    }
-    namespace ScriptSnapshot {
-        function fromString(text: string): IScriptSnapshot;
-    }
-    interface PreProcessedFileInfo {
-        referencedFiles: FileReference[];
-        importedFiles: FileReference[];
-        ambientExternalModules: string[];
-        isLibFile: boolean;
-    }
-    interface HostCancellationToken {
-        isCancellationRequested(): boolean;
-    }
-    interface LanguageServiceHost {
-        getCompilationSettings(): CompilerOptions;
-        getNewLine?(): string;
-        getProjectVersion?(): string;
-        getScriptFileNames(): string[];
-        getScriptVersion(fileName: string): string;
-        getScriptSnapshot(fileName: string): IScriptSnapshot;
-        getLocalizedDiagnosticMessages?(): any;
-        getCancellationToken?(): HostCancellationToken;
-        getCurrentDirectory(): string;
-        getDefaultLibFileName(options: CompilerOptions): string;
-        log?(s: string): void;
-        trace?(s: string): void;
-        error?(s: string): void;
-        useCaseSensitiveFileNames?(): boolean;
-        resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
-    }
-    interface LanguageService {
-        cleanupSemanticCache(): void;
-        getSyntacticDiagnostics(fileName: string): Diagnostic[];
-        getSemanticDiagnostics(fileName: string): Diagnostic[];
-        getCompilerOptionsDiagnostics(): Diagnostic[];
-        /**
-         * @deprecated Use getEncodedSyntacticClassifications instead.
-         */
-        getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
-        /**
-         * @deprecated Use getEncodedSemanticClassifications instead.
-         */
-        getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
-        getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications;
-        getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications;
-        getCompletionsAtPosition(fileName: string, position: number): CompletionInfo;
-        getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails;
-        getQuickInfoAtPosition(fileName: string, position: number): QuickInfo;
-        getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan;
-        getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan;
-        getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems;
-        getRenameInfo(fileName: string, position: number): RenameInfo;
-        findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[];
-        getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
-        getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
-        getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
-        findReferences(fileName: string, position: number): ReferencedSymbol[];
-        getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[];
-        /** @deprecated */
-        getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
-        getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
-        getNavigationBarItems(fileName: string): NavigationBarItem[];
-        getOutliningSpans(fileName: string): OutliningSpan[];
-        getTodoComments(fileName: string, descriptors: TodoCommentDescriptor[]): TodoComment[];
-        getBraceMatchingAtPosition(fileName: string, position: number): TextSpan[];
-        getIndentationAtPosition(fileName: string, position: number, options: EditorOptions): number;
-        getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[];
-        getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[];
-        getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[];
-        getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
-        getEmitOutput(fileName: string): EmitOutput;
-        getProgram(): Program;
-        getSourceFile(fileName: string): SourceFile;
-        dispose(): void;
-    }
-    interface Classifications {
-        spans: number[];
-        endOfLineState: EndOfLineState;
-    }
-    interface ClassifiedSpan {
-        textSpan: TextSpan;
-        classificationType: string;
-    }
-    interface NavigationBarItem {
-        text: string;
-        kind: string;
-        kindModifiers: string;
-        spans: TextSpan[];
-        childItems: NavigationBarItem[];
-        indent: number;
-        bolded: boolean;
-        grayed: boolean;
-    }
-    interface TodoCommentDescriptor {
-        text: string;
-        priority: number;
-    }
-    interface TodoComment {
-        descriptor: TodoCommentDescriptor;
-        message: string;
-        position: number;
-    }
-    class TextChange {
-        span: TextSpan;
-        newText: string;
-    }
-    interface TextInsertion {
-        newText: string;
-        /** The position in newText the caret should point to after the insertion. */
-        caretOffset: number;
-    }
-    interface RenameLocation {
-        textSpan: TextSpan;
-        fileName: string;
-    }
-    interface ReferenceEntry {
-        textSpan: TextSpan;
-        fileName: string;
-        isWriteAccess: boolean;
-    }
-    interface DocumentHighlights {
-        fileName: string;
-        highlightSpans: HighlightSpan[];
-    }
-    namespace HighlightSpanKind {
-        const none: string;
-        const definition: string;
-        const reference: string;
-        const writtenReference: string;
-    }
-    interface HighlightSpan {
-        fileName?: string;
-        textSpan: TextSpan;
-        kind: string;
-    }
-    interface NavigateToItem {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        matchKind: string;
-        isCaseSensitive: boolean;
-        fileName: string;
-        textSpan: TextSpan;
-        containerName: string;
-        containerKind: string;
-    }
-    interface EditorOptions {
-        IndentSize: number;
-        TabSize: number;
-        NewLineCharacter: string;
-        ConvertTabsToSpaces: boolean;
-    }
-    interface FormatCodeOptions extends EditorOptions {
-        InsertSpaceAfterCommaDelimiter: boolean;
-        InsertSpaceAfterSemicolonInForStatements: boolean;
-        InsertSpaceBeforeAndAfterBinaryOperators: boolean;
-        InsertSpaceAfterKeywordsInControlFlowStatements: boolean;
-        InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
-        PlaceOpenBraceOnNewLineForFunctions: boolean;
-        PlaceOpenBraceOnNewLineForControlBlocks: boolean;
-        [s: string]: boolean | number | string;
-    }
-    interface DefinitionInfo {
-        fileName: string;
-        textSpan: TextSpan;
-        kind: string;
-        name: string;
-        containerKind: string;
-        containerName: string;
-    }
-    interface ReferencedSymbol {
-        definition: DefinitionInfo;
-        references: ReferenceEntry[];
-    }
-    enum SymbolDisplayPartKind {
-        aliasName = 0,
-        className = 1,
-        enumName = 2,
-        fieldName = 3,
-        interfaceName = 4,
-        keyword = 5,
-        lineBreak = 6,
-        numericLiteral = 7,
-        stringLiteral = 8,
-        localName = 9,
-        methodName = 10,
-        moduleName = 11,
-        operator = 12,
-        parameterName = 13,
-        propertyName = 14,
-        punctuation = 15,
-        space = 16,
-        text = 17,
-        typeParameterName = 18,
-        enumMemberName = 19,
-        functionName = 20,
-        regularExpressionLiteral = 21,
-    }
-    interface SymbolDisplayPart {
-        text: string;
-        kind: string;
-    }
-    interface QuickInfo {
-        kind: string;
-        kindModifiers: string;
-        textSpan: TextSpan;
-        displayParts: SymbolDisplayPart[];
-        documentation: SymbolDisplayPart[];
-    }
-    interface RenameInfo {
-        canRename: boolean;
-        localizedErrorMessage: string;
-        displayName: string;
-        fullDisplayName: string;
-        kind: string;
-        kindModifiers: string;
-        triggerSpan: TextSpan;
-    }
-    interface SignatureHelpParameter {
-        name: string;
-        documentation: SymbolDisplayPart[];
-        displayParts: SymbolDisplayPart[];
-        isOptional: boolean;
-    }
-    /**
-     * Represents a single signature to show in signature help.
-     * The id is used for subsequent calls into the language service to ask questions about the
-     * signature help item in the context of any documents that have been updated.  i.e. after
-     * an edit has happened, while signature help is still active, the host can ask important
-     * questions like 'what parameter is the user currently contained within?'.
-     */
-    interface SignatureHelpItem {
-        isVariadic: boolean;
-        prefixDisplayParts: SymbolDisplayPart[];
-        suffixDisplayParts: SymbolDisplayPart[];
-        separatorDisplayParts: SymbolDisplayPart[];
-        parameters: SignatureHelpParameter[];
-        documentation: SymbolDisplayPart[];
-    }
-    /**
-     * Represents a set of signature help items, and the preferred item that should be selected.
-     */
-    interface SignatureHelpItems {
-        items: SignatureHelpItem[];
-        applicableSpan: TextSpan;
-        selectedItemIndex: number;
-        argumentIndex: number;
-        argumentCount: number;
-    }
-    interface CompletionInfo {
-        isMemberCompletion: boolean;
-        isNewIdentifierLocation: boolean;
-        entries: CompletionEntry[];
-    }
-    interface CompletionEntry {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        sortText: string;
-    }
-    interface CompletionEntryDetails {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        displayParts: SymbolDisplayPart[];
-        documentation: SymbolDisplayPart[];
-    }
-    interface OutliningSpan {
-        /** The span of the document to actually collapse. */
-        textSpan: TextSpan;
-        /** The span of the document to display when the user hovers over the collapsed span. */
-        hintSpan: TextSpan;
-        /** The text to display in the editor for the collapsed region. */
-        bannerText: string;
-        /**
-          * Whether or not this region should be automatically collapsed when
-          * the 'Collapse to Definitions' command is invoked.
-          */
-        autoCollapse: boolean;
-    }
-    interface EmitOutput {
-        outputFiles: OutputFile[];
-        emitSkipped: boolean;
-    }
-    const enum OutputFileType {
-        JavaScript = 0,
-        SourceMap = 1,
-        Declaration = 2,
-    }
-    interface OutputFile {
-        name: string;
-        writeByteOrderMark: boolean;
-        text: string;
-    }
-    const enum EndOfLineState {
-        None = 0,
-        InMultiLineCommentTrivia = 1,
-        InSingleQuoteStringLiteral = 2,
-        InDoubleQuoteStringLiteral = 3,
-        InTemplateHeadOrNoSubstitutionTemplate = 4,
-        InTemplateMiddleOrTail = 5,
-        InTemplateSubstitutionPosition = 6,
-    }
-    enum TokenClass {
-        Punctuation = 0,
-        Keyword = 1,
-        Operator = 2,
-        Comment = 3,
-        Whitespace = 4,
-        Identifier = 5,
-        NumberLiteral = 6,
-        StringLiteral = 7,
-        RegExpLiteral = 8,
-    }
-    interface ClassificationResult {
-        finalLexState: EndOfLineState;
-        entries: ClassificationInfo[];
-    }
-    interface ClassificationInfo {
-        length: number;
-        classification: TokenClass;
-    }
-    interface Classifier {
-        /**
-         * Gives lexical classifications of tokens on a line without any syntactic context.
-         * For instance, a token consisting of the text 'string' can be either an identifier
-         * named 'string' or the keyword 'string', however, because this classifier is not aware,
-         * it relies on certain heuristics to give acceptable results. For classifications where
-         * speed trumps accuracy, this function is preferable; however, for true accuracy, the
-         * syntactic classifier is ideal. In fact, in certain editing scenarios, combining the
-         * lexical, syntactic, and semantic classifiers may issue the best user experience.
-         *
-         * @param text                      The text of a line to classify.
-         * @param lexState                  The state of the lexical classifier at the end of the previous line.
-         * @param syntacticClassifierAbsent Whether the client is *not* using a syntactic classifier.
-         *                                  If there is no syntactic classifier (syntacticClassifierAbsent=true),
-         *                                  certain heuristics may be used in its place; however, if there is a
-         *                                  syntactic classifier (syntacticClassifierAbsent=false), certain
-         *                                  classifications which may be incorrectly categorized will be given
-         *                                  back as Identifiers in order to allow the syntactic classifier to
-         *                                  subsume the classification.
-         * @deprecated Use getLexicalClassifications instead.
-         */
-        getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult;
-        getEncodedLexicalClassifications(text: string, endOfLineState: EndOfLineState, syntacticClassifierAbsent: boolean): Classifications;
-    }
-    /**
-      * The document registry represents a store of SourceFile objects that can be shared between
-      * multiple LanguageService instances. A LanguageService instance holds on the SourceFile (AST)
-      * of files in the context.
-      * SourceFile objects account for most of the memory usage by the language service. Sharing
-      * the same DocumentRegistry instance between different instances of LanguageService allow
-      * for more efficient memory utilization since all projects will share at least the library
-      * file (lib.d.ts).
-      *
-      * A more advanced use of the document registry is to serialize sourceFile objects to disk
-      * and re-hydrate them when needed.
-      *
-      * To create a default DocumentRegistry, use createDocumentRegistry to create one, and pass it
-      * to all subsequent createLanguageService calls.
-      */
-    interface DocumentRegistry {
-        /**
-          * Request a stored SourceFile with a given fileName and compilationSettings.
-          * The first call to acquire will call createLanguageServiceSourceFile to generate
-          * the SourceFile if was not found in the registry.
-          *
-          * @param fileName The name of the file requested
-          * @param compilationSettings Some compilation settings like target affects the
-          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
-          * multiple copies of the same file for different compilation settings.
-          * @parm scriptSnapshot Text of the file. Only used if the file was not found
-          * in the registry and a new one was created.
-          * @parm version Current version of the file. Only used if the file was not found
-          * in the registry and a new one was created.
-          */
-        acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;
-        /**
-          * Request an updated version of an already existing SourceFile with a given fileName
-          * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile
-          * to get an updated SourceFile.
-          *
-          * @param fileName The name of the file requested
-          * @param compilationSettings Some compilation settings like target affects the
-          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
-          * multiple copies of the same file for different compilation settings.
-          * @param scriptSnapshot Text of the file.
-          * @param version Current version of the file.
-          */
-        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;
-        /**
-          * Informs the DocumentRegistry that a file is not needed any longer.
-          *
-          * Note: It is not allowed to call release on a SourceFile that was not acquired from
-          * this registry originally.
-          *
-          * @param fileName The name of the file to be released
-          * @param compilationSettings The compilation settings used to acquire the file
-          */
-        releaseDocument(fileName: string, compilationSettings: CompilerOptions): void;
-        reportStats(): string;
-    }
-    namespace ScriptElementKind {
-        const unknown: string;
-        const warning: string;
-        const keyword: string;
-        const scriptElement: string;
-        const moduleElement: string;
-        const classElement: string;
-        const localClassElement: string;
-        const interfaceElement: string;
-        const typeElement: string;
-        const enumElement: string;
-        const variableElement: string;
-        const localVariableElement: string;
-        const functionElement: string;
-        const localFunctionElement: string;
-        const memberFunctionElement: string;
-        const memberGetAccessorElement: string;
-        const memberSetAccessorElement: string;
-        const memberVariableElement: string;
-        const constructorImplementationElement: string;
-        const callSignatureElement: string;
-        const indexSignatureElement: string;
-        const constructSignatureElement: string;
-        const parameterElement: string;
-        const typeParameterElement: string;
-        const primitiveType: string;
-        const label: string;
-        const alias: string;
-        const constElement: string;
-        const letElement: string;
-    }
-    namespace ScriptElementKindModifier {
-        const none: string;
-        const publicMemberModifier: string;
-        const privateMemberModifier: string;
-        const protectedMemberModifier: string;
-        const exportedModifier: string;
-        const ambientModifier: string;
-        const staticModifier: string;
-        const abstractModifier: string;
-    }
-    class ClassificationTypeNames {
-        static comment: string;
-        static identifier: string;
-        static keyword: string;
-        static numericLiteral: string;
-        static operator: string;
-        static stringLiteral: string;
-        static whiteSpace: string;
-        static text: string;
-        static punctuation: string;
-        static className: string;
-        static enumName: string;
-        static interfaceName: string;
-        static moduleName: string;
-        static typeParameterName: string;
-        static typeAliasName: string;
-        static parameterName: string;
-        static docCommentTagName: string;
-    }
-    const enum ClassificationType {
-        comment = 1,
-        identifier = 2,
-        keyword = 3,
-        numericLiteral = 4,
-        operator = 5,
-        stringLiteral = 6,
-        regularExpressionLiteral = 7,
-        whiteSpace = 8,
-        text = 9,
-        punctuation = 10,
-        className = 11,
-        enumName = 12,
-        interfaceName = 13,
-        moduleName = 14,
-        typeParameterName = 15,
-        typeAliasName = 16,
-        parameterName = 17,
-        docCommentTagName = 18,
-    }
-    interface DisplayPartsSymbolWriter extends SymbolWriter {
-        displayParts(): SymbolDisplayPart[];
-    }
-    function displayPartsToString(displayParts: SymbolDisplayPart[]): string;
-    function getDefaultCompilerOptions(): CompilerOptions;
-    interface TranspileOptions {
-        compilerOptions?: CompilerOptions;
-        fileName?: string;
-        reportDiagnostics?: boolean;
-        moduleName?: string;
-        renamedDependencies?: Map<string>;
-    }
-    interface TranspileOutput {
-        outputText: string;
-        diagnostics?: Diagnostic[];
-        sourceMapText?: string;
-    }
-    function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
-    function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
-    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
-    let disableIncrementalParsing: boolean;
-    function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
-    function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string;
-    function createDocumentRegistry(useCaseSensitiveFileNames?: boolean): DocumentRegistry;
-    function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
-    function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService;
-    function createClassifier(): Classifier;
-    /**
-      * Get the path of the default library files (lib.d.ts) as distributed with the typescript
-      * node package.
-      * The functionality is not supported if the ts module is consumed outside of a node module.
-      */
-    function getDefaultLibFilePath(options: CompilerOptions): string;
-}
diff --git a/typescript-services/tsconfig.json b/typescript-services/tsconfig.json
deleted file mode 100644
index 87f7d96a9f..0000000000
--- a/typescript-services/tsconfig.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "noImplicitAny": true,
-        "strictNullChecks": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "typescriptServices-tests.ts"
-    ]
-}
\ No newline at end of file
diff --git a/typescript-services/typescriptServices-tests.ts b/typescript-services/typescriptServices-tests.ts
deleted file mode 100644
index f79eee7243..0000000000
--- a/typescript-services/typescriptServices-tests.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-// transpile
-function transpile(input: string): string {
-    return ts.transpile(input, { module: ts.ModuleKind.CommonJS });
-}
-
-// compile
-function compile(fileNames: string[], options: ts.CompilerOptions): number {
-    let program = ts.createProgram(fileNames, options);
-    let emitResult = program.emit();
-
-    let allDiagnostics = ts.getPreEmitDiagnostics(program).concat(emitResult.diagnostics);
-
-    allDiagnostics.forEach(diagnostic => {
-        let { line, character } = diagnostic.file.getLineAndCharacterOfPosition(diagnostic.start);
-        let message = ts.flattenDiagnosticMessageText(diagnostic.messageText, '\n');
-        console.log(`${diagnostic.file.fileName} (${line + 1},${character + 1}): ${message}`);
-    });
-
-    let exitCode = emitResult.emitSkipped ? 1 : 0;
-    return exitCode;
-}
diff --git a/typescript/index.d.ts b/typescript/index.d.ts
deleted file mode 100644
index 0a05300b40..0000000000
--- a/typescript/index.d.ts
+++ /dev/null
@@ -1,2148 +0,0 @@
-// Type definitions for TypeScript API v0.4.0
-// Project: http://www.typescriptlang.org/
-// Definitions by: Microsoft TypeScript <http://typescriptlang.org>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-declare module "typescript" {
-    interface Map<T> {
-        [index: string]: T;
-    }
-    interface FileMap<T> {
-        get(fileName: string): T;
-        set(fileName: string, value: T): void;
-        contains(fileName: string): boolean;
-        remove(fileName: string): void;
-        forEachValue(f: (v: T) => void): void;
-        clear(): void;
-    }
-    interface TextRange {
-        pos: number;
-        end: number;
-    }
-    const enum SyntaxKind {
-        Unknown = 0,
-        EndOfFileToken = 1,
-        SingleLineCommentTrivia = 2,
-        MultiLineCommentTrivia = 3,
-        NewLineTrivia = 4,
-        WhitespaceTrivia = 5,
-        ShebangTrivia = 6,
-        ConflictMarkerTrivia = 7,
-        NumericLiteral = 8,
-        StringLiteral = 9,
-        RegularExpressionLiteral = 10,
-        NoSubstitutionTemplateLiteral = 11,
-        TemplateHead = 12,
-        TemplateMiddle = 13,
-        TemplateTail = 14,
-        OpenBraceToken = 15,
-        CloseBraceToken = 16,
-        OpenParenToken = 17,
-        CloseParenToken = 18,
-        OpenBracketToken = 19,
-        CloseBracketToken = 20,
-        DotToken = 21,
-        DotDotDotToken = 22,
-        SemicolonToken = 23,
-        CommaToken = 24,
-        LessThanToken = 25,
-        LessThanSlashToken = 26,
-        GreaterThanToken = 27,
-        LessThanEqualsToken = 28,
-        GreaterThanEqualsToken = 29,
-        EqualsEqualsToken = 30,
-        ExclamationEqualsToken = 31,
-        EqualsEqualsEqualsToken = 32,
-        ExclamationEqualsEqualsToken = 33,
-        EqualsGreaterThanToken = 34,
-        PlusToken = 35,
-        MinusToken = 36,
-        AsteriskToken = 37,
-        SlashToken = 38,
-        PercentToken = 39,
-        PlusPlusToken = 40,
-        MinusMinusToken = 41,
-        LessThanLessThanToken = 42,
-        GreaterThanGreaterThanToken = 43,
-        GreaterThanGreaterThanGreaterThanToken = 44,
-        AmpersandToken = 45,
-        BarToken = 46,
-        CaretToken = 47,
-        ExclamationToken = 48,
-        TildeToken = 49,
-        AmpersandAmpersandToken = 50,
-        BarBarToken = 51,
-        QuestionToken = 52,
-        ColonToken = 53,
-        AtToken = 54,
-        EqualsToken = 55,
-        PlusEqualsToken = 56,
-        MinusEqualsToken = 57,
-        AsteriskEqualsToken = 58,
-        SlashEqualsToken = 59,
-        PercentEqualsToken = 60,
-        LessThanLessThanEqualsToken = 61,
-        GreaterThanGreaterThanEqualsToken = 62,
-        GreaterThanGreaterThanGreaterThanEqualsToken = 63,
-        AmpersandEqualsToken = 64,
-        BarEqualsToken = 65,
-        CaretEqualsToken = 66,
-        Identifier = 67,
-        BreakKeyword = 68,
-        CaseKeyword = 69,
-        CatchKeyword = 70,
-        ClassKeyword = 71,
-        ConstKeyword = 72,
-        ContinueKeyword = 73,
-        DebuggerKeyword = 74,
-        DefaultKeyword = 75,
-        DeleteKeyword = 76,
-        DoKeyword = 77,
-        ElseKeyword = 78,
-        EnumKeyword = 79,
-        ExportKeyword = 80,
-        ExtendsKeyword = 81,
-        FalseKeyword = 82,
-        FinallyKeyword = 83,
-        ForKeyword = 84,
-        FunctionKeyword = 85,
-        IfKeyword = 86,
-        ImportKeyword = 87,
-        InKeyword = 88,
-        InstanceOfKeyword = 89,
-        NewKeyword = 90,
-        NullKeyword = 91,
-        ReturnKeyword = 92,
-        SuperKeyword = 93,
-        SwitchKeyword = 94,
-        ThisKeyword = 95,
-        ThrowKeyword = 96,
-        TrueKeyword = 97,
-        TryKeyword = 98,
-        TypeOfKeyword = 99,
-        VarKeyword = 100,
-        VoidKeyword = 101,
-        WhileKeyword = 102,
-        WithKeyword = 103,
-        ImplementsKeyword = 104,
-        InterfaceKeyword = 105,
-        LetKeyword = 106,
-        PackageKeyword = 107,
-        PrivateKeyword = 108,
-        ProtectedKeyword = 109,
-        PublicKeyword = 110,
-        StaticKeyword = 111,
-        YieldKeyword = 112,
-        AbstractKeyword = 113,
-        AsKeyword = 114,
-        AnyKeyword = 115,
-        AsyncKeyword = 116,
-        AwaitKeyword = 117,
-        BooleanKeyword = 118,
-        ConstructorKeyword = 119,
-        DeclareKeyword = 120,
-        GetKeyword = 121,
-        IsKeyword = 122,
-        ModuleKeyword = 123,
-        NamespaceKeyword = 124,
-        RequireKeyword = 125,
-        NumberKeyword = 126,
-        SetKeyword = 127,
-        StringKeyword = 128,
-        SymbolKeyword = 129,
-        TypeKeyword = 130,
-        FromKeyword = 131,
-        OfKeyword = 132,
-        QualifiedName = 133,
-        ComputedPropertyName = 134,
-        TypeParameter = 135,
-        Parameter = 136,
-        Decorator = 137,
-        PropertySignature = 138,
-        PropertyDeclaration = 139,
-        MethodSignature = 140,
-        MethodDeclaration = 141,
-        Constructor = 142,
-        GetAccessor = 143,
-        SetAccessor = 144,
-        CallSignature = 145,
-        ConstructSignature = 146,
-        IndexSignature = 147,
-        TypePredicate = 148,
-        TypeReference = 149,
-        FunctionType = 150,
-        ConstructorType = 151,
-        TypeQuery = 152,
-        TypeLiteral = 153,
-        ArrayType = 154,
-        TupleType = 155,
-        UnionType = 156,
-        IntersectionType = 157,
-        ParenthesizedType = 158,
-        ObjectBindingPattern = 159,
-        ArrayBindingPattern = 160,
-        BindingElement = 161,
-        ArrayLiteralExpression = 162,
-        ObjectLiteralExpression = 163,
-        PropertyAccessExpression = 164,
-        ElementAccessExpression = 165,
-        CallExpression = 166,
-        NewExpression = 167,
-        TaggedTemplateExpression = 168,
-        TypeAssertionExpression = 169,
-        ParenthesizedExpression = 170,
-        FunctionExpression = 171,
-        ArrowFunction = 172,
-        DeleteExpression = 173,
-        TypeOfExpression = 174,
-        VoidExpression = 175,
-        AwaitExpression = 176,
-        PrefixUnaryExpression = 177,
-        PostfixUnaryExpression = 178,
-        BinaryExpression = 179,
-        ConditionalExpression = 180,
-        TemplateExpression = 181,
-        YieldExpression = 182,
-        SpreadElementExpression = 183,
-        ClassExpression = 184,
-        OmittedExpression = 185,
-        ExpressionWithTypeArguments = 186,
-        AsExpression = 187,
-        TemplateSpan = 188,
-        SemicolonClassElement = 189,
-        Block = 190,
-        VariableStatement = 191,
-        EmptyStatement = 192,
-        ExpressionStatement = 193,
-        IfStatement = 194,
-        DoStatement = 195,
-        WhileStatement = 196,
-        ForStatement = 197,
-        ForInStatement = 198,
-        ForOfStatement = 199,
-        ContinueStatement = 200,
-        BreakStatement = 201,
-        ReturnStatement = 202,
-        WithStatement = 203,
-        SwitchStatement = 204,
-        LabeledStatement = 205,
-        ThrowStatement = 206,
-        TryStatement = 207,
-        DebuggerStatement = 208,
-        VariableDeclaration = 209,
-        VariableDeclarationList = 210,
-        FunctionDeclaration = 211,
-        ClassDeclaration = 212,
-        InterfaceDeclaration = 213,
-        TypeAliasDeclaration = 214,
-        EnumDeclaration = 215,
-        ModuleDeclaration = 216,
-        ModuleBlock = 217,
-        CaseBlock = 218,
-        ImportEqualsDeclaration = 219,
-        ImportDeclaration = 220,
-        ImportClause = 221,
-        NamespaceImport = 222,
-        NamedImports = 223,
-        ImportSpecifier = 224,
-        ExportAssignment = 225,
-        ExportDeclaration = 226,
-        NamedExports = 227,
-        ExportSpecifier = 228,
-        MissingDeclaration = 229,
-        ExternalModuleReference = 230,
-        JsxElement = 231,
-        JsxSelfClosingElement = 232,
-        JsxOpeningElement = 233,
-        JsxText = 234,
-        JsxClosingElement = 235,
-        JsxAttribute = 236,
-        JsxSpreadAttribute = 237,
-        JsxExpression = 238,
-        CaseClause = 239,
-        DefaultClause = 240,
-        HeritageClause = 241,
-        CatchClause = 242,
-        PropertyAssignment = 243,
-        ShorthandPropertyAssignment = 244,
-        EnumMember = 245,
-        SourceFile = 246,
-        JSDocTypeExpression = 247,
-        JSDocAllType = 248,
-        JSDocUnknownType = 249,
-        JSDocArrayType = 250,
-        JSDocUnionType = 251,
-        JSDocTupleType = 252,
-        JSDocNullableType = 253,
-        JSDocNonNullableType = 254,
-        JSDocRecordType = 255,
-        JSDocRecordMember = 256,
-        JSDocTypeReference = 257,
-        JSDocOptionalType = 258,
-        JSDocFunctionType = 259,
-        JSDocVariadicType = 260,
-        JSDocConstructorType = 261,
-        JSDocThisType = 262,
-        JSDocComment = 263,
-        JSDocTag = 264,
-        JSDocParameterTag = 265,
-        JSDocReturnTag = 266,
-        JSDocTypeTag = 267,
-        JSDocTemplateTag = 268,
-        SyntaxList = 269,
-        Count = 270,
-        FirstAssignment = 55,
-        LastAssignment = 66,
-        FirstReservedWord = 68,
-        LastReservedWord = 103,
-        FirstKeyword = 68,
-        LastKeyword = 132,
-        FirstFutureReservedWord = 104,
-        LastFutureReservedWord = 112,
-        FirstTypeNode = 149,
-        LastTypeNode = 158,
-        FirstPunctuation = 15,
-        LastPunctuation = 66,
-        FirstToken = 0,
-        LastToken = 132,
-        FirstTriviaToken = 2,
-        LastTriviaToken = 7,
-        FirstLiteralToken = 8,
-        LastLiteralToken = 11,
-        FirstTemplateToken = 11,
-        LastTemplateToken = 14,
-        FirstBinaryOperator = 25,
-        LastBinaryOperator = 66,
-        FirstNode = 133,
-    }
-    const enum NodeFlags {
-        Export = 1,
-        Ambient = 2,
-        Public = 16,
-        Private = 32,
-        Protected = 64,
-        Static = 128,
-        Abstract = 256,
-        Async = 512,
-        Default = 1024,
-        MultiLine = 2048,
-        Synthetic = 4096,
-        DeclarationFile = 8192,
-        Let = 16384,
-        Const = 32768,
-        OctalLiteral = 65536,
-        Namespace = 131072,
-        ExportContext = 262144,
-        Modifier = 2035,
-        AccessibilityModifier = 112,
-        BlockScoped = 49152,
-    }
-    const enum JsxFlags {
-        None = 0,
-        IntrinsicNamedElement = 1,
-        IntrinsicIndexedElement = 2,
-        ClassElement = 4,
-        UnknownElement = 8,
-        IntrinsicElement = 3,
-    }
-    interface Node extends TextRange {
-        kind: SyntaxKind;
-        flags: NodeFlags;
-        decorators?: NodeArray<Decorator>;
-        modifiers?: ModifiersArray;
-        parent?: Node;
-    }
-    interface NodeArray<T> extends Array<T>, TextRange {
-        hasTrailingComma?: boolean;
-    }
-    interface ModifiersArray extends NodeArray<Node> {
-        flags: number;
-    }
-    interface Identifier extends PrimaryExpression {
-        text: string;
-        originalKeywordKind?: SyntaxKind;
-    }
-    interface QualifiedName extends Node {
-        left: EntityName;
-        right: Identifier;
-    }
-    type EntityName = Identifier | QualifiedName;
-    type DeclarationName = Identifier | LiteralExpression | ComputedPropertyName | BindingPattern;
-    interface Declaration extends Node {
-        _declarationBrand: any;
-        name?: DeclarationName;
-    }
-    interface ComputedPropertyName extends Node {
-        expression: Expression;
-    }
-    interface Decorator extends Node {
-        expression: LeftHandSideExpression;
-    }
-    interface TypeParameterDeclaration extends Declaration {
-        name: Identifier;
-        constraint?: TypeNode;
-        expression?: Expression;
-    }
-    interface SignatureDeclaration extends Declaration {
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        parameters: NodeArray<ParameterDeclaration>;
-        type?: TypeNode;
-    }
-    interface VariableDeclaration extends Declaration {
-        parent?: VariableDeclarationList;
-        name: Identifier | BindingPattern;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface VariableDeclarationList extends Node {
-        declarations: NodeArray<VariableDeclaration>;
-    }
-    interface ParameterDeclaration extends Declaration {
-        dotDotDotToken?: Node;
-        name: Identifier | BindingPattern;
-        questionToken?: Node;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface BindingElement extends Declaration {
-        propertyName?: Identifier;
-        dotDotDotToken?: Node;
-        name: Identifier | BindingPattern;
-        initializer?: Expression;
-    }
-    interface PropertyDeclaration extends Declaration, ClassElement {
-        name: DeclarationName;
-        questionToken?: Node;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface ObjectLiteralElement extends Declaration {
-        _objectLiteralBrandBrand: any;
-    }
-    interface PropertyAssignment extends ObjectLiteralElement {
-        _propertyAssignmentBrand: any;
-        name: DeclarationName;
-        questionToken?: Node;
-        initializer: Expression;
-    }
-    interface ShorthandPropertyAssignment extends ObjectLiteralElement {
-        name: Identifier;
-        questionToken?: Node;
-    }
-    interface VariableLikeDeclaration extends Declaration {
-        propertyName?: Identifier;
-        dotDotDotToken?: Node;
-        name: DeclarationName;
-        questionToken?: Node;
-        type?: TypeNode;
-        initializer?: Expression;
-    }
-    interface BindingPattern extends Node {
-        elements: NodeArray<BindingElement>;
-    }
-    /**
-     * Several node kinds share function-like features such as a signature,
-     * a name, and a body. These nodes should extend FunctionLikeDeclaration.
-     * Examples:
-     * - FunctionDeclaration
-     * - MethodDeclaration
-     * - AccessorDeclaration
-     */
-    interface FunctionLikeDeclaration extends SignatureDeclaration {
-        _functionLikeDeclarationBrand: any;
-        asteriskToken?: Node;
-        questionToken?: Node;
-        body?: Block | Expression;
-    }
-    interface FunctionDeclaration extends FunctionLikeDeclaration, Statement {
-        name?: Identifier;
-        body?: Block;
-    }
-    interface MethodDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
-        body?: Block;
-    }
-    interface ConstructorDeclaration extends FunctionLikeDeclaration, ClassElement {
-        body?: Block;
-    }
-    interface SemicolonClassElement extends ClassElement {
-        _semicolonClassElementBrand: any;
-    }
-    interface AccessorDeclaration extends FunctionLikeDeclaration, ClassElement, ObjectLiteralElement {
-        _accessorDeclarationBrand: any;
-        body: Block;
-    }
-    interface IndexSignatureDeclaration extends SignatureDeclaration, ClassElement {
-        _indexSignatureDeclarationBrand: any;
-    }
-    interface TypeNode extends Node {
-        _typeNodeBrand: any;
-    }
-    interface FunctionOrConstructorTypeNode extends TypeNode, SignatureDeclaration {
-        _functionOrConstructorTypeNodeBrand: any;
-    }
-    interface TypeReferenceNode extends TypeNode {
-        typeName: EntityName;
-        typeArguments?: NodeArray<TypeNode>;
-    }
-    interface TypePredicateNode extends TypeNode {
-        parameterName: Identifier;
-        type: TypeNode;
-    }
-    interface TypeQueryNode extends TypeNode {
-        exprName: EntityName;
-    }
-    interface TypeLiteralNode extends TypeNode, Declaration {
-        members: NodeArray<Node>;
-    }
-    interface ArrayTypeNode extends TypeNode {
-        elementType: TypeNode;
-    }
-    interface TupleTypeNode extends TypeNode {
-        elementTypes: NodeArray<TypeNode>;
-    }
-    interface UnionOrIntersectionTypeNode extends TypeNode {
-        types: NodeArray<TypeNode>;
-    }
-    interface UnionTypeNode extends UnionOrIntersectionTypeNode {
-    }
-    interface IntersectionTypeNode extends UnionOrIntersectionTypeNode {
-    }
-    interface ParenthesizedTypeNode extends TypeNode {
-        type: TypeNode;
-    }
-    interface StringLiteral extends LiteralExpression, TypeNode {
-        _stringLiteralBrand: any;
-    }
-    interface Expression extends Node {
-        _expressionBrand: any;
-        contextualType?: Type;
-    }
-    interface UnaryExpression extends Expression {
-        _unaryExpressionBrand: any;
-    }
-    interface PrefixUnaryExpression extends UnaryExpression {
-        operator: SyntaxKind;
-        operand: UnaryExpression;
-    }
-    interface PostfixUnaryExpression extends PostfixExpression {
-        operand: LeftHandSideExpression;
-        operator: SyntaxKind;
-    }
-    interface PostfixExpression extends UnaryExpression {
-        _postfixExpressionBrand: any;
-    }
-    interface LeftHandSideExpression extends PostfixExpression {
-        _leftHandSideExpressionBrand: any;
-    }
-    interface MemberExpression extends LeftHandSideExpression {
-        _memberExpressionBrand: any;
-    }
-    interface PrimaryExpression extends MemberExpression {
-        _primaryExpressionBrand: any;
-    }
-    interface DeleteExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface TypeOfExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface VoidExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface AwaitExpression extends UnaryExpression {
-        expression: UnaryExpression;
-    }
-    interface YieldExpression extends Expression {
-        asteriskToken?: Node;
-        expression?: Expression;
-    }
-    interface BinaryExpression extends Expression {
-        left: Expression;
-        operatorToken: Node;
-        right: Expression;
-    }
-    interface ConditionalExpression extends Expression {
-        condition: Expression;
-        questionToken: Node;
-        whenTrue: Expression;
-        colonToken: Node;
-        whenFalse: Expression;
-    }
-    interface FunctionExpression extends PrimaryExpression, FunctionLikeDeclaration {
-        name?: Identifier;
-        body: Block | Expression;
-    }
-    interface ArrowFunction extends Expression, FunctionLikeDeclaration {
-        equalsGreaterThanToken: Node;
-    }
-    interface LiteralExpression extends PrimaryExpression {
-        text: string;
-        isUnterminated?: boolean;
-        hasExtendedUnicodeEscape?: boolean;
-    }
-    interface TemplateExpression extends PrimaryExpression {
-        head: LiteralExpression;
-        templateSpans: NodeArray<TemplateSpan>;
-    }
-    interface TemplateSpan extends Node {
-        expression: Expression;
-        literal: LiteralExpression;
-    }
-    interface ParenthesizedExpression extends PrimaryExpression {
-        expression: Expression;
-    }
-    interface ArrayLiteralExpression extends PrimaryExpression {
-        elements: NodeArray<Expression>;
-    }
-    interface SpreadElementExpression extends Expression {
-        expression: Expression;
-    }
-    interface ObjectLiteralExpression extends PrimaryExpression, Declaration {
-        properties: NodeArray<ObjectLiteralElement>;
-    }
-    interface PropertyAccessExpression extends MemberExpression {
-        expression: LeftHandSideExpression;
-        dotToken: Node;
-        name: Identifier;
-    }
-    interface ElementAccessExpression extends MemberExpression {
-        expression: LeftHandSideExpression;
-        argumentExpression?: Expression;
-    }
-    interface CallExpression extends LeftHandSideExpression {
-        expression: LeftHandSideExpression;
-        typeArguments?: NodeArray<TypeNode>;
-        arguments: NodeArray<Expression>;
-    }
-    interface ExpressionWithTypeArguments extends TypeNode {
-        expression: LeftHandSideExpression;
-        typeArguments?: NodeArray<TypeNode>;
-    }
-    interface NewExpression extends CallExpression, PrimaryExpression {
-    }
-    interface TaggedTemplateExpression extends MemberExpression {
-        tag: LeftHandSideExpression;
-        template: LiteralExpression | TemplateExpression;
-    }
-    type CallLikeExpression = CallExpression | NewExpression | TaggedTemplateExpression | Decorator;
-    interface AsExpression extends Expression {
-        expression: Expression;
-        type: TypeNode;
-    }
-    interface TypeAssertion extends UnaryExpression {
-        type: TypeNode;
-        expression: UnaryExpression;
-    }
-    type AssertionExpression = TypeAssertion | AsExpression;
-    interface JsxElement extends PrimaryExpression {
-        openingElement: JsxOpeningElement;
-        children: NodeArray<JsxChild>;
-        closingElement: JsxClosingElement;
-    }
-    interface JsxOpeningElement extends Expression {
-        _openingElementBrand?: any;
-        tagName: EntityName;
-        attributes: NodeArray<JsxAttribute | JsxSpreadAttribute>;
-    }
-    interface JsxSelfClosingElement extends PrimaryExpression, JsxOpeningElement {
-        _selfClosingElementBrand?: any;
-    }
-    type JsxOpeningLikeElement = JsxSelfClosingElement | JsxOpeningElement;
-    interface JsxAttribute extends Node {
-        name: Identifier;
-        initializer?: Expression;
-    }
-    interface JsxSpreadAttribute extends Node {
-        expression: Expression;
-    }
-    interface JsxClosingElement extends Node {
-        tagName: EntityName;
-    }
-    interface JsxExpression extends Expression {
-        expression?: Expression;
-    }
-    interface JsxText extends Node {
-        _jsxTextExpressionBrand: any;
-    }
-    type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement;
-    interface Statement extends Node {
-        _statementBrand: any;
-    }
-    interface Block extends Statement {
-        statements: NodeArray<Statement>;
-    }
-    interface VariableStatement extends Statement {
-        declarationList: VariableDeclarationList;
-    }
-    interface ExpressionStatement extends Statement {
-        expression: Expression;
-    }
-    interface IfStatement extends Statement {
-        expression: Expression;
-        thenStatement: Statement;
-        elseStatement?: Statement;
-    }
-    interface IterationStatement extends Statement {
-        statement: Statement;
-    }
-    interface DoStatement extends IterationStatement {
-        expression: Expression;
-    }
-    interface WhileStatement extends IterationStatement {
-        expression: Expression;
-    }
-    interface ForStatement extends IterationStatement {
-        initializer?: VariableDeclarationList | Expression;
-        condition?: Expression;
-        incrementor?: Expression;
-    }
-    interface ForInStatement extends IterationStatement {
-        initializer: VariableDeclarationList | Expression;
-        expression: Expression;
-    }
-    interface ForOfStatement extends IterationStatement {
-        initializer: VariableDeclarationList | Expression;
-        expression: Expression;
-    }
-    interface BreakOrContinueStatement extends Statement {
-        label?: Identifier;
-    }
-    interface ReturnStatement extends Statement {
-        expression?: Expression;
-    }
-    interface WithStatement extends Statement {
-        expression: Expression;
-        statement: Statement;
-    }
-    interface SwitchStatement extends Statement {
-        expression: Expression;
-        caseBlock: CaseBlock;
-    }
-    interface CaseBlock extends Node {
-        clauses: NodeArray<CaseOrDefaultClause>;
-    }
-    interface CaseClause extends Node {
-        expression?: Expression;
-        statements: NodeArray<Statement>;
-    }
-    interface DefaultClause extends Node {
-        statements: NodeArray<Statement>;
-    }
-    type CaseOrDefaultClause = CaseClause | DefaultClause;
-    interface LabeledStatement extends Statement {
-        label: Identifier;
-        statement: Statement;
-    }
-    interface ThrowStatement extends Statement {
-        expression: Expression;
-    }
-    interface TryStatement extends Statement {
-        tryBlock: Block;
-        catchClause?: CatchClause;
-        finallyBlock?: Block;
-    }
-    interface CatchClause extends Node {
-        variableDeclaration: VariableDeclaration;
-        block: Block;
-    }
-    interface ClassLikeDeclaration extends Declaration {
-        name?: Identifier;
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        heritageClauses?: NodeArray<HeritageClause>;
-        members: NodeArray<ClassElement>;
-    }
-    interface ClassDeclaration extends ClassLikeDeclaration, Statement {
-    }
-    interface ClassExpression extends ClassLikeDeclaration, PrimaryExpression {
-    }
-    interface ClassElement extends Declaration {
-        _classElementBrand: any;
-    }
-    interface InterfaceDeclaration extends Declaration, Statement {
-        name: Identifier;
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        heritageClauses?: NodeArray<HeritageClause>;
-        members: NodeArray<Declaration>;
-    }
-    interface HeritageClause extends Node {
-        token: SyntaxKind;
-        types?: NodeArray<ExpressionWithTypeArguments>;
-    }
-    interface TypeAliasDeclaration extends Declaration, Statement {
-        name: Identifier;
-        typeParameters?: NodeArray<TypeParameterDeclaration>;
-        type: TypeNode;
-    }
-    interface EnumMember extends Declaration {
-        name: DeclarationName;
-        initializer?: Expression;
-    }
-    interface EnumDeclaration extends Declaration, Statement {
-        name: Identifier;
-        members: NodeArray<EnumMember>;
-    }
-    interface ModuleDeclaration extends Declaration, Statement {
-        name: Identifier | LiteralExpression;
-        body: ModuleBlock | ModuleDeclaration;
-    }
-    interface ModuleBlock extends Node, Statement {
-        statements: NodeArray<Statement>;
-    }
-    interface ImportEqualsDeclaration extends Declaration, Statement {
-        name: Identifier;
-        moduleReference: EntityName | ExternalModuleReference;
-    }
-    interface ExternalModuleReference extends Node {
-        expression?: Expression;
-    }
-    interface ImportDeclaration extends Statement {
-        importClause?: ImportClause;
-        moduleSpecifier: Expression;
-    }
-    interface ImportClause extends Declaration {
-        name?: Identifier;
-        namedBindings?: NamespaceImport | NamedImports;
-    }
-    interface NamespaceImport extends Declaration {
-        name: Identifier;
-    }
-    interface ExportDeclaration extends Declaration, Statement {
-        exportClause?: NamedExports;
-        moduleSpecifier?: Expression;
-    }
-    interface NamedImportsOrExports extends Node {
-        elements: NodeArray<ImportOrExportSpecifier>;
-    }
-    type NamedImports = NamedImportsOrExports;
-    type NamedExports = NamedImportsOrExports;
-    interface ImportOrExportSpecifier extends Declaration {
-        propertyName?: Identifier;
-        name: Identifier;
-    }
-    type ImportSpecifier = ImportOrExportSpecifier;
-    type ExportSpecifier = ImportOrExportSpecifier;
-    interface ExportAssignment extends Declaration, Statement {
-        isExportEquals?: boolean;
-        expression: Expression;
-    }
-    interface FileReference extends TextRange {
-        fileName: string;
-    }
-    interface CommentRange extends TextRange {
-        hasTrailingNewLine?: boolean;
-        kind: SyntaxKind;
-    }
-    interface JSDocTypeExpression extends Node {
-        type: JSDocType;
-    }
-    interface JSDocType extends TypeNode {
-        _jsDocTypeBrand: any;
-    }
-    interface JSDocAllType extends JSDocType {
-        _JSDocAllTypeBrand: any;
-    }
-    interface JSDocUnknownType extends JSDocType {
-        _JSDocUnknownTypeBrand: any;
-    }
-    interface JSDocArrayType extends JSDocType {
-        elementType: JSDocType;
-    }
-    interface JSDocUnionType extends JSDocType {
-        types: NodeArray<JSDocType>;
-    }
-    interface JSDocTupleType extends JSDocType {
-        types: NodeArray<JSDocType>;
-    }
-    interface JSDocNonNullableType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocNullableType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocRecordType extends JSDocType, TypeLiteralNode {
-        members: NodeArray<JSDocRecordMember>;
-    }
-    interface JSDocTypeReference extends JSDocType {
-        name: EntityName;
-        typeArguments: NodeArray<JSDocType>;
-    }
-    interface JSDocOptionalType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocFunctionType extends JSDocType, SignatureDeclaration {
-        parameters: NodeArray<ParameterDeclaration>;
-        type: JSDocType;
-    }
-    interface JSDocVariadicType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocConstructorType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocThisType extends JSDocType {
-        type: JSDocType;
-    }
-    interface JSDocRecordMember extends PropertyDeclaration {
-        name: Identifier | LiteralExpression;
-        type?: JSDocType;
-    }
-    interface JSDocComment extends Node {
-        tags: NodeArray<JSDocTag>;
-    }
-    interface JSDocTag extends Node {
-        atToken: Node;
-        tagName: Identifier;
-    }
-    interface JSDocTemplateTag extends JSDocTag {
-        typeParameters: NodeArray<TypeParameterDeclaration>;
-    }
-    interface JSDocReturnTag extends JSDocTag {
-        typeExpression: JSDocTypeExpression;
-    }
-    interface JSDocTypeTag extends JSDocTag {
-        typeExpression: JSDocTypeExpression;
-    }
-    interface JSDocParameterTag extends JSDocTag {
-        preParameterName?: Identifier;
-        typeExpression?: JSDocTypeExpression;
-        postParameterName?: Identifier;
-        isBracketed: boolean;
-    }
-    interface SourceFile extends Declaration {
-        statements: NodeArray<Statement>;
-        endOfFileToken: Node;
-        fileName: string;
-        text: string;
-        amdDependencies: {
-            path: string;
-            name: string;
-        }[];
-        moduleName: string;
-        referencedFiles: FileReference[];
-        languageVariant: LanguageVariant;
-        /**
-         * lib.d.ts should have a reference comment like
-         *
-         *  /// <reference no-default-lib="true"/>
-         *
-         * If any other file has this comment, it signals not to include lib.d.ts
-         * because this containing file is intended to act as a default library.
-         */
-        hasNoDefaultLib: boolean;
-        languageVersion: ScriptTarget;
-    }
-    interface ScriptReferenceHost {
-        getCompilerOptions(): CompilerOptions;
-        getSourceFile(fileName: string): SourceFile;
-        getCurrentDirectory(): string;
-    }
-    interface ParseConfigHost extends ModuleResolutionHost {
-        readDirectory(rootDir: string, extension: string, exclude: string[]): string[];
-    }
-    interface WriteFileCallback {
-        (fileName: string, data: string, writeByteOrderMark: boolean, onError?: (message: string) => void): void;
-    }
-    class OperationCanceledException {
-    }
-    interface CancellationToken {
-        isCancellationRequested(): boolean;
-        /** @throws OperationCanceledException if isCancellationRequested is true */
-        throwIfCancellationRequested(): void;
-    }
-    interface Program extends ScriptReferenceHost {
-        /**
-         * Get a list of root file names that were passed to a 'createProgram'
-         */
-        getRootFileNames(): string[];
-        /**
-         * Get a list of files in the program
-         */
-        getSourceFiles(): SourceFile[];
-        /**
-         * Emits the JavaScript and declaration files.  If targetSourceFile is not specified, then
-         * the JavaScript and declaration files will be produced for all the files in this program.
-         * If targetSourceFile is specified, then only the JavaScript and declaration for that
-         * specific file will be generated.
-         *
-         * If writeFile is not specified then the writeFile callback from the compiler host will be
-         * used for writing the JavaScript and declaration files.  Otherwise, the writeFile parameter
-         * will be invoked when writing the JavaScript and declaration files.
-         */
-        emit(targetSourceFile?: SourceFile, writeFile?: WriteFileCallback, cancellationToken?: CancellationToken): EmitResult;
-        getOptionsDiagnostics(cancellationToken?: CancellationToken): Diagnostic[];
-        getGlobalDiagnostics(cancellationToken?: CancellationToken): Diagnostic[];
-        getSyntacticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-        getSemanticDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-        getDeclarationDiagnostics(sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-        /**
-         * Gets a type checker that can be used to semantically analyze source fils in the program.
-         */
-        getTypeChecker(): TypeChecker;
-    }
-    interface SourceMapSpan {
-        /** Line number in the .js file. */
-        emittedLine: number;
-        /** Column number in the .js file. */
-        emittedColumn: number;
-        /** Line number in the .ts file. */
-        sourceLine: number;
-        /** Column number in the .ts file. */
-        sourceColumn: number;
-        /** Optional name (index into names array) associated with this span. */
-        nameIndex?: number;
-        /** .ts file (index into sources array) associated with this span */
-        sourceIndex: number;
-    }
-    interface SourceMapData {
-        sourceMapFilePath: string;
-        jsSourceMappingURL: string;
-        sourceMapFile: string;
-        sourceMapSourceRoot: string;
-        sourceMapSources: string[];
-        sourceMapSourcesContent?: string[];
-        inputSourceFileNames: string[];
-        sourceMapNames?: string[];
-        sourceMapMappings: string;
-        sourceMapDecodedMappings: SourceMapSpan[];
-    }
-    /** Return code used by getEmitOutput function to indicate status of the function */
-    enum ExitStatus {
-        Success = 0,
-        DiagnosticsPresent_OutputsSkipped = 1,
-        DiagnosticsPresent_OutputsGenerated = 2,
-    }
-    interface EmitResult {
-        emitSkipped: boolean;
-        diagnostics: Diagnostic[];
-    }
-    interface TypeChecker {
-        getTypeOfSymbolAtLocation(symbol: Symbol, node: Node): Type;
-        getDeclaredTypeOfSymbol(symbol: Symbol): Type;
-        getPropertiesOfType(type: Type): Symbol[];
-        getPropertyOfType(type: Type, propertyName: string): Symbol;
-        getSignaturesOfType(type: Type, kind: SignatureKind): Signature[];
-        getIndexTypeOfType(type: Type, kind: IndexKind): Type;
-        getBaseTypes(type: InterfaceType): ObjectType[];
-        getReturnTypeOfSignature(signature: Signature): Type;
-        getSymbolsInScope(location: Node, meaning: SymbolFlags): Symbol[];
-        getSymbolAtLocation(node: Node): Symbol;
-        getShorthandAssignmentValueSymbol(location: Node): Symbol;
-        getTypeAtLocation(node: Node): Type;
-        typeToString(type: Type, enclosingDeclaration?: Node, flags?: TypeFormatFlags): string;
-        symbolToString(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): string;
-        getSymbolDisplayBuilder(): SymbolDisplayBuilder;
-        getFullyQualifiedName(symbol: Symbol): string;
-        getAugmentedPropertiesOfType(type: Type): Symbol[];
-        getRootSymbols(symbol: Symbol): Symbol[];
-        getContextualType(node: Expression): Type;
-        getResolvedSignature(node: CallLikeExpression, candidatesOutArray?: Signature[]): Signature;
-        getSignatureFromDeclaration(declaration: SignatureDeclaration): Signature;
-        isImplementationOfOverload(node: FunctionLikeDeclaration): boolean;
-        isUndefinedSymbol(symbol: Symbol): boolean;
-        isArgumentsSymbol(symbol: Symbol): boolean;
-        getConstantValue(node: EnumMember | PropertyAccessExpression | ElementAccessExpression): number;
-        isValidPropertyAccess(node: PropertyAccessExpression | QualifiedName, propertyName: string): boolean;
-        getAliasedSymbol(symbol: Symbol): Symbol;
-        getExportsOfModule(moduleSymbol: Symbol): Symbol[];
-        getJsxElementAttributesType(elementNode: JsxOpeningLikeElement): Type;
-        getJsxIntrinsicTagNames(): Symbol[];
-        isOptionalParameter(node: ParameterDeclaration): boolean;
-    }
-    interface SymbolDisplayBuilder {
-        buildTypeDisplay(type: Type, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildSymbolDisplay(symbol: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, meaning?: SymbolFlags, flags?: SymbolFormatFlags): void;
-        buildSignatureDisplay(signatures: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildParameterDisplay(parameter: Symbol, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildTypeParameterDisplay(tp: TypeParameter, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildTypeParameterDisplayFromSymbol(symbol: Symbol, writer: SymbolWriter, enclosingDeclaraiton?: Node, flags?: TypeFormatFlags): void;
-        buildDisplayForParametersAndDelimiters(parameters: Symbol[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildDisplayForTypeParametersAndDelimiters(typeParameters: TypeParameter[], writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-        buildReturnTypeDisplay(signature: Signature, writer: SymbolWriter, enclosingDeclaration?: Node, flags?: TypeFormatFlags): void;
-    }
-    interface SymbolWriter {
-        writeKeyword(text: string): void;
-        writeOperator(text: string): void;
-        writePunctuation(text: string): void;
-        writeSpace(text: string): void;
-        writeStringLiteral(text: string): void;
-        writeParameter(text: string): void;
-        writeSymbol(text: string, symbol: Symbol): void;
-        writeLine(): void;
-        increaseIndent(): void;
-        decreaseIndent(): void;
-        clear(): void;
-        trackSymbol(symbol: Symbol, enclosingDeclaration?: Node, meaning?: SymbolFlags): void;
-    }
-    const enum TypeFormatFlags {
-        None = 0,
-        WriteArrayAsGenericType = 1,
-        UseTypeOfFunction = 2,
-        NoTruncation = 4,
-        WriteArrowStyleSignature = 8,
-        WriteOwnNameForAnyLike = 16,
-        WriteTypeArgumentsOfSignature = 32,
-        InElementType = 64,
-        UseFullyQualifiedType = 128,
-    }
-    const enum SymbolFormatFlags {
-        None = 0,
-        WriteTypeParametersOrArguments = 1,
-        UseOnlyExternalAliasing = 2,
-    }
-    interface TypePredicate {
-        parameterName: string;
-        parameterIndex: number;
-        type: Type;
-    }
-    const enum SymbolFlags {
-        None = 0,
-        FunctionScopedVariable = 1,
-        BlockScopedVariable = 2,
-        Property = 4,
-        EnumMember = 8,
-        Function = 16,
-        Class = 32,
-        Interface = 64,
-        ConstEnum = 128,
-        RegularEnum = 256,
-        ValueModule = 512,
-        NamespaceModule = 1024,
-        TypeLiteral = 2048,
-        ObjectLiteral = 4096,
-        Method = 8192,
-        Constructor = 16384,
-        GetAccessor = 32768,
-        SetAccessor = 65536,
-        Signature = 131072,
-        TypeParameter = 262144,
-        TypeAlias = 524288,
-        ExportValue = 1048576,
-        ExportType = 2097152,
-        ExportNamespace = 4194304,
-        Alias = 8388608,
-        Instantiated = 16777216,
-        Merged = 33554432,
-        Transient = 67108864,
-        Prototype = 134217728,
-        SyntheticProperty = 268435456,
-        Optional = 536870912,
-        ExportStar = 1073741824,
-        Enum = 384,
-        Variable = 3,
-        Value = 107455,
-        Type = 793056,
-        Namespace = 1536,
-        Module = 1536,
-        Accessor = 98304,
-        FunctionScopedVariableExcludes = 107454,
-        BlockScopedVariableExcludes = 107455,
-        ParameterExcludes = 107455,
-        PropertyExcludes = 107455,
-        EnumMemberExcludes = 107455,
-        FunctionExcludes = 106927,
-        ClassExcludes = 899519,
-        InterfaceExcludes = 792960,
-        RegularEnumExcludes = 899327,
-        ConstEnumExcludes = 899967,
-        ValueModuleExcludes = 106639,
-        NamespaceModuleExcludes = 0,
-        MethodExcludes = 99263,
-        GetAccessorExcludes = 41919,
-        SetAccessorExcludes = 74687,
-        TypeParameterExcludes = 530912,
-        TypeAliasExcludes = 793056,
-        AliasExcludes = 8388608,
-        ModuleMember = 8914931,
-        ExportHasLocal = 944,
-        HasExports = 1952,
-        HasMembers = 6240,
-        BlockScoped = 418,
-        PropertyOrAccessor = 98308,
-        Export = 7340032,
-    }
-    interface Symbol {
-        flags: SymbolFlags;
-        name: string;
-        declarations?: Declaration[];
-        valueDeclaration?: Declaration;
-        members?: SymbolTable;
-        exports?: SymbolTable;
-    }
-    interface SymbolTable {
-        [index: string]: Symbol;
-    }
-    const enum TypeFlags {
-        Any = 1,
-        String = 2,
-        Number = 4,
-        Boolean = 8,
-        Void = 16,
-        Undefined = 32,
-        Null = 64,
-        Enum = 128,
-        StringLiteral = 256,
-        TypeParameter = 512,
-        Class = 1024,
-        Interface = 2048,
-        Reference = 4096,
-        Tuple = 8192,
-        Union = 16384,
-        Intersection = 32768,
-        Anonymous = 65536,
-        Instantiated = 131072,
-        ObjectLiteral = 524288,
-        ESSymbol = 16777216,
-        StringLike = 258,
-        NumberLike = 132,
-        ObjectType = 80896,
-        UnionOrIntersection = 49152,
-        StructuredType = 130048,
-    }
-    interface Type {
-        flags: TypeFlags;
-        symbol?: Symbol;
-    }
-    interface StringLiteralType extends Type {
-        text: string;
-    }
-    interface ObjectType extends Type {
-    }
-    interface InterfaceType extends ObjectType {
-        typeParameters: TypeParameter[];
-        outerTypeParameters: TypeParameter[];
-        localTypeParameters: TypeParameter[];
-    }
-    interface InterfaceTypeWithDeclaredMembers extends InterfaceType {
-        declaredProperties: Symbol[];
-        declaredCallSignatures: Signature[];
-        declaredConstructSignatures: Signature[];
-        declaredStringIndexType: Type;
-        declaredNumberIndexType: Type;
-    }
-    interface TypeReference extends ObjectType {
-        target: GenericType;
-        typeArguments: Type[];
-    }
-    interface GenericType extends InterfaceType, TypeReference {
-    }
-    interface TupleType extends ObjectType {
-        elementTypes: Type[];
-        baseArrayType: TypeReference;
-    }
-    interface UnionOrIntersectionType extends Type {
-        types: Type[];
-    }
-    interface UnionType extends UnionOrIntersectionType {
-    }
-    interface IntersectionType extends UnionOrIntersectionType {
-    }
-    interface TypeParameter extends Type {
-        constraint: Type;
-    }
-    const enum SignatureKind {
-        Call = 0,
-        Construct = 1,
-    }
-    interface Signature {
-        declaration: SignatureDeclaration;
-        typeParameters: TypeParameter[];
-        parameters: Symbol[];
-        typePredicate?: TypePredicate;
-    }
-    const enum IndexKind {
-        String = 0,
-        Number = 1,
-    }
-    interface DiagnosticMessage {
-        key: string;
-        category: DiagnosticCategory;
-        code: number;
-    }
-    /**
-     * A linked list of formatted diagnostic messages to be used as part of a multiline message.
-     * It is built from the bottom up, leaving the head to be the "main" diagnostic.
-     * While it seems that DiagnosticMessageChain is structurally similar to DiagnosticMessage,
-     * the difference is that messages are all preformatted in DMC.
-     */
-    interface DiagnosticMessageChain {
-        messageText: string;
-        category: DiagnosticCategory;
-        code: number;
-        next?: DiagnosticMessageChain;
-    }
-    interface Diagnostic {
-        file: SourceFile;
-        start: number;
-        length: number;
-        messageText: string | DiagnosticMessageChain;
-        category: DiagnosticCategory;
-        code: number;
-    }
-    enum DiagnosticCategory {
-        Warning = 0,
-        Error = 1,
-        Message = 2,
-    }
-    const enum ModuleResolutionKind {
-        Classic = 1,
-        NodeJs = 2,
-    }
-    interface CompilerOptions {
-        allowNonTsExtensions?: boolean;
-        charset?: string;
-        declaration?: boolean;
-        diagnostics?: boolean;
-        emitBOM?: boolean;
-        help?: boolean;
-        init?: boolean;
-        inlineSourceMap?: boolean;
-        inlineSources?: boolean;
-        jsx?: JsxEmit;
-        listFiles?: boolean;
-        locale?: string;
-        mapRoot?: string;
-        module?: ModuleKind;
-        newLine?: NewLineKind;
-        noEmit?: boolean;
-        noEmitHelpers?: boolean;
-        noEmitOnError?: boolean;
-        noErrorTruncation?: boolean;
-        noImplicitAny?: boolean;
-        noLib?: boolean;
-        noResolve?: boolean;
-        out?: string;
-        outFile?: string;
-        outDir?: string;
-        preserveConstEnums?: boolean;
-        project?: string;
-        removeComments?: boolean;
-        rootDir?: string;
-        sourceMap?: boolean;
-        sourceRoot?: string;
-        suppressExcessPropertyErrors?: boolean;
-        suppressImplicitAnyIndexErrors?: boolean;
-        target?: ScriptTarget;
-        version?: boolean;
-        watch?: boolean;
-        isolatedModules?: boolean;
-        experimentalDecorators?: boolean;
-        experimentalAsyncFunctions?: boolean;
-        emitDecoratorMetadata?: boolean;
-        moduleResolution?: ModuleResolutionKind;
-        [option: string]: string | number | boolean;
-    }
-    const enum ModuleKind {
-        None = 0,
-        CommonJS = 1,
-        AMD = 2,
-        UMD = 3,
-        System = 4,
-    }
-    const enum JsxEmit {
-        None = 0,
-        Preserve = 1,
-        React = 2,
-    }
-    const enum NewLineKind {
-        CarriageReturnLineFeed = 0,
-        LineFeed = 1,
-    }
-    interface LineAndCharacter {
-        line: number;
-        character: number;
-    }
-    const enum ScriptTarget {
-        ES3 = 0,
-        ES5 = 1,
-        ES6 = 2,
-        Latest = 2,
-    }
-    const enum LanguageVariant {
-        Standard = 0,
-        JSX = 1,
-    }
-    interface ParsedCommandLine {
-        options: CompilerOptions;
-        fileNames: string[];
-        errors: Diagnostic[];
-    }
-    interface ModuleResolutionHost {
-        fileExists(fileName: string): boolean;
-        readFile(fileName: string): string;
-    }
-    interface ResolvedModule {
-        resolvedFileName: string;
-        isExternalLibraryImport?: boolean;
-    }
-    interface ResolvedModuleWithFailedLookupLocations {
-        resolvedModule: ResolvedModule;
-        failedLookupLocations: string[];
-    }
-    interface CompilerHost extends ModuleResolutionHost {
-        getSourceFile(fileName: string, languageVersion: ScriptTarget, onError?: (message: string) => void): SourceFile;
-        getCancellationToken?(): CancellationToken;
-        getDefaultLibFileName(options: CompilerOptions): string;
-        writeFile: WriteFileCallback;
-        getCurrentDirectory(): string;
-        getCanonicalFileName(fileName: string): string;
-        useCaseSensitiveFileNames(): boolean;
-        getNewLine(): string;
-        resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
-    }
-    interface TextSpan {
-        start: number;
-        length: number;
-    }
-    interface TextChangeRange {
-        span: TextSpan;
-        newLength: number;
-    }
-}
-declare module "typescript" {
-    interface System {
-        args: string[];
-        newLine: string;
-        useCaseSensitiveFileNames: boolean;
-        write(s: string): void;
-        readFile(path: string, encoding?: string): string;
-        writeFile(path: string, data: string, writeByteOrderMark?: boolean): void;
-        watchFile?(path: string, callback: (path: string) => void): FileWatcher;
-        resolvePath(path: string): string;
-        fileExists(path: string): boolean;
-        directoryExists(path: string): boolean;
-        createDirectory(path: string): void;
-        getExecutingFilePath(): string;
-        getCurrentDirectory(): string;
-        readDirectory(path: string, extension?: string, exclude?: string[]): string[];
-        getMemoryUsage?(): number;
-        exit(exitCode?: number): void;
-    }
-    interface FileWatcher {
-        close(): void;
-    }
-    var sys: System;
-}
-declare module "typescript" {
-    interface ErrorCallback {
-        (message: DiagnosticMessage, length: number): void;
-    }
-    interface Scanner {
-        getStartPos(): number;
-        getToken(): SyntaxKind;
-        getTextPos(): number;
-        getTokenPos(): number;
-        getTokenText(): string;
-        getTokenValue(): string;
-        hasExtendedUnicodeEscape(): boolean;
-        hasPrecedingLineBreak(): boolean;
-        isIdentifier(): boolean;
-        isReservedWord(): boolean;
-        isUnterminated(): boolean;
-        reScanGreaterToken(): SyntaxKind;
-        reScanSlashToken(): SyntaxKind;
-        reScanTemplateToken(): SyntaxKind;
-        scanJsxIdentifier(): SyntaxKind;
-        reScanJsxToken(): SyntaxKind;
-        scanJsxToken(): SyntaxKind;
-        scan(): SyntaxKind;
-        setText(text: string, start?: number, length?: number): void;
-        setOnError(onError: ErrorCallback): void;
-        setScriptTarget(scriptTarget: ScriptTarget): void;
-        setLanguageVariant(variant: LanguageVariant): void;
-        setTextPos(textPos: number): void;
-        lookAhead<T>(callback: () => T): T;
-        tryScan<T>(callback: () => T): T;
-    }
-    function tokenToString(t: SyntaxKind): string;
-    function getPositionOfLineAndCharacter(sourceFile: SourceFile, line: number, character: number): number;
-    function getLineAndCharacterOfPosition(sourceFile: SourceFile, position: number): LineAndCharacter;
-    function isWhiteSpace(ch: number): boolean;
-    function isLineBreak(ch: number): boolean;
-    function couldStartTrivia(text: string, pos: number): boolean;
-    function getLeadingCommentRanges(text: string, pos: number): CommentRange[];
-    function getTrailingCommentRanges(text: string, pos: number): CommentRange[];
-    /** Optionally, get the shebang */
-    function getShebang(text: string): string;
-    function isIdentifierStart(ch: number, languageVersion: ScriptTarget): boolean;
-    function isIdentifierPart(ch: number, languageVersion: ScriptTarget): boolean;
-    function createScanner(languageVersion: ScriptTarget, skipTrivia: boolean, languageVariant?: LanguageVariant, text?: string, onError?: ErrorCallback, start?: number, length?: number): Scanner;
-}
-declare module "typescript" {
-    function getDefaultLibFileName(options: CompilerOptions): string;
-    function textSpanEnd(span: TextSpan): number;
-    function textSpanIsEmpty(span: TextSpan): boolean;
-    function textSpanContainsPosition(span: TextSpan, position: number): boolean;
-    function textSpanContainsTextSpan(span: TextSpan, other: TextSpan): boolean;
-    function textSpanOverlapsWith(span: TextSpan, other: TextSpan): boolean;
-    function textSpanOverlap(span1: TextSpan, span2: TextSpan): TextSpan;
-    function textSpanIntersectsWithTextSpan(span: TextSpan, other: TextSpan): boolean;
-    function textSpanIntersectsWith(span: TextSpan, start: number, length: number): boolean;
-    function decodedTextSpanIntersectsWith(start1: number, length1: number, start2: number, length2: number): boolean;
-    function textSpanIntersectsWithPosition(span: TextSpan, position: number): boolean;
-    function textSpanIntersection(span1: TextSpan, span2: TextSpan): TextSpan;
-    function createTextSpan(start: number, length: number): TextSpan;
-    function createTextSpanFromBounds(start: number, end: number): TextSpan;
-    function textChangeRangeNewSpan(range: TextChangeRange): TextSpan;
-    function textChangeRangeIsUnchanged(range: TextChangeRange): boolean;
-    function createTextChangeRange(span: TextSpan, newLength: number): TextChangeRange;
-    let unchangedTextChangeRange: TextChangeRange;
-    /**
-     * Called to merge all the changes that occurred across several versions of a script snapshot
-     * into a single change.  i.e. if a user keeps making successive edits to a script we will
-     * have a text change from V1 to V2, V2 to V3, ..., Vn.
-     *
-     * This function will then merge those changes into a single change range valid between V1 and
-     * Vn.
-     */
-    function collapseTextChangeRangesAcrossMultipleVersions(changes: TextChangeRange[]): TextChangeRange;
-    function getTypeParameterOwner(d: Declaration): Declaration;
-}
-declare module "typescript" {
-    function getNodeConstructor(kind: SyntaxKind): new () => Node;
-    function createNode(kind: SyntaxKind): Node;
-    function forEachChild<T>(node: Node, cbNode: (node: Node) => T, cbNodeArray?: (nodes: Node[]) => T): T;
-    function createSourceFile(fileName: string, sourceText: string, languageVersion: ScriptTarget, setParentNodes?: boolean): SourceFile;
-    function updateSourceFile(sourceFile: SourceFile, newText: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
-}
-declare module "typescript" {
-    const version: string;
-    function findConfigFile(searchPath: string): string;
-    function resolveTripleslashReference(moduleName: string, containingFile: string): string;
-    function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function nodeModuleNameResolver(moduleName: string, containingFile: string, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost): ResolvedModuleWithFailedLookupLocations;
-    function createCompilerHost(options: CompilerOptions, setParentNodes?: boolean): CompilerHost;
-    function getPreEmitDiagnostics(program: Program, sourceFile?: SourceFile, cancellationToken?: CancellationToken): Diagnostic[];
-    function flattenDiagnosticMessageText(messageText: string | DiagnosticMessageChain, newLine: string): string;
-    function createProgram(rootNames: string[], options: CompilerOptions, host?: CompilerHost, oldProgram?: Program): Program;
-}
-declare module "typescript" {
-    function parseCommandLine(commandLine: string[], readFile?: (path: string) => string): ParsedCommandLine;
-    /**
-      * Read tsconfig.json file
-      * @param fileName The path to the config file
-      */
-    function readConfigFile(fileName: string): {
-        config?: any;
-        error?: Diagnostic;
-    };
-    /**
-      * Parse the text of the tsconfig.json file
-      * @param fileName The path to the config file
-      * @param jsonText The text of the config file
-      */
-    function parseConfigFileText(fileName: string, jsonText: string): {
-        config?: any;
-        error?: Diagnostic;
-    };
-    /**
-      * Parse the contents of a config file (tsconfig.json).
-      * @param json The contents of the config file to parse
-      * @param basePath A root directory to resolve relative path entries in the config
-      *    file to. e.g. outDir
-      */
-    function parseConfigFile(json: any, host: ParseConfigHost, basePath: string): ParsedCommandLine;
-}
-declare module "typescript" {
-    /** The version of the language service API */
-    let servicesVersion: string;
-    interface Node {
-        getSourceFile(): SourceFile;
-        getChildCount(sourceFile?: SourceFile): number;
-        getChildAt(index: number, sourceFile?: SourceFile): Node;
-        getChildren(sourceFile?: SourceFile): Node[];
-        getStart(sourceFile?: SourceFile): number;
-        getFullStart(): number;
-        getEnd(): number;
-        getWidth(sourceFile?: SourceFile): number;
-        getFullWidth(): number;
-        getLeadingTriviaWidth(sourceFile?: SourceFile): number;
-        getFullText(sourceFile?: SourceFile): string;
-        getText(sourceFile?: SourceFile): string;
-        getFirstToken(sourceFile?: SourceFile): Node;
-        getLastToken(sourceFile?: SourceFile): Node;
-    }
-    interface Symbol {
-        getFlags(): SymbolFlags;
-        getName(): string;
-        getDeclarations(): Declaration[];
-        getDocumentationComment(): SymbolDisplayPart[];
-    }
-    interface Type {
-        getFlags(): TypeFlags;
-        getSymbol(): Symbol;
-        getProperties(): Symbol[];
-        getProperty(propertyName: string): Symbol;
-        getApparentProperties(): Symbol[];
-        getCallSignatures(): Signature[];
-        getConstructSignatures(): Signature[];
-        getStringIndexType(): Type;
-        getNumberIndexType(): Type;
-        getBaseTypes(): ObjectType[];
-    }
-    interface Signature {
-        getDeclaration(): SignatureDeclaration;
-        getTypeParameters(): Type[];
-        getParameters(): Symbol[];
-        getReturnType(): Type;
-        getDocumentationComment(): SymbolDisplayPart[];
-    }
-    interface SourceFile {
-        getLineAndCharacterOfPosition(pos: number): LineAndCharacter;
-        getLineStarts(): number[];
-        getPositionOfLineAndCharacter(line: number, character: number): number;
-        update(newText: string, textChangeRange: TextChangeRange): SourceFile;
-    }
-    /**
-     * Represents an immutable snapshot of a script at a specified time.Once acquired, the
-     * snapshot is observably immutable. i.e. the same calls with the same parameters will return
-     * the same values.
-     */
-    interface IScriptSnapshot {
-        /** Gets a portion of the script snapshot specified by [start, end). */
-        getText(start: number, end: number): string;
-        /** Gets the length of this script snapshot. */
-        getLength(): number;
-        /**
-         * Gets the TextChangeRange that describe how the text changed between this text and
-         * an older version.  This information is used by the incremental parser to determine
-         * what sections of the script need to be re-parsed.  'undefined' can be returned if the
-         * change range cannot be determined.  However, in that case, incremental parsing will
-         * not happen and the entire document will be re - parsed.
-         */
-        getChangeRange(oldSnapshot: IScriptSnapshot): TextChangeRange;
-        /** Releases all resources held by this script snapshot */
-        dispose?(): void;
-    }
-    namespace ScriptSnapshot {
-        function fromString(text: string): IScriptSnapshot;
-    }
-    interface PreProcessedFileInfo {
-        referencedFiles: FileReference[];
-        importedFiles: FileReference[];
-        ambientExternalModules: string[];
-        isLibFile: boolean;
-    }
-    interface HostCancellationToken {
-        isCancellationRequested(): boolean;
-    }
-    interface LanguageServiceHost {
-        getCompilationSettings(): CompilerOptions;
-        getNewLine?(): string;
-        getProjectVersion?(): string;
-        getScriptFileNames(): string[];
-        getScriptVersion(fileName: string): string;
-        getScriptSnapshot(fileName: string): IScriptSnapshot;
-        getLocalizedDiagnosticMessages?(): any;
-        getCancellationToken?(): HostCancellationToken;
-        getCurrentDirectory(): string;
-        getDefaultLibFileName(options: CompilerOptions): string;
-        log?(s: string): void;
-        trace?(s: string): void;
-        error?(s: string): void;
-        useCaseSensitiveFileNames?(): boolean;
-        resolveModuleNames?(moduleNames: string[], containingFile: string): ResolvedModule[];
-    }
-    interface LanguageService {
-        cleanupSemanticCache(): void;
-        getSyntacticDiagnostics(fileName: string): Diagnostic[];
-        getSemanticDiagnostics(fileName: string): Diagnostic[];
-        getCompilerOptionsDiagnostics(): Diagnostic[];
-        /**
-         * @deprecated Use getEncodedSyntacticClassifications instead.
-         */
-        getSyntacticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
-        /**
-         * @deprecated Use getEncodedSemanticClassifications instead.
-         */
-        getSemanticClassifications(fileName: string, span: TextSpan): ClassifiedSpan[];
-        getEncodedSyntacticClassifications(fileName: string, span: TextSpan): Classifications;
-        getEncodedSemanticClassifications(fileName: string, span: TextSpan): Classifications;
-        getCompletionsAtPosition(fileName: string, position: number): CompletionInfo;
-        getCompletionEntryDetails(fileName: string, position: number, entryName: string): CompletionEntryDetails;
-        getQuickInfoAtPosition(fileName: string, position: number): QuickInfo;
-        getNameOrDottedNameSpan(fileName: string, startPos: number, endPos: number): TextSpan;
-        getBreakpointStatementAtPosition(fileName: string, position: number): TextSpan;
-        getSignatureHelpItems(fileName: string, position: number): SignatureHelpItems;
-        getRenameInfo(fileName: string, position: number): RenameInfo;
-        findRenameLocations(fileName: string, position: number, findInStrings: boolean, findInComments: boolean): RenameLocation[];
-        getDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
-        getTypeDefinitionAtPosition(fileName: string, position: number): DefinitionInfo[];
-        getReferencesAtPosition(fileName: string, position: number): ReferenceEntry[];
-        findReferences(fileName: string, position: number): ReferencedSymbol[];
-        getDocumentHighlights(fileName: string, position: number, filesToSearch: string[]): DocumentHighlights[];
-        /** @deprecated */
-        getOccurrencesAtPosition(fileName: string, position: number): ReferenceEntry[];
-        getNavigateToItems(searchValue: string, maxResultCount?: number): NavigateToItem[];
-        getNavigationBarItems(fileName: string): NavigationBarItem[];
-        getOutliningSpans(fileName: string): OutliningSpan[];
-        getTodoComments(fileName: string, descriptors: TodoCommentDescriptor[]): TodoComment[];
-        getBraceMatchingAtPosition(fileName: string, position: number): TextSpan[];
-        getIndentationAtPosition(fileName: string, position: number, options: EditorOptions): number;
-        getFormattingEditsForRange(fileName: string, start: number, end: number, options: FormatCodeOptions): TextChange[];
-        getFormattingEditsForDocument(fileName: string, options: FormatCodeOptions): TextChange[];
-        getFormattingEditsAfterKeystroke(fileName: string, position: number, key: string, options: FormatCodeOptions): TextChange[];
-        getDocCommentTemplateAtPosition(fileName: string, position: number): TextInsertion;
-        getEmitOutput(fileName: string): EmitOutput;
-        getProgram(): Program;
-        getSourceFile(fileName: string): SourceFile;
-        dispose(): void;
-    }
-    interface Classifications {
-        spans: number[];
-        endOfLineState: EndOfLineState;
-    }
-    interface ClassifiedSpan {
-        textSpan: TextSpan;
-        classificationType: string;
-    }
-    interface NavigationBarItem {
-        text: string;
-        kind: string;
-        kindModifiers: string;
-        spans: TextSpan[];
-        childItems: NavigationBarItem[];
-        indent: number;
-        bolded: boolean;
-        grayed: boolean;
-    }
-    interface TodoCommentDescriptor {
-        text: string;
-        priority: number;
-    }
-    interface TodoComment {
-        descriptor: TodoCommentDescriptor;
-        message: string;
-        position: number;
-    }
-    class TextChange {
-        span: TextSpan;
-        newText: string;
-    }
-    interface TextInsertion {
-        newText: string;
-        /** The position in newText the caret should point to after the insertion. */
-        caretOffset: number;
-    }
-    interface RenameLocation {
-        textSpan: TextSpan;
-        fileName: string;
-    }
-    interface ReferenceEntry {
-        textSpan: TextSpan;
-        fileName: string;
-        isWriteAccess: boolean;
-    }
-    interface DocumentHighlights {
-        fileName: string;
-        highlightSpans: HighlightSpan[];
-    }
-    namespace HighlightSpanKind {
-        const none: string;
-        const definition: string;
-        const reference: string;
-        const writtenReference: string;
-    }
-    interface HighlightSpan {
-        fileName?: string;
-        textSpan: TextSpan;
-        kind: string;
-    }
-    interface NavigateToItem {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        matchKind: string;
-        isCaseSensitive: boolean;
-        fileName: string;
-        textSpan: TextSpan;
-        containerName: string;
-        containerKind: string;
-    }
-    interface EditorOptions {
-        IndentSize: number;
-        TabSize: number;
-        NewLineCharacter: string;
-        ConvertTabsToSpaces: boolean;
-    }
-    interface FormatCodeOptions extends EditorOptions {
-        InsertSpaceAfterCommaDelimiter: boolean;
-        InsertSpaceAfterSemicolonInForStatements: boolean;
-        InsertSpaceBeforeAndAfterBinaryOperators: boolean;
-        InsertSpaceAfterKeywordsInControlFlowStatements: boolean;
-        InsertSpaceAfterFunctionKeywordForAnonymousFunctions: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis: boolean;
-        InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets: boolean;
-        PlaceOpenBraceOnNewLineForFunctions: boolean;
-        PlaceOpenBraceOnNewLineForControlBlocks: boolean;
-        [s: string]: boolean | number | string;
-    }
-    interface DefinitionInfo {
-        fileName: string;
-        textSpan: TextSpan;
-        kind: string;
-        name: string;
-        containerKind: string;
-        containerName: string;
-    }
-    interface ReferencedSymbol {
-        definition: DefinitionInfo;
-        references: ReferenceEntry[];
-    }
-    enum SymbolDisplayPartKind {
-        aliasName = 0,
-        className = 1,
-        enumName = 2,
-        fieldName = 3,
-        interfaceName = 4,
-        keyword = 5,
-        lineBreak = 6,
-        numericLiteral = 7,
-        stringLiteral = 8,
-        localName = 9,
-        methodName = 10,
-        moduleName = 11,
-        operator = 12,
-        parameterName = 13,
-        propertyName = 14,
-        punctuation = 15,
-        space = 16,
-        text = 17,
-        typeParameterName = 18,
-        enumMemberName = 19,
-        functionName = 20,
-        regularExpressionLiteral = 21,
-    }
-    interface SymbolDisplayPart {
-        text: string;
-        kind: string;
-    }
-    interface QuickInfo {
-        kind: string;
-        kindModifiers: string;
-        textSpan: TextSpan;
-        displayParts: SymbolDisplayPart[];
-        documentation: SymbolDisplayPart[];
-    }
-    interface RenameInfo {
-        canRename: boolean;
-        localizedErrorMessage: string;
-        displayName: string;
-        fullDisplayName: string;
-        kind: string;
-        kindModifiers: string;
-        triggerSpan: TextSpan;
-    }
-    interface SignatureHelpParameter {
-        name: string;
-        documentation: SymbolDisplayPart[];
-        displayParts: SymbolDisplayPart[];
-        isOptional: boolean;
-    }
-    /**
-     * Represents a single signature to show in signature help.
-     * The id is used for subsequent calls into the language service to ask questions about the
-     * signature help item in the context of any documents that have been updated.  i.e. after
-     * an edit has happened, while signature help is still active, the host can ask important
-     * questions like 'what parameter is the user currently contained within?'.
-     */
-    interface SignatureHelpItem {
-        isVariadic: boolean;
-        prefixDisplayParts: SymbolDisplayPart[];
-        suffixDisplayParts: SymbolDisplayPart[];
-        separatorDisplayParts: SymbolDisplayPart[];
-        parameters: SignatureHelpParameter[];
-        documentation: SymbolDisplayPart[];
-    }
-    /**
-     * Represents a set of signature help items, and the preferred item that should be selected.
-     */
-    interface SignatureHelpItems {
-        items: SignatureHelpItem[];
-        applicableSpan: TextSpan;
-        selectedItemIndex: number;
-        argumentIndex: number;
-        argumentCount: number;
-    }
-    interface CompletionInfo {
-        isMemberCompletion: boolean;
-        isNewIdentifierLocation: boolean;
-        entries: CompletionEntry[];
-    }
-    interface CompletionEntry {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        sortText: string;
-    }
-    interface CompletionEntryDetails {
-        name: string;
-        kind: string;
-        kindModifiers: string;
-        displayParts: SymbolDisplayPart[];
-        documentation: SymbolDisplayPart[];
-    }
-    interface OutliningSpan {
-        /** The span of the document to actually collapse. */
-        textSpan: TextSpan;
-        /** The span of the document to display when the user hovers over the collapsed span. */
-        hintSpan: TextSpan;
-        /** The text to display in the editor for the collapsed region. */
-        bannerText: string;
-        /**
-          * Whether or not this region should be automatically collapsed when
-          * the 'Collapse to Definitions' command is invoked.
-          */
-        autoCollapse: boolean;
-    }
-    interface EmitOutput {
-        outputFiles: OutputFile[];
-        emitSkipped: boolean;
-    }
-    const enum OutputFileType {
-        JavaScript = 0,
-        SourceMap = 1,
-        Declaration = 2,
-    }
-    interface OutputFile {
-        name: string;
-        writeByteOrderMark: boolean;
-        text: string;
-    }
-    const enum EndOfLineState {
-        None = 0,
-        InMultiLineCommentTrivia = 1,
-        InSingleQuoteStringLiteral = 2,
-        InDoubleQuoteStringLiteral = 3,
-        InTemplateHeadOrNoSubstitutionTemplate = 4,
-        InTemplateMiddleOrTail = 5,
-        InTemplateSubstitutionPosition = 6,
-    }
-    enum TokenClass {
-        Punctuation = 0,
-        Keyword = 1,
-        Operator = 2,
-        Comment = 3,
-        Whitespace = 4,
-        Identifier = 5,
-        NumberLiteral = 6,
-        StringLiteral = 7,
-        RegExpLiteral = 8,
-    }
-    interface ClassificationResult {
-        finalLexState: EndOfLineState;
-        entries: ClassificationInfo[];
-    }
-    interface ClassificationInfo {
-        length: number;
-        classification: TokenClass;
-    }
-    interface Classifier {
-        /**
-         * Gives lexical classifications of tokens on a line without any syntactic context.
-         * For instance, a token consisting of the text 'string' can be either an identifier
-         * named 'string' or the keyword 'string', however, because this classifier is not aware,
-         * it relies on certain heuristics to give acceptable results. For classifications where
-         * speed trumps accuracy, this function is preferable; however, for true accuracy, the
-         * syntactic classifier is ideal. In fact, in certain editing scenarios, combining the
-         * lexical, syntactic, and semantic classifiers may issue the best user experience.
-         *
-         * @param text                      The text of a line to classify.
-         * @param lexState                  The state of the lexical classifier at the end of the previous line.
-         * @param syntacticClassifierAbsent Whether the client is *not* using a syntactic classifier.
-         *                                  If there is no syntactic classifier (syntacticClassifierAbsent=true),
-         *                                  certain heuristics may be used in its place; however, if there is a
-         *                                  syntactic classifier (syntacticClassifierAbsent=false), certain
-         *                                  classifications which may be incorrectly categorized will be given
-         *                                  back as Identifiers in order to allow the syntactic classifier to
-         *                                  subsume the classification.
-         * @deprecated Use getLexicalClassifications instead.
-         */
-        getClassificationsForLine(text: string, lexState: EndOfLineState, syntacticClassifierAbsent: boolean): ClassificationResult;
-        getEncodedLexicalClassifications(text: string, endOfLineState: EndOfLineState, syntacticClassifierAbsent: boolean): Classifications;
-    }
-    /**
-      * The document registry represents a store of SourceFile objects that can be shared between
-      * multiple LanguageService instances. A LanguageService instance holds on the SourceFile (AST)
-      * of files in the context.
-      * SourceFile objects account for most of the memory usage by the language service. Sharing
-      * the same DocumentRegistry instance between different instances of LanguageService allow
-      * for more efficient memory utilization since all projects will share at least the library
-      * file (lib.d.ts).
-      *
-      * A more advanced use of the document registry is to serialize sourceFile objects to disk
-      * and re-hydrate them when needed.
-      *
-      * To create a default DocumentRegistry, use createDocumentRegistry to create one, and pass it
-      * to all subsequent createLanguageService calls.
-      */
-    interface DocumentRegistry {
-        /**
-          * Request a stored SourceFile with a given fileName and compilationSettings.
-          * The first call to acquire will call createLanguageServiceSourceFile to generate
-          * the SourceFile if was not found in the registry.
-          *
-          * @param fileName The name of the file requested
-          * @param compilationSettings Some compilation settings like target affects the
-          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
-          * multiple copies of the same file for different compilation settings.
-          * @parm scriptSnapshot Text of the file. Only used if the file was not found
-          * in the registry and a new one was created.
-          * @parm version Current version of the file. Only used if the file was not found
-          * in the registry and a new one was created.
-          */
-        acquireDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;
-        /**
-          * Request an updated version of an already existing SourceFile with a given fileName
-          * and compilationSettings. The update will in-turn call updateLanguageServiceSourceFile
-          * to get an updated SourceFile.
-          *
-          * @param fileName The name of the file requested
-          * @param compilationSettings Some compilation settings like target affects the
-          * shape of a the resulting SourceFile. This allows the DocumentRegistry to store
-          * multiple copies of the same file for different compilation settings.
-          * @param scriptSnapshot Text of the file.
-          * @param version Current version of the file.
-          */
-        updateDocument(fileName: string, compilationSettings: CompilerOptions, scriptSnapshot: IScriptSnapshot, version: string): SourceFile;
-        /**
-          * Informs the DocumentRegistry that a file is not needed any longer.
-          *
-          * Note: It is not allowed to call release on a SourceFile that was not acquired from
-          * this registry originally.
-          *
-          * @param fileName The name of the file to be released
-          * @param compilationSettings The compilation settings used to acquire the file
-          */
-        releaseDocument(fileName: string, compilationSettings: CompilerOptions): void;
-        reportStats(): string;
-    }
-    namespace ScriptElementKind {
-        const unknown: string;
-        const warning: string;
-        const keyword: string;
-        const scriptElement: string;
-        const moduleElement: string;
-        const classElement: string;
-        const localClassElement: string;
-        const interfaceElement: string;
-        const typeElement: string;
-        const enumElement: string;
-        const variableElement: string;
-        const localVariableElement: string;
-        const functionElement: string;
-        const localFunctionElement: string;
-        const memberFunctionElement: string;
-        const memberGetAccessorElement: string;
-        const memberSetAccessorElement: string;
-        const memberVariableElement: string;
-        const constructorImplementationElement: string;
-        const callSignatureElement: string;
-        const indexSignatureElement: string;
-        const constructSignatureElement: string;
-        const parameterElement: string;
-        const typeParameterElement: string;
-        const primitiveType: string;
-        const label: string;
-        const alias: string;
-        const constElement: string;
-        const letElement: string;
-    }
-    namespace ScriptElementKindModifier {
-        const none: string;
-        const publicMemberModifier: string;
-        const privateMemberModifier: string;
-        const protectedMemberModifier: string;
-        const exportedModifier: string;
-        const ambientModifier: string;
-        const staticModifier: string;
-        const abstractModifier: string;
-    }
-    class ClassificationTypeNames {
-        static comment: string;
-        static identifier: string;
-        static keyword: string;
-        static numericLiteral: string;
-        static operator: string;
-        static stringLiteral: string;
-        static whiteSpace: string;
-        static text: string;
-        static punctuation: string;
-        static className: string;
-        static enumName: string;
-        static interfaceName: string;
-        static moduleName: string;
-        static typeParameterName: string;
-        static typeAliasName: string;
-        static parameterName: string;
-        static docCommentTagName: string;
-    }
-    const enum ClassificationType {
-        comment = 1,
-        identifier = 2,
-        keyword = 3,
-        numericLiteral = 4,
-        operator = 5,
-        stringLiteral = 6,
-        regularExpressionLiteral = 7,
-        whiteSpace = 8,
-        text = 9,
-        punctuation = 10,
-        className = 11,
-        enumName = 12,
-        interfaceName = 13,
-        moduleName = 14,
-        typeParameterName = 15,
-        typeAliasName = 16,
-        parameterName = 17,
-        docCommentTagName = 18,
-    }
-    interface DisplayPartsSymbolWriter extends SymbolWriter {
-        displayParts(): SymbolDisplayPart[];
-    }
-    function displayPartsToString(displayParts: SymbolDisplayPart[]): string;
-    function getDefaultCompilerOptions(): CompilerOptions;
-    interface TranspileOptions {
-        compilerOptions?: CompilerOptions;
-        fileName?: string;
-        reportDiagnostics?: boolean;
-        moduleName?: string;
-        renamedDependencies?: Map<string>;
-    }
-    interface TranspileOutput {
-        outputText: string;
-        diagnostics?: Diagnostic[];
-        sourceMapText?: string;
-    }
-    function transpileModule(input: string, transpileOptions: TranspileOptions): TranspileOutput;
-    function transpile(input: string, compilerOptions?: CompilerOptions, fileName?: string, diagnostics?: Diagnostic[], moduleName?: string): string;
-    function createLanguageServiceSourceFile(fileName: string, scriptSnapshot: IScriptSnapshot, scriptTarget: ScriptTarget, version: string, setNodeParents: boolean): SourceFile;
-    let disableIncrementalParsing: boolean;
-    function updateLanguageServiceSourceFile(sourceFile: SourceFile, scriptSnapshot: IScriptSnapshot, version: string, textChangeRange: TextChangeRange, aggressiveChecks?: boolean): SourceFile;
-    function createGetCanonicalFileName(useCaseSensitivefileNames: boolean): (fileName: string) => string;
-    function createDocumentRegistry(useCaseSensitiveFileNames?: boolean): DocumentRegistry;
-    function preProcessFile(sourceText: string, readImportFiles?: boolean): PreProcessedFileInfo;
-    function createLanguageService(host: LanguageServiceHost, documentRegistry?: DocumentRegistry): LanguageService;
-    function createClassifier(): Classifier;
-    /**
-      * Get the path of the default library files (lib.d.ts) as distributed with the typescript
-      * node package.
-      * The functionality is not supported if the ts module is consumed outside of a node module.
-      */
-    function getDefaultLibFilePath(options: CompilerOptions): string;
-}
diff --git a/typescript/tsconfig.json b/typescript/tsconfig.json
deleted file mode 100644
index 79b9eb6b27..0000000000
--- a/typescript/tsconfig.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "noImplicitAny": true,
-        "strictNullChecks": false,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts"
-    ]
-}
\ No newline at end of file

From 86334d469d446b7ed90db542ac1f1e047d79042f Mon Sep 17 00:00:00 2001
From: Philipp A <flying-sheep@web.de>
Date: Wed, 16 Nov 2016 19:39:36 +0100
Subject: [PATCH 158/245] Improved new-package script.

* Add more info (homepage and version)
* Handle errors more gracefully (Handle existing module and clean up otherwise)
---
 scripts/new-package.js | 134 +++++++++++++++++++++++++++++--------
 scripts/new-package.ts | 145 ++++++++++++++++++++++++++++++++---------
 2 files changed, 220 insertions(+), 59 deletions(-)

diff --git a/scripts/new-package.js b/scripts/new-package.js
index 5adcdae176..e235714fe0 100644
--- a/scripts/new-package.js
+++ b/scripts/new-package.js
@@ -1,42 +1,120 @@
 /// <reference types="node" />
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments)).next());
+    });
+};
+const http_1 = require("http");
 const fs_1 = require("fs");
 const path = require("path");
 const newPackageName = process.argv[2];
 if (!newPackageName) {
     throw new Error("Usage: node scripts/new-package.js new-package-name");
 }
-fs_1.mkdirSync(newPackageName);
-write("index.d.ts", `// Type definitions for ${newPackageName} 1.2
-// Project: https://github.com/baz/foo (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)
+run().catch(e => {
+    console.error(e);
+    process.exit(1);
+});
+function run() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const files = [
+            ["index.d.ts", yield getIndex()],
+            [`${newPackageName}-tests.ts`, ""],
+            ["tsconfig.json", `${JSON.stringify(getTSConfig(), undefined, 4)}\n`],
+            ["tslint.json", '{ "extends": "../tslint.json" }\n'],
+        ];
+        try {
+            yield pify1(fs_1.mkdir, newPackageName);
+            yield Promise.all(files.map(([name, text]) => write(name, text)));
+        }
+        catch (e) {
+            if (e.code === "EEXIST") {
+                console.warn(`Module “${newPackageName}” already exists!`);
+            }
+            else {
+                console.error(`Error creating module files: ${e}\nCleaning Up.`);
+                yield Promise.all(files.map(([name]) => rm(name)));
+                yield pify1(fs_1.rmdir, newPackageName);
+            }
+            process.exit(1);
+        }
+    });
+}
+function getIndex() {
+    return __awaiter(this, void 0, void 0, function* () {
+        let version = "x.x";
+        let project = "https://github.com/baz/foo (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)";
+        try {
+            const reg = yield loadString(`http://registry.npmjs.org/${newPackageName}`).then(JSON.parse);
+            const { latest } = reg["dist-tags"];
+            const { homepage } = reg.versions[latest];
+            version = latest.split(".").slice(0, 2).join(".");
+            if (homepage !== undefined)
+                project = homepage;
+        }
+        catch (e) {
+            console.warn(`Could not retrieve version/homepage information: ${e.stack}`);
+        }
+        return `// Type definitions for ${newPackageName} ${version}
+// Project: ${project}
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 Fill the header in!
-`);
-const testsFile = `${newPackageName}-tests.ts`;
-write(testsFile, "");
-const tsconfig = {
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "noImplicitAny": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        `${newPackageName}-tests.ts`
-    ]
-};
-write("tsconfig.json", JSON.stringify(tsconfig, undefined, 4));
-write("tslint.json", '{ "extends": "../tslint.json" }');
+`;
+    });
+}
+function getTSConfig() {
+    return {
+        "compilerOptions": {
+            "module": "commonjs",
+            "target": "es6",
+            "noImplicitAny": true,
+            "strictNullChecks": true,
+            "baseUrl": "../",
+            "typeRoots": [
+                "../"
+            ],
+            "types": [],
+            "noEmit": true,
+            "forceConsistentCasingInFileNames": true
+        },
+        "files": [
+            "index.d.ts",
+            `${newPackageName}-tests.ts`
+        ]
+    };
+}
 function write(name, content) {
-    fs_1.writeFileSync(path.join(newPackageName, name), content);
+    return new Promise((resolve, reject) => {
+        fs_1.writeFile(path.join(newPackageName, name), content, err => err ? reject(err) : resolve());
+    });
+}
+function rm(name) {
+    return pify1(fs_1.unlink, path.join(newPackageName, name)).catch((e) => {
+        if (e.code === "ENOENT")
+            return;
+        throw e;
+    });
+}
+function pify1(fn, arg) {
+    return new Promise((resolve, reject) => {
+        fn(arg, err => err ? reject(err) : resolve());
+    });
+}
+function loadString(url) {
+    return new Promise((resolve, reject) => {
+        http_1.get(url, (res) => {
+            if (res.statusCode !== 200) {
+                return reject(new Error(`HTTP Error ${res.statusCode}: ${http_1.STATUS_CODES[res.statusCode || 500]} for ${url}`));
+            }
+            let rawData = "";
+            res.on("data", chunk => rawData += chunk);
+            res.on("end", () => resolve(rawData));
+        }).on("error", e => reject(e));
+    });
 }
diff --git a/scripts/new-package.ts b/scripts/new-package.ts
index 1818111a74..be8b081f3f 100644
--- a/scripts/new-package.ts
+++ b/scripts/new-package.ts
@@ -1,47 +1,130 @@
 /// <reference types="node" />
 
-import { mkdirSync, writeFileSync } from "fs";
-import * as path from "path";
+import { get, STATUS_CODES } from "http"
+import { mkdir, writeFile, unlink, rmdir } from "fs"
+import * as path from "path"
 
-const newPackageName = process.argv[2];
+interface Package {
+    name: string
+    description: string
+    version: string
+    homepage?: string
+}
+
+interface Registry {
+    name: string
+    description: string
+    "dist-tags": { latest: string }
+    versions: { [version: string]: Package }
+}
+
+const newPackageName = process.argv[2]
 if (!newPackageName) {
     throw new Error("Usage: node scripts/new-package.js new-package-name")
 }
 
-mkdirSync(newPackageName);
+run().catch(e => {
+    console.error(e)
+    process.exit(1)
+})
 
-write("index.d.ts", `// Type definitions for ${newPackageName} 1.2
-// Project: https://github.com/baz/foo (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)
+async function run() {
+    const files: [string, string][] = [
+        ["index.d.ts", await getIndex()],
+        [`${newPackageName}-tests.ts`, ""],
+        ["tsconfig.json", `${JSON.stringify(getTSConfig(), undefined, 4)}\n`],
+        ["tslint.json", '{ "extends": "../tslint.json" }\n'],
+    ]
+
+    try {
+        await pify1(mkdir, newPackageName)
+        await Promise.all(files.map(([name, text]) => write(name, text)))
+    } catch (e) {
+        if (e.code === "EEXIST") {
+            console.warn(`Module “${newPackageName}” already exists!`)
+        } else {
+            console.error(`Error creating module files: ${e}\nCleaning Up.`)
+            await Promise.all(files.map(([name]) => rm(name)))
+            await pify1(rmdir, newPackageName)
+        }
+        process.exit(1)
+    }
+}
+
+async function getIndex() {
+    let version = "x.x"
+    let project = "https://github.com/baz/foo (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)"
+    try {
+        const reg: Registry = await loadString(`http://registry.npmjs.org/${newPackageName}`).then(JSON.parse)
+
+        const { latest } = reg["dist-tags"]
+        const { homepage } = reg.versions[latest]
+        
+        version = latest.split(".").slice(0, 2).join(".")
+        if (homepage !== undefined) project = homepage
+    } catch (e) {
+        console.warn(`Could not retrieve version/homepage information: ${e.stack}`)
+    }
+
+    return `// Type definitions for ${newPackageName} ${version}
+// Project: ${project}
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 Fill the header in!
-`);
-const testsFile = `${newPackageName}-tests.ts`;
-write(testsFile, "");
-const tsconfig = {
-    "compilerOptions": {
-        "module": "commonjs",
-        "target": "es6",
-        "noImplicitAny": true,
-        "strictNullChecks": true,
-        "baseUrl": "../",
-        "typeRoots": [
-            "../"
-        ],
-        "types": [],
-        "noEmit": true,
-        "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        `${newPackageName}-tests.ts`
-    ]
-};
-write("tsconfig.json", JSON.stringify(tsconfig, undefined, 4));
+`
+}
 
-write("tslint.json", '{ "extends": "../tslint.json" }');
+function getTSConfig() {
+    return {
+        "compilerOptions": {
+            "module": "commonjs",
+            "target": "es6",
+            "noImplicitAny": true,
+            "strictNullChecks": true,
+            "baseUrl": "../",
+            "typeRoots": [
+                "../"
+            ],
+            "types": [],
+            "noEmit": true,
+            "forceConsistentCasingInFileNames": true
+        },
+        "files": [
+            "index.d.ts",
+            `${newPackageName}-tests.ts`
+        ]
+    }
+}
 
 function write(name: string, content: string) {
-    writeFileSync(path.join(newPackageName, name), content);
+    return new Promise((resolve, reject) => {
+        writeFile(path.join(newPackageName, name), content, err => err ? reject(err): resolve())
+    })
+}
+
+function rm(name: string) {
+    return pify1(unlink, path.join(newPackageName, name)).catch((e: NodeJS.ErrnoException) => {
+        if (e.code === "ENOENT") return
+        throw e
+    })
+}
+
+function pify1<F extends (a: A, cb: (err?: Error) => void) => void, A>(fn: F, arg: A) {
+    return new Promise((resolve, reject) => {
+        fn(arg, err => err ? reject(err): resolve())
+    })
+}
+
+function loadString(url: string): Promise<string> {
+    return new Promise((resolve, reject) => {
+        get(url, (res) => {
+            if (res.statusCode !== 200) {
+                return reject(new Error(`HTTP Error ${res.statusCode}: ${STATUS_CODES[res.statusCode || 500]} for ${url}`))
+            }
+            let rawData = ""
+            res.on("data", chunk => rawData += chunk)
+            res.on("end", () => resolve(rawData))
+        }).on("error", e => reject(e))
+    })
 }

From 2f6bdf21997cc543f268def8a5df281dc27838c6 Mon Sep 17 00:00:00 2001
From: Roger Martin <rogerweb@techinfosystems.com>
Date: Thu, 17 Nov 2016 08:29:40 -0700
Subject: [PATCH 159/245] Changed cascade to a string.

Changed $.jstree.defaults.checkbox.cascade to a string.
---
 jstree/jstree.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jstree/jstree.d.ts b/jstree/jstree.d.ts
index 2292da7f9c..382eae05eb 100644
--- a/jstree/jstree.d.ts
+++ b/jstree/jstree.d.ts
@@ -429,7 +429,7 @@ interface JSTreeStaticDefaultsCheckbox {
     * @name $.jstree.defaults.checkbox.cascade
     * @plugin checkbox
     */
-    cascade: boolean;
+    cascade: string;
 
     /**
     * This setting controls if checkbox are bound to the general tree selection 

From 6ac4904a58074570e116ce4ea622c7bb14a1b244 Mon Sep 17 00:00:00 2001
From: Tom Wanzek <tomwanzek@gmail.com>
Date: Thu, 17 Nov 2016 10:39:35 -0500
Subject: [PATCH 160/245] [d3-geo]: Upgrade to version 1.4.0 * [Feature]: Add
 `reflectX(...)` and `reflectY(...)` to identity transform created with
 `geoIdentity()`.

---
 d3-geo/d3-geo-tests.ts |  9 +++++++++
 d3-geo/index.d.ts      | 27 ++++++++++++++++++++++++++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/d3-geo/d3-geo-tests.ts b/d3-geo/d3-geo-tests.ts
index b0c2adbb79..3d28bb610f 100644
--- a/d3-geo/d3-geo-tests.ts
+++ b/d3-geo/d3-geo-tests.ts
@@ -636,6 +636,15 @@ identityTransform = identityTransform.fitSize([960, 500], sampleExtendedFeature2
 identityTransform = identityTransform.fitSize([960, 500], sampleFeatureCollection);
 identityTransform = identityTransform.fitSize([960, 500], sampleExtendedFeatureCollection);
 
+let reflecting: boolean;
+
+identityTransform = identityTransform.reflectX(true);
+// identityTransform = identityTransform.reflectX(5); // fails, wrong argument data type
+reflecting = identityTransform.reflectX();
+
+identityTransform = identityTransform.reflectY(true);
+// identityTransform = identityTransform.reflectY(5); // fails, wrong argument data type
+reflecting = identityTransform.reflectY();
 
 // ----------------------------------------------------------------------
 // Stream interface
diff --git a/d3-geo/index.d.ts b/d3-geo/index.d.ts
index f3222ce20e..9ab3ae74cd 100644
--- a/d3-geo/index.d.ts
+++ b/d3-geo/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for D3JS d3-geo module v1.3.1
+// Type definitions for D3JS d3-geo module v1.4.0
 // Project: https://github.com/d3/d3-geo/
 // Definitions by: Hugues Stefanski <https://github.com/Ledragon>, Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -1412,6 +1412,31 @@ export interface GeoIdentityTranform extends GeoStreamWrapper {
      */
     fitSize(size: [number, number], object: ExtendedGeometryCollection<GeoGeometryObjects>): this;
 
+    /**
+     * Returns true if x-reflection is enabled, which defaults to false.
+     */
+    reflectX(): boolean;
+    /**
+     * Sets whether or not the x-dimension is reflected (negated) in the output.
+     *
+     * @param reflect true = reflect x-dimension, false = do not reflect x-dimension.
+     */
+    reflectX(reflect: boolean): this;
+
+    /**
+     * Returns true if y-reflection is enabled, which defaults to false.
+     */
+    reflectY(): boolean;
+    /**
+     * Sets whether or not the y-dimension is reflected (negated) in the output.
+     *
+     * This is especially useful for transforming from standard spatial reference systems,
+     * which treat positive y as pointing up, to display coordinate systems such as Canvas and SVG,
+     * which treat positive y as pointing down.
+     *
+     * @param reflect true = reflect y-dimension, false = do not reflect y-dimension.
+     */
+    reflectY(reflect: boolean): this;
 
     /**
      * Returns the current scale factor.

From e2b13f3c9ea99d7a9be6ba1fb26b6afb54a48ea8 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Mon, 31 Oct 2016 14:26:35 -0700
Subject: [PATCH 161/245] Change instructions for how to test a new type
 definition

---
 README.md | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index d3e6c0e27c..b291fbbe51 100644
--- a/README.md
+++ b/README.md
@@ -55,18 +55,25 @@ Before you share your improvement with the world, use it yourself.
 #### Test editing an exiting package
 
 To add new features you can use [module augmentation](http://www.typescriptlang.org/docs/handbook/declaration-merging.html).
-You can also directly edit the types in `node_modules/@types/foo/index.d.ts`,
-or copy them from there and paste inside of `declarations.d.ts` and follow the steps below.
+You can also directly edit the types in `node_modules/@types/foo/index.d.ts`, or copy them from there and follow the steps below.
 
 
 #### Test a new package
 
-* Add a new file `declarations.d.ts` to your project.
-* Add it to the compilation, through `"includes"` or `"files"` in your [tsconfig](http://www.typescriptlang.org/docs/handbook/tsconfig-json.html),
-or through a `/// <reference path="" />` declaration in your code.
-* Inside `declarations.d.ts`, write `declare module "foo" { }`, then write the module declaration inside.
-* Test that your code works.
-* *Then*, once you've tested your definitions, make a PR contributing the definition.
+Add to your `tsconfig.json`:
+
+```json
+"baseUrl": ".",
+"paths": {
+    "*": ["types/*"]
+}
+```
+
+(You can also use `src/types`.)
+Create `types/foo/index.d.ts` containing declarations for the module "foo".
+You should now be able import from `"foo"` in your code and it will route to the new type definition.
+Then build *and* run the code to make sure your type definition actually corresponds to what happens at runtime.
+Once you've tested your definitions with real code, make a PR contributing the definition by copying `types/foo` to `DefinitelyTyped/foo` and adding a `tsconfig.json` and `foo-tests.ts`.
 
 
 ### Make a pull request

From 85608b4d2993bae825b47a87a5ec9f4d228a11ae Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 07:53:15 -0800
Subject: [PATCH 162/245] Use baseUrl and typeRoots instead

---
 README.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index b291fbbe51..ab2080714b 100644
--- a/README.md
+++ b/README.md
@@ -63,10 +63,8 @@ You can also directly edit the types in `node_modules/@types/foo/index.d.ts`, or
 Add to your `tsconfig.json`:
 
 ```json
-"baseUrl": ".",
-"paths": {
-    "*": ["types/*"]
-}
+"baseUrl": "types",
+"typeRoots": ["types"],
 ```
 
 (You can also use `src/types`.)

From 6e2f5883ffd0e42cd6f10c7e71ff9e619c007d16 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 07:59:30 -0800
Subject: [PATCH 163/245] Expose lz-string as a module

---
 lz-string/index.d.ts  | 6 ++++--
 lz-string/tslint.json | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 lz-string/tslint.json

diff --git a/lz-string/index.d.ts b/lz-string/index.d.ts
index 19c97c419f..d61e39a6ba 100644
--- a/lz-string/index.d.ts
+++ b/lz-string/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare var LZString: LZString.LZStringStatic;
+export = LZString;
+export as namespace LZString;
 
 declare namespace LZString {
     /**
@@ -59,8 +61,8 @@ declare namespace LZString {
         decompressFromBase64(compressed: string): string;
 
         /**
-        * produces ASCII strings representing the original string encoded in Base64 with a few 
-        * tweaks to make these URI safe. Hence, you can send them to the server without thinking 
+        * produces ASCII strings representing the original string encoded in Base64 with a few
+        * tweaks to make these URI safe. Hence, you can send them to the server without thinking
         * about URL encoding them. This saves bandwidth and CPU
         *
         * @param uncompressed A string which should be compressed.
diff --git a/lz-string/tslint.json b/lz-string/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/lz-string/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file

From 77462408070c6d11f0eff721f34a606e035d7e9f Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 08:42:43 -0800
Subject: [PATCH 164/245] Fix typos

---
 PULL_REQUEST_TEMPLATE.md | 2 +-
 README.md                | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
index a864dbcb13..95d0041063 100644
--- a/PULL_REQUEST_TEMPLATE.md
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -13,5 +13,5 @@ If adding a new definition:
 - [ ] Include the required [files](https://github.com/DefinitelyTyped/DefinitelyTyped#create-a-new-package) and header. Base these on the README, *not* on an existing project.
 
 If changing an existing definition:
-- [ ] Provide a URL to  documentation or source code which provides context for the suggested changes: <<url here>>
+- [ ] Provide a URL to documentation or source code which provides context for the suggested changes: <<url here>>
 - [ ] Increase the version number in the header if appropriate.
diff --git a/README.md b/README.md
index ab2080714b..a4cf7ae874 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,7 @@ For a good example package, see [base64-js](https://github.com/DefinitelyTyped/D
 * `interface X {}`: An empty interface is essentially the `{}` type: it places no constraints on an object.
 * `interface IFoo {}`: Don't add `I` to the front of an interface name.
 * `interface Foo { new(): Foo; }`:
-    This defines a type of objects that are new-able. You probably want `declare class Foo { constructor(); }
+    This defines a type of objects that are new-able. You probably want `declare class Foo { constructor(); }`.
 * `const Class: { new(): IClass; }`:
     Prefer to use a class declaration `class Class { constructor(); }` instead of a new-able constant.
 * `namespace foo {}`:

From ffbdae8cae2e3e131356654f322953668666a7a7 Mon Sep 17 00:00:00 2001
From: Ryan Pineo <ryanpineo@gmail.com>
Date: Thu, 17 Nov 2016 12:57:21 -0500
Subject: [PATCH 165/245] add toastr.remove type def

---
 toastr/toastr-tests.ts |  3 ++-
 toastr/toastr.d.ts     | 12 +++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/toastr/toastr-tests.ts b/toastr/toastr-tests.ts
index adacb19340..c09d484dca 100644
--- a/toastr/toastr-tests.ts
+++ b/toastr/toastr-tests.ts
@@ -8,6 +8,7 @@ function test_basic() {
     t.push(toastr.error('I do not think that word means what you think it means.', 'Inconceivable!'));
     toastr.clear(t[0]); // clear 1
     toastr.clear(); // clear all
+    toastr.remove();
 
     var msg = 'Do you think Rodents of Unusual Size really exist?';
     var title = 'Fireswamp Legends';
@@ -82,4 +83,4 @@ function test_fromdemo() {
     $('#cleartoasts').click(function () {
         toastr.clear();
     });
-}
\ No newline at end of file
+}
diff --git a/toastr/toastr.d.ts b/toastr/toastr.d.ts
index 33a739f52e..29c507335d 100644
--- a/toastr/toastr.d.ts
+++ b/toastr/toastr.d.ts
@@ -174,19 +174,25 @@ interface Toastr {
 		(): void;
 		/**
 		* Clear specific toast
-		* 
+		*
 		* @param toast Toast to clear
 		*/
 		(toast: JQuery): void;
 	        /**
 		* Clear specific toast
-		* 
+		*
 		* @param toast Toast to clear
 		* @param clearOptions force clearing a toast, ignoring focus
 		*/
         	(toast: JQuery, clearOptions: { force: boolean }): void;
 	};
 	/**
+	* Removes all toasts (without animation)
+	*/
+	remove: {
+		(): void;
+	};
+	/**
 	* Create an error toast
 	*/
 	error: ToastrDisplayMethod;
@@ -207,7 +213,7 @@ interface Toastr {
 	*/
 	warning: ToastrDisplayMethod;
 	/**
-	* Get toastr version 
+	* Get toastr version
 	*/
 	version: string;
 }

From c9ba3f48891dc806d18619872e504119345daf4b Mon Sep 17 00:00:00 2001
From: Jozef Izso <jozef.izso@gmail.com>
Date: Thu, 13 Oct 2016 22:37:54 +0200
Subject: [PATCH 166/245] Update Error interface and add
 DocumentSelectionChangedEventArgs definition

---
 office-js/index.d.ts | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/office-js/index.d.ts b/office-js/index.d.ts
index 59510c6ffa..fdfa55622f 100644
--- a/office-js/index.d.ts
+++ b/office-js/index.d.ts
@@ -63,8 +63,24 @@ declare namespace Office {
             isSetSupported(name: string, minVersion?: number): boolean;
         }
     }
+    /**
+     * Provides specific information about an error that occurred during an asynchronous data operation.
+     */
     export interface Error {
+        /**
+         * Gets the numeric code of the error.
+         * @since 1.0
+         */
+        code: number;
+        /**
+         * Gets the name of the error.
+         * @since 1.0
+         */
         message: string;
+        /**
+         * Gets a detailed description of the error.
+         * @since 1.0
+         */
         name: string;
     }
     export interface UI {
@@ -920,6 +936,19 @@ declare namespace Office {
          */
         setSelectedDataAsync(data: string | TableData | any[][], options?: any, callback?: (result: AsyncResult) => void): void;
     }
+    /**
+     * Provides information about the document that raised the SelectionChanged event.
+     */
+    export interface DocumentSelectionChangedEventArgs {
+        /**
+         * Gets a Document object that represents the document that raised the SelectionChanged event.
+         */
+        document: Document;
+        /**
+         * Get an EventType enumeration value that identifies the kind of event that was raised.
+         */
+        type: EventType;
+    }
     export interface File {
         size: number;
         sliceCount: number;
@@ -5126,7 +5155,7 @@ declare module Excel {
          *
          * The first criterion used to filter data. Used as an operator in the case of "custom" filtering.
              For example ">50" for number greater than 50 or "=*s" for values ending in "s".
-            
+
              Used as a number in the case of top/bottom items/percents. E.g. "5" for the top 5 items if filterOn is set to "topItems"
          *
          * [Api set: ExcelApi 1.2]

From eed1bf335ae18b07a11ad0bf462f38119a444759 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 13:10:48 -0800
Subject: [PATCH 167/245] Rename files

---
 node-usb/node-usb.d.ts => usb/index.d.ts       | 0
 {node-usb => usb}/tsconfig.json                | 0
 node-usb/node-usb-tests.ts => usb/usb-tests.ts | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename node-usb/node-usb.d.ts => usb/index.d.ts (100%)
 rename {node-usb => usb}/tsconfig.json (100%)
 rename node-usb/node-usb-tests.ts => usb/usb-tests.ts (100%)

diff --git a/node-usb/node-usb.d.ts b/usb/index.d.ts
similarity index 100%
rename from node-usb/node-usb.d.ts
rename to usb/index.d.ts
diff --git a/node-usb/tsconfig.json b/usb/tsconfig.json
similarity index 100%
rename from node-usb/tsconfig.json
rename to usb/tsconfig.json
diff --git a/node-usb/node-usb-tests.ts b/usb/usb-tests.ts
similarity index 100%
rename from node-usb/node-usb-tests.ts
rename to usb/usb-tests.ts

From 4f2f06b5136eba1f347b775a601e998ec64e7f2f Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 13:17:16 -0800
Subject: [PATCH 168/245] Convert usb/index.d.ts to a module and lint

---
 usb/index.d.ts    | 443 +++++++++++++++++++++++-----------------------
 usb/tsconfig.json |   4 +-
 usb/tslint.json   |   1 +
 3 files changed, 223 insertions(+), 225 deletions(-)
 create mode 100644 usb/tslint.json

diff --git a/usb/index.d.ts b/usb/index.d.ts
index 78b93bbfd9..1e8a994383 100644
--- a/usb/index.d.ts
+++ b/usb/index.d.ts
@@ -5,229 +5,226 @@
 
 /// <reference types="node" />
 
-declare module "usb" {
+export class Device {
+  timeout: number;
+  busNumber: number;
+  deviceAddress: number;
+  portNumbers: number[];
+  deviceDescriptor: DeviceDescriptor;
+  configDescriptor: ConfigDescriptor;
+  interfaces: Interface[];
 
-  class Device {
-    public timeout: number;
-    public busNumber: number;
-    public deviceAddress: number;
-    public portNumbers: Array<number>;
-    public deviceDescriptor: DeviceDescriptor;
-    public configDescriptor: ConfigDescriptor;
-    public interfaces: Array<Interface>;
+  __open(): void;
+  __claimInterface(addr: number): void;
 
-    __open(): void;
-    __claimInterface(addr: number): void;
-
-    open(defaultConfig?: boolean): void;
-    close(): void;
-    interface(addr: number): Interface;
-    controlTransfer(bmRequestType: number, bRequest: number, wValue: number, wIndex: number, data_or_length: any, callback: (error?: string, buf?: Buffer) => void): Device;
-    getStringDescriptor(desc_index: number, callback: (error?: string, buf?: Buffer) => void): void;
-    setConfiguration(desired: number, cb: (err?: string) => void): void;
-    reset(callback: (err?: string) => void): void;
-  }
-
-  class DeviceDescriptor {
-    public bLength: number;
-    public bDescriptorType: number;
-    public bcdUSB: number;
-    public bDeviceClass: number;
-    public bDeviceSubClass: number;
-    public bDeviceProtocol: number;
-    public bMaxPacketSize: number;
-    public idVendor: number;
-    public idProduct: number;
-    public bcdDevice: number;
-    public iManufacturer: number;
-    public iProduct: number;
-    public iSerialNumber: number;
-    public bNumConfigurations: number;
-  }
-
-  class ConfigDescriptor {
-    public bLength: number;
-    public bDescriptorType: number;
-    public wTotalLength: number;
-    public bNumInterfaces: number;
-    public bConfigurationValue: number;
-    public iConfiguration: number;
-    public bmAttributes: number;
-    public bMaxPower: number;
-    public extra: Buffer;
-  }
-
-  class Interface {
-    public descriptor: InterfaceDescriptor;
-    public endpoints: Array<IEndpoint>;
-    constructor(device: Device, id: number);
-    claim(): void;
-    release(closeEndpoints?: (err?: string) => void, cb?: (err?: string) => void): void;
-    isKernelDriverActive(): boolean;
-    detachKernelDriver(): number;
-    attachKernelDriver(): number;
-    setAltSetting(altSetting: number, cb: (err?: string) => void): void;
-    endpoint(addr: number): IEndpoint;
-  }
-
-  class InterfaceDescriptor {
-    public bLength: number;
-    public bDescriptorType: number;
-    public bInterfaceNumber: number;
-    public bAlternateSetting: number;
-    public bNumEndpoints: number;
-    public bInterfaceClass: number;
-    public bInterfaceSubClass: number;
-    public bInterfaceProtocol: number;
-    public iInterface: number;
-    public extra: Buffer;
-  }
-
-  interface IEndpoint {
-    direction: string;
-    transferType: number;
-    timeout: number;
-    descriptor: EndpointDescriptor;
-  }
-
-  class InEndpoint implements IEndpoint {
-    public direction: string;
-    public transferType: number;
-    public timeout: number;
-    public descriptor: EndpointDescriptor;
-    constructor(device: Device, descriptor: EndpointDescriptor);
-    transfer(length: number, callback: (error: string, data: Buffer) => void): InEndpoint;
-    startPoll(nTransfers: number, transferSize: number): void;
-    stopPoll(cb: () => void): void;
-  }
-
-  class OutEndpoint implements IEndpoint {
-    public direction: string;
-    public transferType: number;
-    public timeout: number;
-    public descriptor: EndpointDescriptor;
-    constructor(device: Device, descriptor: EndpointDescriptor);
-    transfer(buffer: Buffer, cb: (err?: string) => void): OutEndpoint;
-    transferWithZLP(buf: Buffer, cb: (err?: string) => void): void;
-  }
-
-  class EndpointDescriptor {
-    public bLength: number;
-    public bDescriptorType: number;
-    public bEndpointAddress: number;
-    public bmAttributes: number;
-    public wMaxPacketSize: number;
-    public bInterval: number;
-    public bRefresh: number;
-    public bSynchAddress: number;
-  }
-
-  function findByIds(vid: number, pid: number): Device;
-  function on(event: string, callback: (device: Device) => void): void;
-  function getDeviceList(): Array<Device>;
-  function setDebugLevel(level: number): void;
-
-  const LIBUSB_CLASS_PER_INTERFACE: number;
-  const LIBUSB_CLASS_AUDIO: number;
-  const LIBUSB_CLASS_COMM: number;
-  const LIBUSB_CLASS_HID: number;
-  const LIBUSB_CLASS_PRINTER: number;
-  const LIBUSB_CLASS_PTP: number;
-  const LIBUSB_CLASS_MASS_STORAGE: number;
-  const LIBUSB_CLASS_HUB: number;
-  const LIBUSB_CLASS_DATA: number;
-  const LIBUSB_CLASS_WIRELESS: number;
-  const LIBUSB_CLASS_APPLICATION: number;
-  const LIBUSB_CLASS_VENDOR_SPEC: number;
-  // libusb_standard_request
-  const LIBUSB_REQUEST_GET_STATUS: number;
-  const LIBUSB_REQUEST_CLEAR_FEATURE: number;
-  const LIBUSB_REQUEST_SET_FEATURE: number;
-  const LIBUSB_REQUEST_SET_ADDRESS: number;
-  const LIBUSB_REQUEST_GET_DESCRIPTOR: number;
-  const LIBUSB_REQUEST_SET_DESCRIPTOR: number;
-  const LIBUSB_REQUEST_GET_CONFIGURATION: number;
-  const LIBUSB_REQUEST_SET_CONFIGURATION: number;
-  const LIBUSB_REQUEST_GET_INTERFACE: number;
-  const LIBUSB_REQUEST_SET_INTERFACE: number;
-  const LIBUSB_REQUEST_SYNCH_FRAME: number;
-  // libusb_descriptor_type
-  const LIBUSB_DT_DEVICE: number;
-  const LIBUSB_DT_CONFIG: number;
-  const LIBUSB_DT_STRING: number;
-  const LIBUSB_DT_INTERFACE: number;
-  const LIBUSB_DT_ENDPOINT: number;
-  const LIBUSB_DT_HID: number;
-  const LIBUSB_DT_REPORT: number;
-  const LIBUSB_DT_PHYSICAL: number;
-  const LIBUSB_DT_HUB: number;
-  // libusb_endpoint_direction
-  const LIBUSB_ENDPOINT_IN: number;
-  const LIBUSB_ENDPOINT_OUT: number;
-  // libusb_transfer_type
-  const LIBUSB_TRANSFER_TYPE_CONTROL: number;
-  const LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: number;
-  const LIBUSB_TRANSFER_TYPE_BULK: number;
-  const LIBUSB_TRANSFER_TYPE_INTERRUPT: number;
-  // libusb_iso_sync_type
-  const LIBUSB_ISO_SYNC_TYPE_NONE: number;
-  const LIBUSB_ISO_SYNC_TYPE_ASYNC: number;
-  const LIBUSB_ISO_SYNC_TYPE_ADAPTIVE: number;
-  const LIBUSB_ISO_SYNC_TYPE_SYNC: number;
-  // libusb_iso_usage_type
-  const LIBUSB_ISO_USAGE_TYPE_DATA: number;
-  const LIBUSB_ISO_USAGE_TYPE_FEEDBACK: number;
-  const LIBUSB_ISO_USAGE_TYPE_IMPLICIT: number;
-  // libusb_transfer_status
-  const LIBUSB_TRANSFER_COMPLETED: number;
-  const LIBUSB_TRANSFER_ERROR: number;
-  const LIBUSB_TRANSFER_TIMED_OUT: number;
-  const LIBUSB_TRANSFER_CANCELLED: number;
-  const LIBUSB_TRANSFER_STALL: number;
-  const LIBUSB_TRANSFER_NO_DEVICE: number;
-  const LIBUSB_TRANSFER_OVERFLOW: number;
-  // libusb_transfer_flags
-  const LIBUSB_TRANSFER_SHORT_NOT_OK: number;
-  const LIBUSB_TRANSFER_FREE_BUFFER: number;
-  const LIBUSB_TRANSFER_FREE_TRANSFER: number;
-  // libusb_request_type
-  const LIBUSB_REQUEST_TYPE_STANDARD: number;
-  const LIBUSB_REQUEST_TYPE_CLASS: number;
-  const LIBUSB_REQUEST_TYPE_VENDOR: number;
-  const LIBUSB_REQUEST_TYPE_RESERVED: number;
-  // libusb_request_recipient
-  const LIBUSB_RECIPIENT_DEVICE: number;
-  const LIBUSB_RECIPIENT_INTERFACE: number;
-  const LIBUSB_RECIPIENT_ENDPOINT: number;
-  const LIBUSB_RECIPIENT_OTHER: number;
-
-  const LIBUSB_CONTROL_SETUP_SIZE: number;
-
-  // libusb_error
-  // Input/output error
-  const LIBUSB_ERROR_IO: number;
-  // Invalid parameter
-  const LIBUSB_ERROR_INVALID_PARAM: number;
-  // Access denied (insufficient permissions)
-  const LIBUSB_ERROR_ACCESS: number;
-  // No such device (it may have been disconnected)
-  const LIBUSB_ERROR_NO_DEVICE: number;
-  // Entity not found
-  const LIBUSB_ERROR_NOT_FOUND: number;
-  // Resource busy
-  const LIBUSB_ERROR_BUSY: number;
-  // Operation timed out
-  const LIBUSB_ERROR_TIMEOUT: number;
-  // Overflow
-  const LIBUSB_ERROR_OVERFLOW: number;
-  // Pipe error
-  const LIBUSB_ERROR_PIPE: number;
-  // System call interrupted (perhaps due to signal)
-  const LIBUSB_ERROR_INTERRUPTED: number;
-  // Insufficient memory
-  const LIBUSB_ERROR_NO_MEM: number;
-  // Operation not supported or unimplemented on this platform
-  const LIBUSB_ERROR_NOT_SUPPORTED: number;
-  // Other error
-  const LIBUSB_ERROR_OTHER: number;
+  open(defaultConfig?: boolean): void;
+  close(): void;
+  interface(addr: number): Interface;
+  controlTransfer(bmRequestType: number, bRequest: number, wValue: number, wIndex: number, data_or_length: any, callback: (error?: string, buf?: Buffer) => void): Device;
+  getStringDescriptor(desc_index: number, callback: (error?: string, buf?: Buffer) => void): void;
+  setConfiguration(desired: number, cb: (err?: string) => void): void;
+  reset(callback: (err?: string) => void): void;
 }
+
+export class DeviceDescriptor {
+  bLength: number;
+  bDescriptorType: number;
+  bcdUSB: number;
+  bDeviceClass: number;
+  bDeviceSubClass: number;
+  bDeviceProtocol: number;
+  bMaxPacketSize: number;
+  idVendor: number;
+  idProduct: number;
+  bcdDevice: number;
+  iManufacturer: number;
+  iProduct: number;
+  iSerialNumber: number;
+  bNumConfigurations: number;
+}
+
+export class ConfigDescriptor {
+  bLength: number;
+  bDescriptorType: number;
+  wTotalLength: number;
+  bNumInterfaces: number;
+  bConfigurationValue: number;
+  iConfiguration: number;
+  bmAttributes: number;
+  bMaxPower: number;
+  extra: Buffer;
+}
+
+export class Interface {
+  descriptor: InterfaceDescriptor;
+  endpoints: IEndpoint[];
+  constructor(device: Device, id: number);
+  claim(): void;
+  release(closeEndpoints?: (err?: string) => void, cb?: (err?: string) => void): void;
+  isKernelDriverActive(): boolean;
+  detachKernelDriver(): number;
+  attachKernelDriver(): number;
+  setAltSetting(altSetting: number, cb: (err?: string) => void): void;
+  endpoint(addr: number): IEndpoint;
+}
+
+export class InterfaceDescriptor {
+  bLength: number;
+  bDescriptorType: number;
+  bInterfaceNumber: number;
+  bAlternateSetting: number;
+  bNumEndpoints: number;
+  bInterfaceClass: number;
+  bInterfaceSubClass: number;
+  bInterfaceProtocol: number;
+  iInterface: number;
+  extra: Buffer;
+}
+
+interface IEndpoint {
+  direction: string;
+  transferType: number;
+  timeout: number;
+  descriptor: EndpointDescriptor;
+}
+
+export class InEndpoint implements IEndpoint {
+  direction: string;
+  transferType: number;
+  timeout: number;
+  descriptor: EndpointDescriptor;
+  constructor(device: Device, descriptor: EndpointDescriptor);
+  transfer(length: number, callback: (error: string, data: Buffer) => void): InEndpoint;
+  startPoll(nTransfers: number, transferSize: number): void;
+  stopPoll(cb: () => void): void;
+}
+
+export class OutEndpoint implements IEndpoint {
+  direction: string;
+  transferType: number;
+  timeout: number;
+  descriptor: EndpointDescriptor;
+  constructor(device: Device, descriptor: EndpointDescriptor);
+  transfer(buffer: Buffer, cb: (err?: string) => void): OutEndpoint;
+  transferWithZLP(buf: Buffer, cb: (err?: string) => void): void;
+}
+
+export class EndpointDescriptor {
+  bLength: number;
+  bDescriptorType: number;
+  bEndpointAddress: number;
+  bmAttributes: number;
+  wMaxPacketSize: number;
+  bInterval: number;
+  bRefresh: number;
+  bSynchAddress: number;
+}
+
+export function findByIds(vid: number, pid: number): Device;
+export function on(event: string, callback: (device: Device) => void): void;
+export function getDeviceList(): Device[];
+export function setDebugLevel(level: number): void;
+
+export const LIBUSB_CLASS_PER_INTERFACE: number;
+export const LIBUSB_CLASS_AUDIO: number;
+export const LIBUSB_CLASS_COMM: number;
+export const LIBUSB_CLASS_HID: number;
+export const LIBUSB_CLASS_PRINTER: number;
+export const LIBUSB_CLASS_PTP: number;
+export const LIBUSB_CLASS_MASS_STORAGE: number;
+export const LIBUSB_CLASS_HUB: number;
+export const LIBUSB_CLASS_DATA: number;
+export const LIBUSB_CLASS_WIRELESS: number;
+export const LIBUSB_CLASS_APPLICATION: number;
+export const LIBUSB_CLASS_VENDOR_SPEC: number;
+// libusb_standard_request
+export const LIBUSB_REQUEST_GET_STATUS: number;
+export const LIBUSB_REQUEST_CLEAR_FEATURE: number;
+export const LIBUSB_REQUEST_SET_FEATURE: number;
+export const LIBUSB_REQUEST_SET_ADDRESS: number;
+export const LIBUSB_REQUEST_GET_DESCRIPTOR: number;
+export const LIBUSB_REQUEST_SET_DESCRIPTOR: number;
+export const LIBUSB_REQUEST_GET_CONFIGURATION: number;
+export const LIBUSB_REQUEST_SET_CONFIGURATION: number;
+export const LIBUSB_REQUEST_GET_INTERFACE: number;
+export const LIBUSB_REQUEST_SET_INTERFACE: number;
+export const LIBUSB_REQUEST_SYNCH_FRAME: number;
+// libusb_descriptor_type
+export const LIBUSB_DT_DEVICE: number;
+export const LIBUSB_DT_CONFIG: number;
+export const LIBUSB_DT_STRING: number;
+export const LIBUSB_DT_INTERFACE: number;
+export const LIBUSB_DT_ENDPOINT: number;
+export const LIBUSB_DT_HID: number;
+export const LIBUSB_DT_REPORT: number;
+export const LIBUSB_DT_PHYSICAL: number;
+export const LIBUSB_DT_HUB: number;
+// libusb_endpoint_direction
+export const LIBUSB_ENDPOINT_IN: number;
+export const LIBUSB_ENDPOINT_OUT: number;
+// libusb_transfer_type
+export const LIBUSB_TRANSFER_TYPE_CONTROL: number;
+export const LIBUSB_TRANSFER_TYPE_ISOCHRONOUS: number;
+export const LIBUSB_TRANSFER_TYPE_BULK: number;
+export const LIBUSB_TRANSFER_TYPE_INTERRUPT: number;
+// libusb_iso_sync_type
+export const LIBUSB_ISO_SYNC_TYPE_NONE: number;
+export const LIBUSB_ISO_SYNC_TYPE_ASYNC: number;
+export const LIBUSB_ISO_SYNC_TYPE_ADAPTIVE: number;
+export const LIBUSB_ISO_SYNC_TYPE_SYNC: number;
+// libusb_iso_usage_type
+export const LIBUSB_ISO_USAGE_TYPE_DATA: number;
+export const LIBUSB_ISO_USAGE_TYPE_FEEDBACK: number;
+export const LIBUSB_ISO_USAGE_TYPE_IMPLICIT: number;
+// libusb_transfer_status
+export const LIBUSB_TRANSFER_COMPLETED: number;
+export const LIBUSB_TRANSFER_ERROR: number;
+export const LIBUSB_TRANSFER_TIMED_OUT: number;
+export const LIBUSB_TRANSFER_CANCELLED: number;
+export const LIBUSB_TRANSFER_STALL: number;
+export const LIBUSB_TRANSFER_NO_DEVICE: number;
+export const LIBUSB_TRANSFER_OVERFLOW: number;
+// libusb_transfer_flags
+export const LIBUSB_TRANSFER_SHORT_NOT_OK: number;
+export const LIBUSB_TRANSFER_FREE_BUFFER: number;
+export const LIBUSB_TRANSFER_FREE_TRANSFER: number;
+// libusb_request_type
+export const LIBUSB_REQUEST_TYPE_STANDARD: number;
+export const LIBUSB_REQUEST_TYPE_CLASS: number;
+export const LIBUSB_REQUEST_TYPE_VENDOR: number;
+export const LIBUSB_REQUEST_TYPE_RESERVED: number;
+// libusb_request_recipient
+export const LIBUSB_RECIPIENT_DEVICE: number;
+export const LIBUSB_RECIPIENT_INTERFACE: number;
+export const LIBUSB_RECIPIENT_ENDPOINT: number;
+export const LIBUSB_RECIPIENT_OTHER: number;
+
+export const LIBUSB_CONTROL_SETUP_SIZE: number;
+
+// libusb_error
+// Input/output error
+export const LIBUSB_ERROR_IO: number;
+// Invalid parameter
+export const LIBUSB_ERROR_INVALID_PARAM: number;
+// Access denied (insufficient permissions)
+export const LIBUSB_ERROR_ACCESS: number;
+// No such device (it may have been disconnected)
+export const LIBUSB_ERROR_NO_DEVICE: number;
+// Entity not found
+export const LIBUSB_ERROR_NOT_FOUND: number;
+// Resource busy
+export const LIBUSB_ERROR_BUSY: number;
+// Operation timed out
+export const LIBUSB_ERROR_TIMEOUT: number;
+// Overflow
+export const LIBUSB_ERROR_OVERFLOW: number;
+// Pipe error
+export const LIBUSB_ERROR_PIPE: number;
+// System call interrupted (perhaps due to signal)
+export const LIBUSB_ERROR_INTERRUPTED: number;
+// Insufficient memory
+export const LIBUSB_ERROR_NO_MEM: number;
+// Operation not supported or unimplemented on this platform
+export const LIBUSB_ERROR_NOT_SUPPORTED: number;
+// Other error
+export const LIBUSB_ERROR_OTHER: number;
diff --git a/usb/tsconfig.json b/usb/tsconfig.json
index 8b33ce72d6..9f47845728 100644
--- a/usb/tsconfig.json
+++ b/usb/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "node-usb.d.ts",
-        "node-usb-tests.ts"
+        "index.d.ts",
+        "usb-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/usb/tslint.json b/usb/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/usb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file

From 8c747283fecf11c93d8ce12e82bcea8eac291c0c Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 13:24:03 -0800
Subject: [PATCH 169/245] Declare "pouchdb-mapreduce" module, not
 "pouchdb-adapter-mapreduce"

---
 pouchdb-mapreduce/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pouchdb-mapreduce/index.d.ts b/pouchdb-mapreduce/index.d.ts
index fdcd1fee74..76acbab156 100644
--- a/pouchdb-mapreduce/index.d.ts
+++ b/pouchdb-mapreduce/index.d.ts
@@ -20,7 +20,7 @@ declare namespace PouchDB {
     }
 }
 
-declare module 'pouchdb-adapter-mapreduce' {
+declare module 'pouchdb-mapreduce' {
     const plugin: PouchDB.Plugin;
     export = plugin;
 }

From 8b00a90f22101947c2feaed9afea3d1bd3bbdf0c Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 13:31:54 -0800
Subject: [PATCH 170/245] Rename tinycolor to tinycolor2

---
 {tinycolor => tinycolor2}/index.d.ts                           | 0
 tinycolor/tinycolor-tests.ts => tinycolor2/tinycolor2-tests.ts | 0
 {tinycolor => tinycolor2}/tsconfig.json                        | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {tinycolor => tinycolor2}/index.d.ts (100%)
 rename tinycolor/tinycolor-tests.ts => tinycolor2/tinycolor2-tests.ts (100%)
 rename {tinycolor => tinycolor2}/tsconfig.json (92%)

diff --git a/tinycolor/index.d.ts b/tinycolor2/index.d.ts
similarity index 100%
rename from tinycolor/index.d.ts
rename to tinycolor2/index.d.ts
diff --git a/tinycolor/tinycolor-tests.ts b/tinycolor2/tinycolor2-tests.ts
similarity index 100%
rename from tinycolor/tinycolor-tests.ts
rename to tinycolor2/tinycolor2-tests.ts
diff --git a/tinycolor/tsconfig.json b/tinycolor2/tsconfig.json
similarity index 92%
rename from tinycolor/tsconfig.json
rename to tinycolor2/tsconfig.json
index 2b9c0763ab..58e1fc8b69 100644
--- a/tinycolor/tsconfig.json
+++ b/tinycolor2/tsconfig.json
@@ -14,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "tinycolor-tests.ts"
+        "tinycolor2-tests.ts"
     ]
 }
\ No newline at end of file

From fce742aac140f2ec7777deda2a76b005af075ab9 Mon Sep 17 00:00:00 2001
From: Dan Corder <dev@dancorder.com>
Date: Thu, 17 Nov 2016 21:45:36 +0000
Subject: [PATCH 171/245] Add number type to propToCol

---
 handsontable/handsontable-tests.ts | 1 +
 handsontable/index.d.ts            | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/handsontable/handsontable-tests.ts b/handsontable/handsontable-tests.ts
index d062f9c629..6d55abd960 100644
--- a/handsontable/handsontable-tests.ts
+++ b/handsontable/handsontable-tests.ts
@@ -267,6 +267,7 @@ function test_HandsontableMethods() {
   hot.loadData([]);
   hot.populateFromArray(123, 123, [], 123, 123, 'foo', 'foo', 'foo', []);
   hot.propToCol('foo');
+  hot.propToCol(123);
   hot.removeCellMeta(123, 123, 'foo');
   hot.removeHook('foo', function() {});
   hot.render();
diff --git a/handsontable/index.d.ts b/handsontable/index.d.ts
index 7a82509baa..c08470739e 100644
--- a/handsontable/index.d.ts
+++ b/handsontable/index.d.ts
@@ -266,7 +266,7 @@ declare namespace ht {
     listen(): void;
     loadData(data: any[]): void;
     populateFromArray(row: number, col: number, input: any[], endRow?: number, endCol?: number, source?: string, method?: string, direction?: string, deltas?: any[]): any;
-    propToCol(prop: string): number;
+    propToCol(prop: string | number): number;
     removeCellMeta(row: number, col: number, key: string): void;
     removeHook(key: string, callback: Function): void;
     render(): void;

From 781d64651c1ffc45635eacc1c1e24dbb75b67d06 Mon Sep 17 00:00:00 2001
From: Morgan Benton <registered@morphatic.com>
Date: Thu, 17 Nov 2016 19:42:07 -0500
Subject: [PATCH 172/245] added defs for codependency

---
 codependency/codependency-tests.ts | 11 +++++++++++
 codependency/index.d.ts            | 29 +++++++++++++++++++++++++++++
 codependency/package.json          |  5 +++++
 codependency/tsconfig.json         | 19 +++++++++++++++++++
 4 files changed, 64 insertions(+)
 create mode 100644 codependency/codependency-tests.ts
 create mode 100644 codependency/index.d.ts
 create mode 100644 codependency/package.json
 create mode 100644 codependency/tsconfig.json

diff --git a/codependency/codependency-tests.ts b/codependency/codependency-tests.ts
new file mode 100644
index 0000000000..46f2db8d6d
--- /dev/null
+++ b/codependency/codependency-tests.ts
@@ -0,0 +1,11 @@
+/// <reference path="index.d.ts" />
+/// <reference types="node" />
+
+let requirePeer = codependency.register(module), package: any;
+    requirePeer = codependency.register(module, {index: ["dependencies", "devDependencies"]});
+    requirePeer = codependency.get("some-middleware");
+    package = requirePeer("some-peer-dependency-package");
+    package = requirePeer("some-peer-dependency-package", {optional: true});
+    package = requirePeer("some-peer-dependency-package", {dontThrow: true});
+    package = requirePeer("some-peer-dependency-package", {optional: true, dontThrow: true});
+    package = requirePeer.resolve("peer-package-name");
\ No newline at end of file
diff --git a/codependency/index.d.ts b/codependency/index.d.ts
new file mode 100644
index 0000000000..0376bee4bb
--- /dev/null
+++ b/codependency/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for codependency v0.1.3
+// Project: https://github.com/Wizcorp/codependency
+// Definitions by: Morgan Benton <https://github.com/morphatic>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export as namespace codependency;
+
+interface DependencyInfo {
+    supportedRange: string|null;
+    installedVersion: string|null;
+    isInstalled: boolean|null;
+    isValid: boolean|null;
+    pkgPath: string;
+}
+
+interface RequirePeerFunctionOptions {
+    optional?: boolean;
+    dontThrow?: boolean;
+}
+
+interface RequirePeerFunction {
+    (name: string, options?: RequirePeerFunctionOptions): any;
+    resolve: (name: string) => DependencyInfo;
+}
+
+export function register(baseModule: NodeModule, options?: {index: string[]}): RequirePeerFunction;
+export function get(middlewareName: string): RequirePeerFunction;
\ No newline at end of file
diff --git a/codependency/package.json b/codependency/package.json
new file mode 100644
index 0000000000..2fa5bde2e9
--- /dev/null
+++ b/codependency/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "@types/node": "^6.0.0"
+    }
+}
\ No newline at end of file
diff --git a/codependency/tsconfig.json b/codependency/tsconfig.json
new file mode 100644
index 0000000000..34636ce3d3
--- /dev/null
+++ b/codependency/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "codependency-tests.ts"
+    ]
+}
\ No newline at end of file

From 0e6203b12f960be571cea112406ce216ac2faf51 Mon Sep 17 00:00:00 2001
From: Dominic Watson <domwatson@live.co.uk>
Date: Thu, 17 Nov 2016 22:18:39 +0100
Subject: [PATCH 173/245] Graphql 0.8.0 -> 0.8.2

---
 graphql/index.d.ts | 145 +++++++++++++++++++++++++++++++--------------
 1 file changed, 100 insertions(+), 45 deletions(-)

diff --git a/graphql/index.d.ts b/graphql/index.d.ts
index b156afa6cf..43ca0fdc36 100644
--- a/graphql/index.d.ts
+++ b/graphql/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for graphql v0.8.0
+// Type definitions for graphql v0.8.2
 // Project: https://www.npmjs.com/package/graphql
 // Definitions by: TonyYang <https://github.com/TonyPythoneer>, Caleb Meredith <https://github.com/calebmer>, Dominic Watson <https://github.com/intellix>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -38,6 +38,7 @@ declare module "graphql" {
     // Validate GraphQL queries.
     export {
         validate,
+        ValidationContext,
         specifiedRules,
     } from 'graphql/validation';
 
@@ -195,7 +196,7 @@ declare module "graphql/language/index" {
     import * as Kind from 'graphql/language/kinds';
     export { Kind };
     export { createLexer, TokenKind, Lexer } from 'graphql/language/lexer';
-    export { parse, parseValue, parseType } from 'graphql/language/parser';
+    export { parse, parseValue, parseType, ParseOptions } from 'graphql/language/parser';
     export { print } from 'graphql/language/printer';
     export { Source } from 'graphql/language/source';
     export { visit, visitInParallel, visitWithTypeInfo, BREAK } from 'graphql/language/visitor';
@@ -1034,6 +1035,8 @@ declare module "graphql/type/definition" {
 
     export function isType(type: any): type is GraphQLType;
 
+    export function assertType(type: any): GraphQLType;
+
     /**
      * These types may be used as input types for arguments and directives.
      */
@@ -1051,6 +1054,8 @@ declare module "graphql/type/definition" {
 
     export function isInputType(type: GraphQLType): type is GraphQLInputType;
 
+    export function assertInputType(type: GraphQLType): GraphQLInputType;
+
     /**
      * These types may be used as output types as the result of fields.
      */
@@ -1072,6 +1077,8 @@ declare module "graphql/type/definition" {
 
     export function isOutputType(type: GraphQLType): type is GraphQLOutputType;
 
+    export function assertOutputType(type: GraphQLType): GraphQLOutputType;
+
     /**
      * These types may describe types which may be leaf values.
      */
@@ -1081,6 +1088,8 @@ declare module "graphql/type/definition" {
 
     export function isLeafType(type: GraphQLType): type is GraphQLLeafType;
 
+    export function assertLeafType(type: GraphQLType): GraphQLLeafType;
+
     /**
      * These types may describe the parent context of a selection set.
      */
@@ -1091,6 +1100,8 @@ declare module "graphql/type/definition" {
 
     export function isCompositeType(type: GraphQLType): type is GraphQLCompositeType;
 
+    export function assertCompositeType(type: GraphQLType): GraphQLCompositeType;
+
     /**
      * These types may describe the parent context of a selection set.
      */
@@ -1100,6 +1111,8 @@ declare module "graphql/type/definition" {
 
     export function isAbstractType(type: GraphQLType): type is GraphQLAbstractType;
 
+    export function assertAbstractType(type: GraphQLType): GraphQLAbstractType;
+
     /**
      * These types can all accept null as a value.
      */
@@ -1217,40 +1230,40 @@ declare module "graphql/type/definition" {
     class GraphQLObjectType {
         name: string;
         description: string;
-        isTypeOf: GraphQLIsTypeOfFn;
+        isTypeOf: GraphQLIsTypeOfFn<any, any>;
 
-        constructor(config: GraphQLObjectTypeConfig<any>);
-        getFields(): GraphQLFieldMap;
+        constructor(config: GraphQLObjectTypeConfig<any, any>);
+        getFields(): GraphQLFieldMap<any, any>;
         getInterfaces(): Array<GraphQLInterfaceType>;
         toString(): string;
     }
 
     //
 
-    export interface GraphQLObjectTypeConfig<TSource> {
+    export interface GraphQLObjectTypeConfig<TSource, TContext> {
         name: string;
         interfaces?: Thunk<Array<GraphQLInterfaceType>>;
-        fields: Thunk<GraphQLFieldConfigMap<TSource>>;
-        isTypeOf?: GraphQLIsTypeOfFn;
+        fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>;
+        isTypeOf?: GraphQLIsTypeOfFn<TSource, TContext>;
         description?: string
     }
 
-    export type GraphQLTypeResolver = (
-        value: any,
-        context: any,
+    export type GraphQLTypeResolver<TSource, TContext> = (
+        value: TSource,
+        context: TContext,
         info: GraphQLResolveInfo
     ) => GraphQLObjectType;
 
-    export type GraphQLIsTypeOfFn = (
-        source: any,
-        context: any,
+    export type GraphQLIsTypeOfFn<TSource, TContext> = (
+        source: TSource,
+        context: TContext,
         info: GraphQLResolveInfo
     ) => boolean;
 
-    export type GraphQLFieldResolver<TSource> = (
+    export type GraphQLFieldResolver<TSource, TContext> = (
         source: TSource,
         args: { [argName: string]: any },
-        context: any,
+        context: TContext,
         info: GraphQLResolveInfo
     ) => any;
 
@@ -1269,10 +1282,10 @@ declare module "graphql/type/definition" {
 
     export type ResponsePath = { prev: ResponsePath, key: string | number } | void;
 
-    export interface GraphQLFieldConfig<TSource> {
+    export interface GraphQLFieldConfig<TSource, TContext> {
         type: GraphQLOutputType;
         args?: GraphQLFieldConfigArgumentMap;
-        resolve?: GraphQLFieldResolver<TSource>;
+        resolve?: GraphQLFieldResolver<TSource, TContext>;
         deprecationReason?: string;
         description?: string;
     }
@@ -1287,18 +1300,18 @@ declare module "graphql/type/definition" {
         description?: string;
     }
 
-    export interface GraphQLFieldConfigMap<TSource> {
-        [fieldName: string]: GraphQLFieldConfig<TSource>;
+    export interface GraphQLFieldConfigMap<TSource, TContext> {
+        [fieldName: string]: GraphQLFieldConfig<TSource, TContext>;
     }
 
-    export interface GraphQLField {
+    export interface GraphQLField<TSource, TContext> {
         name: string;
         description: string;
         type: GraphQLOutputType;
         args: Array<GraphQLArgument>;
-        resolve: GraphQLFieldResolver<any>;
-        isDeprecated: boolean;
-        deprecationReason: string;
+        resolve?: GraphQLFieldResolver<TSource, TContext>;
+        isDeprecated?: boolean;
+        deprecationReason?: string;
     }
 
     export interface GraphQLArgument {
@@ -1308,8 +1321,8 @@ declare module "graphql/type/definition" {
         description?: string;
     }
 
-    export interface GraphQLFieldMap {
-        [fieldName: string]: GraphQLField;
+    export interface GraphQLFieldMap<TSource, TContext> {
+        [fieldName: string]: GraphQLField<TSource, TContext>;
     }
 
     /**
@@ -1333,24 +1346,24 @@ declare module "graphql/type/definition" {
     class GraphQLInterfaceType {
         name: string;
         description: string;
-        resolveType: GraphQLTypeResolver;
+        resolveType: GraphQLTypeResolver<any, any>;
 
-        constructor(config: GraphQLInterfaceTypeConfig);
+        constructor(config: GraphQLInterfaceTypeConfig<any, any>);
 
-        getFields(): GraphQLFieldMap;
+        getFields(): GraphQLFieldMap<any, any>;
 
         toString(): string;
     }
 
-    export interface GraphQLInterfaceTypeConfig {
+    export interface GraphQLInterfaceTypeConfig<TSource, TContext> {
         name: string,
-        fields: Thunk<GraphQLFieldConfigMap<any>>,
+        fields: Thunk<GraphQLFieldConfigMap<TSource, TContext>>,
         /**
          * Optionally provide a custom type resolver function. If one is not provided,
          * the default implementation will call `isTypeOf` on each implementing
          * Object type.
          */
-        resolveType?: GraphQLTypeResolver,
+        resolveType?: GraphQLTypeResolver<TSource, TContext>,
         description?: string
     }
 
@@ -1380,16 +1393,16 @@ declare module "graphql/type/definition" {
     class GraphQLUnionType {
         name: string;
         description: string;
-        resolveType: GraphQLTypeResolver;
+        resolveType: GraphQLTypeResolver<any, any>;
 
-        constructor(config: GraphQLUnionTypeConfig);
+        constructor(config: GraphQLUnionTypeConfig<any, any>);
 
         getTypes(): Array<GraphQLObjectType>;
 
         toString(): string;
     }
 
-    export interface GraphQLUnionTypeConfig {
+    export interface GraphQLUnionTypeConfig<TSource, TContext> {
         name: string,
         types: Thunk<Array<GraphQLObjectType>>,
         /**
@@ -1397,7 +1410,7 @@ declare module "graphql/type/definition" {
          * the default implementation will call `isTypeOf` on each implementing
          * Object type.
          */
-        resolveType?: GraphQLTypeResolver;
+        resolveType?: GraphQLTypeResolver<TSource, TContext>;
         description?: string;
     }
 
@@ -1680,9 +1693,9 @@ declare module "graphql/type/introspection" {
      * Note that these are GraphQLField and not GraphQLFieldConfig,
      * so the format for args is different.
      */
-    const SchemaMetaFieldDef: GraphQLField;
-    const TypeMetaFieldDef: GraphQLField;
-    const TypeNameMetaFieldDef: GraphQLField;
+    const SchemaMetaFieldDef: GraphQLField<any, any>;
+    const TypeMetaFieldDef: GraphQLField<any, any>;
+    const TypeNameMetaFieldDef: GraphQLField<any, any>;
 }
 
 declare module "graphql/type/scalars" {
@@ -1778,7 +1791,7 @@ declare module "graphql/validation" {
 }
 
 declare module "graphql/validation/index" {
-    export { validate } from 'graphql/validation/validate';
+    export { validate, ValidationContext } from 'graphql/validation/validate';
     export { specifiedRules } from 'graphql/validation/specifiedRules';
 }
 
@@ -1889,7 +1902,7 @@ declare module "graphql/validation/validate" {
 
         getInputType(): GraphQLInputType;
 
-        getFieldDef(): GraphQLField;
+        getFieldDef(): GraphQLField<any, any>;
 
         getDirective(): GraphQLDirective;
 
@@ -1944,7 +1957,7 @@ declare module "graphql/execution/execute" {
      * non-empty array if an error occurred.
      */
     export interface ExecutionResult {
-        data: {[key: string]: any};
+        data?: {[key: string]: any};
         errors?: Array<GraphQLError>;
     }
 
@@ -1983,7 +1996,7 @@ declare module "graphql/execution/execute" {
      * and returns it as the result, or if it's a function, returns the result
      * of calling that function while passing along args and context.
      */
-    export const defaultFieldResolver: GraphQLFieldResolver<any>;
+    export const defaultFieldResolver: GraphQLFieldResolver<any, any>;
 }
 
 declare module "graphql/execution/values" {
@@ -2007,7 +2020,7 @@ declare module "graphql/execution/values" {
      * definitions and list of argument AST nodes.
      */
     function getArgumentValues(
-        def: GraphQLField | GraphQLDirective,
+        def: GraphQLField<any, any> | GraphQLDirective,
         node: FieldNode | DirectiveNode,
         variableValues?: { [key: string]: any }
     ): { [key: string]: any };
@@ -2781,7 +2794,49 @@ declare module "graphql/utilities/typeFromAST" {
 }
 
 declare module "graphql/utilities/TypeInfo" {
-    class TypeInfo { }
+    import { GraphQLSchema } from 'graphql/type/schema';
+    import {
+        GraphQLOutputType,
+        GraphQLCompositeType,
+        GraphQLInputType,
+        GraphQLField,
+        GraphQLArgument,
+        GraphQLType,
+    } from 'graphql/type/definition';
+    import { GraphQLDirective } from 'graphql/type/directives';
+    import { ASTNode, FieldNode } from 'graphql/language/ast';
+
+    /**
+     * TypeInfo is a utility class which, given a GraphQL schema, can keep track
+     * of the current field and type definitions at any point in a GraphQL document
+     * AST during a recursive descent by calling `enter(node)` and `leave(node)`.
+     */
+    class TypeInfo {
+        constructor(
+            schema: GraphQLSchema,
+            // NOTE: this experimental optional second parameter is only needed in order
+            // to support non-spec-compliant codebases. You should never need to use it.
+            // It may disappear in the future.
+            getFieldDefFn: getFieldDef
+        );
+
+        getType(): GraphQLOutputType;
+        getParentType(): GraphQLCompositeType;
+        getInputType(): GraphQLInputType;
+        getFieldDef(): GraphQLField<any, any>;
+        getDirective(): GraphQLDirective;
+        getArgument(): GraphQLArgument;
+        enter(node: ASTNode): any;
+        leave(node: ASTNode): any;
+    }
+
+    export interface getFieldDef {
+    (
+        schema: GraphQLSchema,
+        parentType: GraphQLType,
+        fieldNode: FieldNode
+    ): GraphQLField<any, any>
+    }
 }
 
 declare module "graphql/utilities/valueFromAST" {

From c8b4fd92cbe3bb02fc657ca58c9bd9bfbb1e7380 Mon Sep 17 00:00:00 2001
From: Nico Jansen <jansennico@gmail.com>
Date: Fri, 18 Nov 2016 10:28:34 +0100
Subject: [PATCH 174/245] Add arguments to commander ICommand interface

---
 commander/commander-tests.ts | 7 +++++++
 commander/index.d.ts         | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/commander/commander-tests.ts b/commander/commander-tests.ts
index f6f3918f6a..78bd873782 100644
--- a/commander/commander-tests.ts
+++ b/commander/commander-tests.ts
@@ -79,6 +79,13 @@ program
         console.log('unknown option is allowed');
     });
 
+program
+  .version('0.0.1')
+  .arguments('<cmd> [env]')
+  .action(function (cmd, env) {
+     console.log(cmd, env);
+  });
+
 program.parse(process.argv);
 
 console.log('stuff');
diff --git a/commander/index.d.ts b/commander/index.d.ts
index e082fcebb2..15a3246710 100644
--- a/commander/index.d.ts
+++ b/commander/index.d.ts
@@ -74,6 +74,11 @@ declare namespace commander {
          */
         command(name:string, desc?:string, opts?: any):ICommand;
 
+        /**
+         * Set / get the arguments usage `str`.
+         */
+        arguments(str: string):ICommand;
+
         /**
          * Add an implicit `help [cmd]` subcommand
          * which invokes `--help` for the given command.

From b7a464430d50c895b087976cdac8497dd8adbc60 Mon Sep 17 00:00:00 2001
From: Rouffiat Vincent <external.z02vrouf@decathlon.com>
Date: Fri, 18 Nov 2016 14:09:11 +0100
Subject: [PATCH 175/245] Type react-redux-i18n: return valide callback
 function

---
 react-redux-i18n/index.d.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/react-redux-i18n/index.d.ts b/react-redux-i18n/index.d.ts
index aa47bb2723..d7851b23dc 100644
--- a/react-redux-i18n/index.d.ts
+++ b/react-redux-i18n/index.d.ts
@@ -20,6 +20,10 @@ declare module 'react-redux-i18n' {
 
   type TranslationObjects = { [lang: string]: SubTranslationObject };
 
+  type DispatchCallback<S> = {
+    (dispatch?: redux.Dispatch<S>, getState?: () => S): any;
+  }
+
   type I18nState = {
     translations: TranslationObjects;
     locale: string;
@@ -55,8 +59,8 @@ declare module 'react-redux-i18n' {
   /**
    *  Redux Actions
    */
-  export function loadTranslations(translationsObject: TranslationObjects): void;
+  export function loadTranslations(translationsObject: TranslationObjects): DispatchCallback<any>;
 
-  export function setLocale(locale: string): void;
+  export function setLocale(locale: string): DispatchCallback<any>;
 
 }

From 3cfaccc98d45cba363ba358722e0dcbe588b4de6 Mon Sep 17 00:00:00 2001
From: Rouffiat Vincent <external.z02vrouf@decathlon.com>
Date: Fri, 18 Nov 2016 14:14:39 +0100
Subject: [PATCH 176/245] Type react-redux-i18n: return valide callback
 function

---
 react-redux-i18n/react-redux-i18n.d.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/react-redux-i18n/react-redux-i18n.d.ts b/react-redux-i18n/react-redux-i18n.d.ts
index 537955af37..ca02c5789a 100644
--- a/react-redux-i18n/react-redux-i18n.d.ts
+++ b/react-redux-i18n/react-redux-i18n.d.ts
@@ -23,6 +23,10 @@ declare module 'react-redux-i18n' {
 
   type TranslationObjects = { [lang: string]: SubTranslationObject };
 
+  type DispatchCallback<S> = {
+    (dispatch?: _Redux.Dispatch<S>, getState?: () => S): any;
+  }
+
   type I18nState = {
     translations: TranslationObjects;
     locale: string;
@@ -58,8 +62,8 @@ declare module 'react-redux-i18n' {
   /**
    *  Redux Actions
    */
-  export function loadTranslations(translationsObject: TranslationObjects): void;
+  export function loadTranslations(translationsObject: TranslationObjects): DispatchCallback<any>;
 
-  export function setLocale(locale: string): void;
+  export function setLocale(locale: string): DispatchCallback<any>;
 
 }

From e9b5459205129c25085754f0fc152fffacc6a98f Mon Sep 17 00:00:00 2001
From: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date: Fri, 18 Nov 2016 15:42:33 +0000
Subject: [PATCH 177/245] Update moment-range definitions

---
 moment-range/index.d.ts            | 4 +++-
 moment-range/moment-range-tests.ts | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/moment-range/index.d.ts b/moment-range/index.d.ts
index bf8ff18350..cf5f823140 100644
--- a/moment-range/index.d.ts
+++ b/moment-range/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Moment.js 2.0.3
+// Type definitions for Moment.js 2.0.4
 // Project: https://github.com/gf3/moment-range
 // Definitions by: Bart van den Burg <https://github.com/Burgov>, Wilgert Velinga <https://github.com/wilgert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -34,6 +34,8 @@ declare module 'moment' {
 
         toString (): string;
 
+        toArray (): Date[];
+
         valueOf (): number;
 
         center (): number;
diff --git a/moment-range/moment-range-tests.ts b/moment-range/moment-range-tests.ts
index 21949aac1c..b1b5e01c9c 100644
--- a/moment-range/moment-range-tests.ts
+++ b/moment-range/moment-range-tests.ts
@@ -42,3 +42,5 @@ var res17: moment.Range = range.clone();
 
 var res18: moment.Moment = range.start;
 var res19: moment.Moment = range.end;
+
+var res20: Date[] = range.toArray();

From fb051545ca2ddc2f2ad0ece436a7841c10ff8e93 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 18 Nov 2016 07:54:44 -0800
Subject: [PATCH 178/245] Add 'tslint.json' to required files

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ab2080714b..8821765f0d 100644
--- a/README.md
+++ b/README.md
@@ -113,6 +113,7 @@ Your package should have this structure:
 | index.d.ts | This contains the typings for the package. |
 | foo-tests.ts | This contains sample code which tests the typings. This code does *not* run, but it is type-checked. |
 | tsconfig.json | This allows you to run `tsc` within the package. |
+| tslint.json | Enables linting. |
 
 Generate these by running `npm run new-package -- new-package-name`.
 

From 48c60ba7433e140ad8d811b105d18abb7bac8395 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 18 Nov 2016 07:58:27 -0800
Subject: [PATCH 179/245] Rename "spin" to "spin.js"

---
 {spin => spin.js}/index.d.ts                   | 0
 spin/spin-tests.ts => spin.js/spin.js-tests.ts | 0
 {spin => spin.js}/tsconfig.json                | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {spin => spin.js}/index.d.ts (100%)
 rename spin/spin-tests.ts => spin.js/spin.js-tests.ts (100%)
 rename {spin => spin.js}/tsconfig.json (93%)

diff --git a/spin/index.d.ts b/spin.js/index.d.ts
similarity index 100%
rename from spin/index.d.ts
rename to spin.js/index.d.ts
diff --git a/spin/spin-tests.ts b/spin.js/spin.js-tests.ts
similarity index 100%
rename from spin/spin-tests.ts
rename to spin.js/spin.js-tests.ts
diff --git a/spin/tsconfig.json b/spin.js/tsconfig.json
similarity index 93%
rename from spin/tsconfig.json
rename to spin.js/tsconfig.json
index c05545cf34..e4aaa00965 100644
--- a/spin/tsconfig.json
+++ b/spin.js/tsconfig.json
@@ -14,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "spin-tests.ts"
+        "spin.js-tests.ts"
     ]
 }
\ No newline at end of file

From aebaa35d790cffe7318dc7a5642543f1e4ed78fc Mon Sep 17 00:00:00 2001
From: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date: Fri, 18 Nov 2016 16:00:14 +0000
Subject: [PATCH 180/245] Add missing parameters for the toArray method.

---
 moment-range/index.d.ts            | 2 +-
 moment-range/moment-range-tests.ts | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/moment-range/index.d.ts b/moment-range/index.d.ts
index cf5f823140..b68603450c 100644
--- a/moment-range/index.d.ts
+++ b/moment-range/index.d.ts
@@ -34,7 +34,7 @@ declare module 'moment' {
 
         toString (): string;
 
-        toArray (): Date[];
+        toArray (by: Range|String, exclusive?: boolean): Date[];
 
         valueOf (): number;
 
diff --git a/moment-range/moment-range-tests.ts b/moment-range/moment-range-tests.ts
index b1b5e01c9c..918f9bb1aa 100644
--- a/moment-range/moment-range-tests.ts
+++ b/moment-range/moment-range-tests.ts
@@ -44,3 +44,5 @@ var res18: moment.Moment = range.start;
 var res19: moment.Moment = range.end;
 
 var res20: Date[] = range.toArray();
+var res21: Date[] = range.toArray('days');
+var res22: Date[] = range.toArray('days', true);

From 45522f5768ff213137b677fb3a0e4b9fd5ce3c36 Mon Sep 17 00:00:00 2001
From: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date: Fri, 18 Nov 2016 16:02:45 +0000
Subject: [PATCH 181/245] Update return type

---
 moment-range/index.d.ts            | 2 +-
 moment-range/moment-range-tests.ts | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/moment-range/index.d.ts b/moment-range/index.d.ts
index b68603450c..7ff7feb9b8 100644
--- a/moment-range/index.d.ts
+++ b/moment-range/index.d.ts
@@ -34,7 +34,7 @@ declare module 'moment' {
 
         toString (): string;
 
-        toArray (by: Range|String, exclusive?: boolean): Date[];
+        toArray (by: Range|String, exclusive?: boolean): Moment[];
 
         valueOf (): number;
 
diff --git a/moment-range/moment-range-tests.ts b/moment-range/moment-range-tests.ts
index 918f9bb1aa..2d8c956076 100644
--- a/moment-range/moment-range-tests.ts
+++ b/moment-range/moment-range-tests.ts
@@ -43,6 +43,5 @@ var res17: moment.Range = range.clone();
 var res18: moment.Moment = range.start;
 var res19: moment.Moment = range.end;
 
-var res20: Date[] = range.toArray();
-var res21: Date[] = range.toArray('days');
-var res22: Date[] = range.toArray('days', true);
+var res20: Moment[] = range.toArray('days');
+var res22: Moment[] = range.toArray('days', true);

From 2ed5596bbb195e51e75833b97e20363cc982505e Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Fri, 18 Nov 2016 08:05:35 -0800
Subject: [PATCH 182/245] Rename "rails-actioncable" to "actioncable"

---
 .../actioncable-tests.ts                                        | 0
 {rails-actioncable => actioncable}/index.d.ts                   | 0
 {rails-actioncable => actioncable}/tsconfig.json                | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename rails-actioncable/rails-actioncable-tests.ts => actioncable/actioncable-tests.ts (100%)
 rename {rails-actioncable => actioncable}/index.d.ts (100%)
 rename {rails-actioncable => actioncable}/tsconfig.json (90%)

diff --git a/rails-actioncable/rails-actioncable-tests.ts b/actioncable/actioncable-tests.ts
similarity index 100%
rename from rails-actioncable/rails-actioncable-tests.ts
rename to actioncable/actioncable-tests.ts
diff --git a/rails-actioncable/index.d.ts b/actioncable/index.d.ts
similarity index 100%
rename from rails-actioncable/index.d.ts
rename to actioncable/index.d.ts
diff --git a/rails-actioncable/tsconfig.json b/actioncable/tsconfig.json
similarity index 90%
rename from rails-actioncable/tsconfig.json
rename to actioncable/tsconfig.json
index 01da174ddf..6767b44330 100644
--- a/rails-actioncable/tsconfig.json
+++ b/actioncable/tsconfig.json
@@ -14,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "rails-actioncable-tests.ts"
+        "actioncable-tests.ts"
     ]
 }
\ No newline at end of file

From 3e2f8424349a199cd1882d973989f2867ad488fa Mon Sep 17 00:00:00 2001
From: Maxime AILLOUD <maxime.ailloud@gmail.com>
Date: Fri, 18 Nov 2016 16:07:03 +0000
Subject: [PATCH 183/245] Fix test typing

---
 moment-range/moment-range-tests.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/moment-range/moment-range-tests.ts b/moment-range/moment-range-tests.ts
index 2d8c956076..16bcf7c808 100644
--- a/moment-range/moment-range-tests.ts
+++ b/moment-range/moment-range-tests.ts
@@ -43,5 +43,5 @@ var res17: moment.Range = range.clone();
 var res18: moment.Moment = range.start;
 var res19: moment.Moment = range.end;
 
-var res20: Moment[] = range.toArray('days');
-var res22: Moment[] = range.toArray('days', true);
+var res20: moment.Moment[] = range.toArray('days');
+var res22: moment.Moment[] = range.toArray('days', true);

From 3a425d67319f23b1f0b1fbd1dc9d8ac25a4c5a7b Mon Sep 17 00:00:00 2001
From: Niklas Mollenhauer <nikeee@outlook.com>
Date: Fri, 18 Nov 2016 18:58:23 +0100
Subject: [PATCH 184/245] Fix builder function return type

---
 yargs/index.d.ts     |  4 ++--
 yargs/yargs-tests.ts | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/yargs/index.d.ts b/yargs/index.d.ts
index fa82e2490e..69accf9d70 100644
--- a/yargs/index.d.ts
+++ b/yargs/index.d.ts
@@ -66,10 +66,10 @@ declare namespace yargs {
 
         command(command: string, description: string): Argv;
         command(command: string, description: string, handler: (args: Argv) => void): Argv;
-        command(command: string, description: string, builder: (args: Argv) => Options): Argv;
+        command(command: string, description: string, builder: (args: Argv) => Argv): Argv;
         command(command: string, description: string, builder: { [optionName: string]: Options }): Argv;
         command(command: string, description: string, builder: { [optionName: string]: Options }, handler: (args: Argv) => void): Argv;
-        command(command: string, description: string, builder: (args: Argv) => Options, handler: (args: Argv) => void): Argv;
+        command(command: string, description: string, builder: (args: Argv) => Argv, handler: (args: Argv) => void): Argv;
         command(command: string, description: string, module: CommandModule): Argv;
         command(module: CommandModule): Argv;
 
diff --git a/yargs/yargs-tests.ts b/yargs/yargs-tests.ts
index 8fb693803a..c88f9954d8 100644
--- a/yargs/yargs-tests.ts
+++ b/yargs/yargs-tests.ts
@@ -226,6 +226,33 @@ function command() {
 		})
 		.help('help')
 		.argv;
+
+	yargs
+		.command('get', 'make a get HTTP request', function (yargs) {
+			return yargs.option('url', {
+				alias: 'u',
+				default: 'http://yargs.js.org/'
+			})
+		})
+		.help()
+		.argv
+
+	yargs
+		.command(
+			'get',
+			'make a get HTTP request',
+			function (yargs) {
+				return yargs.option('u', {
+					alias: 'url',
+					describe: 'the URL to make an HTTP request to'
+				})
+			},
+			function (argv) {
+				console.dir(argv)
+			}
+		)
+		.help()
+		.argv
 }
 
 function completion_sync() {

From cbf1dc7f7c27b69604245fd085fd3bbaaafb9b4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Podeszwa?= <michal.podeszwa@gmail.com>
Date: Fri, 18 Nov 2016 19:44:41 +0100
Subject: [PATCH 185/245] Add updating user methods to Auth0

---
 auth0/auth0-tests.ts | 27 +++++++++++++++++++++++++++
 auth0/index.d.ts     | 25 ++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/auth0/auth0-tests.ts b/auth0/auth0-tests.ts
index 391dee655a..502a72eec1 100644
--- a/auth0/auth0-tests.ts
+++ b/auth0/auth0-tests.ts
@@ -49,3 +49,30 @@ auth
   }).catch((err) => {
     // Handle the error.
   });
+
+
+// Update a user
+management
+  .updateUser({id: "user_id"}, {"email": "hi@me.co"});
+
+// Update a user using callback
+management
+  .updateUser({id: "user_id"}, {"email": "hi@me.co"}, (err: Error, users: auth0.User) => {});
+
+
+// Update user metadata
+management
+  .updateUserMetadata({id: "user_id"}, {"key": "value"});
+
+// Update user metadata using callback
+management
+  .updateUserMetadata({id: "user_id"}, {"key": "value"}, (err: Error, users: auth0.User) => {});
+
+
+// Update app metadata
+management
+  .updateAppMetadata({id: "user_id"}, {"key": "value"});
+
+// Update app metadata using callback
+management
+  .updateAppMetadata({id: "user_id"}, {"key": "value"}, (err: Error, users: auth0.User) => {});
diff --git a/auth0/index.d.ts b/auth0/index.d.ts
index 019d9edc38..dad988a614 100644
--- a/auth0/index.d.ts
+++ b/auth0/index.d.ts
@@ -10,15 +10,18 @@ export interface ManagementClientOptions {
   domain?: string;
 }
 
+export type UserMetadata = {};
+export type AppMetadata = {};
+
 export interface UserData {
   connection: string;
   email?: string;
   username?: string;
   password?: string;
   phone_number?: string;
-  user_metadata?: {};
+  user_metadata?: UserMetadata;
   email_verified?: boolean;
-  app_metadata?: {};
+  app_metadata?: AppMetadata;
 }
 
 export interface GetUsersData {
@@ -43,8 +46,8 @@ export interface User {
   created_at?: string;
   updated_at?: string;
   identities?: Identity[];
-  app_metadata?: {};
-  user_metadata?: {};
+  app_metadata?: AppMetadata;
+  user_metadata?: UserMetadata;
   picture?: string;
   name?: string;
   nickname?: string;
@@ -53,6 +56,8 @@ export interface User {
   last_login?: string;
   logins_count?: number;
   blocked?: boolean;
+  given_name?: string;
+  family_name?: string;
 }
 
 export interface Identity {
@@ -62,6 +67,10 @@ export interface Identity {
   isSocial: boolean;
 }
 
+export interface UpdateUserParameters {
+  id: string;
+}
+
 export class ManagementClient {
   constructor(options: ManagementClientOptions);
 
@@ -69,6 +78,12 @@ export class ManagementClient {
   getUsers(params?: GetUsersData, cb?: (err: Error, users: User[]) => void): void;
   createUser(data: UserData): Promise<User>;
   createUser(data: UserData, cb: (err: Error, data: User) => void): void;
+  updateUser(params: UpdateUserParameters, data: User): Promise<User>;
+  updateUser(params: UpdateUserParameters, data: User, cb: (err: Error, data: User) => void): void;
+  updateUserMetadata(params: UpdateUserParameters, data: UserMetadata): Promise<User>;
+  updateUserMetadata(params: UpdateUserParameters, data: UserMetadata, cb: (err: Error, data: User) => void): void
+  updateAppMetadata(params: UpdateUserParameters, data: AppMetadata): Promise<User>;
+  updateAppMetadata(params: UpdateUserParameters, data: AppMetadata, cb: (err: Error, data: User) => void): void
 }
 
 export interface AuthenticationClientOptions {
@@ -86,4 +101,4 @@ export class AuthenticationClient {
 
   requestChangePasswordEmail(data: RequestChangePasswordEmailData): Promise<string>;
   requestChangePasswordEmail(data: RequestChangePasswordEmailData, cb: (err: Error, message: string) => void): void;
-}
\ No newline at end of file
+}

From ae1969a3c7cc34de124cf2dc64094be66d7d9240 Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Fri, 18 Nov 2016 20:53:46 +0100
Subject: [PATCH 186/245] Change github.com/rackt/history to
 github.com/mjackson/history

---
 history/index.d.ts | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/history/index.d.ts b/history/index.d.ts
index b099b9beaa..6b61fa1b77 100644
--- a/history/index.d.ts
+++ b/history/index.d.ts
@@ -1,10 +1,8 @@
 // Type definitions for history v2.0.0
-// Project: https://github.com/rackt/history
+// Project: https://github.com/mjackson/history
 // Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Nathan Brown <https://github.com/ngbrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// types based on https://github.com/rackt/history/blob/master/docs/Terms.md
-
 export as namespace History;
 
 export type Action = string;

From 34cc6ae05e5c4efb72a9b308fb6dcd5094bddfd3 Mon Sep 17 00:00:00 2001
From: Christian Schwarz <christian.schwarz@refactory.at>
Date: Fri, 18 Nov 2016 21:52:20 +0100
Subject: [PATCH 187/245] Add typings for pbf (#12796)

* Add typings for pbf

* Fix test issues

* Remove single declare module

* Made buffer optional
---
 pbf/index.d.ts    | 77 +++++++++++++++++++++++++++++++++++++++++
 pbf/pbf-tests.ts  | 88 +++++++++++++++++++++++++++++++++++++++++++++++
 pbf/tsconfig.json | 19 ++++++++++
 pbf/tslint.json   |  1 +
 4 files changed, 185 insertions(+)
 create mode 100644 pbf/index.d.ts
 create mode 100644 pbf/pbf-tests.ts
 create mode 100644 pbf/tsconfig.json
 create mode 100644 pbf/tslint.json

diff --git a/pbf/index.d.ts b/pbf/index.d.ts
new file mode 100644
index 0000000000..fdcb9b53ce
--- /dev/null
+++ b/pbf/index.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for pbf 3.0
+// Project: https://github.com/mapbox/pbf
+// Definitions by: Christian Schwarz <https://github.com/cschwarz>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Pbf {
+    buf: Uint8Array;
+    pos: number;
+    type: number;
+    length: number;
+
+    constructor(buffer?: Uint8Array);
+
+    destroy(): void;
+    readFields<T>(readField: (tag: number, result?: T, pbf?: Pbf) => void, result?: T, end?: number): T;
+    readMessage<T>(readField: (tag: number, result?: T, pbf?: Pbf) => void, result?: T): T;
+    readFixed32(): number;
+    readSFixed32(): number;
+    readFixed64(): number;
+    readSFixed64(): number;
+    readFloat(): number;
+    readDouble(): number;
+    readVarint(isSigned?: boolean): number;
+    readVarint64(): number;
+    readSVarint(): number;
+    readBoolean(): boolean;
+    readString(): string;
+    readBytes(): Uint8Array;
+    readPackedVarint(arr?: number[], isSigned?: boolean): number[];
+    readPackedSVarint(arr?: number[]): number[];
+    readPackedBoolean(arr?: boolean[]): boolean[];
+    readPackedFloat(arr?: number[]): number[];
+    readPackedDouble(arr?: number[]): number[];
+    readPackedFixed32(arr?: number[]): number[];
+    readPackedSFixed32(arr?: number[]): number[];
+    readPackedFixed64(arr?: number[]): number[];
+    readPackedSFixed64(arr?: number[]): number[];
+    skip(val: number): void;
+    writeTag(tag: number, type: number): void;
+    realloc(min: number): void;
+    finish(): Uint8Array;
+    writeFixed32(val: number): void;
+    writeSFixed32(val: number): void;
+    writeFixed64(val: number): void;
+    writeSFixed64(val: number): void;
+    writeVarint(val: number): void;
+    writeSVarint(val: number): void;
+    writeBoolean(val: boolean): void;
+    writeString(str: string): void;
+    writeFloat(val: number): void;
+    writeDouble(val: number): void;
+    writeBytes(buffer: Uint8Array): void;
+    writeRawMessage<T>(fn: (obj: T, pbf?: Pbf) => void, obj?: T): void;
+    writeMessage<T>(tag: number, fn: (obj: T, pbf?: Pbf) => void, obj?: T): void;
+    writePackedVarint(tag: number, arr: number[]): void;
+    writePackedSVarint(tag: number, arr: number[]): void;
+    writePackedBoolean(tag: number, arr: boolean[]): void;
+    writePackedFloat(tag: number, arr: number[]): void;
+    writePackedDouble(tag: number, arr: number[]): void;
+    writePackedFixed32(tag: number, arr: number[]): void;
+    writePackedSFixed32(tag: number, arr: number[]): void;
+    writePackedFixed64(tag: number, arr: number[]): void;
+    writePackedSFixed64(tag: number, arr: number[]): void;
+    writeBytesField(tag: number, buffer: Uint8Array): void;
+    writeFixed32Field(tag: number, val: number): void;
+    writeSFixed32Field(tag: number, val: number): void;
+    writeFixed64Field(tag: number, val: number): void;
+    writeSFixed64Field(tag: number, val: number): void;
+    writeVarintField(tag: number, val: number): void;
+    writeSVarintField(tag: number, val: number): void;
+    writeStringField(tag: number, str: string): void;
+    writeFloatField(tag: number, val: number): void;
+    writeDoubleField(tag: number, val: number): void;
+    writeBooleanField(tag: number, val: boolean): void;
+}
+
+export = Pbf;
diff --git a/pbf/pbf-tests.ts b/pbf/pbf-tests.ts
new file mode 100644
index 0000000000..533c183801
--- /dev/null
+++ b/pbf/pbf-tests.ts
@@ -0,0 +1,88 @@
+import Pbf = require('pbf');
+
+var pbf = new Pbf(new Uint8Array(1));
+new Pbf();
+pbf.buf;
+pbf.pos;
+pbf.type;
+pbf.length;
+pbf.destroy();
+pbf.readFields(function (tag) {});
+pbf.readFields(function (tag, result) {});
+pbf.readFields(function (tag, result, pbf) {});
+pbf.readFields(function (tag) {}, {}, 1);
+pbf.readMessage(function (tag) {});
+pbf.readMessage(function (tag, result) {});
+pbf.readMessage(function (tag, result, pbf) {});
+pbf.readFixed32();
+pbf.readSFixed32();
+pbf.readFixed64();
+pbf.readSFixed64();        
+pbf.readFloat();
+pbf.readDouble();
+pbf.readVarint();
+pbf.readVarint(true);
+pbf.readVarint64();
+pbf.readSVarint();
+pbf.readBoolean();
+pbf.readString();
+pbf.readBytes();
+pbf.readPackedVarint();
+pbf.readPackedVarint([], true);        
+pbf.readPackedSVarint();
+pbf.readPackedSVarint([]);
+pbf.readPackedBoolean();
+pbf.readPackedBoolean([]);
+pbf.readPackedFloat();
+pbf.readPackedFloat([]);
+pbf.readPackedDouble();
+pbf.readPackedDouble([]);
+pbf.readPackedFixed32();
+pbf.readPackedFixed32([]);
+pbf.readPackedSFixed32();
+pbf.readPackedSFixed32([]);
+pbf.readPackedFixed64();
+pbf.readPackedFixed64([]);
+pbf.readPackedSFixed64();
+pbf.readPackedSFixed64([]);
+pbf.skip(1);
+pbf.writeTag(1, 2);
+pbf.realloc(1);
+pbf.finish();
+pbf.writeFixed32(1);
+pbf.writeSFixed32(1);
+pbf.writeFixed64(1);
+pbf.writeSFixed64(1);
+pbf.writeVarint(1);
+pbf.writeSVarint(1);
+pbf.writeBoolean(true);
+pbf.writeString('');
+pbf.writeFloat(1);
+pbf.writeDouble(1);
+pbf.writeBytes(new Uint8Array(1));
+pbf.writeRawMessage(function (obj) {});
+pbf.writeRawMessage(function (obj, pbf) {});
+pbf.writeRawMessage(function (obj) {}, {});
+pbf.writeMessage(1, function (obj) {});
+pbf.writeMessage(1, function (obj, pbf) {});
+pbf.writeMessage(1, function (obj) {}, {});
+pbf.writePackedVarint(1, []);
+pbf.writePackedSVarint(1, []);
+pbf.writePackedBoolean(1, []);
+pbf.writePackedFloat(1, []);
+pbf.writePackedDouble(1, []);
+pbf.writePackedFixed32(1, []);
+pbf.writePackedSFixed32(1, []);
+pbf.writePackedFixed64(1, []);
+pbf.writePackedSFixed64(1, []);
+pbf.writeBytesField(1, new Uint8Array(1));
+pbf.writeFixed32Field(1, 2);
+pbf.writeSFixed32Field(1, 2);
+pbf.writeFixed64Field(1, 2);
+pbf.writeSFixed64Field(1, 2);
+pbf.writeVarintField(1, 2);
+pbf.writeSVarintField(1, 2);
+pbf.writeStringField(1, '');
+pbf.writeFloatField(1, 2);
+pbf.writeDoubleField(1, 2);
+pbf.writeBooleanField(1, true);
\ No newline at end of file
diff --git a/pbf/tsconfig.json b/pbf/tsconfig.json
new file mode 100644
index 0000000000..640b85fc41
--- /dev/null
+++ b/pbf/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pbf-tests.ts"
+    ]
+}
diff --git a/pbf/tslint.json b/pbf/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/pbf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }

From 4a4ab44eb3524b8ae32f89d08348a3dc4d750949 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 18 Nov 2016 13:32:07 -0800
Subject: [PATCH 188/245] Support `npm link`-ed types-publisher in `npm run
 lint` (#12760)

---
 scripts/lint.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scripts/lint.js b/scripts/lint.js
index 0a840720eb..1ae8e24d40 100644
--- a/scripts/lint.js
+++ b/scripts/lint.js
@@ -1,8 +1,14 @@
 // Usage: npm run lint -- my-package-name
 const pkg = process.argv[2];
 const execSync = require("child_process").execSync;
-const cmd = `node node_modules/tslint/lib/tslint-cli --format stylish ${pkg}/**/*.d.ts`;
+const existsSync = require("fs").existsSync;
+
+// Path of tslint when `types-publisher` is symlinked
+const symlinkedTslintPath = "node_modules/types-publisher/node_modules/tslint"
+const tslintPath =  existsSync(symlinkedTslintPath) ? symlinkedTslintPath : "node_modules/tslint";
+const cmd = `node ${tslintPath}/lib/tslint-cli --format stylish ${pkg}/**/*.d.ts`;
 console.log(cmd);
+
 try {
     // Child process writes directly to our own stdout
     execSync(cmd, { stdio: "inherit" });

From a666820ef2066d03f0c7d33d057f6a6868142c81 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Fri, 18 Nov 2016 14:14:39 -0800
Subject: [PATCH 189/245] Remove useless `npm-debug.log` (#12803)

---
 npm-debug.log.3539137130 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 npm-debug.log.3539137130

diff --git a/npm-debug.log.3539137130 b/npm-debug.log.3539137130
deleted file mode 100644
index e69de29bb2..0000000000

From 8f81a207fd3a3761e40e7d6f87b61e8d54f5f6bc Mon Sep 17 00:00:00 2001
From: Iain McGinniss <iainmcgin@google.com>
Date: Fri, 18 Nov 2016 16:45:48 -0800
Subject: [PATCH 190/245] Add callback parameter to tls.Server.close

See node definition in the docs here:
https://nodejs.org/api/tls.html#tls_server_close_callback
---
 node/index.d.ts    |  4 +-
 node/node-tests.ts | 99 ++++++++++++++++++++++++++++------------------
 2 files changed, 63 insertions(+), 40 deletions(-)

diff --git a/node/index.d.ts b/node/index.d.ts
index ea81e61147..8c280b6f99 100644
--- a/node/index.d.ts
+++ b/node/index.d.ts
@@ -1539,7 +1539,7 @@ declare module "child_process" {
         disconnect(): void;
         unref(): void;
         ref(): void;
-    
+
         /**
          * events.EventEmitter
          * 1. close
@@ -3051,7 +3051,7 @@ declare module "tls" {
     }
 
     export interface Server extends net.Server {
-        close(): Server;
+        close(callback?: Function): Server;
         address(): { port: number; family: string; address: string; };
         addContext(hostName: string, credentials: {
             key: string;
diff --git a/node/node-tests.ts b/node/node-tests.ts
index 9873b19e72..f24e1502c1 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -1,3 +1,4 @@
+/// <reference path="index.d.ts" />
 import * as assert from "assert";
 import * as fs from "fs";
 import * as events from "events";
@@ -47,33 +48,33 @@ namespace global_tests {
 namespace assert_tests {
     {
         assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
-        
+
         assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
-        
+
         assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
-        
+
         assert.doesNotThrow(() => {
             const b = false;
             if (b) { throw "a hammer at your face"; }
         }, undefined, "What the...*crunch*");
-        
+
         assert.equal(3, "3", "uses == comparator");
 
         assert.fail(1, 2, undefined, '>');
-        
+
         assert.ifError(0);
-        
+
         assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
-        
+
         assert.notEqual(1, 2, "uses != comparator");
-        
+
         assert.notStrictEqual(2, "2", "uses === comparator");
-        
+
         assert.ok(true);
         assert.ok(1);
-        
+
         assert.strictEqual(1, 1,  "uses === comparator");
-        
+
         assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
     }
 }
@@ -153,21 +154,21 @@ namespace fs_tests {
         fs.writeFile("thebible.txt",
             "Do unto others as you would have them do unto you.",
             assert.ifError);
-        
+
         fs.write(1234, "test");
-        
+
         fs.writeFile("Harry Potter",
             "\"You be wizzing, Harry,\" jived Dumbledore.",
             {
                 encoding: "ascii"
             },
-            assert.ifError);	
+            assert.ifError);
     }
 
     {
         var content: string;
         var buffer: Buffer;
-        
+
         content = fs.readFileSync('testfile', 'utf8');
         content = fs.readFileSync('testfile', { encoding: 'utf8' });
         buffer = fs.readFileSync('testfile');
@@ -177,7 +178,7 @@ namespace fs_tests {
         fs.readFile('testfile', (err, data) => buffer = data);
         fs.readFile('testfile', { flag: 'r' }, (err, data) => buffer = data);
     }
-    
+
     {
         var errno: number;
         fs.readFile('testfile', (err, data) => {
@@ -186,28 +187,28 @@ namespace fs_tests {
             }
         });
     }
-    
+
     {
         fs.mkdtemp('/tmp/foo-', (err, folder) => {
             console.log(folder);
             // Prints: /tmp/foo-itXde2
         });
     }
-    
+
     {
         var tempDir: string;
         tempDir = fs.mkdtempSync('/tmp/foo-');
     }
-    
+
     {
         fs.watch('/tmp/foo-', (event, filename) => {
           console.log(event, filename);
         });
-        
+
         fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
           console.log(event, filename);
         });
-        
+
         fs.watch('/tmp/foo-', {
           recursive: true,
           persistent: true,
@@ -216,22 +217,22 @@ namespace fs_tests {
           console.log(event, filename);
         });
     }
-    
+
     {
         fs.access('/path/to/folder', (err) => { });
-        
+
         fs.access(Buffer.from(''), (err) => { });
-        
+
         fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => { });
-        
+
         fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => { });
-        
+
         fs.accessSync('/path/to/folder');
-        
+
         fs.accessSync(Buffer.from(''));
-        
+
         fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK);
-        
+
         fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK);
     }
 }
@@ -400,14 +401,14 @@ function bufferTests() {
 namespace url_tests {
     {
         url.format(url.parse('http://www.example.com/xyz'));
-        
+
         // https://google.com/search?q=you're%20a%20lizard%2C%20gary
         url.format({
             protocol: 'https',
             host: "google.com",
             pathname: 'search',
             query: { q: "you're a lizard, gary" }
-        });   
+        });
     }
 
     {
@@ -424,7 +425,7 @@ namespace util_tests {
     {
         // Old and new util.inspect APIs
         util.inspect(["This is nice"], false, 5);
-        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });    
+        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
     }
 }
 
@@ -731,6 +732,14 @@ namespace tls_tests {
         _server = _server.prependOnceListener("secureConnection", (tlsSocket) => {
             let _tlsSocket: tls.TLSSocket = tlsSocket;
         })
+
+        // close callback parameter is optional
+        _server = _server.close();
+
+        // close callback parameter doesn't specify any arguments, so any
+        // function is acceptable
+        _server = _server.close(() => {});
+        _server = _server.close((...args:any[]) => {});
     }
 
     {
@@ -772,7 +781,7 @@ namespace tls_tests {
             let _response: Buffer = response;
         })
         _TLSSocket = _TLSSocket.prependOnceListener("secureConnect", () => { });
-    } 
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -1315,9 +1324,9 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
-        childProcess.spawnSync("echo test");    
+        childProcess.spawnSync("echo test");
     }
-    
+
     {
         let _cp: childProcess.ChildProcess;
         let _boolean: boolean;
@@ -1574,7 +1583,7 @@ namespace process_tests {
     {
         var eventEmitter: events.EventEmitter;
         eventEmitter = process;                // Test that process implements EventEmitter...
-        
+
         var _p: NodeJS.Process = process;
         _p = p;
     }
@@ -1605,8 +1614,22 @@ namespace console_tests {
 
 namespace net_tests {
     {
-        // Make sure .listen() and .close() retuern a Server instance
-        net.createServer().listen(0).close().address();
+        let server = net.createServer();
+        // Check methods which return server instances by chaining calls
+        server = server.listen(0)
+                .close()
+                .ref()
+                .unref();
+
+        // close has an optional callback function. No callback parameters are
+        // specified, so any callback function is permissible.
+        server = server.close((...args: any[]) => {});
+
+        // test the types of the address object fields
+        let address = server.address();
+        address.port = 1234;
+        address.family = "ipv4";
+        address.address = "127.0.0.1";
     }
 
     {

From d03ee5bf0d26443adb16936686a171f849c61196 Mon Sep 17 00:00:00 2001
From: David Li <randombk@users.noreply.github.com>
Date: Fri, 18 Nov 2016 22:27:36 -0800
Subject: [PATCH 191/245] three: Fix parameter type in Quaternion.dot

Quaternion.dot takes in another quaternion as it's parameter.

Signed-off-by: David Li <jiawei.davidli@gmail.com>
---
 three/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/three/index.d.ts b/three/index.d.ts
index 3fa2c60b12..76f70f32ce 100644
--- a/three/index.d.ts
+++ b/three/index.d.ts
@@ -3646,7 +3646,7 @@ declare namespace THREE {
         inverse(): Quaternion;
 
         conjugate(): Quaternion;
-        dot(v: Vector3): number;
+        dot(v: Quaternion): number;
         lengthSq(): number;
 
         /**

From 1ba13bf7e8b3758746f4f33643ee5d17a5400551 Mon Sep 17 00:00:00 2001
From: David Li <jiawei.davidli@gmail.com>
Date: Fri, 18 Nov 2016 23:06:07 -0800
Subject: [PATCH 192/245] three: Fix typing for shader uniforms

  The 'uniforms' property on shader parameters is an
  object containing string->{value:any} mappings.

Signed-off-by: David Li <jiawei.davidli@gmail.com>
---
 three/index.d.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/three/index.d.ts b/three/index.d.ts
index 3fa2c60b12..9e1cccd0b7 100644
--- a/three/index.d.ts
+++ b/three/index.d.ts
@@ -2737,7 +2737,7 @@ declare namespace THREE {
         constructor(parameters?: ShaderMaterialParameters);
 
         defines: any;
-        uniforms: any; // type should be  { [uniform: string]: { value: any }; };    but gives "Index signature is missing in type" error during compilation
+        uniforms: { [uniform: string]: IUniform };
         vertexShader: string;
         fragmentShader: string;
         linewidth: number;
@@ -5115,7 +5115,7 @@ declare namespace THREE {
     };
 
     export interface Shader {
-        uniforms: IUniform;
+        uniforms: { [uniform: string]: IUniform };
         vertexShader: string;
         fragmentShader: string;
     }

From 915c0ea1e75b74eb0c837b409cf3b6725f954c3f Mon Sep 17 00:00:00 2001
From: Tanguy Krotoff <tkrotoff@gmail.com>
Date: Sat, 19 Nov 2016 16:44:02 +0100
Subject: [PATCH 193/245] Fix indentation

---
 react-dom/index.d.ts |  2 +-
 react/index.d.ts     | 64 ++++++++++++++++++++++----------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/react-dom/index.d.ts b/react-dom/index.d.ts
index e242d65a90..0878cc0256 100644
--- a/react-dom/index.d.ts
+++ b/react-dom/index.d.ts
@@ -7,7 +7,7 @@ export as namespace ReactDOM;
 export = ReactDOM;
 
 import { ReactInstance, Component, ComponentState,
-        ReactElement, SFCElement, CElement,
+         ReactElement, SFCElement, CElement,
          DOMAttributes, DOMElement } from 'react';
 
 declare namespace ReactDOM {
diff --git a/react/index.d.ts b/react/index.d.ts
index fa960ad671..1929a7853c 100644
--- a/react/index.d.ts
+++ b/react/index.d.ts
@@ -2563,41 +2563,41 @@ declare global {
             circle: React.SVGProps;
             clipPath: React.SVGProps;
             defs: React.SVGProps;
-        desc: React.SVGProps;
+            desc: React.SVGProps;
             ellipse: React.SVGProps;
-        feBlend: React.SVGProps;
-        feColorMatrix: React.SVGProps;
-        feComponentTransfer: React.SVGProps;
-        feComposite: React.SVGProps;
-        feConvolveMatrix: React.SVGProps;
-        feDiffuseLighting: React.SVGProps;
-        feDisplacementMap: React.SVGProps;
-        feDistantLight: React.SVGProps;
-        feFlood: React.SVGProps;
-        feFuncA: React.SVGProps;
-        feFuncB: React.SVGProps;
-        feFuncG: React.SVGProps;
-        feFuncR: React.SVGProps;
-        feGaussianBlur: React.SVGProps;
-        feImage: React.SVGProps;
-        feMerge: React.SVGProps;
-        feMergeNode: React.SVGProps;
-        feMorphology: React.SVGProps;
-        feOffset: React.SVGProps;
-        fePointLight: React.SVGProps;
-        feSpecularLighting: React.SVGProps;
-        feSpotLight: React.SVGProps;
-        feTile: React.SVGProps;
-        feTurbulence: React.SVGProps;
-        filter: React.SVGProps;
-        foreignObject: React.SVGProps;
+            feBlend: React.SVGProps;
+            feColorMatrix: React.SVGProps;
+            feComponentTransfer: React.SVGProps;
+            feComposite: React.SVGProps;
+            feConvolveMatrix: React.SVGProps;
+            feDiffuseLighting: React.SVGProps;
+            feDisplacementMap: React.SVGProps;
+            feDistantLight: React.SVGProps;
+            feFlood: React.SVGProps;
+            feFuncA: React.SVGProps;
+            feFuncB: React.SVGProps;
+            feFuncG: React.SVGProps;
+            feFuncR: React.SVGProps;
+            feGaussianBlur: React.SVGProps;
+            feImage: React.SVGProps;
+            feMerge: React.SVGProps;
+            feMergeNode: React.SVGProps;
+            feMorphology: React.SVGProps;
+            feOffset: React.SVGProps;
+            fePointLight: React.SVGProps;
+            feSpecularLighting: React.SVGProps;
+            feSpotLight: React.SVGProps;
+            feTile: React.SVGProps;
+            feTurbulence: React.SVGProps;
+            filter: React.SVGProps;
+            foreignObject: React.SVGProps;
             g: React.SVGProps;
             image: React.SVGProps;
             line: React.SVGProps;
             linearGradient: React.SVGProps;
-        marker: React.SVGProps;
+            marker: React.SVGProps;
             mask: React.SVGProps;
-        metadata: React.SVGProps;
+            metadata: React.SVGProps;
             path: React.SVGProps;
             pattern: React.SVGProps;
             polygon: React.SVGProps;
@@ -2605,13 +2605,13 @@ declare global {
             radialGradient: React.SVGProps;
             rect: React.SVGProps;
             stop: React.SVGProps;
-        switch: React.SVGProps;
+            switch: React.SVGProps;
             symbol: React.SVGProps;
             text: React.SVGProps;
-        textPath: React.SVGProps;
+            textPath: React.SVGProps;
             tspan: React.SVGProps;
             use: React.SVGProps;
-        view: React.SVGProps;
+            view: React.SVGProps;
         }
     }
 }

From 0da5208e59b7d55aae3e564a4203e1b1a0578023 Mon Sep 17 00:00:00 2001
From: CaselIT <cfederico87@gmail.com>
Date: Sat, 19 Nov 2016 18:33:06 +0100
Subject: [PATCH 194/245] Added GridFS

---
 mongodb/index.d.ts | 119 +++++++++++++++++++++++++++++++--------------
 1 file changed, 83 insertions(+), 36 deletions(-)

diff --git a/mongodb/index.d.ts b/mongodb/index.d.ts
index 49f092a0f1..28a56d23b2 100644
--- a/mongodb/index.d.ts
+++ b/mongodb/index.d.ts
@@ -8,6 +8,7 @@
 /// <reference types="node" />
 
 import {EventEmitter} from 'events';
+import { Readable, Writable } from "stream";
 
 // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
 export class MongoClient {
@@ -1112,26 +1113,11 @@ export interface WriteOpResult {
     result: any;
 }
 
-//http://mongodb.github.io/node-mongodb-native/2.1/api/external-Readable.html
-export interface Readable {
-    pause(): void;
-    pipe(destination: Writable, options?: Object): void;
-    read(size: number): string | Buffer | void;
-    resume(): void;
-    setEncoding(encoding: string): void;
-    unpipe(destination?: Writable): void;
-    unshift(stream: Buffer | string): void;
-    wrap(stream: Stream): void;
-}
-
-export interface Writable { }
-export interface Stream { }
-
 //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#~resultCallback
 export type CursorResult = any | void | boolean;
 
 //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html
-export interface Cursor extends Readable, NodeJS.EventEmitter {
+export interface Cursor extends Readable {
 
     sortValue: string;
     timeout: boolean;
@@ -1184,16 +1170,12 @@ export interface Cursor extends Readable, NodeJS.EventEmitter {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
     next(): Promise<CursorResult>;
     next(callback: MongoCallback<CursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#pause
-    pause(): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#pipe
     pipe(destination: Writable, options?: Object): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#project
     project(value: Object): Cursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#read
     read(size: number): string | Buffer | void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#resume
-    resume(): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#next
     returnKey(returnKey: Object): Cursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#rewind
@@ -1221,8 +1203,6 @@ export interface Cursor extends Readable, NodeJS.EventEmitter {
     unpipe(destination?: Writable): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#unshift
     unshift(stream: Buffer | string): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#wrap
-    wrap(stream: Stream): void;
 }
 
 //http://mongodb.github.io/node-mongodb-native/2.1/api/Cursor.html#count
@@ -1248,7 +1228,7 @@ export interface EndCallback {
 export type AggregationCursorResult = any | void;
 
 //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html
-export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
+export interface AggregationCursor extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#batchSize
     batchSize(value: number): AggregationCursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#clone
@@ -1278,8 +1258,6 @@ export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
     next(callback: MongoCallback<AggregationCursorResult>): void;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#out
     out(destination: string): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#pause
-    pause(): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#pipe
     pipe(destination: Writable, options?: Object): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#project
@@ -1288,8 +1266,6 @@ export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
     read(size: number): string | Buffer | void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#redact
     redact(document: Object): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#resume
-    resume(): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#rewind
     rewind(): AggregationCursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#setEncoding
@@ -1307,12 +1283,10 @@ export interface AggregationCursor extends Readable, NodeJS.EventEmitter {
     unshift(stream: Buffer | string): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#unwind
     unwind(field: string): AggregationCursor;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/AggregationCursor.html#wrap
-    wrap(stream: Stream): void;
 }
 
 //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html
-export interface CommandCursor extends Readable, NodeJS.EventEmitter {
+export interface CommandCursor extends Readable {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#batchSize
     batchSize(value: number): CommandCursor;
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#clone
@@ -1329,14 +1303,10 @@ export interface CommandCursor extends Readable, NodeJS.EventEmitter {
     // http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#next
     next(): Promise<AggregationCursorResult>;
     next(callback: MongoCallback<AggregationCursorResult>): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#pause
-    pause(): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#pipe
     pipe(destination: Writable, options?: Object): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#read
     read(size: number): string | Buffer | void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#resume
-    resume(): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#rewind
     rewind(): CommandCursor;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#setEncoding
@@ -1350,6 +1320,83 @@ export interface CommandCursor extends Readable, NodeJS.EventEmitter {
     unpipe(destination?: Writable): void;
     //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#unshift
     unshift(stream: Buffer | string): void;
-    //http://mongodb.github.io/node-mongodb-native/2.1/api/CommandCursor.html#wrap
-    wrap(stream: Stream): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html
+export class GridFSBucket {
+    constructor(db: Db, options?: GridFSBucketOptions);
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#delete
+    delete(id: ObjectID, callback?: GridFSBucketErrorCallback): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#drop
+    drop(callback?: GridFSBucketErrorCallback): void;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#find
+    find(filter?: Object, options?: GridFSBucketFindOptions): Cursor;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openDownloadStream
+    openDownloadStream(id: ObjectID, options?: { start: number, end: number }): GridFSBucketReadStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openDownloadStreamByName
+    openDownloadStreamByName(filename: string, options?: { revision: number, start: number, end: number }): GridFSBucketReadStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStream
+    openUploadStream(filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStreamWithId
+    openUploadStreamWithId(id: string | number | Object, filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
+    // http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#rename
+    rename(id: ObjectID, filename: string, callback?: GridFSBucketErrorCallback): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html
+export interface GridFSBucketOptions {
+    bucketName?: string;
+    chunkSizeBytes?: number;
+    writeConcern?: Object;
+    ReadPreference?: Object;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#~errorCallback
+export interface GridFSBucketErrorCallback {
+    (err?: MongoError): void;
+}
+
+// http://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#find
+export interface GridFSBucketFindOptions {
+    batchSize?: number;
+    limit?: number;
+    maxTimeMS?: number;
+    noCursorTimeout?: boolean;
+    skip?: number;
+    sort?: Object;
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucket.html#openUploadStream
+export interface GridFSBucketOpenUploadStreamOptions {
+    chunkSizeBytes?: number,
+    metadata?: Object,
+    contentType?: string,
+    aliases?: Array<string>
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
+export class GridFSBucketReadStream extends Readable {
+    constructor(chunks: Collection, files: Collection, readPreference: Object, filter: Object, options?: GridFSBucketReadStreamOptions);
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketReadStream.html
+export interface GridFSBucketReadStreamOptions {
+    sort?: number,
+    skip?: number,
+    start?: number,
+    end?: number
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketWriteStream.html
+export class GridFSBucketWriteStream extends Writable{
+    constructor(bucket: GridFSBucket, filename:string, options?: GridFSBucketWriteStreamOptions);
+}
+
+// https://mongodb.github.io/node-mongodb-native/2.1/api/GridFSBucketWriteStream.html
+export interface GridFSBucketWriteStreamOptions {
+    id?: string | number | Object,
+    chunkSizeBytes?: number,
+    w?: number,
+    wtimeout?: number,
+    j?: number
 }

From 5d982043fdb3d2ae1e11cbc281c4c682dbd7db66 Mon Sep 17 00:00:00 2001
From: Stephen Lautier <stephen.lautier@outlook.com>
Date: Sat, 19 Nov 2016 18:54:46 +0100
Subject: [PATCH 195/245] added types for lodash-es

---
 lodash-es/add/index.d.ts               |   3 +
 lodash-es/after/index.d.ts             |   3 +
 lodash-es/ary/index.d.ts               |   3 +
 lodash-es/assign/index.d.ts            |   3 +
 lodash-es/assignIn/index.d.ts          |   3 +
 lodash-es/assignInWith/index.d.ts      |   3 +
 lodash-es/assignWith/index.d.ts        |   3 +
 lodash-es/at/index.d.ts                |   3 +
 lodash-es/attempt/index.d.ts           |   3 +
 lodash-es/before/index.d.ts            |   3 +
 lodash-es/bind/index.d.ts              |   3 +
 lodash-es/bindAll/index.d.ts           |   3 +
 lodash-es/bindKey/index.d.ts           |   3 +
 lodash-es/camelCase/index.d.ts         |   3 +
 lodash-es/capitalize/index.d.ts        |   3 +
 lodash-es/castArray/index.d.ts         |   3 +
 lodash-es/ceil/index.d.ts              |   3 +
 lodash-es/chain/index.d.ts             |   3 +
 lodash-es/chunk/index.d.ts             |   3 +
 lodash-es/clamp/index.d.ts             |   3 +
 lodash-es/clone/index.d.ts             |   3 +
 lodash-es/cloneDeep/index.d.ts         |   3 +
 lodash-es/cloneDeepWith/index.d.ts     |   3 +
 lodash-es/cloneWith/index.d.ts         |   3 +
 lodash-es/compact/index.d.ts           |   3 +
 lodash-es/concat/index.d.ts            |   3 +
 lodash-es/constant/index.d.ts          |   3 +
 lodash-es/countBy/index.d.ts           |   3 +
 lodash-es/create/index.d.ts            |   3 +
 lodash-es/curry/index.d.ts             |   3 +
 lodash-es/curryRight/index.d.ts        |   3 +
 lodash-es/debounce/index.d.ts          |   3 +
 lodash-es/deburr/index.d.ts            |   3 +
 lodash-es/defaults/index.d.ts          |   3 +
 lodash-es/defaultsDeep/index.d.ts      |   3 +
 lodash-es/defer/index.d.ts             |   3 +
 lodash-es/delay/index.d.ts             |   3 +
 lodash-es/difference/index.d.ts        |   3 +
 lodash-es/differenceBy/index.d.ts      |   3 +
 lodash-es/differenceWith/index.d.ts    |   3 +
 lodash-es/drop/index.d.ts              |   3 +
 lodash-es/dropRight/index.d.ts         |   3 +
 lodash-es/dropRightWhile/index.d.ts    |   3 +
 lodash-es/dropWhile/index.d.ts         |   3 +
 lodash-es/each/index.d.ts              |   3 +
 lodash-es/eachRight/index.d.ts         |   3 +
 lodash-es/endsWith/index.d.ts          |   3 +
 lodash-es/eq/index.d.ts                |   3 +
 lodash-es/escape/index.d.ts            |   3 +
 lodash-es/escapeRegExp/index.d.ts      |   3 +
 lodash-es/every/index.d.ts             |   3 +
 lodash-es/extend/index.d.ts            |   3 +
 lodash-es/extendWith/index.d.ts        |   3 +
 lodash-es/fb/index.d.ts                |   2 +
 lodash-es/fill/index.d.ts              |   3 +
 lodash-es/filter/index.d.ts            |   3 +
 lodash-es/find/index.d.ts              |   3 +
 lodash-es/findIndex/index.d.ts         |   3 +
 lodash-es/findKey/index.d.ts           |   3 +
 lodash-es/findLast/index.d.ts          |   3 +
 lodash-es/findLastIndex/index.d.ts     |   3 +
 lodash-es/findLastKey/index.d.ts       |   3 +
 lodash-es/first/index.d.ts             |   3 +
 lodash-es/flatMap/index.d.ts           |   3 +
 lodash-es/flatten/index.d.ts           |   3 +
 lodash-es/flattenDeep/index.d.ts       |   3 +
 lodash-es/flattenDepth/index.d.ts      |   3 +
 lodash-es/flip/index.d.ts              |   3 +
 lodash-es/floor/index.d.ts             |   3 +
 lodash-es/flow/index.d.ts              |   3 +
 lodash-es/flowRight/index.d.ts         |   3 +
 lodash-es/forEach/index.d.ts           |   3 +
 lodash-es/forEachRight/index.d.ts      |   3 +
 lodash-es/forIn/index.d.ts             |   3 +
 lodash-es/forInRight/index.d.ts        |   3 +
 lodash-es/forOwn/index.d.ts            |   3 +
 lodash-es/forOwnRight/index.d.ts       |   3 +
 lodash-es/fromPairs/index.d.ts         |   3 +
 lodash-es/functions/index.d.ts         |   3 +
 lodash-es/functionsIn/index.d.ts       |   3 +
 lodash-es/get/index.d.ts               |   3 +
 lodash-es/groupBy/index.d.ts           |   3 +
 lodash-es/gt/index.d.ts                |   3 +
 lodash-es/gte/index.d.ts               |   3 +
 lodash-es/has/index.d.ts               |   3 +
 lodash-es/hasIn/index.d.ts             |   3 +
 lodash-es/head/index.d.ts              |   3 +
 lodash-es/identity/index.d.ts          |   3 +
 lodash-es/inRange/index.d.ts           |   3 +
 lodash-es/includes/index.d.ts          |   3 +
 lodash-es/index.d.ts                   |   4 +
 lodash-es/indexOf/index.d.ts           |   3 +
 lodash-es/initial/index.d.ts           |   3 +
 lodash-es/intersection/index.d.ts      |   3 +
 lodash-es/intersectionBy/index.d.ts    |   3 +
 lodash-es/intersectionWith/index.d.ts  |   3 +
 lodash-es/invert/index.d.ts            |   3 +
 lodash-es/invertBy/index.d.ts          |   3 +
 lodash-es/invoke/index.d.ts            |   3 +
 lodash-es/invokeMap/index.d.ts         |   3 +
 lodash-es/isArguments/index.d.ts       |   3 +
 lodash-es/isArray/index.d.ts           |   3 +
 lodash-es/isArrayBuffer/index.d.ts     |   3 +
 lodash-es/isArrayLike/index.d.ts       |   3 +
 lodash-es/isArrayLikeObject/index.d.ts |   3 +
 lodash-es/isBoolean/index.d.ts         |   3 +
 lodash-es/isBuffer/index.d.ts          |   3 +
 lodash-es/isDate/index.d.ts            |   3 +
 lodash-es/isElement/index.d.ts         |   3 +
 lodash-es/isEmpty/index.d.ts           |   3 +
 lodash-es/isEqual/index.d.ts           |   3 +
 lodash-es/isEqualWith/index.d.ts       |   3 +
 lodash-es/isError/index.d.ts           |   3 +
 lodash-es/isFinite/index.d.ts          |   3 +
 lodash-es/isFunction/index.d.ts        |   3 +
 lodash-es/isInteger/index.d.ts         |   3 +
 lodash-es/isLength/index.d.ts          |   3 +
 lodash-es/isMap/index.d.ts             |   3 +
 lodash-es/isMatch/index.d.ts           |   3 +
 lodash-es/isMatchWith/index.d.ts       |   3 +
 lodash-es/isNaN/index.d.ts             |   3 +
 lodash-es/isNative/index.d.ts          |   3 +
 lodash-es/isNil/index.d.ts             |   3 +
 lodash-es/isNull/index.d.ts            |   3 +
 lodash-es/isNumber/index.d.ts          |   3 +
 lodash-es/isObject/index.d.ts          |   3 +
 lodash-es/isObjectLike/index.d.ts      |   3 +
 lodash-es/isPlainObject/index.d.ts     |   3 +
 lodash-es/isRegExp/index.d.ts          |   3 +
 lodash-es/isSafeInteger/index.d.ts     |   3 +
 lodash-es/isSet/index.d.ts             |   3 +
 lodash-es/isString/index.d.ts          |   3 +
 lodash-es/isSymbol/index.d.ts          |   3 +
 lodash-es/isTypedArray/index.d.ts      |   3 +
 lodash-es/isUndefined/index.d.ts       |   3 +
 lodash-es/isWeakMap/index.d.ts         |   3 +
 lodash-es/isWeakSet/index.d.ts         |   3 +
 lodash-es/iteratee/index.d.ts          |   3 +
 lodash-es/join/index.d.ts              |   3 +
 lodash-es/kebabCase/index.d.ts         |   3 +
 lodash-es/keyBy/index.d.ts             |   3 +
 lodash-es/keys/index.d.ts              |   3 +
 lodash-es/keysIn/index.d.ts            |   3 +
 lodash-es/last/index.d.ts              |   3 +
 lodash-es/lastIndexOf/index.d.ts       |   3 +
 lodash-es/lodash-es-tests.ts           |   3 +
 lodash-es/lowerCase/index.d.ts         |   3 +
 lodash-es/lowerFirst/index.d.ts        |   3 +
 lodash-es/lt/index.d.ts                |   3 +
 lodash-es/lte/index.d.ts               |   3 +
 lodash-es/map/index.d.ts               |   3 +
 lodash-es/mapKeys/index.d.ts           |   3 +
 lodash-es/mapValues/index.d.ts         |   3 +
 lodash-es/matches/index.d.ts           |   3 +
 lodash-es/matchesProperty/index.d.ts   |   3 +
 lodash-es/max/index.d.ts               |   3 +
 lodash-es/maxBy/index.d.ts             |   3 +
 lodash-es/mean/index.d.ts              |   3 +
 lodash-es/meanBy/index.d.ts            |   3 +
 lodash-es/memoize/index.d.ts           |   3 +
 lodash-es/merge/index.d.ts             |   3 +
 lodash-es/mergeWith/index.d.ts         |   3 +
 lodash-es/method/index.d.ts            |   3 +
 lodash-es/methodOf/index.d.ts          |   3 +
 lodash-es/min/index.d.ts               |   3 +
 lodash-es/minBy/index.d.ts             |   3 +
 lodash-es/mixin/index.d.ts             |   3 +
 lodash-es/negate/index.d.ts            |   3 +
 lodash-es/noConflict/index.d.ts        |   3 +
 lodash-es/noop/index.d.ts              |   3 +
 lodash-es/now/index.d.ts               |   3 +
 lodash-es/nthArg/index.d.ts            |   3 +
 lodash-es/omit/index.d.ts              |   3 +
 lodash-es/omitBy/index.d.ts            |   3 +
 lodash-es/once/index.d.ts              |   3 +
 lodash-es/orderBy/index.d.ts           |   3 +
 lodash-es/over/index.d.ts              |   3 +
 lodash-es/overArgs/index.d.ts          |   3 +
 lodash-es/overEvery/index.d.ts         |   3 +
 lodash-es/overSome/index.d.ts          |   3 +
 lodash-es/package.json                 |   5 +
 lodash-es/pad/index.d.ts               |   3 +
 lodash-es/padEnd/index.d.ts            |   3 +
 lodash-es/padStart/index.d.ts          |   3 +
 lodash-es/parseInt/index.d.ts          |   3 +
 lodash-es/partial/index.d.ts           |   3 +
 lodash-es/partialRight/index.d.ts      |   3 +
 lodash-es/partition/index.d.ts         |   3 +
 lodash-es/pick/index.d.ts              |   3 +
 lodash-es/pickBy/index.d.ts            |   3 +
 lodash-es/property/index.d.ts          |   3 +
 lodash-es/propertyOf/index.d.ts        |   3 +
 lodash-es/pull/index.d.ts              |   3 +
 lodash-es/pullAll/index.d.ts           |   3 +
 lodash-es/pullAllBy/index.d.ts         |   3 +
 lodash-es/pullAt/index.d.ts            |   3 +
 lodash-es/random/index.d.ts            |   3 +
 lodash-es/range/index.d.ts             |   3 +
 lodash-es/rangeRight/index.d.ts        |   3 +
 lodash-es/rearg/index.d.ts             |   3 +
 lodash-es/reduce/index.d.ts            |   3 +
 lodash-es/reduceRight/index.d.ts       |   3 +
 lodash-es/reject/index.d.ts            |   3 +
 lodash-es/remove/index.d.ts            |   3 +
 lodash-es/repeat/index.d.ts            |   3 +
 lodash-es/replace/index.d.ts           |   3 +
 lodash-es/rest/index.d.ts              |   3 +
 lodash-es/result/index.d.ts            |   3 +
 lodash-es/reverse/index.d.ts           |   3 +
 lodash-es/round/index.d.ts             |   3 +
 lodash-es/runInContext/index.d.ts      |   3 +
 lodash-es/sample/index.d.ts            |   3 +
 lodash-es/sampleSize/index.d.ts        |   3 +
 lodash-es/set/index.d.ts               |   3 +
 lodash-es/setWith/index.d.ts           |   3 +
 lodash-es/shuffle/index.d.ts           |   3 +
 lodash-es/size/index.d.ts              |   3 +
 lodash-es/slice/index.d.ts             |   3 +
 lodash-es/snakeCase/index.d.ts         |   3 +
 lodash-es/some/index.d.ts              |   3 +
 lodash-es/sortBy/index.d.ts            |   3 +
 lodash-es/sortedIndex/index.d.ts       |   3 +
 lodash-es/sortedIndexBy/index.d.ts     |   3 +
 lodash-es/sortedIndexOf/index.d.ts     |   3 +
 lodash-es/sortedLastIndex/index.d.ts   |   3 +
 lodash-es/sortedLastIndexBy/index.d.ts |   3 +
 lodash-es/sortedLastIndexOf/index.d.ts |   3 +
 lodash-es/sortedUniq/index.d.ts        |   3 +
 lodash-es/sortedUniqBy/index.d.ts      |   3 +
 lodash-es/split/index.d.ts             |   3 +
 lodash-es/spread/index.d.ts            |   3 +
 lodash-es/startCase/index.d.ts         |   3 +
 lodash-es/startsWith/index.d.ts        |   3 +
 lodash-es/subtract/index.d.ts          |   3 +
 lodash-es/sum/index.d.ts               |   3 +
 lodash-es/sumBy/index.d.ts             |   3 +
 lodash-es/tail/index.d.ts              |   3 +
 lodash-es/take/index.d.ts              |   3 +
 lodash-es/takeRight/index.d.ts         |   3 +
 lodash-es/takeRightWhile/index.d.ts    |   3 +
 lodash-es/takeWhile/index.d.ts         |   3 +
 lodash-es/tap/index.d.ts               |   3 +
 lodash-es/template/index.d.ts          |   3 +
 lodash-es/throttle/index.d.ts          |   3 +
 lodash-es/thru/index.d.ts              |   3 +
 lodash-es/times/index.d.ts             |   3 +
 lodash-es/toArray/index.d.ts           |   3 +
 lodash-es/toInteger/index.d.ts         |   3 +
 lodash-es/toLength/index.d.ts          |   3 +
 lodash-es/toLower/index.d.ts           |   3 +
 lodash-es/toNumber/index.d.ts          |   3 +
 lodash-es/toPairs/index.d.ts           |   3 +
 lodash-es/toPairsIn/index.d.ts         |   3 +
 lodash-es/toPath/index.d.ts            |   3 +
 lodash-es/toPlainObject/index.d.ts     |   3 +
 lodash-es/toSafeInteger/index.d.ts     |   3 +
 lodash-es/toString/index.d.ts          |   3 +
 lodash-es/toUpper/index.d.ts           |   3 +
 lodash-es/transform/index.d.ts         |   3 +
 lodash-es/trim/index.d.ts              |   3 +
 lodash-es/trimEnd/index.d.ts           |   3 +
 lodash-es/trimStart/index.d.ts         |   3 +
 lodash-es/truncate/index.d.ts          |   3 +
 lodash-es/tsconfig.json                | 304 +++++++++++++++++++++++++
 lodash-es/tslint.json                  |   1 +
 lodash-es/unary/index.d.ts             |   3 +
 lodash-es/unescape/index.d.ts          |   3 +
 lodash-es/union/index.d.ts             |   3 +
 lodash-es/unionBy/index.d.ts           |   3 +
 lodash-es/unionWith/index.d.ts         |   3 +
 lodash-es/uniq/index.d.ts              |   3 +
 lodash-es/uniqBy/index.d.ts            |   3 +
 lodash-es/uniqWith/index.d.ts          |   3 +
 lodash-es/uniqueId/index.d.ts          |   3 +
 lodash-es/unset/index.d.ts             |   3 +
 lodash-es/unzip/index.d.ts             |   3 +
 lodash-es/unzipWith/index.d.ts         |   3 +
 lodash-es/update/index.d.ts            |   3 +
 lodash-es/upperCase/index.d.ts         |   3 +
 lodash-es/upperFirst/index.d.ts        |   3 +
 lodash-es/values/index.d.ts            |   3 +
 lodash-es/valuesIn/index.d.ts          |   3 +
 lodash-es/without/index.d.ts           |   3 +
 lodash-es/words/index.d.ts             |   3 +
 lodash-es/wrap/index.d.ts              |   3 +
 lodash-es/xor/index.d.ts               |   3 +
 lodash-es/xorBy/index.d.ts             |   3 +
 lodash-es/xorWith/index.d.ts           |   3 +
 lodash-es/zip/index.d.ts               |   3 +
 lodash-es/zipObject/index.d.ts         |   3 +
 lodash-es/zipWith/index.d.ts           |   3 +
 291 files changed, 1174 insertions(+)
 create mode 100644 lodash-es/add/index.d.ts
 create mode 100644 lodash-es/after/index.d.ts
 create mode 100644 lodash-es/ary/index.d.ts
 create mode 100644 lodash-es/assign/index.d.ts
 create mode 100644 lodash-es/assignIn/index.d.ts
 create mode 100644 lodash-es/assignInWith/index.d.ts
 create mode 100644 lodash-es/assignWith/index.d.ts
 create mode 100644 lodash-es/at/index.d.ts
 create mode 100644 lodash-es/attempt/index.d.ts
 create mode 100644 lodash-es/before/index.d.ts
 create mode 100644 lodash-es/bind/index.d.ts
 create mode 100644 lodash-es/bindAll/index.d.ts
 create mode 100644 lodash-es/bindKey/index.d.ts
 create mode 100644 lodash-es/camelCase/index.d.ts
 create mode 100644 lodash-es/capitalize/index.d.ts
 create mode 100644 lodash-es/castArray/index.d.ts
 create mode 100644 lodash-es/ceil/index.d.ts
 create mode 100644 lodash-es/chain/index.d.ts
 create mode 100644 lodash-es/chunk/index.d.ts
 create mode 100644 lodash-es/clamp/index.d.ts
 create mode 100644 lodash-es/clone/index.d.ts
 create mode 100644 lodash-es/cloneDeep/index.d.ts
 create mode 100644 lodash-es/cloneDeepWith/index.d.ts
 create mode 100644 lodash-es/cloneWith/index.d.ts
 create mode 100644 lodash-es/compact/index.d.ts
 create mode 100644 lodash-es/concat/index.d.ts
 create mode 100644 lodash-es/constant/index.d.ts
 create mode 100644 lodash-es/countBy/index.d.ts
 create mode 100644 lodash-es/create/index.d.ts
 create mode 100644 lodash-es/curry/index.d.ts
 create mode 100644 lodash-es/curryRight/index.d.ts
 create mode 100644 lodash-es/debounce/index.d.ts
 create mode 100644 lodash-es/deburr/index.d.ts
 create mode 100644 lodash-es/defaults/index.d.ts
 create mode 100644 lodash-es/defaultsDeep/index.d.ts
 create mode 100644 lodash-es/defer/index.d.ts
 create mode 100644 lodash-es/delay/index.d.ts
 create mode 100644 lodash-es/difference/index.d.ts
 create mode 100644 lodash-es/differenceBy/index.d.ts
 create mode 100644 lodash-es/differenceWith/index.d.ts
 create mode 100644 lodash-es/drop/index.d.ts
 create mode 100644 lodash-es/dropRight/index.d.ts
 create mode 100644 lodash-es/dropRightWhile/index.d.ts
 create mode 100644 lodash-es/dropWhile/index.d.ts
 create mode 100644 lodash-es/each/index.d.ts
 create mode 100644 lodash-es/eachRight/index.d.ts
 create mode 100644 lodash-es/endsWith/index.d.ts
 create mode 100644 lodash-es/eq/index.d.ts
 create mode 100644 lodash-es/escape/index.d.ts
 create mode 100644 lodash-es/escapeRegExp/index.d.ts
 create mode 100644 lodash-es/every/index.d.ts
 create mode 100644 lodash-es/extend/index.d.ts
 create mode 100644 lodash-es/extendWith/index.d.ts
 create mode 100644 lodash-es/fb/index.d.ts
 create mode 100644 lodash-es/fill/index.d.ts
 create mode 100644 lodash-es/filter/index.d.ts
 create mode 100644 lodash-es/find/index.d.ts
 create mode 100644 lodash-es/findIndex/index.d.ts
 create mode 100644 lodash-es/findKey/index.d.ts
 create mode 100644 lodash-es/findLast/index.d.ts
 create mode 100644 lodash-es/findLastIndex/index.d.ts
 create mode 100644 lodash-es/findLastKey/index.d.ts
 create mode 100644 lodash-es/first/index.d.ts
 create mode 100644 lodash-es/flatMap/index.d.ts
 create mode 100644 lodash-es/flatten/index.d.ts
 create mode 100644 lodash-es/flattenDeep/index.d.ts
 create mode 100644 lodash-es/flattenDepth/index.d.ts
 create mode 100644 lodash-es/flip/index.d.ts
 create mode 100644 lodash-es/floor/index.d.ts
 create mode 100644 lodash-es/flow/index.d.ts
 create mode 100644 lodash-es/flowRight/index.d.ts
 create mode 100644 lodash-es/forEach/index.d.ts
 create mode 100644 lodash-es/forEachRight/index.d.ts
 create mode 100644 lodash-es/forIn/index.d.ts
 create mode 100644 lodash-es/forInRight/index.d.ts
 create mode 100644 lodash-es/forOwn/index.d.ts
 create mode 100644 lodash-es/forOwnRight/index.d.ts
 create mode 100644 lodash-es/fromPairs/index.d.ts
 create mode 100644 lodash-es/functions/index.d.ts
 create mode 100644 lodash-es/functionsIn/index.d.ts
 create mode 100644 lodash-es/get/index.d.ts
 create mode 100644 lodash-es/groupBy/index.d.ts
 create mode 100644 lodash-es/gt/index.d.ts
 create mode 100644 lodash-es/gte/index.d.ts
 create mode 100644 lodash-es/has/index.d.ts
 create mode 100644 lodash-es/hasIn/index.d.ts
 create mode 100644 lodash-es/head/index.d.ts
 create mode 100644 lodash-es/identity/index.d.ts
 create mode 100644 lodash-es/inRange/index.d.ts
 create mode 100644 lodash-es/includes/index.d.ts
 create mode 100644 lodash-es/index.d.ts
 create mode 100644 lodash-es/indexOf/index.d.ts
 create mode 100644 lodash-es/initial/index.d.ts
 create mode 100644 lodash-es/intersection/index.d.ts
 create mode 100644 lodash-es/intersectionBy/index.d.ts
 create mode 100644 lodash-es/intersectionWith/index.d.ts
 create mode 100644 lodash-es/invert/index.d.ts
 create mode 100644 lodash-es/invertBy/index.d.ts
 create mode 100644 lodash-es/invoke/index.d.ts
 create mode 100644 lodash-es/invokeMap/index.d.ts
 create mode 100644 lodash-es/isArguments/index.d.ts
 create mode 100644 lodash-es/isArray/index.d.ts
 create mode 100644 lodash-es/isArrayBuffer/index.d.ts
 create mode 100644 lodash-es/isArrayLike/index.d.ts
 create mode 100644 lodash-es/isArrayLikeObject/index.d.ts
 create mode 100644 lodash-es/isBoolean/index.d.ts
 create mode 100644 lodash-es/isBuffer/index.d.ts
 create mode 100644 lodash-es/isDate/index.d.ts
 create mode 100644 lodash-es/isElement/index.d.ts
 create mode 100644 lodash-es/isEmpty/index.d.ts
 create mode 100644 lodash-es/isEqual/index.d.ts
 create mode 100644 lodash-es/isEqualWith/index.d.ts
 create mode 100644 lodash-es/isError/index.d.ts
 create mode 100644 lodash-es/isFinite/index.d.ts
 create mode 100644 lodash-es/isFunction/index.d.ts
 create mode 100644 lodash-es/isInteger/index.d.ts
 create mode 100644 lodash-es/isLength/index.d.ts
 create mode 100644 lodash-es/isMap/index.d.ts
 create mode 100644 lodash-es/isMatch/index.d.ts
 create mode 100644 lodash-es/isMatchWith/index.d.ts
 create mode 100644 lodash-es/isNaN/index.d.ts
 create mode 100644 lodash-es/isNative/index.d.ts
 create mode 100644 lodash-es/isNil/index.d.ts
 create mode 100644 lodash-es/isNull/index.d.ts
 create mode 100644 lodash-es/isNumber/index.d.ts
 create mode 100644 lodash-es/isObject/index.d.ts
 create mode 100644 lodash-es/isObjectLike/index.d.ts
 create mode 100644 lodash-es/isPlainObject/index.d.ts
 create mode 100644 lodash-es/isRegExp/index.d.ts
 create mode 100644 lodash-es/isSafeInteger/index.d.ts
 create mode 100644 lodash-es/isSet/index.d.ts
 create mode 100644 lodash-es/isString/index.d.ts
 create mode 100644 lodash-es/isSymbol/index.d.ts
 create mode 100644 lodash-es/isTypedArray/index.d.ts
 create mode 100644 lodash-es/isUndefined/index.d.ts
 create mode 100644 lodash-es/isWeakMap/index.d.ts
 create mode 100644 lodash-es/isWeakSet/index.d.ts
 create mode 100644 lodash-es/iteratee/index.d.ts
 create mode 100644 lodash-es/join/index.d.ts
 create mode 100644 lodash-es/kebabCase/index.d.ts
 create mode 100644 lodash-es/keyBy/index.d.ts
 create mode 100644 lodash-es/keys/index.d.ts
 create mode 100644 lodash-es/keysIn/index.d.ts
 create mode 100644 lodash-es/last/index.d.ts
 create mode 100644 lodash-es/lastIndexOf/index.d.ts
 create mode 100644 lodash-es/lodash-es-tests.ts
 create mode 100644 lodash-es/lowerCase/index.d.ts
 create mode 100644 lodash-es/lowerFirst/index.d.ts
 create mode 100644 lodash-es/lt/index.d.ts
 create mode 100644 lodash-es/lte/index.d.ts
 create mode 100644 lodash-es/map/index.d.ts
 create mode 100644 lodash-es/mapKeys/index.d.ts
 create mode 100644 lodash-es/mapValues/index.d.ts
 create mode 100644 lodash-es/matches/index.d.ts
 create mode 100644 lodash-es/matchesProperty/index.d.ts
 create mode 100644 lodash-es/max/index.d.ts
 create mode 100644 lodash-es/maxBy/index.d.ts
 create mode 100644 lodash-es/mean/index.d.ts
 create mode 100644 lodash-es/meanBy/index.d.ts
 create mode 100644 lodash-es/memoize/index.d.ts
 create mode 100644 lodash-es/merge/index.d.ts
 create mode 100644 lodash-es/mergeWith/index.d.ts
 create mode 100644 lodash-es/method/index.d.ts
 create mode 100644 lodash-es/methodOf/index.d.ts
 create mode 100644 lodash-es/min/index.d.ts
 create mode 100644 lodash-es/minBy/index.d.ts
 create mode 100644 lodash-es/mixin/index.d.ts
 create mode 100644 lodash-es/negate/index.d.ts
 create mode 100644 lodash-es/noConflict/index.d.ts
 create mode 100644 lodash-es/noop/index.d.ts
 create mode 100644 lodash-es/now/index.d.ts
 create mode 100644 lodash-es/nthArg/index.d.ts
 create mode 100644 lodash-es/omit/index.d.ts
 create mode 100644 lodash-es/omitBy/index.d.ts
 create mode 100644 lodash-es/once/index.d.ts
 create mode 100644 lodash-es/orderBy/index.d.ts
 create mode 100644 lodash-es/over/index.d.ts
 create mode 100644 lodash-es/overArgs/index.d.ts
 create mode 100644 lodash-es/overEvery/index.d.ts
 create mode 100644 lodash-es/overSome/index.d.ts
 create mode 100644 lodash-es/package.json
 create mode 100644 lodash-es/pad/index.d.ts
 create mode 100644 lodash-es/padEnd/index.d.ts
 create mode 100644 lodash-es/padStart/index.d.ts
 create mode 100644 lodash-es/parseInt/index.d.ts
 create mode 100644 lodash-es/partial/index.d.ts
 create mode 100644 lodash-es/partialRight/index.d.ts
 create mode 100644 lodash-es/partition/index.d.ts
 create mode 100644 lodash-es/pick/index.d.ts
 create mode 100644 lodash-es/pickBy/index.d.ts
 create mode 100644 lodash-es/property/index.d.ts
 create mode 100644 lodash-es/propertyOf/index.d.ts
 create mode 100644 lodash-es/pull/index.d.ts
 create mode 100644 lodash-es/pullAll/index.d.ts
 create mode 100644 lodash-es/pullAllBy/index.d.ts
 create mode 100644 lodash-es/pullAt/index.d.ts
 create mode 100644 lodash-es/random/index.d.ts
 create mode 100644 lodash-es/range/index.d.ts
 create mode 100644 lodash-es/rangeRight/index.d.ts
 create mode 100644 lodash-es/rearg/index.d.ts
 create mode 100644 lodash-es/reduce/index.d.ts
 create mode 100644 lodash-es/reduceRight/index.d.ts
 create mode 100644 lodash-es/reject/index.d.ts
 create mode 100644 lodash-es/remove/index.d.ts
 create mode 100644 lodash-es/repeat/index.d.ts
 create mode 100644 lodash-es/replace/index.d.ts
 create mode 100644 lodash-es/rest/index.d.ts
 create mode 100644 lodash-es/result/index.d.ts
 create mode 100644 lodash-es/reverse/index.d.ts
 create mode 100644 lodash-es/round/index.d.ts
 create mode 100644 lodash-es/runInContext/index.d.ts
 create mode 100644 lodash-es/sample/index.d.ts
 create mode 100644 lodash-es/sampleSize/index.d.ts
 create mode 100644 lodash-es/set/index.d.ts
 create mode 100644 lodash-es/setWith/index.d.ts
 create mode 100644 lodash-es/shuffle/index.d.ts
 create mode 100644 lodash-es/size/index.d.ts
 create mode 100644 lodash-es/slice/index.d.ts
 create mode 100644 lodash-es/snakeCase/index.d.ts
 create mode 100644 lodash-es/some/index.d.ts
 create mode 100644 lodash-es/sortBy/index.d.ts
 create mode 100644 lodash-es/sortedIndex/index.d.ts
 create mode 100644 lodash-es/sortedIndexBy/index.d.ts
 create mode 100644 lodash-es/sortedIndexOf/index.d.ts
 create mode 100644 lodash-es/sortedLastIndex/index.d.ts
 create mode 100644 lodash-es/sortedLastIndexBy/index.d.ts
 create mode 100644 lodash-es/sortedLastIndexOf/index.d.ts
 create mode 100644 lodash-es/sortedUniq/index.d.ts
 create mode 100644 lodash-es/sortedUniqBy/index.d.ts
 create mode 100644 lodash-es/split/index.d.ts
 create mode 100644 lodash-es/spread/index.d.ts
 create mode 100644 lodash-es/startCase/index.d.ts
 create mode 100644 lodash-es/startsWith/index.d.ts
 create mode 100644 lodash-es/subtract/index.d.ts
 create mode 100644 lodash-es/sum/index.d.ts
 create mode 100644 lodash-es/sumBy/index.d.ts
 create mode 100644 lodash-es/tail/index.d.ts
 create mode 100644 lodash-es/take/index.d.ts
 create mode 100644 lodash-es/takeRight/index.d.ts
 create mode 100644 lodash-es/takeRightWhile/index.d.ts
 create mode 100644 lodash-es/takeWhile/index.d.ts
 create mode 100644 lodash-es/tap/index.d.ts
 create mode 100644 lodash-es/template/index.d.ts
 create mode 100644 lodash-es/throttle/index.d.ts
 create mode 100644 lodash-es/thru/index.d.ts
 create mode 100644 lodash-es/times/index.d.ts
 create mode 100644 lodash-es/toArray/index.d.ts
 create mode 100644 lodash-es/toInteger/index.d.ts
 create mode 100644 lodash-es/toLength/index.d.ts
 create mode 100644 lodash-es/toLower/index.d.ts
 create mode 100644 lodash-es/toNumber/index.d.ts
 create mode 100644 lodash-es/toPairs/index.d.ts
 create mode 100644 lodash-es/toPairsIn/index.d.ts
 create mode 100644 lodash-es/toPath/index.d.ts
 create mode 100644 lodash-es/toPlainObject/index.d.ts
 create mode 100644 lodash-es/toSafeInteger/index.d.ts
 create mode 100644 lodash-es/toString/index.d.ts
 create mode 100644 lodash-es/toUpper/index.d.ts
 create mode 100644 lodash-es/transform/index.d.ts
 create mode 100644 lodash-es/trim/index.d.ts
 create mode 100644 lodash-es/trimEnd/index.d.ts
 create mode 100644 lodash-es/trimStart/index.d.ts
 create mode 100644 lodash-es/truncate/index.d.ts
 create mode 100644 lodash-es/tsconfig.json
 create mode 100644 lodash-es/tslint.json
 create mode 100644 lodash-es/unary/index.d.ts
 create mode 100644 lodash-es/unescape/index.d.ts
 create mode 100644 lodash-es/union/index.d.ts
 create mode 100644 lodash-es/unionBy/index.d.ts
 create mode 100644 lodash-es/unionWith/index.d.ts
 create mode 100644 lodash-es/uniq/index.d.ts
 create mode 100644 lodash-es/uniqBy/index.d.ts
 create mode 100644 lodash-es/uniqWith/index.d.ts
 create mode 100644 lodash-es/uniqueId/index.d.ts
 create mode 100644 lodash-es/unset/index.d.ts
 create mode 100644 lodash-es/unzip/index.d.ts
 create mode 100644 lodash-es/unzipWith/index.d.ts
 create mode 100644 lodash-es/update/index.d.ts
 create mode 100644 lodash-es/upperCase/index.d.ts
 create mode 100644 lodash-es/upperFirst/index.d.ts
 create mode 100644 lodash-es/values/index.d.ts
 create mode 100644 lodash-es/valuesIn/index.d.ts
 create mode 100644 lodash-es/without/index.d.ts
 create mode 100644 lodash-es/words/index.d.ts
 create mode 100644 lodash-es/wrap/index.d.ts
 create mode 100644 lodash-es/xor/index.d.ts
 create mode 100644 lodash-es/xorBy/index.d.ts
 create mode 100644 lodash-es/xorWith/index.d.ts
 create mode 100644 lodash-es/zip/index.d.ts
 create mode 100644 lodash-es/zipObject/index.d.ts
 create mode 100644 lodash-es/zipWith/index.d.ts

diff --git a/lodash-es/add/index.d.ts b/lodash-es/add/index.d.ts
new file mode 100644
index 0000000000..a63439b906
--- /dev/null
+++ b/lodash-es/add/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const add: typeof _.add;
+export default add;
diff --git a/lodash-es/after/index.d.ts b/lodash-es/after/index.d.ts
new file mode 100644
index 0000000000..39a19b4f11
--- /dev/null
+++ b/lodash-es/after/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const after: typeof _.after;
+export default after;
diff --git a/lodash-es/ary/index.d.ts b/lodash-es/ary/index.d.ts
new file mode 100644
index 0000000000..683b4c2d16
--- /dev/null
+++ b/lodash-es/ary/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const ary: typeof _.ary;
+export default ary;
diff --git a/lodash-es/assign/index.d.ts b/lodash-es/assign/index.d.ts
new file mode 100644
index 0000000000..e07e8b3712
--- /dev/null
+++ b/lodash-es/assign/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const assign: typeof _.assign;
+export default assign;
diff --git a/lodash-es/assignIn/index.d.ts b/lodash-es/assignIn/index.d.ts
new file mode 100644
index 0000000000..ae37403f48
--- /dev/null
+++ b/lodash-es/assignIn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const assignIn: typeof _.assignIn;
+export default assignIn;
diff --git a/lodash-es/assignInWith/index.d.ts b/lodash-es/assignInWith/index.d.ts
new file mode 100644
index 0000000000..1f99a630e1
--- /dev/null
+++ b/lodash-es/assignInWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const assignInWith: typeof _.assignInWith;
+export default assignInWith;
diff --git a/lodash-es/assignWith/index.d.ts b/lodash-es/assignWith/index.d.ts
new file mode 100644
index 0000000000..d7175fa8fd
--- /dev/null
+++ b/lodash-es/assignWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const assignWith: typeof _.assignWith;
+export default assignWith;
diff --git a/lodash-es/at/index.d.ts b/lodash-es/at/index.d.ts
new file mode 100644
index 0000000000..98ab16eb60
--- /dev/null
+++ b/lodash-es/at/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const at: typeof _.at;
+export default at;
diff --git a/lodash-es/attempt/index.d.ts b/lodash-es/attempt/index.d.ts
new file mode 100644
index 0000000000..c4a32846c3
--- /dev/null
+++ b/lodash-es/attempt/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const attempt: typeof _.attempt;
+export default attempt;
diff --git a/lodash-es/before/index.d.ts b/lodash-es/before/index.d.ts
new file mode 100644
index 0000000000..1051dbf013
--- /dev/null
+++ b/lodash-es/before/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const before: typeof _.before;
+export default before;
diff --git a/lodash-es/bind/index.d.ts b/lodash-es/bind/index.d.ts
new file mode 100644
index 0000000000..b19c3c3f1f
--- /dev/null
+++ b/lodash-es/bind/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const bind: typeof _.bind;
+export default bind;
diff --git a/lodash-es/bindAll/index.d.ts b/lodash-es/bindAll/index.d.ts
new file mode 100644
index 0000000000..4b7c95f654
--- /dev/null
+++ b/lodash-es/bindAll/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const bindAll: typeof _.bindAll;
+export default bindAll;
diff --git a/lodash-es/bindKey/index.d.ts b/lodash-es/bindKey/index.d.ts
new file mode 100644
index 0000000000..c302459d1b
--- /dev/null
+++ b/lodash-es/bindKey/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const bindKey: typeof _.bindKey;
+export default bindKey;
diff --git a/lodash-es/camelCase/index.d.ts b/lodash-es/camelCase/index.d.ts
new file mode 100644
index 0000000000..db927ef779
--- /dev/null
+++ b/lodash-es/camelCase/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const camelCase: typeof _.camelCase;
+export default camelCase;
diff --git a/lodash-es/capitalize/index.d.ts b/lodash-es/capitalize/index.d.ts
new file mode 100644
index 0000000000..bebe71e9b2
--- /dev/null
+++ b/lodash-es/capitalize/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const capitalize: typeof _.capitalize;
+export default capitalize;
diff --git a/lodash-es/castArray/index.d.ts b/lodash-es/castArray/index.d.ts
new file mode 100644
index 0000000000..8474b4b3fc
--- /dev/null
+++ b/lodash-es/castArray/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const castArray: typeof _.castArray;
+export default castArray;
diff --git a/lodash-es/ceil/index.d.ts b/lodash-es/ceil/index.d.ts
new file mode 100644
index 0000000000..eaaefd5a42
--- /dev/null
+++ b/lodash-es/ceil/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const ceil: typeof _.ceil;
+export default ceil;
diff --git a/lodash-es/chain/index.d.ts b/lodash-es/chain/index.d.ts
new file mode 100644
index 0000000000..2bbc3fcb3d
--- /dev/null
+++ b/lodash-es/chain/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const chain: typeof _.chain;
+export default chain;
diff --git a/lodash-es/chunk/index.d.ts b/lodash-es/chunk/index.d.ts
new file mode 100644
index 0000000000..7ee13fad50
--- /dev/null
+++ b/lodash-es/chunk/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const chunk: typeof _.chunk;
+export default chunk;
diff --git a/lodash-es/clamp/index.d.ts b/lodash-es/clamp/index.d.ts
new file mode 100644
index 0000000000..8994eb52bc
--- /dev/null
+++ b/lodash-es/clamp/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const clamp: typeof _.clamp;
+export default clamp;
diff --git a/lodash-es/clone/index.d.ts b/lodash-es/clone/index.d.ts
new file mode 100644
index 0000000000..8792f93fe5
--- /dev/null
+++ b/lodash-es/clone/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const clone: typeof _.clone;
+export default clone;
diff --git a/lodash-es/cloneDeep/index.d.ts b/lodash-es/cloneDeep/index.d.ts
new file mode 100644
index 0000000000..bb86cf7c56
--- /dev/null
+++ b/lodash-es/cloneDeep/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const cloneDeep: typeof _.cloneDeep;
+export default cloneDeep;
diff --git a/lodash-es/cloneDeepWith/index.d.ts b/lodash-es/cloneDeepWith/index.d.ts
new file mode 100644
index 0000000000..0ad1b449b8
--- /dev/null
+++ b/lodash-es/cloneDeepWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const cloneDeepWith: typeof _.cloneDeepWith;
+export default cloneDeepWith;
diff --git a/lodash-es/cloneWith/index.d.ts b/lodash-es/cloneWith/index.d.ts
new file mode 100644
index 0000000000..ba865f9eeb
--- /dev/null
+++ b/lodash-es/cloneWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const cloneWith: typeof _.cloneWith;
+export default cloneWith;
diff --git a/lodash-es/compact/index.d.ts b/lodash-es/compact/index.d.ts
new file mode 100644
index 0000000000..b11a162f5b
--- /dev/null
+++ b/lodash-es/compact/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const compact: typeof _.compact;
+export default compact;
diff --git a/lodash-es/concat/index.d.ts b/lodash-es/concat/index.d.ts
new file mode 100644
index 0000000000..258c9648e8
--- /dev/null
+++ b/lodash-es/concat/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const concat: typeof _.concat;
+export default concat;
diff --git a/lodash-es/constant/index.d.ts b/lodash-es/constant/index.d.ts
new file mode 100644
index 0000000000..ff3bbc5ead
--- /dev/null
+++ b/lodash-es/constant/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const constant: typeof _.constant;
+export default constant;
diff --git a/lodash-es/countBy/index.d.ts b/lodash-es/countBy/index.d.ts
new file mode 100644
index 0000000000..b02617bdce
--- /dev/null
+++ b/lodash-es/countBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const countBy: typeof _.countBy;
+export default countBy;
diff --git a/lodash-es/create/index.d.ts b/lodash-es/create/index.d.ts
new file mode 100644
index 0000000000..eacab36ac2
--- /dev/null
+++ b/lodash-es/create/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const create: typeof _.create;
+export default create;
diff --git a/lodash-es/curry/index.d.ts b/lodash-es/curry/index.d.ts
new file mode 100644
index 0000000000..c7a929f9fd
--- /dev/null
+++ b/lodash-es/curry/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const curry: typeof _.curry;
+export default curry;
diff --git a/lodash-es/curryRight/index.d.ts b/lodash-es/curryRight/index.d.ts
new file mode 100644
index 0000000000..2a5bb1cfe2
--- /dev/null
+++ b/lodash-es/curryRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const curryRight: typeof _.curryRight;
+export default curryRight;
diff --git a/lodash-es/debounce/index.d.ts b/lodash-es/debounce/index.d.ts
new file mode 100644
index 0000000000..cdb629b926
--- /dev/null
+++ b/lodash-es/debounce/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const debounce: typeof _.debounce;
+export default debounce;
diff --git a/lodash-es/deburr/index.d.ts b/lodash-es/deburr/index.d.ts
new file mode 100644
index 0000000000..e0112e772e
--- /dev/null
+++ b/lodash-es/deburr/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const deburr: typeof _.deburr;
+export default deburr;
diff --git a/lodash-es/defaults/index.d.ts b/lodash-es/defaults/index.d.ts
new file mode 100644
index 0000000000..9a3a9135d2
--- /dev/null
+++ b/lodash-es/defaults/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const defaults: typeof _.defaults;
+export default defaults;
diff --git a/lodash-es/defaultsDeep/index.d.ts b/lodash-es/defaultsDeep/index.d.ts
new file mode 100644
index 0000000000..01da70c706
--- /dev/null
+++ b/lodash-es/defaultsDeep/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const defaultsDeep: typeof _.defaultsDeep;
+export default defaultsDeep;
diff --git a/lodash-es/defer/index.d.ts b/lodash-es/defer/index.d.ts
new file mode 100644
index 0000000000..098cdde130
--- /dev/null
+++ b/lodash-es/defer/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const defer: typeof _.defer;
+export default defer;
diff --git a/lodash-es/delay/index.d.ts b/lodash-es/delay/index.d.ts
new file mode 100644
index 0000000000..ff4b25b339
--- /dev/null
+++ b/lodash-es/delay/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const delay: typeof _.delay;
+export default delay;
diff --git a/lodash-es/difference/index.d.ts b/lodash-es/difference/index.d.ts
new file mode 100644
index 0000000000..ab23246e99
--- /dev/null
+++ b/lodash-es/difference/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const difference: typeof _.difference;
+export default difference;
diff --git a/lodash-es/differenceBy/index.d.ts b/lodash-es/differenceBy/index.d.ts
new file mode 100644
index 0000000000..ecadabb5d6
--- /dev/null
+++ b/lodash-es/differenceBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const differenceBy: typeof _.differenceBy;
+export default differenceBy;
diff --git a/lodash-es/differenceWith/index.d.ts b/lodash-es/differenceWith/index.d.ts
new file mode 100644
index 0000000000..6b1d91760d
--- /dev/null
+++ b/lodash-es/differenceWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const differenceWith: typeof _.differenceWith;
+export default differenceWith;
diff --git a/lodash-es/drop/index.d.ts b/lodash-es/drop/index.d.ts
new file mode 100644
index 0000000000..3acb7ffda5
--- /dev/null
+++ b/lodash-es/drop/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const drop: typeof _.drop;
+export default drop;
diff --git a/lodash-es/dropRight/index.d.ts b/lodash-es/dropRight/index.d.ts
new file mode 100644
index 0000000000..8cbf725bba
--- /dev/null
+++ b/lodash-es/dropRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const dropRight: typeof _.dropRight;
+export default dropRight;
diff --git a/lodash-es/dropRightWhile/index.d.ts b/lodash-es/dropRightWhile/index.d.ts
new file mode 100644
index 0000000000..a9c18bdde1
--- /dev/null
+++ b/lodash-es/dropRightWhile/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const dropRightWhile: typeof _.dropRightWhile;
+export default dropRightWhile;
diff --git a/lodash-es/dropWhile/index.d.ts b/lodash-es/dropWhile/index.d.ts
new file mode 100644
index 0000000000..74ad0c260b
--- /dev/null
+++ b/lodash-es/dropWhile/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const dropWhile: typeof _.dropWhile;
+export default dropWhile;
diff --git a/lodash-es/each/index.d.ts b/lodash-es/each/index.d.ts
new file mode 100644
index 0000000000..ce8fe9ee6b
--- /dev/null
+++ b/lodash-es/each/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const each: typeof _.each;
+export default each;
diff --git a/lodash-es/eachRight/index.d.ts b/lodash-es/eachRight/index.d.ts
new file mode 100644
index 0000000000..12160067fb
--- /dev/null
+++ b/lodash-es/eachRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const eachRight: typeof _.eachRight;
+export default eachRight;
diff --git a/lodash-es/endsWith/index.d.ts b/lodash-es/endsWith/index.d.ts
new file mode 100644
index 0000000000..d17582a9ca
--- /dev/null
+++ b/lodash-es/endsWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const endsWith: typeof _.endsWith;
+export default endsWith;
diff --git a/lodash-es/eq/index.d.ts b/lodash-es/eq/index.d.ts
new file mode 100644
index 0000000000..96b4028265
--- /dev/null
+++ b/lodash-es/eq/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const eq: typeof _.eq;
+export default eq;
diff --git a/lodash-es/escape/index.d.ts b/lodash-es/escape/index.d.ts
new file mode 100644
index 0000000000..7dfe42a59d
--- /dev/null
+++ b/lodash-es/escape/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const escape: typeof _.escape;
+export default escape;
diff --git a/lodash-es/escapeRegExp/index.d.ts b/lodash-es/escapeRegExp/index.d.ts
new file mode 100644
index 0000000000..03a6c3b212
--- /dev/null
+++ b/lodash-es/escapeRegExp/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const escapeRegExp: typeof _.escapeRegExp;
+export default escapeRegExp;
diff --git a/lodash-es/every/index.d.ts b/lodash-es/every/index.d.ts
new file mode 100644
index 0000000000..f101e06ef1
--- /dev/null
+++ b/lodash-es/every/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const every: typeof _.every;
+export default every;
diff --git a/lodash-es/extend/index.d.ts b/lodash-es/extend/index.d.ts
new file mode 100644
index 0000000000..0fefaee444
--- /dev/null
+++ b/lodash-es/extend/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const extend: typeof _.extend;
+export default extend;
diff --git a/lodash-es/extendWith/index.d.ts b/lodash-es/extendWith/index.d.ts
new file mode 100644
index 0000000000..43f7f30a90
--- /dev/null
+++ b/lodash-es/extendWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const extendWith: typeof _.extendWith;
+export default extendWith;
diff --git a/lodash-es/fb/index.d.ts b/lodash-es/fb/index.d.ts
new file mode 100644
index 0000000000..9c0c66123e
--- /dev/null
+++ b/lodash-es/fb/index.d.ts
@@ -0,0 +1,2 @@
+import * as _ from "lodash";
+export default _;
diff --git a/lodash-es/fill/index.d.ts b/lodash-es/fill/index.d.ts
new file mode 100644
index 0000000000..6cc7fcdb08
--- /dev/null
+++ b/lodash-es/fill/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const fill: typeof _.fill;
+export default fill;
diff --git a/lodash-es/filter/index.d.ts b/lodash-es/filter/index.d.ts
new file mode 100644
index 0000000000..4ef8e09dca
--- /dev/null
+++ b/lodash-es/filter/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const filter: typeof _.filter;
+export default filter;
diff --git a/lodash-es/find/index.d.ts b/lodash-es/find/index.d.ts
new file mode 100644
index 0000000000..6d7f0ccf51
--- /dev/null
+++ b/lodash-es/find/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const find: typeof _.find;
+export default find;
diff --git a/lodash-es/findIndex/index.d.ts b/lodash-es/findIndex/index.d.ts
new file mode 100644
index 0000000000..618ad93d7d
--- /dev/null
+++ b/lodash-es/findIndex/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const findIndex: typeof _.findIndex;
+export default findIndex;
diff --git a/lodash-es/findKey/index.d.ts b/lodash-es/findKey/index.d.ts
new file mode 100644
index 0000000000..370d80614f
--- /dev/null
+++ b/lodash-es/findKey/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const findKey: typeof _.findKey;
+export default findKey;
diff --git a/lodash-es/findLast/index.d.ts b/lodash-es/findLast/index.d.ts
new file mode 100644
index 0000000000..e9e08d93c2
--- /dev/null
+++ b/lodash-es/findLast/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const findLast: typeof _.findLast;
+export default findLast;
diff --git a/lodash-es/findLastIndex/index.d.ts b/lodash-es/findLastIndex/index.d.ts
new file mode 100644
index 0000000000..a1fbecd823
--- /dev/null
+++ b/lodash-es/findLastIndex/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const findLastIndex: typeof _.findLastIndex;
+export default findLastIndex;
diff --git a/lodash-es/findLastKey/index.d.ts b/lodash-es/findLastKey/index.d.ts
new file mode 100644
index 0000000000..0e6e62fc91
--- /dev/null
+++ b/lodash-es/findLastKey/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const findLastKey: typeof _.findLastKey;
+export default findLastKey;
diff --git a/lodash-es/first/index.d.ts b/lodash-es/first/index.d.ts
new file mode 100644
index 0000000000..96e9c74f0a
--- /dev/null
+++ b/lodash-es/first/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const first: typeof _.first;
+export default first;
diff --git a/lodash-es/flatMap/index.d.ts b/lodash-es/flatMap/index.d.ts
new file mode 100644
index 0000000000..76f335a594
--- /dev/null
+++ b/lodash-es/flatMap/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const flatMap: typeof _.flatMap;
+export default flatMap;
diff --git a/lodash-es/flatten/index.d.ts b/lodash-es/flatten/index.d.ts
new file mode 100644
index 0000000000..ddb4912ba9
--- /dev/null
+++ b/lodash-es/flatten/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const flatten: typeof _.flatten;
+export default flatten;
diff --git a/lodash-es/flattenDeep/index.d.ts b/lodash-es/flattenDeep/index.d.ts
new file mode 100644
index 0000000000..803f501f1e
--- /dev/null
+++ b/lodash-es/flattenDeep/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const flattenDeep: typeof _.flattenDeep;
+export default flattenDeep;
diff --git a/lodash-es/flattenDepth/index.d.ts b/lodash-es/flattenDepth/index.d.ts
new file mode 100644
index 0000000000..245279040f
--- /dev/null
+++ b/lodash-es/flattenDepth/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const flattenDepth: typeof _.flattenDepth;
+export default flattenDepth;
diff --git a/lodash-es/flip/index.d.ts b/lodash-es/flip/index.d.ts
new file mode 100644
index 0000000000..6cc5ecce00
--- /dev/null
+++ b/lodash-es/flip/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const flip: typeof _.flip;
+export default flip;
diff --git a/lodash-es/floor/index.d.ts b/lodash-es/floor/index.d.ts
new file mode 100644
index 0000000000..50f7092478
--- /dev/null
+++ b/lodash-es/floor/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const floor: typeof _.floor;
+export default floor;
diff --git a/lodash-es/flow/index.d.ts b/lodash-es/flow/index.d.ts
new file mode 100644
index 0000000000..908ed2e2c4
--- /dev/null
+++ b/lodash-es/flow/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const flow: typeof _.flow;
+export default flow;
diff --git a/lodash-es/flowRight/index.d.ts b/lodash-es/flowRight/index.d.ts
new file mode 100644
index 0000000000..c5f4158c80
--- /dev/null
+++ b/lodash-es/flowRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const flowRight: typeof _.flowRight;
+export default flowRight;
diff --git a/lodash-es/forEach/index.d.ts b/lodash-es/forEach/index.d.ts
new file mode 100644
index 0000000000..991075c50c
--- /dev/null
+++ b/lodash-es/forEach/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const forEach: typeof _.forEach;
+export default forEach;
diff --git a/lodash-es/forEachRight/index.d.ts b/lodash-es/forEachRight/index.d.ts
new file mode 100644
index 0000000000..98e60667c2
--- /dev/null
+++ b/lodash-es/forEachRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const forEachRight: typeof _.forEachRight;
+export default forEachRight;
diff --git a/lodash-es/forIn/index.d.ts b/lodash-es/forIn/index.d.ts
new file mode 100644
index 0000000000..b94adeb90b
--- /dev/null
+++ b/lodash-es/forIn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const forIn: typeof _.forIn;
+export default forIn;
diff --git a/lodash-es/forInRight/index.d.ts b/lodash-es/forInRight/index.d.ts
new file mode 100644
index 0000000000..ae7257e4b6
--- /dev/null
+++ b/lodash-es/forInRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const forInRight: typeof _.forInRight;
+export default forInRight;
diff --git a/lodash-es/forOwn/index.d.ts b/lodash-es/forOwn/index.d.ts
new file mode 100644
index 0000000000..9c206fd5a9
--- /dev/null
+++ b/lodash-es/forOwn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const forOwn: typeof _.forOwn;
+export default forOwn;
diff --git a/lodash-es/forOwnRight/index.d.ts b/lodash-es/forOwnRight/index.d.ts
new file mode 100644
index 0000000000..5874b6c70e
--- /dev/null
+++ b/lodash-es/forOwnRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const forOwnRight: typeof _.forOwnRight;
+export default forOwnRight;
diff --git a/lodash-es/fromPairs/index.d.ts b/lodash-es/fromPairs/index.d.ts
new file mode 100644
index 0000000000..a6446bff6f
--- /dev/null
+++ b/lodash-es/fromPairs/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const fromPairs: typeof _.fromPairs;
+export default fromPairs;
diff --git a/lodash-es/functions/index.d.ts b/lodash-es/functions/index.d.ts
new file mode 100644
index 0000000000..18f6e34ce3
--- /dev/null
+++ b/lodash-es/functions/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const functions: typeof _.functions;
+export default functions;
diff --git a/lodash-es/functionsIn/index.d.ts b/lodash-es/functionsIn/index.d.ts
new file mode 100644
index 0000000000..b702c836ae
--- /dev/null
+++ b/lodash-es/functionsIn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const functionsIn: typeof _.functionsIn;
+export default functionsIn;
diff --git a/lodash-es/get/index.d.ts b/lodash-es/get/index.d.ts
new file mode 100644
index 0000000000..6a20d96558
--- /dev/null
+++ b/lodash-es/get/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const get: typeof _.get;
+export default get;
diff --git a/lodash-es/groupBy/index.d.ts b/lodash-es/groupBy/index.d.ts
new file mode 100644
index 0000000000..df50c25eeb
--- /dev/null
+++ b/lodash-es/groupBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const groupBy: typeof _.groupBy;
+export default groupBy;
diff --git a/lodash-es/gt/index.d.ts b/lodash-es/gt/index.d.ts
new file mode 100644
index 0000000000..ae4e05da15
--- /dev/null
+++ b/lodash-es/gt/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const gt: typeof _.gt;
+export default gt;
diff --git a/lodash-es/gte/index.d.ts b/lodash-es/gte/index.d.ts
new file mode 100644
index 0000000000..49aeca418a
--- /dev/null
+++ b/lodash-es/gte/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const gte: typeof _.gte;
+export default gte;
diff --git a/lodash-es/has/index.d.ts b/lodash-es/has/index.d.ts
new file mode 100644
index 0000000000..d8ef1a756c
--- /dev/null
+++ b/lodash-es/has/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const has: typeof _.has;
+export default has;
diff --git a/lodash-es/hasIn/index.d.ts b/lodash-es/hasIn/index.d.ts
new file mode 100644
index 0000000000..5451c19bc9
--- /dev/null
+++ b/lodash-es/hasIn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const hasIn: typeof _.hasIn;
+export default hasIn;
diff --git a/lodash-es/head/index.d.ts b/lodash-es/head/index.d.ts
new file mode 100644
index 0000000000..af8323559a
--- /dev/null
+++ b/lodash-es/head/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const head: typeof _.head;
+export default head;
diff --git a/lodash-es/identity/index.d.ts b/lodash-es/identity/index.d.ts
new file mode 100644
index 0000000000..4933422107
--- /dev/null
+++ b/lodash-es/identity/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const identity: typeof _.identity;
+export default identity;
diff --git a/lodash-es/inRange/index.d.ts b/lodash-es/inRange/index.d.ts
new file mode 100644
index 0000000000..4c3e56ddf9
--- /dev/null
+++ b/lodash-es/inRange/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const inRange: typeof _.inRange;
+export default inRange;
diff --git a/lodash-es/includes/index.d.ts b/lodash-es/includes/index.d.ts
new file mode 100644
index 0000000000..09c694b13a
--- /dev/null
+++ b/lodash-es/includes/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const includes: typeof _.includes;
+export default includes;
diff --git a/lodash-es/index.d.ts b/lodash-es/index.d.ts
new file mode 100644
index 0000000000..71f98587ff
--- /dev/null
+++ b/lodash-es/index.d.ts
@@ -0,0 +1,4 @@
+// Type definitions for Lo-Dash-es 4.14
+// Project: http://lodash.com/
+// Definitions by: Stephen Lautier <https://github.com/stephenlautier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/lodash-es/indexOf/index.d.ts b/lodash-es/indexOf/index.d.ts
new file mode 100644
index 0000000000..e10f425449
--- /dev/null
+++ b/lodash-es/indexOf/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const indexOf: typeof _.indexOf;
+export default indexOf;
diff --git a/lodash-es/initial/index.d.ts b/lodash-es/initial/index.d.ts
new file mode 100644
index 0000000000..e853918f3d
--- /dev/null
+++ b/lodash-es/initial/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const initial: typeof _.initial;
+export default initial;
diff --git a/lodash-es/intersection/index.d.ts b/lodash-es/intersection/index.d.ts
new file mode 100644
index 0000000000..8c92aa0c98
--- /dev/null
+++ b/lodash-es/intersection/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const intersection: typeof _.intersection;
+export default intersection;
diff --git a/lodash-es/intersectionBy/index.d.ts b/lodash-es/intersectionBy/index.d.ts
new file mode 100644
index 0000000000..ec19a42859
--- /dev/null
+++ b/lodash-es/intersectionBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const intersectionBy: typeof _.intersectionBy;
+export default intersectionBy;
diff --git a/lodash-es/intersectionWith/index.d.ts b/lodash-es/intersectionWith/index.d.ts
new file mode 100644
index 0000000000..19bc6f5e3e
--- /dev/null
+++ b/lodash-es/intersectionWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const intersectionWith: typeof _.intersectionWith;
+export default intersectionWith;
diff --git a/lodash-es/invert/index.d.ts b/lodash-es/invert/index.d.ts
new file mode 100644
index 0000000000..8cdab06a08
--- /dev/null
+++ b/lodash-es/invert/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const invert: typeof _.invert;
+export default invert;
diff --git a/lodash-es/invertBy/index.d.ts b/lodash-es/invertBy/index.d.ts
new file mode 100644
index 0000000000..c2e414940f
--- /dev/null
+++ b/lodash-es/invertBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const invertBy: typeof _.invertBy;
+export default invertBy;
diff --git a/lodash-es/invoke/index.d.ts b/lodash-es/invoke/index.d.ts
new file mode 100644
index 0000000000..acd47aee19
--- /dev/null
+++ b/lodash-es/invoke/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const invoke: typeof _.invoke;
+export default invoke;
diff --git a/lodash-es/invokeMap/index.d.ts b/lodash-es/invokeMap/index.d.ts
new file mode 100644
index 0000000000..7f25853341
--- /dev/null
+++ b/lodash-es/invokeMap/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const invokeMap: typeof _.invokeMap;
+export default invokeMap;
diff --git a/lodash-es/isArguments/index.d.ts b/lodash-es/isArguments/index.d.ts
new file mode 100644
index 0000000000..ea8d55a68a
--- /dev/null
+++ b/lodash-es/isArguments/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isArguments: typeof _.isArguments;
+export default isArguments;
diff --git a/lodash-es/isArray/index.d.ts b/lodash-es/isArray/index.d.ts
new file mode 100644
index 0000000000..e34b49878f
--- /dev/null
+++ b/lodash-es/isArray/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isArray: typeof _.isArray;
+export default isArray;
diff --git a/lodash-es/isArrayBuffer/index.d.ts b/lodash-es/isArrayBuffer/index.d.ts
new file mode 100644
index 0000000000..ccd71b7775
--- /dev/null
+++ b/lodash-es/isArrayBuffer/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isArrayBuffer: typeof _.isArrayBuffer;
+export default isArrayBuffer;
diff --git a/lodash-es/isArrayLike/index.d.ts b/lodash-es/isArrayLike/index.d.ts
new file mode 100644
index 0000000000..3b42bbbc5c
--- /dev/null
+++ b/lodash-es/isArrayLike/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isArrayLike: typeof _.isArrayLike;
+export default isArrayLike;
diff --git a/lodash-es/isArrayLikeObject/index.d.ts b/lodash-es/isArrayLikeObject/index.d.ts
new file mode 100644
index 0000000000..ea85e10017
--- /dev/null
+++ b/lodash-es/isArrayLikeObject/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isArrayLikeObject: typeof _.isArrayLikeObject;
+export default isArrayLikeObject;
diff --git a/lodash-es/isBoolean/index.d.ts b/lodash-es/isBoolean/index.d.ts
new file mode 100644
index 0000000000..65664f062b
--- /dev/null
+++ b/lodash-es/isBoolean/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isBoolean: typeof _.isBoolean;
+export default isBoolean;
diff --git a/lodash-es/isBuffer/index.d.ts b/lodash-es/isBuffer/index.d.ts
new file mode 100644
index 0000000000..c3c32dea99
--- /dev/null
+++ b/lodash-es/isBuffer/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isBuffer: typeof _.isBuffer;
+export default isBuffer;
diff --git a/lodash-es/isDate/index.d.ts b/lodash-es/isDate/index.d.ts
new file mode 100644
index 0000000000..4f920c8c3f
--- /dev/null
+++ b/lodash-es/isDate/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isDate: typeof _.isDate;
+export default isDate;
diff --git a/lodash-es/isElement/index.d.ts b/lodash-es/isElement/index.d.ts
new file mode 100644
index 0000000000..ea66ae6347
--- /dev/null
+++ b/lodash-es/isElement/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isElement: typeof _.isElement;
+export default isElement;
diff --git a/lodash-es/isEmpty/index.d.ts b/lodash-es/isEmpty/index.d.ts
new file mode 100644
index 0000000000..b8b4b87447
--- /dev/null
+++ b/lodash-es/isEmpty/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isEmpty: typeof _.isEmpty;
+export default isEmpty;
diff --git a/lodash-es/isEqual/index.d.ts b/lodash-es/isEqual/index.d.ts
new file mode 100644
index 0000000000..83e1f70e6f
--- /dev/null
+++ b/lodash-es/isEqual/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isEqual: typeof _.isEqual;
+export default isEqual;
diff --git a/lodash-es/isEqualWith/index.d.ts b/lodash-es/isEqualWith/index.d.ts
new file mode 100644
index 0000000000..945a683116
--- /dev/null
+++ b/lodash-es/isEqualWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isEqualWith: typeof _.isEqualWith;
+export default isEqualWith;
diff --git a/lodash-es/isError/index.d.ts b/lodash-es/isError/index.d.ts
new file mode 100644
index 0000000000..46485d9e7c
--- /dev/null
+++ b/lodash-es/isError/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isError: typeof _.isError;
+export default isError;
diff --git a/lodash-es/isFinite/index.d.ts b/lodash-es/isFinite/index.d.ts
new file mode 100644
index 0000000000..62507f7e1e
--- /dev/null
+++ b/lodash-es/isFinite/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isFinite: typeof _.isFinite;
+export default isFinite;
diff --git a/lodash-es/isFunction/index.d.ts b/lodash-es/isFunction/index.d.ts
new file mode 100644
index 0000000000..3b66cce932
--- /dev/null
+++ b/lodash-es/isFunction/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isFunction: typeof _.isFunction;
+export default isFunction;
diff --git a/lodash-es/isInteger/index.d.ts b/lodash-es/isInteger/index.d.ts
new file mode 100644
index 0000000000..857fed396f
--- /dev/null
+++ b/lodash-es/isInteger/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isInteger: typeof _.isInteger;
+export default isInteger;
diff --git a/lodash-es/isLength/index.d.ts b/lodash-es/isLength/index.d.ts
new file mode 100644
index 0000000000..3a7debd966
--- /dev/null
+++ b/lodash-es/isLength/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isLength: typeof _.isLength;
+export default isLength;
diff --git a/lodash-es/isMap/index.d.ts b/lodash-es/isMap/index.d.ts
new file mode 100644
index 0000000000..d17daa5740
--- /dev/null
+++ b/lodash-es/isMap/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isMap: typeof _.isMap;
+export default isMap;
diff --git a/lodash-es/isMatch/index.d.ts b/lodash-es/isMatch/index.d.ts
new file mode 100644
index 0000000000..90a940554d
--- /dev/null
+++ b/lodash-es/isMatch/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isMatch: typeof _.isMatch;
+export default isMatch;
diff --git a/lodash-es/isMatchWith/index.d.ts b/lodash-es/isMatchWith/index.d.ts
new file mode 100644
index 0000000000..317ce04315
--- /dev/null
+++ b/lodash-es/isMatchWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isMatchWith: typeof _.isMatchWith;
+export default isMatchWith;
diff --git a/lodash-es/isNaN/index.d.ts b/lodash-es/isNaN/index.d.ts
new file mode 100644
index 0000000000..c1c5d06d51
--- /dev/null
+++ b/lodash-es/isNaN/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isNaN: typeof _.isNaN;
+export default isNaN;
diff --git a/lodash-es/isNative/index.d.ts b/lodash-es/isNative/index.d.ts
new file mode 100644
index 0000000000..08ee2fc1fd
--- /dev/null
+++ b/lodash-es/isNative/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isNative: typeof _.isNative;
+export default isNative;
diff --git a/lodash-es/isNil/index.d.ts b/lodash-es/isNil/index.d.ts
new file mode 100644
index 0000000000..25bfaedac2
--- /dev/null
+++ b/lodash-es/isNil/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isNil: typeof _.isNil;
+export default isNil;
diff --git a/lodash-es/isNull/index.d.ts b/lodash-es/isNull/index.d.ts
new file mode 100644
index 0000000000..7e9c46de33
--- /dev/null
+++ b/lodash-es/isNull/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isNull: typeof _.isNull;
+export default isNull;
diff --git a/lodash-es/isNumber/index.d.ts b/lodash-es/isNumber/index.d.ts
new file mode 100644
index 0000000000..1079a60fef
--- /dev/null
+++ b/lodash-es/isNumber/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isNumber: typeof _.isNumber;
+export default isNumber;
diff --git a/lodash-es/isObject/index.d.ts b/lodash-es/isObject/index.d.ts
new file mode 100644
index 0000000000..ea6ace66a8
--- /dev/null
+++ b/lodash-es/isObject/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isObject: typeof _.isObject;
+export default isObject;
diff --git a/lodash-es/isObjectLike/index.d.ts b/lodash-es/isObjectLike/index.d.ts
new file mode 100644
index 0000000000..3851d0959f
--- /dev/null
+++ b/lodash-es/isObjectLike/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isObjectLike: typeof _.isObjectLike;
+export default isObjectLike;
diff --git a/lodash-es/isPlainObject/index.d.ts b/lodash-es/isPlainObject/index.d.ts
new file mode 100644
index 0000000000..0c855f6c47
--- /dev/null
+++ b/lodash-es/isPlainObject/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isPlainObject: typeof _.isPlainObject;
+export default isPlainObject;
diff --git a/lodash-es/isRegExp/index.d.ts b/lodash-es/isRegExp/index.d.ts
new file mode 100644
index 0000000000..7408b0ed3b
--- /dev/null
+++ b/lodash-es/isRegExp/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isRegExp: typeof _.isRegExp;
+export default isRegExp;
diff --git a/lodash-es/isSafeInteger/index.d.ts b/lodash-es/isSafeInteger/index.d.ts
new file mode 100644
index 0000000000..4ed7f6416e
--- /dev/null
+++ b/lodash-es/isSafeInteger/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isSafeInteger: typeof _.isSafeInteger;
+export default isSafeInteger;
diff --git a/lodash-es/isSet/index.d.ts b/lodash-es/isSet/index.d.ts
new file mode 100644
index 0000000000..40e4fc4ba5
--- /dev/null
+++ b/lodash-es/isSet/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isSet: typeof _.isSet;
+export default isSet;
diff --git a/lodash-es/isString/index.d.ts b/lodash-es/isString/index.d.ts
new file mode 100644
index 0000000000..d00c2c7f83
--- /dev/null
+++ b/lodash-es/isString/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isString: typeof _.isString;
+export default isString;
diff --git a/lodash-es/isSymbol/index.d.ts b/lodash-es/isSymbol/index.d.ts
new file mode 100644
index 0000000000..a3e43f8327
--- /dev/null
+++ b/lodash-es/isSymbol/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isSymbol: typeof _.isSymbol;
+export default isSymbol;
diff --git a/lodash-es/isTypedArray/index.d.ts b/lodash-es/isTypedArray/index.d.ts
new file mode 100644
index 0000000000..5b37a9ff0d
--- /dev/null
+++ b/lodash-es/isTypedArray/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isTypedArray: typeof _.isTypedArray;
+export default isTypedArray;
diff --git a/lodash-es/isUndefined/index.d.ts b/lodash-es/isUndefined/index.d.ts
new file mode 100644
index 0000000000..a2ad3eab25
--- /dev/null
+++ b/lodash-es/isUndefined/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isUndefined: typeof _.isUndefined;
+export default isUndefined;
diff --git a/lodash-es/isWeakMap/index.d.ts b/lodash-es/isWeakMap/index.d.ts
new file mode 100644
index 0000000000..5115411a83
--- /dev/null
+++ b/lodash-es/isWeakMap/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isWeakMap: typeof _.isWeakMap;
+export default isWeakMap;
diff --git a/lodash-es/isWeakSet/index.d.ts b/lodash-es/isWeakSet/index.d.ts
new file mode 100644
index 0000000000..fffa232347
--- /dev/null
+++ b/lodash-es/isWeakSet/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const isWeakSet: typeof _.isWeakSet;
+export default isWeakSet;
diff --git a/lodash-es/iteratee/index.d.ts b/lodash-es/iteratee/index.d.ts
new file mode 100644
index 0000000000..bc3670a417
--- /dev/null
+++ b/lodash-es/iteratee/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const iteratee: typeof _.iteratee;
+export default iteratee;
diff --git a/lodash-es/join/index.d.ts b/lodash-es/join/index.d.ts
new file mode 100644
index 0000000000..5400a8a009
--- /dev/null
+++ b/lodash-es/join/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const join: typeof _.join;
+export default join;
diff --git a/lodash-es/kebabCase/index.d.ts b/lodash-es/kebabCase/index.d.ts
new file mode 100644
index 0000000000..f49f33dbf5
--- /dev/null
+++ b/lodash-es/kebabCase/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const kebabCase: typeof _.kebabCase;
+export default kebabCase;
diff --git a/lodash-es/keyBy/index.d.ts b/lodash-es/keyBy/index.d.ts
new file mode 100644
index 0000000000..676c034dcb
--- /dev/null
+++ b/lodash-es/keyBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const keyBy: typeof _.keyBy;
+export default keyBy;
diff --git a/lodash-es/keys/index.d.ts b/lodash-es/keys/index.d.ts
new file mode 100644
index 0000000000..3a947b7243
--- /dev/null
+++ b/lodash-es/keys/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const keys: typeof _.keys;
+export default keys;
diff --git a/lodash-es/keysIn/index.d.ts b/lodash-es/keysIn/index.d.ts
new file mode 100644
index 0000000000..4fe392a6f7
--- /dev/null
+++ b/lodash-es/keysIn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const keysIn: typeof _.keysIn;
+export default keysIn;
diff --git a/lodash-es/last/index.d.ts b/lodash-es/last/index.d.ts
new file mode 100644
index 0000000000..db4784da60
--- /dev/null
+++ b/lodash-es/last/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const last: typeof _.last;
+export default last;
diff --git a/lodash-es/lastIndexOf/index.d.ts b/lodash-es/lastIndexOf/index.d.ts
new file mode 100644
index 0000000000..43a17a6a21
--- /dev/null
+++ b/lodash-es/lastIndexOf/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const lastIndexOf: typeof _.lastIndexOf;
+export default lastIndexOf;
diff --git a/lodash-es/lodash-es-tests.ts b/lodash-es/lodash-es-tests.ts
new file mode 100644
index 0000000000..f849e811b6
--- /dev/null
+++ b/lodash-es/lodash-es-tests.ts
@@ -0,0 +1,3 @@
+import kebabCase from "lodash-es/kebabCase";
+
+kebabCase("chickenWings");
diff --git a/lodash-es/lowerCase/index.d.ts b/lodash-es/lowerCase/index.d.ts
new file mode 100644
index 0000000000..11f4bf8e90
--- /dev/null
+++ b/lodash-es/lowerCase/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const lowerCase: typeof _.lowerCase;
+export default lowerCase;
diff --git a/lodash-es/lowerFirst/index.d.ts b/lodash-es/lowerFirst/index.d.ts
new file mode 100644
index 0000000000..3b6950f527
--- /dev/null
+++ b/lodash-es/lowerFirst/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const lowerFirst: typeof _.lowerFirst;
+export default lowerFirst;
diff --git a/lodash-es/lt/index.d.ts b/lodash-es/lt/index.d.ts
new file mode 100644
index 0000000000..d16db45df9
--- /dev/null
+++ b/lodash-es/lt/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const lt: typeof _.lt;
+export default lt;
diff --git a/lodash-es/lte/index.d.ts b/lodash-es/lte/index.d.ts
new file mode 100644
index 0000000000..0f8c1b6eb8
--- /dev/null
+++ b/lodash-es/lte/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const lte: typeof _.lte;
+export default lte;
diff --git a/lodash-es/map/index.d.ts b/lodash-es/map/index.d.ts
new file mode 100644
index 0000000000..230189f901
--- /dev/null
+++ b/lodash-es/map/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const map: typeof _.map;
+export default map;
diff --git a/lodash-es/mapKeys/index.d.ts b/lodash-es/mapKeys/index.d.ts
new file mode 100644
index 0000000000..75c092904a
--- /dev/null
+++ b/lodash-es/mapKeys/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const mapKeys: typeof _.mapKeys;
+export default mapKeys;
diff --git a/lodash-es/mapValues/index.d.ts b/lodash-es/mapValues/index.d.ts
new file mode 100644
index 0000000000..e94fe54ea4
--- /dev/null
+++ b/lodash-es/mapValues/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const mapValues: typeof _.mapValues;
+export default mapValues;
diff --git a/lodash-es/matches/index.d.ts b/lodash-es/matches/index.d.ts
new file mode 100644
index 0000000000..3649b1f816
--- /dev/null
+++ b/lodash-es/matches/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const matches: typeof _.matches;
+export default matches;
diff --git a/lodash-es/matchesProperty/index.d.ts b/lodash-es/matchesProperty/index.d.ts
new file mode 100644
index 0000000000..05c4214254
--- /dev/null
+++ b/lodash-es/matchesProperty/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const matchesProperty: typeof _.matchesProperty;
+export default matchesProperty;
diff --git a/lodash-es/max/index.d.ts b/lodash-es/max/index.d.ts
new file mode 100644
index 0000000000..5c3ecefa58
--- /dev/null
+++ b/lodash-es/max/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const max: typeof _.max;
+export default max;
diff --git a/lodash-es/maxBy/index.d.ts b/lodash-es/maxBy/index.d.ts
new file mode 100644
index 0000000000..891a6adc51
--- /dev/null
+++ b/lodash-es/maxBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const maxBy: typeof _.maxBy;
+export default maxBy;
diff --git a/lodash-es/mean/index.d.ts b/lodash-es/mean/index.d.ts
new file mode 100644
index 0000000000..4748a5b68c
--- /dev/null
+++ b/lodash-es/mean/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const mean: typeof _.mean;
+export default mean;
diff --git a/lodash-es/meanBy/index.d.ts b/lodash-es/meanBy/index.d.ts
new file mode 100644
index 0000000000..98bb386726
--- /dev/null
+++ b/lodash-es/meanBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const meanBy: typeof _.meanBy;
+export default meanBy;
diff --git a/lodash-es/memoize/index.d.ts b/lodash-es/memoize/index.d.ts
new file mode 100644
index 0000000000..6f04797611
--- /dev/null
+++ b/lodash-es/memoize/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const memoize: typeof _.memoize;
+export default memoize;
diff --git a/lodash-es/merge/index.d.ts b/lodash-es/merge/index.d.ts
new file mode 100644
index 0000000000..857c5c3492
--- /dev/null
+++ b/lodash-es/merge/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const merge: typeof _.merge;
+export default merge;
diff --git a/lodash-es/mergeWith/index.d.ts b/lodash-es/mergeWith/index.d.ts
new file mode 100644
index 0000000000..6e80ad3a61
--- /dev/null
+++ b/lodash-es/mergeWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const mergeWith: typeof _.mergeWith;
+export default mergeWith;
diff --git a/lodash-es/method/index.d.ts b/lodash-es/method/index.d.ts
new file mode 100644
index 0000000000..258566af88
--- /dev/null
+++ b/lodash-es/method/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const method: typeof _.method;
+export default method;
diff --git a/lodash-es/methodOf/index.d.ts b/lodash-es/methodOf/index.d.ts
new file mode 100644
index 0000000000..3f106fa75a
--- /dev/null
+++ b/lodash-es/methodOf/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const methodOf: typeof _.methodOf;
+export default methodOf;
diff --git a/lodash-es/min/index.d.ts b/lodash-es/min/index.d.ts
new file mode 100644
index 0000000000..bef0c59653
--- /dev/null
+++ b/lodash-es/min/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const min: typeof _.min;
+export default min;
diff --git a/lodash-es/minBy/index.d.ts b/lodash-es/minBy/index.d.ts
new file mode 100644
index 0000000000..61524b8636
--- /dev/null
+++ b/lodash-es/minBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const minBy: typeof _.minBy;
+export default minBy;
diff --git a/lodash-es/mixin/index.d.ts b/lodash-es/mixin/index.d.ts
new file mode 100644
index 0000000000..a4c1570442
--- /dev/null
+++ b/lodash-es/mixin/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const mixin: typeof _.mixin;
+export default mixin;
diff --git a/lodash-es/negate/index.d.ts b/lodash-es/negate/index.d.ts
new file mode 100644
index 0000000000..9062ca2344
--- /dev/null
+++ b/lodash-es/negate/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const negate: typeof _.negate;
+export default negate;
diff --git a/lodash-es/noConflict/index.d.ts b/lodash-es/noConflict/index.d.ts
new file mode 100644
index 0000000000..f3dc804e22
--- /dev/null
+++ b/lodash-es/noConflict/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const noConflict: typeof _.noConflict;
+export default noConflict;
diff --git a/lodash-es/noop/index.d.ts b/lodash-es/noop/index.d.ts
new file mode 100644
index 0000000000..54ddded976
--- /dev/null
+++ b/lodash-es/noop/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const noop: typeof _.noop;
+export default noop;
diff --git a/lodash-es/now/index.d.ts b/lodash-es/now/index.d.ts
new file mode 100644
index 0000000000..09b6facb97
--- /dev/null
+++ b/lodash-es/now/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const now: typeof _.now;
+export default now;
diff --git a/lodash-es/nthArg/index.d.ts b/lodash-es/nthArg/index.d.ts
new file mode 100644
index 0000000000..a4ece20ba0
--- /dev/null
+++ b/lodash-es/nthArg/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const nthArg: typeof _.nthArg;
+export default nthArg;
diff --git a/lodash-es/omit/index.d.ts b/lodash-es/omit/index.d.ts
new file mode 100644
index 0000000000..ff29ac332a
--- /dev/null
+++ b/lodash-es/omit/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const omit: typeof _.omit;
+export default omit;
diff --git a/lodash-es/omitBy/index.d.ts b/lodash-es/omitBy/index.d.ts
new file mode 100644
index 0000000000..629fd47b0c
--- /dev/null
+++ b/lodash-es/omitBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const omitBy: typeof _.omitBy;
+export default omitBy;
diff --git a/lodash-es/once/index.d.ts b/lodash-es/once/index.d.ts
new file mode 100644
index 0000000000..f6176c1577
--- /dev/null
+++ b/lodash-es/once/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const once: typeof _.once;
+export default once;
diff --git a/lodash-es/orderBy/index.d.ts b/lodash-es/orderBy/index.d.ts
new file mode 100644
index 0000000000..90928d3740
--- /dev/null
+++ b/lodash-es/orderBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const orderBy: typeof _.orderBy;
+export default orderBy;
diff --git a/lodash-es/over/index.d.ts b/lodash-es/over/index.d.ts
new file mode 100644
index 0000000000..97e8c56335
--- /dev/null
+++ b/lodash-es/over/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const over: typeof _.over;
+export default over;
diff --git a/lodash-es/overArgs/index.d.ts b/lodash-es/overArgs/index.d.ts
new file mode 100644
index 0000000000..c6bf86aaee
--- /dev/null
+++ b/lodash-es/overArgs/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const overArgs: typeof _.overArgs;
+export default overArgs;
diff --git a/lodash-es/overEvery/index.d.ts b/lodash-es/overEvery/index.d.ts
new file mode 100644
index 0000000000..4d8bf3ac98
--- /dev/null
+++ b/lodash-es/overEvery/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const overEvery: typeof _.overEvery;
+export default overEvery;
diff --git a/lodash-es/overSome/index.d.ts b/lodash-es/overSome/index.d.ts
new file mode 100644
index 0000000000..6dcd9365a8
--- /dev/null
+++ b/lodash-es/overSome/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const overSome: typeof _.overSome;
+export default overSome;
diff --git a/lodash-es/package.json b/lodash-es/package.json
new file mode 100644
index 0000000000..27f0917342
--- /dev/null
+++ b/lodash-es/package.json
@@ -0,0 +1,5 @@
+{
+    "dependencies": {
+        "lodash": ">=4.14.0"
+    }
+}
diff --git a/lodash-es/pad/index.d.ts b/lodash-es/pad/index.d.ts
new file mode 100644
index 0000000000..cf433d4663
--- /dev/null
+++ b/lodash-es/pad/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const pad: typeof _.pad;
+export default pad;
diff --git a/lodash-es/padEnd/index.d.ts b/lodash-es/padEnd/index.d.ts
new file mode 100644
index 0000000000..701b09551d
--- /dev/null
+++ b/lodash-es/padEnd/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const padEnd: typeof _.padEnd;
+export default padEnd;
diff --git a/lodash-es/padStart/index.d.ts b/lodash-es/padStart/index.d.ts
new file mode 100644
index 0000000000..be4d29907a
--- /dev/null
+++ b/lodash-es/padStart/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const padStart: typeof _.padStart;
+export default padStart;
diff --git a/lodash-es/parseInt/index.d.ts b/lodash-es/parseInt/index.d.ts
new file mode 100644
index 0000000000..ea95ce55f4
--- /dev/null
+++ b/lodash-es/parseInt/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const parseInt: typeof _.parseInt;
+export default parseInt;
diff --git a/lodash-es/partial/index.d.ts b/lodash-es/partial/index.d.ts
new file mode 100644
index 0000000000..b87c82b07a
--- /dev/null
+++ b/lodash-es/partial/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const partial: typeof _.partial;
+export default partial;
diff --git a/lodash-es/partialRight/index.d.ts b/lodash-es/partialRight/index.d.ts
new file mode 100644
index 0000000000..893f6541a6
--- /dev/null
+++ b/lodash-es/partialRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const partialRight: typeof _.partialRight;
+export default partialRight;
diff --git a/lodash-es/partition/index.d.ts b/lodash-es/partition/index.d.ts
new file mode 100644
index 0000000000..54c7aedd2f
--- /dev/null
+++ b/lodash-es/partition/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const partition: typeof _.partition;
+export default partition;
diff --git a/lodash-es/pick/index.d.ts b/lodash-es/pick/index.d.ts
new file mode 100644
index 0000000000..7ed39cfd45
--- /dev/null
+++ b/lodash-es/pick/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const pick: typeof _.pick;
+export default pick;
diff --git a/lodash-es/pickBy/index.d.ts b/lodash-es/pickBy/index.d.ts
new file mode 100644
index 0000000000..c37adcc1e5
--- /dev/null
+++ b/lodash-es/pickBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const pickBy: typeof _.pickBy;
+export default pickBy;
diff --git a/lodash-es/property/index.d.ts b/lodash-es/property/index.d.ts
new file mode 100644
index 0000000000..fbb31e52b9
--- /dev/null
+++ b/lodash-es/property/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const property: typeof _.property;
+export default property;
diff --git a/lodash-es/propertyOf/index.d.ts b/lodash-es/propertyOf/index.d.ts
new file mode 100644
index 0000000000..27da14daad
--- /dev/null
+++ b/lodash-es/propertyOf/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const propertyOf: typeof _.propertyOf;
+export default propertyOf;
diff --git a/lodash-es/pull/index.d.ts b/lodash-es/pull/index.d.ts
new file mode 100644
index 0000000000..6c959cf61e
--- /dev/null
+++ b/lodash-es/pull/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const pull: typeof _.pull;
+export default pull;
diff --git a/lodash-es/pullAll/index.d.ts b/lodash-es/pullAll/index.d.ts
new file mode 100644
index 0000000000..c37b1d0f94
--- /dev/null
+++ b/lodash-es/pullAll/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const pullAll: typeof _.pullAll;
+export default pullAll;
diff --git a/lodash-es/pullAllBy/index.d.ts b/lodash-es/pullAllBy/index.d.ts
new file mode 100644
index 0000000000..c8fe2e16bf
--- /dev/null
+++ b/lodash-es/pullAllBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const pullAllBy: typeof _.pullAllBy;
+export default pullAllBy;
diff --git a/lodash-es/pullAt/index.d.ts b/lodash-es/pullAt/index.d.ts
new file mode 100644
index 0000000000..15c3e2a377
--- /dev/null
+++ b/lodash-es/pullAt/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const pullAt: typeof _.pullAt;
+export default pullAt;
diff --git a/lodash-es/random/index.d.ts b/lodash-es/random/index.d.ts
new file mode 100644
index 0000000000..426f56ddef
--- /dev/null
+++ b/lodash-es/random/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const random: typeof _.random;
+export default random;
diff --git a/lodash-es/range/index.d.ts b/lodash-es/range/index.d.ts
new file mode 100644
index 0000000000..cb18402b59
--- /dev/null
+++ b/lodash-es/range/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const range: typeof _.range;
+export default range;
diff --git a/lodash-es/rangeRight/index.d.ts b/lodash-es/rangeRight/index.d.ts
new file mode 100644
index 0000000000..e515dba52b
--- /dev/null
+++ b/lodash-es/rangeRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const rangeRight: typeof _.rangeRight;
+export default rangeRight;
diff --git a/lodash-es/rearg/index.d.ts b/lodash-es/rearg/index.d.ts
new file mode 100644
index 0000000000..e446584d67
--- /dev/null
+++ b/lodash-es/rearg/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const rearg: typeof _.rearg;
+export default rearg;
diff --git a/lodash-es/reduce/index.d.ts b/lodash-es/reduce/index.d.ts
new file mode 100644
index 0000000000..4144ae4daa
--- /dev/null
+++ b/lodash-es/reduce/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const reduce: typeof _.reduce;
+export default reduce;
diff --git a/lodash-es/reduceRight/index.d.ts b/lodash-es/reduceRight/index.d.ts
new file mode 100644
index 0000000000..50953f7228
--- /dev/null
+++ b/lodash-es/reduceRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const reduceRight: typeof _.reduceRight;
+export default reduceRight;
diff --git a/lodash-es/reject/index.d.ts b/lodash-es/reject/index.d.ts
new file mode 100644
index 0000000000..73812df5fe
--- /dev/null
+++ b/lodash-es/reject/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const reject: typeof _.reject;
+export default reject;
diff --git a/lodash-es/remove/index.d.ts b/lodash-es/remove/index.d.ts
new file mode 100644
index 0000000000..41a78b2389
--- /dev/null
+++ b/lodash-es/remove/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const remove: typeof _.remove;
+export default remove;
diff --git a/lodash-es/repeat/index.d.ts b/lodash-es/repeat/index.d.ts
new file mode 100644
index 0000000000..64d2507d01
--- /dev/null
+++ b/lodash-es/repeat/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const repeat: typeof _.repeat;
+export default repeat;
diff --git a/lodash-es/replace/index.d.ts b/lodash-es/replace/index.d.ts
new file mode 100644
index 0000000000..cc35b2043b
--- /dev/null
+++ b/lodash-es/replace/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const replace: typeof _.replace;
+export default replace;
diff --git a/lodash-es/rest/index.d.ts b/lodash-es/rest/index.d.ts
new file mode 100644
index 0000000000..4ff5ec1716
--- /dev/null
+++ b/lodash-es/rest/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const rest: typeof _.rest;
+export default rest;
diff --git a/lodash-es/result/index.d.ts b/lodash-es/result/index.d.ts
new file mode 100644
index 0000000000..36c1b43514
--- /dev/null
+++ b/lodash-es/result/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const result: typeof _.result;
+export default result;
diff --git a/lodash-es/reverse/index.d.ts b/lodash-es/reverse/index.d.ts
new file mode 100644
index 0000000000..baeaadeece
--- /dev/null
+++ b/lodash-es/reverse/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const reverse: typeof _.reverse;
+export default reverse;
diff --git a/lodash-es/round/index.d.ts b/lodash-es/round/index.d.ts
new file mode 100644
index 0000000000..3e689aea24
--- /dev/null
+++ b/lodash-es/round/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const round: typeof _.round;
+export default round;
diff --git a/lodash-es/runInContext/index.d.ts b/lodash-es/runInContext/index.d.ts
new file mode 100644
index 0000000000..9062c43c9e
--- /dev/null
+++ b/lodash-es/runInContext/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const runInContext: typeof _.runInContext;
+export default runInContext;
diff --git a/lodash-es/sample/index.d.ts b/lodash-es/sample/index.d.ts
new file mode 100644
index 0000000000..8b5ac9d960
--- /dev/null
+++ b/lodash-es/sample/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sample: typeof _.sample;
+export default sample;
diff --git a/lodash-es/sampleSize/index.d.ts b/lodash-es/sampleSize/index.d.ts
new file mode 100644
index 0000000000..fd6714d967
--- /dev/null
+++ b/lodash-es/sampleSize/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sampleSize: typeof _.sampleSize;
+export default sampleSize;
diff --git a/lodash-es/set/index.d.ts b/lodash-es/set/index.d.ts
new file mode 100644
index 0000000000..4472c88874
--- /dev/null
+++ b/lodash-es/set/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const set: typeof _.set;
+export default set;
diff --git a/lodash-es/setWith/index.d.ts b/lodash-es/setWith/index.d.ts
new file mode 100644
index 0000000000..bc9bfa2f23
--- /dev/null
+++ b/lodash-es/setWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const setWith: typeof _.setWith;
+export default setWith;
diff --git a/lodash-es/shuffle/index.d.ts b/lodash-es/shuffle/index.d.ts
new file mode 100644
index 0000000000..c1f10cb79f
--- /dev/null
+++ b/lodash-es/shuffle/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const shuffle: typeof _.shuffle;
+export default shuffle;
diff --git a/lodash-es/size/index.d.ts b/lodash-es/size/index.d.ts
new file mode 100644
index 0000000000..0e47c325ea
--- /dev/null
+++ b/lodash-es/size/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const size: typeof _.size;
+export default size;
diff --git a/lodash-es/slice/index.d.ts b/lodash-es/slice/index.d.ts
new file mode 100644
index 0000000000..9d8aaffc83
--- /dev/null
+++ b/lodash-es/slice/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const slice: typeof _.slice;
+export default slice;
diff --git a/lodash-es/snakeCase/index.d.ts b/lodash-es/snakeCase/index.d.ts
new file mode 100644
index 0000000000..4ed1129d8c
--- /dev/null
+++ b/lodash-es/snakeCase/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const snakeCase: typeof _.snakeCase;
+export default snakeCase;
diff --git a/lodash-es/some/index.d.ts b/lodash-es/some/index.d.ts
new file mode 100644
index 0000000000..27dbceeddb
--- /dev/null
+++ b/lodash-es/some/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const some: typeof _.some;
+export default some;
diff --git a/lodash-es/sortBy/index.d.ts b/lodash-es/sortBy/index.d.ts
new file mode 100644
index 0000000000..3974667db9
--- /dev/null
+++ b/lodash-es/sortBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortBy: typeof _.sortBy;
+export default sortBy;
diff --git a/lodash-es/sortedIndex/index.d.ts b/lodash-es/sortedIndex/index.d.ts
new file mode 100644
index 0000000000..47413f639e
--- /dev/null
+++ b/lodash-es/sortedIndex/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedIndex: typeof _.sortedIndex;
+export default sortedIndex;
diff --git a/lodash-es/sortedIndexBy/index.d.ts b/lodash-es/sortedIndexBy/index.d.ts
new file mode 100644
index 0000000000..319ed34d5a
--- /dev/null
+++ b/lodash-es/sortedIndexBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedIndexBy: typeof _.sortedIndexBy;
+export default sortedIndexBy;
diff --git a/lodash-es/sortedIndexOf/index.d.ts b/lodash-es/sortedIndexOf/index.d.ts
new file mode 100644
index 0000000000..24fba2ed53
--- /dev/null
+++ b/lodash-es/sortedIndexOf/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedIndexOf: typeof _.sortedIndexOf;
+export default sortedIndexOf;
diff --git a/lodash-es/sortedLastIndex/index.d.ts b/lodash-es/sortedLastIndex/index.d.ts
new file mode 100644
index 0000000000..43f98b2a7e
--- /dev/null
+++ b/lodash-es/sortedLastIndex/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedLastIndex: typeof _.sortedLastIndex;
+export default sortedLastIndex;
diff --git a/lodash-es/sortedLastIndexBy/index.d.ts b/lodash-es/sortedLastIndexBy/index.d.ts
new file mode 100644
index 0000000000..9475209c54
--- /dev/null
+++ b/lodash-es/sortedLastIndexBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedLastIndexBy: typeof _.sortedLastIndexBy;
+export default sortedLastIndexBy;
diff --git a/lodash-es/sortedLastIndexOf/index.d.ts b/lodash-es/sortedLastIndexOf/index.d.ts
new file mode 100644
index 0000000000..0616f1681c
--- /dev/null
+++ b/lodash-es/sortedLastIndexOf/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedLastIndexOf: typeof _.sortedLastIndexOf;
+export default sortedLastIndexOf;
diff --git a/lodash-es/sortedUniq/index.d.ts b/lodash-es/sortedUniq/index.d.ts
new file mode 100644
index 0000000000..d07b2cce2d
--- /dev/null
+++ b/lodash-es/sortedUniq/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedUniq: typeof _.sortedUniq;
+export default sortedUniq;
diff --git a/lodash-es/sortedUniqBy/index.d.ts b/lodash-es/sortedUniqBy/index.d.ts
new file mode 100644
index 0000000000..c8f6dd5af6
--- /dev/null
+++ b/lodash-es/sortedUniqBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sortedUniqBy: typeof _.sortedUniqBy;
+export default sortedUniqBy;
diff --git a/lodash-es/split/index.d.ts b/lodash-es/split/index.d.ts
new file mode 100644
index 0000000000..324d02d47c
--- /dev/null
+++ b/lodash-es/split/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const split: typeof _.split;
+export default split;
diff --git a/lodash-es/spread/index.d.ts b/lodash-es/spread/index.d.ts
new file mode 100644
index 0000000000..461cca54f8
--- /dev/null
+++ b/lodash-es/spread/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const spread: typeof _.spread;
+export default spread;
diff --git a/lodash-es/startCase/index.d.ts b/lodash-es/startCase/index.d.ts
new file mode 100644
index 0000000000..47adda4778
--- /dev/null
+++ b/lodash-es/startCase/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const startCase: typeof _.startCase;
+export default startCase;
diff --git a/lodash-es/startsWith/index.d.ts b/lodash-es/startsWith/index.d.ts
new file mode 100644
index 0000000000..6911075113
--- /dev/null
+++ b/lodash-es/startsWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const startsWith: typeof _.startsWith;
+export default startsWith;
diff --git a/lodash-es/subtract/index.d.ts b/lodash-es/subtract/index.d.ts
new file mode 100644
index 0000000000..0f95bf51bd
--- /dev/null
+++ b/lodash-es/subtract/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const subtract: typeof _.subtract;
+export default subtract;
diff --git a/lodash-es/sum/index.d.ts b/lodash-es/sum/index.d.ts
new file mode 100644
index 0000000000..4c56b8d65e
--- /dev/null
+++ b/lodash-es/sum/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sum: typeof _.sum;
+export default sum;
diff --git a/lodash-es/sumBy/index.d.ts b/lodash-es/sumBy/index.d.ts
new file mode 100644
index 0000000000..f0eed13717
--- /dev/null
+++ b/lodash-es/sumBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const sumBy: typeof _.sumBy;
+export default sumBy;
diff --git a/lodash-es/tail/index.d.ts b/lodash-es/tail/index.d.ts
new file mode 100644
index 0000000000..0ac36fc944
--- /dev/null
+++ b/lodash-es/tail/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const tail: typeof _.tail;
+export default tail;
diff --git a/lodash-es/take/index.d.ts b/lodash-es/take/index.d.ts
new file mode 100644
index 0000000000..93178fa05f
--- /dev/null
+++ b/lodash-es/take/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const take: typeof _.take;
+export default take;
diff --git a/lodash-es/takeRight/index.d.ts b/lodash-es/takeRight/index.d.ts
new file mode 100644
index 0000000000..198c35a364
--- /dev/null
+++ b/lodash-es/takeRight/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const takeRight: typeof _.takeRight;
+export default takeRight;
diff --git a/lodash-es/takeRightWhile/index.d.ts b/lodash-es/takeRightWhile/index.d.ts
new file mode 100644
index 0000000000..d530ad33d6
--- /dev/null
+++ b/lodash-es/takeRightWhile/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const takeRightWhile: typeof _.takeRightWhile;
+export default takeRightWhile;
diff --git a/lodash-es/takeWhile/index.d.ts b/lodash-es/takeWhile/index.d.ts
new file mode 100644
index 0000000000..526f3743b1
--- /dev/null
+++ b/lodash-es/takeWhile/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const takeWhile: typeof _.takeWhile;
+export default takeWhile;
diff --git a/lodash-es/tap/index.d.ts b/lodash-es/tap/index.d.ts
new file mode 100644
index 0000000000..33c2b8b111
--- /dev/null
+++ b/lodash-es/tap/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const tap: typeof _.tap;
+export default tap;
diff --git a/lodash-es/template/index.d.ts b/lodash-es/template/index.d.ts
new file mode 100644
index 0000000000..d034b9fa77
--- /dev/null
+++ b/lodash-es/template/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const template: typeof _.template;
+export default template;
diff --git a/lodash-es/throttle/index.d.ts b/lodash-es/throttle/index.d.ts
new file mode 100644
index 0000000000..513c7b5d5d
--- /dev/null
+++ b/lodash-es/throttle/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const throttle: typeof _.throttle;
+export default throttle;
diff --git a/lodash-es/thru/index.d.ts b/lodash-es/thru/index.d.ts
new file mode 100644
index 0000000000..1726f23228
--- /dev/null
+++ b/lodash-es/thru/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const thru: typeof _.thru;
+export default thru;
diff --git a/lodash-es/times/index.d.ts b/lodash-es/times/index.d.ts
new file mode 100644
index 0000000000..a917d3c4b1
--- /dev/null
+++ b/lodash-es/times/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const times: typeof _.times;
+export default times;
diff --git a/lodash-es/toArray/index.d.ts b/lodash-es/toArray/index.d.ts
new file mode 100644
index 0000000000..3c0a17b73b
--- /dev/null
+++ b/lodash-es/toArray/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toArray: typeof _.toArray;
+export default toArray;
diff --git a/lodash-es/toInteger/index.d.ts b/lodash-es/toInteger/index.d.ts
new file mode 100644
index 0000000000..2cc3269564
--- /dev/null
+++ b/lodash-es/toInteger/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toInteger: typeof _.toInteger;
+export default toInteger;
diff --git a/lodash-es/toLength/index.d.ts b/lodash-es/toLength/index.d.ts
new file mode 100644
index 0000000000..5a58a74444
--- /dev/null
+++ b/lodash-es/toLength/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toLength: typeof _.toLength;
+export default toLength;
diff --git a/lodash-es/toLower/index.d.ts b/lodash-es/toLower/index.d.ts
new file mode 100644
index 0000000000..822e0a5398
--- /dev/null
+++ b/lodash-es/toLower/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toLower: typeof _.toLower;
+export default toLower;
diff --git a/lodash-es/toNumber/index.d.ts b/lodash-es/toNumber/index.d.ts
new file mode 100644
index 0000000000..773b27b6ac
--- /dev/null
+++ b/lodash-es/toNumber/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toNumber: typeof _.toNumber;
+export default toNumber;
diff --git a/lodash-es/toPairs/index.d.ts b/lodash-es/toPairs/index.d.ts
new file mode 100644
index 0000000000..c8dd85752c
--- /dev/null
+++ b/lodash-es/toPairs/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toPairs: typeof _.toPairs;
+export default toPairs;
diff --git a/lodash-es/toPairsIn/index.d.ts b/lodash-es/toPairsIn/index.d.ts
new file mode 100644
index 0000000000..f25ebc6231
--- /dev/null
+++ b/lodash-es/toPairsIn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toPairsIn: typeof _.toPairsIn;
+export default toPairsIn;
diff --git a/lodash-es/toPath/index.d.ts b/lodash-es/toPath/index.d.ts
new file mode 100644
index 0000000000..14c24785e0
--- /dev/null
+++ b/lodash-es/toPath/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toPath: typeof _.toPath;
+export default toPath;
diff --git a/lodash-es/toPlainObject/index.d.ts b/lodash-es/toPlainObject/index.d.ts
new file mode 100644
index 0000000000..daf78df646
--- /dev/null
+++ b/lodash-es/toPlainObject/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toPlainObject: typeof _.toPlainObject;
+export default toPlainObject;
diff --git a/lodash-es/toSafeInteger/index.d.ts b/lodash-es/toSafeInteger/index.d.ts
new file mode 100644
index 0000000000..8a745612c7
--- /dev/null
+++ b/lodash-es/toSafeInteger/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toSafeInteger: typeof _.toSafeInteger;
+export default toSafeInteger;
diff --git a/lodash-es/toString/index.d.ts b/lodash-es/toString/index.d.ts
new file mode 100644
index 0000000000..4368b5151e
--- /dev/null
+++ b/lodash-es/toString/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toString: typeof _.toString;
+export default toString;
diff --git a/lodash-es/toUpper/index.d.ts b/lodash-es/toUpper/index.d.ts
new file mode 100644
index 0000000000..1af2cf82ad
--- /dev/null
+++ b/lodash-es/toUpper/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const toUpper: typeof _.toUpper;
+export default toUpper;
diff --git a/lodash-es/transform/index.d.ts b/lodash-es/transform/index.d.ts
new file mode 100644
index 0000000000..3cf81aaa34
--- /dev/null
+++ b/lodash-es/transform/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const transform: typeof _.transform;
+export default transform;
diff --git a/lodash-es/trim/index.d.ts b/lodash-es/trim/index.d.ts
new file mode 100644
index 0000000000..f4339c8ef4
--- /dev/null
+++ b/lodash-es/trim/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const trim: typeof _.trim;
+export default trim;
diff --git a/lodash-es/trimEnd/index.d.ts b/lodash-es/trimEnd/index.d.ts
new file mode 100644
index 0000000000..dd2e972c0e
--- /dev/null
+++ b/lodash-es/trimEnd/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const trimEnd: typeof _.trimEnd;
+export default trimEnd;
diff --git a/lodash-es/trimStart/index.d.ts b/lodash-es/trimStart/index.d.ts
new file mode 100644
index 0000000000..8a097d0e41
--- /dev/null
+++ b/lodash-es/trimStart/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const trimStart: typeof _.trimStart;
+export default trimStart;
diff --git a/lodash-es/truncate/index.d.ts b/lodash-es/truncate/index.d.ts
new file mode 100644
index 0000000000..b460b03a77
--- /dev/null
+++ b/lodash-es/truncate/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const truncate: typeof _.truncate;
+export default truncate;
diff --git a/lodash-es/tsconfig.json b/lodash-es/tsconfig.json
new file mode 100644
index 0000000000..74653a6c6c
--- /dev/null
+++ b/lodash-es/tsconfig.json
@@ -0,0 +1,304 @@
+{
+    "files": [
+        "index.d.ts",
+        "lodash-tests.ts",
+        "add/index.d.ts",
+        "after/index.d.ts",
+        "ary/index.d.ts",
+        "assign/index.d.ts",
+        "assignIn/index.d.ts",
+        "assignInWith/index.d.ts",
+        "assignWith/index.d.ts",
+        "at/index.d.ts",
+        "attempt/index.d.ts",
+        "before/index.d.ts",
+        "bind/index.d.ts",
+        "bindAll/index.d.ts",
+        "bindKey/index.d.ts",
+        "camelCase/index.d.ts",
+        "capitalize/index.d.ts",
+        "castArray/index.d.ts",
+        "ceil/index.d.ts",
+        "chain/index.d.ts",
+        "chunk/index.d.ts",
+        "clamp/index.d.ts",
+        "clone/index.d.ts",
+        "cloneDeep/index.d.ts",
+        "cloneDeepWith/index.d.ts",
+        "cloneWith/index.d.ts",
+        "compact/index.d.ts",
+        "concat/index.d.ts",
+        "constant/index.d.ts",
+        "countBy/index.d.ts",
+        "create/index.d.ts",
+        "curry/index.d.ts",
+        "curryRight/index.d.ts",
+        "debounce/index.d.ts",
+        "deburr/index.d.ts",
+        "defaults/index.d.ts",
+        "defaultsDeep/index.d.ts",
+        "defer/index.d.ts",
+        "delay/index.d.ts",
+        "difference/index.d.ts",
+        "differenceBy/index.d.ts",
+        "differenceWith/index.d.ts",
+        "drop/index.d.ts",
+        "dropRight/index.d.ts",
+        "dropRightWhile/index.d.ts",
+        "dropWhile/index.d.ts",
+        "each/index.d.ts",
+        "eachRight/index.d.ts",
+        "endsWith/index.d.ts",
+        "eq/index.d.ts",
+        "escape/index.d.ts",
+        "escapeRegExp/index.d.ts",
+        "every/index.d.ts",
+        "extend/index.d.ts",
+        "extendWith/index.d.ts",
+        "fb/index.d.ts",
+        "fill/index.d.ts",
+        "filter/index.d.ts",
+        "find/index.d.ts",
+        "findIndex/index.d.ts",
+        "findKey/index.d.ts",
+        "findLast/index.d.ts",
+        "findLastIndex/index.d.ts",
+        "findLastKey/index.d.ts",
+        "first/index.d.ts",
+        "flatMap/index.d.ts",
+        "flatten/index.d.ts",
+        "flattenDeep/index.d.ts",
+        "flattenDepth/index.d.ts",
+        "flip/index.d.ts",
+        "floor/index.d.ts",
+        "flow/index.d.ts",
+        "flowRight/index.d.ts",
+        "forEach/index.d.ts",
+        "forEachRight/index.d.ts",
+        "forIn/index.d.ts",
+        "forInRight/index.d.ts",
+        "forOwn/index.d.ts",
+        "forOwnRight/index.d.ts",
+        "fromPairs/index.d.ts",
+        "functions/index.d.ts",
+        "functionsIn/index.d.ts",
+        "get/index.d.ts",
+        "groupBy/index.d.ts",
+        "gt/index.d.ts",
+        "gte/index.d.ts",
+        "has/index.d.ts",
+        "hasIn/index.d.ts",
+        "head/index.d.ts",
+        "identity/index.d.ts",
+        "includes/index.d.ts",
+        "indexOf/index.d.ts",
+        "initial/index.d.ts",
+        "inRange/index.d.ts",
+        "intersection/index.d.ts",
+        "intersectionBy/index.d.ts",
+        "intersectionWith/index.d.ts",
+        "invert/index.d.ts",
+        "invertBy/index.d.ts",
+        "invoke/index.d.ts",
+        "invokeMap/index.d.ts",
+        "isArguments/index.d.ts",
+        "isArray/index.d.ts",
+        "isArrayBuffer/index.d.ts",
+        "isArrayLike/index.d.ts",
+        "isArrayLikeObject/index.d.ts",
+        "isBoolean/index.d.ts",
+        "isBuffer/index.d.ts",
+        "isDate/index.d.ts",
+        "isElement/index.d.ts",
+        "isEmpty/index.d.ts",
+        "isEqual/index.d.ts",
+        "isEqualWith/index.d.ts",
+        "isError/index.d.ts",
+        "isFinite/index.d.ts",
+        "isFunction/index.d.ts",
+        "isInteger/index.d.ts",
+        "isLength/index.d.ts",
+        "isMap/index.d.ts",
+        "isMatch/index.d.ts",
+        "isMatchWith/index.d.ts",
+        "isNaN/index.d.ts",
+        "isNative/index.d.ts",
+        "isNil/index.d.ts",
+        "isNull/index.d.ts",
+        "isNumber/index.d.ts",
+        "isObject/index.d.ts",
+        "isObjectLike/index.d.ts",
+        "isPlainObject/index.d.ts",
+        "isRegExp/index.d.ts",
+        "isSafeInteger/index.d.ts",
+        "isSet/index.d.ts",
+        "isString/index.d.ts",
+        "isSymbol/index.d.ts",
+        "isTypedArray/index.d.ts",
+        "isUndefined/index.d.ts",
+        "isWeakMap/index.d.ts",
+        "isWeakSet/index.d.ts",
+        "iteratee/index.d.ts",
+        "join/index.d.ts",
+        "kebabCase/index.d.ts",
+        "keyBy/index.d.ts",
+        "keys/index.d.ts",
+        "keysIn/index.d.ts",
+        "last/index.d.ts",
+        "lastIndexOf/index.d.ts",
+        "lowerCase/index.d.ts",
+        "lowerFirst/index.d.ts",
+        "lt/index.d.ts",
+        "lte/index.d.ts",
+        "map/index.d.ts",
+        "mapKeys/index.d.ts",
+        "mapValues/index.d.ts",
+        "matches/index.d.ts",
+        "matchesProperty/index.d.ts",
+        "max/index.d.ts",
+        "maxBy/index.d.ts",
+        "mean/index.d.ts",
+        "memoize/index.d.ts",
+        "merge/index.d.ts",
+        "mergeWith/index.d.ts",
+        "method/index.d.ts",
+        "methodOf/index.d.ts",
+        "min/index.d.ts",
+        "minBy/index.d.ts",
+        "mixin/index.d.ts",
+        "negate/index.d.ts",
+        "noConflict/index.d.ts",
+        "noop/index.d.ts",
+        "now/index.d.ts",
+        "nthArg/index.d.ts",
+        "omit/index.d.ts",
+        "omitBy/index.d.ts",
+        "once/index.d.ts",
+        "orderBy/index.d.ts",
+        "over/index.d.ts",
+        "overArgs/index.d.ts",
+        "overEvery/index.d.ts",
+        "overSome/index.d.ts",
+        "pad/index.d.ts",
+        "padEnd/index.d.ts",
+        "padStart/index.d.ts",
+        "parseInt/index.d.ts",
+        "partial/index.d.ts",
+        "partialRight/index.d.ts",
+        "partition/index.d.ts",
+        "pick/index.d.ts",
+        "pickBy/index.d.ts",
+        "property/index.d.ts",
+        "propertyOf/index.d.ts",
+        "pull/index.d.ts",
+        "pullAll/index.d.ts",
+        "pullAllBy/index.d.ts",
+        "pullAt/index.d.ts",
+        "random/index.d.ts",
+        "range/index.d.ts",
+        "rangeRight/index.d.ts",
+        "rearg/index.d.ts",
+        "reduce/index.d.ts",
+        "reduceRight/index.d.ts",
+        "reject/index.d.ts",
+        "remove/index.d.ts",
+        "repeat/index.d.ts",
+        "replace/index.d.ts",
+        "rest/index.d.ts",
+        "result/index.d.ts",
+        "reverse/index.d.ts",
+        "round/index.d.ts",
+        "runInContext/index.d.ts",
+        "sample/index.d.ts",
+        "sampleSize/index.d.ts",
+        "set/index.d.ts",
+        "setWith/index.d.ts",
+        "shuffle/index.d.ts",
+        "size/index.d.ts",
+        "slice/index.d.ts",
+        "snakeCase/index.d.ts",
+        "some/index.d.ts",
+        "sortBy/index.d.ts",
+        "sortedIndex/index.d.ts",
+        "sortedIndexBy/index.d.ts",
+        "sortedIndexOf/index.d.ts",
+        "sortedLastIndex/index.d.ts",
+        "sortedLastIndexBy/index.d.ts",
+        "sortedLastIndexOf/index.d.ts",
+        "sortedUniq/index.d.ts",
+        "sortedUniqBy/index.d.ts",
+        "split/index.d.ts",
+        "spread/index.d.ts",
+        "startCase/index.d.ts",
+        "startsWith/index.d.ts",
+        "subtract/index.d.ts",
+        "sum/index.d.ts",
+        "sumBy/index.d.ts",
+        "tail/index.d.ts",
+        "take/index.d.ts",
+        "takeRight/index.d.ts",
+        "takeRightWhile/index.d.ts",
+        "takeWhile/index.d.ts",
+        "tap/index.d.ts",
+        "template/index.d.ts",
+        "throttle/index.d.ts",
+        "thru/index.d.ts",
+        "times/index.d.ts",
+        "toArray/index.d.ts",
+        "toInteger/index.d.ts",
+        "toLength/index.d.ts",
+        "toLower/index.d.ts",
+        "toNumber/index.d.ts",
+        "toPairs/index.d.ts",
+        "toPairsIn/index.d.ts",
+        "toPath/index.d.ts",
+        "toPlainObject/index.d.ts",
+        "toSafeInteger/index.d.ts",
+        "toString/index.d.ts",
+        "toUpper/index.d.ts",
+        "transform/index.d.ts",
+        "trim/index.d.ts",
+        "trimEnd/index.d.ts",
+        "trimStart/index.d.ts",
+        "truncate/index.d.ts",
+        "unary/index.d.ts",
+        "unescape/index.d.ts",
+        "union/index.d.ts",
+        "unionBy/index.d.ts",
+        "unionWith/index.d.ts",
+        "uniq/index.d.ts",
+        "uniqBy/index.d.ts",
+        "uniqueId/index.d.ts",
+        "uniqWith/index.d.ts",
+        "unset/index.d.ts",
+        "unzip/index.d.ts",
+        "unzipWith/index.d.ts",
+        "update/index.d.ts",
+        "upperCase/index.d.ts",
+        "upperFirst/index.d.ts",
+        "values/index.d.ts",
+        "valuesIn/index.d.ts",
+        "without/index.d.ts",
+        "words/index.d.ts",
+        "wrap/index.d.ts",
+        "xor/index.d.ts",
+        "xorBy/index.d.ts",
+        "xorWith/index.d.ts",
+        "zip/index.d.ts",
+        "zipObject/index.d.ts",
+        "zipWith/index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/lodash-es/tslint.json b/lodash-es/tslint.json
new file mode 100644
index 0000000000..2221e40e4a
--- /dev/null
+++ b/lodash-es/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
\ No newline at end of file
diff --git a/lodash-es/unary/index.d.ts b/lodash-es/unary/index.d.ts
new file mode 100644
index 0000000000..d8c0e57fb1
--- /dev/null
+++ b/lodash-es/unary/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const unary: typeof _.unary;
+export default unary;
diff --git a/lodash-es/unescape/index.d.ts b/lodash-es/unescape/index.d.ts
new file mode 100644
index 0000000000..3506888535
--- /dev/null
+++ b/lodash-es/unescape/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const unescape: typeof _.unescape;
+export default unescape;
diff --git a/lodash-es/union/index.d.ts b/lodash-es/union/index.d.ts
new file mode 100644
index 0000000000..b08034f25c
--- /dev/null
+++ b/lodash-es/union/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const union: typeof _.union;
+export default union;
diff --git a/lodash-es/unionBy/index.d.ts b/lodash-es/unionBy/index.d.ts
new file mode 100644
index 0000000000..edadc46ba2
--- /dev/null
+++ b/lodash-es/unionBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const unionBy: typeof _.unionBy;
+export default unionBy;
diff --git a/lodash-es/unionWith/index.d.ts b/lodash-es/unionWith/index.d.ts
new file mode 100644
index 0000000000..d54e10d78c
--- /dev/null
+++ b/lodash-es/unionWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const unionWith: typeof _.unionWith;
+export default unionWith;
diff --git a/lodash-es/uniq/index.d.ts b/lodash-es/uniq/index.d.ts
new file mode 100644
index 0000000000..4762079e3c
--- /dev/null
+++ b/lodash-es/uniq/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const uniq: typeof _.uniq;
+export default uniq;
diff --git a/lodash-es/uniqBy/index.d.ts b/lodash-es/uniqBy/index.d.ts
new file mode 100644
index 0000000000..375c79ff00
--- /dev/null
+++ b/lodash-es/uniqBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const uniqBy: typeof _.uniqBy;
+export default uniqBy;
diff --git a/lodash-es/uniqWith/index.d.ts b/lodash-es/uniqWith/index.d.ts
new file mode 100644
index 0000000000..206dbd676f
--- /dev/null
+++ b/lodash-es/uniqWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const uniqWith: typeof _.uniqWith;
+export default uniqWith;
diff --git a/lodash-es/uniqueId/index.d.ts b/lodash-es/uniqueId/index.d.ts
new file mode 100644
index 0000000000..19fc567963
--- /dev/null
+++ b/lodash-es/uniqueId/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const uniqueId: typeof _.uniqueId;
+export default uniqueId;
diff --git a/lodash-es/unset/index.d.ts b/lodash-es/unset/index.d.ts
new file mode 100644
index 0000000000..3ca4539505
--- /dev/null
+++ b/lodash-es/unset/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const unset: typeof _.unset;
+export default unset;
diff --git a/lodash-es/unzip/index.d.ts b/lodash-es/unzip/index.d.ts
new file mode 100644
index 0000000000..a7eead8dd4
--- /dev/null
+++ b/lodash-es/unzip/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const unzip: typeof _.unzip;
+export default unzip;
diff --git a/lodash-es/unzipWith/index.d.ts b/lodash-es/unzipWith/index.d.ts
new file mode 100644
index 0000000000..bd54fec609
--- /dev/null
+++ b/lodash-es/unzipWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const unzipWith: typeof _.unzipWith;
+export default unzipWith;
diff --git a/lodash-es/update/index.d.ts b/lodash-es/update/index.d.ts
new file mode 100644
index 0000000000..980239450a
--- /dev/null
+++ b/lodash-es/update/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const update: typeof _.update;
+export default update;
diff --git a/lodash-es/upperCase/index.d.ts b/lodash-es/upperCase/index.d.ts
new file mode 100644
index 0000000000..ac41216f80
--- /dev/null
+++ b/lodash-es/upperCase/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const upperCase: typeof _.upperCase;
+export default upperCase;
diff --git a/lodash-es/upperFirst/index.d.ts b/lodash-es/upperFirst/index.d.ts
new file mode 100644
index 0000000000..aebaffb3d6
--- /dev/null
+++ b/lodash-es/upperFirst/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const upperFirst: typeof _.upperFirst;
+export default upperFirst;
diff --git a/lodash-es/values/index.d.ts b/lodash-es/values/index.d.ts
new file mode 100644
index 0000000000..8c2ec79150
--- /dev/null
+++ b/lodash-es/values/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const values: typeof _.values;
+export default values;
diff --git a/lodash-es/valuesIn/index.d.ts b/lodash-es/valuesIn/index.d.ts
new file mode 100644
index 0000000000..5a7a19d852
--- /dev/null
+++ b/lodash-es/valuesIn/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const valuesIn: typeof _.valuesIn;
+export default valuesIn;
diff --git a/lodash-es/without/index.d.ts b/lodash-es/without/index.d.ts
new file mode 100644
index 0000000000..88dba2ae33
--- /dev/null
+++ b/lodash-es/without/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const without: typeof _.without;
+export default without;
diff --git a/lodash-es/words/index.d.ts b/lodash-es/words/index.d.ts
new file mode 100644
index 0000000000..02fe6bcc57
--- /dev/null
+++ b/lodash-es/words/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const words: typeof _.words;
+export default words;
diff --git a/lodash-es/wrap/index.d.ts b/lodash-es/wrap/index.d.ts
new file mode 100644
index 0000000000..15a7ddbbc4
--- /dev/null
+++ b/lodash-es/wrap/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const wrap: typeof _.wrap;
+export default wrap;
diff --git a/lodash-es/xor/index.d.ts b/lodash-es/xor/index.d.ts
new file mode 100644
index 0000000000..bbbe130a7a
--- /dev/null
+++ b/lodash-es/xor/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const xor: typeof _.xor;
+export default xor;
diff --git a/lodash-es/xorBy/index.d.ts b/lodash-es/xorBy/index.d.ts
new file mode 100644
index 0000000000..373baf8544
--- /dev/null
+++ b/lodash-es/xorBy/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const xorBy: typeof _.xorBy;
+export default xorBy;
diff --git a/lodash-es/xorWith/index.d.ts b/lodash-es/xorWith/index.d.ts
new file mode 100644
index 0000000000..0deeb4a07c
--- /dev/null
+++ b/lodash-es/xorWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const xorWith: typeof _.xorWith;
+export default xorWith;
diff --git a/lodash-es/zip/index.d.ts b/lodash-es/zip/index.d.ts
new file mode 100644
index 0000000000..84bca1bbb8
--- /dev/null
+++ b/lodash-es/zip/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const zip: typeof _.zip;
+export default zip;
diff --git a/lodash-es/zipObject/index.d.ts b/lodash-es/zipObject/index.d.ts
new file mode 100644
index 0000000000..264c843317
--- /dev/null
+++ b/lodash-es/zipObject/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const zipObject: typeof _.zipObject;
+export default zipObject;
diff --git a/lodash-es/zipWith/index.d.ts b/lodash-es/zipWith/index.d.ts
new file mode 100644
index 0000000000..e67bc61a33
--- /dev/null
+++ b/lodash-es/zipWith/index.d.ts
@@ -0,0 +1,3 @@
+import * as _ from "lodash";
+declare const zipWith: typeof _.zipWith;
+export default zipWith;

From aa8f54212e2ab7e89accb81f3e27e72f616f8e63 Mon Sep 17 00:00:00 2001
From: Stephen Lautier <stephen.lautier@outlook.com>
Date: Sat, 19 Nov 2016 19:25:18 +0100
Subject: [PATCH 196/245] fix lodash test

---
 lodash-es/tsconfig.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lodash-es/tsconfig.json b/lodash-es/tsconfig.json
index 74653a6c6c..5cec53c53e 100644
--- a/lodash-es/tsconfig.json
+++ b/lodash-es/tsconfig.json
@@ -1,7 +1,7 @@
 {
     "files": [
         "index.d.ts",
-        "lodash-tests.ts",
+        "lodash-es-tests.ts",
         "add/index.d.ts",
         "after/index.d.ts",
         "ary/index.d.ts",

From 55b5cd8a219d83cd2e2c753856c67106b6238185 Mon Sep 17 00:00:00 2001
From: zeh fernando <zeh@users.noreply.github.com>
Date: Sat, 19 Nov 2016 14:27:45 -0500
Subject: [PATCH 197/245] Added `simplesignal` and `prando` to
 notNeededPackages.json

As per https://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html instructions under "Publicize your declaration file", this adds references to two of my projects to the list of NPM packages that do not need declaration types. The packages themselves already ship with their own `.d.ts` file, and their `types` declared within `packages.json`.
---
 notNeededPackages.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/notNeededPackages.json b/notNeededPackages.json
index b2c8de0dfe..9d21a32db6 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -52,6 +52,18 @@
             "typingsPackageName": "typescript-services",
             "sourceRepoURL": "https://github.com/Microsoft/TypeScript",
             "asOfVersion": "2.0.0"
+        },
+        {
+            "libraryName": "Prando",
+            "typingsPackageName": "prando",
+            "sourceRepoURL": "https://github.com/zeh/prando",
+            "asOfVersion": "1.0.0"
+        },
+        {
+            "libraryName": "SimpleSignal",
+            "typingsPackageName": "simplesignal",
+            "sourceRepoURL": "https://github.com/zeh/simplesignal",
+            "asOfVersion": "1.0.0"
         }
     ]
 }

From 1946d5ea731b3d2a7c4eed89b743bd9ce6131273 Mon Sep 17 00:00:00 2001
From: markisme <zhaogehi@gmail.com>
Date: Sun, 20 Nov 2016 10:56:06 +0800
Subject: [PATCH 198/245] Add type definitions for smtp-server.

---
 smtp-server/index.d.ts           | 382 +++++++++++++++++++++++++++++++
 smtp-server/smtp-server-tests.ts |  12 +
 smtp-server/tsconfig.json        |  19 ++
 3 files changed, 413 insertions(+)
 create mode 100644 smtp-server/index.d.ts
 create mode 100644 smtp-server/smtp-server-tests.ts
 create mode 100644 smtp-server/tsconfig.json

diff --git a/smtp-server/index.d.ts b/smtp-server/index.d.ts
new file mode 100644
index 0000000000..09d11b5477
--- /dev/null
+++ b/smtp-server/index.d.ts
@@ -0,0 +1,382 @@
+// Type definitions for smtp-server v1.15.0
+// Project: https://github.com/andris9/smtp-server
+// Definitions by: markisme <https://github.com/markisme/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+
+export class SMTPServer {
+    constructor(options: SMTPServerOptions);
+    close(callback: (err?: Error) => any): any;
+    listen(...args: any[]): void;
+    onAuth(auth: Authentication, session: Session, callback: any): any;
+    onClose(callback: (err?: Error) => any): any;
+    onConnect(session: Session, callback: (err?: Error) => any): any;
+    onData(stream: any, session: Session, callback: (err?: Error) => any): any;
+    onMailFrom(address: Address, session: Session, callback: (err?: Error) => any): any;
+    onRcptTo(address: Address, session: Session, callback: (err?: Error) => any): any;
+}
+
+export interface SMTPServerOptions {
+    /**
+     * if true, the connection will use TLS. The default is false. 
+     * If the server doesn't start in TLS mode, 
+     * it is still possible to upgrade clear text socket to 
+     * TLS socket with the STARTTLS command (unless you disable support for it). 
+     * If secure is true, additional tls options for tls.
+     * createServer can be added directly onto this options object.
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    secure?: boolean;
+    key?: any;
+    cert?: any;
+    ca?: any;
+    /**
+     * optional hostname of the server,
+     *  used for identifying to the client (defaults to os.hostname())
+     * 
+     * @type {string}
+     * @memberOf SMTPServerOptions
+     */
+    name?: string;
+    /**
+     * optional greeting message.
+     *  This message is appended to the default ESMTP response.
+     * 
+     * @type {string}
+     * @memberOf SMTPServerOptions
+     */
+    banner?: string;
+    /**
+     * optional maximum allowed message size in bytes, 
+     * see details:https://github.com/andris9/smtp-server#using-size-extension
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    size?: number;
+    /**
+     * optional array of allowed authentication methods, defaults to ['PLAIN', 'LOGIN']. 
+     * Only the methods listed in this array are allowed, 
+     * so if you set it to ['XOAUTH2'] then PLAIN and LOGIN are not available. 
+     * Use ['PLAIN', 'LOGIN', 'XOAUTH2'] to allow all three. 
+     * Authentication is only allowed in secure mode 
+     * (either the server is started with secure: true option or STARTTLS command is used)
+     * 
+     * @type {string[]}
+     * @memberOf SMTPServerOptions
+     */
+    authMethods?: string[];
+    /**
+     * allow authentication, but do not require it
+     * 
+     * @type {*}
+     * @memberOf SMTPServerOptions
+     */
+    authOptional?: any;
+    /**
+     * optional array of disabled commands (see all supported commands here). 
+     * For example if you want to disable authentication, 
+     * use ['AUTH'] as this value. 
+     * If you want to allow authentication in clear text, set it to ['STARTTLS'].
+     * 
+     * @type {*}
+     * @memberOf SMTPServerOptions
+     */
+    disabledCommands?: string[];
+    /**
+     * optional boolean, if set to true then allow using STARTTLS 
+     * but do not advertise or require it. It only makes sense 
+     * when creating integration test servers for testing the scenario 
+     * where you want to try STARTTLS even when it is not advertised
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hideSTARTTLS?: boolean;
+    /**
+     * optional boolean, if set to true then does not show PIPELINING in feature list
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hidePIPELINING?: boolean;
+    /**
+     * optional boolean, if set to true then does not show 8BITMIME in features list
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hide8BITMIME?: boolean;
+    /**
+     * optional boolean, if set to true then does not show SMTPUTF8 in features list
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    hideSMTPUTF8?: boolean;
+    /**
+     * optional boolean, if set to true allows authentication even if connection is not secured first
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    allowInsecureAuth?: boolean;
+    /**
+     * optional boolean, if set to true then does not try to reverse resolve client hostname
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    disableReverseLookup?: boolean;
+    /**
+     * optional Map or an object of TLS options for SNI where servername is the key. Overrided by SNICallback.
+     * 
+     * @type {Object}
+     * @memberOf SMTPServerOptions
+     */
+    sniOptions?: Object;
+    /**
+     * optional bunyan compatible logger instance. 
+     * If set to true then logs to console. 
+     * If value is not set or is false then nothing is logged
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    logger?: boolean;
+    /**
+     * sets the maximum number of concurrently connected clients, defaults to Infinity
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    maxClients?: number;//defaults to Infinity
+    /**
+     * boolean, if set to true expects to be behind a proxy that emits a 
+     * PROXY header{http://www.haproxy.org/download/1.5/doc/proxy-protocol.txt} (version 1 only)
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    useProxy?: boolean;
+    /**
+     * boolean, if set to true, enables usage of 
+     * XCLIENT{http://www.postfix.org/XCLIENT_README.html} extension to override connection properties. 
+     * See session.xClient (Map object) for the details provided by the client
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    useXClient?: boolean;
+    /**
+     * boolean, if set to true, enables usage of XFORWARD{http://www.postfix.org/XFORWARD_README.html} extension. 
+     * See session.xForward (Map object) for the details provided by the client
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    useXForward?: boolean;
+    /**
+     * boolean, if set to true use LMTP protocol instead of SMTP
+     * 
+     * @type {boolean}
+     * @memberOf SMTPServerOptions
+     */
+    lmtp?: boolean;
+    /**
+     * How many milliseconds of inactivity to allow before disconnecting the client (defaults to 1 minute)
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    socketTimeout?: number;//millisceonds
+    /**
+     * How many millisceonds to wait before disconnecting pending 
+     * connections once server.close() has been called (defaults to 30 seconds)
+     * 
+     * @type {number}
+     * @memberOf SMTPServerOptions
+     */
+    closeTimeout?: number;//millisceonds
+    /**
+     * The callback to handle authentications (see details https://github.com/andris9/smtp-server#handling-authentication)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onAuth?: (auth: Authentication, session: Session, callback: (err?: Error, response?: AuthenticationResponse) => any) => any;
+    /**
+     * The callback to handle the client connection. (see details https://github.com/andris9/smtp-server#validating-client-connection)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onConnect?: (session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * the callback to validate MAIL FROM commands (see details https://github.com/andris9/smtp-server#validating-sender-addresses)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onMailFrom?: (address: Address, session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * The callback to validate RCPT TO commands (see details https://github.com/andris9/smtp-server#validating-recipient-addresses)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onRcptTo?: (address: Address, session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * the callback to handle incoming messages (see details https://github.com/andris9/smtp-server#processing-incoming-message)
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onData?: (stream: any, session: Session, callback: (err?: Error) => any) => any;
+    /**
+     * the callback that informs about closed client connection
+     * 
+     * 
+     * @memberOf SMTPServerOptions
+     */
+    onClose?: (session: Session) => any;
+}
+
+export interface Authentication {
+    /**
+     * indicates the authentication method used, 'PLAIN', 'LOGIN' or 'XOAUTH2'
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    method: "PLAIN" | "LOGIN" | "XOAUTH2";//'PLAIN', 'LOGIN' or 'XOAUTH2'
+    /**
+     * the username of the user
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    username?: string;
+    /**
+     * the password if LOGIN or PLAIN was used
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    password?: string;
+    /**
+     *  the OAuth2 bearer access token if 'XOAUTH2' was used as the authentication method
+     * 
+     * @type {string}
+     * @memberOf Authentication
+     */
+    accessToken?: string;
+    /**
+     * a function for validating CRAM-MD5 challenge responses. 
+     * Takes the password of the user as an argument and returns true if the response matches the password
+     * 
+     * 
+     * @memberOf Authentication
+     */
+    validatePassword: (password: string) => boolean;
+}
+
+export interface AuthenticationResponse {
+    /**
+     * can be any value - if this is set then the user is considered logged in 
+     * and this value is used later with the session data to identify the user. 
+     * If this value is empty, then the authentication is considered failed
+     * 
+     * @type {*}
+     * @memberOf AuthenticationResponse
+     */
+    user: any;
+    /**
+     * an object to return if XOAUTH2 authentication failed (do not set the error object in this case). 
+     * This value is serialized to JSON and base64 encoded automatically, so you can just return the object
+     * 
+     * @type {{}}
+     * @memberOf AuthenticationResponse
+     */
+    data?: {};
+}
+
+export interface Session {
+    /**
+     * random string identificator generated when the client connected
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    id: string;
+    /**
+     * the IP address for the connected client
+     * 
+     * @type {Address}
+     * @memberOf Session
+     */
+    remoteAddress: Address;
+    /**
+     * reverse resolved hostname for remoteAddress
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    clientHostname: string;
+    /**
+     * the opening SMTP command (HELO/EHLO/LHLO)
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    openingCommand: string;
+    /**
+     * hostname the client provided with HELO/EHLO call
+     * 
+     * @type {string}
+     * @memberOf Session
+     */
+    hostNameApearsAs: string;
+    /**
+     * Envelope Object
+     * 
+     * @type {Envelope}
+     * @memberOf Session
+     */
+    envelope: Envelope;
+}
+
+export interface Envelope {
+    /**
+     * includes an address object or is set to false
+     * 
+     * @type {Address}
+     * @memberOf Envelope
+     */
+    mailFrom: Address;
+    /**
+     * includes an array of address objects
+     * 
+     * @type {Address[]}
+     * @memberOf Envelope
+     */
+    rcptTo: Address[];
+}
+
+export interface Address {
+    /**
+     * the address provided with the MAIL FROM or RCPT TO command
+     * 
+     * @type {string}
+     * @memberOf Address
+     */
+    address: string;
+    /**
+     * an object with additional arguments (all key names are uppercase)
+     * 
+     * @type {Object}
+     * @memberOf Address
+     */
+    args: Object;
+}
diff --git a/smtp-server/smtp-server-tests.ts b/smtp-server/smtp-server-tests.ts
new file mode 100644
index 0000000000..70a7797790
--- /dev/null
+++ b/smtp-server/smtp-server-tests.ts
@@ -0,0 +1,12 @@
+import { SMTPServer, SMTPServerOptions } from './';
+
+function SMTPServerConnectTest() {
+    let options: SMTPServerOptions = {
+        secure: false,
+    };
+    let server = new SMTPServer(options);
+    server.listen(2323);
+}
+
+SMTPServerConnectTest();
+
diff --git a/smtp-server/tsconfig.json b/smtp-server/tsconfig.json
new file mode 100644
index 0000000000..e2a03d1d7f
--- /dev/null
+++ b/smtp-server/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "smtp-server-tests.ts"
+    ]
+}

From d13e19cb6b063d78b89198efd1adce6f16d6c673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adam=20Pluci=C5=84ski?= <adaskothebeast@gmail.com>
Date: Sun, 20 Nov 2016 11:34:36 +0100
Subject: [PATCH 199/245] Updated to version 3.3.3 - fix in cascade from
 boolean to string

---
 jstree/jstree-tests.ts | 12 ++++++++++++
 jstree/jstree.d.ts     | 39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/jstree/jstree-tests.ts b/jstree/jstree-tests.ts
index 11c5bd9af4..39c1759828 100644
--- a/jstree/jstree-tests.ts
+++ b/jstree/jstree-tests.ts
@@ -114,3 +114,15 @@ tree.get_path('nodeId');
 tree.get_path('nodeId', '/');
 tree.get_path('nodeId', '/', true);
 
+
+
+var coreThemes: JSTreeStaticDefaultsCoreThemes = {
+    ellipsis:true
+};
+
+// tree with new theme elipsis
+var treeWithNewCoreProperties = $('#treeWithNewEllipsisProperties').jstree({
+    core: {
+        themes: coreThemes
+    }
+});
diff --git a/jstree/jstree.d.ts b/jstree/jstree.d.ts
index 2292da7f9c..e70016511d 100644
--- a/jstree/jstree.d.ts
+++ b/jstree/jstree.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for jsTree v3.3.2 
+// Type definitions for jsTree v3.3.3 
 // Project: http://www.jstree.com/
 // Definitions by: Adam Pluciński <https://github.com/adaskothebeast>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// 1 commit bb0473ae8cfc205585b6404ef86f650df2f6996e 2016-08-15
+// 1 commit 26e99ad5ec27c1a594ed57974cb16e0987482fd5 2016-11-19
 
 ///<reference path="../jquery/jquery.d.ts" />
 
@@ -374,6 +374,12 @@ interface JSTreeStaticDefaultsCoreThemes {
     */
     icons?: boolean;
 
+    /**
+    * a boolean indicating if node ellipsis should be shown - this only works with a fixed with on the container
+    * @name $.jstree.defaults.core.themes.ellipsis
+    */
+    ellipsis?: boolean;
+
     /**
     * a boolean indicating if the tree background is striped
     * @name $.jstree.defaults.core.themes.stripes
@@ -423,13 +429,13 @@ interface JSTreeStaticDefaultsCheckbox {
     keep_selected_style: boolean;
 
     /**
-    * This setting controls how cascading and undetermined nodes are applied. 
-    * If 'up' is in the string - cascading up is enabled, if 'down' is in the string - cascading down is enabled, if 'undetermined' is in the string - undetermined nodes will be used. 
+    * This setting controls how cascading and undetermined nodes are applied.
+    * If 'up' is in the string - cascading up is enabled, if 'down' is in the string - cascading down is enabled, if 'undetermined' is in the string - undetermined nodes will be used.
     * If `three_state` is set to `true` this setting is automatically set to 'up+down+undetermined'. Defaults to ''.
     * @name $.jstree.defaults.checkbox.cascade
     * @plugin checkbox
     */
-    cascade: boolean;
+    cascade: string;
 
     /**
     * This setting controls if checkbox are bound to the general tree selection 
@@ -737,6 +743,11 @@ interface JSTree extends JQuery {
     */
     teardown: () => void;
 
+    /**
+    * Create prototype node
+    */
+    _create_prototype_node: () => HTMLElement;
+
     /**
     * bind all events. Used internally.
     * @private
@@ -1567,6 +1578,24 @@ interface JSTree extends JQuery {
     */
     toggle_icons: () => void;
 
+    /**
+    * show the node ellipsis
+    * @name show_icons()
+    */
+    show_ellipsis: () => void;
+
+    /**
+    * hide the node ellipsis
+    * @name hide_ellipsis()
+    */
+    hide_ellipsis: () => void;
+
+    /**
+    * toggle the node ellipsis
+    * @name toggle_icons()
+    */
+    toggle_ellipsis: () => void;
+
     /**
     * set the node icon for a node
     * @name set_icon(obj, icon)

From dff6949f85bbe4cc9f374ba8c342ab4381128315 Mon Sep 17 00:00:00 2001
From: Vincent R <vincent.rouffiat@gmail.com>
Date: Sun, 20 Nov 2016 13:35:07 +0100
Subject: [PATCH 200/245] feat(halogen): definitions (#12791)

* feat(halogen): definitions

* chore(halogen): some correction + remove identical component tests

* chore(halogen): replace module by namespace
---
 halogen/halogen-clip-loader-tests.tsx   | 18 +++++
 halogen/halogen-fade-loader-tests.tsx   | 19 ++++++
 halogen/halogen-pacman-loader-tests.tsx | 18 +++++
 halogen/halogen-rotate-loader-tests.tsx | 18 +++++
 halogen/index.d.ts                      | 88 +++++++++++++++++++++++++
 halogen/tsconfig.json                   | 22 +++++++
 halogen/tslint.json                     |  3 +
 7 files changed, 186 insertions(+)
 create mode 100644 halogen/halogen-clip-loader-tests.tsx
 create mode 100644 halogen/halogen-fade-loader-tests.tsx
 create mode 100644 halogen/halogen-pacman-loader-tests.tsx
 create mode 100644 halogen/halogen-rotate-loader-tests.tsx
 create mode 100644 halogen/index.d.ts
 create mode 100644 halogen/tsconfig.json
 create mode 100644 halogen/tslint.json

diff --git a/halogen/halogen-clip-loader-tests.tsx b/halogen/halogen-clip-loader-tests.tsx
new file mode 100644
index 0000000000..884e1caec6
--- /dev/null
+++ b/halogen/halogen-clip-loader-tests.tsx
@@ -0,0 +1,18 @@
+import * as React from "react";
+import * as Halogen from "halogen";
+
+class HalogenTests_ClipLoader_withNoProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.ClipLoader />
+    )
+  }
+}
+
+class HalogenTests_ClipLoader_withAllProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.ClipLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="bottom" size="200px" />
+    )
+  }
+}
diff --git a/halogen/halogen-fade-loader-tests.tsx b/halogen/halogen-fade-loader-tests.tsx
new file mode 100644
index 0000000000..63781098eb
--- /dev/null
+++ b/halogen/halogen-fade-loader-tests.tsx
@@ -0,0 +1,19 @@
+import * as React from "react";
+import * as Halogen from "halogen";
+
+class HalogenTests_FadeLoader_withNoProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.FadeLoader />
+    )
+  }
+}
+
+class HalogenTests_FadeLoader_withAllProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.FadeLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle"
+        size="100px" margin="10px" height="200px" width="200px" radius="5px" />
+    )
+  }
+}
diff --git a/halogen/halogen-pacman-loader-tests.tsx b/halogen/halogen-pacman-loader-tests.tsx
new file mode 100644
index 0000000000..7ccd294918
--- /dev/null
+++ b/halogen/halogen-pacman-loader-tests.tsx
@@ -0,0 +1,18 @@
+import * as React from "react";
+import * as Halogen from "halogen";
+
+class HalogenTests_PacmanLoader_withNoProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.PacmanLoader />
+    )
+  }
+}
+
+class HalogenTests_PacmanLoader_withAllProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.PacmanLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle" margin={10} size={200} />
+    )
+  }
+}
diff --git a/halogen/halogen-rotate-loader-tests.tsx b/halogen/halogen-rotate-loader-tests.tsx
new file mode 100644
index 0000000000..82b4b2b380
--- /dev/null
+++ b/halogen/halogen-rotate-loader-tests.tsx
@@ -0,0 +1,18 @@
+import * as React from "react";
+import * as Halogen from "halogen";
+
+class HalogenTests_RotateLoader_withNoProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.RotateLoader />
+    )
+  }
+}
+
+class HalogenTests_RotateLoader_withAllProps extends React.Component<React.Props<{}>, {}>{
+  render() {
+    return (
+      <Halogen.RotateLoader loading={false} color="black" id="MyLoader" className="loader" verticalAlign="middle" margin="10px" size="100px" />
+    )
+  }
+}
diff --git a/halogen/index.d.ts b/halogen/index.d.ts
new file mode 100644
index 0000000000..909812ff4b
--- /dev/null
+++ b/halogen/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for halogen
+// Project: https://github.com/yuanyan/halogen
+// Definitions by: Vincent Rouffiat <https://github.com/steller>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as react from "react";
+
+export = Halogen;
+
+declare namespace Halogen {
+
+  type VerticalAlign = "baseline" | "length" | "sub" | "super" | "top" | "text-top" | "middle" | "bottom" | "text-bottom" | "initial" | "inherit";
+
+  interface HalogenCommonProps {
+    loading?: boolean;
+    color?: string;
+    id?: string;
+    className?: string;
+    verticalAlign?: VerticalAlign;
+  }
+
+  interface SizeLoaderProps extends HalogenCommonProps {
+    size?: string;
+  }
+
+  interface MarginLoaderProps<T> extends HalogenCommonProps {
+    margin?: T;
+    size?: T;
+  }
+
+  interface RadiusLoaderProps extends MarginLoaderProps<string> {
+    height?: string;
+    width?: string;
+    radius?: string;
+  }
+
+  /**
+   * React components
+   */
+  type PulseLoader = react.Component<MarginLoaderProps<string>, {}>;
+  export const PulseLoader: react.ComponentClass<MarginLoaderProps<string>>;
+
+  type RotateLoader = react.Component<MarginLoaderProps<string>, {}>;
+  export const RotateLoader: react.ComponentClass<MarginLoaderProps<string>>;
+
+  type BeatLoader = react.Component<MarginLoaderProps<string>, {}>;
+  export const BeatLoader: react.ComponentClass<MarginLoaderProps<string>>;
+
+  type RiseLoader = react.Component<MarginLoaderProps<string>, {}>;
+  export const RiseLoader: react.ComponentClass<MarginLoaderProps<string>>;
+
+  type SyncLoader = react.Component<MarginLoaderProps<string>, {}>;
+  export const SyncLoader: react.ComponentClass<MarginLoaderProps<string>>;
+
+  type GridLoader = react.Component<MarginLoaderProps<string>, {}>;
+  export const GridLoader: react.ComponentClass<MarginLoaderProps<string>>;
+
+  type ClipLoader = react.Component<SizeLoaderProps, {}>;
+  export const ClipLoader: react.ComponentClass<SizeLoaderProps>;
+
+  type SquareLoader = react.Component<SizeLoaderProps, {}>;
+  export const SquareLoader: react.ComponentClass<SizeLoaderProps>;
+
+  type DotLoader = react.Component<SizeLoaderProps, {}>;
+  export const DotLoader: react.ComponentClass<SizeLoaderProps>;
+
+  type PacmanLoader = react.Component<MarginLoaderProps<number>, {}>;
+  export const PacmanLoader: react.ComponentClass<MarginLoaderProps<number>>;
+
+  type MoonLoader = react.Component<SizeLoaderProps, {}>;
+  export const MoonLoader: react.ComponentClass<SizeLoaderProps>;
+
+  type RingLoader = react.Component<SizeLoaderProps, {}>;
+  export const RingLoader: react.ComponentClass<SizeLoaderProps>;
+
+  type BounceLoader = react.Component<SizeLoaderProps, {}>;
+  export const BounceLoader: react.ComponentClass<SizeLoaderProps>;
+
+  type SkewLoader = react.Component<SizeLoaderProps, {}>;
+  export const SkewLoader: react.ComponentClass<SizeLoaderProps>;
+
+  type FadeLoader = react.Component<RadiusLoaderProps, {}>;
+  export const FadeLoader: react.ComponentClass<RadiusLoaderProps>;
+
+  type ScaleLoader = react.Component<RadiusLoaderProps, {}>;
+  export const ScaleLoader: react.ComponentClass<RadiusLoaderProps>;
+
+}
diff --git a/halogen/tsconfig.json b/halogen/tsconfig.json
new file mode 100644
index 0000000000..9765d85cfc
--- /dev/null
+++ b/halogen/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts"
+    ],
+    "include": [
+        "halogen-*-loader-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/halogen/tslint.json b/halogen/tslint.json
new file mode 100644
index 0000000000..fdc7cdc370
--- /dev/null
+++ b/halogen/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "../tslint.json"
+}
\ No newline at end of file

From 2057acf55e2359a14a31a31b9a101ee8e1551074 Mon Sep 17 00:00:00 2001
From: danzel <dave@smartrak.co.nz>
Date: Mon, 21 Nov 2016 14:42:24 +1300
Subject: [PATCH 201/245] Add react-easy-chart (0.1.12)

---
 react-easy-chart/index.d.ts                 |  277 +++
 react-easy-chart/react-easy-chart-tests.tsx | 2021 +++++++++++++++++++
 react-easy-chart/tsconfig.json              |   20 +
 3 files changed, 2318 insertions(+)
 create mode 100644 react-easy-chart/index.d.ts
 create mode 100644 react-easy-chart/react-easy-chart-tests.tsx
 create mode 100644 react-easy-chart/tsconfig.json

diff --git a/react-easy-chart/index.d.ts b/react-easy-chart/index.d.ts
new file mode 100644
index 0000000000..8728ad0eaf
--- /dev/null
+++ b/react-easy-chart/index.d.ts
@@ -0,0 +1,277 @@
+// Type definitions for react-easy-chart v0.1.12
+// Project: https://github.com/rma-consulting/react-easy-chart
+// Definitions by: Dave Leaver <https://github.com/danzel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="react" />
+
+declare module "react-easy-chart" {
+
+	interface BarData {
+		x: number | Date | string;
+		y: number;
+		color?: string
+	}
+	interface BarChartProps {
+		/** Whether to show axis labels */
+		axes?: boolean;
+
+		/** Labels for each of the axis */
+		axisLabels?: { x?: string, y?: string, y2?: string };
+
+		/** The width of an individual bar in pixels */
+		barWidth?: number;
+
+		clickHandler?: (data: BarData, mouseEvent: MouseEvent) => any;
+
+		/** Whether to automatically color the bars */
+		colorBars?: boolean;
+
+		data: Array<BarData>;
+
+		/** A d3 time formatting pattern to be applied to format the x axis values */
+		datePattern?: string;
+
+		/** Whether to show horizontal grid lines on the chart */
+		grid?: boolean;
+
+		/** Height of the chart in pixels */
+		height?: number;
+
+		/** Interpolation method if you add a line to this chart (via lineData) */
+		interpolate?: string;
+
+		lineData?: Array<LineData>;
+
+		/** css margins */
+		margin?: { top?: number, right?: number, bottom?: number, left?: number };
+
+		mouseMoveHandler?: (data: BarData, mouseEvent: MouseEvent) => any;
+
+		mouseOutHandler?: (data: BarData, mouseEvent: MouseEvent) => any;
+
+		mouseOverHandler?: (data: BarData, mouseEvent: MouseEvent) => any;
+
+		/** The d3 time format to be used for the x axis (when xType is 'time') */
+		tickTimeDisplayFormat?: string;
+
+		/** Width of the chart in pixels */
+		width?: number;
+
+		/** The range that the x axis should show (otherwise automatically calculated) */
+		xDomainRange?: Array<number> | Array<Date> | Array<string>;
+
+		/** The amount of ticks to be shown on the x axis */
+		xTickNumber?: number;
+
+		/** What data type the x axis is */
+		xType?: 'time' | 'text' | 'linear';
+
+		/** What data type the second y axis is */
+		y2Type?: 'time' | 'text' | 'linear';
+
+		/** Whether to show the axis on the right (default false: left) */
+		yAxisOrientRight?: boolean;
+
+		/** The range that the y axis should show (otherwise automatically calculated) */
+		yDomainRange?: Array<number>;
+
+		/** The amount of ticks to be shown on the y axis */
+		yTickNumber?: number;
+	}
+	class BarChart extends React.Component<BarChartProps, {}> {
+	}
+
+	interface PieData {
+		key: string;
+		value: number;
+		color?: string;
+	}
+	interface PieChartProps {
+		clickHandler?: (data: PieData, mouseEvent: MouseEvent) => any;
+
+		data: Array<{ key: string, value: number, color?: string }>;
+
+		/** Size in pixels of the inner hole (diameter) */
+		innerHoleSize?: number;
+
+		/** Whether to add labels the to pie segments */
+		labels?: boolean;
+
+		mouseMoveHandler?: (data: PieData, mouseEvent: MouseEvent) => any;
+
+		mouseOutHandler?: (data: PieData, mouseEvent: MouseEvent) => any;
+
+		mouseOverHandler?: (data: PieData, mouseEvent: MouseEvent) => any;
+
+		/** Padding around the chart in pixels */
+		padding?: number;
+
+		/** Size in pixels in each dimension */
+		size?: number;
+
+		styles?: { [cssSelector: string]: React.CSSProperties };
+	}
+	class PieChart extends React.Component<PieChartProps, {}> {
+	}
+
+	interface LineData {
+		x: number | Date | string;
+		y: number | Date | string;
+	}
+	interface LineChartProps {
+		/** Whether to show axis labels */
+		axes?: boolean;
+
+		/** Labels for each of the axis */
+		axisLabels?: { x?: string, y?: string };
+
+		clickHandler?: (data: LineData, mouseEvent: MouseEvent) => any;
+
+		data: Array<Array<LineData>>;
+
+		/** Whether to show circles on the data points */
+		dataPoints?: boolean;
+
+		/** Whether to show horizontal grid lines on the chart */
+		grid?: boolean;
+
+		/** Height of the chart in pixels */
+		height?: number;
+
+		/** Smoothing option for the lines */
+		interpolate?: 'linear' | 'linear-closed' | 'step' | 'step-before' | 'step-after' | 'basis' | 'basis-open' | 'basis-closed' | 'bundle' | 'cardinal' | 'cardinal-open' | 'cardinal-closed' | 'monotone';
+
+		lineColors?: Array<string>;
+
+		/** css margins */
+		margin?: { top?: number, right?: number, bottom?: number, left?: number };
+
+		mouseMoveHandler?: (data: LineData, mouseEvent: MouseEvent) => any;
+
+		mouseOutHandler?: (data: LineData, mouseEvent: MouseEvent) => any;
+
+		mouseOverHandler?: (data: LineData, mouseEvent: MouseEvent) => any;
+
+		/** The d3 time format to be used for the x axis (when xType is 'time') */
+		tickTimeDisplayFormat?: string;
+
+		/** Whether to show vertical grid lines on the chart */
+		verticalGrid?: boolean;
+
+		/** Width of the chart in pixels */
+		width?: number;
+
+		/** The range that the x axis should show (otherwise automatically calculated) */
+		xDomainRange?: Array<number> | Array<Date> | Array<string>;
+
+		/** The amount of ticks to be shown on the x axis */
+		xTicks?: number;
+
+		/** What data type the x axis is */
+		xType?: 'time' | 'text' | 'linear';
+
+		/** Whether to show the axis on the right (default false: left) */
+		yAxisOrientRight?: boolean;
+
+		/** The range that the y axis should show (otherwise automatically calculated) */
+		yDomainRange?: Array<number> | Array<string>;
+
+		/** The amount of ticks to be shown on the y axis */
+		yTicks?: number;
+
+		/** What data type the x axis is */
+		yType?: 'time' | 'text' | 'linear';
+	}
+	class LineChart extends React.Component<LineChartProps, {}> {
+	}
+
+	interface AreaChartProps extends LineChartProps {
+		/** Make the gradient area a solid fill rather than a gradient */
+		noAreaGradient?: boolean;
+	}
+	class AreaChart extends React.Component<AreaChartProps, {}> {
+	}
+
+	interface ScatterplotData {
+		type: string | number;
+		x: number | Date | string;
+		y: number | Date | string;
+		z?: number;
+	}
+	interface ScatterplotChartProps {
+		/** Whether to show axis labels */
+		axes?: boolean;
+
+		/** Labels for each of the axis */
+		axisLabels?: { x?: string, y?: string };
+
+		clickHandler?: (data: ScatterplotData, mouseEvent: MouseEvent) => any;
+
+		/** Allows styling of individual types of points */
+		config?: Array<{ type: string, color: string, stroke: string }>;
+
+		data: Array<ScatterplotData>;
+
+		/** Radius of the dots on the chart */
+		dotRadius?: number;
+
+		/** Whether to show horizontal grid lines on the chart */
+		grid?: boolean;
+
+		/** Height of the chart in pixels */
+		height?: number;
+
+		/** css margins */
+		margin?: { top?: number, right?: number, bottom?: number, left?: number };
+
+		mouseMoveHandler?: (data: ScatterplotData, mouseEvent: MouseEvent) => any;
+
+		mouseOutHandler?: (data: ScatterplotData, mouseEvent: MouseEvent) => any;
+
+		mouseOverHandler?: (data: ScatterplotData, mouseEvent: MouseEvent) => any;
+
+		/** Whether to show vertical grid lines on the chart */
+		verticalGrid?: boolean;
+
+		/** Width of the chart in pixels */
+		width?: number;
+
+		/** The range that the x axis should show (otherwise automatically calculated) */
+		xDomainRange?: Array<number> | Array<Date> | Array<string>;
+
+		/** What data type the x axis is */
+		xType?: 'time' | 'text' | 'linear';
+
+		/** Whether to show the axis on the right (default false: left) */
+		yAxisOrientRight?: boolean;
+
+		/** The range that the y axis should show (otherwise automatically calculated) */
+		yDomainRange?: Array<number> | Array<Date> | Array<string>;
+
+		/** What data type the x axis is */
+		yType?: 'time' | 'text' | 'linear';
+	}
+	class ScatterplotChart extends React.Component<ScatterplotChartProps, {}> {
+	}
+
+	interface LegendProps {
+		/** Override the color of the items */
+		config?: Array<{ color: string }>;
+
+		data: Array<any>;
+
+		dataId: string;
+
+		/** change list items to inline-block (default block) */
+		horizontal?: boolean;
+
+		/** Override the css styles of individual components, see http://rma-consulting.github.io/react-easy-chart/legend/index.html */
+		styles?: { [cssSelector: string]: React.CSSProperties };
+	}
+	class Legend extends React.Component<LegendProps, {}> {
+
+	}
+
+}
+
diff --git a/react-easy-chart/react-easy-chart-tests.tsx b/react-easy-chart/react-easy-chart-tests.tsx
new file mode 100644
index 0000000000..65ab377ccc
--- /dev/null
+++ b/react-easy-chart/react-easy-chart-tests.tsx
@@ -0,0 +1,2021 @@
+import * as React from 'react';
+import { AreaChart, BarChart, Legend, LineChart, PieChart, ScatterplotChart } from 'react-easy-chart';
+
+class BarChartData extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				data={[
+					{ x: 'A', y: 20 },
+					{ x: 'B', y: 30 },
+					{ x: 'C', y: 40 },
+					{ x: 'D', y: 20 },
+					{ x: 'E', y: 40 },
+					{ x: 'F', y: 25 },
+					{ x: 'G', y: 5 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartHeightAndWidth extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				height={150}
+				width={350}
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartColorBars extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				colorBars
+				height={150}
+				width={650}
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartMargin extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				colorBars
+				height={150}
+				width={650}
+				data={[]}
+				margin={{ top: 0, right: 0, bottom: 30, left: 100 }}
+				/>
+		);
+	}
+}
+
+class BarChartOverridingBarColors extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				data={[
+					{ x: 'A', y: 20 },
+					{ x: 'B', y: 30, color: '#f00' },
+					{ x: 'C', y: 40 },
+					{ x: 'D', y: 20 },
+					{ x: 'E', y: 40 },
+					{ x: 'F', y: 25 },
+					{ x: 'G', y: 5, color: 'orange' }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartAxes extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axes
+				height={250}
+				width={650}
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartAxesLabels extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartYAxisOrientation extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				yAxisOrientRight
+				height={250}
+				width={650}
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartYAxesType extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				height={250}
+				width={650}
+				xType={'linear'}
+				data={[
+					{ x: 10, y: 20 },
+					{ x: 12, y: 20 },
+					{ x: 30, y: 30, color: '#f00' },
+					{ x: 40, y: 40 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartYAxesType2 extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				height={250}
+				width={650}
+				colorBars
+				xType={'time'}
+				data={[
+					{ x: '1-Jan-15', y: 20 },
+					{ x: '2-Jan-15', y: 10 },
+					{ x: '3-Jan-15', y: 33 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartDatePattern extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				height={250}
+				width={650}
+				datePattern="%d-%b-%y %H:%M"
+				colorBars
+				xType={'time'}
+				data={[
+					{ x: '1-Jan-15 13:00', y: 20 },
+					{ x: '1-Jan-15 14:00', y: 10 },
+					{ x: '1-Jan-15 15:00', y: 33 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartBarWidth extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				height={250}
+				width={650}
+				margin={{ top: 50, right: 100, bottom: 50, left: 100 }}
+				colorBars
+				barWidth={40}
+				xType={'time'}
+				data={[
+					{ x: '1-Jan-15', y: 20 },
+					{ x: '2-Jan-15', y: 10 },
+					{ x: '3-Jan-15', y: 33 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartDomainRange extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				colorBars
+				height={250}
+				width={650}
+				barWidth={20}
+				xType={'time'}
+				xDomainRange={['5-Jan-15', '18-Jan-15']}
+				yDomainRange={[5, 50]}
+				data={[
+					{ x: '10-Jan-15', y: 20 },
+					{ x: '12-Jan-15', y: 10 },
+					{ x: '15-Jan-15', y: 33 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartTickDisplayFormat extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				colorBars
+				height={250}
+				width={650}
+				barWidth={20}
+				xType={'time'}
+				tickTimeDisplayFormat={'%a'}
+				xDomainRange={['1-Jan-15', '20-Jan-15']}
+				data={[
+					{ x: '10-Jan-15', y: 20 },
+					{ x: '12-Jan-15', y: 10 },
+					{ x: '15-Jan-15', y: 33 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartNumberOfTicks extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				colorBars
+				height={250}
+				width={650}
+				barWidth={20}
+				xTickNumber={5}
+				yTickNumber={3}
+				xType={'time'}
+				xDomainRange={['1-Jan-15', '20-Jan-15']}
+				data={[
+					{ x: '10-Jan-15', y: 20 },
+					{ x: '12-Jan-15', y: 10 },
+					{ x: '15-Jan-15', y: 33 }
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartGrid extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				grid
+				colorBars
+				height={250}
+				width={650}
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartBarAndLine extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis', y2: 'My second y Axis' }}
+				axes
+				grid
+				colorBars
+				height={450}
+				width={650}
+				interpolate={'cardinal'}
+				y2Type="linear"
+				lineData={[
+					{
+						x: 'A',
+						y: 1000
+					},
+					{
+						x: 'B',
+						y: 2000
+					}
+				]}
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				/>
+		);
+	}
+}
+
+class BarChartMouseHandlers extends React.Component<{}, {}> {
+	mouseOverHandler(d: any, e: any) {
+	}
+
+	mouseMoveHandler(e: any) {
+	}
+
+	mouseOutHandler() {
+	}
+
+	render(): any {
+		return (
+			<BarChart
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				axes
+				grid
+				colorBars
+				height={250}
+				width={650}
+				data={[
+					{
+						x: 'A',
+						y: 46
+					},
+					{
+						x: 'B',
+						y: 26
+					}
+				]}
+				clickHandler={(d) => this.setState({ dataDisplay: `The value on the ${d.x} is ${d.y}` })}
+				mouseOverHandler={this.mouseOverHandler}
+				mouseOutHandler={this.mouseOutHandler}
+				mouseMoveHandler={this.mouseMoveHandler}
+				yDomainRange={[0, 100]}
+				/>
+		);
+	}
+}
+
+
+class PieChartData extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<PieChart
+				data={[
+					{ key: 'A', value: 100 },
+					{ key: 'B', value: 200 },
+					{ key: 'C', value: 50 }
+				]}
+				/>
+		);
+	}
+}
+
+class PieChartColor extends React.Component<{}, {}> {
+	render(): any {
+		return (
+
+			<PieChart
+				data={[
+					{ key: 'A', value: 100, color: '#aaac84' },
+					{ key: 'B', value: 200, color: '#dce7c5' },
+					{ key: 'C', value: 50, color: '#e3a51a' }
+				]}
+				/>
+		);
+	}
+}
+
+class PieChartSize extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<PieChart
+				size={100}
+				data={[
+					{ key: 'A', value: 100, color: '#aaac84' },
+					{ key: 'B', value: 200, color: '#dce7c5' },
+					{ key: 'C', value: 50, color: '#e3a51a' }
+				]}
+				/>
+		);
+	}
+}
+
+class PieChartDonut extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<PieChart
+				size={400}
+				innerHoleSize={200}
+				data={[
+					{ key: 'A', value: 100, color: '#aaac84' },
+					{ key: 'B', value: 200, color: '#dce7c5' },
+					{ key: 'C', value: 50, color: '#e3a51a' }
+				]}
+				/>
+		);
+	}
+}
+
+class PieChartPadding extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<PieChart
+				padding={50}
+				data={[
+					{ key: 'A', value: 100, color: '#aaac84' },
+					{ key: 'B', value: 200, color: '#dce7c5' },
+					{ key: 'C', value: 50, color: '#e3a51a' }
+				]}
+				/>
+		);
+	}
+}
+
+class PieChartLabels extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<PieChart
+				labels
+				data={[
+					{ key: 'A', value: 100, color: '#aaac84' },
+					{ key: 'B', value: 200, color: '#dce7c5' },
+					{ key: 'C', value: 50, color: '#e3a51a' }
+				]}
+				styles={{
+					'<div className="cha"></div>rt_text': {
+						fontSize: '1em',
+						fill: '#fff'
+					}
+				}}
+				/>
+		);
+	}
+}
+
+class PieChartStyle extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<PieChart
+				labels
+				styles={{
+					'.chart_lines': {
+						strokeWidth: 0
+					},
+					'.chart_text': {
+						fontFamily: 'serif',
+						fontSize: '1.25em',
+						fill: '#333'
+					}
+				}}
+				data={[
+					{ key: 'A', value: 100, color: '#aaac84' },
+					{ key: 'B', value: 200, color: '#dce7c5' },
+					{ key: 'C', value: 50, color: '#e3a51a' }
+				]}
+				/>
+		);
+	}
+}
+
+class PieChartMouseHandlers extends React.Component<{}, {}> {
+	mouseOverHandler(d: any, e: any) { }
+	mouseMoveHandler(e: any) { }
+	mouseOutHandler() { }
+	render(): any {
+		return (
+			<PieChart
+				data={[
+					{ key: 'A', value: 100, color: '#aaac84' },
+					{ key: 'B', value: 200, color: '#dce7c5' },
+					{ key: 'C', value: 50, color: '#e3a51a' }
+				]}
+				innerHoleSize={200}
+				clickHandler={(d) => this.setState({})}
+				mouseOverHandler={this.mouseOverHandler}
+				mouseOutHandler={this.mouseOutHandler.bind(this)}
+				mouseMoveHandler={this.mouseMoveHandler.bind(this)}
+				padding={10}
+				/>
+		);
+	}
+}
+
+
+class LineChartData extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartData2 extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartHeightAndWidth extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				width={50}
+				height={50}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartMargin extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				margin={{ top: 0, right: 0, bottom: 30, left: 100 }}
+				width={250}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartAxes extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axes
+				width={250}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartAxesLabels extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axes
+				margin={{ top: 10, right: 10, bottom: 50, left: 50 }}
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				width={250}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartYAxisOrientation extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				yAxisOrientRight
+				width={450}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartInterpolate extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axes
+				margin={{ top: 10, right: 10, bottom: 50, left: 50 }}
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				width={250}
+				interpolate={'cardinal'}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartXType extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				xType={'text'}
+				axes
+				width={350}
+				height={250}
+				interpolate={'cardinal'}
+				data={[
+					[
+						{ x: 'Mon', y: 20 },
+						{ x: 'Tue', y: 10 },
+						{ x: 'Wed', y: 33 },
+						{ x: 'Thu', y: 45 },
+						{ x: 'Fri', y: 15 }
+					], [
+						{ x: 'Mon', y: 10 },
+						{ x: 'Tue', y: 15 },
+						{ x: 'Wed', y: 13 },
+						{ x: 'Thu', y: 15 },
+						{ x: 'Fri', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartXTypeTime extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				xType={'time'}
+				axes
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartYTypeText extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				yType={'text'}
+				xType={'text'}
+				axes
+				margin={{ top: 0, right: 0, bottom: 100, left: 100 }}
+				yDomainRange={['Allot', 'Middle', 'Less']}
+				interpolate={'cardinal'}
+				width={350}
+				height={250}
+				data={[
+					[
+						{ x: 'Mon', y: 'Little' },
+						{ x: 'Tue', y: 'Perfect' },
+						{ x: 'Wed', y: 'Allot' },
+						{ x: 'Thu', y: 'Little' },
+						{ x: 'Fri', y: 'Perfect' }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartYTypeTime extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axisLabels={{ x: 'Total Revenue', y: 'January' }}
+				margin={{ top: 10, right: 30, bottom: 50, left: 70 }}
+				yType={'time'}
+				axes
+				width={500}
+				height={500}
+				data={[
+					[
+						{ x: 10, y: '1-Jan-15' },
+						{ x: 20, y: '10-Jan-15' },
+						{ x: 40, y: '21-Jan-15' },
+						{ x: 80, y: '31-Jan-15' }
+					], [
+						{ x: 0, y: '1-Jan-15' },
+						{ x: 15, y: '10-Jan-15' },
+						{ x: 20, y: '21-Jan-15' },
+						{ x: 25, y: '31-Jan-15' }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartGrid extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axisLabels={{ x: 'Total Revenue', y: 'January' }}
+				margin={{ top: 10, right: 30, bottom: 50, left: 70 }}
+				yType={'time'}
+				axes
+				grid
+				width={500}
+				height={500}
+				data={[
+					[
+						{ x: 10, y: '1-Jan-15' },
+						{ x: 20, y: '10-Jan-15' },
+						{ x: 40, y: '21-Jan-15' },
+						{ x: 80, y: '31-Jan-15' }
+					], [
+						{ x: 0, y: '1-Jan-15' },
+						{ x: 15, y: '10-Jan-15' },
+						{ x: 20, y: '21-Jan-15' },
+						{ x: 25, y: '31-Jan-15' }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartVerticalGrid extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				xType={'time'}
+				axes
+				grid
+				verticalGrid
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartDomainRange extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axes
+				xDomainRange={[0, 100]}
+				yDomainRange={[0, 100]}
+				margin={{ top: 0, right: 0, bottom: 100, left: 100 }}
+				width={250}
+				height={250}
+				interpolate={'cardinal'}
+				data={[
+					[
+						{ x: 10, y: 25 },
+						{ x: 20, y: 10 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 10 },
+						{ x: 50, y: 12 },
+						{ x: 60, y: 25 }
+					], [
+						{ x: 10, y: 40 },
+						{ x: 20, y: 30 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 60 },
+						{ x: 50, y: 22 },
+						{ x: 60, y: 9 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartTickDisplayFormat extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axisLabels={{ x: 'Total Revenue', y: 'January' }}
+				margin={{ top: 10, right: 30, bottom: 50, left: 70 }}
+				yType={'time'}
+				axes
+				interpolate={'cardinal'}
+				tickTimeDisplayFormat={'%a'}
+				width={500}
+				height={500}
+				data={[
+					[
+						{ x: 10, y: '1-Jan-15' },
+						{ x: 20, y: '10-Jan-15' },
+						{ x: 40, y: '21-Jan-15' },
+						{ x: 80, y: '31-Jan-15' }
+					], [
+						{ x: 0, y: '1-Jan-15' },
+						{ x: 15, y: '10-Jan-15' },
+						{ x: 20, y: '21-Jan-15' },
+						{ x: 25, y: '31-Jan-15' }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartNumberOfTicks extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axes
+				xTicks={5}
+				yTicks={5}
+				xDomainRange={[0, 100]}
+				yDomainRange={[0, 100]}
+				width={500}
+				height={250}
+				interpolate={'cardinal'}
+				data={[
+					[
+						{ x: 10, y: 25 },
+						{ x: 20, y: 10 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 10 },
+						{ x: 50, y: 12 },
+						{ x: 60, y: 25 }
+					], [
+						{ x: 10, y: 40 },
+						{ x: 20, y: 30 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 60 },
+						{ x: 50, y: 22 },
+						{ x: 60, y: 9 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartLineColors extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				xType={'time'}
+				axes
+				grid
+				verticalGrid
+				interpolate={'cardinal'}
+				lineColors={['pink', 'cyan']}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartDataPoints extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<LineChart
+				axes
+				dataPoints
+				xDomainRange={[0, 100]}
+				yDomainRange={[0, 100]}
+				width={500}
+				height={250}
+				interpolate={'cardinal'}
+				data={[
+					[
+						{ x: 10, y: 25 },
+						{ x: 20, y: 10 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 10 },
+						{ x: 50, y: 12 },
+						{ x: 60, y: 25 }
+					], [
+						{ x: 10, y: 40 },
+						{ x: 20, y: 30 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 60 },
+						{ x: 50, y: 22 },
+						{ x: 60, y: 9 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class LineChartMouseEvents extends React.Component<{}, {}> {
+	mouseOverHandler(d: any, e: any) { }
+	mouseMoveHandler(e: any) { }
+	mouseOutHandler() { }
+	render(): any {
+		return (
+			<LineChart
+				axes
+				dataPoints
+				grid
+				xDomainRange={[0, 100]}
+				yDomainRange={[0, 100]}
+				clickHandler={() => { } }
+				mouseOverHandler={this.mouseOverHandler}
+				mouseOutHandler={this.mouseOutHandler}
+				mouseMoveHandler={this.mouseMoveHandler}
+				width={700}
+				height={350}
+				interpolate={'cardinal'}
+				data={[
+					[
+						{ x: 10, y: 25 },
+						{ x: 20, y: 10 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 10 },
+						{ x: 50, y: 12 },
+						{ x: 60, y: 25 }
+					], [
+						{ x: 10, y: 40 },
+						{ x: 20, y: 30 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 60 },
+						{ x: 50, y: 22 },
+						{ x: 60, y: 9 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+
+class AreaChartData extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartData2 extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartHeightAndWidth extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				width={50}
+				height={50}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartMargin extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				margin={{ top: 30, right: 30, bottom: 30, left: 30 }}
+				width={250}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartAxes extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				axes
+				width={250}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartAxesLabels extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				axes
+				margin={{ top: 10, right: 10, bottom: 50, left: 50 }}
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				width={250}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartYAxisOrientation extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				yAxisOrientRight
+				width={450}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartInterpolate extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				axes
+				margin={{ top: 10, right: 10, bottom: 50, left: 50 }}
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				width={250}
+				interpolate={'cardinal'}
+				height={250}
+				data={[
+					[
+						{ x: 1, y: 20 },
+						{ x: 2, y: 10 },
+						{ x: 3, y: 25 }
+					], [
+						{ x: 1, y: 10 },
+						{ x: 2, y: 12 },
+						{ x: 3, y: 4 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartAxisType extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				xType={'text'}
+				axes
+				width={350}
+				height={250}
+				interpolate={'cardinal'}
+				data={[
+					[
+						{ x: 'Mon', y: 20 },
+						{ x: 'Tue', y: 10 },
+						{ x: 'Wed', y: 33 },
+						{ x: 'Thu', y: 45 },
+						{ x: 'Fri', y: 15 }
+					], [
+						{ x: 'Mon', y: 10 },
+						{ x: 'Tue', y: 15 },
+						{ x: 'Wed', y: 13 },
+						{ x: 'Thu', y: 15 },
+						{ x: 'Fri', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartAxisTypeXTime extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				xType={'time'}
+				axes
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartYTypeText extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				yType={'text'}
+				xType={'text'}
+				axes
+				margin={{ top: 0, right: 0, bottom: 100, left: 100 }}
+				yDomainRange={['Allot', 'Middle', 'Less']}
+				interpolate={'cardinal'}
+				width={350}
+				height={250}
+				data={[
+					[
+						{ x: 'Mon', y: 'Little' },
+						{ x: 'Tue', y: 'Perfect' },
+						{ x: 'Wed', y: 'Allot' },
+						{ x: 'Thu', y: 'Little' },
+						{ x: 'Fri', y: 'Perfect' }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartGrid extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				xType={'time'}
+				axes
+				grid
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartVerticalGrid extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				xType={'time'}
+				axes
+				grid
+				verticalGrid
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartDomainRange extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				axes
+				xDomainRange={[0, 100]}
+				yDomainRange={[0, 100]}
+				margin={{ top: 0, right: 0, bottom: 100, left: 100 }}
+				width={750}
+				height={250}
+				interpolate={'cardinal'}
+				data={[
+					[
+						{ x: 10, y: 25 },
+						{ x: 20, y: 10 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 10 },
+						{ x: 50, y: 12 },
+						{ x: 60, y: 25 }
+					], [
+						{ x: 10, y: 40 },
+						{ x: 20, y: 30 },
+						{ x: 30, y: 25 },
+						{ x: 40, y: 60 },
+						{ x: 50, y: 22 },
+						{ x: 60, y: 9 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartTickDisplayFormat extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				xType={'time'}
+				axes
+				grid
+				tickTimeDisplayFormat={'%d %m'}
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartTickNumbers extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				xType={'time'}
+				axes
+				xTicks={5}
+				yTicks={3}
+				grid
+				tickTimeDisplayFormat={'%d %m'}
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartDataPoints extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<AreaChart
+				xType={'time'}
+				axes
+				dataPoints
+				xTicks={5}
+				yTicks={3}
+				grid
+				tickTimeDisplayFormat={'%d %m'}
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+class AreaChartMouseHandlers extends React.Component<{}, {}> {
+	mouseOverHandler(d: any, e: any) { }
+	mouseMoveHandler(e: any) { }
+	mouseOutHandler() { }
+	render(): any {
+		return (
+			<AreaChart
+				xType={'time'}
+				axes
+				dataPoints
+				xTicks={5}
+				yTicks={3}
+				grid
+				clickHandler={(d) => { } }
+				mouseOverHandler={this.mouseOverHandler}
+				mouseOutHandler={this.mouseOutHandler}
+				mouseMoveHandler={this.mouseMoveHandler}
+				tickTimeDisplayFormat={'%d %m'}
+				interpolate={'cardinal'}
+				width={750}
+				height={250}
+				data={[
+					[
+						{ x: '1-Jan-15', y: 20 },
+						{ x: '1-Feb-15', y: 10 },
+						{ x: '1-Mar-15', y: 33 },
+						{ x: '1-Apr-15', y: 45 },
+						{ x: '1-May-15', y: 15 }
+					], [
+						{ x: '1-Jan-15', y: 10 },
+						{ x: '1-Feb-15', y: 15 },
+						{ x: '1-Mar-15', y: 13 },
+						{ x: '1-Apr-15', y: 15 },
+						{ x: '1-May-15', y: 10 }
+					]
+				]}
+				/>
+		);
+	}
+}
+
+
+const data = [
+	{
+		type: 'One',
+		x: 1,
+		y: 5
+	},
+	{
+		type: 'Two',
+		x: 3,
+		y: 1
+	},
+	{
+		type: 'Three',
+		x: 0,
+		y: 6
+	},
+	{
+		type: 'Four',
+		x: 5,
+		y: 2
+	},
+	{
+		type: 'Five',
+		x: 4,
+		y: 4
+	},
+	{
+		type: 'Six',
+		x: 5,
+		y: 9
+	},
+	{
+		type: 'Seven',
+		x: 9,
+		y: 1
+	},
+	{
+		type: 'Eight',
+		x: 5,
+		y: 6
+	},
+	{
+		type: 'Nine',
+		x: 3,
+		y: 9
+	},
+	{
+		type: 'Ten',
+		x: 7,
+		y: 9
+	}
+];
+
+class ScatterplotData extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart data={data} />
+		);
+	}
+}
+
+class ScatterplotHeightAndWidth extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart data={data} width={160} height={90} />
+		);
+	}
+}
+
+class ScatterplotMargin extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={data}
+				margin={{ top: 10, right: 10, bottom: 30, left: 100 }} />
+		);
+	}
+}
+
+class ScatterplotAxes extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={data}
+				axes
+				width={480}
+				height={270} />
+		);
+	}
+}
+
+class ScatterplotYAxisOrientation extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={data}
+				axes
+				yAxisOrientRight
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				width={480}
+				height={270}
+				/>
+		);
+	}
+}
+
+class ScatterplotAxesLabels extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={data}
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				width={480}
+				height={270}
+				/>
+		);
+	}
+}
+
+class ScatterplotDotRadius extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={data}
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				dotRadius={10}
+				width={480}
+				height={270}
+				/>
+		);
+	}
+}
+
+class ScatterplotConfig extends React.Component<{}, {}> {
+	config = [
+		{
+			type: 'One',
+			color: '#ff0000',
+			stroke: 'blue'
+		},
+		{
+			type: 'Two',
+			color: '#00ff00',
+			stroke: 'blue'
+		},
+		{
+			type: 'Three',
+			color: '#ffffff',
+			stroke: 'black'
+		}
+	];
+	render(): any {
+		return (
+			<ScatterplotChart data={data} config={this.config} />
+		);
+	}
+}
+
+class ScatterplotGrid extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={data}
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				dotRadius={10}
+				width={480}
+				height={270}
+				grid
+				/>
+		);
+	}
+}
+
+class ScatterplotVerticalGrid extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={data}
+				axes
+				verticalGrid
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				dotRadius={10}
+				width={480}
+				height={270}
+				grid
+				/>
+		);
+	}
+}
+
+class ScatterplotAxisType extends React.Component<{}, {}> {
+
+	typedData = [
+		{
+			type: 1,
+			x: 'Tue',
+			y: 10
+		},
+		{
+			type: 1,
+			x: 'Wed',
+			y: 20
+		},
+		{
+			type: 2,
+			x: 'Tue',
+			y: 30
+		},
+		{
+			type: 3,
+			x: 'Thu',
+			y: 40
+		}
+	];
+	render(): any {
+		return (
+
+			<ScatterplotChart
+				data={this.typedData}
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				dotRadius={6}
+				width={480}
+				height={270}
+				grid
+				xType="text"
+				/>
+		);
+	}
+}
+
+class ScatterplotDomainRange extends React.Component<{}, {}> {
+
+	typedData = [
+		{
+			type: 1,
+			x: '1-Jan-15',
+			y: 10
+		},
+		{
+			type: 1,
+			x: '2-Jan-15',
+			y: 20
+		},
+		{
+			type: 2,
+			x: '1-Jan-15',
+			y: 30
+		},
+		{
+			type: 2,
+			x: '2-Jan-15',
+			y: 30
+		},
+		{
+			type: 3,
+			x: '3-Jan-15',
+			y: 40
+		}
+	];
+
+	render(): any {
+		return (
+			<ScatterplotChart
+				data={this.typedData}
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				dotRadius={6}
+				width={480}
+				height={270}
+				grid
+				xType="time"
+				xDomainRange={['31-Dec-14', '4-Jan-15']}
+				/>
+		);
+	}
+}
+
+class ScatterplotMouseEvents extends React.Component<{}, {}> {
+	mouseOverHandler(d: any, e: any) { }
+	mouseMoveHandler(e: any) { }
+	mouseOutHandler() { }
+	render(): any {
+		return (
+
+			<ScatterplotChart
+				data={data}
+				axes
+				axisLabels={{ x: 'My x Axis', y: 'My y Axis' }}
+				dotRadius={6}
+				width={480}
+				height={270}
+				grid
+				mouseOverHandler={this.mouseOverHandler}
+				mouseOutHandler={this.mouseOutHandler}
+				mouseMoveHandler={this.mouseMoveHandler}
+				clickHandler={(d) => { } }
+				/>
+		);
+	}
+}
+
+
+const pieData = [
+	{ key: 'Cats', value: 100 },
+	{ key: 'Dogs', value: 200 },
+	{ key: 'Other', value: 50 }
+];
+
+class LegendData extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<Legend data={pieData} dataId={'key'} />
+		);
+	}
+}
+
+class LegendHorizontal extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<Legend data={pieData} dataId={'key'} horizontal />
+		);
+	}
+}
+
+const pieDataCustom = [
+	{ key: 'Cats', value: 100, color: '#aaac84' },
+	{ key: 'Dogs', value: 200, color: '#dce7c5' },
+	{ key: 'Other', value: 50, color: '#e3a51a' }
+];
+
+const config = [
+	{ color: '#aaac84' },
+	{ color: '#dce7c5' },
+	{ color: '#e3a51a' }
+];
+
+class LegendConfig extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<Legend data={pieDataCustom} dataId={'key'} config={config} />
+		);
+	}
+}
+
+
+/* default component styles */
+const defaultStyles = {
+	'.legend': {
+		'list-style': 'none',
+		margin: 0,
+		padding: 0
+	},
+	'.legend li': {
+		display: 'block',
+		lineHeight: '24px',
+		marginRight: '24px',
+		marginBottom: '6px',
+		paddingLeft: '24px',
+		position: 'relative'
+	},
+	'.legend li.horizontal': {
+		display: 'inline-block'
+	},
+	'.legend .icon': {
+		width: '12px',
+		height: '12px',
+		background: 'red',
+		borderRadius: '6px',
+		position: 'absolute',
+		left: '0',
+		top: '50%',
+		marginTop: '-6px'
+	}
+};
+
+/* example override */
+const customStyle = {
+	'.legend': {
+		backgroundColor: '#f9f9f9',
+		border: '1px solid #e5e5e5',
+		borderRadius: '12px',
+		fontSize: '0.8em',
+		maxWidth: '300px',
+		padding: '12px'
+	}
+};
+
+class LegendStyles extends React.Component<{}, {}> {
+	render(): any {
+		return (
+			<Legend
+				data={pieDataCustom}
+				dataId={'key'}
+				config={config}
+				styles={customStyle}
+				horizontal
+				/>
+		);
+	}
+}
\ No newline at end of file
diff --git a/react-easy-chart/tsconfig.json b/react-easy-chart/tsconfig.json
new file mode 100644
index 0000000000..fa7efaac28
--- /dev/null
+++ b/react-easy-chart/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": ["react"],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-easy-chart-tests.tsx"
+    ]
+}
\ No newline at end of file

From f74ca955a579abcbe235cd2364ff2d705788af52 Mon Sep 17 00:00:00 2001
From: Dominic Watson <intellix@users.noreply.github.com>
Date: Mon, 21 Nov 2016 15:41:05 +0100
Subject: [PATCH 202/245] Fix GraphQLError optional constructor parameters
 (#12800)

---
 graphql/index.d.ts | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/graphql/index.d.ts b/graphql/index.d.ts
index 43ca0fdc36..14b29144eb 100644
--- a/graphql/index.d.ts
+++ b/graphql/index.d.ts
@@ -2091,7 +2091,7 @@ declare module "graphql/error/GraphQLError" {
          *
          * Enumerable, and appears in the result of JSON.stringify().
          */
-        locations: Array<{ line: number, column: number }> | void;
+        locations?: Array<{ line: number, column: number }> | void;
 
         /**
          * An array describing the JSON-path into the execution response which
@@ -2099,28 +2099,37 @@ declare module "graphql/error/GraphQLError" {
          *
          * Enumerable, and appears in the result of JSON.stringify().
          */
-        path: Array<string | number> | void;
+        path?: Array<string | number> | void;
 
         /**
          * An array of GraphQL AST Nodes corresponding to this error.
          */
-        nodes: Array<ASTNode> | void;
+        nodes?: Array<ASTNode> | void;
 
         /**
          * The source GraphQL document corresponding to this error.
          */
-        source: Source | void;
+        source?: Source | void;
 
         /**
          * An array of character offsets within the source GraphQL document
          * which correspond to this error.
          */
-        positions: Array<number> | void;
+        positions?: Array<number> | void;
 
         /**
          * The original error thrown from a field resolver during execution.
          */
-        originalError: Error;
+        originalError?: Error;
+
+        constructor(
+            message: string,
+            nodes?: Array<any>,
+            source?: Source,
+            positions?: Array<number>,
+            path?: Array<string | number>,
+            originalError?: Error,
+        );
     }
 }
 

From b70ba5a49edd64280d3e4b2a1f101cf8da8fa297 Mon Sep 17 00:00:00 2001
From: Massimo Andreasi Bassi <massimoandreasi@gmail.com>
Date: Mon, 21 Nov 2016 09:51:25 -0500
Subject: [PATCH 203/245] Missing property `socket.destroyed` (#12639)

* Missing property `socket.destroyed`

https://nodejs.org/dist/latest-v4.x/docs/api/net.html#net_socket_destroyed

* Added socket.destroyed tests

* Moved socket.destroyed to index
---
 node/index.d.ts    |  1 +
 node/node-tests.ts | 73 ++++++++++++++++++++++++----------------------
 2 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/node/index.d.ts b/node/index.d.ts
index ea81e61147..ea22eb6486 100644
--- a/node/index.d.ts
+++ b/node/index.d.ts
@@ -1851,6 +1851,7 @@ declare module "net" {
         localPort: number;
         bytesRead: number;
         bytesWritten: number;
+        destroyed: boolean;
 
         // Extended base methods
         end(): void;
diff --git a/node/node-tests.ts b/node/node-tests.ts
index 9873b19e72..9116125b1e 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -47,33 +47,33 @@ namespace global_tests {
 namespace assert_tests {
     {
         assert(1 + 1 - 2 === 0, "The universe isn't how it should.");
-        
+
         assert.deepEqual({ x: { y: 3 } }, { x: { y: 3 } }, "DEEP WENT DERP");
-        
+
         assert.deepStrictEqual({ a: 1 }, { a: 1 }, "uses === comparator");
-        
+
         assert.doesNotThrow(() => {
             const b = false;
             if (b) { throw "a hammer at your face"; }
         }, undefined, "What the...*crunch*");
-        
+
         assert.equal(3, "3", "uses == comparator");
 
         assert.fail(1, 2, undefined, '>');
-        
+
         assert.ifError(0);
-        
+
         assert.notDeepStrictEqual({ x: { y: "3" } }, { x: { y: 3 } }, "uses !== comparator");
-        
+
         assert.notEqual(1, 2, "uses != comparator");
-        
+
         assert.notStrictEqual(2, "2", "uses === comparator");
-        
+
         assert.ok(true);
         assert.ok(1);
-        
+
         assert.strictEqual(1, 1,  "uses === comparator");
-        
+
         assert.throws(() => { throw "a hammer at your face"; }, undefined, "DODGED IT");
     }
 }
@@ -153,21 +153,21 @@ namespace fs_tests {
         fs.writeFile("thebible.txt",
             "Do unto others as you would have them do unto you.",
             assert.ifError);
-        
+
         fs.write(1234, "test");
-        
+
         fs.writeFile("Harry Potter",
             "\"You be wizzing, Harry,\" jived Dumbledore.",
             {
                 encoding: "ascii"
             },
-            assert.ifError);	
+            assert.ifError);
     }
 
     {
         var content: string;
         var buffer: Buffer;
-        
+
         content = fs.readFileSync('testfile', 'utf8');
         content = fs.readFileSync('testfile', { encoding: 'utf8' });
         buffer = fs.readFileSync('testfile');
@@ -177,7 +177,7 @@ namespace fs_tests {
         fs.readFile('testfile', (err, data) => buffer = data);
         fs.readFile('testfile', { flag: 'r' }, (err, data) => buffer = data);
     }
-    
+
     {
         var errno: number;
         fs.readFile('testfile', (err, data) => {
@@ -186,28 +186,28 @@ namespace fs_tests {
             }
         });
     }
-    
+
     {
         fs.mkdtemp('/tmp/foo-', (err, folder) => {
             console.log(folder);
             // Prints: /tmp/foo-itXde2
         });
     }
-    
+
     {
         var tempDir: string;
         tempDir = fs.mkdtempSync('/tmp/foo-');
     }
-    
+
     {
         fs.watch('/tmp/foo-', (event, filename) => {
           console.log(event, filename);
         });
-        
+
         fs.watch('/tmp/foo-', 'utf8', (event, filename) => {
           console.log(event, filename);
         });
-        
+
         fs.watch('/tmp/foo-', {
           recursive: true,
           persistent: true,
@@ -216,22 +216,22 @@ namespace fs_tests {
           console.log(event, filename);
         });
     }
-    
+
     {
         fs.access('/path/to/folder', (err) => { });
-        
+
         fs.access(Buffer.from(''), (err) => { });
-        
+
         fs.access('/path/to/folder', fs.constants.F_OK | fs.constants.R_OK, (err) => { });
-        
+
         fs.access(Buffer.from(''), fs.constants.F_OK | fs.constants.R_OK, (err) => { });
-        
+
         fs.accessSync('/path/to/folder');
-        
+
         fs.accessSync(Buffer.from(''));
-        
+
         fs.accessSync('path/to/folder', fs.constants.W_OK | fs.constants.X_OK);
-        
+
         fs.accessSync(Buffer.from(''), fs.constants.W_OK | fs.constants.X_OK);
     }
 }
@@ -400,14 +400,14 @@ function bufferTests() {
 namespace url_tests {
     {
         url.format(url.parse('http://www.example.com/xyz'));
-        
+
         // https://google.com/search?q=you're%20a%20lizard%2C%20gary
         url.format({
             protocol: 'https',
             host: "google.com",
             pathname: 'search',
             query: { q: "you're a lizard, gary" }
-        });   
+        });
     }
 
     {
@@ -424,7 +424,7 @@ namespace util_tests {
     {
         // Old and new util.inspect APIs
         util.inspect(["This is nice"], false, 5);
-        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });    
+        util.inspect(["This is nice"], { colors: true, depth: 5, customInspect: false });
     }
 }
 
@@ -772,7 +772,7 @@ namespace tls_tests {
             let _response: Buffer = response;
         })
         _TLSSocket = _TLSSocket.prependOnceListener("secureConnect", () => { });
-    } 
+    }
 }
 
 ////////////////////////////////////////////////////
@@ -1315,7 +1315,7 @@ namespace string_decoder_tests {
 namespace child_process_tests {
     {
         childProcess.exec("echo test");
-        childProcess.spawnSync("echo test");    
+        childProcess.spawnSync("echo test");
     }
     
     {
@@ -1574,7 +1574,7 @@ namespace process_tests {
     {
         var eventEmitter: events.EventEmitter;
         eventEmitter = process;                // Test that process implements EventEmitter...
-        
+
         var _p: NodeJS.Process = process;
         _p = p;
     }
@@ -1770,6 +1770,9 @@ namespace net_tests {
             str = host;
         })
         _socket = _socket.prependOnceListener("timeout", () => { })
+
+        bool = _socket.destroyed;
+        _socket.destroy();
     }
 
     {

From 9db910d965c843554e443351f6cfadb67005e85a Mon Sep 17 00:00:00 2001
From: Mizunashi Mana <mizunashi_mana@mma.club.uec.ac.jp>
Date: Mon, 21 Nov 2016 23:53:28 +0900
Subject: [PATCH 204/245] Add chai-oequal types (#12799)

---
 chai-oequal/chai-oequal-tests.ts | 35 ++++++++++++++++++++++++++++++++
 chai-oequal/index.d.ts           | 27 ++++++++++++++++++++++++
 chai-oequal/tsconfig.json        | 19 +++++++++++++++++
 chai-oequal/tslint.json          |  6 ++++++
 4 files changed, 87 insertions(+)
 create mode 100644 chai-oequal/chai-oequal-tests.ts
 create mode 100644 chai-oequal/index.d.ts
 create mode 100644 chai-oequal/tsconfig.json
 create mode 100644 chai-oequal/tslint.json

diff --git a/chai-oequal/chai-oequal-tests.ts b/chai-oequal/chai-oequal-tests.ts
new file mode 100644
index 0000000000..ae7dbdc29f
--- /dev/null
+++ b/chai-oequal/chai-oequal-tests.ts
@@ -0,0 +1,35 @@
+import Chai = require('chai');
+import ChaiOequal = require('chai-oequal');
+
+Chai.use(ChaiOequal);
+
+import {
+    expect,
+    assert
+} from 'chai';
+
+expect({
+    equals: () => true,
+}).to.be.oequal({});
+expect({
+    customequals: () => true,
+}).to.be.oequal({}, 'customequals');
+expect({
+    equals: () => true,
+}).to.be.oeql({});
+expect({
+    equals: () => true,
+}).to.be.oeq({});
+
+assert.oequal({
+    equals: () => true,
+}, {});
+assert.oequal({
+    customequals: () => true,
+}, {}, 'customequals');
+assert.oeql({
+    equals: () => true,
+}, {});
+assert.oeq({
+    equals: () => true,
+}, {});
diff --git a/chai-oequal/index.d.ts b/chai-oequal/index.d.ts
new file mode 100644
index 0000000000..bf5f9e201f
--- /dev/null
+++ b/chai-oequal/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for chai-oequal
+// Project: https://github.com/wrwrwr/chai-oequal
+// Definitions by: Mizunashi Mana <https://github.com/mizunashi-mana>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="chai" />
+
+declare namespace Chai {
+    // For BDD APIs
+    interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+        oequal(result: any, method?: string): Equal;
+        oeql(result: any, method?: string): Equal;
+        oeq(result: any, method?: string): Equal;
+    }
+
+    // For Assert APIs
+    interface Assert {
+        oequal(act: any, exp: any, method?: string): Equal;
+        oeql(act: any, exp: any, method?: string): Equal;
+        oeq(act: any, exp: any, method?: string): Equal;
+    }
+}
+
+declare module 'chai-oequal' {
+    function chaiOequal(chai: any, utils: any): void;
+    export = chaiOequal;
+}
diff --git a/chai-oequal/tsconfig.json b/chai-oequal/tsconfig.json
new file mode 100644
index 0000000000..cfeb14eeee
--- /dev/null
+++ b/chai-oequal/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "chai-oequal-tests.ts"
+    ]
+}
diff --git a/chai-oequal/tslint.json b/chai-oequal/tslint.json
new file mode 100644
index 0000000000..cfdf2986e5
--- /dev/null
+++ b/chai-oequal/tslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "../tslint.json",
+  "rules": {
+    "no-single-declare-module": false
+  }
+}

From b99e420919321ce4c890d2ab04a9970e3678dd8f Mon Sep 17 00:00:00 2001
From: maghis <massimoandreasi@gmail.com>
Date: Mon, 21 Nov 2016 10:52:22 -0500
Subject: [PATCH 205/245] Added support for compressing strings

---
 node/index.d.ts    | 10 +++++-----
 node/node-tests.ts |  7 ++++++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/node/index.d.ts b/node/index.d.ts
index 6bd6c444e2..84113ad114 100644
--- a/node/index.d.ts
+++ b/node/index.d.ts
@@ -1046,10 +1046,10 @@ declare module "zlib" {
     export function createInflateRaw(options?: ZlibOptions): InflateRaw;
     export function createUnzip(options?: ZlibOptions): Unzip;
 
-    export function deflate(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
-    export function deflateSync(buf: Buffer, options?: ZlibOptions): Buffer;
-    export function deflateRaw(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
-    export function deflateRawSync(buf: Buffer, options?: ZlibOptions): Buffer;
+    export function deflate(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
+    export function deflateSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
+    export function deflateRaw(buf: Buffer | string, callback: (error: Error, result: Buffer) => void): void;
+    export function deflateRawSync(buf: Buffer | string, options?: ZlibOptions): Buffer;
     export function gzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
     export function gzipSync(buf: Buffer, options?: ZlibOptions): Buffer;
     export function gunzip(buf: Buffer, callback: (error: Error, result: Buffer) => void): void;
@@ -1539,7 +1539,7 @@ declare module "child_process" {
         disconnect(): void;
         unref(): void;
         ref(): void;
-    
+
         /**
          * events.EventEmitter
          * 1. close
diff --git a/node/node-tests.ts b/node/node-tests.ts
index 4c48fe05d5..bfe0d16f48 100644
--- a/node/node-tests.ts
+++ b/node/node-tests.ts
@@ -451,12 +451,17 @@ function stream_readable_pipe_test() {
 
 // helpers
 const compressMe = new Buffer("some data");
+const compressMeString = "compress me!";
 
 zlib.deflate(compressMe, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
+zlib.deflate(compressMeString, (err: Error, result: Buffer) => zlib.inflate(result, (err: Error, result: Buffer) => result));
 const inflated = zlib.inflateSync(zlib.deflateSync(compressMe));
+const inflatedString = zlib.inflateSync(zlib.deflateSync(compressMeString));
 
 zlib.deflateRaw(compressMe, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
+zlib.deflateRaw(compressMeString, (err: Error, result: Buffer) => zlib.inflateRaw(result, (err: Error, result: Buffer) => result));
 const inflatedRaw: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMe));
+const inflatedRawString: Buffer = zlib.inflateRawSync(zlib.deflateRawSync(compressMeString));
 
 zlib.gzip(compressMe, (err: Error, result: Buffer) => zlib.gunzip(result, (err: Error, result: Buffer) => result));
 const gunzipped: Buffer = zlib.gunzipSync(zlib.gzipSync(compressMe));
@@ -1332,7 +1337,7 @@ namespace child_process_tests {
         childProcess.exec("echo test");
         childProcess.spawnSync("echo test");
     }
-    
+
     {
         let _cp: childProcess.ChildProcess;
         let _boolean: boolean;

From 1d62ee1441829ff4fa858c22bfc5b32dcab4fcc9 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 08:35:34 -0800
Subject: [PATCH 206/245] Fix typoes in readme and improve link readability

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index ab2080714b..0a7131bd99 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ DefinitelyTyped only works because of contributions by users like you!
 
 Before you share your improvement with the world, use it yourself.
 
-#### Test editing an exiting package
+#### Test editing an existing package
 
 To add new features you can use [module augmentation](http://www.typescriptlang.org/docs/handbook/declaration-merging.html).
 You can also directly edit the types in `node_modules/@types/foo/index.d.ts`, or copy them from there and follow the steps below.
@@ -100,7 +100,7 @@ If it doesn't, you can do so yourself in the comment associated with the PR.
 
 #### Create a new package
 
-If you are the library author, or can make a pull request to the library, [bundle](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) types instead of publishing to DefinitelyTyped.
+If you are the library author, or can make a pull request to the library, [bundle types](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html) instead of publishing to DefinitelyTyped.
 
 If you are adding typings for an NPM package, create a directory with the same name.
 If the package you are adding typings for is not on NPM, make sure the name you choose for it does not conflict with the name of a package on NPM.
@@ -192,7 +192,7 @@ Changes to the `master` branch are also manually merged into the `types-2.0` bra
 #### I'm writing a definition that depends on another definition. Should I use `<reference types="" />` or an import?
 
 If the module you're referencing is an external module (uses `export`), use an import.
-If the module you're referenceing is an ambient module (uses `declare module`, or just declares globals), use `<reference types="" />`.
+If the module you're referencing is an ambient module (uses `declare module`, or just declares globals), use `<reference types="" />`.
 
 #### What do I do about older versions of typings?
 

From 9fd6eab69291b4760d6bd6f8a197220d827b0ecf Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 08:52:14 -0800
Subject: [PATCH 207/245] Convert \r\n -> \n in a few files

---
 gapi.analytics/gapi.analytics-tests.ts | 132 ++++++-------
 gapi.analytics/gapi.analytics.d.ts     | 252 ++++++++++++-------------
 matter-js/matter-js.d.ts               |   2 +-
 3 files changed, 193 insertions(+), 193 deletions(-)

diff --git a/gapi.analytics/gapi.analytics-tests.ts b/gapi.analytics/gapi.analytics-tests.ts
index a6aea00796..78b30e1745 100644
--- a/gapi.analytics/gapi.analytics-tests.ts
+++ b/gapi.analytics/gapi.analytics-tests.ts
@@ -1,66 +1,66 @@
-// Type definitions for Google Analytics API
-
-/// <reference path="../gapi/gapi.d.ts" />
-/// <reference path="./gapi.analytics.d.ts" />
-
-function test_namespace() {
-	var analytics : boolean = gapi.client.analytics instanceof Object;
-	
-	var provisioning : boolean = gapi.client.analytics.provisioning.createAccountTicket instanceof Function;
-	analytics = analytics && provisioning;
-
-	var data : boolean = gapi.client.analytics.data.ga.get instanceof Function;
-	data = data && gapi.client.analytics.data.mcf.get instanceof Function;
-	data = data && gapi.client.analytics.data.realtime.get instanceof Function;
-	analytics = analytics && data;
-
-	interface AnalyticsParameter {
-		"type"              ?: string;
-		"description"       ?: string;
-		"default"           ?: string;
-		"enum"              ?: string[];
-		"enumDescriptions"  ?: string[];
-		"location"          ?: string;
-	}
-    var kBI : AnalyticsParameter = gapi.client.analytics.kB.parameters.alt;
-	var kB = !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.fields;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.key;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.oauth_token;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.prettyPrint;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.quotaUser;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.userIP;
-	kB = kB && !!kBI;
-	analytics = analytics && kB;
-
-	var management : boolean = gapi.client.analytics.management.accountSummaries.list instanceof Function;
-	management = management && gapi.client.analytics.management.accountUserLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.accounts.list instanceof Function;
-	management = management && gapi.client.analytics.management.customDataSources.list instanceof Function;
-	management = management && gapi.client.analytics.management.customDimensions.list instanceof Function;
-	management = management && gapi.client.analytics.management.customMetrics.list instanceof Function;
-	management = management && gapi.client.analytics.management.experiments.list instanceof Function;
-	management = management && gapi.client.analytics.management.filters.list instanceof Function;
-	management = management && gapi.client.analytics.management.goals.list instanceof Function;
-	management = management && gapi.client.analytics.management.profileFilterLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.profileUserLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.profiles.list instanceof Function;
-	management = management && gapi.client.analytics.management.remarketingAudience.list instanceof Function;
-	management = management && gapi.client.analytics.management.segments.list instanceof Function;
-	management = management && gapi.client.analytics.management.unsampledReports.list instanceof Function;
-	management = management && gapi.client.analytics.management.uploads.list instanceof Function;
-	management = management && gapi.client.analytics.management.webPropertyAdWordsLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.webproperties.list instanceof Function;
-	management = management && gapi.client.analytics.management.webpropertyUserLinks.list instanceof Function;
-	analytics = analytics && management;
-
-	var metadata : boolean = gapi.client.analytics.metadata.column.list instanceof Function;
-	analytics = analytics && metadata;
-	
-	return analytics;
-}
+// Type definitions for Google Analytics API
+
+/// <reference path="../gapi/gapi.d.ts" />
+/// <reference path="./gapi.analytics.d.ts" />
+
+function test_namespace() {
+	var analytics : boolean = gapi.client.analytics instanceof Object;
+	
+	var provisioning : boolean = gapi.client.analytics.provisioning.createAccountTicket instanceof Function;
+	analytics = analytics && provisioning;
+
+	var data : boolean = gapi.client.analytics.data.ga.get instanceof Function;
+	data = data && gapi.client.analytics.data.mcf.get instanceof Function;
+	data = data && gapi.client.analytics.data.realtime.get instanceof Function;
+	analytics = analytics && data;
+
+	interface AnalyticsParameter {
+		"type"              ?: string;
+		"description"       ?: string;
+		"default"           ?: string;
+		"enum"              ?: string[];
+		"enumDescriptions"  ?: string[];
+		"location"          ?: string;
+	}
+    var kBI : AnalyticsParameter = gapi.client.analytics.kB.parameters.alt;
+	var kB = !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.fields;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.key;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.oauth_token;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.prettyPrint;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.quotaUser;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.userIP;
+	kB = kB && !!kBI;
+	analytics = analytics && kB;
+
+	var management : boolean = gapi.client.analytics.management.accountSummaries.list instanceof Function;
+	management = management && gapi.client.analytics.management.accountUserLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.accounts.list instanceof Function;
+	management = management && gapi.client.analytics.management.customDataSources.list instanceof Function;
+	management = management && gapi.client.analytics.management.customDimensions.list instanceof Function;
+	management = management && gapi.client.analytics.management.customMetrics.list instanceof Function;
+	management = management && gapi.client.analytics.management.experiments.list instanceof Function;
+	management = management && gapi.client.analytics.management.filters.list instanceof Function;
+	management = management && gapi.client.analytics.management.goals.list instanceof Function;
+	management = management && gapi.client.analytics.management.profileFilterLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.profileUserLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.profiles.list instanceof Function;
+	management = management && gapi.client.analytics.management.remarketingAudience.list instanceof Function;
+	management = management && gapi.client.analytics.management.segments.list instanceof Function;
+	management = management && gapi.client.analytics.management.unsampledReports.list instanceof Function;
+	management = management && gapi.client.analytics.management.uploads.list instanceof Function;
+	management = management && gapi.client.analytics.management.webPropertyAdWordsLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.webproperties.list instanceof Function;
+	management = management && gapi.client.analytics.management.webpropertyUserLinks.list instanceof Function;
+	analytics = analytics && management;
+
+	var metadata : boolean = gapi.client.analytics.metadata.column.list instanceof Function;
+	analytics = analytics && metadata;
+	
+	return analytics;
+}
diff --git a/gapi.analytics/gapi.analytics.d.ts b/gapi.analytics/gapi.analytics.d.ts
index dc49ffd617..34027c9d47 100644
--- a/gapi.analytics/gapi.analytics.d.ts
+++ b/gapi.analytics/gapi.analytics.d.ts
@@ -1,126 +1,126 @@
-// Type definitions for Google Analytics API
-// Project: https://developers.google.com/analytics/devguides/reporting/core/v4/
-// Definitions by: César Costas <https://github.com/gatsbimantico>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.client.analytics {}
-declare namespace gapi.client.analytics.provisioning {
-    export function createAccountTicket() : Promise<any>;
-}
-
-interface DataQuery {
-    "ids"                   ?: string;
-    "start-date"            ?: string;
-    "30daysAgo"             ?: string;
-    "end-date"              ?: string;
-    "yesterday"             ?: string;
-    "metrics"               ?: string;
-    "dimensions"            ?: string;
-    "sort"                  ?: string;
-    "filters"               ?: string;
-    "segment"               ?: string;
-    "samplingLevel"         ?: string;
-    "include-empty-rows"    ?: string;
-    "start-index"           ?: string;
-    "max-results"           ?: string;
-}
-declare namespace gapi.client.analytics.data {}
-declare namespace gapi.client.analytics.data.ga {
-    export function get(data ?: DataQuery) : Promise<any>;
-}
-declare namespace gapi.client.analytics.data.mcf {
-    export function get(data ?: DataQuery) : Promise<any>;
-}
-declare namespace gapi.client.analytics.data.realtime {
-    export function get(data ?: DataQuery) : Promise<any>;
-}
-
-declare namespace gapi.client.analytics.kB {}
-declare namespace gapi.client.analytics.kB.parameters {
-	export interface AnalyticsParameter {
-		"type"              ?: string;
-		"description"       ?: string;
-		"default"           ?: string;
-		"enum"              ?: string[];
-		"enumDescriptions"  ?: string[];
-		"location"          ?: string;
-	}
-	export class alt implements AnalyticsParameter {}
-	export class fields implements AnalyticsParameter {}
-	export class key implements AnalyticsParameter {}
-	export class oauth_token implements AnalyticsParameter {}
-	export class prettyPrint implements AnalyticsParameter {}
-	export class quotaUser implements AnalyticsParameter {}
-	export class userIP implements AnalyticsParameter {}
-}
-
-interface View {
-    accountId       ?: string;
-    webPropertyId   ?: string;
-    webViewId       ?: string;
-}
-declare namespace gapi.client.analytics.management {}
-declare namespace gapi.client.analytics.management.accountSummaries {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.accountUserLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.accounts {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.customDataSources {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.customDimensions {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.customMetrics {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.experiments {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.filters {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.goals {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.profileFilterLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.profileUserLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.profiles {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.remarketingAudience {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.segments {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.unsampledReports {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.uploads {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.webPropertyAdWordsLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.webproperties {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.webpropertyUserLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-
-declare namespace gapi.client.analytics.metadata {}
-declare namespace gapi.client.analytics.metadata.column {
-    export function list() : Promise<any>;
-}
+// Type definitions for Google Analytics API
+// Project: https://developers.google.com/analytics/devguides/reporting/core/v4/
+// Definitions by: César Costas <https://github.com/gatsbimantico>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../gapi/gapi.d.ts" />
+
+declare namespace gapi.client.analytics {}
+declare namespace gapi.client.analytics.provisioning {
+    export function createAccountTicket() : Promise<any>;
+}
+
+interface DataQuery {
+    "ids"                   ?: string;
+    "start-date"            ?: string;
+    "30daysAgo"             ?: string;
+    "end-date"              ?: string;
+    "yesterday"             ?: string;
+    "metrics"               ?: string;
+    "dimensions"            ?: string;
+    "sort"                  ?: string;
+    "filters"               ?: string;
+    "segment"               ?: string;
+    "samplingLevel"         ?: string;
+    "include-empty-rows"    ?: string;
+    "start-index"           ?: string;
+    "max-results"           ?: string;
+}
+declare namespace gapi.client.analytics.data {}
+declare namespace gapi.client.analytics.data.ga {
+    export function get(data ?: DataQuery) : Promise<any>;
+}
+declare namespace gapi.client.analytics.data.mcf {
+    export function get(data ?: DataQuery) : Promise<any>;
+}
+declare namespace gapi.client.analytics.data.realtime {
+    export function get(data ?: DataQuery) : Promise<any>;
+}
+
+declare namespace gapi.client.analytics.kB {}
+declare namespace gapi.client.analytics.kB.parameters {
+	export interface AnalyticsParameter {
+		"type"              ?: string;
+		"description"       ?: string;
+		"default"           ?: string;
+		"enum"              ?: string[];
+		"enumDescriptions"  ?: string[];
+		"location"          ?: string;
+	}
+	export class alt implements AnalyticsParameter {}
+	export class fields implements AnalyticsParameter {}
+	export class key implements AnalyticsParameter {}
+	export class oauth_token implements AnalyticsParameter {}
+	export class prettyPrint implements AnalyticsParameter {}
+	export class quotaUser implements AnalyticsParameter {}
+	export class userIP implements AnalyticsParameter {}
+}
+
+interface View {
+    accountId       ?: string;
+    webPropertyId   ?: string;
+    webViewId       ?: string;
+}
+declare namespace gapi.client.analytics.management {}
+declare namespace gapi.client.analytics.management.accountSummaries {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.accountUserLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.accounts {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.customDataSources {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.customDimensions {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.customMetrics {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.experiments {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.filters {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.goals {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.profileFilterLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.profileUserLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.profiles {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.remarketingAudience {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.segments {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.unsampledReports {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.uploads {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.webPropertyAdWordsLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.webproperties {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.webpropertyUserLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+
+declare namespace gapi.client.analytics.metadata {}
+declare namespace gapi.client.analytics.metadata.column {
+    export function list() : Promise<any>;
+}
diff --git a/matter-js/matter-js.d.ts b/matter-js/matter-js.d.ts
index cc887673ee..f21ad2ef7b 100644
--- a/matter-js/matter-js.d.ts
+++ b/matter-js/matter-js.d.ts
@@ -2129,7 +2129,7 @@ declare namespace Matter {
          * @param {engine} engine
          * @param {} options
          * @return {MouseConstraint} A new MouseConstraint
-         */
+         */
         static create(engine: Engine, options?: IMouseConstraintDefinition): MouseConstraint;
 
         /**

From 7d87ea82696617aaab38de0d04f6180379200aa6 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 10:41:15 -0800
Subject: [PATCH 208/245] Fix assert and react-native-sortable-list merge

---
 assert/index.d.ts                             |  3 -
 react-native-sortable-list/index.d.ts         | 89 +++++++++++++++++
 .../react-native-sortable-list-tests.tsx      |  5 -
 .../react-native-sortable-list.d.ts           | 99 -------------------
 react-native-sortable-list/tsconfig.json      | 18 +++-
 5 files changed, 105 insertions(+), 109 deletions(-)
 create mode 100644 react-native-sortable-list/index.d.ts
 delete mode 100644 react-native-sortable-list/react-native-sortable-list.d.ts

diff --git a/assert/index.d.ts b/assert/index.d.ts
index 35220dbb87..18c042fe26 100644
--- a/assert/index.d.ts
+++ b/assert/index.d.ts
@@ -57,6 +57,3 @@ declare namespace assert {
     export function ifError(value:any):void;
 }
 
-declare module "assert" {
-    export = assert;
-}
diff --git a/react-native-sortable-list/index.d.ts b/react-native-sortable-list/index.d.ts
new file mode 100644
index 0000000000..a62dcfcc88
--- /dev/null
+++ b/react-native-sortable-list/index.d.ts
@@ -0,0 +1,89 @@
+// Type definitions for react-native-sortable-list
+// Project: https://github.com/gitim/react-native-sortable-list
+// Definitions by: Michael Sivolobov <https://github.com/sivolobov>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as React from 'react';
+
+type DataKey = string | number;
+
+export type DataValue = any
+
+type DataByNumber = {
+    [key: number]: DataValue
+}
+
+type DataByString = {
+    [key: string]: DataValue
+}
+
+export type Data = DataByNumber | DataByString;
+
+export interface RowProps {
+    active: boolean
+    data: DataValue
+    key?: DataKey
+    index?: number
+    disabled?: boolean
+}
+
+interface SortableListProps {
+
+    /**
+     * data source
+     */
+    data: Data
+
+    /**
+     * an array of keys from data, the order of keys from the array will be used to initial rows order
+     */
+    order?: DataKey[]
+
+    /**
+     * style of HOC
+     */
+    style?: React.ViewStyle
+
+    /**
+     * these styles will be applied to the inner scroll view content container
+     */
+    contentContainerStyle?: React.ViewStyle
+
+    /**
+     * when false, rows are not sortable. The default value is true.
+     */
+    sortingEnabled?: boolean
+
+    /**
+     * when false, the content does not scrollable. The default value is true.
+     */
+    scrollEnabled?: boolean
+
+    /**
+     * Takes a row key, row index, data entry from the data source and its statuses disabled,
+     *  active and should return a renderable component to be rendered as the row.
+     */
+    renderRow: (props: RowProps) => JSX.Element
+
+    /**
+     * Called when rows were reordered, takes an array of rows keys of the next rows order.
+     */
+    onChangeOrder?: (nextOrder: DataKey[]) => void
+
+    /**
+     * Called when a row was activated (user long tapped).
+     */
+    onActivateRow?: (key: DataKey) => void
+
+    /**
+     * Called when the active row was released.
+     */
+    onReleaseRow?: (key: DataKey) => void
+}
+
+interface SortableListStatic extends React.ClassicComponentClass<SortableListProps> {}
+
+declare var SortableList: SortableListStatic;
+declare type SortableList = SortableListStatic;
+
+export default SortableList;
diff --git a/react-native-sortable-list/react-native-sortable-list-tests.tsx b/react-native-sortable-list/react-native-sortable-list-tests.tsx
index fb72ce2e2f..57a59b8d20 100644
--- a/react-native-sortable-list/react-native-sortable-list-tests.tsx
+++ b/react-native-sortable-list/react-native-sortable-list-tests.tsx
@@ -1,7 +1,3 @@
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="../react-native/react-native.d.ts"/>
-/// <reference path="react-native-sortable-list.d.ts" />
-
 import * as React from 'react';
 import {
     Animated,
@@ -17,7 +13,6 @@ import {
 } from 'react-native';
 import SortableList, {RowProps} from 'react-native-sortable-list';
 
-
 const window = Dimensions.get('window');
 
 const data = {
diff --git a/react-native-sortable-list/react-native-sortable-list.d.ts b/react-native-sortable-list/react-native-sortable-list.d.ts
deleted file mode 100644
index 38a078c689..0000000000
--- a/react-native-sortable-list/react-native-sortable-list.d.ts
+++ /dev/null
@@ -1,99 +0,0 @@
-// Type definitions for react-native-sortable-list
-// Project: https://github.com/gitim/react-native-sortable-list
-// Definitions by: Michael Sivolobov <https://github.com/sivolobov>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../react/react.d.ts"/>
-/// <reference path="../react-native/react-native.d.ts"/>
-
-declare namespace __SortableList {
-
-    type DataKey = string | number;
-
-    export type DataValue = any
-
-    type DataByNumber = {
-        [key: number]: DataValue
-    }
-
-    type DataByString = {
-        [key: string]: DataValue
-    }
-
-    export type Data = DataByNumber | DataByString;
-
-    export interface RowProps {
-        active: boolean
-        data: DataValue
-        key?: DataKey
-        index?: number
-        disabled?: boolean
-    }
-
-    interface SortableListProps {
-
-        /**
-         * data source
-         */
-        data: Data
-
-        /**
-         * an array of keys from data, the order of keys from the array will be used to initial rows order
-         */
-        order?: DataKey[]
-
-        /**
-         * style of HOC
-         */
-        style?: React.ViewStyle
-
-        /**
-         * these styles will be applied to the inner scroll view content container
-         */
-        contentContainerStyle?: React.ViewStyle
-
-        /**
-         * when false, rows are not sortable. The default value is true.
-         */
-        sortingEnabled?: boolean
-
-        /**
-         * when false, the content does not scrollable. The default value is true.
-         */
-        scrollEnabled?: boolean
-
-        /**
-         * Takes a row key, row index, data entry from the data source and its statuses disabled,
-         *  active and should return a renderable component to be rendered as the row.
-         */
-        renderRow: (props: RowProps) => JSX.Element
-
-        /**
-         * Called when rows were reordered, takes an array of rows keys of the next rows order.
-         */
-        onChangeOrder?: (nextOrder: DataKey[]) => void
-
-        /**
-         * Called when a row was activated (user long tapped).
-         */
-        onActivateRow?: (key: DataKey) => void
-
-        /**
-         * Called when the active row was released.
-         */
-        onReleaseRow?: (key: DataKey) => void
-    }
-
-    export interface SortableListStatic extends React.ClassicComponentClass<SortableListProps> {}
-
-    export var SortableList: SortableListStatic;
-    export type SortableList = SortableListStatic;
-}
-
-declare module 'react-native-sortable-list' {
-    import SortableList = __SortableList;
-
-    export interface RowProps extends SortableList.RowProps {}
-
-    export default SortableList.SortableList;
-}
diff --git a/react-native-sortable-list/tsconfig.json b/react-native-sortable-list/tsconfig.json
index b666373644..9e533f6495 100644
--- a/react-native-sortable-list/tsconfig.json
+++ b/react-native-sortable-list/tsconfig.json
@@ -1,6 +1,20 @@
 {
     "compilerOptions": {
+        "module": "commonjs",
         "target": "es6",
-        "noImplicitAny": true
-    }
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-sortable-list-tests.tsx"
+    ]
 }

From ad4e3de7ad6838a1f83b3d215a71dbbe8a927c43 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 21 Nov 2016 10:43:52 -0800
Subject: [PATCH 209/245] Convert multiple `Project` headers to a single
 comma-separated list (#12829)

---
 assert/index.d.ts                | 3 +--
 google-libphonenumber/index.d.ts | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/assert/index.d.ts b/assert/index.d.ts
index abd31688f1..f358833165 100644
--- a/assert/index.d.ts
+++ b/assert/index.d.ts
@@ -1,6 +1,5 @@
 // Type definitions for assert and power-assert
-// Project: https://github.com/Jxck/assert
-// Project: https://github.com/twada/power-assert
+// Project: https://github.com/Jxck/assert, https://github.com/twada/power-assert
 // Definitions by: vvakame <https://github.com/vvakame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
diff --git a/google-libphonenumber/index.d.ts b/google-libphonenumber/index.d.ts
index 28f72f67a3..0c0e1efda3 100644
--- a/google-libphonenumber/index.d.ts
+++ b/google-libphonenumber/index.d.ts
@@ -1,6 +1,5 @@
 // Type definitions for libphonenumber v7.4.3
-// Project: https://github.com/googlei18n/libphonenumber
-// Project: https://github.com/seegno/google-libphonenumber
+// Project: https://github.com/googlei18n/libphonenumber, https://github.com/seegno/google-libphonenumber
 // Definitions by: Leon Yu <https://github.com/leonyu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 

From 79f359c500530bf0418efbfb205a1ea07fc45b41 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 21 Nov 2016 10:44:02 -0800
Subject: [PATCH 210/245] Remove patch version from linted project (#12833)

---
 usb/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/usb/index.d.ts b/usb/index.d.ts
index 1e8a994383..da2cce8b96 100644
--- a/usb/index.d.ts
+++ b/usb/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for node-usb 1.1.2
+// Type definitions for node-usb 1.1
 // Project: https://github.com/nonolith/node-usb
 // Definitions by: Eric Brody <https://github.com/underscorebrody>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped

From 432ced1ff379173a9471ae75388b6bd9adbc4399 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 21 Nov 2016 10:50:14 -0800
Subject: [PATCH 211/245] D3 modules (#12542)

* Rename files

* Fix d3-box and d3.slider typings
---
 d3-box/d3-box-tests.ts                   |  3 ---
 d3-box/{d3-box.d.ts => index.d.ts}       |  4 ++--
 d3-box/package.json                      |  5 +++++
 d3-box/tsconfig.json                     | 14 ++++++++++++++
 d3.slider/d3.slider-tests.ts             |  3 ---
 d3.slider/{d3.slider.d.ts => index.d.ts} |  4 ++--
 d3.slider/package.json                   |  5 +++++
 d3.slider/tsconfig.json                  | 14 ++++++++++++++
 8 files changed, 42 insertions(+), 10 deletions(-)
 rename d3-box/{d3-box.d.ts => index.d.ts} (93%)
 create mode 100644 d3-box/package.json
 create mode 100644 d3-box/tsconfig.json
 rename d3.slider/{d3.slider.d.ts => index.d.ts} (94%)
 create mode 100644 d3.slider/package.json
 create mode 100644 d3.slider/tsconfig.json

diff --git a/d3-box/d3-box-tests.ts b/d3-box/d3-box-tests.ts
index 191962ff13..ab5ca799ba 100644
--- a/d3-box/d3-box-tests.ts
+++ b/d3-box/d3-box-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="d3-box.d.ts" />
-
 // Inspired by http://bl.ocks.org/mbostock/4061502
 
 function iqr(k: number) {
diff --git a/d3-box/d3-box.d.ts b/d3-box/index.d.ts
similarity index 93%
rename from d3-box/d3-box.d.ts
rename to d3-box/index.d.ts
index 4bc837df31..fdc304a68e 100644
--- a/d3-box/d3-box.d.ts
+++ b/d3-box/index.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Linkun Chen <https://github.com/lk-chen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../d3/d3.d.ts"/>
+import * as d3 from "d3";
 
-declare namespace d3 {
+declare module "d3" {
     export function box(): Box;
 
     interface Box {
diff --git a/d3-box/package.json b/d3-box/package.json
new file mode 100644
index 0000000000..ca67ffd471
--- /dev/null
+++ b/d3-box/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@types/d3": "^3.5.36"
+  }
+}
\ No newline at end of file
diff --git a/d3-box/tsconfig.json b/d3-box/tsconfig.json
new file mode 100644
index 0000000000..ac2a5178dc
--- /dev/null
+++ b/d3-box/tsconfig.json
@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3-box-tests.ts"
+    ]
+}
diff --git a/d3.slider/d3.slider-tests.ts b/d3.slider/d3.slider-tests.ts
index e0e0473059..30f5900d41 100644
--- a/d3.slider/d3.slider-tests.ts
+++ b/d3.slider/d3.slider-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../d3/d3.d.ts" />
-/// <reference path="d3.slider.d.ts" />
-
 d3.select('#slider1').call(d3.slider());
 d3.select('#slider2').call(d3.slider().value( [ 10, 25 ] ));
 d3.select('#slider3').call(d3.slider().axis(true).value( [ 10, 25 ] )
diff --git a/d3.slider/d3.slider.d.ts b/d3.slider/index.d.ts
similarity index 94%
rename from d3.slider/d3.slider.d.ts
rename to d3.slider/index.d.ts
index d459f4f04c..7b0dfcc5c2 100644
--- a/d3.slider/d3.slider.d.ts
+++ b/d3.slider/index.d.ts
@@ -3,9 +3,9 @@
 // Definitions by: Linkun Chen <https://github.com/lk-chen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../d3/d3.d.ts"/>
+import * as d3 from "d3";
 
-declare namespace d3 {
+declare module "d3" {
     export function slider(): Slider;
 
     interface Slider {
diff --git a/d3.slider/package.json b/d3.slider/package.json
new file mode 100644
index 0000000000..ca67ffd471
--- /dev/null
+++ b/d3.slider/package.json
@@ -0,0 +1,5 @@
+{
+  "dependencies": {
+    "@types/d3": "^3.5.36"
+  }
+}
\ No newline at end of file
diff --git a/d3.slider/tsconfig.json b/d3.slider/tsconfig.json
new file mode 100644
index 0000000000..c56fab950f
--- /dev/null
+++ b/d3.slider/tsconfig.json
@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "d3.slider-tests.ts"
+    ]
+}
\ No newline at end of file

From ff34b04b04639e771f289ea804a7812b68490ba6 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 10:59:47 -0800
Subject: [PATCH 212/245] Fix hapi, i18next and leaflet merges

---
 hapi-decorators/hapi-decorators-tests.ts |    3 -
 hapi-decorators/hapi-decorators.d.ts     |   98 -
 hapi-decorators/index.d.ts               |   94 +
 hapi-decorators/tsconfig.json            |   22 +-
 hapi/hapi-tests.ts                       |    4 +-
 hapi/hapi.d.ts                           | 2493 ----------------------
 i18next/index.d.ts                       |    2 +-
 leaflet/index.d.ts                       |    2 +-
 8 files changed, 116 insertions(+), 2602 deletions(-)
 delete mode 100644 hapi-decorators/hapi-decorators.d.ts
 create mode 100644 hapi-decorators/index.d.ts
 delete mode 100644 hapi/hapi.d.ts

diff --git a/hapi-decorators/hapi-decorators-tests.ts b/hapi-decorators/hapi-decorators-tests.ts
index c4c8dcf5bb..2a05f67e4d 100644
--- a/hapi-decorators/hapi-decorators-tests.ts
+++ b/hapi-decorators/hapi-decorators-tests.ts
@@ -1,6 +1,3 @@
-/// <reference path="../hapi/hapi.d.ts" />
-/// <reference path="hapi-decorators.d.ts" />
-
 import * as hapi from 'hapi';
 import { controller, get, post, put, cache, config, route, validate, Controller } from 'hapi-decorators';
 
diff --git a/hapi-decorators/hapi-decorators.d.ts b/hapi-decorators/hapi-decorators.d.ts
deleted file mode 100644
index 7659eaa1a8..0000000000
--- a/hapi-decorators/hapi-decorators.d.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-// Type definitions for hapi-decorators v0.4.3
-// Project: https://github.com/knownasilya/hapi-decorators
-// Definitions by: Ken Howard <http://github.com/kenhowardpdx>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../hapi/hapi.d.ts" />
-
-declare module 'hapi-decorators' {
-    import * as hapi from 'hapi';
-    interface ControllerStatic {
-        new (): Controller;
-    }
-    export interface Controller {
-        baseUrl: string;
-        routes: () => hapi.IRouteConfiguration[];
-    }
-    export function controller(baseUrl: string): (target: ControllerStatic) => void;
-    interface IRouteSetup {
-        (target: any, key: any, descriptor: any): any;
-    }
-    interface IRouteDecorator {
-        (method: string, path: string): IRouteSetup;
-    }
-    interface IRouteConfig {
-        (path: string): IRouteSetup;
-    }
-    export const route: IRouteDecorator;
-    export const get: IRouteConfig;
-    export const post: IRouteConfig;
-    export const put: IRouteConfig;
-    // export const delete: IRouteConfig;
-    export const patch: IRouteConfig;
-    export const all: IRouteConfig;
-    export function config(config: hapi.IRouteAdditionalConfigurationOptions): (target: any, key: any, descriptor: any) => any;
-    interface IValidateConfig {
-        /** validation rules for incoming request headers.Values allowed:
-         * trueany headers allowed (no validation performed).This is the default.
-         falseno headers allowed (this will cause all valid HTTP requests to fail).
-            a Joi validation object.
-            a validation function using the signature function(value, options, next) where:
-            valuethe object containing the request headers.
-            optionsthe server validation options.
-            next(err, value)the callback function called when validation is completed.
-            */
-        headers?: boolean | hapi.IJoi | hapi.IValidationFunction;
-        /** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
-         trueany path parameters allowed (no validation performed).This is the default.
-            falseno path variables allowed.
-            a Joi validation object.
-            a validation function using the signature function(value, options, next) where:
-            valuethe object containing the path parameters.
-            optionsthe server validation options.
-            next(err, value)the callback function called when validation is completed. */
-        params?: boolean | hapi.IJoi | hapi.IValidationFunction;
-        /** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
-         trueany query parameters allowed (no validation performed).This is the default.
-            falseno query parameters allowed.
-            a Joi validation object.
-            a validation function using the signature function(value, options, next) where:
-            valuethe object containing the query parameters.
-            optionsthe server validation options.
-            next(err, value)the callback function called when validation is completed. */
-        query?: boolean | hapi.IJoi | hapi.IValidationFunction;
-        /**  validation rules for an incoming request payload (request body).Values allowed:
-         trueany payload allowed (no validation performed).This is the default.
-            falseno payload allowed.
-            a Joi validation object.
-            a validation function using the signature function(value, options, next) where:
-            valuethe object containing the payload object.
-            optionsthe server validation options.
-            next(err, value)the callback function called when validation is completed.  */
-        payload?: boolean | hapi.IJoi | hapi.IValidationFunction;
-        /** an optional object with error fields copied into every validation error response. */
-        errorFields?: any;
-        /** determines how to handle invalid requests.Allowed values are:
-         'error'return a Bad Request (400) error response.This is the default value.
-            'log'log the error but continue processing the request.
-            'ignore'take no action.
-            OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
-            requestthe request object.
-            replythe continuation reply interface.
-            sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
-            errorthe error object prepared for the client response (including the validation function error under error.data). */
-        failAction?: string | hapi.IRouteFailFunction;
-        /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
-        options?: any;
-    }
-    export function validate(config: IValidateConfig): (target: any, key: any, descriptor: any) => any;
-    interface ICacheConfig {
-        privacy?: string;
-        expiresIn?: number;
-        expiresAt?: number;
-    }
-    export function cache(cacheConfig: ICacheConfig): (target: any, key: any, descriptor: any) => any;
-    export function pre(pre: {
-        [key: string]: any;
-    }): (target: any, key: any, descriptor: any) => any;
-}
diff --git a/hapi-decorators/index.d.ts b/hapi-decorators/index.d.ts
new file mode 100644
index 0000000000..63d8f989ec
--- /dev/null
+++ b/hapi-decorators/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for hapi-decorators v0.4.3
+// Project: https://github.com/knownasilya/hapi-decorators
+// Definitions by: Ken Howard <http://github.com/kenhowardpdx>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as hapi from 'hapi';
+interface ControllerStatic {
+    new (): Controller;
+}
+export interface Controller {
+    baseUrl: string;
+    routes: () => hapi.IRouteConfiguration[];
+}
+export function controller(baseUrl: string): (target: ControllerStatic) => void;
+interface IRouteSetup {
+    (target: any, key: any, descriptor: any): any;
+}
+interface IRouteDecorator {
+    (method: string, path: string): IRouteSetup;
+}
+interface IRouteConfig {
+    (path: string): IRouteSetup;
+}
+export const route: IRouteDecorator;
+export const get: IRouteConfig;
+export const post: IRouteConfig;
+export const put: IRouteConfig;
+// export const delete: IRouteConfig;
+export const patch: IRouteConfig;
+export const all: IRouteConfig;
+export function config(config: hapi.IRouteAdditionalConfigurationOptions): (target: any, key: any, descriptor: any) => any;
+interface IValidateConfig {
+    /** validation rules for incoming request headers.Values allowed:
+     * trueany headers allowed (no validation performed).This is the default.
+     falseno headers allowed (this will cause all valid HTTP requests to fail).
+     a Joi validation object.
+     a validation function using the signature function(value, options, next) where:
+     valuethe object containing the request headers.
+     optionsthe server validation options.
+     next(err, value)the callback function called when validation is completed.
+    */
+    headers?: boolean | hapi.IJoi | hapi.IValidationFunction;
+    /** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
+        trueany path parameters allowed (no validation performed).This is the default.
+        falseno path variables allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the path parameters.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed. */
+    params?: boolean | hapi.IJoi | hapi.IValidationFunction;
+    /** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
+        trueany query parameters allowed (no validation performed).This is the default.
+        falseno query parameters allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the query parameters.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed. */
+    query?: boolean | hapi.IJoi | hapi.IValidationFunction;
+    /**  validation rules for an incoming request payload (request body).Values allowed:
+         trueany payload allowed (no validation performed).This is the default.
+         falseno payload allowed.
+         a Joi validation object.
+         a validation function using the signature function(value, options, next) where:
+         valuethe object containing the payload object.
+         optionsthe server validation options.
+         next(err, value)the callback function called when validation is completed.  */
+    payload?: boolean | hapi.IJoi | hapi.IValidationFunction;
+    /** an optional object with error fields copied into every validation error response. */
+    errorFields?: any;
+    /** determines how to handle invalid requests.Allowed values are:
+        'error'return a Bad Request (400) error response.This is the default value.
+        'log'log the error but continue processing the request.
+        'ignore'take no action.
+        OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
+        requestthe request object.
+        replythe continuation reply interface.
+        sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
+        errorthe error object prepared for the client response (including the validation function error under error.data). */
+    failAction?: string | hapi.IRouteFailFunction;
+    /** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
+    options?: any;
+}
+export function validate(config: IValidateConfig): (target: any, key: any, descriptor: any) => any;
+interface ICacheConfig {
+    privacy?: string;
+    expiresIn?: number;
+    expiresAt?: number;
+}
+export function cache(cacheConfig: ICacheConfig): (target: any, key: any, descriptor: any) => any;
+export function pre(pre: {
+    [key: string]: any;
+}): (target: any, key: any, descriptor: any) => any;
diff --git a/hapi-decorators/tsconfig.json b/hapi-decorators/tsconfig.json
index 06670f1da9..3c7877c976 100644
--- a/hapi-decorators/tsconfig.json
+++ b/hapi-decorators/tsconfig.json
@@ -1,6 +1,20 @@
 {
-  "compilerOptions": {
-    "target": "es2015",
-    "experimentalDecorators": true
-  }
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "experimentalDecorators": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "hapi-decorators-tests.ts"
+    ]
 }
diff --git a/hapi/hapi-tests.ts b/hapi/hapi-tests.ts
index 2ee355e9d1..97c4a77b44 100644
--- a/hapi/hapi-tests.ts
+++ b/hapi/hapi-tests.ts
@@ -116,8 +116,8 @@ server.route([{
 server.route({
 	method: 'GET',
 	path: '/hello6',
-	handler: function (request, reply) {
-		request.log('info', { route: '/hello' }, Date.now());
+        handler: function (request: Hapi.Request, reply: Hapi.IReply) {
+                request.log('info', { route: '/hello' }, Date.now());
 		reply('hello world');
 	}
 });
diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
deleted file mode 100644
index c433de3a8d..0000000000
--- a/hapi/hapi.d.ts
+++ /dev/null
@@ -1,2493 +0,0 @@
-// Type definitions for hapi 13.0.0
-// Project: http://github.com/spumko/hapi
-// Definitions by: Jason Swearingen <http://github.com/jasonswearingen>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-//Note/Disclaimer: This .d.ts was created against hapi v8.x but has been incrementally upgraded to 13.x.  Some newer features/changes may be missing.  YMMV.
-
-
-/// <reference path="../node/node.d.ts" />
-
-declare module "hapi" {
-	import http = require("http");
-	import stream = require("stream");
-	import Events = require("events");
-	import url = require("url");
-
-	interface IDictionary<T> {
-		[key: string]: T;
-	}
-
-	interface IThenable<R> {
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IThenable<U>;
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IThenable<U>;
-	}
-
-	interface IPromise<R> extends IThenable<R> {
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
-		then<U>(onFulfilled?: (value: R) => U | IThenable<U>, onRejected?: (error: any) => void): IPromise<U>;
-		catch<U>(onRejected?: (error: any) => U | IThenable<U>): IPromise<U>;
-	}
-
-	export interface IHeaderOptions {
-		append?: boolean;
-		separator?: string;
-		override?: boolean;
-		duplicate?: boolean;
-	}
-
-	/** Boom Module for errors. https://github.com/hapijs/boom
-	 *  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
-	export interface IBoom extends Error {
-		/**  if true, indicates this is a Boom object instance.  */
-		isBoom: boolean;
-		/** convenience bool indicating status code >= 500.  */
-		isServer: boolean;
-		/**  the error message.  */
-		message: string;
-		/**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
-		output: {
-			/** the HTTP status code (typically 4xx or 5xx).  */
-			statusCode: number;
-			/** an object containing any HTTP headers where each key is a header name and value is the header content.  */
-			headers: IDictionary<string>;
-			/** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
-			payload: {
-				/** the HTTP status code, derived from error.output.statusCode.  */
-				statusCode: number;
-				/** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
-				error: string;
-				/** the error message derived from error.message. */
-				message: string;
-			};
-		};
-		/**  reformat()rebuilds error.output using the other object properties.  */
-		reformat(): void;
-
-	}
-
-	/** cache functionality via the "CatBox" module. */
-	export interface ICatBoxCacheOptions {
-		/**  a prototype function or catbox engine object.  */
-		engine: any;
-		/**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
-		name?: string;
-		/**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
-		shared?: boolean;
-	}
-	
-	/** policy configuration for the "CatBox" module and server method options. */
-	export interface ICatBoxCachePolicyOptions {
-		/** the cache name configured in server.cache. Defaults to the default cache. */
-		cache?: string;
-		/** string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. When called within a server method, defaults to '#name' where 'name' is the server method name. Required when called outside of a plugin. */
-		segment?: string;
-		/** if true, allows multiple cache provisions to share the same segment. Default to false. */
-		shared?: boolean;
-		/** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
-		expiresIn?: number;
-		/** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn. */
-		expiresAt?: number;
-		/** a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy. */
-		generateFunc?: Function;
-		/** number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn. */
-		staleIn?: number;
-		/** number of milliseconds to wait before checking if an item is stale. */
-		staleTimeout?: number;
-		/** number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests. Required if generateFunc is present. Set to false to disable timeouts which may cause all get() requests to get stuck forever. */
-		generateTimeout?: number;
-		/** if true, an error or timeout in the generateFunc causes the stale value to be evicted from the cache. Defaults to true */
-		dropOnError?: boolean;
-		/** if false, an upstream cache read error will stop the cache.get() method from calling the generate function and will instead pass back the cache error. Defaults to true. */
-		generateOnReadError?: boolean;
-		/** if false, an upstream cache write error when calling cache.get() will be passed back with the generated value when calling. Defaults to true. */
-		generateIgnoreWriteError?: boolean;
-		/** number of milliseconds while generateFunc call is in progress for a given id, before a subsequent generateFunc call is allowed. Defaults to 0 (no blocking of concurrent generateFunc calls beyond staleTimeout). */
-		pendingGenerateTimeout?: number;
-	}
-
-
-	/** Any connections configuration server defaults can be included to override and customize the individual connection. */
-	export interface IServerConnectionOptions extends IConnectionConfigurationServerDefaults {
-		/**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
-		host?: string;
-		/** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
-		address?: string;
-		/** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
-		port?: string | number;
-		/** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
-		uri?: string;
-		/**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
-		listener?: any;
-		/**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
-		autoListen?: boolean;
-		/**  caching headers configuration: */
-		cache?: {
-			/** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
-			statuses: number[];
-		};
-		/** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
-		labels?: string | string[];
-		/**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
-		tls?: boolean | { key?: string; cert?: string; pfx?: string; } | Object;
-
-	}
-
-	export interface IConnectionConfigurationServerDefaults {
-		/**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
-		app?: any;
-		/** if false, response content encoding is disabled. Defaults to true */
-		compression?: boolean;
-		/**  connection load limits configuration where:  */
-		load?: {
-			/**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxHeapUsedBytes: number;
-			/**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxRssBytes: number;
-			/**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
-			maxEventLoopDelay: number;
-		};
-		/**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
-		plugins?: any;
-		/**  controls how incoming request URIs are matched against the routing table: */
-		router?: {
-			/**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
-			isCaseSensitive: boolean;
-			/**  removes trailing slashes on incoming paths. Defaults to false.  */
-			stripTrailingSlash: boolean;
-		};
-		/** a route options object used to set the default configuration for every route. */
-		routes?: IRouteAdditionalConfigurationOptions;
-		state?: IServerState;
-	}
-
-	/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
-	export interface IServerOptions {
-		/**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
-		app?: any;
-		/**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
-		 a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
-		 a configuration object with the following options:
-		 enginea prototype function or catbox engine object.
-		 namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
-		 sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
-		 other options passed to the catbox strategy used.
-		 an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
-		cache?: string | ICatBoxCacheOptions | Array<ICatBoxCacheOptions> | any;
-		/**  sets the default connections configuration which can be overridden by each connection where:  */
-		connections?: IConnectionConfigurationServerDefaults;
-		/** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
-		debug?: boolean | {
-			/** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
-			log: string[];
-			/**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
-			request: string[];
-		};
-		/** file system related settings*/
-		files?: {
-			/**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
-			etagsCacheMaxSize?: number;
-		};
-		/**  process load monitoring*/
-		load?: {
-			/**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
-			sampleInterval?: number;
-		};
-
-		/** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
-		mime?: any;
-		/**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
-		minimal?: boolean;
-		/** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
-		plugins?: IDictionary<any>;
-
-	}
-
-	export interface IServerViewCompile {
-		(template: string, options: any): void;
-		(template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
-	}
-
-	export interface IServerViewsAdditionalOptions {
-		/**    path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
-		path?: string;
-		/**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
-		 */
-		partialsPath?: string;
-		/**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
-		helpersPath?: string;
-		/**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
-		relativeTo?: string;
-
-		/**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
-		layout?: boolean | string;
-		/**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
-		layoutPath?: string;
-		/**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
-		layoutKeywork?: string;
-		/**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
-		encoding?: string;
-		/**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
-		isCached?: boolean;
-		/**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
-		allowAbsolutePaths?: boolean;
-		/**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
-		allowInsecureAccess?: boolean;
-		/**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
-		compileOptions?: any;
-		/**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
-		runtimeOptions?: any;
-		/**contentType - the content type of the engine results.Defaults to 'text/html'.*/
-		contentType?: string;
-		/**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
-		compileMode?: string;
-		/**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
-		context?: any;
-	}
-
-	export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
-		/**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
-		 * If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
-			module: {
-			compile?(template: any, options: any): (context: any, options: any) => void;
-			compile?(template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
-		};
-	}
-
-	/**Initializes the server views manager
-	 var Hapi = require('hapi');
-	 var server = new Hapi.Server();
-
-	 server.views({
-	engines: {
-	html: require('handlebars'),
-	jade: require('jade')
-	},
-	path: '/static/templates'
-	});
-	 When server.views() is called within a plugin, the views manager is only available to plugins methods.
-	 */
-	export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
-		/** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
-		engines: IDictionary<any> | IServerViewsEnginesOptions;
-		/**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
-		defaultExtension?: string;
-	}
-
-
-	interface IReplyMethods {
-		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
-		 * The data argument is only used for passing back authentication data and is ignored elsewhere. */
-		continue(credentialData?: any): void;
-
-		/** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
-		file(/**   the file path. */
-			 path: string,
-			 /**  optional settings:  */
-			 options?: {
-				 /** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-				 filename?: string;
-				 /** specifies whether to include the 'Content-Disposition' header with the response. Available values:
-				  false - header is not included. This is the default value.
-				  'attachment'
-				  'inline'*/
-				 mode?: boolean | string;
-				 /**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
-				 lookupCompressed: boolean;
-			 }): void;
-		/**  Concludes the handler activity by returning control over to the router with a templatized view response.
-		 the response flow control rules apply. */
-		view(/**  the template filename and path, relative to the templates path configured via the server views manager. */
-			 template: string,
-			 /**  optional object used by the template to render context-specific result. Defaults to no context {}. */
-			 context?: {},
-			 /**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
-			 options?: any): Response;
-		/** Sets a header on the response */
-		header(name: string, value: string, options?: IHeaderOptions): Response;
-
-		/** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
-		 The response flow control rules do not apply. */
-		close(options?: {
-			/**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
-			end?: boolean;
-		}): void;
-		/** Proxies the request to an upstream endpoint.
-		 the response flow control rules do not apply. */
-
-		proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
-			  options: IProxyHandlerConfig): void;
-		/** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
-		 he response flow control rules apply. */
-		redirect(uri: string): ResponseRedirect;
-
-		/** Replies with the specified response */
-		response(result: any): Response;
-
-		/** Sets a cookie on the response */
-		state(name: string, value: any, options?: any): void;
-
-		/** Clears a cookie on the response */
-		unstate(name: string, options?: any): void;
-	}
-
-	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
-	 erran optional error response.
-	 result an optional response payload.
-	 Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-	 FLOW CONTROL:
-	 When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
-	export interface IReply extends IReplyMethods {
-		<T>(err: Error,
-			result?: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T,
-			/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-			credentialData?: any): IBoom;
-		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-		<T>(result: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T): Response;
-	}
-
-	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
-	 erran optional error response.
-	 result an optional response payload.
-	 Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
-	 FLOW CONTROL:
-	 When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
-	export interface IStrictReply<T> extends IReplyMethods {
-		(err: Error,
-			result?: IPromise<T> | T,
-			/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-			credentialData?: any): IBoom;
-		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-		(result: IPromise<T> | T): Response;
-	}
-
-	export interface ISessionHandler {
-		(request: Request, reply: IReply): void;
-	}
-
-	export interface IStrictSessionHandler {
-		<T>(request: Request, reply: IStrictReply<T>): void;
-	}
-
-	export interface IRequestHandler<T> {
-		(request: Request): T;
-	}
-
-
-	export interface IFailAction {
-		(source: string, error: any, next: () => void): void
-	}
-	/**  generates a reverse proxy handler */
-	export interface IProxyHandlerConfig {
-		/** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
-		host?: string;
-		/** the upstream service port. */
-		port?: number;
-		/**  The protocol to use when making a request to the proxied host:
-		 'http'
-		 'https'*/
-		protocol?: string;
-		/**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
-		uri?: string;
-		/**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
-		passThrough?: boolean;
-		/** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
-		localStatePassThrough?: boolean;
-		/**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
-		acceptEncoding?: boolean;
-		/** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
-		rejectUnauthorized?: boolean;
-		/**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
-		xforward?: boolean;
-		/** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
-		redirects?: boolean | number;
-		/**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
-		timeout?: number;
-		/** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
-		 request - is the incoming request object.
-		 callback - is function(err, uri, headers) where:
-		 err - internal error condition.
-		 uri - the absolute proxy URI.
-		 headers - optional object where each key is an HTTP request header and the value is the header content.*/
-		mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
-		/**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
-		onResponse?: (err: any,
-					  res: http.ServerResponse,
-					  req: Request,
-					  reply: IReply,
-					  settings: IProxyHandlerConfig,
-					  ttl: number) => void;
-		/** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
-		ttl?: number;
-		/** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
-		agent?: http.Agent;
-		/** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
-		maxSockets?: boolean | number;
-	}
-	/**  TODO: fill in joi definition  */
-	export interface IJoi {
-
-	}
-	/**  a validation function using the signature function(value, options, next) */
-	export interface IValidationFunction {
-
-		(/**   the object containing the path parameters. */
-		 value: any,
-		 /**  the server validation options. */
-		 options: any,
-		 /**   the callback function called when validation is completed.  */
-		 next: (err: any, value: any) => void): void;
-	}
-	/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-	export interface IRouteFailFunction {
-		/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
-		(/** - the [request object]. */
-		 request: Request,
-		 /**   the continuation reply interface. */
-		 reply: IReply,
-		 /**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
-		 source: string,
-		 /**  the error object prepared for the client response (including the validation function error under error.data). */
-		 error: any): void;
-	}
-
-	/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
-	export interface IRouteAdditionalConfigurationOptions {
-		/**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
-		app?: any;
-		/** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
-		 a string with the name of an authentication strategy registered with server.auth.strategy().
-		 an object  */
-		auth?: boolean | string |
-			{
-				/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
-				 'required'authentication is required.
-				 'optional'authentication is optional (must be valid if present).
-				 'try'same as 'optional' but allows for invalid authentication. */
-				mode?: string;
-				/**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
-				strategies?: string | Array<string>;
-				/**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
-				 falseno payload authentication.This is the default value.
-				 'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
-				 'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
-				payload?: string;
-				/**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
-				scope?: string | Array<string> | boolean;
-				/** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
-				 anythe authentication can be on behalf of a user or application.This is the default value.
-				 userthe authentication must be on behalf of a user.
-				 appthe authentication must be on behalf of an application. */
-				entity?: string;
-				/**
-				 * an object or array of objects specifying the route access rules. Each rule is evaluated against an incoming
-				 * request and access is granted if at least one rule matches. Each rule object must include at least one of:
-				 */
-				access?: IRouteAdditionalConfigurationAuthAccess | IRouteAdditionalConfigurationAuthAccess[];
-			};
-		/** an object passed back to the provided handler (via this) when called. */
-		bind?: any;
-		/** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
-		cache?: {
-			/**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
-			 fault'no privacy flag.This is the default setting.
-			 'public'mark the response as suitable for public caching.
-			 'private'mark the response as suitable only for private caching.  */
-			privacy: string;
-			/**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
-			expiresIn: number;
-			/**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
-			expiresAt: string;
-		};
-		/** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
-		cors?: {
-			/** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
-			origin?: Array<string>;
-			/** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
-			matchOrigin?: boolean;
-			/** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
-			isOriginExposed?: boolean;
-			/**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
-			maxAge?: number;
-			/**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
-			headers?: string[];
-			/**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
-			additionalHeaders?: string[];
-			/**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
-			methods?: string[];
-			/**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
-			additionalMethods?: string[];
-			/**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
-			exposedHeaders?: string[];
-			/**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
-			additionalExposedHeaders?: string[];
-			/**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
-			credentials?: boolean;
-			/** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
-			override?: boolean;
-		};
-		/**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
-		files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
-		relativeTo: string;
-		};
-
-		/**  an alternative location for the route handler option. */
-		handler?: ISessionHandler | IStrictSessionHandler | string | IRouteHandlerConfig;
-		/** an optional unique identifier used to look up the route using server.lookup(). */
-		id?: number;
-		/** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
-		json?: {
-			/** the replacer function or array.Defaults to no action. */
-			replacer?: Function | string[];
-			/**  number of spaces to indent nested object keys.Defaults to no indentation. */
-			space?: number | string;
-			/** string suffix added after conversion to JSON string.Defaults to no suffix. */
-			suffix?: string;
-		};
-		/** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
-		jsonp?: string;
-		/** determines how the request payload is processed: */
-		payload?: {
-			/**  the type of payload representation requested. The value must be one of:
-			 'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
-			 'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
-			 'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
-			output?: string;
-			/**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
-			 'application/json'
-			 'application/x-www-form-urlencoded'
-			 'application/octet-stream'
-			 'text/ *'
-			 'multipart/form-data' */
-			parse?: string | boolean;
-			/** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
-			allow?: string | string[];
-			/** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
-			override?: string;
-			/**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
-			maxBytes?: number;
-			/** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
-			timeout?: number;
-			/**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
-			uploads?: string;
-			/**  determines how to handle payload parsing errors. Allowed values are:
-			 'error'return a Bad Request (400) error response. This is the default value.
-			 'log'report the error but continue processing the request.
-			 'ignore'take no action and continue processing the request. */
-			failAction?: string;
-		};
-		/** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
-		plugins?: IDictionary<any>;
-		/** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
-		pre?: any[];
-		/** validation rules for the outgoing response payload (response body).Can only validate object response: */
-		response?: {
-			/** the default HTTP status code when the payload is empty. Value can be 200 or 204.
-			 Note that a 200 status code is converted to a 204 only at the time or response transmission
-			 (the response status code will remain 200 throughout the request lifecycle unless manually set). Defaults to 200. */
-			emptyStatusCode?: number;
-			/**   the default response object validation rules (for all non-error responses) expressed as one of:
-			 true - any payload allowed (no validation performed). This is the default.
-			 false - no payload allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 value - the object containing the response object.
-			 options - the server validation options.
-			 next(err) - the callback function called when validation is completed.  */
-			schema?: boolean | any;
-			/** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
-			status?: { [statusCode: number]: boolean | any };
-			/** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
-			sample?: number;
-			/**  defines what to do when a response fails validation.Options are:
-			 errorreturn an Internal Server Error (500) error response.This is the default value.
-			 loglog the error but send the response.  */
-			failAction?: string;
-			/** if true, applies the validation rule changes to the response.Defaults to false. */
-			modify?: boolean;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
-			options?: any;
-		};
-		/** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
-		security?: boolean | {
-			/** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
-			hsts?: boolean | number | {
-				/** the max- age portion of the header, as a number.Default is 15768000. */
-				maxAge?: number;
-				/**  a boolean specifying whether to add the includeSubdomains flag to the header. */
-				includeSubdomains?: boolean;
-				/** a boolean specifying whether to add the 'preload' flag (used to submit domains inclusion in Chrome's HTTP Strict Transport Security (HSTS) preload list) to the header. */
-				preload?: boolean;
-			};
-			/** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
-			xframe?: {
-				/** either 'deny', 'sameorigin', or 'allow-from' */
-				rule: string;
-				/** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
-				source: string;
-			};
-			/** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
-			xss?: boolean;
-			/**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
-			noOpen?: boolean;
-			/** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
-			noSniff?: boolean;
-		};
-		/** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
-		state?: {
-			/** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
-			parse: boolean;
-			/** determines how to handle cookie parsing errors.Allowed values are:
-			 'error'return a Bad Request (400) error response.This is the default value.
-			 'log'report the error but continue processing the request.
-			 'ignore'take no action. */
-			failAction: string;
-		};
-		/**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
-		validate?: {
-			/** validation rules for incoming request headers.Values allowed:
-			 * trueany headers allowed (no validation performed).This is the default.
-			 falseno headers allowed (this will cause all valid HTTP requests to fail).
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the request headers.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed.
-			 */
-			headers?: boolean | IJoi | IValidationFunction;
-
-
-			/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
-			 trueany path parameters allowed (no validation performed).This is the default.
-			 falseno path variables allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the path parameters.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed. */
-			params?: boolean | IJoi | IValidationFunction;
-			/** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
-			 trueany query parameters allowed (no validation performed).This is the default.
-			 falseno query parameters allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the query parameters.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed. */
-			query?: boolean | IJoi | IValidationFunction;
-			/**  validation rules for an incoming request payload (request body).Values allowed:
-			 trueany payload allowed (no validation performed).This is the default.
-			 falseno payload allowed.
-			 a Joi validation object.
-			 a validation function using the signature function(value, options, next) where:
-			 valuethe object containing the payload object.
-			 optionsthe server validation options.
-			 next(err, value)the callback function called when validation is completed.  */
-			payload?: boolean | IJoi | IValidationFunction;
-			/** an optional object with error fields copied into every validation error response. */
-			errorFields?: any;
-			/** determines how to handle invalid requests.Allowed values are:
-			 'error'return a Bad Request (400) error response.This is the default value.
-			 'log'log the error but continue processing the request.
-			 'ignore'take no action.
-			 OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
-			 requestthe request object.
-			 replythe continuation reply interface.
-			 sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
-			 errorthe error object prepared for the client response (including the validation function error under error.data). */
-			failAction?: string | IRouteFailFunction;
-			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
-			options?: any;
-		};
-		/** define timeouts for processing durations: */
-		timeout?: {
-			/** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
-			server: boolean | number;
-			/** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
-			socket: boolean | number;
-		};
-
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		 *route description used for generating documentation (string).
-		 */
-		description?: string;
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		 *route notes used for generating documentation (string or array of strings).
-		 */
-		notes?: string | string[];
-		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
-		 *route tags used for generating documentation (array of strings).
-		 */
-		tags?: string[]
-	}
-
-	/**
-	 * specifying the route access rules. Each rule is evaluated against an incoming request and access is granted if at least one rule matches
-	 */
-	export interface IRouteAdditionalConfigurationAuthAccess {
-		/**
-		 * the application scope required to access the route. Value can be a scope string or an array of scope strings.
-		 * The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.
-		 * If a scope string begins with a + character, that scope is required. If a scope string begins with a ! character,
-		 * that scope is forbidden. For example, the scope ['!a', '+b', 'c', 'd'] means the incoming request credentials'
-		 * scope must not include 'a', must include 'b', and must include on of 'c' or 'd'. You may also access properties
-		 * on the request object (query and params} to populate a dynamic scope by using {} characters around the property name,
-		 * such as 'user-{params.id}'. Defaults to false (no scope requirements).
-		 */
-		scope?: string | Array<string> | boolean;
-		/** the required authenticated entity type. If set, must match the entity value of the authentication credentials. Available values:
-		 * any - the authentication can be on behalf of a user or application. This is the default value.
-		 * user - the authentication must be on behalf of a user which is identified by the presence of a user attribute in the credentials object returned by the authentication strategy.
-		 * app - the authentication must be on behalf of an application which is identified by the lack of presence of a user attribute in the credentials object returned by the authentication strategy.
-		 */
-		entity?: string;
-	}
-
-	/** server.realm http://hapijs.com/api#serverrealm
-	 The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
-	 the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
-	 Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-	 The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-	 exports.register = function (server, options, next) {
-	console.log(server.realm.modifiers.route.prefix);
-	return next();
-	};
-	 */
-	export interface IServerRealm {
-		/** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
-		modifiers: {
-			/** routes preferences: */
-			route: {
-				/** - the route path prefix used by any calls to server.route() from the server. */
-				prefix: string;
-				/**  the route virtual host settings used by any calls to server.route() from the server. */
-				vhost: string;
-			};
-
-		};
-		/** the active plugin name (empty string if at the server root). */
-		plugin: string;
-		/** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
-		plugins: IDictionary<any>;
-		/**  settings overrides */
-		settings: {
-			files: {
-				relativeTo: any;
-			};
-			bind: any;
-		}
-	}
-	/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
-	 HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
-	export interface IServerState {
-		/**  - the cookie name string. */name: string;
-
-		/** - are the optional cookie settings: */options: {
-			/**  - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/ttl: number;
-			/**  - sets the 'Secure' flag.Defaults to false.*/isSecure: boolean;
-			/**  - sets the 'HttpOnly' flag.Defaults to false.*/isHttpOnly: boolean
-			/**  - the path scope.Defaults to null (no path).*/path: any;
-			/**  - the domain scope.Defaults to null (no domain). */domain: any;
-			/**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
-			 request - the request object.
-			 next - the continuation function using the function(err, value) signature.*/
-			autoValue: (request: Request, next: (err: any, value: any) => void) => void;
-			/**  - encoding performs on the provided value before serialization. Options are:
-			 'none' - no encoding. When used, the cookie value must be a string. This is the default value.
-			 'base64' - string value is encoded using Base64.
-			 'base64json' - object value is JSON-stringified than encoded using Base64.
-			 'form' - object value is encoded using the x-www-form-urlencoded method.
-			 'iron' - Encrypts and sign the value using iron.*/
-			encoding: string;
-			/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:*/sign: {
-				/** - algorithm options.Defaults to require('iron').defaults.integrity.*/integrity: any;
-				/** - password used for HMAC key generation.*/password: string;
-			};
-			/**  - password used for 'iron' encoding.*/password: string;
-			/** - options for 'iron' encoding.Defaults to require('iron').defaults.*/iron: any;
-			/** - if false, errors are ignored and treated as missing cookies.*/ignoreErrors: boolean;
-			/**  - if true, automatically instruct the client to remove invalid cookies.Defaults to false.*/clearInvalid: boolean;
-			/**  - if false, allows any cookie value including values in violation of RFC 6265. Defaults to true.*/strictHeader: boolean;
-			/**  - overrides the default proxy localStatePassThrough setting.*/passThrough: any;
-		};
-	}
-
-	export interface IFileHandlerConfig {
-		/**  a path string or function as described above.*/
-		path: string;
-		/** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
-		filename?: string;
-		/**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
-		 false - header is not included. This is the default value.
-		 'attachment'
-		 'inline'*/
-		mode?: boolean | string;
-		/** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
-		lookupCompressed: boolean;
-	}
-
-	/**http://hapijs.com/api#route-handler
-	 Built-in handlers
-
-	 The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
-	export interface IRouteHandlerConfig {
-		/** generates a static file endpoint for serving a single file. file can be set to:
-		 a relative or absolute file path string (relative paths are resolved based on the route files configuration).
-		 a function with the signature function(request) which returns the relative or absolute file path.
-		 an object with the following options */
-		file?: string | IRequestHandler<void> | IFileHandlerConfig;
-		/** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
-		 path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
-		 a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
-		 an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
-		 a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
-		 index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
-		 listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
-		 showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
-		 redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
-		 lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
-		 defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
-		directory?: {
-			path: string | Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
-			index?: boolean | string | string[];
-			listing?: boolean;
-			showHidden?: boolean;
-			redirectToSlash?: boolean;
-			lookupCompressed?: boolean;
-			defaultExtension?: string;
-		};
-		proxy?: IProxyHandlerConfig;
-		view?: string | {
-			template: string;
-			context: {
-				payload: any;
-				params: any;
-				query: any;
-				pre: any;
-			}
-		};
-		config?: {
-			handler: any;
-			bind: any;
-			app: any;
-			plugins: {
-				[name: string]: any;
-			};
-			pre: Array<() => void>;
-			validate: {
-				headers: any;
-				params: any;
-				query: any;
-				payload: any;
-				errorFields?: any;
-				failAction?: string | IFailAction;
-			};
-			payload: {
-				output: {
-					data: any;
-					stream: any;
-					file: any;
-				};
-				parse?: any;
-				allow?: string | Array<string>;
-				override?: string;
-				maxBytes?: number;
-				uploads?: number;
-				failAction?: string;
-			};
-			response: {
-				schema: any;
-				sample: number;
-				failAction: string;
-			};
-			cache: {
-				privacy: string;
-				expiresIn: number;
-				expiresAt: number;
-			};
-			auth: string | boolean | {
-				mode: string;
-				strategies: Array<string>;
-				payload?: boolean | string;
-				tos?: boolean | string;
-				scope?: string | Array<string>;
-				entity: string;
-			};
-			cors?: boolean;
-			jsonp?: string;
-			description?: string;
-			notes?: string | Array<string>;
-			tags?: Array<string>;
-		};
-	}
-	/** Route configuration
-	 The route configuration object*/
-	export interface IRouteConfiguration {
-		/**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
-		path: string;
-		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
-		 * Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
-		method: string | string[];
-		/**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
-		vhost?: string;
-		/**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
-		handler?: ISessionHandler | IStrictSessionHandler | string | IRouteHandlerConfig;
-		/** - additional route options.*/
-		config?: IRouteAdditionalConfigurationOptions;
-	}
-	/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
-	export interface IRoute {
-
-
-		/** the route HTTP method. */
-		method: string;
-		/** the route path. */
-		path: string;
-		/** the route vhost option if configured. */
-		vhost?: string | Array<string>;
-		/** the [active realm] associated with the route.*/
-		realm: IServerRealm;
-		/** the [route options]  object with all defaults applied. */
-		settings: IRouteAdditionalConfigurationOptions;
-	}
-
-	export interface IServerAuthScheme {
-		/** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
-		 request - the request object.
-		 reply - the reply interface the authentication method must call when done authenticating the request where:
-		 reply(err, response, result) - is called if authentication failed where:
-		 err - any authentication error.
-		 response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		 result - an object containing:
-		 credentials - the authenticated credentials.
-		 artifacts - optional authentication artifacts.
-		 reply.continue(result) - is called if authentication succeeded where:
-		 result - same object as result above.
-		 When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
-		 .If the err returned by the reply() method includes a message, no additional strategies will be attempted.
-		 If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var scheme = function (server, options) {
-		return {
-		authenticate: function (request, reply) {
-		var req = request.raw.req;
-		var authorization = req.headers.authorization;
-		if (!authorization) {
-		return reply(Boom.unauthorized(null, 'Custom'));
-		}
-		return reply(null, { credentials: { user: 'john' } });
-		}
-		};
-		};
-		 server.auth.scheme('custom', scheme);*/
-		authenticate(request: Request, reply: IReply): void;
-		authenticate<T>(request: Request, reply: IStrictReply<T>): void;
-		/** payload(request, reply) - optional function called to authenticate the request payload where:
-		 request - the request object.
-		 reply(err, response) - is called if authentication failed where:
-		 err - any authentication error.
-		 response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
-		 reply.continue() - is called if payload authentication succeeded.
-		 When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
-		payload?(request: Request, reply: IReply): void;
-		payload?<T>(request: Request, reply: IStrictReply<T>): void;
-		/** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
-		 request - the request object.
-		 reply(err, response) - is called if an error occurred where:
-		 err - any authentication error.
-		 response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
-		 reply.continue() - is called if the operation succeeded.*/
-		response?(request: Request, reply: IReply): void;
-		response?<T>(request: Request, reply: IStrictReply<T>): void;
-		/** an optional object  */
-		options?: {
-			/**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
-			payload: boolean;
-		}
-	}
-
-	/**the response object where:
-	 statusCode - the HTTP status code.
-	 headers - an object containing the headers set.
-	 payload - the response payload string.
-	 rawPayload - the raw response payload buffer.
-	 raw - an object with the injection request and response objects:
-	 req - the simulated node request object.
-	 res - the simulated node response object.
-	 result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
-	 request - the request object.*/
-	export interface IServerInjectResponse {
-		statusCode: number;
-		headers: IDictionary<string>;
-		payload: string;
-		rawPayload: Buffer;
-		raw: {
-			req: http.IncomingMessage;
-			res: http.ServerResponse
-		};
-		result: string;
-		request: Request;
-	}
-
-	export interface IServerInject {
-		(options: string | IServerInjectOptions, callback: (res: IServerInjectResponse) => void): void;
-		(options: string | IServerInjectOptions): IPromise<IServerInjectResponse>;
-	}
-
-	export interface IServerInjectOptions {
-		/**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
-		method: string;
-		/** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
-		url: string;
-		/** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
-		headers?: IDictionary<string>;
-		/** n optional string, buffer or object containing the request payload. In case of an object it will be converted to a string for you. Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
-		payload?: string | {} | Buffer;
-		/** an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
-		credentials?: any;
-		/** an optional artifacts object containing authentication artifact information. The artifacts are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Ignored if set without credentials. Defaults to no artifacts.*/
-		artifacts?: any;
-		/** sets the initial value of request.app*/
-		app?: any;
-		/** sets the initial value of request.plugins*/
-		plugins?: any;
-		/** allows access to routes with config.isInternal set to true. Defaults to false.*/
-		allowInternals?: boolean;
-		/** sets the remote address for the incoming connection.*/
-		remoteAddress?: boolean;
-		/**object with options used to simulate client request stream conditions for testing:
-		 error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
-		 close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
-		 end - if false, does not end the stream. Defaults to true.*/
-		simulate?: {
-			error: boolean;
-			close: boolean;
-			end: boolean;
-		};
-	}
-
-
-	/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-	 The return value is an array where each item is an object containing:
-	 info - the connection.info the connection the table was generated for.
-	 labels - the connection labels.
-	 table - an array of routes where each route contains:
-	 settings - the route config with defaults applied.
-	 method - the HTTP method in lower case.
-	 path - the route path.*/
-	export interface IConnectionTable {
-		info: any;
-		labels: any;
-		table: IRoute[];
-	}
-
-	export interface ICookieSettings {
-		/** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
-		ttl?: number;
-		/** - sets the 'Secure' flag.Defaults to false.*/
-		isSecure?: boolean;
-		/** - sets the 'HttpOnly' flag.Defaults to false.*/
-		isHttpOnly?: boolean;
-		/** - the path scope.Defaults to null (no path).*/
-		path?: string;
-		/** - the domain scope.Defaults to null (no domain).*/
-		domain?: any;
-		/** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
-		 request - the request object.
-		 next - the continuation function using the function(err, value) signature.*/
-		autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
-		/** - encoding performs on the provided value before serialization.Options are:
-		 'none' - no encoding.When used, the cookie value must be a string.This is the default value.
-		 'base64' - string value is encoded using Base64.
-		 'base64json' - object value is JSON- stringified than encoded using Base64.
-		 'form' - object value is encoded using the x- www - form - urlencoded method. */
-		encoding?: string;
-		/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
-		 integrity - algorithm options.Defaults to require('iron').defaults.integrity.
-		 password - password used for HMAC key generation. */
-		sign?: { integrity: any; password: string; }
-		password?: string;
-		iron?: any;
-		ignoreErrors?: boolean;
-		clearInvalid?: boolean;
-		strictHeader?: boolean;
-		passThrough?: any;
-	}
-
-	/** method - the method function with the signature is one of:
-	 function(arg1, arg2, ..., argn, next) where:
-	 arg1, arg2, etc. - the method function arguments.
-	 next - the function called when the method is done with the signature function(err, result, ttl) where:
-	 err - error response if the method failed.
-	 result - the return value.
-	 ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
-	 function(arg1, arg2, ..., argn) where:
-	 arg1, arg2, etc. - the method function arguments.
-	 the callback option is set to false.
-	 the method must returns a value (result, Error, or a promise) or throw an Error.*/
-	export interface IServerMethod {
-		//(): void;
-		//(next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any): void;
-		//(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
-		//(arg1: any, arg2: any): void;
-		(...args: any[]): void;
-
-	}
-	/** options - optional configuration:
-	 bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
-	 cache - the same cache configuration used in server.cache().
-	 callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
-	 generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
-	export interface IServerMethodOptions {
-		bind?: any;
-		cache?: ICatBoxCachePolicyOptions;
-		callback?: boolean;
-		generateKey?(args: any[]): string;
-	}
-	/** Request object
-
-	 The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
-	 Request events
-
-	 The request object supports the following events:
-
-	 'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
-	 'finish' - emitted when the request payload finished reading. The event method signature is function ().
-	 'disconnect' - emitted when a request errors or aborts unexpectedly.
-	 var Crypto = require('crypto');
-	 var Hapi = require('hapi');
-	 var server = new Hapi.Server();
-	 server.connection({ port: 80 });
-
-	 server.ext('onRequest', function (request, reply) {
-
-	var hash = Crypto.createHash('sha1');
-	request.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	request.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	request.once('disconnect', function () {
-
-	console.error('request aborted');
-	});
-
-	return reply.continue();
-	});*/
-	export class Request extends Events.EventEmitter {
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/**  authentication information*/
-		auth: {
-			/** true is the request has been successfully authenticated, otherwise false.*/
-			isAuthenticated: boolean;
-			/**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.  can be set in the validate function's callback.*/
-			credentials: any;
-			/**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
-			artifacts: any;
-			/**  the route authentication mode.*/
-			mode: any;
-			/** the authentication error is failed and mode set to 'try'.*/
-			error: any;
-		};
-		/** the connection used by this request*/
-		connection: ServerConnection;
-		/**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
-		domain: any;
-		/** the raw request headers (references request.raw.headers).*/
-		headers: IDictionary<string>;
-		/** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
-		id: number;
-		/**  request information */
-		info: {
-			/**  the request preferred encoding. */
-			acceptEncoding: string;
-			/**  if CORS is enabled for the route, contains the following: */
-			cors: {
-				isOriginMatch: boolean; /**  true if the request 'Origin' header matches the configured CORS restrictions. Set to false if no 'Origin' header is found or if it does not match. Note that this is only available after the 'onRequest' extension point as CORS is configured per-route and no routing decisions are made at that point in the request lifecycle. */
-			};
-			/**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
-			host: string;
-			/**  the hostname part of the 'Host' header (e.g. 'example.com').*/
-			hostname: string;
-			/**  request reception timestamp. */
-			received: number;
-			/**  content of the HTTP 'Referrer' (or 'Referer') header. */
-			referrer: string;
-			/** remote client IP address. */
-			remoteAddress: string;
-			/**  remote client port. */
-			remotePort: number;
-			/**  request response timestamp (0 is not responded yet). */
-			responded: number;
-		};
-		/**  the request method in lower case (e.g. 'get', 'post'). */
-		method: string;
-		/**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
-		mime: string;
-		/**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
-		orig: {
-			params: any;
-			query: any;
-			payload: any;
-		};
-		/**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
-		params: IDictionary<string>;
-		/** an array containing all the path params values in the order they appeared in the path.*/
-		paramsArray: string[];
-		/**  the request URI's path component. */
-		path: string;
-		/** the request payload based on the route payload.output and payload.parse settings.*/
-		payload: stream.Readable | Buffer | any;
-		/**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
-		plugins: any;
-		/** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
-		pre: IDictionary<any>;
-		/** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
-		response: Response;
-		/**preResponses - same as pre but represented as the response object created by the pre method.*/
-		preResponses: any;
-		/**an object containing the query parameters.*/
-		query: any;
-		/**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
-		raw: {
-			req: http.IncomingMessage;
-			res: http.ServerResponse;
-		};
-		/** the route public interface.*/
-		route: IRoute;
-		/** the server object. */
-		server: Server;
-		/** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
-		state: any;
-		/** complex object contining details on the url */
-		url: {
-			/** null when i tested */
-			auth: any;
-			/** null when i tested */
-			hash: any;
-			/** null when i tested */
-			host: any;
-			/** null when i tested */
-			hostname: any;
-			href: string;
-			path: string;
-			/** path without search*/
-			pathname: string;
-			/** null when i tested */
-			port: any;
-			/** null when i tested */
-			protocol: any;
-			/** querystring parameters*/
-			query: IDictionary<string>;
-			/** querystring parameters as a string*/
-			search: string;
-			/** null when i tested */
-			slashes: any;
-		};
-
-		/** request.setUrl(url)
-
-		 Available only in 'onRequest' extension methods.
-
-		 Changes the request URI before the router begins processing the request where:
-
-		 url - the new request path value.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});*/
-		setUrl(url: string | url.Url): void;
-		/** request.setMethod(method)
-
-		 Available only in 'onRequest' extension methods.
-
-		 Changes the request method before the router begins processing the request where:
-
-		 method - is the request HTTP method (e.g. 'GET').
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 server.ext('onRequest', function (request, reply) {
-
-		// Change all requests to 'GET'
-		request.setMethod('GET');
-		return reply.continue();
-		});*/
-		setMethod(method: string): void;
-
-		/** request.log(tags, [data, [timestamp]])
-
-		 Always available.
-
-		 Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
-
-		 data - an optional message string or object with the application data being logged.
-		 timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		 Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 server.on('request', function (request, event, tags) {
-
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-
-		 var handler = function (request, reply) {
-
-		request.log(['test', 'error'], 'Test event');
-		return reply();
-		};
-		 */
-		log(/** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
-			tags: string | string[],
-			/** an optional message string or object with the application data being logged.*/
-			data?: any,
-			/**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
-			timestamp?: number): void;
-
-		/** request.getLog([tags], [internal])
-
-		 Always available.
-
-		 Returns an array containing the events matching any of the tags specified (logical OR)
-		 request.getLog();
-		 request.getLog('error');
-		 request.getLog(['error', 'auth']);
-		 request.getLog(['error'], true);
-		 request.getLog(false);*/
-
-		getLog(/** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
-			   tags?: string,
-			   /**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
-			   internal?: boolean): string[];
-
-		/** request.tail([name])
-
-		 Available until immediately after the 'response' event is emitted.
-
-		 Adds a request tail which has to complete before the request lifecycle is complete where:
-
-		 name - an optional tail name used for logging purposes.
-		 Returns a tail function which must be called when the tail activity is completed.
-
-		 Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
-
-		 When all tails completed, the server emits a 'tail' event.
-
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-
-		 var get = function (request, reply) {
-
-		var dbTail = request.tail('write to database');
-
-		db.save('key', 'value', function () {
-
-		dbTail();
-		});
-
-		return reply('Success!');
-		};
-
-		 server.route({ method: 'GET', path: '/', handler: get });
-
-		 server.on('tail', function (request) {
-
-		console.log('Request completed including db activity');
-		});*/
-		tail(/** an optional tail name used for logging purposes.*/
-			 name?: string): Function;
-	}
-	/** Response events
-
-	 The response object supports the following events:
-
-	 'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
-	 'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
-	 var Crypto = require('crypto');
-	 var Hapi = require('hapi');
-	 var server = new Hapi.Server();
-	 server.connection({ port: 80 });
-
-	 server.ext('onPreResponse', function (request, reply) {
-
-	var response = request.response;
-	if (response.isBoom) {
-	return reply();
-	}
-
-	var hash = Crypto.createHash('sha1');
-	response.on('peek', function (chunk) {
-
-	hash.update(chunk);
-	});
-
-	response.once('finish', function () {
-
-	console.log(hash.digest('hex'));
-	});
-
-	return reply.continue();
-	});*/
-	export class Response extends Events.EventEmitter {
-		isBoom: boolean;
-		/**  the HTTP response status code. Defaults to 200 (except for errors).*/
-		statusCode: number;
-		/** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
-		headers: IDictionary<string>;
-		/** the value provided using the reply interface.*/
-		source: any;
-		/** a string indicating the type of source with available values:
-		 'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
-		 'buffer' - a Buffer.
-		 'view' - a view generated with reply.view().
-		 'file' - a file generated with reply.file() of via the directory handler.
-		 'stream' - a Stream.
-		 'promise' - a Promise object. */
-		variety: string;
-		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
-		app: any;
-		/** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
-		plugins: any;
-		/** settings - response handling flags:
-		 charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
-		 encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
-		 passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
-		 stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
-		 ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
-		 varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
-		settings: {
-			charset: string;
-			encoding: string;
-			passThrough: boolean;
-			stringify: any;
-			ttl: number;
-			varyEtag: boolean;
-		}
-
-		/**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
-		 length - the header value. Must match the actual payload size.*/
-		bytes(length: number): Response;
-
-		/**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
-		charset(charset: string): Response;
-
-		/**  sets the HTTP status code where:
-		 statusCode - the HTTP status code.*/
-		code(statusCode: number): Response;
-
-		/** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
-		created(uri: string): Response;
-
-
-		/** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
-		encoding(encoding: string): Response;
-
-		/** etag(tag, options) - sets the representation entity tag where:
-		 tag - the entity tag string without the double-quote.
-		 options - optional settings where:
-		 weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
-		 vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
-		etag(tag: string, options: {
-			weak: boolean; vary: boolean;
-		}): Response;
-
-		/**header(name, value, options) - sets an HTTP header where:
-		 name - the header name.
-		 value - the header value.
-		 options - optional settings where:
-		 append - if true, the value is appended to any existing header value using separator. Defaults to false.
-		 separator - string used as separator when appending to an exiting value. Defaults to ','.
-		 override - if false, the header value is not set if an existing value present. Defaults to true.*/
-		header(name: string, value: string, options?: IHeaderOptions): Response;
-
-		/** hold() - puts the response on hold until response.send() is called. Available only after reply() is called and until response.hold() is invoked once. */
-		hold(): Response;
-
-		/** location(uri) - sets the HTTP 'Location' header where:
-		 uri - an absolute or relative URI used as the 'Location' header value.*/
-		location(uri: string): Response;
-
-		/** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
-		 uri - an absolute or relative URI used to redirect the client to another resource. */
-		redirect(uri: string): Response;
-
-		/** replacer(method) - sets the JSON.stringify() replacer argument where:
-		 method - the replacer function or array. Defaults to none.*/
-		replacer(method: Function | Array<Function>): Response;
-
-		/** spaces(count) - sets the JSON.stringify() space argument where:
-		 count - the number of spaces to indent nested object keys. Defaults to no indentation. */
-		spaces(count: number): Response;
-
-		/**state(name, value, [options]) - sets an HTTP cookie where:
-		 name - the cookie name.
-		 value - the cookie value. If no encoding is defined, must be a string.
-		 options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-		state(name: string, value: string, options?: any): Response;
-
-		/** send() - resume the response which will be transmitted in the next tick. Available only after response.hold() is called and until response.send() is invoked once. */
-		send(): void;
-
-		/** sets a string suffix when the response is process via JSON.stringify().*/
-		suffix(suffix: string): void;
-
-		/** overrides the default route cache expiration rule for this response instance where:
-		 msec - the time-to-live value in milliseconds.*/
-		ttl(msec: number): void;
-
-		/** type(mimeType) - sets the HTTP 'Content-Type' header where:
-		 mimeType - is the mime type. Should only be used to override the built-in default for each response type. */
-		type(mimeType: string): Response;
-
-		/** clears the HTTP cookie by setting an expired value where:
-		 name - the cookie name.
-		 options - optional configuration for expiring cookie. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
-		unstate(name: string, options?: { [key: string]: string }): Response;
-
-		/** adds the provided header to the list of inputs affected the response generation via the HTTP 'Vary' header where:
-		 header - the HTTP request header name.*/
-		vary(header: string): void;
-	}
-	/** When using the redirect() method, the response object provides these additional methods */
-	export class ResponseRedirect extends Response {
-		/** sets the status code to 302 or 307 (based on the rewritable() setting) where:
-		 isTemporary - if false, sets status to permanent. Defaults to true.*/
-		temporary(isTemporary: boolean): void;
-
-		/** sets the status code to 301 or 308 (based on the rewritable() setting) where:
-		 isPermanent - if true, sets status to temporary. Defaults to false. */
-		permanent(isPermanent: boolean): void;
-
-		/** sets the status code to 301/302 for rewritable (allows changing the request method from 'POST' to 'GET') or 307/308 for non-rewritable (does not allow changing the request method from 'POST' to 'GET'). Exact code based on the temporary() or permanent() setting. Arguments:
-		 isRewritable - if false, sets to non-rewritable. Defaults to true.
-		 Permanent    Temporary
-		 Rewritable    301    302(1)
-		 Non-rewritable    308(2)    307
-		 Notes: 1. Default value. 2. Proposed code, not supported by all clients. */
-		rewritable(isRewritable: boolean): void;
-	}
-	/** info about a server connection */
-	export interface IServerConnectionInfo {
-		/**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
-		id: string;
-		/**  - the connection creation timestamp.*/
-		created: number;
-		/**  - the connection start timestamp (0 when stopped).*/
-		started: number;
-		/**  the connection port based on the following rules:
-		 the configured port value before the server has been started.
-		 the actual port assigned when no port is configured or set to 0 after the server has been started.*/
-		port: number;
-
-		/** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
-		host: string;
-		/** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
-		address: string;
-		/**  - the protocol used:
-		 'http' - HTTP.
-		 'https' - HTTPS.
-		 'socket' - UNIX domain socket or Windows named pipe.*/
-		protocol: string;
-		/** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
-		uri: string;
-	}
-	/**
-	 *  undocumented.   The connection object constructed after calling server.connection();
-	 * can be accessed via server.connections; or request.connection;
-	 */
-	export class ServerConnection extends Events.EventEmitter {
-		domain: any;
-		_events: { route: Function, domain: Function, _events: Function, _eventsCount: Function, _maxListeners: Function };
-		_eventsCount: number;
-		settings: IServerConnectionOptions;
-		server: Server;
-		/** ex: "tcp" */
-		type: string;
-		_started: boolean;
-		/** dictionary of sockets */
-		_connections: { [ip_port: string]: any };
-		_onConnection: Function;
-		registrations: any;
-		_extensions: any;
-		_requestCounter: { value: number; min: number; max: number };
-		_load: any;
-		states: {
-			settings: any; cookies: any; names: any[]
-		};
-		auth: { connection: ServerConnection; _schemes: any; _strategies: any; settings: any; api: any; };
-		_router: any;
-		MSPluginsCollection: any;
-		applicationCache: any;
-		addEventListener: any;
-		info: IServerConnectionInfo;
-	}
-
-	type RequestExtPoints = "onRequest" | "onPreResponse" | "onPreAuth" | "onPostAuth" | "onPreHandler" | "onPostHandler" | "onPreResponse";
-	type ServerExtPoints = "onPreStart" | "onPostStart" | "onPreStop" | "onPostStop";
-
-	/** Server http://hapijs.com/api#server
-	 rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
-	 Server events
-	 The server object inherits from Events.EventEmitter and emits the following events:
-	 'log' - events logged with server.log() and server events generated internally by the framework.
-	 'start' - emitted when the server is started using server.start().
-	 'stop' - emitted when the server is stopped using server.stop().
-	 'request' - events generated by request.log(). Does not include any internally generated events.
-	 'request-internal' - request events generated internally by the framework (multiple events per request).
-	 'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
-	 'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
-	 'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
-	 Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
-	 MORE EVENTS HERE: http://hapijs.com/api#server-events*/
-	export class Server extends Events.EventEmitter {
-
-		constructor(options?: IServerOptions);
-
-		/** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
-		 var Hapi = require('hapi');
-		 server = new Hapi.Server();
-		 server.app.key = 'value';
-		 var handler = function (request, reply) {
-		return reply(request.server.app.key);
-		}; */
-		app: any;
-		/** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, labels: 'a' });
-		 server.connection({ port: 8080, labels: 'b' });
-		 // server.connections.length === 2
-		 var a = server.select('a');
-		 // a.connections.length === 1*/
-		connections: Array<ServerConnection>;
-		/** When the server contains exactly one connection, info is an object containing information about the sole connection.
-		 * When the server contains more than one connection, each server.connections array member provides its own connection.info.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 // server.info.port === 80
-		 server.connection({ port: 8080 });
-		 // server.info === null
-		 // server.connections[1].info.port === 8080
-		 */
-		info: IServerConnectionInfo;
-		/** An object containing the process load metrics (when load.sampleInterval is enabled):
-		 rss - RSS memory usage.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
-		 console.log(server.load.rss);*/
-		load: {
-			/** - event loop delay milliseconds.*/
-			eventLoopDelay: number;
-			/**  - V8 heap usage.*/
-			heapUsed: number;
-		};
-		/** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
-		 When the server contains more than one connection, each server.connections array member provides its own connection.listener.
-		 var Hapi = require('hapi');
-		 var SocketIO = require('socket.io');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var io = SocketIO.listen(server.listener);
-		 io.sockets.on('connection', function(socket) {
-		socket.emit({ msg: 'welcome' });
-		});*/
-		listener: http.Server;
-
-		/** server.methods
-		 An object providing access to the server methods where each server method name is an object property.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.method('add', function (a, b, next) {
-		return next(null, a + b);
-		});
-		 server.methods.add(1, 2, function (err, result) {
-		// result === 3
-		});*/
-		methods: IDictionary<Function>;
-
-		/** server.mime
-		 Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
-		 var Hapi = require('hapi');
-		 var options = {
-		mime: {
-		override: {
-		'node/module': {
-		source: 'steve',
-		compressible: false,
-		extensions: ['node', 'module', 'npm'],
-		type: 'node/module'
-		}
-		}
-		}
-		};
-		 var server = new Hapi.Server(options);
-		 // server.mime.path('code.js').type === 'application/javascript'
-		 // server.mime.path('file.npm').type === 'node/module'*/
-		mime: any;
-		/**server.plugins
-		 An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
-		 exports.register = function (server, options, next) {
-		server.expose('key', 'value');
-		// server.plugins.example.key === 'value'
-		return next();
-		};
-		 exports.register.attributes = {
-		name: 'example'
-		};*/
-		plugins: IDictionary<any>;
-		/** server.realm
-		 The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
-		 modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
-		 route - routes preferences:
-		 prefix - the route path prefix used by any calls to server.route() from the server.
-		 vhost - the route virtual host settings used by any calls to server.route() from the server.
-		 plugin - the active plugin name (empty string if at the server root).
-		 plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
-		 settings - settings overrides:
-		 files.relativeTo
-		 bind
-		 The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
-		 exports.register = function (server, options, next) {
-		console.log(server.realm.modifiers.route.prefix);
-		return next();
-		};*/
-		realm: IServerRealm;
-
-		/** server.root
-		 The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
-		root: Server;
-		/** server.settings
-		 The server configuration object after defaults applied.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server({
-		app: {
-		key: 'value'
-		}
-		});
-		 // server.settings.app === { key: 'value' }*/
-		settings: IServerOptions;
-
-		/** server.version
-		 The hapi module version number.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 // server.version === '8.0.0'*/
-		version: string;
-
-		/** server.after(method, [dependencies])
-		 Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
-		 after - the method with signature function(plugin, next) where:
-		 server - server object the after() method was called on.
-		 next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		 err - internal error which is returned back via the server.start() callback.
-		 dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.after(function () {
-		// Perform some pre-start logic
-		});
-		 server.start(function (err) {
-		// After method already executed
-		});
-		 server.auth.default(options)*/
-		after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string | string[]): void;
-
-		auth: {
-			/** server.auth.api
-			 An object where each key is a strategy name and the value is the exposed strategy API. Available on when the authentication scheme exposes an API by returning an api key in the object returned from its implementation function.
-			 When the server contains more than one connection, each server.connections array member provides its own connection.auth.api object.
-			 const server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 const scheme = function (server, options) {
-            return {
-            api: {
-            settings: {
-            x: 5
-            }
-            },
-            authenticate: function (request, reply) {
-            const req = request.raw.req;
-            const authorization = req.headers.authorization;
-            if (!authorization) {
-            return reply(Boom.unauthorized(null, 'Custom'));
-            }
-            return reply.continue({ credentials: { user: 'john' } });
-            }
-            };
-            };
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 console.log(server.auth.api.default.settings.x);    // 5
-			 */
-			api: {
-				[index: string]: any;
-			}
-			/** server.auth.default(options)
-			 Sets a default strategy which is applied to every route where:
-			 options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
-			 The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
-			 The default auth strategy configuration can be accessed via connection.auth.settings.default.
-			 var server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 server.auth.default('default');
-			 server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			});*/
-			default(options: string): void;
-			default(options: { strategy: string }): void;
-			default(options: { strategies: string[] }): void;
-			/** server.auth.scheme(name, scheme)
-			 Registers an authentication scheme where:
-			 name - the scheme name.
-			 scheme - the method implementing the scheme with signature function(server, options) where:
-			 server - a reference to the server object the scheme is added to.
-			 options - optional scheme settings used to instantiate a strategy.*/
-			scheme(name: string,
-				   /** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
-					n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
-					server = new Hapi.Server();
-					server.connection({ port: 80 });
-					scheme = function (server, options) {
-				urn {
-				authenticate: function (request, reply) {
-				req = request.raw.req;
-				var authorization = req.headers.authorization;
-				if (!authorization) {
-				return reply(Boom.unauthorized(null, 'Custom'));
-				}
-				urn reply(null, { credentials: { user: 'john' } });
-				}
-				};
-				};
-					*/
-				   scheme: (server: Server, options: any) => IServerAuthScheme): void;
-
-			/** server.auth.strategy(name, scheme, [mode], [options])
-			 Registers an authentication strategy where:
-			 name - the strategy name.
-			 scheme - the scheme name (must be previously registered using server.auth.scheme()).
-			 mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
-			 options - scheme options based on the scheme requirements.
-			 var server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 server.route({
-			method: 'GET',
-			path: '/',
-			config: {
-			auth: 'default',
-			handler: function (request, reply) {
-			return reply(request.auth.credentials.user);
-			}
-			}
-			});*/
-			strategy(name: string, scheme: string, mode?: boolean | string, options?: any): void;
-			strategy(name: string, scheme: string, mode?: boolean | string): void;
-			strategy(name: string, scheme: string, options?:any): void;
-
-			/** server.auth.test(strategy, request, next)
-			 Tests a request against an authentication strategy where:
-			 strategy - the strategy name registered with server.auth.strategy().
-			 request - the request object.
-			 next - the callback function with signature function(err, credentials) where:
-			 err - the error if authentication failed.
-			 credentials - the authentication credentials object if authentication was successful.
-			 Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
-			 var server = new Hapi.Server();
-			 server.connection({ port: 80 });
-			 server.auth.scheme('custom', scheme);
-			 server.auth.strategy('default', 'custom');
-			 server.route({
-			method: 'GET',
-			path: '/',
-			handler: function (request, reply) {
-			request.server.auth.test('default', request, function (err, credentials) {
-			if (err) {
-			return reply({ status: false });
-			}
-			return reply({ status: true, user: credentials.name });
-			});
-			}
-			});*/
-			test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
-		};
-
-		/** server.bind(context)
-		 Sets a global context used as the default bind object when adding a route or an extension where:
-		 context - the object used to bind this in handler and extension methods.
-		 When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
-		 var handler = function (request, reply) {
-		return reply(this.message);
-		};
-		 exports.register = function (server, options, next) {
-		var bind = {
-		message: 'hello'
-		};
-		server.bind(bind);
-		server.route({ method: 'GET', path: '/', handler: handler });
-		return next();
-		};*/
-		bind(context: any): void;
-
-
-		/** server.cache(options)
-		 Provisions a cache segment within the server cache facility where:
-		 options - catbox policy configuration where:
-		 expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
-		 expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
-		 generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
-		 staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
-		 staleTimeout - number of milliseconds to wait before checking if an item is stale.
-		 generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
-		 cache - the cache name configured in 'server.cache`. Defaults to the default cache.
-		 segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
-		 shared - if true, allows multiple cache provisions to share the same segment. Default to false.
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
-		 cache.set('norway', { capital: 'oslo' }, null, function (err) {
-		cache.get('norway', function (err, value, cached, log) {
-		// value === { capital: 'oslo' };
-		});
-		});*/
-		cache(options: ICatBoxCachePolicyOptions): void;
-
-		/** server.connection([options])
-		 Adds an incoming server connection
-		 Returns a server object with the new connection selected.
-		 Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
-		 Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
-		 var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
-		 // server.connections.length === 2
-		 // web.connections.length === 1
-		 // admin.connections.length === 1 */
-		connection(options: IServerConnectionOptions): Server;
-
-		/** server.decorate(type, property, method, [options])
-		 Extends various framework interfaces with custom methods where:
-		 type - the interface being decorated. Supported types:
-		 'reply' - adds methods to the reply interface.
-		 'server' - adds methods to the Server object.
-		 property - the object decoration key name.
-		 method - the extension function.
-		 options - if the type is 'request', supports the following optional settings:
-		 'apply' - if true, the method function is invoked using the signature function(request) where request is the current request object and the returned value is assigned as the decoration.
-		 Note that decorations apply to the entire server and all its connections regardless of current selection.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.decorate('reply', 'success', function () {
-		return this.response({ status: 'ok' });
-		});
-		 server.route({
-		method: 'GET',
-		path: '/',
-		handler: function (request, reply) {
-		return reply.success();
-		}
-		});*/
-		decorate(type: string, property: string, method: Function, options?: { apply: boolean }): void;
-
-		/** server.dependency(dependencies, [after])
-		 Used within a plugin to declares a required dependency on other plugins where:
-		 dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
-		 after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
-		 server - the server the dependency() method was called on.
-		 next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
-		 err - internal error condition, which is returned back via the server.start() callback.
-		 exports.register = function (server, options, next) {
-		server.dependency('yar', after);
-		return next();
-		};
-		 var after = function (server, next) {
-		// Additional plugin registration logic
-		return next();
-		};*/
-		dependency(dependencies: string | string[], after?: (server: Server, next: (err: any) => void) => void): void;
-
-
-		/** server.expose(key, value)
-		 Used within a plugin to expose a property via server.plugins[name] where:
-		 key - the key assigned (server.plugins[name][key]).
-		 value - the value assigned.
-		 exports.register = function (server, options, next) {
-		server.expose('util', function () { console.log('something'); });
-		return next();
-		};*/
-		expose(key: string, value: any): void;
-
-		/** server.expose(obj)
-		 Merges a deep copy of an object into to the existing content of server.plugins[name] where:
-		 obj - the object merged into the exposed properties container.
-		 exports.register = function (server, options, next) {
-		server.expose({ util: function () { console.log('something'); } });
-		return next();
-		};*/
-		expose(obj: any): void;
-
-		/** server.ext(event, method, [options])
-		 Registers an extension function in one of the available extension points where:
-		 event - the event name.
-		 method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
-		 request - the request object. NOTE: Access the Response via request.response
-		 reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
-		 this - the object provided via options.bind or the current active context set with server.bind().
-		 options - an optional object with the following:
-		 before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
-		 after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
-		 bind - a context object passed back to the provided method (via this) when called.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.ext('onRequest', function (request, reply) {
-		// Change all requests to '/test'
-		request.setUrl('/test');
-		return reply.continue();
-		});
-		 var handler = function (request, reply) {
-		return reply({ status: 'ok' });
-		};
-		 server.route({ method: 'GET', path: '/test', handler: handler });
-		 server.start();
-		 // All requests will get routed to '/test'*/
-		ext(event: RequestExtPoints, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
-		ext<T>(event: RequestExtPoints, method: (request: Request, reply: IStrictReply<T>, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
-		ext(event: ServerExtPoints, method: (server: Server, next: (err?: any) => void, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
-
-		/** server.handler(name, method)
-		 Registers a new handler type to be used in routes where:
-		 name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
-		 method - the function used to generate the route handler using the signature function(route, options) where:
-		 route - the route public interface object.
-		 options - the configuration object provided in the handler config.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ host: 'localhost', port: 8000 });
-		 // Defines new handler for routes on this server
-		 server.handler('test', function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		});
-		 server.route({
-		method: 'GET',
-		path: '/',
-		handler: { test: { msg: 'test' } }
-		});
-		 server.start();
-		 The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ host: 'localhost', port: 8000 });
-		 var handler = function (route, options) {
-		return function (request, reply) {
-		return reply('new handler: ' + options.msg);
-		}
-		};
-		 // Change the default payload processing for this handler
-		 handler.defaults = {
-		payload: {
-		output: 'stream',
-		parse: false
-		}
-		};
-		 server.handler('test', handler);*/
-		handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
-
-		/** server.initialize([callback])
-		 Initializes the server (starts the caches, finalizes plugin registration) but does not start listening
-		 on the connection ports, where:
-		 - `callback` - the callback method when server initialization is completed or failed with the signature
-		 `function(err)` where:
-		 - `err` - any initialization error condition.
-
-		 If no `callback` is provided, a `Promise` object is returned.
-
-		 Note that if the method fails and the callback includes an error, the server is considered to be in
-		 an undefined state and should be shut down. In most cases it would be impossible to fully recover as
-		 the various plugins, caches, and other event listeners will get confused by repeated attempts to
-		 start the server or make assumptions about the healthy state of the environment. It is recommended
-		 to assert that no error has been returned after calling `initialize()` to abort the process when the
-		 server fails to start properly. If you must try to resume after an error, call `server.stop()`
-		 first to reset the server state.
-		 */
-		initialize(callback?: (error: any) => void): IPromise<void>;
-
-		/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
-		 Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
-		 Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
-		 * When the server contains more than one connection, each server.connections array member provides its own connection.inject().
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 var handler = function (request, reply) {
-		return reply('Success!');
-		};
-		 server.route({ method: 'GET', path: '/', handler: handler });
-		 server.inject('/', function (res) {
-		console.log(res.result);
-		});
-		 */
-		inject: IServerInject;
-
-		/** server.log(tags, [data, [timestamp]])
-		 Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
-		 tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
-		 data - an optional message string or object with the application data being logged.
-		 timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.on('log', function (event, tags) {
-		if (tags.error) {
-		console.log(event);
-		}
-		});
-		 server.log(['test', 'error'], 'Test event');*/
-		log(tags: string | string[], data?: string | any, timestamp?: number): void;
-
-		/**server.lookup(id)
-		 When the server contains exactly one connection, looks up a route configuration where:
-		 id - the route identifier as set in the route options.
-		 returns the route public interface object if found, otherwise null.
-		 var server = new Hapi.Server();
-		 server.connection();
-		 server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		 var route = server.lookup('root');
-		 When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
-		lookup(id: string): IRoute;
-
-		/** server.match(method, path, [host])
-		 When the server contains exactly one connection, looks up a route configuration where:
-		 method - the HTTP method (e.g. 'GET', 'POST').
-		 path - the requested path (must begin with '/').
-		 host - optional hostname (to match against routes with vhost).
-		 returns the route public interface object if found, otherwise null.
-		 var server = new Hapi.Server();
-		 server.connection();
-		 server.route({
-		method: 'GET',
-		path: '/',
-		config: {
-		handler: function (request, reply) { return reply(); },
-		id: 'root'
-		}
-		});
-		 var route = server.match('get', '/');
-		 When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
-		match(method: string, path: string, host?: string): IRoute;
-
-
-		/** server.method(name, method, [options])
-		 Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
-		 Methods are registered via server.method(name, method, [options])
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 // Simple arguments
-		 var add = function (a, b, next) {
-		return next(null, a + b);
-		};
-		 server.method('sum', add, { cache: { expiresIn: 2000 } });
-		 server.methods.sum(4, 5, function (err, result) {
-		console.log(result);
-		});
-		 // Object argument
-		 var addArray = function (array, next) {
-		var sum = 0;
-		array.forEach(function (item) {
-		sum += item;
-		});
-		return next(null, sum);
-		};
-		 server.method('sumObj', addArray, {
-		cache: { expiresIn: 2000 },
-		generateKey: function (array) {
-		return array.join(',');
-		}
-		});
-		 server.methods.sumObj([5, 6], function (err, result) {
-		console.log(result);
-		});
-		 // Synchronous method with cache
-		 var addSync = function (a, b) {
-		return a + b;
-		};
-		 server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
-		 server.methods.sumSync(4, 5, function (err, result) {
-		console.log(result);
-		}); */
-		method(/**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
-			   name: string,
-			   method: IServerMethod,
-			   options?: IServerMethodOptions): void;
-
-
-		/**server.method(methods)
-		 Registers a server method function as described in server.method() using a configuration object where:
-		 methods - an object or an array of objects where each one contains:
-		 name - the method name.
-		 method - the method function.
-		 options - optional settings.
-		 var add = function (a, b, next) {
-		next(null, a + b);
-		};
-		 server.method({
-		name: 'sum',
-		method: add,
-		options: {
-		cache: {
-		expiresIn: 2000
-		}
-		}
-		});*/
-		method(methods: {
-			name: string; method: IServerMethod; options?: IServerMethodOptions
-		} | Array<{
-			name: string; method: IServerMethod; options?: IServerMethodOptions
-		}>): void;
-
-		/**server.path(relativeTo)
-		 Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
-		 relativeTo - the path prefix added to any relative file path starting with '.'.
-		 Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
-		 exports.register = function (server, options, next) {
-		server.path(__dirname + '../static');
-		server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
-		next();
-		};*/
-		path(relativeTo: string): void;
-
-
-		/**
-		 * server.register(plugins, [options], callback)
-		 * Registers a plugin where:
-		 * plugins - an object or array of objects where each one is either:
-		 * a plugin registration function.
-		 * an object with the following:
-		 * register - the plugin registration function.
-		 * options - optional options passed to the registration function when called.
-		 * options - optional registration options (different from the options passed to the registration function):
-		 * select - a string or array of string labels used to pre-select connections for plugin registration.
-		 * routes - modifiers applied to each route added by the plugin:
-		 * prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
-		 * vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
-		 * callback - the callback function with signature function(err) where:
-		 * err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
-		 *
-		 * If no callback is provided, a Promise object is returned.
-		 */
-		register(plugins: any | any[], options: {
-			select: string | string[];
-			routes: {
-				prefix: string; vhost?: string | string[]
-			};
-		}, callback: (err: any) => void): void;
-		register(plugins: any | any[], options: {
-			select: string | string[];
-			routes: {
-				prefix: string; vhost?: string | string[]
-			};
-		}): IPromise<any>;
-
-		register(plugins: any | any[], callback: (err: any) => void): void;
-		register(plugins: any | any[]): IPromise<any>;
-
-		/**server.render(template, context, [options], callback)
-		 Utilizes the server views manager to render a template where:
-		 template - the template filename and path, relative to the views manager templates path (path or relativeTo).
-		 context - optional object used by the template to render context-specific result. Defaults to no context ({}).
-		 options - optional object used to override the views manager configuration.
-		 callback - the callback function with signature function (err, rendered, config) where:
-		 err - the rendering error if any.
-		 rendered - the result view string.
-		 config - the configuration used to render the template.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.views({
-		engines: { html: require('handlebars') },
-		path: __dirname + '/templates'
-		});
-		 var context = {
-		title: 'Views Example',
-		message: 'Hello, World'
-		};
-		 server.render('hello', context, function (err, rendered, config) {
-		console.log(rendered);
-		});*/
-		render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void): void;
-
-		/** server.route(options)
-		 Adds a connection route where:
-		 options - a route configuration object or an array of configuration objects.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
-		 server.route([
-		 { method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
-		 { method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
-		 ]);*/
-		route(options: IRouteConfiguration): void;
-		route(options: IRouteConfiguration[]): void;
-
-		/**server.select(labels)
-		 Selects a subset of the server's connections where:
-		 labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
-		 Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, labels: ['a'] });
-		 server.connection({ port: 8080, labels: ['b'] });
-		 server.connection({ port: 8081, labels: ['c'] });
-		 server.connection({ port: 8082, labels: ['c','d'] });
-		 var a = server.select('a');          // The server with port 80
-		 var ab = server.select(['a','b']);   // A list of servers containing the server with port 80 and the server with port 8080
-		 var c = server.select('c');          // A list of servers containing the server with port 8081 and the server with port 8082 */
-		select(labels: string | string[]): Server | Server[];
-
-		/** server.start([callback])
-		 Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
-		 callback - optional callback when server startup is completed or failed with the signature function(err) where:
-		 err - any startup error condition.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.start(function (err) {
-		console.log('Server started at: ' + server.info.uri);
-		});*/
-		start(callback?: (err: any) => void): IPromise<void>;
-
-		/** server.state(name, [options])
-		 HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
-		 State defaults can be modified via the server connections.routes.state configuration option.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 // Set cookie definition
-		 server.state('session', {
-		ttl: 24 * 60 * 60 * 1000,     // One day
-		isSecure: true,
-		path: '/',
-		encoding: 'base64json'
-		});
-		 // Set state in route handler
-		 var handler = function (request, reply) {
-		var session = request.state.session;
-		if (!session) {
-		session = { user: 'joe' };
-		}
-		session.last = Date.now();
-		return reply('Success').state('session', session);
-		};
-		 Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.on('request-internal', function (request, event, tags) {
-		if (tags.error && tags.state) {
-		console.error(event);
-		}
-		});    */
-		state(name: string, options?: ICookieSettings): void;
-
-		/** server.stop([options], [callback])
-		 Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
-		 options - optional object with:
-		 timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
-		 callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80 });
-		 server.stop({ timeout: 60 * 1000 }, function () {
-		console.log('Server stopped');
-		});*/
-		stop(options?: { timeout: number }, callback?: () => void): IPromise<void>;
-
-		/**server.table([host])
-		 Returns a copy of the routing table where:
-		 host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
-		 The return value is an array where each item is an object containing:
-		 info - the connection.info the connection the table was generated for.
-		 labels - the connection labels.
-		 table - an array of routes where each route contains:
-		 settings - the route config with defaults applied.
-		 method - the HTTP method in lower case.
-		 path - the route path.
-		 Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, host: 'example.com' });
-		 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		 var table = server.table();
-		 When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.connection({ port: 80, host: 'example.com' });
-		 server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
-		 var table = server.connections[0].table();
-		 //[
-		 //    {
-		//        method: 'get',
-		//        path: '/example',
-		//        settings: { ... }
-		//    }
-		 //]
-		 */
-		table(host?: any): IConnectionTable;
-
-		/**server.views(options)
-		 Initializes the server views manager
-		 var Hapi = require('hapi');
-		 var server = new Hapi.Server();
-		 server.views({
-		engines: {
-		html: require('handlebars'),
-		jade: require('jade')
-		},
-		path: '/static/templates'
-		});
-		 When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
-		views(options: IServerViewsConfiguration): void;
-
-	}
-}
diff --git a/i18next/index.d.ts b/i18next/index.d.ts
index 21f93524fb..03dcb9daac 100644
--- a/i18next/index.d.ts
+++ b/i18next/index.d.ts
@@ -131,7 +131,7 @@ declare namespace i18n {
 
         off(event: string, listener: () => void): void;
 
-        options: I18next.Options;
+        options: Options;
     }
 }
 
diff --git a/leaflet/index.d.ts b/leaflet/index.d.ts
index b67134a8b6..1adf9f0b0b 100644
--- a/leaflet/index.d.ts
+++ b/leaflet/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-/// <reference path="../geojson/geojson.d.ts" />
+/// <reference types="geojson" />
 
 type NativeMouseEvent = MouseEvent;
 

From 5e5357a902823801b75648513b4b33624f8fede3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 11:45:37 -0800
Subject: [PATCH 213/245] Fix cropperjs and material-ui merge

---
 cropperjs/cropperjs-tests.ts      |    2 +-
 cropperjs/index.d.ts              |    6 +-
 material-ui/index.d.ts            |   16 +-
 material-ui/material-ui-tests.tsx |   14 +-
 material-ui/material-ui.d.ts      | 8601 -----------------------------
 5 files changed, 21 insertions(+), 8618 deletions(-)
 delete mode 100644 material-ui/material-ui.d.ts

diff --git a/cropperjs/cropperjs-tests.ts b/cropperjs/cropperjs-tests.ts
index aa44e97554..2c57656b78 100644
--- a/cropperjs/cropperjs-tests.ts
+++ b/cropperjs/cropperjs-tests.ts
@@ -1,4 +1,4 @@
-import Cropper from 'cropperjs';
+import * as Cropper from 'cropperjs';
 
 var image = <HTMLImageElement>document.getElementById('image');
 var cropper = new Cropper(image, {
diff --git a/cropperjs/index.d.ts b/cropperjs/index.d.ts
index 42904b8fe5..aba858bfa5 100644
--- a/cropperjs/index.d.ts
+++ b/cropperjs/index.d.ts
@@ -465,7 +465,5 @@ declare class cropperjs {
 
 }
 
-declare module "cropperjs" {
-    const Cropper: typeof cropperjs;
-    export default Cropper;
-}
+export = cropperjs;
+export as namespace Cropper;
diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
index e416f5a7ab..3b186a4966 100644
--- a/material-ui/index.d.ts
+++ b/material-ui/index.d.ts
@@ -35,7 +35,7 @@ declare module "material-ui" {
     export import LinearProgress = __MaterialUI.LinearProgress;
     export import List = __MaterialUI.List.List;
     export import ListItem = __MaterialUI.List.ListItem;
-    export import MakeSelectable = __MaterialUI.List.MakeSelectable;
+    export import makeSelectable = __MaterialUI.List.makeSelectable;
     export import Menu = __MaterialUI.Menus.Menu;
     export import MenuItem = __MaterialUI.Menus.MenuItem;
     export import Paper = __MaterialUI.Paper;
@@ -573,6 +573,7 @@ declare namespace __MaterialUI {
         onUpdateInput?: (searchText: string, dataSource: AutoCompleteDataSource) => void;
         open?: boolean;
         openOnFocus?: boolean;
+        popoverProps?: Popover.PopoverProps;
         searchText?: string;
         style?: React.CSSProperties;
         targetOrigin?: propTypes.origin;
@@ -683,6 +684,7 @@ declare namespace __MaterialUI {
     interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
         // <EnhancedButton/> is the element that get the 'other' properties
         backgroundColor?: string;
+        buttonStyle?: React.CSSProperties;
         className?: string;
         disabled?: boolean;
         disabledBackgroundColor?: string;
@@ -1103,7 +1105,7 @@ declare namespace __MaterialUI {
         }
 
         // union types for higher order components in TypeScript 1.8: https://github.com/Microsoft/TypeScript/issues/4362
-        export function MakeSelectable<P extends {}>(component: React.ComponentClass<P>): React.ComponentClass<P & SelectableProps>;
+        export function makeSelectable<P extends {}>(component: React.ComponentClass<P>): React.ComponentClass<P & SelectableProps>;
     }
 
     namespace Menus {
@@ -1285,6 +1287,7 @@ declare namespace __MaterialUI {
         mode?: "determinate" | "indeterminate";
         size?: number;
         style?: React.CSSProperties;
+        thickness?: number;
         value?: number;
     }
     export class CircularProgress extends React.Component<CircularProgressProps, {}> {
@@ -1488,6 +1491,8 @@ declare namespace __MaterialUI {
             rippleStyle?: React.CSSProperties;
             style?: React.CSSProperties;
             thumbStyle?: React.CSSProperties;
+            thumbSwitchedStyle?: React.CSSProperties;
+            trackSwitchedStyle?: React.CSSProperties;
             toggled?: boolean;
             trackStyle?: React.CSSProperties;
             valueLink?: ReactLink<boolean>;
@@ -1503,6 +1508,7 @@ declare namespace __MaterialUI {
         autoHideDuration?: number;
         bodyStyle?: React.CSSProperties;
         className?: string;
+        contentStyle?: React.CSSProperties;
         message: React.ReactNode;
         onActionTouchTap?: React.TouchEventHandler<{}>;
         onRequestClose: (reason: string) => void;
@@ -2086,7 +2092,7 @@ declare module 'material-ui/LinearProgress' {
 declare module 'material-ui/List' {
     export import List = __MaterialUI.List.List;
     export import ListItem = __MaterialUI.List.ListItem;
-    export import MakeSelectable = __MaterialUI.List.MakeSelectable;
+    export import makeSelectable = __MaterialUI.List.makeSelectable;
     export default List;
 }
 
@@ -2100,8 +2106,8 @@ declare module 'material-ui/List/ListItem' {
     export default ListItem;
 }
 
-declare module 'material-ui/List/MakeSelectable' {
-    export import MakeSelectable = __MaterialUI.List.MakeSelectable;
+declare module 'material-ui/List/makeSelectable' {
+    export import MakeSelectable = __MaterialUI.List.makeSelectable;
     export default MakeSelectable;
 }
 
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index 014d933471..f9b992f875 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -1,7 +1,7 @@
-///<reference path='../react/react.d.ts' />
-///<reference path='../react/react-dom.d.ts' />
-///<reference path='../react-tap-event-plugin/react-tap-event-plugin.d.ts' />
-///<reference path='material-ui.d.ts' />
+///<reference types='react' />
+///<reference types='react-dom' />
+///<reference types='react-tap-event-plugin' />
+///<reference types='material-ui' />
 
 import * as React from 'react';
 import {Component, PropTypes} from 'react';
@@ -165,7 +165,7 @@ const styles = {
     root: {
         display: 'flex',
         flexWrap: 'wrap',
-        justifyContent: 'space-around',
+        justifyContent: 'space-around' as 'space-around',
     },
     gridList: {
         width: 500,
@@ -3584,8 +3584,8 @@ const ToggleExampleSimple = () => (
             label="Label on the right"
             labelPosition="right"
             style={styles.toggle}
-            thumbTwitchedStyle={styles.toggle}
-            trackTwitchedStyle={styles.toggle}
+            thumbSwitchedStyle={styles.toggle}
+            trackSwitchedStyle={styles.toggle}
         />
     </div>
 );
diff --git a/material-ui/material-ui.d.ts b/material-ui/material-ui.d.ts
deleted file mode 100644
index 475b719bea..0000000000
--- a/material-ui/material-ui.d.ts
+++ /dev/null
@@ -1,8601 +0,0 @@
-// Type definitions for material-ui v0.16.0
-// Project: https://github.com/callemall/material-ui
-// Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-///<reference path='../react/react.d.ts' />
-
-declare module "material-ui" {
-    export import AppBar = __MaterialUI.AppBar;
-    export import AutoComplete = __MaterialUI.AutoComplete;
-    export import Avatar = __MaterialUI.Avatar;
-    export import Badge = __MaterialUI.Badge;
-    export import Card = __MaterialUI.Card.Card;
-    export import CardActions = __MaterialUI.Card.CardActions;
-    export import CardHeader = __MaterialUI.Card.CardHeader;
-    export import CardMedia = __MaterialUI.Card.CardMedia;
-    export import CardText = __MaterialUI.Card.CardText;
-    export import CardTitle = __MaterialUI.Card.CardTitle;
-    export import Checkbox = __MaterialUI.Switches.Checkbox;
-    export import Chip = __MaterialUI.Chip;
-    export import CircularProgress = __MaterialUI.CircularProgress;
-    export import DatePicker = __MaterialUI.DatePicker.DatePicker;
-    export import Dialog = __MaterialUI.Dialog;
-    export import Divider = __MaterialUI.Divider;
-    export import Drawer = __MaterialUI.Drawer;
-    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
-    export import FlatButton = __MaterialUI.FlatButton;
-    export import FloatingActionButton = __MaterialUI.FloatingActionButton;
-    export import FontIcon = __MaterialUI.FontIcon;
-    export import GridList = __MaterialUI.GridList.GridList;
-    export import GridTile = __MaterialUI.GridList.GridTile;
-    export import IconButton = __MaterialUI.IconButton;
-    export import IconMenu = __MaterialUI.Menus.IconMenu;
-    export import LinearProgress = __MaterialUI.LinearProgress;
-    export import List = __MaterialUI.List.List;
-    export import ListItem = __MaterialUI.List.ListItem;
-    export import makeSelectable = __MaterialUI.List.makeSelectable;
-    export import Menu = __MaterialUI.Menus.Menu;
-    export import MenuItem = __MaterialUI.Menus.MenuItem;
-    export import Paper = __MaterialUI.Paper;
-    export import Popover = __MaterialUI.Popover.Popover;
-    export import RadioButton = __MaterialUI.Switches.RadioButton;
-    export import RadioButtonGroup = __MaterialUI.Switches.RadioButtonGroup;
-    export import RaisedButton = __MaterialUI.RaisedButton;
-    export import RefreshIndicator = __MaterialUI.RefreshIndicator;
-    export import SelectField = __MaterialUI.SelectField;
-    export import Slider = __MaterialUI.Slider;
-    export import Subheader = __MaterialUI.Subheader;
-    export import SvgIcon = __MaterialUI.SvgIcon;
-    export import Step = __MaterialUI.Stepper.Step;
-    export import StepButton = __MaterialUI.Stepper.StepButton;
-    export import StepContent = __MaterialUI.Stepper.StepContent;
-    export import StepLabel = __MaterialUI.Stepper.StepLabel;
-    export import Stepper = __MaterialUI.Stepper;
-    export import Snackbar = __MaterialUI.Snackbar;
-    export import Tab = __MaterialUI.Tabs.Tab;
-    export import Tabs = __MaterialUI.Tabs.Tabs;
-    export import Table = __MaterialUI.Table.Table;
-    export import TableBody = __MaterialUI.Table.TableBody;
-    export import TableFooter = __MaterialUI.Table.TableFooter;
-    export import TableHeader = __MaterialUI.Table.TableHeader;
-    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn;
-    export import TableRow = __MaterialUI.Table.TableRow;
-    export import TableRowColumn = __MaterialUI.Table.TableRowColumn;
-    export import TextField = __MaterialUI.TextField;
-    export import TimePicker = __MaterialUI.TimePicker;
-    export import Toggle = __MaterialUI.Switches.Toggle;
-    export import Toolbar = __MaterialUI.Toolbar.Toolbar;
-    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup;
-    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator;
-    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle;
-
-    // export type definitions
-    export type TouchTapEvent = __MaterialUI.TouchTapEvent;
-    export type TouchTapEventHandler = __MaterialUI.TouchTapEventHandler;
-}
-
-declare namespace __MaterialUI {
-    export import React = __React;
-
-    // ReactLink is from "react/addons"
-    interface ReactLink<T> {
-        value: T;
-        requestChange(newValue: T): void;
-    }
-
-    // What's common between React.TouchEvent and React.MouseEvent
-    interface TouchTapEvent extends React.SyntheticEvent {
-        altKey: boolean;
-        ctrlKey: boolean;
-        getModifierState(key: string): boolean;
-        metaKey: boolean;
-        shiftKey: boolean;
-    }
-
-    // What's common between React.TouchEventHandler and React.MouseEventHandler
-    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> {
-    }
-
-    interface ThemeWrapperProps {
-        theme: Styles.MuiTheme;
-    }
-    export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
-    }
-
-    export namespace Styles {
-        interface Spacing {
-            iconSize?: number;
-
-            desktopGutter?: number;
-            desktopGutterMore?: number;
-            desktopGutterLess?: number;
-            desktopGutterMini?: number;
-            desktopKeylineIncrement?: number;
-            desktopDropDownMenuItemHeight?: number;
-            desktopDropDownMenuFontSize?: number;
-            desktopLeftNavMenuItemHeight?: number;
-            desktopSubheaderHeight?: number;
-            desktopToolbarHeight?: number;
-        }
-        export var Spacing: Spacing;
-
-        interface ThemePalette {
-            primary1Color?: string;
-            primary2Color?: string;
-            primary3Color?: string;
-            accent1Color?: string;
-            accent2Color?: string;
-            accent3Color?: string;
-            textColor?: string;
-            alternateTextColor?: string;
-            canvasColor?: string;
-            borderColor?: string;
-            disabledColor?: string;
-            pickerHeaderColor?: string;
-            clockCircleColor?: string;
-            shadowColor?: string;
-        }
-        export var ThemePalette: ThemePalette;
-        interface MuiTheme {
-            spacing?: Spacing;
-            fontFamily?: string;
-            palette?: ThemePalette;
-            isRtl?: boolean;
-            userAgent?: string;
-            zIndex?: zIndex;
-            baseTheme?: RawTheme;
-            rawTheme?: RawTheme;
-            appBar?: {
-                color?: string;
-                textColor?: string;
-                height?: number;
-                titleFontWeight?: number;
-                padding?: number;
-            };
-            avatar?: {
-                color?: string;
-                backgroundColor?: string;
-                borderColor?: string;
-            };
-            badge?: {
-                color?: string;
-                textColor?: string;
-                primaryColor?: string;
-                primaryTextColor?: string;
-                secondaryColor?: string;
-                secondaryTextColor?: string;
-                fontWeight?: number;
-            };
-            button?: {
-                height?: number;
-                minWidth?: number;
-                iconButtonSize?: number;
-            };
-            card?: {
-                titleColor?: string;
-                subtitleColor?: string;
-                fontWeight?: number;
-            };
-            cardMedia?: {
-                color?: string;
-                overlayContentBackground?: string;
-                titleColor?: string;
-                subtitleColor?: string;
-            };
-            cardText?: {
-                textColor?: string;
-            };
-            checkbox?: {
-                boxColor?: string;
-                checkedColor?: string;
-                requiredColor?: string;
-                disabledColor?: string;
-                labelColor?: string;
-                labelDisabledColor?: string;
-            };
-            chip?: {
-                backgroundColor?: string;
-                deleteIconColor?: string;
-                textColor?: string;
-                fontSize?: number;
-                fontWeight?: number;
-                shadow?: string;
-            };
-            datePicker?: {
-                color?: string;
-                textColor?: string;
-                calendarTextColor?: string;
-                selectColor?: string;
-                selectTextColor?: string;
-                calendarYearBackgroundColor?: string;
-            };
-            dialog?: {
-                titleFontSize?: number;
-                bodyFontSize?: number;
-                bodyColor?: string;
-            };
-            dropDownMenu?: {
-                accentColor?: string;
-            };
-            enhancedButton?: {
-                tapHighlightColor?: string;
-            };
-            flatButton?: {
-                color?: string;
-                buttonFilterColor?: string;
-                disabledTextColor?: string;
-                textColor?: string;
-                primaryTextColor?: string;
-                secondaryTextColor?: string;
-                fontSize?: number;
-                fontWeight?: number;
-            };
-            floatingActionButton?: {
-                buttonSize?: number;
-                miniSize?: number;
-                color?: string;
-                iconColor?: string;
-                secondaryColor?: string;
-                secondaryIconColor?: string;
-                disabledTextColor?: string;
-                disabledColor?: string;
-            };
-            gridTile?: {
-                textColor?: string;
-            };
-            icon?: {
-                color?: string;
-                backgroundColor?: string;
-            };
-            inkBar?: {
-                backgroundColor?: string;
-            };
-            drawer?: {
-                width?: number;
-                color?: string;
-            };
-            listItem?: {
-                nestedLevelDepth?: number;
-                secondaryTextColor?: string;
-                leftIconColor?: string;
-                rightIconColor?: string;
-            };
-            menu?: {
-                backgroundColor?: string;
-                containerBackgroundColor?: string;
-            };
-            menuItem?: {
-                dataHeight?: number;
-                height?: number;
-                hoverColor?: string;
-                padding?: number;
-                selectedTextColor?: string;
-                rightIconDesktopFill?: string;
-            };
-            menuSubheader?: {
-                padding?: number;
-                borderColor?: string;
-                textColor?: string;
-            };
-            overlay?: {
-                backgroundColor?: string;
-            };
-            paper?: {
-                color?: string;
-                backgroundColor?: string;
-                zDepthShadows?: string[];
-            };
-            radioButton?: {
-                borderColor?: string;
-                backgroundColor?: string;
-                checkedColor?: string;
-                requiredColor?: string;
-                disabledColor?: string;
-                size?: number;
-                labelColor?: string;
-                labelDisabledColor?: string;
-            };
-            raisedButton?: {
-                color?: string;
-                textColor?: string;
-                primaryColor?: string;
-                primaryTextColor?: string;
-                secondaryColor?: string;
-                secondaryTextColor?: string;
-                disabledColor?: string;
-                disabledTextColor?: string;
-                fontSize?: number;
-                fontWeight?: number;
-            };
-            refreshIndicator?: {
-                strokeColor?: string;
-                loadingStrokeColor?: string;
-            };
-            ripple?: {
-                color?: string;
-            };
-            slider?: {
-                trackSize?: number;
-                trackColor?: string;
-                trackColorSelected?: string;
-                handleSize?: number;
-                handleSizeDisabled?: number;
-                handleSizeActive?: number;
-                handleColorZero?: string;
-                handleFillColor?: string;
-                selectionColor?: string;
-                rippleColor?: string;
-            };
-            snackbar?: {
-                textColor?: string;
-                backgroundColor?: string;
-                actionColor?: string;
-            };
-            subheader?: {
-                color?: string;
-                fontWeight?: number;
-            };
-            stepper?: {
-                backgroundColor?: string;
-                hoverBackgroundColor?: string;
-                iconColor?: string;
-                hoveredIconColor?: string;
-                inactiveIconColor?: string;
-                textColor?: string;
-                disabledTextColor?: string;
-                connectorLineColor?: string;
-            };
-            svgIcon?: {
-                color?: string,
-            };
-            table?: {
-                backgroundColor?: string;
-            };
-            tableFooter?: {
-                borderColor?: string;
-                textColor?: string;
-            };
-            tableHeader?: {
-                borderColor?: string;
-            };
-            tableHeaderColumn?: {
-                textColor?: string;
-                height?: number;
-                spacing?: number;
-            };
-            tableRow?: {
-                hoverColor?: string;
-                stripeColor?: string;
-                selectedColor?: string;
-                textColor?: string;
-                borderColor?: string;
-                height?: number;
-            };
-            tableRowColumn?: {
-                height?: number;
-                spacing?: number;
-            };
-            tabs?: {
-                backgroundColor?: string;
-                textColor?: string;
-                selectedTextColor?: string;
-            };
-            textField?: {
-                textColor?: string;
-                hintColor?: string;
-                floatingLabelColor?: string;
-                disabledTextColor?: string;
-                errorColor?: string;
-                focusColor?: string;
-                backgroundColor?: string;
-                borderColor?: string;
-            };
-            timePicker?: {
-                color?: string;
-                textColor?: string;
-                accentColor?: string;
-                clockColor?: string;
-                clockCircleColor?: string;
-                headerColor?: string;
-                selectColor?: string;
-                selectTextColor?: string;
-            };
-            toggle?: {
-                thumbOnColor?: string;
-                thumbOffColor?: string;
-                thumbDisabledColor?: string;
-                thumbRequiredColor?: string;
-                trackOnColor?: string;
-                trackOffColor?: string;
-                trackDisabledColor?: string;
-                labelColor?: string;
-                labelDisabledColor?: string;
-                trackRequiredColor?: string;
-            };
-            toolbar?: {
-                color?: string;
-                hoverColor?: string;
-                backgroundColor?: string;
-                height?: number;
-                titleFontSize?: number;
-                iconColor?: string;
-                separatorColor?: string;
-                menuHoverColor?: string;
-            };
-            tooltip?: {
-                color?: string;
-                rippleBackgroundColor?: string;
-            };
-        }
-
-        interface zIndex {
-            menu: number;
-            appBar: number;
-            drawerOverlay: number;
-            drawer: number;
-            dialogOverlay: number;
-            dialog: number;
-            layer: number;
-            popover: number;
-            snackbar: number;
-            tooltip: number;
-        }
-        export var zIndex: zIndex;
-
-        interface RawTheme {
-            spacing?: Spacing;
-            fontFamily?: string;
-            palette?: ThemePalette;
-        }
-        var lightBaseTheme: RawTheme;
-        var darkBaseTheme: RawTheme;
-
-        export function muiThemeable<TComponent extends React.Component<P, S>, P, S>(): (component: TComponent) => TComponent;
-
-        interface MuiThemeProviderProps {
-            muiTheme?: Styles.MuiTheme;
-        }
-        export class MuiThemeProvider extends React.Component<MuiThemeProviderProps, {}> {
-        }
-
-        export function getMuiTheme(...muiTheme: MuiTheme[]): MuiTheme;
-
-        interface Transitions {
-            easeOut(duration?: string, property?: string | string[], delay?: string, easeFunction?: string): string;
-            create(duration?: string, property?: string, delay?: string, easeFunction?: string): string;
-            easeOutFunction: string;
-            easeInOutFunction: string;
-        }
-        export var Transitions: Transitions;
-
-        interface Typography {
-            textFullBlack: string;
-            textDarkBlack: string;
-            textLightBlack: string;
-            textMinBlack: string;
-            textFullWhite: string;
-            textDarkWhite: string;
-            textLightWhite: string;
-
-            // font weight
-            fontWeightLight: number;
-            fontWeightNormal: number;
-            fontWeightMedium: number;
-
-            fontStyleButtonFontSize: number;
-        }
-        export var Typography: Typography;
-    }
-
-    interface AppBarProps {
-        className?: string;
-        iconClassNameLeft?: string;
-        iconClassNameRight?: string;
-        iconElementLeft?: React.ReactElement<any>;
-        iconElementRight?: React.ReactElement<any>;
-        iconStyleRight?: React.CSSProperties;
-        iconStyleLeft?: React.CSSProperties;
-        onLeftIconButtonTouchTap?: TouchTapEventHandler;
-        onRightIconButtonTouchTap?: TouchTapEventHandler;
-        onTitleTouchTap?: TouchTapEventHandler;
-        showMenuIconButton?: boolean;
-        style?: React.CSSProperties;
-        title?: React.ReactNode;
-        titleStyle?: React.CSSProperties;
-        zDepth?: number;
-    }
-    export class AppBar extends React.Component<AppBarProps, {}> {
-    }
-
-    interface AppCanvasProps {
-    }
-    export class AppCanvas extends React.Component<AppCanvasProps, {}> {
-    }
-
-    namespace propTypes {
-        type horizontal = 'left' | 'middle' | 'right';
-        type vertical = 'top' | 'center' | 'bottom';
-        type direction = 'left' | 'right' | 'up' | 'down';
-
-        interface origin {
-            horizontal: horizontal;
-            vertical: vertical;
-        }
-
-        type corners = 'bottom-left' | 'bottom-right' | 'top-left' | 'top-right';
-        type cornersAndCenter = 'bottom-center' | 'bottom-left' | 'bottom-right' | 'top-center' | 'top-left' | 'top-right';
-    }
-
-    type AutoCompleteDataItem = { text: string, value: React.ReactNode } | string;
-    type AutoCompleteDataSource = { text: string, value: React.ReactNode }[] | string[];
-    interface AutoCompleteProps {
-        anchorOrigin?: propTypes.origin;
-        animated?: boolean;
-        animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
-        dataSource: AutoCompleteDataSource;
-        disableFocusRipple?: boolean;
-        errorStyle?: React.CSSProperties;
-        errorText?: string;
-        filter?: (searchText: string, key: string, item: AutoCompleteDataItem) => boolean;
-        floatingLabelText?: React.ReactNode;
-        fullWidth?: boolean;
-        hintText?: string;
-        listStyle?: React.CSSProperties;
-        maxSearchResults?: number;
-        menuCloseDelay?: number;
-        menuProps?: any;
-        menuStyle?: React.CSSProperties;
-        onBlur?: React.FocusEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onKeyDown?: React.KeyboardEventHandler;
-        onNewRequest?: (chosenRequest: string, index: number) => void;
-        onUpdateInput?: (searchText: string, dataSource: AutoCompleteDataSource) => void;
-        open?: boolean;
-        openOnFocus?: boolean;
-        popoverProps?: Popover.PopoverProps;
-        searchText?: string;
-        style?: React.CSSProperties;
-        targetOrigin?: propTypes.origin;
-        textFieldStyle?: React.CSSProperties;
-    }
-    export class AutoComplete extends React.Component<AutoCompleteProps, {}> {
-        static noFilter: () => boolean;
-        static defaultFilter: (searchText: string, key: string) => boolean;
-        static caseSensitiveFilter: (searchText: string, key: string) => boolean;
-        static caseInsensitiveFilter: (searchText: string, key: string) => boolean;
-
-        static levenshteinDistanceFilter(distanceLessThan: number): (searchText: string, key: string) => boolean;
-
-        static fuzzyFilter: (searchText: string, key: string) => boolean;
-        static Item: Menus.MenuItem;
-        static Divider: Divider;
-    }
-
-    interface AvatarProps {
-        backgroundColor?: string;
-        className?: string;
-        color?: string;
-        icon?: React.ReactElement<any>;
-        size?: number;
-        src?: string;
-        style?: React.CSSProperties;
-    }
-    export class Avatar extends React.Component<AvatarProps, {}> {
-    }
-
-    interface BadgeProps {
-        badgeContent: React.ReactNode;
-        badgeStyle?: React.CSSProperties;
-        className?: string;
-        primary?: boolean;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class Badge extends React.Component<BadgeProps, {}> {
-    }
-
-    interface BeforeAfterWrapperProps {
-        afterElementType?: string;
-        afterStyle?: React.CSSProperties;
-        beforeElementType?: string;
-        beforeStyle?: React.CSSProperties;
-        elementType?: string;
-        style?: React.CSSProperties;
-    }
-    export class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> {
-    }
-
-    // non generally overridden elements of EnhancedButton
-    interface SharedEnhancedButtonProps<T> {
-        centerRipple?: boolean;
-        disableFocusRipple?: boolean;
-        disableKeyboardFocus?: boolean;
-        disableTouchRipple?: boolean;
-        focusRippleColor?: string;
-        focusRippleOpacity?: number;
-        href?: string;
-        keyboardFocused?: boolean;
-        onBlur?: React.FocusEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-        onKeyDown?: React.KeyboardEventHandler;
-        onKeyUp?: React.KeyboardEventHandler;
-        onTouchTap?: TouchTapEventHandler;
-        onClick?: React.MouseEventHandler;
-        style?: React.CSSProperties;
-        tabIndex?: number;
-        target?: string;
-        touchRippleColor?: string;
-        touchRippleOpacity?: number;
-        type?: string;
-        containerElement?: React.ReactNode | string;
-    }
-
-    interface EnhancedButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<EnhancedButton> {
-        // container element, <button/>, or <span/>(if disabled link) is the element that get the 'other' properties
-        containerElement?: React.ReactNode | string;
-        disabled?: boolean;
-    }
-    export class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {
-    }
-
-    interface FlatButtonProps extends React.DOMAttributes, SharedEnhancedButtonProps<FlatButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        backgroundColor?: string;
-        disabled?: boolean;
-        hoverColor?: string;
-        icon?: React.ReactNode;
-        label?: React.ReactNode;
-        labelPosition?: "before" | "after";
-        labelStyle?: React.CSSProperties;
-        linkButton?: boolean;
-        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onTouchStart?: React.TouchEventHandler;
-        primary?: boolean;
-        rippleColor?: string;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class FlatButton extends React.Component<FlatButtonProps, {}> {
-    }
-
-    interface RaisedButtonProps extends SharedEnhancedButtonProps<RaisedButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        backgroundColor?: string;
-        buttonStyle?: React.CSSProperties;
-        className?: string;
-        disabled?: boolean;
-        disabledBackgroundColor?: string;
-        disabledLabelColor?: string;
-        fullWidth?: boolean;
-        icon?: React.ReactNode;
-        label?: React.ReactNode;
-        labelColor?: string;
-        labelPosition?: "before" | "after";
-        labelStyle?: React.CSSProperties;
-        linkButton?: boolean;
-        onMouseDown?: React.MouseEventHandler;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onMouseUp?: React.MouseEventHandler;
-        onTouchEnd?: React.TouchEventHandler;
-        onTouchStart?: React.TouchEventHandler;
-        primary?: boolean;
-        rippleStyle?: React.CSSProperties;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class RaisedButton extends React.Component<RaisedButtonProps, {}> {
-    }
-
-    interface FloatingActionButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<FloatingActionButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        backgroundColor?: string;
-        className?: string;
-        disabled?: boolean;
-        disabledColor?: string;
-        iconClassName?: string;
-        iconStyle?: React.CSSProperties;
-        mini?: boolean;
-        onMouseDown?: React.MouseEventHandler;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onMouseUp?: React.MouseEventHandler;
-        onTouchEnd?: React.TouchEventHandler;
-        onTouchStart?: React.TouchEventHandler;
-        secondary?: boolean;
-        style?: React.CSSProperties;
-        zDepth?: number;
-    }
-    export class FloatingActionButton extends React.Component<FloatingActionButtonProps, {}> {
-    }
-
-    interface IconButtonProps extends React.HTMLAttributes, SharedEnhancedButtonProps<IconButton> {
-        // <EnhancedButton/> is the element that get the 'other' properties
-        className?: string;
-        disableTouchRipple?: boolean;
-        disabled?: boolean;
-        iconClassName?: string;
-        iconStyle?: React.CSSProperties;
-        onBlur?: React.FocusEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        onMouseOut?: React.MouseEventHandler;
-        style?: React.CSSProperties;
-        tooltip?: React.ReactNode | string;
-        tooltipPosition?: propTypes.cornersAndCenter;
-        tooltipStyles?: React.CSSProperties;
-        touch?: boolean;
-    }
-    export class IconButton extends React.Component<IconButtonProps, {}> {
-    }
-
-    namespace Card {
-
-        interface CardProps {
-            className?: string;
-            actAsExpander?: boolean;
-            containerStyle?: React.CSSProperties;
-            expandable?: boolean;
-            expanded?: boolean;
-            initiallyExpanded?: boolean;
-            onExpandChange?: (isExpanded: boolean) => void;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class Card extends React.Component<CardProps, {}> {
-        }
-
-        interface CardActionsProps {
-            actAsExpander?: boolean;
-            expandable?: boolean;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class CardActions extends React.Component<CardActionsProps, {}> {
-        }
-
-        interface CardExpandableProps {
-            expanded?: boolean;
-            onExpanding?: (isExpanded: boolean) => void;
-            style?: React.CSSProperties;
-        }
-        export class CardExpandable extends React.Component<CardExpandableProps, {}> {
-        }
-
-        interface CardHeaderProps {
-            actAsExpander?: boolean;
-            avatar?: React.ReactNode;
-            expandable?: boolean;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-            subtitle?: React.ReactNode;
-            subtitleColor?: string;
-            subtitleStyle?: React.CSSProperties;
-            textStyle?: React.CSSProperties;
-            title?: React.ReactNode;
-            titleColor?: string;
-            titleStyle?: React.CSSProperties;
-        }
-        export class CardHeader extends React.Component<CardHeaderProps, {}> {
-        }
-
-        interface CardMediaProps {
-            actAsExpander?: boolean;
-            expandable?: boolean;
-            mediaStyle?: React.CSSProperties;
-            overlay?: React.ReactNode;
-            overlayContainerStyle?: React.CSSProperties;
-            overlayContentStyle?: React.CSSProperties;
-            overlayStyle?: React.CSSProperties;
-            style?: React.CSSProperties;
-        }
-        export class CardMedia extends React.Component<CardMediaProps, {}> {
-        }
-
-        interface CardTextProps {
-            actAsExpander?: boolean;
-            color?: string;
-            expandable?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class CardText extends React.Component<CardTextProps, {}> {
-        }
-
-        interface CardTitleProps {
-            actAsExpander?: boolean;
-            expandable?: boolean;
-            showExpandableButton?: boolean;
-            style?: React.CSSProperties;
-            subtitle?: React.ReactNode;
-            subtitleColor?: string;
-            subtitleStyle?: React.CSSProperties;
-            title?: React.ReactNode;
-            titleColor?: string;
-            titleStyle?: React.CSSProperties;
-        }
-        export class CardTitle extends React.Component<CardTitleProps, {}> {
-        }
-    }
-
-    interface ChipProps {
-        backgroundColor?: string;
-        className?: string;
-        labelColor?: string;
-        labelStyle?: React.CSSProperties;
-        onRequestDelete?: React.TouchEventHandler;
-        onTouchTap?: React.TouchEventHandler;
-        style?: React.CSSProperties;
-    }
-    export class Chip extends React.Component<ChipProps, {}> {
-    }
-
-    namespace DatePicker {
-        interface DatePickerProps {
-            // <TextField/> is the element that get the 'other' properties
-            DateTimeFormat?: Intl.DateTimeFormat;
-            autoOk?: boolean;
-            cancelLabel?: React.ReactNode;
-            container?: "dialog" | "inline";
-            defaultDate?: Date;
-            dialogContainerStyle?: React.CSSProperties;
-            disableYearSelection?: boolean;
-            disabled?: boolean;
-            firstDayOfWeek?: number;
-            formatDate?: (date: Date) => string;
-            locale?: string;
-            maxDate?: Date;
-            minDate?: Date;
-            mode?: "portrait" | "landscape";
-            okLabel?: React.ReactNode;
-            onChange?: (e: any, date: Date) => void; // e is always null
-            onDismiss?: () => void;
-            onFocus?: React.FocusEventHandler;
-            onShow?: () => void;
-            onTouchTap?: React.TouchEventHandler;
-            shouldDisableDate?: (day: Date) => boolean;
-            style?: React.CSSProperties;
-            textFieldStyle?: React.CSSProperties;
-            value?: Date;
-
-            // From <TextField />
-            className?: string;
-            defaultValue?: string;
-            errorStyle?: React.CSSProperties;
-            errorText?: React.ReactNode;
-            floatingLabelStyle?: React.CSSProperties;
-            floatingLabelText?: React.ReactNode;
-            fullWidth?: boolean;
-            hintStyle?: React.CSSProperties;
-            hintText?: React.ReactNode;
-            id?: string;
-            inputStyle?: React.CSSProperties;
-            name?: string;
-            onBlur?: React.FocusEventHandler;
-            onKeyDown?: React.KeyboardEventHandler;
-            type?: string;
-            underlineDisabledStyle?: React.CSSProperties;
-            underlineFocusStyle?: React.CSSProperties;
-            underlineShow?: boolean;
-            underlineStyle?: React.CSSProperties;
-        }
-        export class DatePicker extends React.Component<DatePickerProps, {}> {
-        }
-
-        interface DatePickerDialogProps {
-            // <Container/> is the element that get the 'other' properties
-            DateTimeFormat?: Intl.DateTimeFormat;
-            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
-            autoOk?: boolean;
-            cancelLabel?: React.ReactNode;
-            container?: "dialog" | "inline";
-            disableYearSelection?: boolean;
-            firstDayOfWeek?: number;
-            initialDate?: Date;
-            locale?: string;
-            maxDate?: Date;
-            minDate?: Date;
-            mode?: "portrait" | "landscape";
-            okLabel?: React.ReactNode;
-            onAccept?: (d: Date) => void;
-            onDismiss?: () => void;
-            onShow?: () => void;
-            shouldDisableDate?: (day: Date) => boolean;
-            style?: React.CSSProperties;
-        }
-        export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
-        }
-    }
-
-    interface DialogProps extends React.DOMAttributes {
-        actions?: React.ReactElement<any> | React.ReactElement<any>[];
-        actionsContainerClassName?: string;
-        actionsContainerStyle?: React.CSSProperties;
-        autoDetectWindowHeight?: boolean;
-        autoScrollBodyContent?: boolean;
-        bodyClassName?: string;
-        bodyStyle?: React.CSSProperties;
-        className?: string;
-        contentClassName?: string;
-        contentStyle?: React.CSSProperties;
-        modal?: boolean;
-        onRequestClose?: (buttonClicked: boolean) => void;
-        open: boolean;
-        overlayClassName?: string;
-        overlayStyle?: React.CSSProperties;
-        repositionOnUpdate?: boolean;
-        style?: React.CSSProperties;
-        title?: React.ReactNode;
-        titleClassName?: string;
-        titleStyle?: React.CSSProperties;
-    }
-    export class Dialog extends React.Component<DialogProps, {}> {
-    }
-
-    interface DividerProps {
-        className?: string;
-        inset?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class Divider extends React.Component<DividerProps, {}> {
-    }
-
-    interface DrawerProps {
-        className?: string;
-        containerClassName?: string;
-        containerStyle?: React.CSSProperties;
-        disableSwipeToOpen?: boolean;
-        docked?: boolean;
-        onRequestChange?: (opening: boolean, reason: string) => void;
-        open?: boolean;
-        openSecondary?: Boolean;
-        overlayClassName?: string;
-        overlayStyle?: React.CSSProperties;
-        style?: React.CSSProperties;
-        swipeAreaWidth?: number;
-        width?: number;
-        zDepth?: number;
-    }
-    export class Drawer extends React.Component<DrawerProps, {}> {
-    }
-
-    namespace GridList {
-        interface GridListProps {
-            cellHeight?: number;
-            cols?: number;
-            padding?: number;
-            style?: React.CSSProperties;
-        }
-        export class GridList extends React.Component<GridListProps, {}> {
-        }
-
-        interface GridTileProps {
-            actionIcon?: React.ReactElement<any>;
-            actionPosition?: "left" | "right";
-            cols?: number;
-            containerElement?: string | React.ReactElement<any> | React.ComponentClass<any>;
-            rows?: number;
-            style?: React.CSSProperties;
-            subtitle?: React.ReactNode;
-            title?: React.ReactNode;
-            titleBackground?: string;
-            titlePosition?: "top" | "bottom";
-        }
-        export class GridTile extends React.Component<GridTileProps, {}> {
-        }
-    }
-
-    interface FontIconProps extends React.HTMLAttributes {
-        // <span/> is the element that get the 'other' properties
-        color?: string;
-        hoverColor?: string;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        style?: React.CSSProperties;
-    }
-    export class FontIcon extends React.Component<FontIconProps, {}> {
-    }
-
-    interface SvgIconProps extends React.SVGAttributes {
-        // <svg/> is the element that get the 'other' properties
-        color?: string;
-        hoverColor?: string;
-        onMouseEnter?: React.MouseEventHandler;
-        onMouseLeave?: React.MouseEventHandler;
-        style?: React.CSSProperties;
-        viewBox?: string;
-    }
-    export class SvgIcon extends React.Component<SvgIconProps, {}> {
-    }
-
-    namespace List {
-        interface ListProps {
-            // <Paper/> is the element that get the 'other' properties
-            style?: React.CSSProperties;
-        }
-        export class List extends React.Component<ListProps, {}> {
-        }
-
-        interface ListItemProps extends React.HTMLAttributes {
-            // <EnhancedButton/> is the element that get the 'other' properties
-            autoGenerateNestedIndicator?: boolean;
-            disableKeyboardFocus?: boolean;
-            disabled?: boolean;
-            initiallyOpen?: boolean;
-            innerDivStyle?: React.CSSProperties;
-            insetChildren?: boolean;
-            leftAvatar?: React.ReactElement<any>;
-            leftCheckbox?: React.ReactElement<any>;
-            leftIcon?: React.ReactElement<any>;
-            nestedItems?: React.ReactElement<ListItemProps>[];
-            nestedLevel?: number;
-            nestedListStyle?: React.CSSProperties;
-            onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-            onMouseEnter?: React.MouseEventHandler;
-            onMouseLeave?: React.MouseEventHandler;
-            onNestedListToggle?: (item: ListItem) => void;
-            onTouchStart?: React.TouchEventHandler;
-            onTouchTap?: TouchTapEventHandler;
-            open?: boolean;
-            primaryText?: React.ReactNode;
-            primaryTogglesNestedList?: boolean;
-            rightAvatar?: React.ReactElement<any>;
-            rightIcon?: React.ReactElement<any>;
-            rightIconButton?: React.ReactElement<any>;
-            rightToggle?: React.ReactElement<any>;
-            secondaryText?: React.ReactNode;
-            secondaryTextLines?: number; // 1 or 2
-            style?: React.CSSProperties;
-        }
-        export class ListItem extends React.Component<ListItemProps, {}> {
-        }
-
-        interface SelectableProps {
-            onChange?: (e: TouchTapEvent, value: any) => void;
-            selectedItemStyle?: React.CSSProperties;
-            value?: any;
-        }
-
-        // union types for higher order components in TypeScript 1.8: https://github.com/Microsoft/TypeScript/issues/4362
-        export function makeSelectable<P extends {}>(component: React.ComponentClass<P>): React.ComponentClass<P & SelectableProps>;
-    }
-
-    namespace Menus {
-        interface MenuProps {
-            // <List/> is the element that get the 'other' properties
-            autoWidth?: boolean;
-            desktop?: boolean;
-            disableAutoFocus?: boolean;
-            initiallyKeyboardFocused?: boolean;
-            listStyle?: React.CSSProperties;
-            maxHeight?: number;
-            multiple?: boolean;
-            onChange?: (e: TouchTapEvent, itemValue: any | any[]) => void;
-            onEscKeyDown?: React.KeyboardEventHandler;
-            onItemTouchTap?: (e: TouchTapEvent, item: MenuItem) => void;
-            onKeyDown?: React.KeyboardEventHandler;
-            selectedMenuItemStyle?: React.CSSProperties;
-            style?: React.CSSProperties;
-            value?: any | any[];
-            valueLink?: ReactLink<any | any[]>;
-            width?: string | number;
-        }
-        export class Menu extends React.Component<MenuProps, {}> {
-        }
-
-        interface MenuItemProps extends React.HTMLAttributes {
-            // <ListItem/> is the element that get the 'other' properties
-            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
-            checked?: boolean;
-            desktop?: boolean;
-            disabled?: boolean;
-            focusState?: string; // 'none', 'focused', or 'keyboard-focused'
-            innerDivStyle?: React.CSSProperties;
-            insetChildren?: boolean;
-            leftIcon?: React.ReactElement<any>;
-            menuItems?: React.ReactNode;
-            onTouchTap?: TouchTapEventHandler;
-            primaryText?: React.ReactNode;
-            rightIcon?: React.ReactElement<any>;
-            secondaryText?: React.ReactNode;
-            style?: React.CSSProperties;
-            value?: any;
-        }
-        export class MenuItem extends React.Component<MenuItemProps, {}> {
-        }
-
-        interface IconMenuProps {
-            // <Menu/> is the element that get the 'other' properties
-            anchorOrigin?: propTypes.origin;
-            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
-            className?: string;
-            iconButtonElement: React.ReactElement<IconButtonProps>;
-            iconStyle?: React.CSSProperties;
-            menuStyle?: React.CSSProperties;
-            onItemTouchTap?: (e: TouchTapEvent, item: MenuItem) => void;
-            onKeyboardFocus?: (e: React.FocusEvent, isKeyboardFocused: boolean) => void;
-            onMouseDown?: React.MouseEventHandler;
-            onMouseEnter?: React.MouseEventHandler;
-            onMouseLeave?: React.MouseEventHandler;
-            onMouseUp?: React.MouseEventHandler;
-            onRequestChange?: (opening: boolean, reason: string) => void;
-            onTouchTap?: TouchTapEventHandler;
-            open?: boolean;
-            style?: React.CSSProperties;
-            targetOrigin?: propTypes.origin;
-            touchTapCloseDelay?: number;
-            useLayerForClickAway?: boolean;
-
-            animated?: boolean;
-            autoWidth?: boolean;
-            desktop?: boolean;
-            listStyle?: React.CSSProperties;
-            maxHeight?: number;
-            multiple?: boolean;
-            onChange?: (e: TouchTapEvent, itemValue: any | any[]) => void;
-            onKeyDown?: React.KeyboardEventHandler;
-            selectedMenuItemStyle?: React.CSSProperties;
-            value?: any | any[];
-            valueLink?: ReactLink<any | any[]>;
-            width?: string | number;
-        }
-        export class IconMenu extends React.Component<IconMenuProps, {}> {
-        }
-
-        interface DropDownMenuProps {
-            // <div/> is the element that gets the 'other' properties
-            animated?: boolean;
-            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
-            autoWidth?: boolean;
-            className?: string;
-            disabled?: boolean;
-            iconStyle?: React.CSSProperties;
-            labelStyle?: React.CSSProperties;
-            listStyle?: React.CSSProperties;
-            maxHeight?: number;
-            menuStyle?: React.CSSProperties;
-            onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
-            openImmediately?: boolean;
-            style?: React.CSSProperties;
-            underlineStyle?: React.CSSProperties;
-            value?: any;
-        }
-        export class DropDownMenu extends React.Component<DropDownMenuProps, {}> {
-        }
-    }
-
-    interface PaperProps extends React.HTMLAttributes {
-        circle?: boolean;
-        rounded?: boolean;
-        style?: React.CSSProperties;
-        transitionEnabled?: boolean;
-        zDepth?: number;
-    }
-    export class Paper extends React.Component<PaperProps, {}> {
-    }
-
-    namespace Popover {
-        interface PopoverAnimationProps {
-            open: boolean;
-            style?: React.CSSProperties;
-        }
-
-        interface PopoverProps {
-            anchorEl?: React.ReactInstance;
-            anchorOrigin?: propTypes.origin;
-            animated?: boolean;
-            animation?: React.ComponentClass<PopoverAnimationProps>;
-            autoCloseWhenOffScreen?: boolean;
-            canAutoPosition?: boolean;
-            className?: string;
-            onRequestClose?: (reason: string) => void;
-            open?: boolean;
-            style?: React.CSSProperties;
-            targetOrigin?: propTypes.origin;
-            useLayerForClickAway?: boolean;
-            zDepth?: number;
-        }
-        export class Popover extends React.Component<PopoverProps, {}> {
-        }
-
-        interface PopoverAnimationVerticalProps extends PopoverAnimationProps {
-            className?: string;
-            targetOrigin?: propTypes.origin;
-            zDepth?: number;
-        }
-        export class PopoverAnimationVertical extends React.Component<PopoverAnimationVerticalProps, {}> {
-        }
-
-        interface PopoverAnimationDefaultProps extends PopoverAnimationProps {
-            className?: string;
-            targetOrigin?: propTypes.origin;
-            zDepth?: number;
-        }
-        export class PopoverAnimationDefault extends React.Component<PopoverAnimationDefaultProps, {}> {
-        }
-    }
-
-    interface CircularProgressProps {
-        color?: string;
-        innerStyle?: React.CSSProperties;
-        max?: number;
-        min?: number;
-        mode?: "determinate" | "indeterminate";
-        size?: number;
-        style?: React.CSSProperties;
-        thickness?: number;
-        value?: number;
-    }
-    export class CircularProgress extends React.Component<CircularProgressProps, {}> {
-    }
-
-    interface LinearProgressProps {
-        color?: string;
-        max?: number;
-        min?: number;
-        mode?: "determinate" | "indeterminate";
-        style?: React.CSSProperties;
-        value?: number;
-    }
-    export class LinearProgress extends React.Component<LinearProgressProps, {}> {
-    }
-
-    interface RefreshIndicatorProps {
-        color?: string;
-        left: number;
-        loadingColor?: string;
-        percentage?: number;
-        size?: number;
-        status?: "ready" | "loading" | "hide";
-        style?: React.CSSProperties;
-        top: number;
-    }
-    export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
-    }
-
-    interface SelectFieldProps {
-        // <DropDownMenu/> is the element that get the 'other' properties
-        autoWidth?: boolean;
-        disabled?: boolean;
-        errorStyle?: React.CSSProperties;
-        errorText?: React.ReactNode;
-        floatingLabelFixed?: boolean;
-        floatingLabelStyle?: React.CSSProperties;
-        floatingLabelText?: React.ReactNode;
-        fullWidth?: boolean;
-        hintStyle?: React.CSSProperties;
-        hintText?: React.ReactNode;
-        iconStyle?: React.CSSProperties;
-        id?: string;
-        labelStyle?: React.CSSProperties;
-        maxHeight?: number;
-        menuStyle?: any;
-        onBlur?: React.FocusEventHandler;
-        onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
-        onFocus?: React.FocusEventHandler;
-        style?: React.CSSProperties;
-        underlineDisabledStyle?: React.CSSProperties;
-        underlineFocusStyle?: React.CSSProperties;
-        underlineStyle?: React.CSSProperties;
-        value?: any;
-    }
-    export class SelectField extends React.Component<SelectFieldProps, {}> {
-    }
-
-    interface SliderProps {
-        axis?: 'x' | 'x-reverse' | 'y' | 'y-reverse';
-        defaultValue?: number;
-        description?: string;
-        disableFocusRipple?: boolean;
-        disabled?: boolean;
-        error?: string;
-        max?: number;
-        min?: number;
-        name?: string;
-        onBlur?: React.FocusEventHandler;
-        onChange?: (e: React.MouseEvent, value: number) => void;
-        onDragStart?: React.MouseEventHandler;
-        onDragStop?: React.MouseEventHandler;
-        onFocus?: React.FocusEventHandler;
-        required?: boolean;
-        sliderStyle?: React.CSSProperties,
-        step?: number;
-        style?: React.CSSProperties;
-        value?: number;
-    }
-    export class Slider extends React.Component<SliderProps, {}> {
-    }
-
-    namespace Switches {
-
-        // what's not commonly overridden by Checkbox, RadioButton, or Toggle
-        interface CommonEnhancedSwitchProps<T> extends React.HTMLAttributes {
-        }
-
-        interface CheckboxProps extends CommonEnhancedSwitchProps<Checkbox> {
-            // <EnhancedSwitch/> is element that get the 'other' properties
-            checked?: boolean;
-            checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-            defaultChecked?: boolean;
-            disabled?: boolean;
-            iconStyle?: React.CSSProperties;
-            labelPosition?: "left" | "right";
-            labelStyle?: React.CSSProperties;
-            onCheck?: (event: React.MouseEvent, checked: boolean) => void;
-            style?: React.CSSProperties;
-            uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-            valueLink?: ReactLink<boolean>;
-        }
-        export class Checkbox extends React.Component<CheckboxProps, {}> {
-            /** @deprecated Use checked property instead */
-            isChecked(): void;
-
-            /** @deprecated Use checked property instead */
-            setChecked(newCheckedValue: boolean): void;
-        }
-
-        interface RadioButtonProps extends CommonEnhancedSwitchProps<RadioButton> {
-            // <EnhancedSwitch/> is element that get the 'other' properties
-            checkedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-            disabled?: boolean;
-            iconStyle?: React.CSSProperties;
-            inputStyle?: React.CSSProperties;
-            labelStyle?: React.CSSProperties;
-            style?: React.CSSProperties;
-            uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-            value?: any;
-        }
-        export class RadioButton extends React.Component<RadioButtonProps, {}> {
-            isChecked(): boolean;
-
-            getValue(): string;
-        }
-
-        interface RadioButtonGroupProps {
-            className?: string;
-            defaultSelected?: any;
-            labelPosition?: "left" | "right";
-            name: string;
-            onChange?: (e: React.FormEvent, selected: string) => void;
-            style?: React.CSSProperties;
-            valueSelected?: any;
-        }
-        export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
-            clearValue(): void;
-
-            getSelectedValue(): string;
-
-            setSelectedValue(newSelectionValue: string): void;
-        }
-
-        interface ToggleProps extends CommonEnhancedSwitchProps<Toggle> {
-            // <EnhancedSwitch/> is element that get the 'other' properties
-            defaultToggled?: boolean;
-            disabled?: boolean;
-            elementStyle?: React.CSSProperties;
-            iconStyle?: React.CSSProperties;
-            inputStyle?: React.CSSProperties;
-            label?: string;
-            labelPosition?: "left" | "right";
-            labelStyle?: React.CSSProperties;
-            onToggle?: (e: React.MouseEvent, isInputChecked: boolean) => void;
-            rippleStyle?: React.CSSProperties;
-            style?: React.CSSProperties;
-            thumbStyle?: React.CSSProperties;
-            thumbSwitchedStyle?: React.CSSProperties;
-            trackSwitchedStyle?: React.CSSProperties;
-            toggled?: boolean;
-            trackStyle?: React.CSSProperties;
-            valueLink?: ReactLink<boolean>;
-        }
-        export class Toggle extends React.Component<ToggleProps, {}> {
-            isToggled(): boolean;
-
-            setToggled(newToggledValue: boolean): void;
-        }
-    }
-
-    interface SnackbarProps {
-        action?: React.ReactNode;
-        autoHideDuration?: number;
-        bodyStyle?: React.CSSProperties;
-        className?: string;
-        contentStyle?: React.CSSProperties;
-        message: React.ReactNode;
-        onActionTouchTap?: React.TouchEventHandler;
-        onRequestClose: (reason: string) => void;
-        open: boolean;
-        style?: React.CSSProperties;
-    }
-    export class Snackbar extends React.Component<SnackbarProps, {}> {
-    }
-
-    namespace Stepper {
-        interface StepProps {
-            active?: boolean;
-            completed?: boolean;
-            disabled?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class Step extends React.Component<StepProps, {}> {
-        }
-
-        interface StepButtonProps extends SharedEnhancedButtonProps<StepButton> {
-            active?: boolean;
-            completed?: boolean;
-            disabled?: boolean;
-            icon?: React.ReactNode | string | number;
-            onMouseEnter?: React.MouseEventHandler;
-            onMouseLeave?: React.MouseEventHandler;
-            onTouchStart?: React.TouchEventHandler;
-            style?: React.CSSProperties;
-        }
-        export class StepButton extends React.Component<StepButtonProps, {}> {
-        }
-
-        interface StepContentProps {
-            active?: boolean;
-            last?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class StepContent extends React.Component<StepContentProps, {}> {
-        }
-
-        interface StepLabelProps {
-            active?: boolean;
-            completed?: boolean;
-            disabled?: boolean;
-            icon?: React.ReactNode | string | number;
-            style?: React.CSSProperties;
-        }
-        export class StepLabel extends React.Component<StepLabelProps, {}> {
-        }
-
-        interface StepperProps {
-            activeStep?: number;
-            linear?: boolean;
-            orientation?: "horizontal" | "vertical";
-            style?: React.CSSProperties;
-        }
-        export class Stepper extends React.Component<StepperProps, {}> {
-        }
-    }
-
-    interface SubheaderProps {
-        inset?: boolean;
-        style?: React.CSSProperties;
-    }
-    export class Subheader extends React.Component<SubheaderProps, {}> {
-    }
-
-    namespace Table {
-        interface TableProps {
-            allRowsSelected?: boolean;
-            bodyStyle?: React.CSSProperties;
-            className?: string;
-            fixedFooter?: boolean;
-            fixedHeader?: boolean;
-            footerStyle?: React.CSSProperties;
-            headerStyle?: React.CSSProperties;
-            height?: string;
-            multiSelectable?: boolean;
-            onCellClick?: (row: number, column: number) => void;
-            onCellHover?: (row: number, column: number) => void;
-            onCellHoverExit?: (row: number, column: number) => void;
-            onRowHover?: (row: number) => void;
-            onRowHoverExit?: (row: number) => void;
-            onRowSelection?: (selectedRows: number[] | string) => void;
-            selectable?: boolean;
-            style?: React.CSSProperties;
-            wrapperStyle?: React.CSSProperties;
-        }
-        export class Table extends React.Component<TableProps, {}> {
-        }
-
-        interface TableRowProps {
-            // <tr/> is element that get the 'other' properties
-            className?: string;
-            displayBorder?: boolean;
-            hoverable?: boolean;
-            hovered?: boolean;
-            /** @deprecated Instead, use event handler on Table */
-            onCellClick?: (e: React.MouseEvent, row: number, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onCellHover?: (e: React.MouseEvent, row: number, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onCellHoverExit?: (e: React.MouseEvent, row: number, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onRowClick?: (e: React.MouseEvent, row: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onRowHover?: (e: React.MouseEvent, row: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onRowHoverExit?: (e: React.MouseEvent, row: number) => void;
-            rowNumber?: number;
-            selectable?: boolean;
-            selected?: boolean;
-            striped?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class TableRow extends React.Component<TableRowProps, {}> {
-        }
-
-        interface TableRowColumnProps {
-            // <td/> is element that get the 'other' properties
-            className?: string;
-            columnNumber?: number;
-            hoverable?: boolean;
-            key?: string;
-            /** @deprecated Instead, use event handler on Table */
-            onClick?: (e: React.MouseEvent, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onHover?: (e: React.MouseEvent, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onHoverExit?: (e: React.MouseEvent, column: number) => void;
-            style?: React.CSSProperties;
-
-            // useful attributes passed to <td/>
-            colSpan?: number;
-        }
-        export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
-        }
-
-        interface TableHeaderProps {
-            adjustForCheckbox?: boolean;
-            className?: string;
-            displaySelectAll?: boolean;
-            enableSelectAll?: boolean;
-            /** @deprecated Instead, use event handler on Table */
-            onSelectAll?: (checked: boolean) => void;
-            /** @deprecated Instead, use event handler on Table */
-            selectAllSelected?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class TableHeader extends React.Component<TableHeaderProps, {}> {
-        }
-
-        interface TableHeaderColumnProps {
-            // <th/> is element that get the 'other' properties
-            className?: string;
-            columnNumber?: number;
-            onClick?: (e: React.MouseEvent, column: number) => void;
-            style?: React.CSSProperties;
-            tooltip?: string;
-            tooltipStyle?: React.CSSProperties;
-
-            // useful attributes passed to <th/>
-            colSpan?: number;
-        }
-        export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
-        }
-
-        interface TableBodyProps {
-            /** @deprecated Instead, use property on Table */
-            allRowsSelected?: boolean;
-            className?: string;
-            deselectOnClickaway?: boolean;
-            displayRowCheckbox?: boolean;
-            /** @deprecated Instead, use property on Table */
-            multiSelectable?: boolean;
-            /** @deprecated Instead, use event handler on Table */
-            onCellClick?: (row: number, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onCellHover?: (row: number, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onCellHoverExit?: (row: number, column: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onRowHover?: (row: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onRowHoverExit?: (row: number) => void;
-            /** @deprecated Instead, use event handler on Table */
-            onRowSelection?: (selectedRows: number[] | string) => void;
-            preScanRows?: boolean;
-            /** @deprecated Instead, use property on Table */
-            selectable?: boolean;
-            showRowHover?: boolean;
-            stripedRows?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class TableBody extends React.Component<TableBodyProps, {}> {
-        }
-
-        interface TableFooterProps {
-            // <tfoot/> is element that get the 'other' properties
-            adjustForCheckbox?: boolean;
-            className?: string;
-            style?: React.CSSProperties;
-        }
-        export class TableFooter extends React.Component<TableFooterProps, {}> {
-        }
-    }
-
-    namespace Tabs {
-        interface TabsProps {
-            className?: string;
-            contentContainerClassName?: string;
-            contentContainerStyle?: React.CSSProperties;
-            initialSelectedIndex?: number;
-            inkBarStyle?: React.CSSProperties;
-            onChange?: (value: any, e: React.FormEvent, tab: Tab) => void;
-            style?: React.CSSProperties;
-            tabItemContainerStyle?: React.CSSProperties;
-            tabTemplate?: React.ComponentClass<any>;
-            value?: any;
-        }
-        export class Tabs extends React.Component<TabsProps, {}> {
-        }
-
-        interface TabProps extends SharedEnhancedButtonProps<Tab> {
-            className?: string;
-            icon?: React.ReactNode;
-            label?: React.ReactNode;
-            onActive?: (tab: Tab) => void;
-            style?: React.CSSProperties;
-            value?: any;
-            disabled?: boolean;
-        }
-        export class Tab extends React.Component<
-            TabProps, {}> {
-        }
-    }
-
-    interface TextFieldProps {
-        className?: string;
-        defaultValue?: string | number;
-        disabled?: boolean;
-        errorStyle?: React.CSSProperties;
-        errorText?: React.ReactNode;
-        floatingLabelFixed?: boolean;
-        floatingLabelFocusStyle?: React.CSSProperties;
-        floatingLabelStyle?: React.CSSProperties;
-        floatingLabelText?: React.ReactNode;
-        fullWidth?: boolean;
-        hintStyle?: React.CSSProperties;
-        hintText?: React.ReactNode;
-        id?: string;
-        inputStyle?: React.CSSProperties;
-        multiLine?: boolean;
-        name?: string;
-        onBlur?: React.FocusEventHandler;
-        onChange?: React.FormEventHandler;
-        onFocus?: React.FocusEventHandler;
-        onKeyDown?: React.KeyboardEventHandler;
-        rows?: number,
-        rowsMax?: number,
-        style?: React.CSSProperties;
-        textareaStyle?: React.CSSProperties;
-        type?: string;
-        underlineDisabledStyle?: React.CSSProperties;
-        underlineFocusStyle?: React.CSSProperties;
-        underlineShow?: boolean;
-        underlineStyle?: React.CSSProperties;
-        value?: string | number;
-    }
-    export class TextField extends React.Component<TextFieldProps, {}> {
-        blur(): void;
-
-        focus(): void;
-
-        select(): void;
-
-        getValue(): string;
-
-        getInputNode(): HTMLInputElement;
-    }
-
-    interface TimePickerProps {
-        // <TextField/> is element that get the 'other' properties
-        autoOk?: boolean;
-        cancelLabel?: React.ReactNode;
-        defaultTime?: Date;
-        dialogBodyStyle?: React.CSSProperties;
-        dialogStyle?: React.CSSProperties;
-        disabled?: boolean;
-        format?: "ampm" | "24hr";
-        okLabel?: React.ReactNode;
-        onChange?: (e: any, time: Date) => void;
-        onDismiss?: () => void;
-        onFocus?: React.FocusEventHandler;
-        onShow?: () => void;
-        onTouchTap?: TouchTapEventHandler;
-        pedantic?: boolean;
-        style?: React.CSSProperties;
-        textFieldStyle?: React.CSSProperties;
-        value?: Date;
-
-        // From <TextField />
-        className?: string;
-        defaultValue?: string | number;
-        errorStyle?: React.CSSProperties;
-        errorText?: React.ReactNode;
-        floatingLabelFixed?: boolean;
-        floatingLabelFocusStyle?: React.CSSProperties;
-        floatingLabelStyle?: React.CSSProperties;
-        floatingLabelText?: React.ReactNode;
-        fullWidth?: boolean;
-        hintStyle?: React.CSSProperties;
-        hintText?: React.ReactNode;
-        id?: string;
-        inputStyle?: React.CSSProperties;
-        multiLine?: boolean;
-        name?: string;
-        onBlur?: React.FocusEventHandler;
-        onKeyDown?: React.KeyboardEventHandler;
-        rows?: number,
-        rowsMax?: number,
-        textareaStyle?: React.CSSProperties;
-        type?: string;
-        underlineDisabledStyle?: React.CSSProperties;
-        underlineFocusStyle?: React.CSSProperties;
-        underlineShow?: boolean;
-        underlineStyle?: React.CSSProperties;
-    }
-    export class TimePicker extends React.Component<TimePickerProps, {}> {
-        focus(): void;
-
-        openDialog(): void;
-    }
-
-    namespace Toolbar {
-        interface ToolbarProps {
-            className?: string;
-            noGutter?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class Toolbar extends React.Component<ToolbarProps, {}> {
-        }
-
-        interface ToolbarGroupProps {
-            className?: string;
-            firstChild?: boolean;
-            float?: "left" | "right";
-            lastChild?: boolean;
-            style?: React.CSSProperties;
-        }
-        export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
-        }
-
-        interface ToolbarSeparatorProps {
-            className?: string;
-            style?: React.CSSProperties;
-        }
-        export class ToolbarSeparator extends React.Component<ToolbarSeparatorProps, {}> {
-        }
-
-        interface ToolbarTitleProps extends React.HTMLAttributes {
-            className?: string;
-            style?: React.CSSProperties;
-            text?: string;
-        }
-        export class ToolbarTitle extends React.Component<ToolbarTitleProps, {}> {
-        }
-    }
-
-    export namespace Utils {
-        export namespace ColorManipulator {
-            interface MuiColorObject {
-                type: string;
-                values: number[];
-            }
-            function convertColorToString(color: any): string;
-
-            function convertHexToRGB(color: string): string;
-
-            function decomposeColor(color: string): MuiColorObject;
-
-            function getContrastRatio(foreground: string, background: string): number;
-
-            function getLuminance(color: string): number;
-
-            function emphasize(color: string, coefficient?: number): string;
-
-            function fade(color: string, value: number): string;
-
-            function darken(color: string, coefficient: number): string;
-
-            function lighten(color: string, coefficient: number): string;
-        }
-
-        interface Dom {
-            addClass(el: Element, className: string): void;
-            forceRedraw(el: HTMLElement): void;
-            getStyleAttributeAsNumber(el: HTMLElement, attr: string): number;
-            hasClass(el: Element, className: string): boolean;
-            isDescendant(parent: Node, child: Node): boolean;
-            offset(el: Element): { top: number, left: number };
-            removeClass(el: Element, className: string): void;
-            toggleClass(el: Element, className: string): void;
-            withoutTransition(el: HTMLElement, callback: () => void): void;
-        }
-        export var Dom: Dom;
-
-        interface Events {
-            isKeyboard(e: Event): boolean;
-            off(el: Element, type: string, callback: EventListener): void;
-            on(el: Element, type: string, callback: EventListener): void;
-            once(el: Element, type: string, callback: EventListener): void;
-        }
-        export var Events: Events;
-    }
-}    // __MaterialUI
-
-declare module 'material-ui/AppBar' {
-    export import AppBar = __MaterialUI.AppBar;
-    export default AppBar;
-}
-
-declare module 'material-ui/AutoComplete' {
-    export import AutoComplete = __MaterialUI.AutoComplete;
-    export default AutoComplete;
-}
-
-declare module 'material-ui/Avatar' {
-    export import Avatar = __MaterialUI.Avatar;
-    export default Avatar;
-}
-
-declare module "material-ui/Badge" {
-    export import Badge = __MaterialUI.Badge;
-    export default Badge;
-}
-
-declare module 'material-ui/Card' {
-    export import Card = __MaterialUI.Card.Card;
-    export import CardActions = __MaterialUI.Card.CardActions;
-    export import CardExpandable = __MaterialUI.Card.CardExpandable;
-    export import CardHeader = __MaterialUI.Card.CardHeader;
-    export import CardMedia = __MaterialUI.Card.CardMedia;
-    export import CardText = __MaterialUI.Card.CardText;
-    export import CardTitle = __MaterialUI.Card.CardTitle;
-    export default Card;
-}
-
-declare module 'material-ui/Card/Card' {
-    export import Card = __MaterialUI.Card.Card;
-    export default Card;
-}
-
-declare module 'material-ui/Card/CardActions' {
-    export import CardActions = __MaterialUI.Card.CardActions;
-    export default CardActions;
-}
-
-declare module 'material-ui/Card/CardExpandable' {
-    export import CardExpandable = __MaterialUI.Card.CardExpandable;
-    export default CardExpandable;
-}
-
-declare module 'material-ui/Card/CardHeader' {
-    export import CardHeader = __MaterialUI.Card.CardHeader;
-    export default CardHeader;
-}
-
-declare module 'material-ui/Card/CardMedia' {
-    export import CardMedia = __MaterialUI.Card.CardMedia;
-    export default CardMedia;
-}
-
-declare module 'material-ui/Card/CardText' {
-    export import CardText = __MaterialUI.Card.CardText;
-    export default CardText;
-}
-
-declare module 'material-ui/Card/CardTitle' {
-    export import CardTitle = __MaterialUI.Card.CardTitle;
-    export default CardTitle;
-}
-
-declare module 'material-ui/Checkbox' {
-    export import Checkbox = __MaterialUI.Switches.Checkbox;
-    export default Checkbox;
-}
-
-declare module 'material-ui/Chip' {
-    export import Chip = __MaterialUI.Chip;
-    export default Chip;
-}
-
-declare module 'material-ui/CircularProgress' {
-    export import CircularProgress = __MaterialUI.CircularProgress;
-    export default CircularProgress;
-}
-
-declare module 'material-ui/DatePicker' {
-    export import DatePicker = __MaterialUI.DatePicker.DatePicker;
-    export default DatePicker;
-}
-
-declare module 'material-ui/Dialog' {
-    export import Dialog = __MaterialUI.Dialog;
-    export default Dialog;
-}
-
-declare module "material-ui/Divider" {
-    export import Divider = __MaterialUI.Divider;
-    export default Divider;
-}
-
-declare module 'material-ui/Drawer' {
-    export import Drawer = __MaterialUI.Drawer;
-    export default Drawer;
-}
-
-declare module 'material-ui/DropDownMenu' {
-    export import DropDownMenu = __MaterialUI.Menus.DropDownMenu;
-    export default DropDownMenu;
-}
-
-declare module 'material-ui/FlatButton' {
-    export import FlatButton = __MaterialUI.FlatButton;
-    export default FlatButton;
-}
-
-declare module 'material-ui/FloatingActionButton' {
-    export import FloatingActionButton = __MaterialUI.FloatingActionButton;
-    export default FloatingActionButton;
-}
-
-declare module 'material-ui/FontIcon' {
-    export import FontIcon = __MaterialUI.FontIcon;
-    export default FontIcon;
-}
-
-declare module "material-ui/GridList" {
-    export import GridList = __MaterialUI.GridList.GridList;
-    export import GridTile = __MaterialUI.GridList.GridTile;
-    export default GridList;
-}
-
-declare module "material-ui/GridList/GridList" {
-    export import GridList = __MaterialUI.GridList.GridList;
-    export default GridList;
-}
-
-declare module "material-ui/GridList/GridTile" {
-    export import GridTile = __MaterialUI.GridList.GridTile;
-    export default GridTile;
-}
-
-declare module 'material-ui/IconButton' {
-    export import IconButton = __MaterialUI.IconButton;
-    export default IconButton;
-}
-
-declare module "material-ui/IconMenu" {
-    export import IconMenu = __MaterialUI.Menus.IconMenu;
-    export default IconMenu;
-}
-
-declare module 'material-ui/LinearProgress' {
-    export import LinearProgress = __MaterialUI.LinearProgress;
-    export default LinearProgress;
-}
-
-declare module 'material-ui/List' {
-    export import List = __MaterialUI.List.List;
-    export import ListItem = __MaterialUI.List.ListItem;
-    export import makeSelectable = __MaterialUI.List.makeSelectable;
-    export default List;
-}
-
-declare module 'material-ui/List/List' {
-    export import List = __MaterialUI.List.List;
-    export default List;
-}
-
-declare module 'material-ui/List/ListItem' {
-    export import ListItem = __MaterialUI.List.ListItem;
-    export default ListItem;
-}
-
-declare module 'material-ui/List/makeSelectable' {
-    export import makeSelectable = __MaterialUI.List.makeSelectable;
-    export default makeSelectable;
-}
-
-declare module "material-ui/Menu" {
-    export import Menu = __MaterialUI.Menus.Menu;
-    export import MenuItem = __MaterialUI.Menus.MenuItem;
-    export default Menu;
-}
-
-declare module "material-ui/MenuItem" {
-    export import MenuItem = __MaterialUI.Menus.MenuItem;
-    export default MenuItem;
-}
-
-declare module 'material-ui/Paper' {
-    export import Paper = __MaterialUI.Paper;
-    export default Paper;
-}
-
-declare module 'material-ui/Popover' {
-    export import Popover = __MaterialUI.Popover.Popover;
-    export import PopoverAnimationVertical = __MaterialUI.Popover.PopoverAnimationVertical;
-    export default Popover;
-}
-
-declare module 'material-ui/Popover/Popover' {
-    export import Popover = __MaterialUI.Popover.Popover;
-    export default Popover;
-}
-
-declare module 'material-ui/Popover/PopoverAnimationDefault' {
-    export import PopoverAnimationDefault = __MaterialUI.Popover.PopoverAnimationDefault;
-    export default PopoverAnimationDefault;
-}
-
-declare module 'material-ui/Popover/PopoverAnimationVertical' {
-    export import PopoverAnimationVertical = __MaterialUI.Popover.PopoverAnimationVertical;
-    export default PopoverAnimationVertical;
-}
-
-declare module 'material-ui/RadioButton' {
-    export import RadioButton = __MaterialUI.Switches.RadioButton;
-    export import RadioButtonGroup = __MaterialUI.Switches.RadioButtonGroup;
-    export default RadioButton;
-}
-
-declare module 'material-ui/RadioButton/RadioButtonGroup' {
-    export import RadioButtonGroup = __MaterialUI.Switches.RadioButtonGroup;
-    export default RadioButtonGroup;
-}
-
-declare module 'material-ui/RaisedButton' {
-    export import RaisedButton = __MaterialUI.RaisedButton;
-    export default RaisedButton;
-}
-
-declare module 'material-ui/RefreshIndicator' {
-    export import RefreshIndicator = __MaterialUI.RefreshIndicator;
-    export default RefreshIndicator;
-}
-
-declare module 'material-ui/SelectField' {
-    export import SelectField = __MaterialUI.SelectField;
-    export default SelectField;
-}
-
-declare module 'material-ui/Slider' {
-    export import Slider = __MaterialUI.Slider;
-    export default Slider;
-}
-
-declare module 'material-ui/Snackbar' {
-    export import Snackbar = __MaterialUI.Snackbar;
-    export default Snackbar;
-}
-
-declare module 'material-ui/Stepper' {
-    export import Step = __MaterialUI.Stepper.Step;
-    export import StepButton = __MaterialUI.Stepper.StepButton;
-    export import StepContent = __MaterialUI.Stepper.StepContent;
-    export import StepLabel = __MaterialUI.Stepper.StepLabel;
-    export import Stepper = __MaterialUI.Stepper.Stepper;
-}
-
-declare module 'material-ui/Subheader' {
-    export import Subheader = __MaterialUI.Subheader;
-    export default Subheader;
-}
-
-declare module 'material-ui/SvgIcon' {
-    export import SvgIcon = __MaterialUI.SvgIcon;
-    export default SvgIcon;
-}
-
-declare module 'material-ui/svg-icons/action/work' {
-    export import ActionWork = __MaterialUI.SvgIcon;
-    export default ActionWork;
-}
-
-declare module 'material-ui/svg-icons/action/camera-enhance' {
-    export import ActionCameraEnhance = __MaterialUI.SvgIcon;
-    export default ActionCameraEnhance;
-}
-
-declare module 'material-ui/svg-icons/action/flip-to-back' {
-    export import ActionFlipToBack = __MaterialUI.SvgIcon;
-    export default ActionFlipToBack;
-}
-
-declare module 'material-ui/svg-icons/action/feedback' {
-    export import ActionFeedback = __MaterialUI.SvgIcon;
-    export default ActionFeedback;
-}
-
-declare module 'material-ui/svg-icons/action/assignment-turned-in' {
-    export import ActionAssignmentTurnedIn = __MaterialUI.SvgIcon;
-    export default ActionAssignmentTurnedIn;
-}
-
-declare module 'material-ui/svg-icons/action/track-changes' {
-    export import ActionTrackChanges = __MaterialUI.SvgIcon;
-    export default ActionTrackChanges;
-}
-
-declare module 'material-ui/svg-icons/action/view-stream' {
-    export import ActionViewStream = __MaterialUI.SvgIcon;
-    export default ActionViewStream;
-}
-
-declare module 'material-ui/svg-icons/action/open-in-browser' {
-    export import ActionOpenInBrowser = __MaterialUI.SvgIcon;
-    export default ActionOpenInBrowser;
-}
-
-declare module 'material-ui/svg-icons/action/view-headline' {
-    export import ActionViewHeadline = __MaterialUI.SvgIcon;
-    export default ActionViewHeadline;
-}
-
-declare module 'material-ui/svg-icons/action/alarm-add' {
-    export import ActionAlarmAdd = __MaterialUI.SvgIcon;
-    export default ActionAlarmAdd;
-}
-
-declare module 'material-ui/svg-icons/action/history' {
-    export import ActionHistory = __MaterialUI.SvgIcon;
-    export default ActionHistory;
-}
-
-declare module 'material-ui/svg-icons/action/perm-device-information' {
-    export import ActionPermDeviceInformation = __MaterialUI.SvgIcon;
-    export default ActionPermDeviceInformation;
-}
-
-declare module 'material-ui/svg-icons/action/reorder' {
-    export import ActionReorder = __MaterialUI.SvgIcon;
-    export default ActionReorder;
-}
-
-declare module 'material-ui/svg-icons/action/assignment' {
-    export import ActionAssignment = __MaterialUI.SvgIcon;
-    export default ActionAssignment;
-}
-
-declare module 'material-ui/svg-icons/action/shopping-cart' {
-    export import ActionShoppingCart = __MaterialUI.SvgIcon;
-    export default ActionShoppingCart;
-}
-
-declare module 'material-ui/svg-icons/action/face' {
-    export import ActionFace = __MaterialUI.SvgIcon;
-    export default ActionFace;
-}
-
-declare module 'material-ui/svg-icons/action/event' {
-    export import ActionEvent = __MaterialUI.SvgIcon;
-    export default ActionEvent;
-}
-
-declare module 'material-ui/svg-icons/action/view-week' {
-    export import ActionViewWeek = __MaterialUI.SvgIcon;
-    export default ActionViewWeek;
-}
-
-declare module 'material-ui/svg-icons/action/rounded-corner' {
-    export import ActionRoundedCorner = __MaterialUI.SvgIcon;
-    export default ActionRoundedCorner;
-}
-
-declare module 'material-ui/svg-icons/action/view-carousel' {
-    export import ActionViewCarousel = __MaterialUI.SvgIcon;
-    export default ActionViewCarousel;
-}
-
-declare module 'material-ui/svg-icons/action/toll' {
-    export import ActionToll = __MaterialUI.SvgIcon;
-    export default ActionToll;
-}
-
-declare module 'material-ui/svg-icons/action/home' {
-    export import ActionHome = __MaterialUI.SvgIcon;
-    export default ActionHome;
-}
-
-declare module 'material-ui/svg-icons/action/subject' {
-    export import ActionSubject = __MaterialUI.SvgIcon;
-    export default ActionSubject;
-}
-
-declare module 'material-ui/svg-icons/action/lock' {
-    export import ActionLock = __MaterialUI.SvgIcon;
-    export default ActionLock;
-}
-
-declare module 'material-ui/svg-icons/action/visibility-off' {
-    export import ActionVisibilityOff = __MaterialUI.SvgIcon;
-    export default ActionVisibilityOff;
-}
-
-declare module 'material-ui/svg-icons/action/opacity' {
-    export import ActionOpacity = __MaterialUI.SvgIcon;
-    export default ActionOpacity;
-}
-
-declare module 'material-ui/svg-icons/action/dns' {
-    export import ActionDns = __MaterialUI.SvgIcon;
-    export default ActionDns;
-}
-
-declare module 'material-ui/svg-icons/action/open-with' {
-    export import ActionOpenWith = __MaterialUI.SvgIcon;
-    export default ActionOpenWith;
-}
-
-declare module 'material-ui/svg-icons/action/system-update-alt' {
-    export import ActionSystemUpdateAlt = __MaterialUI.SvgIcon;
-    export default ActionSystemUpdateAlt;
-}
-
-declare module 'material-ui/svg-icons/action/picture-in-picture-alt' {
-    export import ActionPictureInPictureAlt = __MaterialUI.SvgIcon;
-    export default ActionPictureInPictureAlt;
-}
-
-declare module 'material-ui/svg-icons/action/bookmark-border' {
-    export import ActionBookmarkBorder = __MaterialUI.SvgIcon;
-    export default ActionBookmarkBorder;
-}
-
-declare module 'material-ui/svg-icons/action/settings' {
-    export import ActionSettings = __MaterialUI.SvgIcon;
-    export default ActionSettings;
-}
-
-declare module 'material-ui/svg-icons/action/dashboard' {
-    export import ActionDashboard = __MaterialUI.SvgIcon;
-    export default ActionDashboard;
-}
-
-declare module 'material-ui/svg-icons/action/done-all' {
-    export import ActionDoneAll = __MaterialUI.SvgIcon;
-    export default ActionDoneAll;
-}
-
-declare module 'material-ui/svg-icons/action/aspect-ratio' {
-    export import ActionAspectRatio = __MaterialUI.SvgIcon;
-    export default ActionAspectRatio;
-}
-
-declare module 'material-ui/svg-icons/action/verified-user' {
-    export import ActionVerifiedUser = __MaterialUI.SvgIcon;
-    export default ActionVerifiedUser;
-}
-
-declare module 'material-ui/svg-icons/action/update' {
-    export import ActionUpdate = __MaterialUI.SvgIcon;
-    export default ActionUpdate;
-}
-
-declare module 'material-ui/svg-icons/action/query-builder' {
-    export import ActionQueryBuilder = __MaterialUI.SvgIcon;
-    export default ActionQueryBuilder;
-}
-
-declare module 'material-ui/svg-icons/action/supervisor-account' {
-    export import ActionSupervisorAccount = __MaterialUI.SvgIcon;
-    export default ActionSupervisorAccount;
-}
-
-declare module 'material-ui/svg-icons/action/polymer' {
-    export import ActionPolymer = __MaterialUI.SvgIcon;
-    export default ActionPolymer;
-}
-
-declare module 'material-ui/svg-icons/action/accessible' {
-    export import ActionAccessible = __MaterialUI.SvgIcon;
-    export default ActionAccessible;
-}
-
-declare module 'material-ui/svg-icons/action/highlight-off' {
-    export import ActionHighlightOff = __MaterialUI.SvgIcon;
-    export default ActionHighlightOff;
-}
-
-declare module 'material-ui/svg-icons/action/power-settings-new' {
-    export import ActionPowerSettingsNew = __MaterialUI.SvgIcon;
-    export default ActionPowerSettingsNew;
-}
-
-declare module 'material-ui/svg-icons/action/chrome-reader-mode' {
-    export import ActionChromeReaderMode = __MaterialUI.SvgIcon;
-    export default ActionChromeReaderMode;
-}
-
-declare module 'material-ui/svg-icons/action/perm-camera-mic' {
-    export import ActionPermCameraMic = __MaterialUI.SvgIcon;
-    export default ActionPermCameraMic;
-}
-
-declare module 'material-ui/svg-icons/action/touch-app' {
-    export import ActionTouchApp = __MaterialUI.SvgIcon;
-    export default ActionTouchApp;
-}
-
-declare module 'material-ui/svg-icons/action/receipt' {
-    export import ActionReceipt = __MaterialUI.SvgIcon;
-    export default ActionReceipt;
-}
-
-declare module 'material-ui/svg-icons/action/assignment-late' {
-    export import ActionAssignmentLate = __MaterialUI.SvgIcon;
-    export default ActionAssignmentLate;
-}
-
-declare module 'material-ui/svg-icons/action/alarm-off' {
-    export import ActionAlarmOff = __MaterialUI.SvgIcon;
-    export default ActionAlarmOff;
-}
-
-declare module 'material-ui/svg-icons/action/toc' {
-    export import ActionToc = __MaterialUI.SvgIcon;
-    export default ActionToc;
-}
-
-declare module 'material-ui/svg-icons/action/settings-bluetooth' {
-    export import ActionSettingsBluetooth = __MaterialUI.SvgIcon;
-    export default ActionSettingsBluetooth;
-}
-
-declare module 'material-ui/svg-icons/action/settings-brightness' {
-    export import ActionSettingsBrightness = __MaterialUI.SvgIcon;
-    export default ActionSettingsBrightness;
-}
-
-declare module 'material-ui/svg-icons/action/donut-small' {
-    export import ActionDonutSmall = __MaterialUI.SvgIcon;
-    export default ActionDonutSmall;
-}
-
-declare module 'material-ui/svg-icons/action/zoom-out' {
-    export import ActionZoomOut = __MaterialUI.SvgIcon;
-    export default ActionZoomOut;
-}
-
-declare module 'material-ui/svg-icons/action/loyalty' {
-    export import ActionLoyalty = __MaterialUI.SvgIcon;
-    export default ActionLoyalty;
-}
-
-declare module 'material-ui/svg-icons/action/search' {
-    export import ActionSearch = __MaterialUI.SvgIcon;
-    export default ActionSearch;
-}
-
-declare module 'material-ui/svg-icons/action/account-balance-wallet' {
-    export import ActionAccountBalanceWallet = __MaterialUI.SvgIcon;
-    export default ActionAccountBalanceWallet;
-}
-
-declare module 'material-ui/svg-icons/action/date-range' {
-    export import ActionDateRange = __MaterialUI.SvgIcon;
-    export default ActionDateRange;
-}
-
-declare module 'material-ui/svg-icons/action/alarm-on' {
-    export import ActionAlarmOn = __MaterialUI.SvgIcon;
-    export default ActionAlarmOn;
-}
-
-declare module 'material-ui/svg-icons/action/view-quilt' {
-    export import ActionViewQuilt = __MaterialUI.SvgIcon;
-    export default ActionViewQuilt;
-}
-
-declare module 'material-ui/svg-icons/action/launch' {
-    export import ActionLaunch = __MaterialUI.SvgIcon;
-    export default ActionLaunch;
-}
-
-declare module 'material-ui/svg-icons/action/visibility' {
-    export import ActionVisibility = __MaterialUI.SvgIcon;
-    export default ActionVisibility;
-}
-
-declare module 'material-ui/svg-icons/action/flight-land' {
-    export import ActionFlightLand = __MaterialUI.SvgIcon;
-    export default ActionFlightLand;
-}
-
-declare module 'material-ui/svg-icons/action/card-travel' {
-    export import ActionCardTravel = __MaterialUI.SvgIcon;
-    export default ActionCardTravel;
-}
-
-declare module 'material-ui/svg-icons/action/get-app' {
-    export import ActionGetApp = __MaterialUI.SvgIcon;
-    export default ActionGetApp;
-}
-
-declare module 'material-ui/svg-icons/action/markunread-mailbox' {
-    export import ActionMarkunreadMailbox = __MaterialUI.SvgIcon;
-    export default ActionMarkunreadMailbox;
-}
-
-declare module 'material-ui/svg-icons/action/view-agenda' {
-    export import ActionViewAgenda = __MaterialUI.SvgIcon;
-    export default ActionViewAgenda;
-}
-
-declare module 'material-ui/svg-icons/action/timeline' {
-    export import ActionTimeline = __MaterialUI.SvgIcon;
-    export default ActionTimeline;
-}
-
-declare module 'material-ui/svg-icons/action/settings-remote' {
-    export import ActionSettingsRemote = __MaterialUI.SvgIcon;
-    export default ActionSettingsRemote;
-}
-
-declare module 'material-ui/svg-icons/action/input' {
-    export import ActionInput = __MaterialUI.SvgIcon;
-    export default ActionInput;
-}
-
-declare module 'material-ui/svg-icons/action/record-voice-over' {
-    export import ActionRecordVoiceOver = __MaterialUI.SvgIcon;
-    export default ActionRecordVoiceOver;
-}
-
-declare module 'material-ui/svg-icons/action/backup' {
-    export import ActionBackup = __MaterialUI.SvgIcon;
-    export default ActionBackup;
-}
-
-declare module 'material-ui/svg-icons/action/language' {
-    export import ActionLanguage = __MaterialUI.SvgIcon;
-    export default ActionLanguage;
-}
-
-declare module 'material-ui/svg-icons/action/play-for-work' {
-    export import ActionPlayForWork = __MaterialUI.SvgIcon;
-    export default ActionPlayForWork;
-}
-
-declare module 'material-ui/svg-icons/action/gif' {
-    export import ActionGif = __MaterialUI.SvgIcon;
-    export default ActionGif;
-}
-
-declare module 'material-ui/svg-icons/action/theaters' {
-    export import ActionTheaters = __MaterialUI.SvgIcon;
-    export default ActionTheaters;
-}
-
-declare module 'material-ui/svg-icons/action/offline-pin' {
-    export import ActionOfflinePin = __MaterialUI.SvgIcon;
-    export default ActionOfflinePin;
-}
-
-declare module 'material-ui/svg-icons/action/assignment-return' {
-    export import ActionAssignmentReturn = __MaterialUI.SvgIcon;
-    export default ActionAssignmentReturn;
-}
-
-declare module 'material-ui/svg-icons/action/print' {
-    export import ActionPrint = __MaterialUI.SvgIcon;
-    export default ActionPrint;
-}
-
-declare module 'material-ui/svg-icons/action/settings-overscan' {
-    export import ActionSettingsOverscan = __MaterialUI.SvgIcon;
-    export default ActionSettingsOverscan;
-}
-
-declare module 'material-ui/svg-icons/action/store' {
-    export import ActionStore = __MaterialUI.SvgIcon;
-    export default ActionStore;
-}
-
-declare module 'material-ui/svg-icons/action/exit-to-app' {
-    export import ActionExitToApp = __MaterialUI.SvgIcon;
-    export default ActionExitToApp;
-}
-
-declare module 'material-ui/svg-icons/action/account-balance' {
-    export import ActionAccountBalance = __MaterialUI.SvgIcon;
-    export default ActionAccountBalance;
-}
-
-declare module 'material-ui/svg-icons/action/grade' {
-    export import ActionGrade = __MaterialUI.SvgIcon;
-    export default ActionGrade;
-}
-
-declare module 'material-ui/svg-icons/action/picture-in-picture' {
-    export import ActionPictureInPicture = __MaterialUI.SvgIcon;
-    export default ActionPictureInPicture;
-}
-
-declare module 'material-ui/svg-icons/action/copyright' {
-    export import ActionCopyright = __MaterialUI.SvgIcon;
-    export default ActionCopyright;
-}
-
-declare module 'material-ui/svg-icons/action/donut-large' {
-    export import ActionDonutLarge = __MaterialUI.SvgIcon;
-    export default ActionDonutLarge;
-}
-
-declare module 'material-ui/svg-icons/action/lock-open' {
-    export import ActionLockOpen = __MaterialUI.SvgIcon;
-    export default ActionLockOpen;
-}
-
-declare module 'material-ui/svg-icons/action/perm-media' {
-    export import ActionPermMedia = __MaterialUI.SvgIcon;
-    export default ActionPermMedia;
-}
-
-declare module 'material-ui/svg-icons/action/all-out' {
-    export import ActionAllOut = __MaterialUI.SvgIcon;
-    export default ActionAllOut;
-}
-
-declare module 'material-ui/svg-icons/action/check-circle' {
-    export import ActionCheckCircle = __MaterialUI.SvgIcon;
-    export default ActionCheckCircle;
-}
-
-declare module 'material-ui/svg-icons/action/swap-vertical-circle' {
-    export import ActionSwapVerticalCircle = __MaterialUI.SvgIcon;
-    export default ActionSwapVerticalCircle;
-}
-
-declare module 'material-ui/svg-icons/action/settings-input-svideo' {
-    export import ActionSettingsInputSvideo = __MaterialUI.SvgIcon;
-    export default ActionSettingsInputSvideo;
-}
-
-declare module 'material-ui/svg-icons/action/watch-later' {
-    export import ActionWatchLater = __MaterialUI.SvgIcon;
-    export default ActionWatchLater;
-}
-
-declare module 'material-ui/svg-icons/action/question-answer' {
-    export import ActionQuestionAnswer = __MaterialUI.SvgIcon;
-    export default ActionQuestionAnswer;
-}
-
-declare module 'material-ui/svg-icons/action/assignment-ind' {
-    export import ActionAssignmentInd = __MaterialUI.SvgIcon;
-    export default ActionAssignmentInd;
-}
-
-declare module 'material-ui/svg-icons/action/code' {
-    export import ActionCode = __MaterialUI.SvgIcon;
-    export default ActionCode;
-}
-
-declare module 'material-ui/svg-icons/action/turned-in-not' {
-    export import ActionTurnedInNot = __MaterialUI.SvgIcon;
-    export default ActionTurnedInNot;
-}
-
-declare module 'material-ui/svg-icons/action/line-weight' {
-    export import ActionLineWeight = __MaterialUI.SvgIcon;
-    export default ActionLineWeight;
-}
-
-declare module 'material-ui/svg-icons/action/restore' {
-    export import ActionRestore = __MaterialUI.SvgIcon;
-    export default ActionRestore;
-}
-
-declare module 'material-ui/svg-icons/action/tab' {
-    export import ActionTab = __MaterialUI.SvgIcon;
-    export default ActionTab;
-}
-
-declare module 'material-ui/svg-icons/action/open-in-new' {
-    export import ActionOpenInNew = __MaterialUI.SvgIcon;
-    export default ActionOpenInNew;
-}
-
-declare module 'material-ui/svg-icons/action/turned-in' {
-    export import ActionTurnedIn = __MaterialUI.SvgIcon;
-    export default ActionTurnedIn;
-}
-
-declare module 'material-ui/svg-icons/action/settings-input-hdmi' {
-    export import ActionSettingsInputHdmi = __MaterialUI.SvgIcon;
-    export default ActionSettingsInputHdmi;
-}
-
-declare module 'material-ui/svg-icons/action/favorite-border' {
-    export import ActionFavoriteBorder = __MaterialUI.SvgIcon;
-    export default ActionFavoriteBorder;
-}
-
-declare module 'material-ui/svg-icons/action/done' {
-    export import ActionDone = __MaterialUI.SvgIcon;
-    export default ActionDone;
-}
-
-declare module 'material-ui/svg-icons/action/payment' {
-    export import ActionPayment = __MaterialUI.SvgIcon;
-    export default ActionPayment;
-}
-
-declare module 'material-ui/svg-icons/action/announcement' {
-    export import ActionAnnouncement = __MaterialUI.SvgIcon;
-    export default ActionAnnouncement;
-}
-
-declare module 'material-ui/svg-icons/action/find-in-page' {
-    export import ActionFindInPage = __MaterialUI.SvgIcon;
-    export default ActionFindInPage;
-}
-
-declare module 'material-ui/svg-icons/action/thumbs-up-down' {
-    export import ActionThumbsUpDown = __MaterialUI.SvgIcon;
-    export default ActionThumbsUpDown;
-}
-
-declare module 'material-ui/svg-icons/action/explore' {
-    export import ActionExplore = __MaterialUI.SvgIcon;
-    export default ActionExplore;
-}
-
-declare module 'material-ui/svg-icons/action/today' {
-    export import ActionToday = __MaterialUI.SvgIcon;
-    export default ActionToday;
-}
-
-declare module 'material-ui/svg-icons/action/settings-power' {
-    export import ActionSettingsPower = __MaterialUI.SvgIcon;
-    export default ActionSettingsPower;
-}
-
-declare module 'material-ui/svg-icons/action/gavel' {
-    export import ActionGavel = __MaterialUI.SvgIcon;
-    export default ActionGavel;
-}
-
-declare module 'material-ui/svg-icons/action/build' {
-    export import ActionBuild = __MaterialUI.SvgIcon;
-    export default ActionBuild;
-}
-
-declare module 'material-ui/svg-icons/action/rowing' {
-    export import ActionRowing = __MaterialUI.SvgIcon;
-    export default ActionRowing;
-}
-
-declare module 'material-ui/svg-icons/action/label' {
-    export import ActionLabel = __MaterialUI.SvgIcon;
-    export default ActionLabel;
-}
-
-declare module 'material-ui/svg-icons/action/card-giftcard' {
-    export import ActionCardGiftcard = __MaterialUI.SvgIcon;
-    export default ActionCardGiftcard;
-}
-
-declare module 'material-ui/svg-icons/action/thumb-up' {
-    export import ActionThumbUp = __MaterialUI.SvgIcon;
-    export default ActionThumbUp;
-}
-
-declare module 'material-ui/svg-icons/action/shopping-basket' {
-    export import ActionShoppingBasket = __MaterialUI.SvgIcon;
-    export default ActionShoppingBasket;
-}
-
-declare module 'material-ui/svg-icons/action/swap-horiz' {
-    export import ActionSwapHoriz = __MaterialUI.SvgIcon;
-    export default ActionSwapHoriz;
-}
-
-declare module 'material-ui/svg-icons/action/help-outline' {
-    export import ActionHelpOutline = __MaterialUI.SvgIcon;
-    export default ActionHelpOutline;
-}
-
-declare module 'material-ui/svg-icons/action/pregnant-woman' {
-    export import ActionPregnantWoman = __MaterialUI.SvgIcon;
-    export default ActionPregnantWoman;
-}
-
-declare module 'material-ui/svg-icons/action/help' {
-    export import ActionHelp = __MaterialUI.SvgIcon;
-    export default ActionHelp;
-}
-
-declare module 'material-ui/svg-icons/action/settings-input-antenna' {
-    export import ActionSettingsInputAntenna = __MaterialUI.SvgIcon;
-    export default ActionSettingsInputAntenna;
-}
-
-declare module 'material-ui/svg-icons/action/find-replace' {
-    export import ActionFindReplace = __MaterialUI.SvgIcon;
-    export default ActionFindReplace;
-}
-
-declare module 'material-ui/svg-icons/action/shop' {
-    export import ActionShop = __MaterialUI.SvgIcon;
-    export default ActionShop;
-}
-
-declare module 'material-ui/svg-icons/action/change-history' {
-    export import ActionChangeHistory = __MaterialUI.SvgIcon;
-    export default ActionChangeHistory;
-}
-
-declare module 'material-ui/svg-icons/action/info' {
-    export import ActionInfo = __MaterialUI.SvgIcon;
-    export default ActionInfo;
-}
-
-declare module 'material-ui/svg-icons/action/trending-down' {
-    export import ActionTrendingDown = __MaterialUI.SvgIcon;
-    export default ActionTrendingDown;
-}
-
-declare module 'material-ui/svg-icons/action/flight-takeoff' {
-    export import ActionFlightTakeoff = __MaterialUI.SvgIcon;
-    export default ActionFlightTakeoff;
-}
-
-declare module 'material-ui/svg-icons/action/alarm' {
-    export import ActionAlarm = __MaterialUI.SvgIcon;
-    export default ActionAlarm;
-}
-
-declare module 'material-ui/svg-icons/action/spellcheck' {
-    export import ActionSpellcheck = __MaterialUI.SvgIcon;
-    export default ActionSpellcheck;
-}
-
-declare module 'material-ui/svg-icons/action/settings-input-component' {
-    export import ActionSettingsInputComponent = __MaterialUI.SvgIcon;
-    export default ActionSettingsInputComponent;
-}
-
-declare module 'material-ui/svg-icons/action/settings-applications' {
-    export import ActionSettingsApplications = __MaterialUI.SvgIcon;
-    export default ActionSettingsApplications;
-}
-
-declare module 'material-ui/svg-icons/action/room' {
-    export import ActionRoom = __MaterialUI.SvgIcon;
-    export default ActionRoom;
-}
-
-declare module 'material-ui/svg-icons/action/book' {
-    export import ActionBook = __MaterialUI.SvgIcon;
-    export default ActionBook;
-}
-
-declare module 'material-ui/svg-icons/action/class' {
-    export import ActionClass = __MaterialUI.SvgIcon;
-    export default ActionClass;
-}
-
-declare module 'material-ui/svg-icons/action/group-work' {
-    export import ActionGroupWork = __MaterialUI.SvgIcon;
-    export default ActionGroupWork;
-}
-
-declare module 'material-ui/svg-icons/action/hourglass-full' {
-    export import ActionHourglassFull = __MaterialUI.SvgIcon;
-    export default ActionHourglassFull;
-}
-
-declare module 'material-ui/svg-icons/action/assessment' {
-    export import ActionAssessment = __MaterialUI.SvgIcon;
-    export default ActionAssessment;
-}
-
-declare module 'material-ui/svg-icons/action/youtube-searched-for' {
-    export import ActionYoutubeSearchedFor = __MaterialUI.SvgIcon;
-    export default ActionYoutubeSearchedFor;
-}
-
-declare module 'material-ui/svg-icons/action/eject' {
-    export import ActionEject = __MaterialUI.SvgIcon;
-    export default ActionEject;
-}
-
-declare module 'material-ui/svg-icons/action/trending-up' {
-    export import ActionTrendingUp = __MaterialUI.SvgIcon;
-    export default ActionTrendingUp;
-}
-
-declare module 'material-ui/svg-icons/action/http' {
-    export import ActionHttp = __MaterialUI.SvgIcon;
-    export default ActionHttp;
-}
-
-declare module 'material-ui/svg-icons/action/stars' {
-    export import ActionStars = __MaterialUI.SvgIcon;
-    export default ActionStars;
-}
-
-declare module 'material-ui/svg-icons/action/autorenew' {
-    export import ActionAutorenew = __MaterialUI.SvgIcon;
-    export default ActionAutorenew;
-}
-
-declare module 'material-ui/svg-icons/action/settings-ethernet' {
-    export import ActionSettingsEthernet = __MaterialUI.SvgIcon;
-    export default ActionSettingsEthernet;
-}
-
-declare module 'material-ui/svg-icons/action/label-outline' {
-    export import ActionLabelOutline = __MaterialUI.SvgIcon;
-    export default ActionLabelOutline;
-}
-
-declare module 'material-ui/svg-icons/action/settings-phone' {
-    export import ActionSettingsPhone = __MaterialUI.SvgIcon;
-    export default ActionSettingsPhone;
-}
-
-declare module 'material-ui/svg-icons/action/info-outline' {
-    export import ActionInfoOutline = __MaterialUI.SvgIcon;
-    export default ActionInfoOutline;
-}
-
-declare module 'material-ui/svg-icons/action/lock-outline' {
-    export import ActionLockOutline = __MaterialUI.SvgIcon;
-    export default ActionLockOutline;
-}
-
-declare module 'material-ui/svg-icons/action/settings-input-composite' {
-    export import ActionSettingsInputComposite = __MaterialUI.SvgIcon;
-    export default ActionSettingsInputComposite;
-}
-
-declare module 'material-ui/svg-icons/action/invert-colors' {
-    export import ActionInvertColors = __MaterialUI.SvgIcon;
-    export default ActionInvertColors;
-}
-
-declare module 'material-ui/svg-icons/action/bookmark' {
-    export import ActionBookmark = __MaterialUI.SvgIcon;
-    export default ActionBookmark;
-}
-
-declare module 'material-ui/svg-icons/action/add-shopping-cart' {
-    export import ActionAddShoppingCart = __MaterialUI.SvgIcon;
-    export default ActionAddShoppingCart;
-}
-
-declare module 'material-ui/svg-icons/action/bug-report' {
-    export import ActionBugReport = __MaterialUI.SvgIcon;
-    export default ActionBugReport;
-}
-
-declare module 'material-ui/svg-icons/action/cached' {
-    export import ActionCached = __MaterialUI.SvgIcon;
-    export default ActionCached;
-}
-
-declare module 'material-ui/svg-icons/action/view-day' {
-    export import ActionViewDay = __MaterialUI.SvgIcon;
-    export default ActionViewDay;
-}
-
-declare module 'material-ui/svg-icons/action/fingerprint' {
-    export import ActionFingerprint = __MaterialUI.SvgIcon;
-    export default ActionFingerprint;
-}
-
-declare module 'material-ui/svg-icons/action/accessibility' {
-    export import ActionAccessibility = __MaterialUI.SvgIcon;
-    export default ActionAccessibility;
-}
-
-declare module 'material-ui/svg-icons/action/perm-data-setting' {
-    export import ActionPermDataSetting = __MaterialUI.SvgIcon;
-    export default ActionPermDataSetting;
-}
-
-declare module 'material-ui/svg-icons/action/settings-backup-restore' {
-    export import ActionSettingsBackupRestore = __MaterialUI.SvgIcon;
-    export default ActionSettingsBackupRestore;
-}
-
-declare module 'material-ui/svg-icons/action/zoom-in' {
-    export import ActionZoomIn = __MaterialUI.SvgIcon;
-    export default ActionZoomIn;
-}
-
-declare module 'material-ui/svg-icons/action/perm-identity' {
-    export import ActionPermIdentity = __MaterialUI.SvgIcon;
-    export default ActionPermIdentity;
-}
-
-declare module 'material-ui/svg-icons/action/favorite' {
-    export import ActionFavorite = __MaterialUI.SvgIcon;
-    export default ActionFavorite;
-}
-
-declare module 'material-ui/svg-icons/action/thumb-down' {
-    export import ActionThumbDown = __MaterialUI.SvgIcon;
-    export default ActionThumbDown;
-}
-
-declare module 'material-ui/svg-icons/action/assignment-returned' {
-    export import ActionAssignmentReturned = __MaterialUI.SvgIcon;
-    export default ActionAssignmentReturned;
-}
-
-declare module 'material-ui/svg-icons/action/account-box' {
-    export import ActionAccountBox = __MaterialUI.SvgIcon;
-    export default ActionAccountBox;
-}
-
-declare module 'material-ui/svg-icons/action/extension' {
-    export import ActionExtension = __MaterialUI.SvgIcon;
-    export default ActionExtension;
-}
-
-declare module 'material-ui/svg-icons/action/pageview' {
-    export import ActionPageview = __MaterialUI.SvgIcon;
-    export default ActionPageview;
-}
-
-declare module 'material-ui/svg-icons/action/https' {
-    export import ActionHttps = __MaterialUI.SvgIcon;
-    export default ActionHttps;
-}
-
-declare module 'material-ui/svg-icons/action/translate' {
-    export import ActionTranslate = __MaterialUI.SvgIcon;
-    export default ActionTranslate;
-}
-
-declare module 'material-ui/svg-icons/action/three-d-rotation' {
-    export import ActionThreeDRotation = __MaterialUI.SvgIcon;
-    export default ActionThreeDRotation;
-}
-
-declare module 'material-ui/svg-icons/action/tab-unselected' {
-    export import ActionTabUnselected = __MaterialUI.SvgIcon;
-    export default ActionTabUnselected;
-}
-
-declare module 'material-ui/svg-icons/action/description' {
-    export import ActionDescription = __MaterialUI.SvgIcon;
-    export default ActionDescription;
-}
-
-declare module 'material-ui/svg-icons/action/note-add' {
-    export import ActionNoteAdd = __MaterialUI.SvgIcon;
-    export default ActionNoteAdd;
-}
-
-declare module 'material-ui/svg-icons/action/perm-scan-wifi' {
-    export import ActionPermScanWifi = __MaterialUI.SvgIcon;
-    export default ActionPermScanWifi;
-}
-
-declare module 'material-ui/svg-icons/action/pets' {
-    export import ActionPets = __MaterialUI.SvgIcon;
-    export default ActionPets;
-}
-
-declare module 'material-ui/svg-icons/action/view-array' {
-    export import ActionViewArray = __MaterialUI.SvgIcon;
-    export default ActionViewArray;
-}
-
-declare module 'material-ui/svg-icons/action/shop-two' {
-    export import ActionShopTwo = __MaterialUI.SvgIcon;
-    export default ActionShopTwo;
-}
-
-declare module 'material-ui/svg-icons/action/line-style' {
-    export import ActionLineStyle = __MaterialUI.SvgIcon;
-    export default ActionLineStyle;
-}
-
-declare module 'material-ui/svg-icons/action/lightbulb-outline' {
-    export import ActionLightbulbOutline = __MaterialUI.SvgIcon;
-    export default ActionLightbulbOutline;
-}
-
-declare module 'material-ui/svg-icons/action/report-problem' {
-    export import ActionReportProblem = __MaterialUI.SvgIcon;
-    export default ActionReportProblem;
-}
-
-declare module 'material-ui/svg-icons/action/swap-vert' {
-    export import ActionSwapVert = __MaterialUI.SvgIcon;
-    export default ActionSwapVert;
-}
-
-declare module 'material-ui/svg-icons/action/list' {
-    export import ActionList = __MaterialUI.SvgIcon;
-    export default ActionList;
-}
-
-declare module 'material-ui/svg-icons/action/settings-voice' {
-    export import ActionSettingsVoice = __MaterialUI.SvgIcon;
-    export default ActionSettingsVoice;
-}
-
-declare module 'material-ui/svg-icons/action/view-list' {
-    export import ActionViewList = __MaterialUI.SvgIcon;
-    export default ActionViewList;
-}
-
-declare module 'material-ui/svg-icons/action/pan-tool' {
-    export import ActionPanTool = __MaterialUI.SvgIcon;
-    export default ActionPanTool;
-}
-
-declare module 'material-ui/svg-icons/action/important-devices' {
-    export import ActionImportantDevices = __MaterialUI.SvgIcon;
-    export default ActionImportantDevices;
-}
-
-declare module 'material-ui/svg-icons/action/redeem' {
-    export import ActionRedeem = __MaterialUI.SvgIcon;
-    export default ActionRedeem;
-}
-
-declare module 'material-ui/svg-icons/action/flip-to-front' {
-    export import ActionFlipToFront = __MaterialUI.SvgIcon;
-    export default ActionFlipToFront;
-}
-
-declare module 'material-ui/svg-icons/action/android' {
-    export import ActionAndroid = __MaterialUI.SvgIcon;
-    export default ActionAndroid;
-}
-
-declare module 'material-ui/svg-icons/action/account-circle' {
-    export import ActionAccountCircle = __MaterialUI.SvgIcon;
-    export default ActionAccountCircle;
-}
-
-declare module 'material-ui/svg-icons/action/event-seat' {
-    export import ActionEventSeat = __MaterialUI.SvgIcon;
-    export default ActionEventSeat;
-}
-
-declare module 'material-ui/svg-icons/action/perm-contact-calendar' {
-    export import ActionPermContactCalendar = __MaterialUI.SvgIcon;
-    export default ActionPermContactCalendar;
-}
-
-declare module 'material-ui/svg-icons/action/perm-phone-msg' {
-    export import ActionPermPhoneMsg = __MaterialUI.SvgIcon;
-    export default ActionPermPhoneMsg;
-}
-
-declare module 'material-ui/svg-icons/action/delete' {
-    export import ActionDelete = __MaterialUI.SvgIcon;
-    export default ActionDelete;
-}
-
-declare module 'material-ui/svg-icons/action/card-membership' {
-    export import ActionCardMembership = __MaterialUI.SvgIcon;
-    export default ActionCardMembership;
-}
-
-declare module 'material-ui/svg-icons/action/hourglass-empty' {
-    export import ActionHourglassEmpty = __MaterialUI.SvgIcon;
-    export default ActionHourglassEmpty;
-}
-
-declare module 'material-ui/svg-icons/action/schedule' {
-    export import ActionSchedule = __MaterialUI.SvgIcon;
-    export default ActionSchedule;
-}
-
-declare module 'material-ui/svg-icons/action/trending-flat' {
-    export import ActionTrendingFlat = __MaterialUI.SvgIcon;
-    export default ActionTrendingFlat;
-}
-
-declare module 'material-ui/svg-icons/action/motorcycle' {
-    export import ActionMotorcycle = __MaterialUI.SvgIcon;
-    export default ActionMotorcycle;
-}
-
-declare module 'material-ui/svg-icons/action/view-column' {
-    export import ActionViewColumn = __MaterialUI.SvgIcon;
-    export default ActionViewColumn;
-}
-
-declare module 'material-ui/svg-icons/action/settings-cell' {
-    export import ActionSettingsCell = __MaterialUI.SvgIcon;
-    export default ActionSettingsCell;
-}
-
-declare module 'material-ui/svg-icons/action/credit-card' {
-    export import ActionCreditCard = __MaterialUI.SvgIcon;
-    export default ActionCreditCard;
-}
-
-declare module 'material-ui/svg-icons/action/view-module' {
-    export import ActionViewModule = __MaterialUI.SvgIcon;
-    export default ActionViewModule;
-}
-
-declare module 'material-ui/svg-icons/action/compare-arrows' {
-    export import ActionCompareArrows = __MaterialUI.SvgIcon;
-    export default ActionCompareArrows;
-}
-
-declare module 'material-ui/svg-icons/action/speaker-notes' {
-    export import ActionSpeakerNotes = __MaterialUI.SvgIcon;
-    export default ActionSpeakerNotes;
-}
-
-declare module 'material-ui/svg-icons/social/person' {
-    export import SocialPerson = __MaterialUI.SvgIcon;
-    export default SocialPerson;
-}
-
-declare module 'material-ui/svg-icons/social/notifications-none' {
-    export import SocialNotificationsNone = __MaterialUI.SvgIcon;
-    export default SocialNotificationsNone;
-}
-
-declare module 'material-ui/svg-icons/social/domain' {
-    export import SocialDomain = __MaterialUI.SvgIcon;
-    export default SocialDomain;
-}
-
-declare module 'material-ui/svg-icons/social/notifications-paused' {
-    export import SocialNotificationsPaused = __MaterialUI.SvgIcon;
-    export default SocialNotificationsPaused;
-}
-
-declare module 'material-ui/svg-icons/social/person-outline' {
-    export import SocialPersonOutline = __MaterialUI.SvgIcon;
-    export default SocialPersonOutline;
-}
-
-declare module 'material-ui/svg-icons/social/plus-one' {
-    export import SocialPlusOne = __MaterialUI.SvgIcon;
-    export default SocialPlusOne;
-}
-
-declare module 'material-ui/svg-icons/social/notifications-active' {
-    export import SocialNotificationsActive = __MaterialUI.SvgIcon;
-    export default SocialNotificationsActive;
-}
-
-declare module 'material-ui/svg-icons/social/share' {
-    export import SocialShare = __MaterialUI.SvgIcon;
-    export default SocialShare;
-}
-
-declare module 'material-ui/svg-icons/social/whatshot' {
-    export import SocialWhatshot = __MaterialUI.SvgIcon;
-    export default SocialWhatshot;
-}
-
-declare module 'material-ui/svg-icons/social/poll' {
-    export import SocialPoll = __MaterialUI.SvgIcon;
-    export default SocialPoll;
-}
-
-declare module 'material-ui/svg-icons/social/pages' {
-    export import SocialPages = __MaterialUI.SvgIcon;
-    export default SocialPages;
-}
-
-declare module 'material-ui/svg-icons/social/notifications-off' {
-    export import SocialNotificationsOff = __MaterialUI.SvgIcon;
-    export default SocialNotificationsOff;
-}
-
-declare module 'material-ui/svg-icons/social/notifications' {
-    export import SocialNotifications = __MaterialUI.SvgIcon;
-    export default SocialNotifications;
-}
-
-declare module 'material-ui/svg-icons/social/school' {
-    export import SocialSchool = __MaterialUI.SvgIcon;
-    export default SocialSchool;
-}
-
-declare module 'material-ui/svg-icons/social/cake' {
-    export import SocialCake = __MaterialUI.SvgIcon;
-    export default SocialCake;
-}
-
-declare module 'material-ui/svg-icons/social/people-outline' {
-    export import SocialPeopleOutline = __MaterialUI.SvgIcon;
-    export default SocialPeopleOutline;
-}
-
-declare module 'material-ui/svg-icons/social/location-city' {
-    export import SocialLocationCity = __MaterialUI.SvgIcon;
-    export default SocialLocationCity;
-}
-
-declare module 'material-ui/svg-icons/social/public' {
-    export import SocialPublic = __MaterialUI.SvgIcon;
-    export default SocialPublic;
-}
-
-declare module 'material-ui/svg-icons/social/mood-bad' {
-    export import SocialMoodBad = __MaterialUI.SvgIcon;
-    export default SocialMoodBad;
-}
-
-declare module 'material-ui/svg-icons/social/people' {
-    export import SocialPeople = __MaterialUI.SvgIcon;
-    export default SocialPeople;
-}
-
-declare module 'material-ui/svg-icons/social/mood' {
-    export import SocialMood = __MaterialUI.SvgIcon;
-    export default SocialMood;
-}
-
-declare module 'material-ui/svg-icons/social/party-mode' {
-    export import SocialPartyMode = __MaterialUI.SvgIcon;
-    export default SocialPartyMode;
-}
-
-declare module 'material-ui/svg-icons/social/group' {
-    export import SocialGroup = __MaterialUI.SvgIcon;
-    export default SocialGroup;
-}
-
-declare module 'material-ui/svg-icons/social/person-add' {
-    export import SocialPersonAdd = __MaterialUI.SvgIcon;
-    export default SocialPersonAdd;
-}
-
-declare module 'material-ui/svg-icons/social/group-add' {
-    export import SocialGroupAdd = __MaterialUI.SvgIcon;
-    export default SocialGroupAdd;
-}
-
-declare module 'material-ui/svg-icons/maps/edit-location' {
-    export import MapsEditLocation = __MaterialUI.SvgIcon;
-    export default MapsEditLocation;
-}
-
-declare module 'material-ui/svg-icons/maps/local-airport' {
-    export import MapsLocalAirport = __MaterialUI.SvgIcon;
-    export default MapsLocalAirport;
-}
-
-declare module 'material-ui/svg-icons/maps/local-phone' {
-    export import MapsLocalPhone = __MaterialUI.SvgIcon;
-    export default MapsLocalPhone;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-car' {
-    export import MapsDirectionsCar = __MaterialUI.SvgIcon;
-    export default MapsDirectionsCar;
-}
-
-declare module 'material-ui/svg-icons/maps/local-drink' {
-    export import MapsLocalDrink = __MaterialUI.SvgIcon;
-    export default MapsLocalDrink;
-}
-
-declare module 'material-ui/svg-icons/maps/local-gas-station' {
-    export import MapsLocalGasStation = __MaterialUI.SvgIcon;
-    export default MapsLocalGasStation;
-}
-
-declare module 'material-ui/svg-icons/maps/store-mall-directory' {
-    export import MapsStoreMallDirectory = __MaterialUI.SvgIcon;
-    export default MapsStoreMallDirectory;
-}
-
-declare module 'material-ui/svg-icons/maps/add-location' {
-    export import MapsAddLocation = __MaterialUI.SvgIcon;
-    export default MapsAddLocation;
-}
-
-declare module 'material-ui/svg-icons/maps/local-laundry-service' {
-    export import MapsLocalLaundryService = __MaterialUI.SvgIcon;
-    export default MapsLocalLaundryService;
-}
-
-declare module 'material-ui/svg-icons/maps/local-hotel' {
-    export import MapsLocalHotel = __MaterialUI.SvgIcon;
-    export default MapsLocalHotel;
-}
-
-declare module 'material-ui/svg-icons/maps/local-pizza' {
-    export import MapsLocalPizza = __MaterialUI.SvgIcon;
-    export default MapsLocalPizza;
-}
-
-declare module 'material-ui/svg-icons/maps/person-pin-circle' {
-    export import MapsPersonPinCircle = __MaterialUI.SvgIcon;
-    export default MapsPersonPinCircle;
-}
-
-declare module 'material-ui/svg-icons/maps/terrain' {
-    export import MapsTerrain = __MaterialUI.SvgIcon;
-    export default MapsTerrain;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-subway' {
-    export import MapsDirectionsSubway = __MaterialUI.SvgIcon;
-    export default MapsDirectionsSubway;
-}
-
-declare module 'material-ui/svg-icons/maps/local-bar' {
-    export import MapsLocalBar = __MaterialUI.SvgIcon;
-    export default MapsLocalBar;
-}
-
-declare module 'material-ui/svg-icons/maps/local-car-wash' {
-    export import MapsLocalCarWash = __MaterialUI.SvgIcon;
-    export default MapsLocalCarWash;
-}
-
-declare module 'material-ui/svg-icons/maps/restaurant-menu' {
-    export import MapsRestaurantMenu = __MaterialUI.SvgIcon;
-    export default MapsRestaurantMenu;
-}
-
-declare module 'material-ui/svg-icons/maps/near-me' {
-    export import MapsNearMe = __MaterialUI.SvgIcon;
-    export default MapsNearMe;
-}
-
-declare module 'material-ui/svg-icons/maps/directions' {
-    export import MapsDirections = __MaterialUI.SvgIcon;
-    export default MapsDirections;
-}
-
-declare module 'material-ui/svg-icons/maps/my-location' {
-    export import MapsMyLocation = __MaterialUI.SvgIcon;
-    export default MapsMyLocation;
-}
-
-declare module 'material-ui/svg-icons/maps/local-convenience-store' {
-    export import MapsLocalConvenienceStore = __MaterialUI.SvgIcon;
-    export default MapsLocalConvenienceStore;
-}
-
-declare module 'material-ui/svg-icons/maps/local-offer' {
-    export import MapsLocalOffer = __MaterialUI.SvgIcon;
-    export default MapsLocalOffer;
-}
-
-declare module 'material-ui/svg-icons/maps/local-florist' {
-    export import MapsLocalFlorist = __MaterialUI.SvgIcon;
-    export default MapsLocalFlorist;
-}
-
-declare module 'material-ui/svg-icons/maps/local-shipping' {
-    export import MapsLocalShipping = __MaterialUI.SvgIcon;
-    export default MapsLocalShipping;
-}
-
-declare module 'material-ui/svg-icons/maps/local-taxi' {
-    export import MapsLocalTaxi = __MaterialUI.SvgIcon;
-    export default MapsLocalTaxi;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-walk' {
-    export import MapsDirectionsWalk = __MaterialUI.SvgIcon;
-    export default MapsDirectionsWalk;
-}
-
-declare module 'material-ui/svg-icons/maps/local-hospital' {
-    export import MapsLocalHospital = __MaterialUI.SvgIcon;
-    export default MapsLocalHospital;
-}
-
-declare module 'material-ui/svg-icons/maps/layers' {
-    export import MapsLayers = __MaterialUI.SvgIcon;
-    export default MapsLayers;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-run' {
-    export import MapsDirectionsRun = __MaterialUI.SvgIcon;
-    export default MapsDirectionsRun;
-}
-
-declare module 'material-ui/svg-icons/maps/rate-review' {
-    export import MapsRateReview = __MaterialUI.SvgIcon;
-    export default MapsRateReview;
-}
-
-declare module 'material-ui/svg-icons/maps/local-dining' {
-    export import MapsLocalDining = __MaterialUI.SvgIcon;
-    export default MapsLocalDining;
-}
-
-declare module 'material-ui/svg-icons/maps/local-post-office' {
-    export import MapsLocalPostOffice = __MaterialUI.SvgIcon;
-    export default MapsLocalPostOffice;
-}
-
-declare module 'material-ui/svg-icons/maps/pin-drop' {
-    export import MapsPinDrop = __MaterialUI.SvgIcon;
-    export default MapsPinDrop;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-boat' {
-    export import MapsDirectionsBoat = __MaterialUI.SvgIcon;
-    export default MapsDirectionsBoat;
-}
-
-declare module 'material-ui/svg-icons/maps/local-see' {
-    export import MapsLocalSee = __MaterialUI.SvgIcon;
-    export default MapsLocalSee;
-}
-
-declare module 'material-ui/svg-icons/maps/map' {
-    export import MapsMap = __MaterialUI.SvgIcon;
-    export default MapsMap;
-}
-
-declare module 'material-ui/svg-icons/maps/flight' {
-    export import MapsFlight = __MaterialUI.SvgIcon;
-    export default MapsFlight;
-}
-
-declare module 'material-ui/svg-icons/maps/person-pin' {
-    export import MapsPersonPin = __MaterialUI.SvgIcon;
-    export default MapsPersonPin;
-}
-
-declare module 'material-ui/svg-icons/maps/satellite' {
-    export import MapsSatellite = __MaterialUI.SvgIcon;
-    export default MapsSatellite;
-}
-
-declare module 'material-ui/svg-icons/maps/local-printshop' {
-    export import MapsLocalPrintshop = __MaterialUI.SvgIcon;
-    export default MapsLocalPrintshop;
-}
-
-declare module 'material-ui/svg-icons/maps/navigation' {
-    export import MapsNavigation = __MaterialUI.SvgIcon;
-    export default MapsNavigation;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-railway' {
-    export import MapsDirectionsRailway = __MaterialUI.SvgIcon;
-    export default MapsDirectionsRailway;
-}
-
-declare module 'material-ui/svg-icons/maps/local-atm' {
-    export import MapsLocalAtm = __MaterialUI.SvgIcon;
-    export default MapsLocalAtm;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-transit' {
-    export import MapsDirectionsTransit = __MaterialUI.SvgIcon;
-    export default MapsDirectionsTransit;
-}
-
-declare module 'material-ui/svg-icons/maps/local-parking' {
-    export import MapsLocalParking = __MaterialUI.SvgIcon;
-    export default MapsLocalParking;
-}
-
-declare module 'material-ui/svg-icons/maps/local-cafe' {
-    export import MapsLocalCafe = __MaterialUI.SvgIcon;
-    export default MapsLocalCafe;
-}
-
-declare module 'material-ui/svg-icons/maps/local-mall' {
-    export import MapsLocalMall = __MaterialUI.SvgIcon;
-    export default MapsLocalMall;
-}
-
-declare module 'material-ui/svg-icons/maps/zoom-out-map' {
-    export import MapsZoomOutMap = __MaterialUI.SvgIcon;
-    export default MapsZoomOutMap;
-}
-
-declare module 'material-ui/svg-icons/maps/local-activity' {
-    export import MapsLocalActivity = __MaterialUI.SvgIcon;
-    export default MapsLocalActivity;
-}
-
-declare module 'material-ui/svg-icons/maps/local-grocery-store' {
-    export import MapsLocalGroceryStore = __MaterialUI.SvgIcon;
-    export default MapsLocalGroceryStore;
-}
-
-declare module 'material-ui/svg-icons/maps/local-pharmacy' {
-    export import MapsLocalPharmacy = __MaterialUI.SvgIcon;
-    export default MapsLocalPharmacy;
-}
-
-declare module 'material-ui/svg-icons/maps/local-movies' {
-    export import MapsLocalMovies = __MaterialUI.SvgIcon;
-    export default MapsLocalMovies;
-}
-
-declare module 'material-ui/svg-icons/maps/place' {
-    export import MapsPlace = __MaterialUI.SvgIcon;
-    export default MapsPlace;
-}
-
-declare module 'material-ui/svg-icons/maps/layers-clear' {
-    export import MapsLayersClear = __MaterialUI.SvgIcon;
-    export default MapsLayersClear;
-}
-
-declare module 'material-ui/svg-icons/maps/hotel' {
-    export import MapsHotel = __MaterialUI.SvgIcon;
-    export default MapsHotel;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-bike' {
-    export import MapsDirectionsBike = __MaterialUI.SvgIcon;
-    export default MapsDirectionsBike;
-}
-
-declare module 'material-ui/svg-icons/maps/local-library' {
-    export import MapsLocalLibrary = __MaterialUI.SvgIcon;
-    export default MapsLocalLibrary;
-}
-
-declare module 'material-ui/svg-icons/maps/local-play' {
-    export import MapsLocalPlay = __MaterialUI.SvgIcon;
-    export default MapsLocalPlay;
-}
-
-declare module 'material-ui/svg-icons/maps/directions-bus' {
-    export import MapsDirectionsBus = __MaterialUI.SvgIcon;
-    export default MapsDirectionsBus;
-}
-
-declare module 'material-ui/svg-icons/maps/traffic' {
-    export import MapsTraffic = __MaterialUI.SvgIcon;
-    export default MapsTraffic;
-}
-
-declare module 'material-ui/svg-icons/maps/beenhere' {
-    export import MapsBeenhere = __MaterialUI.SvgIcon;
-    export default MapsBeenhere;
-}
-
-declare module 'material-ui/svg-icons/communication/call-received' {
-    export import CommunicationCallReceived = __MaterialUI.SvgIcon;
-    export default CommunicationCallReceived;
-}
-
-declare module 'material-ui/svg-icons/communication/dialpad' {
-    export import CommunicationDialpad = __MaterialUI.SvgIcon;
-    export default CommunicationDialpad;
-}
-
-declare module 'material-ui/svg-icons/communication/forum' {
-    export import CommunicationForum = __MaterialUI.SvgIcon;
-    export default CommunicationForum;
-}
-
-declare module 'material-ui/svg-icons/communication/no-sim' {
-    export import CommunicationNoSim = __MaterialUI.SvgIcon;
-    export default CommunicationNoSim;
-}
-
-declare module 'material-ui/svg-icons/communication/chat' {
-    export import CommunicationChat = __MaterialUI.SvgIcon;
-    export default CommunicationChat;
-}
-
-declare module 'material-ui/svg-icons/communication/stay-primary-landscape' {
-    export import CommunicationStayPrimaryLandscape = __MaterialUI.SvgIcon;
-    export default CommunicationStayPrimaryLandscape;
-}
-
-declare module 'material-ui/svg-icons/communication/phonelink-setup' {
-    export import CommunicationPhonelinkSetup = __MaterialUI.SvgIcon;
-    export default CommunicationPhonelinkSetup;
-}
-
-declare module 'material-ui/svg-icons/communication/ring-volume' {
-    export import CommunicationRingVolume = __MaterialUI.SvgIcon;
-    export default CommunicationRingVolume;
-}
-
-declare module 'material-ui/svg-icons/communication/phonelink-lock' {
-    export import CommunicationPhonelinkLock = __MaterialUI.SvgIcon;
-    export default CommunicationPhonelinkLock;
-}
-
-declare module 'material-ui/svg-icons/communication/contacts' {
-    export import CommunicationContacts = __MaterialUI.SvgIcon;
-    export default CommunicationContacts;
-}
-
-declare module 'material-ui/svg-icons/communication/call-missed' {
-    export import CommunicationCallMissed = __MaterialUI.SvgIcon;
-    export default CommunicationCallMissed;
-}
-
-declare module 'material-ui/svg-icons/communication/contact-mail' {
-    export import CommunicationContactMail = __MaterialUI.SvgIcon;
-    export default CommunicationContactMail;
-}
-
-declare module 'material-ui/svg-icons/communication/portable-wifi-off' {
-    export import CommunicationPortableWifiOff = __MaterialUI.SvgIcon;
-    export default CommunicationPortableWifiOff;
-}
-
-declare module 'material-ui/svg-icons/communication/call-merge' {
-    export import CommunicationCallMerge = __MaterialUI.SvgIcon;
-    export default CommunicationCallMerge;
-}
-
-declare module 'material-ui/svg-icons/communication/tact-mail' {
-    export import CommunicationTactMail = __MaterialUI.SvgIcon;
-    export default CommunicationTactMail;
-}
-
-declare module 'material-ui/svg-icons/communication/stop-screen-share' {
-    export import CommunicationStopScreenShare = __MaterialUI.SvgIcon;
-    export default CommunicationStopScreenShare;
-}
-
-declare module 'material-ui/svg-icons/communication/vpn-key' {
-    export import CommunicationVpnKey = __MaterialUI.SvgIcon;
-    export default CommunicationVpnKey;
-}
-
-declare module 'material-ui/svg-icons/communication/swap-calls' {
-    export import CommunicationSwapCalls = __MaterialUI.SvgIcon;
-    export default CommunicationSwapCalls;
-}
-
-declare module 'material-ui/svg-icons/communication/dialer-sip' {
-    export import CommunicationDialerSip = __MaterialUI.SvgIcon;
-    export default CommunicationDialerSip;
-}
-
-declare module 'material-ui/svg-icons/communication/business' {
-    export import CommunicationBusiness = __MaterialUI.SvgIcon;
-    export default CommunicationBusiness;
-}
-
-declare module 'material-ui/svg-icons/communication/phonelink-erase' {
-    export import CommunicationPhonelinkErase = __MaterialUI.SvgIcon;
-    export default CommunicationPhonelinkErase;
-}
-
-declare module 'material-ui/svg-icons/communication/call' {
-    export import CommunicationCall = __MaterialUI.SvgIcon;
-    export default CommunicationCall;
-}
-
-declare module 'material-ui/svg-icons/communication/screen-share' {
-    export import CommunicationScreenShare = __MaterialUI.SvgIcon;
-    export default CommunicationScreenShare;
-}
-
-declare module 'material-ui/svg-icons/communication/clear-all' {
-    export import CommunicationClearAll = __MaterialUI.SvgIcon;
-    export default CommunicationClearAll;
-}
-
-declare module 'material-ui/svg-icons/communication/chat-bubble-outline' {
-    export import CommunicationChatBubbleOutline = __MaterialUI.SvgIcon;
-    export default CommunicationChatBubbleOutline;
-}
-
-declare module 'material-ui/svg-icons/communication/call-missed-outgoing' {
-    export import CommunicationCallMissedOutgoing = __MaterialUI.SvgIcon;
-    export default CommunicationCallMissedOutgoing;
-}
-
-declare module 'material-ui/svg-icons/communication/stay-primary-portrait' {
-    export import CommunicationStayPrimaryPortrait = __MaterialUI.SvgIcon;
-    export default CommunicationStayPrimaryPortrait;
-}
-
-declare module 'material-ui/svg-icons/communication/stay-current-portrait' {
-    export import CommunicationStayCurrentPortrait = __MaterialUI.SvgIcon;
-    export default CommunicationStayCurrentPortrait;
-}
-
-declare module 'material-ui/svg-icons/communication/voicemail' {
-    export import CommunicationVoicemail = __MaterialUI.SvgIcon;
-    export default CommunicationVoicemail;
-}
-
-declare module 'material-ui/svg-icons/communication/speaker-phone' {
-    export import CommunicationSpeakerPhone = __MaterialUI.SvgIcon;
-    export default CommunicationSpeakerPhone;
-}
-
-declare module 'material-ui/svg-icons/communication/call-split' {
-    export import CommunicationCallSplit = __MaterialUI.SvgIcon;
-    export default CommunicationCallSplit;
-}
-
-declare module 'material-ui/svg-icons/communication/live-help' {
-    export import CommunicationLiveHelp = __MaterialUI.SvgIcon;
-    export default CommunicationLiveHelp;
-}
-
-declare module 'material-ui/svg-icons/communication/call-made' {
-    export import CommunicationCallMade = __MaterialUI.SvgIcon;
-    export default CommunicationCallMade;
-}
-
-declare module 'material-ui/svg-icons/communication/phone' {
-    export import CommunicationPhone = __MaterialUI.SvgIcon;
-    export default CommunicationPhone;
-}
-
-declare module 'material-ui/svg-icons/communication/textsms' {
-    export import CommunicationTextsms = __MaterialUI.SvgIcon;
-    export default CommunicationTextsms;
-}
-
-declare module 'material-ui/svg-icons/communication/message' {
-    export import CommunicationMessage = __MaterialUI.SvgIcon;
-    export default CommunicationMessage;
-}
-
-declare module 'material-ui/svg-icons/communication/import-export' {
-    export import CommunicationImportExport = __MaterialUI.SvgIcon;
-    export default CommunicationImportExport;
-}
-
-declare module 'material-ui/svg-icons/communication/import-contacts' {
-    export import CommunicationImportContacts = __MaterialUI.SvgIcon;
-    export default CommunicationImportContacts;
-}
-
-declare module 'material-ui/svg-icons/communication/phonelink-ring' {
-    export import CommunicationPhonelinkRing = __MaterialUI.SvgIcon;
-    export default CommunicationPhonelinkRing;
-}
-
-declare module 'material-ui/svg-icons/communication/present-to-all' {
-    export import CommunicationPresentToAll = __MaterialUI.SvgIcon;
-    export default CommunicationPresentToAll;
-}
-
-declare module 'material-ui/svg-icons/communication/contact-phone' {
-    export import CommunicationContactPhone = __MaterialUI.SvgIcon;
-    export default CommunicationContactPhone;
-}
-
-declare module 'material-ui/svg-icons/communication/invert-colors-off' {
-    export import CommunicationInvertColorsOff = __MaterialUI.SvgIcon;
-    export default CommunicationInvertColorsOff;
-}
-
-declare module 'material-ui/svg-icons/communication/comment' {
-    export import CommunicationComment = __MaterialUI.SvgIcon;
-    export default CommunicationComment;
-}
-
-declare module 'material-ui/svg-icons/communication/chat-bubble' {
-    export import CommunicationChatBubble = __MaterialUI.SvgIcon;
-    export default CommunicationChatBubble;
-}
-
-declare module 'material-ui/svg-icons/communication/mail-outline' {
-    export import CommunicationMailOutline = __MaterialUI.SvgIcon;
-    export default CommunicationMailOutline;
-}
-
-declare module 'material-ui/svg-icons/communication/location-on' {
-    export import CommunicationLocationOn = __MaterialUI.SvgIcon;
-    export default CommunicationLocationOn;
-}
-
-declare module 'material-ui/svg-icons/communication/stay-current-landscape' {
-    export import CommunicationStayCurrentLandscape = __MaterialUI.SvgIcon;
-    export default CommunicationStayCurrentLandscape;
-}
-
-declare module 'material-ui/svg-icons/communication/location-off' {
-    export import CommunicationLocationOff = __MaterialUI.SvgIcon;
-    export default CommunicationLocationOff;
-}
-
-declare module 'material-ui/svg-icons/communication/email' {
-    export import CommunicationEmail = __MaterialUI.SvgIcon;
-    export default CommunicationEmail;
-}
-
-declare module 'material-ui/svg-icons/communication/call-end' {
-    export import CommunicationCallEnd = __MaterialUI.SvgIcon;
-    export default CommunicationCallEnd;
-}
-
-declare module 'material-ui/svg-icons/toggle/check-box' {
-    export import ToggleCheckBox = __MaterialUI.SvgIcon;
-    export default ToggleCheckBox;
-}
-
-declare module 'material-ui/svg-icons/toggle/star-half' {
-    export import ToggleStarHalf = __MaterialUI.SvgIcon;
-    export default ToggleStarHalf;
-}
-
-declare module 'material-ui/svg-icons/toggle/check-box-outline-blank' {
-    export import ToggleCheckBoxOutlineBlank = __MaterialUI.SvgIcon;
-    export default ToggleCheckBoxOutlineBlank;
-}
-
-declare module 'material-ui/svg-icons/toggle/star' {
-    export import ToggleStar = __MaterialUI.SvgIcon;
-    export default ToggleStar;
-}
-
-declare module 'material-ui/svg-icons/toggle/star-border' {
-    export import ToggleStarBorder = __MaterialUI.SvgIcon;
-    export default ToggleStarBorder;
-}
-
-declare module 'material-ui/svg-icons/toggle/radio-button-unchecked' {
-    export import ToggleRadioButtonUnchecked = __MaterialUI.SvgIcon;
-    export default ToggleRadioButtonUnchecked;
-}
-
-declare module 'material-ui/svg-icons/toggle/indeterminate-check-box' {
-    export import ToggleIndeterminateCheckBox = __MaterialUI.SvgIcon;
-    export default ToggleIndeterminateCheckBox;
-}
-
-declare module 'material-ui/svg-icons/toggle/radio-button-checked' {
-    export import ToggleRadioButtonChecked = __MaterialUI.SvgIcon;
-    export default ToggleRadioButtonChecked;
-}
-
-declare module 'material-ui/svg-icons/index' {
-    export import Index = __MaterialUI.SvgIcon;
-    export default Index;
-}
-
-declare module 'material-ui/svg-icons/index-generator' {
-    export import IndexGenerator = __MaterialUI.SvgIcon;
-    export default IndexGenerator;
-}
-
-declare module 'material-ui/svg-icons/alert/warning' {
-    export import AlertWarning = __MaterialUI.SvgIcon;
-    export default AlertWarning;
-}
-
-declare module 'material-ui/svg-icons/alert/add-alert' {
-    export import AlertAddAlert = __MaterialUI.SvgIcon;
-    export default AlertAddAlert;
-}
-
-declare module 'material-ui/svg-icons/alert/error-outline' {
-    export import AlertErrorOutline = __MaterialUI.SvgIcon;
-    export default AlertErrorOutline;
-}
-
-declare module 'material-ui/svg-icons/alert/error' {
-    export import AlertError = __MaterialUI.SvgIcon;
-    export default AlertError;
-}
-
-declare module 'material-ui/svg-icons/file/file-upload' {
-    export import FileFileUpload = __MaterialUI.SvgIcon;
-    export default FileFileUpload;
-}
-
-declare module 'material-ui/svg-icons/file/cloud-upload' {
-    export import FileCloudUpload = __MaterialUI.SvgIcon;
-    export default FileCloudUpload;
-}
-
-declare module 'material-ui/svg-icons/file/cloud-done' {
-    export import FileCloudDone = __MaterialUI.SvgIcon;
-    export default FileCloudDone;
-}
-
-declare module 'material-ui/svg-icons/file/folder-open' {
-    export import FileFolderOpen = __MaterialUI.SvgIcon;
-    export default FileFolderOpen;
-}
-
-declare module 'material-ui/svg-icons/file/cloud-off' {
-    export import FileCloudOff = __MaterialUI.SvgIcon;
-    export default FileCloudOff;
-}
-
-declare module 'material-ui/svg-icons/file/cloud-queue' {
-    export import FileCloudQueue = __MaterialUI.SvgIcon;
-    export default FileCloudQueue;
-}
-
-declare module 'material-ui/svg-icons/file/folder-shared' {
-    export import FileFolderShared = __MaterialUI.SvgIcon;
-    export default FileFolderShared;
-}
-
-declare module 'material-ui/svg-icons/file/cloud-circle' {
-    export import FileCloudCircle = __MaterialUI.SvgIcon;
-    export default FileCloudCircle;
-}
-
-declare module 'material-ui/svg-icons/file/folder' {
-    export import FileFolder = __MaterialUI.SvgIcon;
-    export default FileFolder;
-}
-
-declare module 'material-ui/svg-icons/file/attachment' {
-    export import FileAttachment = __MaterialUI.SvgIcon;
-    export default FileAttachment;
-}
-
-declare module 'material-ui/svg-icons/file/create-new-folder' {
-    export import FileCreateNewFolder = __MaterialUI.SvgIcon;
-    export default FileCreateNewFolder;
-}
-
-declare module 'material-ui/svg-icons/file/cloud-download' {
-    export import FileCloudDownload = __MaterialUI.SvgIcon;
-    export default FileCloudDownload;
-}
-
-declare module 'material-ui/svg-icons/file/cloud' {
-    export import FileCloud = __MaterialUI.SvgIcon;
-    export default FileCloud;
-}
-
-declare module 'material-ui/svg-icons/file/file-download' {
-    export import FileFileDownload = __MaterialUI.SvgIcon;
-    export default FileFileDownload;
-}
-
-declare module 'material-ui/svg-icons/navigation-arrow-drop-right' {
-    export import NavigationArrowDropRight = __MaterialUI.SvgIcon;
-    export default NavigationArrowDropRight;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard' {
-    export import HardwareKeyboard = __MaterialUI.SvgIcon;
-    export default HardwareKeyboard;
-}
-
-declare module 'material-ui/svg-icons/hardware/toys' {
-    export import HardwareToys = __MaterialUI.SvgIcon;
-    export default HardwareToys;
-}
-
-declare module 'material-ui/svg-icons/hardware/dock' {
-    export import HardwareDock = __MaterialUI.SvgIcon;
-    export default HardwareDock;
-}
-
-declare module 'material-ui/svg-icons/hardware/headset' {
-    export import HardwareHeadset = __MaterialUI.SvgIcon;
-    export default HardwareHeadset;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-voice' {
-    export import HardwareKeyboardVoice = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardVoice;
-}
-
-declare module 'material-ui/svg-icons/hardware/phonelink-off' {
-    export import HardwarePhonelinkOff = __MaterialUI.SvgIcon;
-    export default HardwarePhonelinkOff;
-}
-
-declare module 'material-ui/svg-icons/hardware/speaker-group' {
-    export import HardwareSpeakerGroup = __MaterialUI.SvgIcon;
-    export default HardwareSpeakerGroup;
-}
-
-declare module 'material-ui/svg-icons/hardware/desktop-windows' {
-    export import HardwareDesktopWindows = __MaterialUI.SvgIcon;
-    export default HardwareDesktopWindows;
-}
-
-declare module 'material-ui/svg-icons/hardware/laptop-mac' {
-    export import HardwareLaptopMac = __MaterialUI.SvgIcon;
-    export default HardwareLaptopMac;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-return' {
-    export import HardwareKeyboardReturn = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardReturn;
-}
-
-declare module 'material-ui/svg-icons/hardware/gamepad' {
-    export import HardwareGamepad = __MaterialUI.SvgIcon;
-    export default HardwareGamepad;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-arrow-up' {
-    export import HardwareKeyboardArrowUp = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardArrowUp;
-}
-
-declare module 'material-ui/svg-icons/hardware/laptop' {
-    export import HardwareLaptop = __MaterialUI.SvgIcon;
-    export default HardwareLaptop;
-}
-
-declare module 'material-ui/svg-icons/hardware/phone-iphone' {
-    export import HardwarePhoneIphone = __MaterialUI.SvgIcon;
-    export default HardwarePhoneIphone;
-}
-
-declare module 'material-ui/svg-icons/hardware/memory' {
-    export import HardwareMemory = __MaterialUI.SvgIcon;
-    export default HardwareMemory;
-}
-
-declare module 'material-ui/svg-icons/hardware/security' {
-    export import HardwareSecurity = __MaterialUI.SvgIcon;
-    export default HardwareSecurity;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-capslock' {
-    export import HardwareKeyboardCapslock = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardCapslock;
-}
-
-declare module 'material-ui/svg-icons/hardware/sim-card' {
-    export import HardwareSimCard = __MaterialUI.SvgIcon;
-    export default HardwareSimCard;
-}
-
-declare module 'material-ui/svg-icons/hardware/devices-other' {
-    export import HardwareDevicesOther = __MaterialUI.SvgIcon;
-    export default HardwareDevicesOther;
-}
-
-declare module 'material-ui/svg-icons/hardware/tablet-android' {
-    export import HardwareTabletAndroid = __MaterialUI.SvgIcon;
-    export default HardwareTabletAndroid;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-arrow-right' {
-    export import HardwareKeyboardArrowRight = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardArrowRight;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-tab' {
-    export import HardwareKeyboardTab = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardTab;
-}
-
-declare module 'material-ui/svg-icons/hardware/watch' {
-    export import HardwareWatch = __MaterialUI.SvgIcon;
-    export default HardwareWatch;
-}
-
-declare module 'material-ui/svg-icons/hardware/speaker' {
-    export import HardwareSpeaker = __MaterialUI.SvgIcon;
-    export default HardwareSpeaker;
-}
-
-declare module 'material-ui/svg-icons/hardware/phonelink' {
-    export import HardwarePhonelink = __MaterialUI.SvgIcon;
-    export default HardwarePhonelink;
-}
-
-declare module 'material-ui/svg-icons/hardware/laptop-windows' {
-    export import HardwareLaptopWindows = __MaterialUI.SvgIcon;
-    export default HardwareLaptopWindows;
-}
-
-declare module 'material-ui/svg-icons/hardware/tv' {
-    export import HardwareTv = __MaterialUI.SvgIcon;
-    export default HardwareTv;
-}
-
-declare module 'material-ui/svg-icons/hardware/headset-mic' {
-    export import HardwareHeadsetMic = __MaterialUI.SvgIcon;
-    export default HardwareHeadsetMic;
-}
-
-declare module 'material-ui/svg-icons/hardware/videogame-asset' {
-    export import HardwareVideogameAsset = __MaterialUI.SvgIcon;
-    export default HardwareVideogameAsset;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-arrow-down' {
-    export import HardwareKeyboardArrowDown = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardArrowDown;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-hide' {
-    export import HardwareKeyboardHide = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardHide;
-}
-
-declare module 'material-ui/svg-icons/hardware/scanner' {
-    export import HardwareScanner = __MaterialUI.SvgIcon;
-    export default HardwareScanner;
-}
-
-declare module 'material-ui/svg-icons/hardware/laptop-chromebook' {
-    export import HardwareLaptopChromebook = __MaterialUI.SvgIcon;
-    export default HardwareLaptopChromebook;
-}
-
-declare module 'material-ui/svg-icons/hardware/tablet-mac' {
-    export import HardwareTabletMac = __MaterialUI.SvgIcon;
-    export default HardwareTabletMac;
-}
-
-declare module 'material-ui/svg-icons/hardware/cast' {
-    export import HardwareCast = __MaterialUI.SvgIcon;
-    export default HardwareCast;
-}
-
-declare module 'material-ui/svg-icons/hardware/cast-connected' {
-    export import HardwareCastConnected = __MaterialUI.SvgIcon;
-    export default HardwareCastConnected;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-arrow-left' {
-    export import HardwareKeyboardArrowLeft = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardArrowLeft;
-}
-
-declare module 'material-ui/svg-icons/hardware/phone-android' {
-    export import HardwarePhoneAndroid = __MaterialUI.SvgIcon;
-    export default HardwarePhoneAndroid;
-}
-
-declare module 'material-ui/svg-icons/hardware/computer' {
-    export import HardwareComputer = __MaterialUI.SvgIcon;
-    export default HardwareComputer;
-}
-
-declare module 'material-ui/svg-icons/hardware/power-input' {
-    export import HardwarePowerInput = __MaterialUI.SvgIcon;
-    export default HardwarePowerInput;
-}
-
-declare module 'material-ui/svg-icons/hardware/smartphone' {
-    export import HardwareSmartphone = __MaterialUI.SvgIcon;
-    export default HardwareSmartphone;
-}
-
-declare module 'material-ui/svg-icons/hardware/router' {
-    export import HardwareRouter = __MaterialUI.SvgIcon;
-    export default HardwareRouter;
-}
-
-declare module 'material-ui/svg-icons/hardware/keyboard-backspace' {
-    export import HardwareKeyboardBackspace = __MaterialUI.SvgIcon;
-    export default HardwareKeyboardBackspace;
-}
-
-declare module 'material-ui/svg-icons/hardware/developer-board' {
-    export import HardwareDeveloperBoard = __MaterialUI.SvgIcon;
-    export default HardwareDeveloperBoard;
-}
-
-declare module 'material-ui/svg-icons/hardware/device-hub' {
-    export import HardwareDeviceHub = __MaterialUI.SvgIcon;
-    export default HardwareDeviceHub;
-}
-
-declare module 'material-ui/svg-icons/hardware/mouse' {
-    export import HardwareMouse = __MaterialUI.SvgIcon;
-    export default HardwareMouse;
-}
-
-declare module 'material-ui/svg-icons/hardware/desktop-mac' {
-    export import HardwareDesktopMac = __MaterialUI.SvgIcon;
-    export default HardwareDesktopMac;
-}
-
-declare module 'material-ui/svg-icons/hardware/tablet' {
-    export import HardwareTablet = __MaterialUI.SvgIcon;
-    export default HardwareTablet;
-}
-
-declare module 'material-ui/svg-icons/content/add-box' {
-    export import ContentAddBox = __MaterialUI.SvgIcon;
-    export default ContentAddBox;
-}
-
-declare module 'material-ui/svg-icons/content/filter-list' {
-    export import ContentFilterList = __MaterialUI.SvgIcon;
-    export default ContentFilterList;
-}
-
-declare module 'material-ui/svg-icons/content/save' {
-    export import ContentSave = __MaterialUI.SvgIcon;
-    export default ContentSave;
-}
-
-declare module 'material-ui/svg-icons/content/unarchive' {
-    export import ContentUnarchive = __MaterialUI.SvgIcon;
-    export default ContentUnarchive;
-}
-
-declare module 'material-ui/svg-icons/content/link' {
-    export import ContentLink = __MaterialUI.SvgIcon;
-    export default ContentLink;
-}
-
-declare module 'material-ui/svg-icons/content/sort' {
-    export import ContentSort = __MaterialUI.SvgIcon;
-    export default ContentSort;
-}
-
-declare module 'material-ui/svg-icons/content/text-format' {
-    export import ContentTextFormat = __MaterialUI.SvgIcon;
-    export default ContentTextFormat;
-}
-
-declare module 'material-ui/svg-icons/content/add' {
-    export import ContentAdd = __MaterialUI.SvgIcon;
-    export default ContentAdd;
-}
-
-declare module 'material-ui/svg-icons/content/send' {
-    export import ContentSend = __MaterialUI.SvgIcon;
-    export default ContentSend;
-}
-
-declare module 'material-ui/svg-icons/content/gesture' {
-    export import ContentGesture = __MaterialUI.SvgIcon;
-    export default ContentGesture;
-}
-
-declare module 'material-ui/svg-icons/content/archive' {
-    export import ContentArchive = __MaterialUI.SvgIcon;
-    export default ContentArchive;
-}
-
-declare module 'material-ui/svg-icons/content/weekend' {
-    export import ContentWeekend = __MaterialUI.SvgIcon;
-    export default ContentWeekend;
-}
-
-declare module 'material-ui/svg-icons/content/markunread' {
-    export import ContentMarkunread = __MaterialUI.SvgIcon;
-    export default ContentMarkunread;
-}
-
-declare module 'material-ui/svg-icons/content/create' {
-    export import ContentCreate = __MaterialUI.SvgIcon;
-    export default ContentCreate;
-}
-
-declare module 'material-ui/svg-icons/content/content-cut' {
-    export import ContentContentCut = __MaterialUI.SvgIcon;
-    export default ContentContentCut;
-}
-
-declare module 'material-ui/svg-icons/content/clear' {
-    export import ContentClear = __MaterialUI.SvgIcon;
-    export default ContentClear;
-}
-
-declare module 'material-ui/svg-icons/content/redo' {
-    export import ContentRedo = __MaterialUI.SvgIcon;
-    export default ContentRedo;
-}
-
-declare module 'material-ui/svg-icons/content/block' {
-    export import ContentBlock = __MaterialUI.SvgIcon;
-    export default ContentBlock;
-}
-
-declare module 'material-ui/svg-icons/content/forward' {
-    export import ContentForward = __MaterialUI.SvgIcon;
-    export default ContentForward;
-}
-
-declare module 'material-ui/svg-icons/content/mail' {
-    export import ContentMail = __MaterialUI.SvgIcon;
-    export default ContentMail;
-}
-
-declare module 'material-ui/svg-icons/content/inbox' {
-    export import ContentInbox = __MaterialUI.SvgIcon;
-    export default ContentInbox;
-}
-
-declare module 'material-ui/svg-icons/content/remove-circle' {
-    export import ContentRemoveCircle = __MaterialUI.SvgIcon;
-    export default ContentRemoveCircle;
-}
-
-declare module 'material-ui/svg-icons/content/move-to-inbox' {
-    export import ContentMoveToInbox = __MaterialUI.SvgIcon;
-    export default ContentMoveToInbox;
-}
-
-declare module 'material-ui/svg-icons/content/flag' {
-    export import ContentFlag = __MaterialUI.SvgIcon;
-    export default ContentFlag;
-}
-
-declare module 'material-ui/svg-icons/content/reply-all' {
-    export import ContentReplyAll = __MaterialUI.SvgIcon;
-    export default ContentReplyAll;
-}
-
-declare module 'material-ui/svg-icons/content/remove' {
-    export import ContentRemove = __MaterialUI.SvgIcon;
-    export default ContentRemove;
-}
-
-declare module 'material-ui/svg-icons/content/next-week' {
-    export import ContentNextWeek = __MaterialUI.SvgIcon;
-    export default ContentNextWeek;
-}
-
-declare module 'material-ui/svg-icons/content/undo' {
-    export import ContentUndo = __MaterialUI.SvgIcon;
-    export default ContentUndo;
-}
-
-declare module 'material-ui/svg-icons/content/font-download' {
-    export import ContentFontDownload = __MaterialUI.SvgIcon;
-    export default ContentFontDownload;
-}
-
-declare module 'material-ui/svg-icons/content/remove-circle-outline' {
-    export import ContentRemoveCircleOutline = __MaterialUI.SvgIcon;
-    export default ContentRemoveCircleOutline;
-}
-
-declare module 'material-ui/svg-icons/content/backspace' {
-    export import ContentBackspace = __MaterialUI.SvgIcon;
-    export default ContentBackspace;
-}
-
-declare module 'material-ui/svg-icons/content/reply' {
-    export import ContentReply = __MaterialUI.SvgIcon;
-    export default ContentReply;
-}
-
-declare module 'material-ui/svg-icons/content/report' {
-    export import ContentReport = __MaterialUI.SvgIcon;
-    export default ContentReport;
-}
-
-declare module 'material-ui/svg-icons/content/add-circle' {
-    export import ContentAddCircle = __MaterialUI.SvgIcon;
-    export default ContentAddCircle;
-}
-
-declare module 'material-ui/svg-icons/content/content-copy' {
-    export import ContentContentCopy = __MaterialUI.SvgIcon;
-    export default ContentContentCopy;
-}
-
-declare module 'material-ui/svg-icons/content/content-paste' {
-    export import ContentContentPaste = __MaterialUI.SvgIcon;
-    export default ContentContentPaste;
-}
-
-declare module 'material-ui/svg-icons/content/select-all' {
-    export import ContentSelectAll = __MaterialUI.SvgIcon;
-    export default ContentSelectAll;
-}
-
-declare module 'material-ui/svg-icons/content/add-circle-outline' {
-    export import ContentAddCircleOutline = __MaterialUI.SvgIcon;
-    export default ContentAddCircleOutline;
-}
-
-declare module 'material-ui/svg-icons/content/drafts' {
-    export import ContentDrafts = __MaterialUI.SvgIcon;
-    export default ContentDrafts;
-}
-
-declare module 'material-ui/svg-icons/editor/wrap-text' {
-    export import EditorWrapText = __MaterialUI.SvgIcon;
-    export default EditorWrapText;
-}
-
-declare module 'material-ui/svg-icons/editor/format-size' {
-    export import EditorFormatSize = __MaterialUI.SvgIcon;
-    export default EditorFormatSize;
-}
-
-declare module 'material-ui/svg-icons/editor/functions' {
-    export import EditorFunctions = __MaterialUI.SvgIcon;
-    export default EditorFunctions;
-}
-
-declare module 'material-ui/svg-icons/editor/format-bold' {
-    export import EditorFormatBold = __MaterialUI.SvgIcon;
-    export default EditorFormatBold;
-}
-
-declare module 'material-ui/svg-icons/editor/format-align-center' {
-    export import EditorFormatAlignCenter = __MaterialUI.SvgIcon;
-    export default EditorFormatAlignCenter;
-}
-
-declare module 'material-ui/svg-icons/editor/mode-comment' {
-    export import EditorModeComment = __MaterialUI.SvgIcon;
-    export default EditorModeComment;
-}
-
-declare module 'material-ui/svg-icons/editor/money-off' {
-    export import EditorMoneyOff = __MaterialUI.SvgIcon;
-    export default EditorMoneyOff;
-}
-
-declare module 'material-ui/svg-icons/editor/format-textdirection-r-to-l' {
-    export import EditorFormatTextdirectionRToL = __MaterialUI.SvgIcon;
-    export default EditorFormatTextdirectionRToL;
-}
-
-declare module 'material-ui/svg-icons/editor/insert-drive-file' {
-    export import EditorInsertDriveFile = __MaterialUI.SvgIcon;
-    export default EditorInsertDriveFile;
-}
-
-declare module 'material-ui/svg-icons/editor/highlight' {
-    export import EditorHighlight = __MaterialUI.SvgIcon;
-    export default EditorHighlight;
-}
-
-declare module 'material-ui/svg-icons/editor/format-clear' {
-    export import EditorFormatClear = __MaterialUI.SvgIcon;
-    export default EditorFormatClear;
-}
-
-declare module 'material-ui/svg-icons/editor/border-style' {
-    export import EditorBorderStyle = __MaterialUI.SvgIcon;
-    export default EditorBorderStyle;
-}
-
-declare module 'material-ui/svg-icons/editor/format-shapes' {
-    export import EditorFormatShapes = __MaterialUI.SvgIcon;
-    export default EditorFormatShapes;
-}
-
-declare module 'material-ui/svg-icons/editor/format-paint' {
-    export import EditorFormatPaint = __MaterialUI.SvgIcon;
-    export default EditorFormatPaint;
-}
-
-declare module 'material-ui/svg-icons/editor/linear-scale' {
-    export import EditorLinearScale = __MaterialUI.SvgIcon;
-    export default EditorLinearScale;
-}
-
-declare module 'material-ui/svg-icons/editor/insert-photo' {
-    export import EditorInsertPhoto = __MaterialUI.SvgIcon;
-    export default EditorInsertPhoto;
-}
-
-declare module 'material-ui/svg-icons/editor/drag-handle' {
-    export import EditorDragHandle = __MaterialUI.SvgIcon;
-    export default EditorDragHandle;
-}
-
-declare module 'material-ui/svg-icons/editor/merge-type' {
-    export import EditorMergeType = __MaterialUI.SvgIcon;
-    export default EditorMergeType;
-}
-
-declare module 'material-ui/svg-icons/editor/attach-money' {
-    export import EditorAttachMoney = __MaterialUI.SvgIcon;
-    export default EditorAttachMoney;
-}
-
-declare module 'material-ui/svg-icons/editor/border-vertical' {
-    export import EditorBorderVertical = __MaterialUI.SvgIcon;
-    export default EditorBorderVertical;
-}
-
-declare module 'material-ui/svg-icons/editor/format-indent-decrease' {
-    export import EditorFormatIndentDecrease = __MaterialUI.SvgIcon;
-    export default EditorFormatIndentDecrease;
-}
-
-declare module 'material-ui/svg-icons/editor/insert-emoticon' {
-    export import EditorInsertEmoticon = __MaterialUI.SvgIcon;
-    export default EditorInsertEmoticon;
-}
-
-declare module 'material-ui/svg-icons/editor/insert-invitation' {
-    export import EditorInsertInvitation = __MaterialUI.SvgIcon;
-    export default EditorInsertInvitation;
-}
-
-declare module 'material-ui/svg-icons/editor/format-color-fill' {
-    export import EditorFormatColorFill = __MaterialUI.SvgIcon;
-    export default EditorFormatColorFill;
-}
-
-declare module 'material-ui/svg-icons/editor/mode-edit' {
-    export import EditorModeEdit = __MaterialUI.SvgIcon;
-    export default EditorModeEdit;
-}
-
-declare module 'material-ui/svg-icons/editor/vertical-align-bottom' {
-    export import EditorVerticalAlignBottom = __MaterialUI.SvgIcon;
-    export default EditorVerticalAlignBottom;
-}
-
-declare module 'material-ui/svg-icons/editor/format-align-justify' {
-    export import EditorFormatAlignJustify = __MaterialUI.SvgIcon;
-    export default EditorFormatAlignJustify;
-}
-
-declare module 'material-ui/svg-icons/editor/attach-file' {
-    export import EditorAttachFile = __MaterialUI.SvgIcon;
-    export default EditorAttachFile;
-}
-
-declare module 'material-ui/svg-icons/editor/space-bar' {
-    export import EditorSpaceBar = __MaterialUI.SvgIcon;
-    export default EditorSpaceBar;
-}
-
-declare module 'material-ui/svg-icons/editor/border-clear' {
-    export import EditorBorderClear = __MaterialUI.SvgIcon;
-    export default EditorBorderClear;
-}
-
-declare module 'material-ui/svg-icons/editor/short-text' {
-    export import EditorShortText = __MaterialUI.SvgIcon;
-    export default EditorShortText;
-}
-
-declare module 'material-ui/svg-icons/editor/insert-link' {
-    export import EditorInsertLink = __MaterialUI.SvgIcon;
-    export default EditorInsertLink;
-}
-
-declare module 'material-ui/svg-icons/editor/format-list-numbered' {
-    export import EditorFormatListNumbered = __MaterialUI.SvgIcon;
-    export default EditorFormatListNumbered;
-}
-
-declare module 'material-ui/svg-icons/editor/format-quote' {
-    export import EditorFormatQuote = __MaterialUI.SvgIcon;
-    export default EditorFormatQuote;
-}
-
-declare module 'material-ui/svg-icons/editor/border-left' {
-    export import EditorBorderLeft = __MaterialUI.SvgIcon;
-    export default EditorBorderLeft;
-}
-
-declare module 'material-ui/svg-icons/editor/format-underlined' {
-    export import EditorFormatUnderlined = __MaterialUI.SvgIcon;
-    export default EditorFormatUnderlined;
-}
-
-declare module 'material-ui/svg-icons/editor/text-fields' {
-    export import EditorTextFields = __MaterialUI.SvgIcon;
-    export default EditorTextFields;
-}
-
-declare module 'material-ui/svg-icons/editor/format-italic' {
-    export import EditorFormatItalic = __MaterialUI.SvgIcon;
-    export default EditorFormatItalic;
-}
-
-declare module 'material-ui/svg-icons/editor/publish' {
-    export import EditorPublish = __MaterialUI.SvgIcon;
-    export default EditorPublish;
-}
-
-declare module 'material-ui/svg-icons/editor/border-top' {
-    export import EditorBorderTop = __MaterialUI.SvgIcon;
-    export default EditorBorderTop;
-}
-
-declare module 'material-ui/svg-icons/editor/format-indent-increase' {
-    export import EditorFormatIndentIncrease = __MaterialUI.SvgIcon;
-    export default EditorFormatIndentIncrease;
-}
-
-declare module 'material-ui/svg-icons/editor/border-bottom' {
-    export import EditorBorderBottom = __MaterialUI.SvgIcon;
-    export default EditorBorderBottom;
-}
-
-declare module 'material-ui/svg-icons/editor/format-align-right' {
-    export import EditorFormatAlignRight = __MaterialUI.SvgIcon;
-    export default EditorFormatAlignRight;
-}
-
-declare module 'material-ui/svg-icons/editor/border-right' {
-    export import EditorBorderRight = __MaterialUI.SvgIcon;
-    export default EditorBorderRight;
-}
-
-declare module 'material-ui/svg-icons/editor/insert-comment' {
-    export import EditorInsertComment = __MaterialUI.SvgIcon;
-    export default EditorInsertComment;
-}
-
-declare module 'material-ui/svg-icons/editor/strikethrough-s' {
-    export import EditorStrikethroughS = __MaterialUI.SvgIcon;
-    export default EditorStrikethroughS;
-}
-
-declare module 'material-ui/svg-icons/editor/format-strikethrough' {
-    export import EditorFormatStrikethrough = __MaterialUI.SvgIcon;
-    export default EditorFormatStrikethrough;
-}
-
-declare module 'material-ui/svg-icons/editor/insert-chart' {
-    export import EditorInsertChart = __MaterialUI.SvgIcon;
-    export default EditorInsertChart;
-}
-
-declare module 'material-ui/svg-icons/editor/format-color-reset' {
-    export import EditorFormatColorReset = __MaterialUI.SvgIcon;
-    export default EditorFormatColorReset;
-}
-
-declare module 'material-ui/svg-icons/editor/border-inner' {
-    export import EditorBorderInner = __MaterialUI.SvgIcon;
-    export default EditorBorderInner;
-}
-
-declare module 'material-ui/svg-icons/editor/format-color-text' {
-    export import EditorFormatColorText = __MaterialUI.SvgIcon;
-    export default EditorFormatColorText;
-}
-
-declare module 'material-ui/svg-icons/editor/border-horizontal' {
-    export import EditorBorderHorizontal = __MaterialUI.SvgIcon;
-    export default EditorBorderHorizontal;
-}
-
-declare module 'material-ui/svg-icons/editor/format-list-bulleted' {
-    export import EditorFormatListBulleted = __MaterialUI.SvgIcon;
-    export default EditorFormatListBulleted;
-}
-
-declare module 'material-ui/svg-icons/editor/border-outer' {
-    export import EditorBorderOuter = __MaterialUI.SvgIcon;
-    export default EditorBorderOuter;
-}
-
-declare module 'material-ui/svg-icons/editor/format-align-left' {
-    export import EditorFormatAlignLeft = __MaterialUI.SvgIcon;
-    export default EditorFormatAlignLeft;
-}
-
-declare module 'material-ui/svg-icons/editor/border-color' {
-    export import EditorBorderColor = __MaterialUI.SvgIcon;
-    export default EditorBorderColor;
-}
-
-declare module 'material-ui/svg-icons/editor/format-textdirection-l-to-r' {
-    export import EditorFormatTextdirectionLToR = __MaterialUI.SvgIcon;
-    export default EditorFormatTextdirectionLToR;
-}
-
-declare module 'material-ui/svg-icons/editor/vertical-align-center' {
-    export import EditorVerticalAlignCenter = __MaterialUI.SvgIcon;
-    export default EditorVerticalAlignCenter;
-}
-
-declare module 'material-ui/svg-icons/editor/vertical-align-top' {
-    export import EditorVerticalAlignTop = __MaterialUI.SvgIcon;
-    export default EditorVerticalAlignTop;
-}
-
-declare module 'material-ui/svg-icons/editor/format-line-spacing' {
-    export import EditorFormatLineSpacing = __MaterialUI.SvgIcon;
-    export default EditorFormatLineSpacing;
-}
-
-declare module 'material-ui/svg-icons/editor/border-all' {
-    export import EditorBorderAll = __MaterialUI.SvgIcon;
-    export default EditorBorderAll;
-}
-
-declare module 'material-ui/svg-icons/device/screen-lock-portrait' {
-    export import DeviceScreenLockPortrait = __MaterialUI.SvgIcon;
-    export default DeviceScreenLockPortrait;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-off' {
-    export import DeviceSignalCellularOff = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularOff;
-}
-
-declare module 'material-ui/svg-icons/device/bluetooth-searching' {
-    export import DeviceBluetoothSearching = __MaterialUI.SvgIcon;
-    export default DeviceBluetoothSearching;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-3-bar' {
-    export import DeviceSignalCellular3Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellular3Bar;
-}
-
-declare module 'material-ui/svg-icons/device/network-cell' {
-    export import DeviceNetworkCell = __MaterialUI.SvgIcon;
-    export default DeviceNetworkCell;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-no-sim' {
-    export import DeviceSignalCellularNoSim = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularNoSim;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-2-bar' {
-    export import DeviceSignalWifi2Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi2Bar;
-}
-
-declare module 'material-ui/svg-icons/device/devices' {
-    export import DeviceDevices = __MaterialUI.SvgIcon;
-    export default DeviceDevices;
-}
-
-declare module 'material-ui/svg-icons/device/battery-90' {
-    export import DeviceBattery90 = __MaterialUI.SvgIcon;
-    export default DeviceBattery90;
-}
-
-declare module 'material-ui/svg-icons/device/battery-charging-80' {
-    export import DeviceBatteryCharging80 = __MaterialUI.SvgIcon;
-    export default DeviceBatteryCharging80;
-}
-
-declare module 'material-ui/svg-icons/device/location-searching' {
-    export import DeviceLocationSearching = __MaterialUI.SvgIcon;
-    export default DeviceLocationSearching;
-}
-
-declare module 'material-ui/svg-icons/device/wallpaper' {
-    export import DeviceWallpaper = __MaterialUI.SvgIcon;
-    export default DeviceWallpaper;
-}
-
-declare module 'material-ui/svg-icons/device/screen-lock-rotation' {
-    export import DeviceScreenLockRotation = __MaterialUI.SvgIcon;
-    export default DeviceScreenLockRotation;
-}
-
-declare module 'material-ui/svg-icons/device/screen-lock-landscape' {
-    export import DeviceScreenLockLandscape = __MaterialUI.SvgIcon;
-    export default DeviceScreenLockLandscape;
-}
-
-declare module 'material-ui/svg-icons/device/battery-charging-20' {
-    export import DeviceBatteryCharging20 = __MaterialUI.SvgIcon;
-    export default DeviceBatteryCharging20;
-}
-
-declare module 'material-ui/svg-icons/device/usb' {
-    export import DeviceUsb = __MaterialUI.SvgIcon;
-    export default DeviceUsb;
-}
-
-declare module 'material-ui/svg-icons/device/airplanemode-active' {
-    export import DeviceAirplanemodeActive = __MaterialUI.SvgIcon;
-    export default DeviceAirplanemodeActive;
-}
-
-declare module 'material-ui/svg-icons/device/network-wifi' {
-    export import DeviceNetworkWifi = __MaterialUI.SvgIcon;
-    export default DeviceNetworkWifi;
-}
-
-declare module 'material-ui/svg-icons/device/graphic-eq' {
-    export import DeviceGraphicEq = __MaterialUI.SvgIcon;
-    export default DeviceGraphicEq;
-}
-
-declare module 'material-ui/svg-icons/device/bluetooth-connected' {
-    export import DeviceBluetoothConnected = __MaterialUI.SvgIcon;
-    export default DeviceBluetoothConnected;
-}
-
-declare module 'material-ui/svg-icons/device/gps-fixed' {
-    export import DeviceGpsFixed = __MaterialUI.SvgIcon;
-    export default DeviceGpsFixed;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-connected-no-internet-4-bar' {
-    export import DeviceSignalCellularConnectedNoInternet4Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularConnectedNoInternet4Bar;
-}
-
-declare module 'material-ui/svg-icons/device/brightness-medium' {
-    export import DeviceBrightnessMedium = __MaterialUI.SvgIcon;
-    export default DeviceBrightnessMedium;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-connected-no-internet-3-bar' {
-    export import DeviceSignalCellularConnectedNoInternet3Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularConnectedNoInternet3Bar;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-3-bar-lock' {
-    export import DeviceSignalWifi3BarLock = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi3BarLock;
-}
-
-declare module 'material-ui/svg-icons/device/battery-80' {
-    export import DeviceBattery80 = __MaterialUI.SvgIcon;
-    export default DeviceBattery80;
-}
-
-declare module 'material-ui/svg-icons/device/wifi-lock' {
-    export import DeviceWifiLock = __MaterialUI.SvgIcon;
-    export default DeviceWifiLock;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-2-bar-lock' {
-    export import DeviceSignalWifi2BarLock = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi2BarLock;
-}
-
-declare module 'material-ui/svg-icons/device/bluetooth' {
-    export import DeviceBluetooth = __MaterialUI.SvgIcon;
-    export default DeviceBluetooth;
-}
-
-declare module 'material-ui/svg-icons/device/access-time' {
-    export import DeviceAccessTime = __MaterialUI.SvgIcon;
-    export default DeviceAccessTime;
-}
-
-declare module 'material-ui/svg-icons/device/battery-charging-30' {
-    export import DeviceBatteryCharging30 = __MaterialUI.SvgIcon;
-    export default DeviceBatteryCharging30;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-off' {
-    export import DeviceSignalWifiOff = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifiOff;
-}
-
-declare module 'material-ui/svg-icons/device/dvr' {
-    export import DeviceDvr = __MaterialUI.SvgIcon;
-    export default DeviceDvr;
-}
-
-declare module 'material-ui/svg-icons/device/battery-60' {
-    export import DeviceBattery60 = __MaterialUI.SvgIcon;
-    export default DeviceBattery60;
-}
-
-declare module 'material-ui/svg-icons/device/access-alarm' {
-    export import DeviceAccessAlarm = __MaterialUI.SvgIcon;
-    export default DeviceAccessAlarm;
-}
-
-declare module 'material-ui/svg-icons/device/nfc' {
-    export import DeviceNfc = __MaterialUI.SvgIcon;
-    export default DeviceNfc;
-}
-
-declare module 'material-ui/svg-icons/device/data-usage' {
-    export import DeviceDataUsage = __MaterialUI.SvgIcon;
-    export default DeviceDataUsage;
-}
-
-declare module 'material-ui/svg-icons/device/access-alarms' {
-    export import DeviceAccessAlarms = __MaterialUI.SvgIcon;
-    export default DeviceAccessAlarms;
-}
-
-declare module 'material-ui/svg-icons/device/battery-full' {
-    export import DeviceBatteryFull = __MaterialUI.SvgIcon;
-    export default DeviceBatteryFull;
-}
-
-declare module 'material-ui/svg-icons/device/battery-charging-full' {
-    export import DeviceBatteryChargingFull = __MaterialUI.SvgIcon;
-    export default DeviceBatteryChargingFull;
-}
-
-declare module 'material-ui/svg-icons/device/settings-system-daydream' {
-    export import DeviceSettingsSystemDaydream = __MaterialUI.SvgIcon;
-    export default DeviceSettingsSystemDaydream;
-}
-
-declare module 'material-ui/svg-icons/device/battery-std' {
-    export import DeviceBatteryStd = __MaterialUI.SvgIcon;
-    export default DeviceBatteryStd;
-}
-
-declare module 'material-ui/svg-icons/device/battery-unknown' {
-    export import DeviceBatteryUnknown = __MaterialUI.SvgIcon;
-    export default DeviceBatteryUnknown;
-}
-
-declare module 'material-ui/svg-icons/device/add-alarm' {
-    export import DeviceAddAlarm = __MaterialUI.SvgIcon;
-    export default DeviceAddAlarm;
-}
-
-declare module 'material-ui/svg-icons/device/storage' {
-    export import DeviceStorage = __MaterialUI.SvgIcon;
-    export default DeviceStorage;
-}
-
-declare module 'material-ui/svg-icons/device/battery-charging-90' {
-    export import DeviceBatteryCharging90 = __MaterialUI.SvgIcon;
-    export default DeviceBatteryCharging90;
-}
-
-declare module 'material-ui/svg-icons/device/screen-rotation' {
-    export import DeviceScreenRotation = __MaterialUI.SvgIcon;
-    export default DeviceScreenRotation;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-4-bar' {
-    export import DeviceSignalWifi4Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi4Bar;
-}
-
-declare module 'material-ui/svg-icons/device/battery-charging-50' {
-    export import DeviceBatteryCharging50 = __MaterialUI.SvgIcon;
-    export default DeviceBatteryCharging50;
-}
-
-declare module 'material-ui/svg-icons/device/battery-30' {
-    export import DeviceBattery30 = __MaterialUI.SvgIcon;
-    export default DeviceBattery30;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-connected-no-internet-0-bar' {
-    export import DeviceSignalCellularConnectedNoInternet0Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularConnectedNoInternet0Bar;
-}
-
-declare module 'material-ui/svg-icons/device/battery-alert' {
-    export import DeviceBatteryAlert = __MaterialUI.SvgIcon;
-    export default DeviceBatteryAlert;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-1-bar' {
-    export import DeviceSignalWifi1Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi1Bar;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-4-bar' {
-    export import DeviceSignalCellular4Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellular4Bar;
-}
-
-declare module 'material-ui/svg-icons/device/wifi-tethering' {
-    export import DeviceWifiTethering = __MaterialUI.SvgIcon;
-    export default DeviceWifiTethering;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-0-bar' {
-    export import DeviceSignalWifi0Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi0Bar;
-}
-
-declare module 'material-ui/svg-icons/device/brightness-auto' {
-    export import DeviceBrightnessAuto = __MaterialUI.SvgIcon;
-    export default DeviceBrightnessAuto;
-}
-
-declare module 'material-ui/svg-icons/device/location-disabled' {
-    export import DeviceLocationDisabled = __MaterialUI.SvgIcon;
-    export default DeviceLocationDisabled;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-3-bar' {
-    export import DeviceSignalWifi3Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi3Bar;
-}
-
-declare module 'material-ui/svg-icons/device/gps-not-fixed' {
-    export import DeviceGpsNotFixed = __MaterialUI.SvgIcon;
-    export default DeviceGpsNotFixed;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-1-bar' {
-    export import DeviceSignalCellular1Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellular1Bar;
-}
-
-declare module 'material-ui/svg-icons/device/battery-charging-60' {
-    export import DeviceBatteryCharging60 = __MaterialUI.SvgIcon;
-    export default DeviceBatteryCharging60;
-}
-
-declare module 'material-ui/svg-icons/device/gps-off' {
-    export import DeviceGpsOff = __MaterialUI.SvgIcon;
-    export default DeviceGpsOff;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-null' {
-    export import DeviceSignalCellularNull = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularNull;
-}
-
-declare module 'material-ui/svg-icons/device/brightness-low' {
-    export import DeviceBrightnessLow = __MaterialUI.SvgIcon;
-    export default DeviceBrightnessLow;
-}
-
-declare module 'material-ui/svg-icons/device/sd-storage' {
-    export import DeviceSdStorage = __MaterialUI.SvgIcon;
-    export default DeviceSdStorage;
-}
-
-declare module 'material-ui/svg-icons/device/airplanemode-inactive' {
-    export import DeviceAirplanemodeInactive = __MaterialUI.SvgIcon;
-    export default DeviceAirplanemodeInactive;
-}
-
-declare module 'material-ui/svg-icons/device/widgets' {
-    export import DeviceWidgets = __MaterialUI.SvgIcon;
-    export default DeviceWidgets;
-}
-
-declare module 'material-ui/svg-icons/device/brightness-high' {
-    export import DeviceBrightnessHigh = __MaterialUI.SvgIcon;
-    export default DeviceBrightnessHigh;
-}
-
-declare module 'material-ui/svg-icons/device/battery-20' {
-    export import DeviceBattery20 = __MaterialUI.SvgIcon;
-    export default DeviceBattery20;
-}
-
-declare module 'material-ui/svg-icons/device/bluetooth-disabled' {
-    export import DeviceBluetoothDisabled = __MaterialUI.SvgIcon;
-    export default DeviceBluetoothDisabled;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-4-bar-lock' {
-    export import DeviceSignalWifi4BarLock = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi4BarLock;
-}
-
-declare module 'material-ui/svg-icons/device/developer-mode' {
-    export import DeviceDeveloperMode = __MaterialUI.SvgIcon;
-    export default DeviceDeveloperMode;
-}
-
-declare module 'material-ui/svg-icons/device/battery-50' {
-    export import DeviceBattery50 = __MaterialUI.SvgIcon;
-    export default DeviceBattery50;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-connected-no-internet-1-bar' {
-    export import DeviceSignalCellularConnectedNoInternet1Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularConnectedNoInternet1Bar;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-2-bar' {
-    export import DeviceSignalCellular2Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellular2Bar;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-connected-no-internet-2-bar' {
-    export import DeviceSignalCellularConnectedNoInternet2Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellularConnectedNoInternet2Bar;
-}
-
-declare module 'material-ui/svg-icons/device/signal-cellular-0-bar' {
-    export import DeviceSignalCellular0Bar = __MaterialUI.SvgIcon;
-    export default DeviceSignalCellular0Bar;
-}
-
-declare module 'material-ui/svg-icons/device/signal-wifi-1-bar-lock' {
-    export import DeviceSignalWifi1BarLock = __MaterialUI.SvgIcon;
-    export default DeviceSignalWifi1BarLock;
-}
-
-declare module 'material-ui/svg-icons/navigation/arrow-forward' {
-    export import NavigationArrowForward = __MaterialUI.SvgIcon;
-    export default NavigationArrowForward;
-}
-
-declare module 'material-ui/svg-icons/navigation/unfold-more' {
-    export import NavigationUnfoldMore = __MaterialUI.SvgIcon;
-    export default NavigationUnfoldMore;
-}
-
-declare module 'material-ui/svg-icons/navigation/arrow-drop-down' {
-    export import NavigationArrowDropDown = __MaterialUI.SvgIcon;
-    export default NavigationArrowDropDown;
-}
-
-declare module 'material-ui/svg-icons/navigation/arrow-back' {
-    export import NavigationArrowBack = __MaterialUI.SvgIcon;
-    export default NavigationArrowBack;
-}
-
-declare module 'material-ui/svg-icons/navigation/arrow-downward' {
-    export import NavigationArrowDownward = __MaterialUI.SvgIcon;
-    export default NavigationArrowDownward;
-}
-
-declare module 'material-ui/svg-icons/navigation/fullscreen' {
-    export import NavigationFullscreen = __MaterialUI.SvgIcon;
-    export default NavigationFullscreen;
-}
-
-declare module 'material-ui/svg-icons/navigation/unfold-less' {
-    export import NavigationUnfoldLess = __MaterialUI.SvgIcon;
-    export default NavigationUnfoldLess;
-}
-
-declare module 'material-ui/svg-icons/navigation/chevron-right' {
-    export import NavigationChevronRight = __MaterialUI.SvgIcon;
-    export default NavigationChevronRight;
-}
-
-declare module 'material-ui/svg-icons/navigation/arrow-drop-down-circle' {
-    export import NavigationArrowDropDownCircle = __MaterialUI.SvgIcon;
-    export default NavigationArrowDropDownCircle;
-}
-
-declare module 'material-ui/svg-icons/navigation/check' {
-    export import NavigationCheck = __MaterialUI.SvgIcon;
-    export default NavigationCheck;
-}
-
-declare module 'material-ui/svg-icons/navigation/fullscreen-exit' {
-    export import NavigationFullscreenExit = __MaterialUI.SvgIcon;
-    export default NavigationFullscreenExit;
-}
-
-declare module 'material-ui/svg-icons/navigation/chevron-left' {
-    export import NavigationChevronLeft = __MaterialUI.SvgIcon;
-    export default NavigationChevronLeft;
-}
-
-declare module 'material-ui/svg-icons/navigation/menu' {
-    export import NavigationMenu = __MaterialUI.SvgIcon;
-    export default NavigationMenu;
-}
-
-declare module 'material-ui/svg-icons/navigation/apps' {
-    export import NavigationApps = __MaterialUI.SvgIcon;
-    export default NavigationApps;
-}
-
-declare module 'material-ui/svg-icons/navigation/arrow-upward' {
-    export import NavigationArrowUpward = __MaterialUI.SvgIcon;
-    export default NavigationArrowUpward;
-}
-
-declare module 'material-ui/svg-icons/navigation/close' {
-    export import NavigationClose = __MaterialUI.SvgIcon;
-    export default NavigationClose;
-}
-
-declare module 'material-ui/svg-icons/navigation/more-horiz' {
-    export import NavigationMoreHoriz = __MaterialUI.SvgIcon;
-    export default NavigationMoreHoriz;
-}
-
-declare module 'material-ui/svg-icons/navigation/cancel' {
-    export import NavigationCancel = __MaterialUI.SvgIcon;
-    export default NavigationCancel;
-}
-
-declare module 'material-ui/svg-icons/navigation/subdirectory-arrow-right' {
-    export import NavigationSubdirectoryArrowRight = __MaterialUI.SvgIcon;
-    export default NavigationSubdirectoryArrowRight;
-}
-
-declare module 'material-ui/svg-icons/navigation/expand-more' {
-    export import NavigationExpandMore = __MaterialUI.SvgIcon;
-    export default NavigationExpandMore;
-}
-
-declare module 'material-ui/svg-icons/navigation/arrow-drop-up' {
-    export import NavigationArrowDropUp = __MaterialUI.SvgIcon;
-    export default NavigationArrowDropUp;
-}
-
-declare module 'material-ui/svg-icons/navigation/subdirectory-arrow-left' {
-    export import NavigationSubdirectoryArrowLeft = __MaterialUI.SvgIcon;
-    export default NavigationSubdirectoryArrowLeft;
-}
-
-declare module 'material-ui/svg-icons/navigation/expand-less' {
-    export import NavigationExpandLess = __MaterialUI.SvgIcon;
-    export default NavigationExpandLess;
-}
-
-declare module 'material-ui/svg-icons/navigation/refresh' {
-    export import NavigationRefresh = __MaterialUI.SvgIcon;
-    export default NavigationRefresh;
-}
-
-declare module 'material-ui/svg-icons/navigation/more-vert' {
-    export import NavigationMoreVert = __MaterialUI.SvgIcon;
-    export default NavigationMoreVert;
-}
-
-declare module 'material-ui/svg-icons/notification/rv-hookup' {
-    export import NotificationRvHookup = __MaterialUI.SvgIcon;
-    export default NotificationRvHookup;
-}
-
-declare module 'material-ui/svg-icons/notification/no-encryption' {
-    export import NotificationNoEncryption = __MaterialUI.SvgIcon;
-    export default NotificationNoEncryption;
-}
-
-declare module 'material-ui/svg-icons/notification/phone-forwarded' {
-    export import NotificationPhoneForwarded = __MaterialUI.SvgIcon;
-    export default NotificationPhoneForwarded;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-flat-angled' {
-    export import NotificationAirlineSeatFlatAngled = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatFlatAngled;
-}
-
-declare module 'material-ui/svg-icons/notification/time-to-leave' {
-    export import NotificationTimeToLeave = __MaterialUI.SvgIcon;
-    export default NotificationTimeToLeave;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-legroom-extra' {
-    export import NotificationAirlineSeatLegroomExtra = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatLegroomExtra;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-recline-extra' {
-    export import NotificationAirlineSeatReclineExtra = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatReclineExtra;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-individual-suite' {
-    export import NotificationAirlineSeatIndividualSuite = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatIndividualSuite;
-}
-
-declare module 'material-ui/svg-icons/notification/vibration' {
-    export import NotificationVibration = __MaterialUI.SvgIcon;
-    export default NotificationVibration;
-}
-
-declare module 'material-ui/svg-icons/notification/sim-card-alert' {
-    export import NotificationSimCardAlert = __MaterialUI.SvgIcon;
-    export default NotificationSimCardAlert;
-}
-
-declare module 'material-ui/svg-icons/notification/sms-failed' {
-    export import NotificationSmsFailed = __MaterialUI.SvgIcon;
-    export default NotificationSmsFailed;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-flat' {
-    export import NotificationAirlineSeatFlat = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatFlat;
-}
-
-declare module 'material-ui/svg-icons/notification/do-not-disturb' {
-    export import NotificationDoNotDisturb = __MaterialUI.SvgIcon;
-    export default NotificationDoNotDisturb;
-}
-
-declare module 'material-ui/svg-icons/notification/sync-problem' {
-    export import NotificationSyncProblem = __MaterialUI.SvgIcon;
-    export default NotificationSyncProblem;
-}
-
-declare module 'material-ui/svg-icons/notification/event-available' {
-    export import NotificationEventAvailable = __MaterialUI.SvgIcon;
-    export default NotificationEventAvailable;
-}
-
-declare module 'material-ui/svg-icons/notification/network-check' {
-    export import NotificationNetworkCheck = __MaterialUI.SvgIcon;
-    export default NotificationNetworkCheck;
-}
-
-declare module 'material-ui/svg-icons/notification/sms' {
-    export import NotificationSms = __MaterialUI.SvgIcon;
-    export default NotificationSms;
-}
-
-declare module 'material-ui/svg-icons/notification/disc-full' {
-    export import NotificationDiscFull = __MaterialUI.SvgIcon;
-    export default NotificationDiscFull;
-}
-
-declare module 'material-ui/svg-icons/notification/do-not-disturb-alt' {
-    export import NotificationDoNotDisturbAlt = __MaterialUI.SvgIcon;
-    export default NotificationDoNotDisturbAlt;
-}
-
-declare module 'material-ui/svg-icons/notification/system-update' {
-    export import NotificationSystemUpdate = __MaterialUI.SvgIcon;
-    export default NotificationSystemUpdate;
-}
-
-declare module 'material-ui/svg-icons/notification/phone-bluetooth-speaker' {
-    export import NotificationPhoneBluetoothSpeaker = __MaterialUI.SvgIcon;
-    export default NotificationPhoneBluetoothSpeaker;
-}
-
-declare module 'material-ui/svg-icons/notification/ondemand-video' {
-    export import NotificationOndemandVideo = __MaterialUI.SvgIcon;
-    export default NotificationOndemandVideo;
-}
-
-declare module 'material-ui/svg-icons/notification/power' {
-    export import NotificationPower = __MaterialUI.SvgIcon;
-    export default NotificationPower;
-}
-
-declare module 'material-ui/svg-icons/notification/phone-locked' {
-    export import NotificationPhoneLocked = __MaterialUI.SvgIcon;
-    export default NotificationPhoneLocked;
-}
-
-declare module 'material-ui/svg-icons/notification/sd-card' {
-    export import NotificationSdCard = __MaterialUI.SvgIcon;
-    export default NotificationSdCard;
-}
-
-declare module 'material-ui/svg-icons/notification/event-busy' {
-    export import NotificationEventBusy = __MaterialUI.SvgIcon;
-    export default NotificationEventBusy;
-}
-
-declare module 'material-ui/svg-icons/notification/personal-video' {
-    export import NotificationPersonalVideo = __MaterialUI.SvgIcon;
-    export default NotificationPersonalVideo;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-legroom-normal' {
-    export import NotificationAirlineSeatLegroomNormal = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatLegroomNormal;
-}
-
-declare module 'material-ui/svg-icons/notification/phone-in-talk' {
-    export import NotificationPhoneInTalk = __MaterialUI.SvgIcon;
-    export default NotificationPhoneInTalk;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-legroom-reduced' {
-    export import NotificationAirlineSeatLegroomReduced = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatLegroomReduced;
-}
-
-declare module 'material-ui/svg-icons/notification/phone-paused' {
-    export import NotificationPhonePaused = __MaterialUI.SvgIcon;
-    export default NotificationPhonePaused;
-}
-
-declare module 'material-ui/svg-icons/notification/sync-disabled' {
-    export import NotificationSyncDisabled = __MaterialUI.SvgIcon;
-    export default NotificationSyncDisabled;
-}
-
-declare module 'material-ui/svg-icons/notification/enhanced-encryption' {
-    export import NotificationEnhancedEncryption = __MaterialUI.SvgIcon;
-    export default NotificationEnhancedEncryption;
-}
-
-declare module 'material-ui/svg-icons/notification/mms' {
-    export import NotificationMms = __MaterialUI.SvgIcon;
-    export default NotificationMms;
-}
-
-declare module 'material-ui/svg-icons/notification/drive-eta' {
-    export import NotificationDriveEta = __MaterialUI.SvgIcon;
-    export default NotificationDriveEta;
-}
-
-declare module 'material-ui/svg-icons/notification/voice-chat' {
-    export import NotificationVoiceChat = __MaterialUI.SvgIcon;
-    export default NotificationVoiceChat;
-}
-
-declare module 'material-ui/svg-icons/notification/wifi' {
-    export import NotificationWifi = __MaterialUI.SvgIcon;
-    export default NotificationWifi;
-}
-
-declare module 'material-ui/svg-icons/notification/airline-seat-recline-normal' {
-    export import NotificationAirlineSeatReclineNormal = __MaterialUI.SvgIcon;
-    export default NotificationAirlineSeatReclineNormal;
-}
-
-declare module 'material-ui/svg-icons/notification/more' {
-    export import NotificationMore = __MaterialUI.SvgIcon;
-    export default NotificationMore;
-}
-
-declare module 'material-ui/svg-icons/notification/vpn-lock' {
-    export import NotificationVpnLock = __MaterialUI.SvgIcon;
-    export default NotificationVpnLock;
-}
-
-declare module 'material-ui/svg-icons/notification/event-note' {
-    export import NotificationEventNote = __MaterialUI.SvgIcon;
-    export default NotificationEventNote;
-}
-
-declare module 'material-ui/svg-icons/notification/confirmation-number' {
-    export import NotificationConfirmationNumber = __MaterialUI.SvgIcon;
-    export default NotificationConfirmationNumber;
-}
-
-declare module 'material-ui/svg-icons/notification/network-locked' {
-    export import NotificationNetworkLocked = __MaterialUI.SvgIcon;
-    export default NotificationNetworkLocked;
-}
-
-declare module 'material-ui/svg-icons/notification/adb' {
-    export import NotificationAdb = __MaterialUI.SvgIcon;
-    export default NotificationAdb;
-}
-
-declare module 'material-ui/svg-icons/notification/bluetooth-audio' {
-    export import NotificationBluetoothAudio = __MaterialUI.SvgIcon;
-    export default NotificationBluetoothAudio;
-}
-
-declare module 'material-ui/svg-icons/notification/wc' {
-    export import NotificationWc = __MaterialUI.SvgIcon;
-    export default NotificationWc;
-}
-
-declare module 'material-ui/svg-icons/notification/tap-and-play' {
-    export import NotificationTapAndPlay = __MaterialUI.SvgIcon;
-    export default NotificationTapAndPlay;
-}
-
-declare module 'material-ui/svg-icons/notification/folder-special' {
-    export import NotificationFolderSpecial = __MaterialUI.SvgIcon;
-    export default NotificationFolderSpecial;
-}
-
-declare module 'material-ui/svg-icons/notification/live-tv' {
-    export import NotificationLiveTv = __MaterialUI.SvgIcon;
-    export default NotificationLiveTv;
-}
-
-declare module 'material-ui/svg-icons/notification/sync' {
-    export import NotificationSync = __MaterialUI.SvgIcon;
-    export default NotificationSync;
-}
-
-declare module 'material-ui/svg-icons/notification/phone-missed' {
-    export import NotificationPhoneMissed = __MaterialUI.SvgIcon;
-    export default NotificationPhoneMissed;
-}
-
-declare module 'material-ui/svg-icons/av/skip-previous' {
-    export import AvSkipPrevious = __MaterialUI.SvgIcon;
-    export default AvSkipPrevious;
-}
-
-declare module 'material-ui/svg-icons/av/volume-off' {
-    export import AvVolumeOff = __MaterialUI.SvgIcon;
-    export default AvVolumeOff;
-}
-
-declare module 'material-ui/svg-icons/av/subscriptions' {
-    export import AvSubscriptions = __MaterialUI.SvgIcon;
-    export default AvSubscriptions;
-}
-
-declare module 'material-ui/svg-icons/av/play-arrow' {
-    export import AvPlayArrow = __MaterialUI.SvgIcon;
-    export default AvPlayArrow;
-}
-
-declare module 'material-ui/svg-icons/av/play-circle-outline' {
-    export import AvPlayCircleOutline = __MaterialUI.SvgIcon;
-    export default AvPlayCircleOutline;
-}
-
-declare module 'material-ui/svg-icons/av/replay-30' {
-    export import AvReplay30 = __MaterialUI.SvgIcon;
-    export default AvReplay30;
-}
-
-declare module 'material-ui/svg-icons/av/videocam' {
-    export import AvVideocam = __MaterialUI.SvgIcon;
-    export default AvVideocam;
-}
-
-declare module 'material-ui/svg-icons/av/replay-5' {
-    export import AvReplay5 = __MaterialUI.SvgIcon;
-    export default AvReplay5;
-}
-
-declare module 'material-ui/svg-icons/av/forward-10' {
-    export import AvForward10 = __MaterialUI.SvgIcon;
-    export default AvForward10;
-}
-
-declare module 'material-ui/svg-icons/av/recent-actors' {
-    export import AvRecentActors = __MaterialUI.SvgIcon;
-    export default AvRecentActors;
-}
-
-declare module 'material-ui/svg-icons/av/replay-10' {
-    export import AvReplay10 = __MaterialUI.SvgIcon;
-    export default AvReplay10;
-}
-
-declare module 'material-ui/svg-icons/av/repeat' {
-    export import AvRepeat = __MaterialUI.SvgIcon;
-    export default AvRepeat;
-}
-
-declare module 'material-ui/svg-icons/av/queue-music' {
-    export import AvQueueMusic = __MaterialUI.SvgIcon;
-    export default AvQueueMusic;
-}
-
-declare module 'material-ui/svg-icons/av/fiber-pin' {
-    export import AvFiberPin = __MaterialUI.SvgIcon;
-    export default AvFiberPin;
-}
-
-declare module 'material-ui/svg-icons/av/new-releases' {
-    export import AvNewReleases = __MaterialUI.SvgIcon;
-    export default AvNewReleases;
-}
-
-declare module 'material-ui/svg-icons/av/fiber-new' {
-    export import AvFiberNew = __MaterialUI.SvgIcon;
-    export default AvFiberNew;
-}
-
-declare module 'material-ui/svg-icons/av/fiber-manual-record' {
-    export import AvFiberManualRecord = __MaterialUI.SvgIcon;
-    export default AvFiberManualRecord;
-}
-
-declare module 'material-ui/svg-icons/av/hearing' {
-    export import AvHearing = __MaterialUI.SvgIcon;
-    export default AvHearing;
-}
-
-declare module 'material-ui/svg-icons/av/loop' {
-    export import AvLoop = __MaterialUI.SvgIcon;
-    export default AvLoop;
-}
-
-declare module 'material-ui/svg-icons/av/volume-up' {
-    export import AvVolumeUp = __MaterialUI.SvgIcon;
-    export default AvVolumeUp;
-}
-
-declare module 'material-ui/svg-icons/av/high-quality' {
-    export import AvHighQuality = __MaterialUI.SvgIcon;
-    export default AvHighQuality;
-}
-
-declare module 'material-ui/svg-icons/av/surround-sound' {
-    export import AvSurroundSound = __MaterialUI.SvgIcon;
-    export default AvSurroundSound;
-}
-
-declare module 'material-ui/svg-icons/av/equalizer' {
-    export import AvEqualizer = __MaterialUI.SvgIcon;
-    export default AvEqualizer;
-}
-
-declare module 'material-ui/svg-icons/av/music-video' {
-    export import AvMusicVideo = __MaterialUI.SvgIcon;
-    export default AvMusicVideo;
-}
-
-declare module 'material-ui/svg-icons/av/shuffle' {
-    export import AvShuffle = __MaterialUI.SvgIcon;
-    export default AvShuffle;
-}
-
-declare module 'material-ui/svg-icons/av/volume-down' {
-    export import AvVolumeDown = __MaterialUI.SvgIcon;
-    export default AvVolumeDown;
-}
-
-declare module 'material-ui/svg-icons/av/radio' {
-    export import AvRadio = __MaterialUI.SvgIcon;
-    export default AvRadio;
-}
-
-declare module 'material-ui/svg-icons/av/web-asset' {
-    export import AvWebAsset = __MaterialUI.SvgIcon;
-    export default AvWebAsset;
-}
-
-declare module 'material-ui/svg-icons/av/replay' {
-    export import AvReplay = __MaterialUI.SvgIcon;
-    export default AvReplay;
-}
-
-declare module 'material-ui/svg-icons/av/queue-play-next' {
-    export import AvQueuePlayNext = __MaterialUI.SvgIcon;
-    export default AvQueuePlayNext;
-}
-
-declare module 'material-ui/svg-icons/av/closed-caption' {
-    export import AvClosedCaption = __MaterialUI.SvgIcon;
-    export default AvClosedCaption;
-}
-
-declare module 'material-ui/svg-icons/av/fiber-dvr' {
-    export import AvFiberDvr = __MaterialUI.SvgIcon;
-    export default AvFiberDvr;
-}
-
-declare module 'material-ui/svg-icons/av/explicit' {
-    export import AvExplicit = __MaterialUI.SvgIcon;
-    export default AvExplicit;
-}
-
-declare module 'material-ui/svg-icons/av/games' {
-    export import AvGames = __MaterialUI.SvgIcon;
-    export default AvGames;
-}
-
-declare module 'material-ui/svg-icons/av/videocam-off' {
-    export import AvVideocamOff = __MaterialUI.SvgIcon;
-    export default AvVideocamOff;
-}
-
-declare module 'material-ui/svg-icons/av/hd' {
-    export import AvHd = __MaterialUI.SvgIcon;
-    export default AvHd;
-}
-
-declare module 'material-ui/svg-icons/av/fast-rewind' {
-    export import AvFastRewind = __MaterialUI.SvgIcon;
-    export default AvFastRewind;
-}
-
-declare module 'material-ui/svg-icons/av/add-to-queue' {
-    export import AvAddToQueue = __MaterialUI.SvgIcon;
-    export default AvAddToQueue;
-}
-
-declare module 'material-ui/svg-icons/av/movie' {
-    export import AvMovie = __MaterialUI.SvgIcon;
-    export default AvMovie;
-}
-
-declare module 'material-ui/svg-icons/av/library-books' {
-    export import AvLibraryBooks = __MaterialUI.SvgIcon;
-    export default AvLibraryBooks;
-}
-
-declare module 'material-ui/svg-icons/av/art-track' {
-    export import AvArtTrack = __MaterialUI.SvgIcon;
-    export default AvArtTrack;
-}
-
-declare module 'material-ui/svg-icons/av/web' {
-    export import AvWeb = __MaterialUI.SvgIcon;
-    export default AvWeb;
-}
-
-declare module 'material-ui/svg-icons/av/play-circle-filled' {
-    export import AvPlayCircleFilled = __MaterialUI.SvgIcon;
-    export default AvPlayCircleFilled;
-}
-
-declare module 'material-ui/svg-icons/av/snooze' {
-    export import AvSnooze = __MaterialUI.SvgIcon;
-    export default AvSnooze;
-}
-
-declare module 'material-ui/svg-icons/av/forward-5' {
-    export import AvForward5 = __MaterialUI.SvgIcon;
-    export default AvForward5;
-}
-
-declare module 'material-ui/svg-icons/av/sort-by-alpha' {
-    export import AvSortByAlpha = __MaterialUI.SvgIcon;
-    export default AvSortByAlpha;
-}
-
-declare module 'material-ui/svg-icons/av/pause-circle-filled' {
-    export import AvPauseCircleFilled = __MaterialUI.SvgIcon;
-    export default AvPauseCircleFilled;
-}
-
-declare module 'material-ui/svg-icons/av/fiber-smart-record' {
-    export import AvFiberSmartRecord = __MaterialUI.SvgIcon;
-    export default AvFiberSmartRecord;
-}
-
-declare module 'material-ui/svg-icons/av/stop' {
-    export import AvStop = __MaterialUI.SvgIcon;
-    export default AvStop;
-}
-
-declare module 'material-ui/svg-icons/av/playlist-play' {
-    export import AvPlaylistPlay = __MaterialUI.SvgIcon;
-    export default AvPlaylistPlay;
-}
-
-declare module 'material-ui/svg-icons/av/library-add' {
-    export import AvLibraryAdd = __MaterialUI.SvgIcon;
-    export default AvLibraryAdd;
-}
-
-declare module 'material-ui/svg-icons/av/volume-mute' {
-    export import AvVolumeMute = __MaterialUI.SvgIcon;
-    export default AvVolumeMute;
-}
-
-declare module 'material-ui/svg-icons/av/skip-next' {
-    export import AvSkipNext = __MaterialUI.SvgIcon;
-    export default AvSkipNext;
-}
-
-declare module 'material-ui/svg-icons/av/forward-30' {
-    export import AvForward30 = __MaterialUI.SvgIcon;
-    export default AvForward30;
-}
-
-declare module 'material-ui/svg-icons/av/playlist-add' {
-    export import AvPlaylistAdd = __MaterialUI.SvgIcon;
-    export default AvPlaylistAdd;
-}
-
-declare module 'material-ui/svg-icons/av/album' {
-    export import AvAlbum = __MaterialUI.SvgIcon;
-    export default AvAlbum;
-}
-
-declare module 'material-ui/svg-icons/av/video-library' {
-    export import AvVideoLibrary = __MaterialUI.SvgIcon;
-    export default AvVideoLibrary;
-}
-
-declare module 'material-ui/svg-icons/av/library-music' {
-    export import AvLibraryMusic = __MaterialUI.SvgIcon;
-    export default AvLibraryMusic;
-}
-
-declare module 'material-ui/svg-icons/av/not-interested' {
-    export import AvNotInterested = __MaterialUI.SvgIcon;
-    export default AvNotInterested;
-}
-
-declare module 'material-ui/svg-icons/av/playlist-add-check' {
-    export import AvPlaylistAddCheck = __MaterialUI.SvgIcon;
-    export default AvPlaylistAddCheck;
-}
-
-declare module 'material-ui/svg-icons/av/mic-none' {
-    export import AvMicNone = __MaterialUI.SvgIcon;
-    export default AvMicNone;
-}
-
-declare module 'material-ui/svg-icons/av/pause' {
-    export import AvPause = __MaterialUI.SvgIcon;
-    export default AvPause;
-}
-
-declare module 'material-ui/svg-icons/av/remove-from-queue' {
-    export import AvRemoveFromQueue = __MaterialUI.SvgIcon;
-    export default AvRemoveFromQueue;
-}
-
-declare module 'material-ui/svg-icons/av/slow-motion-video' {
-    export import AvSlowMotionVideo = __MaterialUI.SvgIcon;
-    export default AvSlowMotionVideo;
-}
-
-declare module 'material-ui/svg-icons/av/subtitles' {
-    export import AvSubtitles = __MaterialUI.SvgIcon;
-    export default AvSubtitles;
-}
-
-declare module 'material-ui/svg-icons/av/mic-off' {
-    export import AvMicOff = __MaterialUI.SvgIcon;
-    export default AvMicOff;
-}
-
-declare module 'material-ui/svg-icons/av/repeat-one' {
-    export import AvRepeatOne = __MaterialUI.SvgIcon;
-    export default AvRepeatOne;
-}
-
-declare module 'material-ui/svg-icons/av/queue' {
-    export import AvQueue = __MaterialUI.SvgIcon;
-    export default AvQueue;
-}
-
-declare module 'material-ui/svg-icons/av/fast-forward' {
-    export import AvFastForward = __MaterialUI.SvgIcon;
-    export default AvFastForward;
-}
-
-declare module 'material-ui/svg-icons/av/mic' {
-    export import AvMic = __MaterialUI.SvgIcon;
-    export default AvMic;
-}
-
-declare module 'material-ui/svg-icons/av/av-timer' {
-    export import AvAvTimer = __MaterialUI.SvgIcon;
-    export default AvAvTimer;
-}
-
-declare module 'material-ui/svg-icons/av/pause-circle-outline' {
-    export import AvPauseCircleOutline = __MaterialUI.SvgIcon;
-    export default AvPauseCircleOutline;
-}
-
-declare module 'material-ui/svg-icons/av/airplay' {
-    export import AvAirplay = __MaterialUI.SvgIcon;
-    export default AvAirplay;
-}
-
-declare module 'material-ui/svg-icons/image/camera-rear' {
-    export import ImageCameraRear = __MaterialUI.SvgIcon;
-    export default ImageCameraRear;
-}
-
-declare module 'material-ui/svg-icons/image/add-a-photo' {
-    export import ImageAddAPhoto = __MaterialUI.SvgIcon;
-    export default ImageAddAPhoto;
-}
-
-declare module 'material-ui/svg-icons/image/portrait' {
-    export import ImagePortrait = __MaterialUI.SvgIcon;
-    export default ImagePortrait;
-}
-
-declare module 'material-ui/svg-icons/image/looks' {
-    export import ImageLooks = __MaterialUI.SvgIcon;
-    export default ImageLooks;
-}
-
-declare module 'material-ui/svg-icons/image/exposure-neg-2' {
-    export import ImageExposureNeg2 = __MaterialUI.SvgIcon;
-    export default ImageExposureNeg2;
-}
-
-declare module 'material-ui/svg-icons/image/wb-cloudy' {
-    export import ImageWbCloudy = __MaterialUI.SvgIcon;
-    export default ImageWbCloudy;
-}
-
-declare module 'material-ui/svg-icons/image/switch-video' {
-    export import ImageSwitchVideo = __MaterialUI.SvgIcon;
-    export default ImageSwitchVideo;
-}
-
-declare module 'material-ui/svg-icons/image/wb-auto' {
-    export import ImageWbAuto = __MaterialUI.SvgIcon;
-    export default ImageWbAuto;
-}
-
-declare module 'material-ui/svg-icons/image/filter-center-focus' {
-    export import ImageFilterCenterFocus = __MaterialUI.SvgIcon;
-    export default ImageFilterCenterFocus;
-}
-
-declare module 'material-ui/svg-icons/image/crop-7-5' {
-    export import ImageCrop75 = __MaterialUI.SvgIcon;
-    export default ImageCrop75;
-}
-
-declare module 'material-ui/svg-icons/image/crop-3-2' {
-    export import ImageCrop32 = __MaterialUI.SvgIcon;
-    export default ImageCrop32;
-}
-
-declare module 'material-ui/svg-icons/image/assistant-photo' {
-    export import ImageAssistantPhoto = __MaterialUI.SvgIcon;
-    export default ImageAssistantPhoto;
-}
-
-declare module 'material-ui/svg-icons/image/looks-one' {
-    export import ImageLooksOne = __MaterialUI.SvgIcon;
-    export default ImageLooksOne;
-}
-
-declare module 'material-ui/svg-icons/image/collections-bookmark' {
-    export import ImageCollectionsBookmark = __MaterialUI.SvgIcon;
-    export default ImageCollectionsBookmark;
-}
-
-declare module 'material-ui/svg-icons/image/image-aspect-ratio' {
-    export import ImageImageAspectRatio = __MaterialUI.SvgIcon;
-    export default ImageImageAspectRatio;
-}
-
-declare module 'material-ui/svg-icons/image/brush' {
-    export import ImageBrush = __MaterialUI.SvgIcon;
-    export default ImageBrush;
-}
-
-declare module 'material-ui/svg-icons/image/linked-camera' {
-    export import ImageLinkedCamera = __MaterialUI.SvgIcon;
-    export default ImageLinkedCamera;
-}
-
-declare module 'material-ui/svg-icons/image/filter-1' {
-    export import ImageFilter1 = __MaterialUI.SvgIcon;
-    export default ImageFilter1;
-}
-
-declare module 'material-ui/svg-icons/image/edit' {
-    export import ImageEdit = __MaterialUI.SvgIcon;
-    export default ImageEdit;
-}
-
-declare module 'material-ui/svg-icons/image/timelapse' {
-    export import ImageTimelapse = __MaterialUI.SvgIcon;
-    export default ImageTimelapse;
-}
-
-declare module 'material-ui/svg-icons/image/nature' {
-    export import ImageNature = __MaterialUI.SvgIcon;
-    export default ImageNature;
-}
-
-declare module 'material-ui/svg-icons/image/monochrome-photos' {
-    export import ImageMonochromePhotos = __MaterialUI.SvgIcon;
-    export default ImageMonochromePhotos;
-}
-
-declare module 'material-ui/svg-icons/image/brightness-6' {
-    export import ImageBrightness6 = __MaterialUI.SvgIcon;
-    export default ImageBrightness6;
-}
-
-declare module 'material-ui/svg-icons/image/music-note' {
-    export import ImageMusicNote = __MaterialUI.SvgIcon;
-    export default ImageMusicNote;
-}
-
-declare module 'material-ui/svg-icons/image/collections' {
-    export import ImageCollections = __MaterialUI.SvgIcon;
-    export default ImageCollections;
-}
-
-declare module 'material-ui/svg-icons/image/wb-sunny' {
-    export import ImageWbSunny = __MaterialUI.SvgIcon;
-    export default ImageWbSunny;
-}
-
-declare module 'material-ui/svg-icons/image/hdr-strong' {
-    export import ImageHdrStrong = __MaterialUI.SvgIcon;
-    export default ImageHdrStrong;
-}
-
-declare module 'material-ui/svg-icons/image/panorama-vertical' {
-    export import ImagePanoramaVertical = __MaterialUI.SvgIcon;
-    export default ImagePanoramaVertical;
-}
-
-declare module 'material-ui/svg-icons/image/navigate-next' {
-    export import ImageNavigateNext = __MaterialUI.SvgIcon;
-    export default ImageNavigateNext;
-}
-
-declare module 'material-ui/svg-icons/image/looks-4' {
-    export import ImageLooks4 = __MaterialUI.SvgIcon;
-    export default ImageLooks4;
-}
-
-declare module 'material-ui/svg-icons/image/filter-4' {
-    export import ImageFilter4 = __MaterialUI.SvgIcon;
-    export default ImageFilter4;
-}
-
-declare module 'material-ui/svg-icons/image/brightness-1' {
-    export import ImageBrightness1 = __MaterialUI.SvgIcon;
-    export default ImageBrightness1;
-}
-
-declare module 'material-ui/svg-icons/image/exposure-plus-1' {
-    export import ImageExposurePlus1 = __MaterialUI.SvgIcon;
-    export default ImageExposurePlus1;
-}
-
-declare module 'material-ui/svg-icons/image/timer-3' {
-    export import ImageTimer3 = __MaterialUI.SvgIcon;
-    export default ImageTimer3;
-}
-
-declare module 'material-ui/svg-icons/image/exposure-zero' {
-    export import ImageExposureZero = __MaterialUI.SvgIcon;
-    export default ImageExposureZero;
-}
-
-declare module 'material-ui/svg-icons/image/blur-linear' {
-    export import ImageBlurLinear = __MaterialUI.SvgIcon;
-    export default ImageBlurLinear;
-}
-
-declare module 'material-ui/svg-icons/image/photo-library' {
-    export import ImagePhotoLibrary = __MaterialUI.SvgIcon;
-    export default ImagePhotoLibrary;
-}
-
-declare module 'material-ui/svg-icons/image/filter-drama' {
-    export import ImageFilterDrama = __MaterialUI.SvgIcon;
-    export default ImageFilterDrama;
-}
-
-declare module 'material-ui/svg-icons/image/dehaze' {
-    export import ImageDehaze = __MaterialUI.SvgIcon;
-    export default ImageDehaze;
-}
-
-declare module 'material-ui/svg-icons/image/control-point-duplicate' {
-    export import ImageControlPointDuplicate = __MaterialUI.SvgIcon;
-    export default ImageControlPointDuplicate;
-}
-
-declare module 'material-ui/svg-icons/image/image' {
-    export import ImageImage = __MaterialUI.SvgIcon;
-    export default ImageImage;
-}
-
-declare module 'material-ui/svg-icons/image/flash-auto' {
-    export import ImageFlashAuto = __MaterialUI.SvgIcon;
-    export default ImageFlashAuto;
-}
-
-declare module 'material-ui/svg-icons/image/rotate-90-degrees-ccw' {
-    export import ImageRotate90DegreesCcw = __MaterialUI.SvgIcon;
-    export default ImageRotate90DegreesCcw;
-}
-
-declare module 'material-ui/svg-icons/image/blur-circular' {
-    export import ImageBlurCircular = __MaterialUI.SvgIcon;
-    export default ImageBlurCircular;
-}
-
-declare module 'material-ui/svg-icons/image/filter-3' {
-    export import ImageFilter3 = __MaterialUI.SvgIcon;
-    export default ImageFilter3;
-}
-
-declare module 'material-ui/svg-icons/image/exposure-plus-2' {
-    export import ImageExposurePlus2 = __MaterialUI.SvgIcon;
-    export default ImageExposurePlus2;
-}
-
-declare module 'material-ui/svg-icons/image/flash-on' {
-    export import ImageFlashOn = __MaterialUI.SvgIcon;
-    export default ImageFlashOn;
-}
-
-declare module 'material-ui/svg-icons/image/view-comfy' {
-    export import ImageViewComfy = __MaterialUI.SvgIcon;
-    export default ImageViewComfy;
-}
-
-declare module 'material-ui/svg-icons/image/colorize' {
-    export import ImageColorize = __MaterialUI.SvgIcon;
-    export default ImageColorize;
-}
-
-declare module 'material-ui/svg-icons/image/brightness-4' {
-    export import ImageBrightness4 = __MaterialUI.SvgIcon;
-    export default ImageBrightness4;
-}
-
-declare module 'material-ui/svg-icons/image/crop-free' {
-    export import ImageCropFree = __MaterialUI.SvgIcon;
-    export default ImageCropFree;
-}
-
-declare module 'material-ui/svg-icons/image/vignette' {
-    export import ImageVignette = __MaterialUI.SvgIcon;
-    export default ImageVignette;
-}
-
-declare module 'material-ui/svg-icons/image/tag-faces' {
-    export import ImageTagFaces = __MaterialUI.SvgIcon;
-    export default ImageTagFaces;
-}
-
-declare module 'material-ui/svg-icons/image/brightness-7' {
-    export import ImageBrightness7 = __MaterialUI.SvgIcon;
-    export default ImageBrightness7;
-}
-
-declare module 'material-ui/svg-icons/image/healing' {
-    export import ImageHealing = __MaterialUI.SvgIcon;
-    export default ImageHealing;
-}
-
-declare module 'material-ui/svg-icons/image/nature-people' {
-    export import ImageNaturePeople = __MaterialUI.SvgIcon;
-    export default ImageNaturePeople;
-}
-
-declare module 'material-ui/svg-icons/image/gradient' {
-    export import ImageGradient = __MaterialUI.SvgIcon;
-    export default ImageGradient;
-}
-
-declare module 'material-ui/svg-icons/image/flash-off' {
-    export import ImageFlashOff = __MaterialUI.SvgIcon;
-    export default ImageFlashOff;
-}
-
-declare module 'material-ui/svg-icons/image/movie-creation' {
-    export import ImageMovieCreation = __MaterialUI.SvgIcon;
-    export default ImageMovieCreation;
-}
-
-declare module 'material-ui/svg-icons/image/leak-add' {
-    export import ImageLeakAdd = __MaterialUI.SvgIcon;
-    export default ImageLeakAdd;
-}
-
-declare module 'material-ui/svg-icons/image/filter-5' {
-    export import ImageFilter5 = __MaterialUI.SvgIcon;
-    export default ImageFilter5;
-}
-
-declare module 'material-ui/svg-icons/image/photo' {
-    export import ImagePhoto = __MaterialUI.SvgIcon;
-    export default ImagePhoto;
-}
-
-declare module 'material-ui/svg-icons/image/color-lens' {
-    export import ImageColorLens = __MaterialUI.SvgIcon;
-    export default ImageColorLens;
-}
-
-declare module 'material-ui/svg-icons/image/broken-image' {
-    export import ImageBrokenImage = __MaterialUI.SvgIcon;
-    export default ImageBrokenImage;
-}
-
-declare module 'material-ui/svg-icons/image/looks-6' {
-    export import ImageLooks6 = __MaterialUI.SvgIcon;
-    export default ImageLooks6;
-}
-
-declare module 'material-ui/svg-icons/image/picture-as-pdf' {
-    export import ImagePictureAsPdf = __MaterialUI.SvgIcon;
-    export default ImagePictureAsPdf;
-}
-
-declare module 'material-ui/svg-icons/image/palette' {
-    export import ImagePalette = __MaterialUI.SvgIcon;
-    export default ImagePalette;
-}
-
-declare module 'material-ui/svg-icons/image/crop-landscape' {
-    export import ImageCropLandscape = __MaterialUI.SvgIcon;
-    export default ImageCropLandscape;
-}
-
-declare module 'material-ui/svg-icons/image/grid-on' {
-    export import ImageGridOn = __MaterialUI.SvgIcon;
-    export default ImageGridOn;
-}
-
-declare module 'material-ui/svg-icons/image/slideshow' {
-    export import ImageSlideshow = __MaterialUI.SvgIcon;
-    export default ImageSlideshow;
-}
-
-declare module 'material-ui/svg-icons/image/brightness-3' {
-    export import ImageBrightness3 = __MaterialUI.SvgIcon;
-    export default ImageBrightness3;
-}
-
-declare module 'material-ui/svg-icons/image/style' {
-    export import ImageStyle = __MaterialUI.SvgIcon;
-    export default ImageStyle;
-}
-
-declare module 'material-ui/svg-icons/image/filter-vintage' {
-    export import ImageFilterVintage = __MaterialUI.SvgIcon;
-    export default ImageFilterVintage;
-}
-
-declare module 'material-ui/svg-icons/image/tune' {
-    export import ImageTune = __MaterialUI.SvgIcon;
-    export default ImageTune;
-}
-
-declare module 'material-ui/svg-icons/image/camera' {
-    export import ImageCamera = __MaterialUI.SvgIcon;
-    export default ImageCamera;
-}
-
-declare module 'material-ui/svg-icons/image/timer' {
-    export import ImageTimer = __MaterialUI.SvgIcon;
-    export default ImageTimer;
-}
-
-declare module 'material-ui/svg-icons/image/landscape' {
-    export import ImageLandscape = __MaterialUI.SvgIcon;
-    export default ImageLandscape;
-}
-
-declare module 'material-ui/svg-icons/image/crop-16-9' {
-    export import ImageCrop169 = __MaterialUI.SvgIcon;
-    export default ImageCrop169;
-}
-
-declare module 'material-ui/svg-icons/image/add-to-photos' {
-    export import ImageAddToPhotos = __MaterialUI.SvgIcon;
-    export default ImageAddToPhotos;
-}
-
-declare module 'material-ui/svg-icons/image/wb-incandescent' {
-    export import ImageWbIncandescent = __MaterialUI.SvgIcon;
-    export default ImageWbIncandescent;
-}
-
-declare module 'material-ui/svg-icons/image/hdr-weak' {
-    export import ImageHdrWeak = __MaterialUI.SvgIcon;
-    export default ImageHdrWeak;
-}
-
-declare module 'material-ui/svg-icons/image/details' {
-    export import ImageDetails = __MaterialUI.SvgIcon;
-    export default ImageDetails;
-}
-
-declare module 'material-ui/svg-icons/image/view-compact' {
-    export import ImageViewCompact = __MaterialUI.SvgIcon;
-    export default ImageViewCompact;
-}
-
-declare module 'material-ui/svg-icons/image/brightness-5' {
-    export import ImageBrightness5 = __MaterialUI.SvgIcon;
-    export default ImageBrightness5;
-}
-
-declare module 'material-ui/svg-icons/image/center-focus-weak' {
-    export import ImageCenterFocusWeak = __MaterialUI.SvgIcon;
-    export default ImageCenterFocusWeak;
-}
-
-declare module 'material-ui/svg-icons/image/adjust' {
-    export import ImageAdjust = __MaterialUI.SvgIcon;
-    export default ImageAdjust;
-}
-
-declare module 'material-ui/svg-icons/image/camera-front' {
-    export import ImageCameraFront = __MaterialUI.SvgIcon;
-    export default ImageCameraFront;
-}
-
-declare module 'material-ui/svg-icons/image/transform' {
-    export import ImageTransform = __MaterialUI.SvgIcon;
-    export default ImageTransform;
-}
-
-declare module 'material-ui/svg-icons/image/filter' {
-    export import ImageFilter = __MaterialUI.SvgIcon;
-    export default ImageFilter;
-}
-
-declare module 'material-ui/svg-icons/image/grain' {
-    export import ImageGrain = __MaterialUI.SvgIcon;
-    export default ImageGrain;
-}
-
-declare module 'material-ui/svg-icons/image/filter-9-plus' {
-    export import ImageFilter9Plus = __MaterialUI.SvgIcon;
-    export default ImageFilter9Plus;
-}
-
-declare module 'material-ui/svg-icons/image/looks-5' {
-    export import ImageLooks5 = __MaterialUI.SvgIcon;
-    export default ImageLooks5;
-}
-
-declare module 'material-ui/svg-icons/image/hdr-on' {
-    export import ImageHdrOn = __MaterialUI.SvgIcon;
-    export default ImageHdrOn;
-}
-
-declare module 'material-ui/svg-icons/image/audiotrack' {
-    export import ImageAudiotrack = __MaterialUI.SvgIcon;
-    export default ImageAudiotrack;
-}
-
-declare module 'material-ui/svg-icons/image/compare' {
-    export import ImageCompare = __MaterialUI.SvgIcon;
-    export default ImageCompare;
-}
-
-declare module 'material-ui/svg-icons/image/crop' {
-    export import ImageCrop = __MaterialUI.SvgIcon;
-    export default ImageCrop;
-}
-
-declare module 'material-ui/svg-icons/image/texture' {
-    export import ImageTexture = __MaterialUI.SvgIcon;
-    export default ImageTexture;
-}
-
-declare module 'material-ui/svg-icons/image/movie-filter' {
-    export import ImageMovieFilter = __MaterialUI.SvgIcon;
-    export default ImageMovieFilter;
-}
-
-declare module 'material-ui/svg-icons/image/exposure' {
-    export import ImageExposure = __MaterialUI.SvgIcon;
-    export default ImageExposure;
-}
-
-declare module 'material-ui/svg-icons/image/filter-b-and-w' {
-    export import ImageFilterBAndW = __MaterialUI.SvgIcon;
-    export default ImageFilterBAndW;
-}
-
-declare module 'material-ui/svg-icons/image/photo-size-select-actual' {
-    export import ImagePhotoSizeSelectActual = __MaterialUI.SvgIcon;
-    export default ImagePhotoSizeSelectActual;
-}
-
-declare module 'material-ui/svg-icons/image/crop-5-4' {
-    export import ImageCrop54 = __MaterialUI.SvgIcon;
-    export default ImageCrop54;
-}
-
-declare module 'material-ui/svg-icons/image/brightness-2' {
-    export import ImageBrightness2 = __MaterialUI.SvgIcon;
-    export default ImageBrightness2;
-}
-
-declare module 'material-ui/svg-icons/image/tonality' {
-    export import ImageTonality = __MaterialUI.SvgIcon;
-    export default ImageTonality;
-}
-
-declare module 'material-ui/svg-icons/image/panorama-wide-angle' {
-    export import ImagePanoramaWideAngle = __MaterialUI.SvgIcon;
-    export default ImagePanoramaWideAngle;
-}
-
-declare module 'material-ui/svg-icons/image/flip' {
-    export import ImageFlip = __MaterialUI.SvgIcon;
-    export default ImageFlip;
-}
-
-declare module 'material-ui/svg-icons/image/filter-9' {
-    export import ImageFilter9 = __MaterialUI.SvgIcon;
-    export default ImageFilter9;
-}
-
-declare module 'material-ui/svg-icons/image/blur-on' {
-    export import ImageBlurOn = __MaterialUI.SvgIcon;
-    export default ImageBlurOn;
-}
-
-declare module 'material-ui/svg-icons/image/assistant' {
-    export import ImageAssistant = __MaterialUI.SvgIcon;
-    export default ImageAssistant;
-}
-
-declare module 'material-ui/svg-icons/image/lens' {
-    export import ImageLens = __MaterialUI.SvgIcon;
-    export default ImageLens;
-}
-
-declare module 'material-ui/svg-icons/image/switch-camera' {
-    export import ImageSwitchCamera = __MaterialUI.SvgIcon;
-    export default ImageSwitchCamera;
-}
-
-declare module 'material-ui/svg-icons/image/photo-filter' {
-    export import ImagePhotoFilter = __MaterialUI.SvgIcon;
-    export default ImagePhotoFilter;
-}
-
-declare module 'material-ui/svg-icons/image/wb-iridescent' {
-    export import ImageWbIridescent = __MaterialUI.SvgIcon;
-    export default ImageWbIridescent;
-}
-
-declare module 'material-ui/svg-icons/image/crop-square' {
-    export import ImageCropSquare = __MaterialUI.SvgIcon;
-    export default ImageCropSquare;
-}
-
-declare module 'material-ui/svg-icons/image/timer-10' {
-    export import ImageTimer10 = __MaterialUI.SvgIcon;
-    export default ImageTimer10;
-}
-
-declare module 'material-ui/svg-icons/image/rotate-right' {
-    export import ImageRotateRight = __MaterialUI.SvgIcon;
-    export default ImageRotateRight;
-}
-
-declare module 'material-ui/svg-icons/image/grid-off' {
-    export import ImageGridOff = __MaterialUI.SvgIcon;
-    export default ImageGridOff;
-}
-
-declare module 'material-ui/svg-icons/image/filter-7' {
-    export import ImageFilter7 = __MaterialUI.SvgIcon;
-    export default ImageFilter7;
-}
-
-declare module 'material-ui/svg-icons/image/loupe' {
-    export import ImageLoupe = __MaterialUI.SvgIcon;
-    export default ImageLoupe;
-}
-
-declare module 'material-ui/svg-icons/image/filter-6' {
-    export import ImageFilter6 = __MaterialUI.SvgIcon;
-    export default ImageFilter6;
-}
-
-declare module 'material-ui/svg-icons/image/filter-tilt-shift' {
-    export import ImageFilterTiltShift = __MaterialUI.SvgIcon;
-    export default ImageFilterTiltShift;
-}
-
-declare module 'material-ui/svg-icons/image/crop-din' {
-    export import ImageCropDin = __MaterialUI.SvgIcon;
-    export default ImageCropDin;
-}
-
-declare module 'material-ui/svg-icons/image/center-focus-strong' {
-    export import ImageCenterFocusStrong = __MaterialUI.SvgIcon;
-    export default ImageCenterFocusStrong;
-}
-
-declare module 'material-ui/svg-icons/image/rotate-left' {
-    export import ImageRotateLeft = __MaterialUI.SvgIcon;
-    export default ImageRotateLeft;
-}
-
-declare module 'material-ui/svg-icons/image/filter-hdr' {
-    export import ImageFilterHdr = __MaterialUI.SvgIcon;
-    export default ImageFilterHdr;
-}
-
-declare module 'material-ui/svg-icons/image/timer-off' {
-    export import ImageTimerOff = __MaterialUI.SvgIcon;
-    export default ImageTimerOff;
-}
-
-declare module 'material-ui/svg-icons/image/straighten' {
-    export import ImageStraighten = __MaterialUI.SvgIcon;
-    export default ImageStraighten;
-}
-
-declare module 'material-ui/svg-icons/image/exposure-neg-1' {
-    export import ImageExposureNeg1 = __MaterialUI.SvgIcon;
-    export default ImageExposureNeg1;
-}
-
-declare module 'material-ui/svg-icons/image/navigate-before' {
-    export import ImageNavigateBefore = __MaterialUI.SvgIcon;
-    export default ImageNavigateBefore;
-}
-
-declare module 'material-ui/svg-icons/image/iso' {
-    export import ImageIso = __MaterialUI.SvgIcon;
-    export default ImageIso;
-}
-
-declare module 'material-ui/svg-icons/image/photo-album' {
-    export import ImagePhotoAlbum = __MaterialUI.SvgIcon;
-    export default ImagePhotoAlbum;
-}
-
-declare module 'material-ui/svg-icons/image/crop-rotate' {
-    export import ImageCropRotate = __MaterialUI.SvgIcon;
-    export default ImageCropRotate;
-}
-
-declare module 'material-ui/svg-icons/image/remove-red-eye' {
-    export import ImageRemoveRedEye = __MaterialUI.SvgIcon;
-    export default ImageRemoveRedEye;
-}
-
-declare module 'material-ui/svg-icons/image/crop-portrait' {
-    export import ImageCropPortrait = __MaterialUI.SvgIcon;
-    export default ImageCropPortrait;
-}
-
-declare module 'material-ui/svg-icons/image/camera-alt' {
-    export import ImageCameraAlt = __MaterialUI.SvgIcon;
-    export default ImageCameraAlt;
-}
-
-declare module 'material-ui/svg-icons/image/control-point' {
-    export import ImageControlPoint = __MaterialUI.SvgIcon;
-    export default ImageControlPoint;
-}
-
-declare module 'material-ui/svg-icons/image/panorama' {
-    export import ImagePanorama = __MaterialUI.SvgIcon;
-    export default ImagePanorama;
-}
-
-declare module 'material-ui/svg-icons/image/panorama-fish-eye' {
-    export import ImagePanoramaFishEye = __MaterialUI.SvgIcon;
-    export default ImagePanoramaFishEye;
-}
-
-declare module 'material-ui/svg-icons/image/filter-8' {
-    export import ImageFilter8 = __MaterialUI.SvgIcon;
-    export default ImageFilter8;
-}
-
-declare module 'material-ui/svg-icons/image/looks-two' {
-    export import ImageLooksTwo = __MaterialUI.SvgIcon;
-    export default ImageLooksTwo;
-}
-
-declare module 'material-ui/svg-icons/image/panorama-horizontal' {
-    export import ImagePanoramaHorizontal = __MaterialUI.SvgIcon;
-    export default ImagePanoramaHorizontal;
-}
-
-declare module 'material-ui/svg-icons/image/looks-3' {
-    export import ImageLooks3 = __MaterialUI.SvgIcon;
-    export default ImageLooks3;
-}
-
-declare module 'material-ui/svg-icons/image/filter-none' {
-    export import ImageFilterNone = __MaterialUI.SvgIcon;
-    export default ImageFilterNone;
-}
-
-declare module 'material-ui/svg-icons/image/photo-size-select-large' {
-    export import ImagePhotoSizeSelectLarge = __MaterialUI.SvgIcon;
-    export default ImagePhotoSizeSelectLarge;
-}
-
-declare module 'material-ui/svg-icons/image/blur-off' {
-    export import ImageBlurOff = __MaterialUI.SvgIcon;
-    export default ImageBlurOff;
-}
-
-declare module 'material-ui/svg-icons/image/camera-roll' {
-    export import ImageCameraRoll = __MaterialUI.SvgIcon;
-    export default ImageCameraRoll;
-}
-
-declare module 'material-ui/svg-icons/image/leak-remove' {
-    export import ImageLeakRemove = __MaterialUI.SvgIcon;
-    export default ImageLeakRemove;
-}
-
-declare module 'material-ui/svg-icons/image/filter-frames' {
-    export import ImageFilterFrames = __MaterialUI.SvgIcon;
-    export default ImageFilterFrames;
-}
-
-declare module 'material-ui/svg-icons/image/flare' {
-    export import ImageFlare = __MaterialUI.SvgIcon;
-    export default ImageFlare;
-}
-
-declare module 'material-ui/svg-icons/image/photo-size-select-small' {
-    export import ImagePhotoSizeSelectSmall = __MaterialUI.SvgIcon;
-    export default ImagePhotoSizeSelectSmall;
-}
-
-declare module 'material-ui/svg-icons/image/photo-camera' {
-    export import ImagePhotoCamera = __MaterialUI.SvgIcon;
-    export default ImagePhotoCamera;
-}
-
-declare module 'material-ui/svg-icons/image/hdr-off' {
-    export import ImageHdrOff = __MaterialUI.SvgIcon;
-    export default ImageHdrOff;
-}
-
-declare module 'material-ui/svg-icons/image/filter-2' {
-    export import ImageFilter2 = __MaterialUI.SvgIcon;
-    export default ImageFilter2;
-}
-
-declare module 'material-ui/svg-icons/image/crop-original' {
-    export import ImageCropOriginal = __MaterialUI.SvgIcon;
-    export default ImageCropOriginal;
-}
-
-declare module 'material-ui/svg-icons/places/kitchen' {
-    export import PlacesKitchen = __MaterialUI.SvgIcon;
-    export default PlacesKitchen;
-}
-
-declare module 'material-ui/svg-icons/places/spa' {
-    export import PlacesSpa = __MaterialUI.SvgIcon;
-    export default PlacesSpa;
-}
-
-declare module 'material-ui/svg-icons/places/all-inclusive' {
-    export import PlacesAllInclusive = __MaterialUI.SvgIcon;
-    export default PlacesAllInclusive;
-}
-
-declare module 'material-ui/svg-icons/places/ac-unit' {
-    export import PlacesAcUnit = __MaterialUI.SvgIcon;
-    export default PlacesAcUnit;
-}
-
-declare module 'material-ui/svg-icons/places/child-care' {
-    export import PlacesChildCare = __MaterialUI.SvgIcon;
-    export default PlacesChildCare;
-}
-
-declare module 'material-ui/svg-icons/places/golf-course' {
-    export import PlacesGolfCourse = __MaterialUI.SvgIcon;
-    export default PlacesGolfCourse;
-}
-
-declare module 'material-ui/svg-icons/places/business-center' {
-    export import PlacesBusinessCenter = __MaterialUI.SvgIcon;
-    export default PlacesBusinessCenter;
-}
-
-declare module 'material-ui/svg-icons/places/free-breakfast' {
-    export import PlacesFreeBreakfast = __MaterialUI.SvgIcon;
-    export default PlacesFreeBreakfast;
-}
-
-declare module 'material-ui/svg-icons/places/fitness-center' {
-    export import PlacesFitnessCenter = __MaterialUI.SvgIcon;
-    export default PlacesFitnessCenter;
-}
-
-declare module 'material-ui/svg-icons/places/pool' {
-    export import PlacesPool = __MaterialUI.SvgIcon;
-    export default PlacesPool;
-}
-
-declare module 'material-ui/svg-icons/places/child-friendly' {
-    export import PlacesChildFriendly = __MaterialUI.SvgIcon;
-    export default PlacesChildFriendly;
-}
-
-declare module 'material-ui/svg-icons/places/casino' {
-    export import PlacesCasino = __MaterialUI.SvgIcon;
-    export default PlacesCasino;
-}
-
-declare module 'material-ui/svg-icons/places/hot-tub' {
-    export import PlacesHotTub = __MaterialUI.SvgIcon;
-    export default PlacesHotTub;
-}
-
-declare module 'material-ui/svg-icons/places/smoke-free' {
-    export import PlacesSmokeFree = __MaterialUI.SvgIcon;
-    export default PlacesSmokeFree;
-}
-
-declare module 'material-ui/svg-icons/places/room-service' {
-    export import PlacesRoomService = __MaterialUI.SvgIcon;
-    export default PlacesRoomService;
-}
-
-declare module 'material-ui/svg-icons/places/smoking-rooms' {
-    export import PlacesSmokingRooms = __MaterialUI.SvgIcon;
-    export default PlacesSmokingRooms;
-}
-
-declare module 'material-ui/svg-icons/places/beach-access' {
-    export import PlacesBeachAccess = __MaterialUI.SvgIcon;
-    export default PlacesBeachAccess;
-}
-
-declare module 'material-ui/svg-icons/places/airport-shuttle' {
-    export import PlacesAirportShuttle = __MaterialUI.SvgIcon;
-    export default PlacesAirportShuttle;
-}
-
-declare module 'material-ui/styles' {
-    export import MuiThemeProvider = __MaterialUI.Styles.MuiThemeProvider;
-    export import colors = __MaterialUI.Styles.Colors;
-    export import darkBaseTheme = __MaterialUI.Styles.darkBaseTheme;
-    export import DarkRawTheme = __MaterialUI.Styles.darkBaseTheme;
-    export import lightBaseTheme = __MaterialUI.Styles.lightBaseTheme;
-    export import LightRawTheme = __MaterialUI.Styles.lightBaseTheme;
-    export import getMuiTheme = __MaterialUI.Styles.getMuiTheme;
-    export import spacing = __MaterialUI.Styles.Spacing;
-    export import transitions = __MaterialUI.Styles.Transitions;
-    export import typography = __MaterialUI.Styles.Typography;
-    export import zIndex = __MaterialUI.Styles.zIndex;
-
-    export type MuiTheme = __MaterialUI.Styles.MuiTheme;
-}
-
-declare module 'material-ui/styles/getMuiTheme' {
-    export import getMuiTheme = __MaterialUI.Styles.getMuiTheme;
-    export default getMuiTheme;
-}
-
-declare module 'material-ui/styles/muiThemeable' {
-    export import muiThemeable = __MaterialUI.Styles.muiThemeable;
-    export default muiThemeable;
-}
-
-declare module 'material-ui/styles/MuiThemeProvider' {
-    export import MuiThemeProvider = __MaterialUI.Styles.MuiThemeProvider;
-    export default MuiThemeProvider;
-}
-
-declare module 'material-ui/styles/spacing' {
-    type Spacing = __MaterialUI.Styles.Spacing;
-    var Spacing: Spacing;
-    export default Spacing;
-}
-
-declare module 'material-ui/styles/transitions' {
-    export import Transitions = __MaterialUI.Styles.Transitions;
-    export default Transitions;
-}
-
-declare module 'material-ui/styles/typography' {
-    export import Typography = __MaterialUI.Styles.Typography;
-    export default Typography;
-}
-
-declare module 'material-ui/styles/baseThemes/lightBaseTheme' {
-    export import lightBaseTheme = __MaterialUI.Styles.lightBaseTheme;
-    export default lightBaseTheme;
-}
-
-declare module 'material-ui/styles/baseThemes/darkBaseTheme' {
-    export import darkBaseTheme = __MaterialUI.Styles.darkBaseTheme;
-    export default darkBaseTheme;
-}
-
-declare module 'material-ui/styles/zIndex' {
-    export import zIndex = __MaterialUI.Styles.zIndex;
-    export default zIndex;
-}
-
-declare module "material-ui/styles/colors" {
-    export const red50: string;
-    export const red100: string;
-    export const red200: string;
-    export const red300: string;
-    export const red400: string;
-    export const red500: string;
-    export const red600: string;
-    export const red700: string;
-    export const red800: string;
-    export const red900: string;
-    export const redA100: string;
-    export const redA200: string;
-    export const redA400: string;
-    export const redA700: string;
-
-    export const pink50: string;
-    export const pink100: string;
-    export const pink200: string;
-    export const pink300: string;
-    export const pink400: string;
-    export const pink500: string;
-    export const pink600: string;
-    export const pink700: string;
-    export const pink800: string;
-    export const pink900: string;
-    export const pinkA100: string;
-    export const pinkA200: string;
-    export const pinkA400: string;
-    export const pinkA700: string;
-
-    export const purple50: string;
-    export const purple100: string;
-    export const purple200: string;
-    export const purple300: string;
-    export const purple400: string;
-    export const purple500: string;
-    export const purple600: string;
-    export const purple700: string;
-    export const purple800: string;
-    export const purple900: string;
-    export const purpleA100: string;
-    export const purpleA200: string;
-    export const purpleA400: string;
-    export const purpleA700: string;
-
-    export const deepPurple50: string;
-    export const deepPurple100: string;
-    export const deepPurple200: string;
-    export const deepPurple300: string;
-    export const deepPurple400: string;
-    export const deepPurple500: string;
-    export const deepPurple600: string;
-    export const deepPurple700: string;
-    export const deepPurple800: string;
-    export const deepPurple900: string;
-    export const deepPurpleA100: string;
-    export const deepPurpleA200: string;
-    export const deepPurpleA400: string;
-    export const deepPurpleA700: string;
-
-    export const indigo50: string;
-    export const indigo100: string;
-    export const indigo200: string;
-    export const indigo300: string;
-    export const indigo400: string;
-    export const indigo500: string;
-    export const indigo600: string;
-    export const indigo700: string;
-    export const indigo800: string;
-    export const indigo900: string;
-    export const indigoA100: string;
-    export const indigoA200: string;
-    export const indigoA400: string;
-    export const indigoA700: string;
-
-    export const blue50: string;
-    export const blue100: string;
-    export const blue200: string;
-    export const blue300: string;
-    export const blue400: string;
-    export const blue500: string;
-    export const blue600: string;
-    export const blue700: string;
-    export const blue800: string;
-    export const blue900: string;
-    export const blueA100: string;
-    export const blueA200: string;
-    export const blueA400: string;
-    export const blueA700: string;
-
-    export const lightBlue50: string;
-    export const lightBlue100: string;
-    export const lightBlue200: string;
-    export const lightBlue300: string;
-    export const lightBlue400: string;
-    export const lightBlue500: string;
-    export const lightBlue600: string;
-    export const lightBlue700: string;
-    export const lightBlue800: string;
-    export const lightBlue900: string;
-    export const lightBlueA100: string;
-    export const lightBlueA200: string;
-    export const lightBlueA400: string;
-    export const lightBlueA700: string;
-
-    export const cyan50: string;
-    export const cyan100: string;
-    export const cyan200: string;
-    export const cyan300: string;
-    export const cyan400: string;
-    export const cyan500: string;
-    export const cyan600: string;
-    export const cyan700: string;
-    export const cyan800: string;
-    export const cyan900: string;
-    export const cyanA100: string;
-    export const cyanA200: string;
-    export const cyanA400: string;
-    export const cyanA700: string;
-
-    export const teal50: string;
-    export const teal100: string;
-    export const teal200: string;
-    export const teal300: string;
-    export const teal400: string;
-    export const teal500: string;
-    export const teal600: string;
-    export const teal700: string;
-    export const teal800: string;
-    export const teal900: string;
-    export const tealA100: string;
-    export const tealA200: string;
-    export const tealA400: string;
-    export const tealA700: string;
-
-    export const green50: string;
-    export const green100: string;
-    export const green200: string;
-    export const green300: string;
-    export const green400: string;
-    export const green500: string;
-    export const green600: string;
-    export const green700: string;
-    export const green800: string;
-    export const green900: string;
-    export const greenA100: string;
-    export const greenA200: string;
-    export const greenA400: string;
-    export const greenA700: string;
-
-    export const lightGreen50: string;
-    export const lightGreen100: string;
-    export const lightGreen200: string;
-    export const lightGreen300: string;
-    export const lightGreen400: string;
-    export const lightGreen500: string;
-    export const lightGreen600: string;
-    export const lightGreen700: string;
-    export const lightGreen800: string;
-    export const lightGreen900: string;
-    export const lightGreenA100: string;
-    export const lightGreenA200: string;
-    export const lightGreenA400: string;
-    export const lightGreenA700: string;
-
-    export const lime50: string;
-    export const lime100: string;
-    export const lime200: string;
-    export const lime300: string;
-    export const lime400: string;
-    export const lime500: string;
-    export const lime600: string;
-    export const lime700: string;
-    export const lime800: string;
-    export const lime900: string;
-    export const limeA100: string;
-    export const limeA200: string;
-    export const limeA400: string;
-    export const limeA700: string;
-
-    export const yellow50: string;
-    export const yellow100: string;
-    export const yellow200: string;
-    export const yellow300: string;
-    export const yellow400: string;
-    export const yellow500: string;
-    export const yellow600: string;
-    export const yellow700: string;
-    export const yellow800: string;
-    export const yellow900: string;
-    export const yellowA100: string;
-    export const yellowA200: string;
-    export const yellowA400: string;
-    export const yellowA700: string;
-
-    export const amber50: string;
-    export const amber100: string;
-    export const amber200: string;
-    export const amber300: string;
-    export const amber400: string;
-    export const amber500: string;
-    export const amber600: string;
-    export const amber700: string;
-    export const amber800: string;
-    export const amber900: string;
-    export const amberA100: string;
-    export const amberA200: string;
-    export const amberA400: string;
-    export const amberA700: string;
-
-    export const orange50: string;
-    export const orange100: string;
-    export const orange200: string;
-    export const orange300: string;
-    export const orange400: string;
-    export const orange500: string;
-    export const orange600: string;
-    export const orange700: string;
-    export const orange800: string;
-    export const orange900: string;
-    export const orangeA100: string;
-    export const orangeA200: string;
-    export const orangeA400: string;
-    export const orangeA700: string;
-
-    export const deepOrange50: string;
-    export const deepOrange100: string;
-    export const deepOrange200: string;
-    export const deepOrange300: string;
-    export const deepOrange400: string;
-    export const deepOrange500: string;
-    export const deepOrange600: string;
-    export const deepOrange700: string;
-    export const deepOrange800: string;
-    export const deepOrange900: string;
-    export const deepOrangeA100: string;
-    export const deepOrangeA200: string;
-    export const deepOrangeA400: string;
-    export const deepOrangeA700: string;
-
-    export const brown50: string;
-    export const brown100: string;
-    export const brown200: string;
-    export const brown300: string;
-    export const brown400: string;
-    export const brown500: string;
-    export const brown600: string;
-    export const brown700: string;
-    export const brown800: string;
-    export const brown900: string;
-
-    export const blueGrey50: string;
-    export const blueGrey100: string;
-    export const blueGrey200: string;
-    export const blueGrey300: string;
-    export const blueGrey400: string;
-    export const blueGrey500: string;
-    export const blueGrey600: string;
-    export const blueGrey700: string;
-    export const blueGrey800: string;
-    export const blueGrey900: string;
-
-    export const grey50: string;
-    export const grey100: string;
-    export const grey200: string;
-    export const grey300: string;
-    export const grey400: string;
-    export const grey500: string;
-    export const grey600: string;
-    export const grey700: string;
-    export const grey800: string;
-    export const grey900: string;
-
-    export const black: string;
-    export const white: string;
-
-    export const transparent: string;
-    export const fullBlack: string;
-    export const darkBlack: string;
-    export const lightBlack: string;
-    export const minBlack: string;
-    export const faintBlack: string;
-    export const fullWhite: string;
-    export const darkWhite: string;
-    export const lightWhite: string;
-}
-
-declare module 'material-ui/Table' {
-    export import Table = __MaterialUI.Table.Table;
-    export import TableBody = __MaterialUI.Table.TableBody;
-    export import TableFooter = __MaterialUI.Table.TableFooter;
-    export import TableHeader = __MaterialUI.Table.TableHeader;
-    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn;
-    export import TableRow = __MaterialUI.Table.TableRow;
-    export import TableRowColumn = __MaterialUI.Table.TableRowColumn;
-    export default Table;
-}
-
-declare module 'material-ui/Table/Table' {
-    export import Table = __MaterialUI.Table.Table;
-    export default Table;
-}
-
-declare module 'material-ui/Table/TableBody' {
-    export import TableBody = __MaterialUI.Table.TableBody;
-    export default TableBody;
-}
-
-declare module 'material-ui/Table/TableFooter' {
-    export import TableFooter = __MaterialUI.Table.TableFooter;
-    export default TableFooter;
-}
-
-declare module 'material-ui/Table/TableHeader' {
-    export import TableHeader = __MaterialUI.Table.TableHeader;
-    export default TableHeader;
-}
-
-declare module 'material-ui/Table/TableHeaderColumn' {
-    export import TableHeaderColumn = __MaterialUI.Table.TableHeaderColumn;
-    export default TableHeaderColumn;
-}
-
-declare module 'material-ui/Table/TableRow' {
-    export import TableRow = __MaterialUI.Table.TableRow;
-    export default TableRow;
-}
-
-declare module 'material-ui/Table/TableRowColumn' {
-    export import TableRowColumn = __MaterialUI.Table.TableRowColumn;
-    export default TableRowColumn;
-}
-
-declare module 'material-ui/Tabs' {
-    export import Tab = __MaterialUI.Tabs.Tab;
-    export import Tabs = __MaterialUI.Tabs.Tabs;
-    export default Tabs;
-}
-
-declare module 'material-ui/Tabs/Tab' {
-    export import Tab = __MaterialUI.Tabs.Tab;
-    export default Tab;
-}
-
-declare module 'material-ui/Tabs/Tabs' {
-    export import Tabs = __MaterialUI.Tabs.Tabs;
-    export default Tabs;
-}
-
-declare module 'material-ui/TextField' {
-    export import TextField = __MaterialUI.TextField;
-    export default TextField;
-}
-
-declare module 'material-ui/TimePicker' {
-    export import TimePicker = __MaterialUI.TimePicker;
-    export default TimePicker;
-}
-
-declare module 'material-ui/Toggle' {
-    export import Toggle = __MaterialUI.Switches.Toggle;
-    export default Toggle;
-}
-
-declare module 'material-ui/Toolbar' {
-    export import Toolbar = __MaterialUI.Toolbar.Toolbar;
-    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup;
-    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator;
-    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle;
-    export default Toolbar;
-}
-
-declare module 'material-ui/Toolbar/Toolbar' {
-    export import Toolbar = __MaterialUI.Toolbar.Toolbar;
-    export default Toolbar;
-}
-
-declare module 'material-ui/Toolbar/ToolbarGroup' {
-    export import ToolbarGroup = __MaterialUI.Toolbar.ToolbarGroup;
-    export default ToolbarGroup;
-}
-
-declare module 'material-ui/Toolbar/ToolbarSeparator' {
-    export import ToolbarSeparator = __MaterialUI.Toolbar.ToolbarSeparator;
-    export default ToolbarSeparator;
-}
-
-declare module 'material-ui/Toolbar/ToolbarTitle' {
-    export import ToolbarTitle = __MaterialUI.Toolbar.ToolbarTitle;
-    export default ToolbarTitle;
-}
-
-declare module 'material-ui/utils/colorManipulator' {
-    export import convertColorToString = __MaterialUI.Utils.ColorManipulator.convertColorToString;
-    export import convertHexToRGB = __MaterialUI.Utils.ColorManipulator.convertHexToRGB;
-    export import decomposeColor = __MaterialUI.Utils.ColorManipulator.decomposeColor;
-    export import getContrastRatio = __MaterialUI.Utils.ColorManipulator.getContrastRatio;
-    export import getLuminance = __MaterialUI.Utils.ColorManipulator.getLuminance;
-    export import emphasize = __MaterialUI.Utils.ColorManipulator.emphasize;
-    export import fade = __MaterialUI.Utils.ColorManipulator.fade;
-    export import darken = __MaterialUI.Utils.ColorManipulator.darken;
-    export import lighten = __MaterialUI.Utils.ColorManipulator.lighten;
-}
-declare module 'material-ui/utils/dom' {
-    export import Dom = __MaterialUI.Utils.Dom;
-    export default Dom;
-}
-declare module 'material-ui/utils/events' {
-    export import Events = __MaterialUI.Utils.Events;
-    export default Events;
-}
-declare module 'material-ui/utils/withWidth' {
-    export const SMALL: number;
-    export const MEDIUM: number;
-    export const LARGE: number;
-
-    interface Options {
-        largeWidth?: number;
-        mediumWidth?: number;
-        resizeInterval?: number;
-    }
-    export default function withWidth<C extends Function>(options?: Options): (component: C) => C;
-}
-
-declare namespace __MaterialUI.Styles {
-    interface Colors {
-        red50: string;
-        red100: string;
-        red200: string;
-        red300: string;
-        red400: string;
-        red500: string;
-        red600: string;
-        red700: string;
-        red800: string;
-        red900: string;
-        redA100: string;
-        redA200: string;
-        redA400: string;
-        redA700: string;
-
-        pink50: string;
-        pink100: string;
-        pink200: string;
-        pink300: string;
-        pink400: string;
-        pink500: string;
-        pink600: string;
-        pink700: string;
-        pink800: string;
-        pink900: string;
-        pinkA100: string;
-        pinkA200: string;
-        pinkA400: string;
-        pinkA700: string;
-
-        purple50: string;
-        purple100: string;
-        purple200: string;
-        purple300: string;
-        purple400: string;
-        purple500: string;
-        purple600: string;
-        purple700: string;
-        purple800: string;
-        purple900: string;
-        purpleA100: string;
-        purpleA200: string;
-        purpleA400: string;
-        purpleA700: string;
-
-        deepPurple50: string;
-        deepPurple100: string;
-        deepPurple200: string;
-        deepPurple300: string;
-        deepPurple400: string;
-        deepPurple500: string;
-        deepPurple600: string;
-        deepPurple700: string;
-        deepPurple800: string;
-        deepPurple900: string;
-        deepPurpleA100: string;
-        deepPurpleA200: string;
-        deepPurpleA400: string;
-        deepPurpleA700: string;
-
-        indigo50: string;
-        indigo100: string;
-        indigo200: string;
-        indigo300: string;
-        indigo400: string;
-        indigo500: string;
-        indigo600: string;
-        indigo700: string;
-        indigo800: string;
-        indigo900: string;
-        indigoA100: string;
-        indigoA200: string;
-        indigoA400: string;
-        indigoA700: string;
-
-        blue50: string;
-        blue100: string;
-        blue200: string;
-        blue300: string;
-        blue400: string;
-        blue500: string;
-        blue600: string;
-        blue700: string;
-        blue800: string;
-        blue900: string;
-        blueA100: string;
-        blueA200: string;
-        blueA400: string;
-        blueA700: string;
-
-        lightBlue50: string;
-        lightBlue100: string;
-        lightBlue200: string;
-        lightBlue300: string;
-        lightBlue400: string;
-        lightBlue500: string;
-        lightBlue600: string;
-        lightBlue700: string;
-        lightBlue800: string;
-        lightBlue900: string;
-        lightBlueA100: string;
-        lightBlueA200: string;
-        lightBlueA400: string;
-        lightBlueA700: string;
-
-        cyan50: string;
-        cyan100: string;
-        cyan200: string;
-        cyan300: string;
-        cyan400: string;
-        cyan500: string;
-        cyan600: string;
-        cyan700: string;
-        cyan800: string;
-        cyan900: string;
-        cyanA100: string;
-        cyanA200: string;
-        cyanA400: string;
-        cyanA700: string;
-
-        teal50: string;
-        teal100: string;
-        teal200: string;
-        teal300: string;
-        teal400: string;
-        teal500: string;
-        teal600: string;
-        teal700: string;
-        teal800: string;
-        teal900: string;
-        tealA100: string;
-        tealA200: string;
-        tealA400: string;
-        tealA700: string;
-
-        green50: string;
-        green100: string;
-        green200: string;
-        green300: string;
-        green400: string;
-        green500: string;
-        green600: string;
-        green700: string;
-        green800: string;
-        green900: string;
-        greenA100: string;
-        greenA200: string;
-        greenA400: string;
-        greenA700: string;
-
-        lightGreen50: string;
-        lightGreen100: string;
-        lightGreen200: string;
-        lightGreen300: string;
-        lightGreen400: string;
-        lightGreen500: string;
-        lightGreen600: string;
-        lightGreen700: string;
-        lightGreen800: string;
-        lightGreen900: string;
-        lightGreenA100: string;
-        lightGreenA200: string;
-        lightGreenA400: string;
-        lightGreenA700: string;
-
-        lime50: string;
-        lime100: string;
-        lime200: string;
-        lime300: string;
-        lime400: string;
-        lime500: string;
-        lime600: string;
-        lime700: string;
-        lime800: string;
-        lime900: string;
-        limeA100: string;
-        limeA200: string;
-        limeA400: string;
-        limeA700: string;
-
-        yellow50: string;
-        yellow100: string;
-        yellow200: string;
-        yellow300: string;
-        yellow400: string;
-        yellow500: string;
-        yellow600: string;
-        yellow700: string;
-        yellow800: string;
-        yellow900: string;
-        yellowA100: string;
-        yellowA200: string;
-        yellowA400: string;
-        yellowA700: string;
-
-        amber50: string;
-        amber100: string;
-        amber200: string;
-        amber300: string;
-        amber400: string;
-        amber500: string;
-        amber600: string;
-        amber700: string;
-        amber800: string;
-        amber900: string;
-        amberA100: string;
-        amberA200: string;
-        amberA400: string;
-        amberA700: string;
-
-        orange50: string;
-        orange100: string;
-        orange200: string;
-        orange300: string;
-        orange400: string;
-        orange500: string;
-        orange600: string;
-        orange700: string;
-        orange800: string;
-        orange900: string;
-        orangeA100: string;
-        orangeA200: string;
-        orangeA400: string;
-        orangeA700: string;
-
-        deepOrange50: string;
-        deepOrange100: string;
-        deepOrange200: string;
-        deepOrange300: string;
-        deepOrange400: string;
-        deepOrange500: string;
-        deepOrange600: string;
-        deepOrange700: string;
-        deepOrange800: string;
-        deepOrange900: string;
-        deepOrangeA100: string;
-        deepOrangeA200: string;
-        deepOrangeA400: string;
-        deepOrangeA700: string;
-
-        brown50: string;
-        brown100: string;
-        brown200: string;
-        brown300: string;
-        brown400: string;
-        brown500: string;
-        brown600: string;
-        brown700: string;
-        brown800: string;
-        brown900: string;
-
-        blueGrey50: string;
-        blueGrey100: string;
-        blueGrey200: string;
-        blueGrey300: string;
-        blueGrey400: string;
-        blueGrey500: string;
-        blueGrey600: string;
-        blueGrey700: string;
-        blueGrey800: string;
-        blueGrey900: string;
-
-        grey50: string;
-        grey100: string;
-        grey200: string;
-        grey300: string;
-        grey400: string;
-        grey500: string;
-        grey600: string;
-        grey700: string;
-        grey800: string;
-        grey900: string;
-
-        black: string;
-        white: string;
-
-        transparent: string;
-        fullBlack: string;
-        darkBlack: string;
-        lightBlack: string;
-        minBlack: string;
-        faintBlack: string;
-        fullWhite: string;
-        darkWhite: string;
-        lightWhite: string;
-    }
-    export var Colors: Colors;
-}
-
-declare module "material-ui/svg-icons" {
-    export import ActionAccessibility = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/accessibility');
-    export import ActionAccessible = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/accessible');
-    export import ActionAccountBalance = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/account-balance');
-    export import ActionAccountBalanceWallet = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/account-balance-wallet');
-    export import ActionAccountBox = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/account-box');
-    export import ActionAccountCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/account-circle');
-    export import ActionAddShoppingCart = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/add-shopping-cart');
-    export import ActionAlarm = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/alarm');
-    export import ActionAlarmAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/alarm-add');
-    export import ActionAlarmOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/alarm-off');
-    export import ActionAlarmOn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/alarm-on');
-    export import ActionAllOut = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/all-out');
-    export import ActionAndroid = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/android');
-    export import ActionAnnouncement = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/announcement');
-    export import ActionAspectRatio = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/aspect-ratio');
-    export import ActionAssessment = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/assessment');
-    export import ActionAssignment = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/assignment');
-    export import ActionAssignmentInd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/assignment-ind');
-    export import ActionAssignmentLate = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/assignment-late');
-    export import ActionAssignmentReturn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/assignment-return');
-    export import ActionAssignmentReturned = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/assignment-returned');
-    export import ActionAssignmentTurnedIn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/assignment-turned-in');
-    export import ActionAutorenew = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/autorenew');
-    export import ActionBackup = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/backup');
-    export import ActionBook = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/book');
-    export import ActionBookmark = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/bookmark');
-    export import ActionBookmarkBorder = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/bookmark-border');
-    export import ActionBugReport = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/bug-report');
-    export import ActionBuild = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/build');
-    export import ActionCached = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/cached');
-    export import ActionCameraEnhance = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/camera-enhance');
-    export import ActionCardGiftcard = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/card-giftcard');
-    export import ActionCardMembership = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/card-membership');
-    export import ActionCardTravel = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/card-travel');
-    export import ActionChangeHistory = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/change-history');
-    export import ActionCheckCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/check-circle');
-    export import ActionChromeReaderMode = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/chrome-reader-mode');
-    export import ActionClass = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/class');
-    export import ActionCode = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/code');
-    export import ActionCompareArrows = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/compare-arrows');
-    export import ActionCopyright = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/copyright');
-    export import ActionCreditCard = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/credit-card');
-    export import ActionDashboard = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/dashboard');
-    export import ActionDateRange = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/date-range');
-    export import ActionDelete = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/delete');
-    export import ActionDescription = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/description');
-    export import ActionDns = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/dns');
-    export import ActionDone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/done');
-    export import ActionDoneAll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/done-all');
-    export import ActionDonutLarge = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/donut-large');
-    export import ActionDonutSmall = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/donut-small');
-    export import ActionEject = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/eject');
-    export import ActionEvent = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/event');
-    export import ActionEventSeat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/event-seat');
-    export import ActionExitToApp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/exit-to-app');
-    export import ActionExplore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/explore');
-    export import ActionExtension = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/extension');
-    export import ActionFace = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/face');
-    export import ActionFavorite = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/favorite');
-    export import ActionFavoriteBorder = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/favorite-border');
-    export import ActionFeedback = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/feedback');
-    export import ActionFindInPage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/find-in-page');
-    export import ActionFindReplace = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/find-replace');
-    export import ActionFingerprint = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/fingerprint');
-    export import ActionFlightLand = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/flight-land');
-    export import ActionFlightTakeoff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/flight-takeoff');
-    export import ActionFlipToBack = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/flip-to-back');
-    export import ActionFlipToFront = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/flip-to-front');
-    export import ActionGavel = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/gavel');
-    export import ActionGetApp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/get-app');
-    export import ActionGif = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/gif');
-    export import ActionGrade = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/grade');
-    export import ActionGroupWork = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/group-work');
-    export import ActionHelp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/help');
-    export import ActionHelpOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/help-outline');
-    export import ActionHighlightOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/highlight-off');
-    export import ActionHistory = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/history');
-    export import ActionHome = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/home');
-    export import ActionHourglassEmpty = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/hourglass-empty');
-    export import ActionHourglassFull = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/hourglass-full');
-    export import ActionHttp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/http');
-    export import ActionHttps = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/https');
-    export import ActionImportantDevices = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/important-devices');
-    export import ActionInfo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/info');
-    export import ActionInfoOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/info-outline');
-    export import ActionInput = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/input');
-    export import ActionInvertColors = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/invert-colors');
-    export import ActionLabel = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/label');
-    export import ActionLabelOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/label-outline');
-    export import ActionLanguage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/language');
-    export import ActionLaunch = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/launch');
-    export import ActionLightbulbOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/lightbulb-outline');
-    export import ActionLineStyle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/line-style');
-    export import ActionLineWeight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/line-weight');
-    export import ActionList = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/list');
-    export import ActionLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/lock');
-    export import ActionLockOpen = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/lock-open');
-    export import ActionLockOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/lock-outline');
-    export import ActionLoyalty = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/loyalty');
-    export import ActionMarkunreadMailbox = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/markunread-mailbox');
-    export import ActionMotorcycle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/motorcycle');
-    export import ActionNoteAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/note-add');
-    export import ActionOfflinePin = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/offline-pin');
-    export import ActionOpacity = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/opacity');
-    export import ActionOpenInBrowser = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/open-in-browser');
-    export import ActionOpenInNew = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/open-in-new');
-    export import ActionOpenWith = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/open-with');
-    export import ActionPageview = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/pageview');
-    export import ActionPanTool = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/pan-tool');
-    export import ActionPayment = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/payment');
-    export import ActionPermCameraMic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-camera-mic');
-    export import ActionPermContactCalendar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-contact-calendar');
-    export import ActionPermDataSetting = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-data-setting');
-    export import ActionPermDeviceInformation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-device-information');
-    export import ActionPermIdentity = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-identity');
-    export import ActionPermMedia = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-media');
-    export import ActionPermPhoneMsg = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-phone-msg');
-    export import ActionPermScanWifi = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/perm-scan-wifi');
-    export import ActionPets = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/pets');
-    export import ActionPictureInPicture = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/picture-in-picture');
-    export import ActionPictureInPictureAlt = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/picture-in-picture-alt');
-    export import ActionPlayForWork = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/play-for-work');
-    export import ActionPolymer = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/polymer');
-    export import ActionPowerSettingsNew = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/power-settings-new');
-    export import ActionPregnantWoman = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/pregnant-woman');
-    export import ActionPrint = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/print');
-    export import ActionQueryBuilder = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/query-builder');
-    export import ActionQuestionAnswer = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/question-answer');
-    export import ActionReceipt = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/receipt');
-    export import ActionRecordVoiceOver = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/record-voice-over');
-    export import ActionRedeem = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/redeem');
-    export import ActionReorder = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/reorder');
-    export import ActionReportProblem = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/report-problem');
-    export import ActionRestore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/restore');
-    export import ActionRoom = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/room');
-    export import ActionRoundedCorner = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/rounded-corner');
-    export import ActionRowing = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/rowing');
-    export import ActionSchedule = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/schedule');
-    export import ActionSearch = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/search');
-    export import ActionSettings = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings');
-    export import ActionSettingsApplications = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-applications');
-    export import ActionSettingsBackupRestore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-backup-restore');
-    export import ActionSettingsBluetooth = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-bluetooth');
-    export import ActionSettingsBrightness = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-brightness');
-    export import ActionSettingsCell = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-cell');
-    export import ActionSettingsEthernet = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-ethernet');
-    export import ActionSettingsInputAntenna = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-input-antenna');
-    export import ActionSettingsInputComponent = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-input-component');
-    export import ActionSettingsInputComposite = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-input-composite');
-    export import ActionSettingsInputHdmi = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-input-hdmi');
-    export import ActionSettingsInputSvideo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-input-svideo');
-    export import ActionSettingsOverscan = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-overscan');
-    export import ActionSettingsPhone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-phone');
-    export import ActionSettingsPower = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-power');
-    export import ActionSettingsRemote = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-remote');
-    export import ActionSettingsVoice = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/settings-voice');
-    export import ActionShop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/shop');
-    export import ActionShoppingBasket = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/shopping-basket');
-    export import ActionShoppingCart = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/shopping-cart');
-    export import ActionShopTwo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/shop-two');
-    export import ActionSpeakerNotes = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/speaker-notes');
-    export import ActionSpellcheck = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/spellcheck');
-    export import ActionStars = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/stars');
-    export import ActionStore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/store');
-    export import ActionSubject = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/subject');
-    export import ActionSupervisorAccount = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/supervisor-account');
-    export import ActionSwapHoriz = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/swap-horiz');
-    export import ActionSwapVert = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/swap-vert');
-    export import ActionSwapVerticalCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/swap-vertical-circle');
-    export import ActionSystemUpdateAlt = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/system-update-alt');
-    export import ActionTab = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/tab');
-    export import ActionTabUnselected = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/tab-unselected');
-    export import ActionTheaters = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/theaters');
-    export import ActionThreeDRotation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/three-d-rotation');
-    export import ActionThumbDown = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/thumb-down');
-    export import ActionThumbsUpDown = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/thumbs-up-down');
-    export import ActionThumbUp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/thumb-up');
-    export import ActionTimeline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/timeline');
-    export import ActionToc = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/toc');
-    export import ActionToday = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/today');
-    export import ActionToll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/toll');
-    export import ActionTouchApp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/touch-app');
-    export import ActionTrackChanges = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/track-changes');
-    export import ActionTranslate = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/translate');
-    export import ActionTrendingDown = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/trending-down');
-    export import ActionTrendingFlat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/trending-flat');
-    export import ActionTrendingUp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/trending-up');
-    export import ActionTurnedIn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/turned-in');
-    export import ActionTurnedInNot = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/turned-in-not');
-    export import ActionUpdate = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/update');
-    export import ActionVerifiedUser = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/verified-user');
-    export import ActionViewAgenda = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-agenda');
-    export import ActionViewArray = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-array');
-    export import ActionViewCarousel = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-carousel');
-    export import ActionViewColumn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-column');
-    export import ActionViewDay = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-day');
-    export import ActionViewHeadline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-headline');
-    export import ActionViewList = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-list');
-    export import ActionViewModule = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-module');
-    export import ActionViewQuilt = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-quilt');
-    export import ActionViewStream = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-stream');
-    export import ActionViewWeek = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/view-week');
-    export import ActionVisibility = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/visibility');
-    export import ActionVisibilityOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/visibility-off');
-    export import ActionWatchLater = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/watch-later');
-    export import ActionWork = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/work');
-    export import ActionYoutubeSearchedFor = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/youtube-searched-for');
-    export import ActionZoomIn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/zoom-in');
-    export import ActionZoomOut = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/action/zoom-out');
-    export import AlertAddAlert = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/alert/add-alert');
-    export import AlertError = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/alert/error');
-    export import AlertErrorOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/alert/error-outline');
-    export import AlertWarning = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/alert/warning');
-    export import AvAddToQueue = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/add-to-queue');
-    export import AvAirplay = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/airplay');
-    export import AvAlbum = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/album');
-    export import AvArtTrack = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/art-track');
-    export import AvAvTimer = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/av-timer');
-    export import AvClosedCaption = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/closed-caption');
-    export import AvEqualizer = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/equalizer');
-    export import AvExplicit = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/explicit');
-    export import AvFastForward = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/fast-forward');
-    export import AvFastRewind = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/fast-rewind');
-    export import AvFiberDvr = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/fiber-dvr');
-    export import AvFiberManualRecord = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/fiber-manual-record');
-    export import AvFiberNew = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/fiber-new');
-    export import AvFiberPin = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/fiber-pin');
-    export import AvFiberSmartRecord = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/fiber-smart-record');
-    export import AvForward10 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/forward-10');
-    export import AvForward30 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/forward-30');
-    export import AvForward5 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/forward-5');
-    export import AvGames = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/games');
-    export import AvHd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/hd');
-    export import AvHearing = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/hearing');
-    export import AvHighQuality = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/high-quality');
-    export import AvLibraryAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/library-add');
-    export import AvLibraryBooks = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/library-books');
-    export import AvLibraryMusic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/library-music');
-    export import AvLoop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/loop');
-    export import AvMic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/mic');
-    export import AvMicNone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/mic-none');
-    export import AvMicOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/mic-off');
-    export import AvMovie = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/movie');
-    export import AvMusicVideo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/music-video');
-    export import AvNewReleases = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/new-releases');
-    export import AvNotInterested = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/not-interested');
-    export import AvPause = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/pause');
-    export import AvPauseCircleFilled = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/pause-circle-filled');
-    export import AvPauseCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/pause-circle-outline');
-    export import AvPlayArrow = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/play-arrow');
-    export import AvPlayCircleFilled = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/play-circle-filled');
-    export import AvPlayCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/play-circle-outline');
-    export import AvPlaylistAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/playlist-add');
-    export import AvPlaylistAddCheck = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/playlist-add-check');
-    export import AvPlaylistPlay = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/playlist-play');
-    export import AvQueue = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/queue');
-    export import AvQueueMusic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/queue-music');
-    export import AvQueuePlayNext = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/queue-play-next');
-    export import AvRadio = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/radio');
-    export import AvRecentActors = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/recent-actors');
-    export import AvRemoveFromQueue = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/remove-from-queue');
-    export import AvRepeat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/repeat');
-    export import AvRepeatOne = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/repeat-one');
-    export import AvReplay = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/replay');
-    export import AvReplay10 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/replay-10');
-    export import AvReplay30 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/replay-30');
-    export import AvReplay5 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/replay-5');
-    export import AvShuffle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/shuffle');
-    export import AvSkipNext = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/skip-next');
-    export import AvSkipPrevious = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/skip-previous');
-    export import AvSlowMotionVideo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/slow-motion-video');
-    export import AvSnooze = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/snooze');
-    export import AvSortByAlpha = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/sort-by-alpha');
-    export import AvStop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/stop');
-    export import AvSubscriptions = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/subscriptions');
-    export import AvSubtitles = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/subtitles');
-    export import AvSurroundSound = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/surround-sound');
-    export import AvVideocam = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/videocam');
-    export import AvVideocamOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/videocam-off');
-    export import AvVideoLibrary = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/video-library');
-    export import AvVolumeDown = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/volume-down');
-    export import AvVolumeMute = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/volume-mute');
-    export import AvVolumeOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/volume-off');
-    export import AvVolumeUp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/volume-up');
-    export import AvWeb = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/web');
-    export import AvWebAsset = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/av/web-asset');
-    export import CommunicationBusiness = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/business');
-    export import CommunicationCall = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call');
-    export import CommunicationCallEnd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call-end');
-    export import CommunicationCallMade = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call-made');
-    export import CommunicationCallMerge = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call-merge');
-    export import CommunicationCallMissed = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call-missed');
-    export import CommunicationCallMissedOutgoing = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call-missed-outgoing');
-    export import CommunicationCallReceived = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call-received');
-    export import CommunicationCallSplit = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/call-split');
-    export import CommunicationChat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/chat');
-    export import CommunicationChatBubble = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/chat-bubble');
-    export import CommunicationChatBubbleOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/chat-bubble-outline');
-    export import CommunicationClearAll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/clear-all');
-    export import CommunicationComment = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/comment');
-    export import CommunicationContactMail = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/contact-mail');
-    export import CommunicationContactPhone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/contact-phone');
-    export import CommunicationContacts = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/contacts');
-    export import CommunicationDialerSip = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/dialer-sip');
-    export import CommunicationDialpad = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/dialpad');
-    export import CommunicationEmail = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/email');
-    export import CommunicationForum = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/forum');
-    export import CommunicationImportContacts = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/import-contacts');
-    export import CommunicationImportExport = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/import-export');
-    export import CommunicationInvertColorsOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/invert-colors-off');
-    export import CommunicationLiveHelp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/live-help');
-    export import CommunicationLocationOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/location-off');
-    export import CommunicationLocationOn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/location-on');
-    export import CommunicationMailOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/mail-outline');
-    export import CommunicationMessage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/message');
-    export import CommunicationNoSim = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/no-sim');
-    export import CommunicationPhone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/phone');
-    export import CommunicationPhonelinkErase = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/phonelink-erase');
-    export import CommunicationPhonelinkLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/phonelink-lock');
-    export import CommunicationPhonelinkRing = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/phonelink-ring');
-    export import CommunicationPhonelinkSetup = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/phonelink-setup');
-    export import CommunicationPortableWifiOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/portable-wifi-off');
-    export import CommunicationPresentToAll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/present-to-all');
-    export import CommunicationRingVolume = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/ring-volume');
-    export import CommunicationScreenShare = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/screen-share');
-    export import CommunicationSpeakerPhone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/speaker-phone');
-    export import CommunicationStayCurrentLandscape = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/stay-current-landscape');
-    export import CommunicationStayCurrentPortrait = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/stay-current-portrait');
-    export import CommunicationStayPrimaryLandscape = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/stay-primary-landscape');
-    export import CommunicationStayPrimaryPortrait = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/stay-primary-portrait');
-    export import CommunicationStopScreenShare = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/stop-screen-share');
-    export import CommunicationSwapCalls = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/swap-calls');
-    export import CommunicationTactMail = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/tact-mail');
-    export import CommunicationTextsms = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/textsms');
-    export import CommunicationVoicemail = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/voicemail');
-    export import CommunicationVpnKey = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/communication/vpn-key');
-    export import ContentAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/add');
-    export import ContentAddBox = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/add-box');
-    export import ContentAddCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/add-circle');
-    export import ContentAddCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/add-circle-outline');
-    export import ContentArchive = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/archive');
-    export import ContentBackspace = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/backspace');
-    export import ContentBlock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/block');
-    export import ContentClear = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/clear');
-    export import ContentContentCopy = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/content-copy');
-    export import ContentContentCut = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/content-cut');
-    export import ContentContentPaste = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/content-paste');
-    export import ContentCreate = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/create');
-    export import ContentDrafts = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/drafts');
-    export import ContentFilterList = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/filter-list');
-    export import ContentFlag = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/flag');
-    export import ContentFontDownload = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/font-download');
-    export import ContentForward = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/forward');
-    export import ContentGesture = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/gesture');
-    export import ContentInbox = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/inbox');
-    export import ContentLink = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/link');
-    export import ContentMail = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/mail');
-    export import ContentMarkunread = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/markunread');
-    export import ContentMoveToInbox = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/move-to-inbox');
-    export import ContentNextWeek = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/next-week');
-    export import ContentRedo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/redo');
-    export import ContentRemove = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/remove');
-    export import ContentRemoveCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/remove-circle');
-    export import ContentRemoveCircleOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/remove-circle-outline');
-    export import ContentReply = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/reply');
-    export import ContentReplyAll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/reply-all');
-    export import ContentReport = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/report');
-    export import ContentSave = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/save');
-    export import ContentSelectAll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/select-all');
-    export import ContentSend = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/send');
-    export import ContentSort = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/sort');
-    export import ContentTextFormat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/text-format');
-    export import ContentUnarchive = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/unarchive');
-    export import ContentUndo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/undo');
-    export import ContentWeekend = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/content/weekend');
-    export import DeviceAccessAlarm = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/access-alarm');
-    export import DeviceAccessAlarms = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/access-alarms');
-    export import DeviceAccessTime = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/access-time');
-    export import DeviceAddAlarm = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/add-alarm');
-    export import DeviceAirplanemodeActive = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/airplanemode-active');
-    export import DeviceAirplanemodeInactive = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/airplanemode-inactive');
-    export import DeviceBattery20 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-20');
-    export import DeviceBattery30 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-30');
-    export import DeviceBattery50 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-50');
-    export import DeviceBattery60 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-60');
-    export import DeviceBattery80 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-80');
-    export import DeviceBattery90 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-90');
-    export import DeviceBatteryAlert = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-alert');
-    export import DeviceBatteryCharging20 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-charging-20');
-    export import DeviceBatteryCharging30 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-charging-30');
-    export import DeviceBatteryCharging50 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-charging-50');
-    export import DeviceBatteryCharging60 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-charging-60');
-    export import DeviceBatteryCharging80 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-charging-80');
-    export import DeviceBatteryCharging90 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-charging-90');
-    export import DeviceBatteryChargingFull = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-charging-full');
-    export import DeviceBatteryFull = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-full');
-    export import DeviceBatteryStd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-std');
-    export import DeviceBatteryUnknown = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/battery-unknown');
-    export import DeviceBluetooth = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/bluetooth');
-    export import DeviceBluetoothConnected = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/bluetooth-connected');
-    export import DeviceBluetoothDisabled = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/bluetooth-disabled');
-    export import DeviceBluetoothSearching = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/bluetooth-searching');
-    export import DeviceBrightnessAuto = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/brightness-auto');
-    export import DeviceBrightnessHigh = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/brightness-high');
-    export import DeviceBrightnessLow = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/brightness-low');
-    export import DeviceBrightnessMedium = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/brightness-medium');
-    export import DeviceDataUsage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/data-usage');
-    export import DeviceDeveloperMode = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/developer-mode');
-    export import DeviceDevices = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/devices');
-    export import DeviceDvr = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/dvr');
-    export import DeviceGpsFixed = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/gps-fixed');
-    export import DeviceGpsNotFixed = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/gps-not-fixed');
-    export import DeviceGpsOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/gps-off');
-    export import DeviceGraphicEq = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/graphic-eq');
-    export import DeviceLocationDisabled = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/location-disabled');
-    export import DeviceLocationSearching = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/location-searching');
-    export import DeviceNetworkCell = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/network-cell');
-    export import DeviceNetworkWifi = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/network-wifi');
-    export import DeviceNfc = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/nfc');
-    export import DeviceScreenLockLandscape = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/screen-lock-landscape');
-    export import DeviceScreenLockPortrait = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/screen-lock-portrait');
-    export import DeviceScreenLockRotation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/screen-lock-rotation');
-    export import DeviceScreenRotation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/screen-rotation');
-    export import DeviceSdStorage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/sd-storage');
-    export import DeviceSettingsSystemDaydream = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/settings-system-daydream');
-    export import DeviceSignalCellular0Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-0-bar');
-    export import DeviceSignalCellular1Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-1-bar');
-    export import DeviceSignalCellular2Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-2-bar');
-    export import DeviceSignalCellular3Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-3-bar');
-    export import DeviceSignalCellular4Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-4-bar');
-    export import DeviceSignalCellularConnectedNoInternet0Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-connected-no-internet-0-bar');
-    export import DeviceSignalCellularConnectedNoInternet1Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-connected-no-internet-1-bar');
-    export import DeviceSignalCellularConnectedNoInternet2Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-connected-no-internet-2-bar');
-    export import DeviceSignalCellularConnectedNoInternet3Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-connected-no-internet-3-bar');
-    export import DeviceSignalCellularConnectedNoInternet4Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-connected-no-internet-4-bar');
-    export import DeviceSignalCellularNoSim = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-no-sim');
-    export import DeviceSignalCellularNull = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-null');
-    export import DeviceSignalCellularOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-cellular-off');
-    export import DeviceSignalWifi0Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-0-bar');
-    export import DeviceSignalWifi1Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-1-bar');
-    export import DeviceSignalWifi1BarLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-1-bar-lock');
-    export import DeviceSignalWifi2Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-2-bar');
-    export import DeviceSignalWifi2BarLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-2-bar-lock');
-    export import DeviceSignalWifi3Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-3-bar');
-    export import DeviceSignalWifi3BarLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-3-bar-lock');
-    export import DeviceSignalWifi4Bar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-4-bar');
-    export import DeviceSignalWifi4BarLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-4-bar-lock');
-    export import DeviceSignalWifiOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/signal-wifi-off');
-    export import DeviceStorage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/storage');
-    export import DeviceUsb = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/usb');
-    export import DeviceWallpaper = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/wallpaper');
-    export import DeviceWidgets = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/widgets');
-    export import DeviceWifiLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/wifi-lock');
-    export import DeviceWifiTethering = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/device/wifi-tethering');
-    export import EditorAttachFile = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/attach-file');
-    export import EditorAttachMoney = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/attach-money');
-    export import EditorBorderAll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-all');
-    export import EditorBorderBottom = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-bottom');
-    export import EditorBorderClear = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-clear');
-    export import EditorBorderColor = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-color');
-    export import EditorBorderHorizontal = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-horizontal');
-    export import EditorBorderInner = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-inner');
-    export import EditorBorderLeft = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-left');
-    export import EditorBorderOuter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-outer');
-    export import EditorBorderRight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-right');
-    export import EditorBorderStyle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-style');
-    export import EditorBorderTop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-top');
-    export import EditorBorderVertical = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/border-vertical');
-    export import EditorDragHandle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/drag-handle');
-    export import EditorFormatAlignCenter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-align-center');
-    export import EditorFormatAlignJustify = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-align-justify');
-    export import EditorFormatAlignLeft = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-align-left');
-    export import EditorFormatAlignRight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-align-right');
-    export import EditorFormatBold = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-bold');
-    export import EditorFormatClear = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-clear');
-    export import EditorFormatColorFill = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-color-fill');
-    export import EditorFormatColorReset = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-color-reset');
-    export import EditorFormatColorText = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-color-text');
-    export import EditorFormatIndentDecrease = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-indent-decrease');
-    export import EditorFormatIndentIncrease = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-indent-increase');
-    export import EditorFormatItalic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-italic');
-    export import EditorFormatLineSpacing = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-line-spacing');
-    export import EditorFormatListBulleted = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-list-bulleted');
-    export import EditorFormatListNumbered = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-list-numbered');
-    export import EditorFormatPaint = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-paint');
-    export import EditorFormatQuote = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-quote');
-    export import EditorFormatShapes = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-shapes');
-    export import EditorFormatSize = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-size');
-    export import EditorFormatStrikethrough = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-strikethrough');
-    export import EditorFormatTextdirectionLToR = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-textdirection-l-to-r');
-    export import EditorFormatTextdirectionRToL = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-textdirection-r-to-l');
-    export import EditorFormatUnderlined = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/format-underlined');
-    export import EditorFunctions = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/functions');
-    export import EditorHighlight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/highlight');
-    export import EditorInsertChart = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/insert-chart');
-    export import EditorInsertComment = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/insert-comment');
-    export import EditorInsertDriveFile = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/insert-drive-file');
-    export import EditorInsertEmoticon = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/insert-emoticon');
-    export import EditorInsertInvitation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/insert-invitation');
-    export import EditorInsertLink = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/insert-link');
-    export import EditorInsertPhoto = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/insert-photo');
-    export import EditorLinearScale = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/linear-scale');
-    export import EditorMergeType = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/merge-type');
-    export import EditorModeComment = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/mode-comment');
-    export import EditorModeEdit = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/mode-edit');
-    export import EditorMoneyOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/money-off');
-    export import EditorPublish = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/publish');
-    export import EditorShortText = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/short-text');
-    export import EditorSpaceBar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/space-bar');
-    export import EditorStrikethroughS = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/strikethrough-s');
-    export import EditorTextFields = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/text-fields');
-    export import EditorVerticalAlignBottom = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/vertical-align-bottom');
-    export import EditorVerticalAlignCenter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/vertical-align-center');
-    export import EditorVerticalAlignTop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/vertical-align-top');
-    export import EditorWrapText = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/editor/wrap-text');
-    export import FileAttachment = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/attachment');
-    export import FileCloud = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/cloud');
-    export import FileCloudCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/cloud-circle');
-    export import FileCloudDone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/cloud-done');
-    export import FileCloudDownload = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/cloud-download');
-    export import FileCloudOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/cloud-off');
-    export import FileCloudQueue = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/cloud-queue');
-    export import FileCloudUpload = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/cloud-upload');
-    export import FileCreateNewFolder = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/create-new-folder');
-    export import FileFileDownload = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/file-download');
-    export import FileFileUpload = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/file-upload');
-    export import FileFolder = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/folder');
-    export import FileFolderOpen = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/folder-open');
-    export import FileFolderShared = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/file/folder-shared');
-    export import HardwareCast = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/cast');
-    export import HardwareCastConnected = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/cast-connected');
-    export import HardwareComputer = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/computer');
-    export import HardwareDesktopMac = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/desktop-mac');
-    export import HardwareDesktopWindows = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/desktop-windows');
-    export import HardwareDeveloperBoard = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/developer-board');
-    export import HardwareDeviceHub = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/device-hub');
-    export import HardwareDevicesOther = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/devices-other');
-    export import HardwareDock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/dock');
-    export import HardwareGamepad = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/gamepad');
-    export import HardwareHeadset = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/headset');
-    export import HardwareHeadsetMic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/headset-mic');
-    export import HardwareKeyboard = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard');
-    export import HardwareKeyboardArrowDown = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-arrow-down');
-    export import HardwareKeyboardArrowLeft = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-arrow-left');
-    export import HardwareKeyboardArrowRight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-arrow-right');
-    export import HardwareKeyboardArrowUp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-arrow-up');
-    export import HardwareKeyboardBackspace = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-backspace');
-    export import HardwareKeyboardCapslock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-capslock');
-    export import HardwareKeyboardHide = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-hide');
-    export import HardwareKeyboardReturn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-return');
-    export import HardwareKeyboardTab = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-tab');
-    export import HardwareKeyboardVoice = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/keyboard-voice');
-    export import HardwareLaptop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/laptop');
-    export import HardwareLaptopChromebook = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/laptop-chromebook');
-    export import HardwareLaptopMac = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/laptop-mac');
-    export import HardwareLaptopWindows = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/laptop-windows');
-    export import HardwareMemory = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/memory');
-    export import HardwareMouse = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/mouse');
-    export import HardwarePhoneAndroid = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/phone-android');
-    export import HardwarePhoneIphone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/phone-iphone');
-    export import HardwarePhonelink = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/phonelink');
-    export import HardwarePhonelinkOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/phonelink-off');
-    export import HardwarePowerInput = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/power-input');
-    export import HardwareRouter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/router');
-    export import HardwareScanner = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/scanner');
-    export import HardwareSecurity = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/security');
-    export import HardwareSimCard = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/sim-card');
-    export import HardwareSmartphone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/smartphone');
-    export import HardwareSpeaker = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/speaker');
-    export import HardwareSpeakerGroup = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/speaker-group');
-    export import HardwareTablet = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/tablet');
-    export import HardwareTabletAndroid = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/tablet-android');
-    export import HardwareTabletMac = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/tablet-mac');
-    export import HardwareToys = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/toys');
-    export import HardwareTv = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/tv');
-    export import HardwareVideogameAsset = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/videogame-asset');
-    export import HardwareWatch = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/hardware/watch');
-    export import ImageAddAPhoto = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/add-a-photo');
-    export import ImageAddToPhotos = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/add-to-photos');
-    export import ImageAdjust = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/adjust');
-    export import ImageAssistant = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/assistant');
-    export import ImageAssistantPhoto = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/assistant-photo');
-    export import ImageAudiotrack = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/audiotrack');
-    export import ImageBlurCircular = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/blur-circular');
-    export import ImageBlurLinear = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/blur-linear');
-    export import ImageBlurOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/blur-off');
-    export import ImageBlurOn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/blur-on');
-    export import ImageBrightness1 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brightness-1');
-    export import ImageBrightness2 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brightness-2');
-    export import ImageBrightness3 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brightness-3');
-    export import ImageBrightness4 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brightness-4');
-    export import ImageBrightness5 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brightness-5');
-    export import ImageBrightness6 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brightness-6');
-    export import ImageBrightness7 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brightness-7');
-    export import ImageBrokenImage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/broken-image');
-    export import ImageBrush = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/brush');
-    export import ImageCamera = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/camera');
-    export import ImageCameraAlt = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/camera-alt');
-    export import ImageCameraFront = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/camera-front');
-    export import ImageCameraRear = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/camera-rear');
-    export import ImageCameraRoll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/camera-roll');
-    export import ImageCenterFocusStrong = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/center-focus-strong');
-    export import ImageCenterFocusWeak = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/center-focus-weak');
-    export import ImageCollections = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/collections');
-    export import ImageCollectionsBookmark = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/collections-bookmark');
-    export import ImageColorize = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/colorize');
-    export import ImageColorLens = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/color-lens');
-    export import ImageCompare = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/compare');
-    export import ImageControlPoint = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/control-point');
-    export import ImageControlPointDuplicate = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/control-point-duplicate');
-    export import ImageCrop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop');
-    export import ImageCrop169 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-16-9');
-    export import ImageCrop32 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-3-2');
-    export import ImageCrop54 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-5-4');
-    export import ImageCrop75 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-7-5');
-    export import ImageCropDin = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-din');
-    export import ImageCropFree = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-free');
-    export import ImageCropLandscape = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-landscape');
-    export import ImageCropOriginal = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-original');
-    export import ImageCropPortrait = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-portrait');
-    export import ImageCropRotate = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-rotate');
-    export import ImageCropSquare = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/crop-square');
-    export import ImageDehaze = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/dehaze');
-    export import ImageDetails = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/details');
-    export import ImageEdit = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/edit');
-    export import ImageExposure = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/exposure');
-    export import ImageExposureNeg1 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/exposure-neg-1');
-    export import ImageExposureNeg2 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/exposure-neg-2');
-    export import ImageExposurePlus1 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/exposure-plus-1');
-    export import ImageExposurePlus2 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/exposure-plus-2');
-    export import ImageExposureZero = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/exposure-zero');
-    export import ImageFilter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter');
-    export import ImageFilter1 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-1');
-    export import ImageFilter2 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-2');
-    export import ImageFilter3 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-3');
-    export import ImageFilter4 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-4');
-    export import ImageFilter5 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-5');
-    export import ImageFilter6 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-6');
-    export import ImageFilter7 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-7');
-    export import ImageFilter8 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-8');
-    export import ImageFilter9 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-9');
-    export import ImageFilter9Plus = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-9-plus');
-    export import ImageFilterBAndW = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-b-and-w');
-    export import ImageFilterCenterFocus = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-center-focus');
-    export import ImageFilterDrama = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-drama');
-    export import ImageFilterFrames = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-frames');
-    export import ImageFilterHdr = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-hdr');
-    export import ImageFilterNone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-none');
-    export import ImageFilterTiltShift = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-tilt-shift');
-    export import ImageFilterVintage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/filter-vintage');
-    export import ImageFlare = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/flare');
-    export import ImageFlashAuto = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/flash-auto');
-    export import ImageFlashOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/flash-off');
-    export import ImageFlashOn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/flash-on');
-    export import ImageFlip = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/flip');
-    export import ImageGradient = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/gradient');
-    export import ImageGrain = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/grain');
-    export import ImageGridOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/grid-off');
-    export import ImageGridOn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/grid-on');
-    export import ImageHdrOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/hdr-off');
-    export import ImageHdrOn = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/hdr-on');
-    export import ImageHdrStrong = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/hdr-strong');
-    export import ImageHdrWeak = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/hdr-weak');
-    export import ImageHealing = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/healing');
-    export import ImageImage = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/image');
-    export import ImageImageAspectRatio = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/image-aspect-ratio');
-    export import ImageIso = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/iso');
-    export import ImageLandscape = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/landscape');
-    export import ImageLeakAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/leak-add');
-    export import ImageLeakRemove = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/leak-remove');
-    export import ImageLens = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/lens');
-    export import ImageLinkedCamera = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/linked-camera');
-    export import ImageLooks = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/looks');
-    export import ImageLooks3 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/looks-3');
-    export import ImageLooks4 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/looks-4');
-    export import ImageLooks5 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/looks-5');
-    export import ImageLooks6 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/looks-6');
-    export import ImageLooksOne = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/looks-one');
-    export import ImageLooksTwo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/looks-two');
-    export import ImageLoupe = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/loupe');
-    export import ImageMonochromePhotos = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/monochrome-photos');
-    export import ImageMovieCreation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/movie-creation');
-    export import ImageMovieFilter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/movie-filter');
-    export import ImageMusicNote = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/music-note');
-    export import ImageNature = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/nature');
-    export import ImageNaturePeople = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/nature-people');
-    export import ImageNavigateBefore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/navigate-before');
-    export import ImageNavigateNext = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/navigate-next');
-    export import ImagePalette = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/palette');
-    export import ImagePanorama = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/panorama');
-    export import ImagePanoramaFishEye = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/panorama-fish-eye');
-    export import ImagePanoramaHorizontal = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/panorama-horizontal');
-    export import ImagePanoramaVertical = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/panorama-vertical');
-    export import ImagePanoramaWideAngle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/panorama-wide-angle');
-    export import ImagePhoto = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo');
-    export import ImagePhotoAlbum = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo-album');
-    export import ImagePhotoCamera = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo-camera');
-    export import ImagePhotoFilter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo-filter');
-    export import ImagePhotoLibrary = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo-library');
-    export import ImagePhotoSizeSelectActual = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo-size-select-actual');
-    export import ImagePhotoSizeSelectLarge = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo-size-select-large');
-    export import ImagePhotoSizeSelectSmall = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/photo-size-select-small');
-    export import ImagePictureAsPdf = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/picture-as-pdf');
-    export import ImagePortrait = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/portrait');
-    export import ImageRemoveRedEye = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/remove-red-eye');
-    export import ImageRotate90DegreesCcw = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/rotate-90-degrees-ccw');
-    export import ImageRotateLeft = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/rotate-left');
-    export import ImageRotateRight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/rotate-right');
-    export import ImageSlideshow = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/slideshow');
-    export import ImageStraighten = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/straighten');
-    export import ImageStyle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/style');
-    export import ImageSwitchCamera = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/switch-camera');
-    export import ImageSwitchVideo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/switch-video');
-    export import ImageTagFaces = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/tag-faces');
-    export import ImageTexture = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/texture');
-    export import ImageTimelapse = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/timelapse');
-    export import ImageTimer = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/timer');
-    export import ImageTimer10 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/timer-10');
-    export import ImageTimer3 = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/timer-3');
-    export import ImageTimerOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/timer-off');
-    export import ImageTonality = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/tonality');
-    export import ImageTransform = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/transform');
-    export import ImageTune = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/tune');
-    export import ImageViewComfy = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/view-comfy');
-    export import ImageViewCompact = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/view-compact');
-    export import ImageVignette = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/vignette');
-    export import ImageWbAuto = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/wb-auto');
-    export import ImageWbCloudy = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/wb-cloudy');
-    export import ImageWbIncandescent = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/wb-incandescent');
-    export import ImageWbIridescent = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/wb-iridescent');
-    export import ImageWbSunny = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/image/wb-sunny');
-    export import Index = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/index');
-    export import IndexGenerator = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/index-generator');
-    export import MapsAddLocation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/add-location');
-    export import MapsBeenhere = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/beenhere');
-    export import MapsDirections = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions');
-    export import MapsDirectionsBike = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-bike');
-    export import MapsDirectionsBoat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-boat');
-    export import MapsDirectionsBus = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-bus');
-    export import MapsDirectionsCar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-car');
-    export import MapsDirectionsRailway = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-railway');
-    export import MapsDirectionsRun = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-run');
-    export import MapsDirectionsSubway = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-subway');
-    export import MapsDirectionsTransit = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-transit');
-    export import MapsDirectionsWalk = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/directions-walk');
-    export import MapsEditLocation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/edit-location');
-    export import MapsFlight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/flight');
-    export import MapsHotel = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/hotel');
-    export import MapsLayers = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/layers');
-    export import MapsLayersClear = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/layers-clear');
-    export import MapsLocalActivity = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-activity');
-    export import MapsLocalAirport = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-airport');
-    export import MapsLocalAtm = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-atm');
-    export import MapsLocalBar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-bar');
-    export import MapsLocalCafe = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-cafe');
-    export import MapsLocalCarWash = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-car-wash');
-    export import MapsLocalConvenienceStore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-convenience-store');
-    export import MapsLocalDining = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-dining');
-    export import MapsLocalDrink = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-drink');
-    export import MapsLocalFlorist = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-florist');
-    export import MapsLocalGasStation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-gas-station');
-    export import MapsLocalGroceryStore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-grocery-store');
-    export import MapsLocalHospital = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-hospital');
-    export import MapsLocalHotel = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-hotel');
-    export import MapsLocalLaundryService = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-laundry-service');
-    export import MapsLocalLibrary = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-library');
-    export import MapsLocalMall = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-mall');
-    export import MapsLocalMovies = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-movies');
-    export import MapsLocalOffer = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-offer');
-    export import MapsLocalParking = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-parking');
-    export import MapsLocalPharmacy = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-pharmacy');
-    export import MapsLocalPhone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-phone');
-    export import MapsLocalPizza = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-pizza');
-    export import MapsLocalPlay = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-play');
-    export import MapsLocalPostOffice = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-post-office');
-    export import MapsLocalPrintshop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-printshop');
-    export import MapsLocalSee = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-see');
-    export import MapsLocalShipping = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-shipping');
-    export import MapsLocalTaxi = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/local-taxi');
-    export import MapsMap = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/map');
-    export import MapsMyLocation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/my-location');
-    export import MapsNavigation = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/navigation');
-    export import MapsNearMe = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/near-me');
-    export import MapsPersonPin = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/person-pin');
-    export import MapsPersonPinCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/person-pin-circle');
-    export import MapsPinDrop = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/pin-drop');
-    export import MapsPlace = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/place');
-    export import MapsRateReview = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/rate-review');
-    export import MapsRestaurantMenu = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/restaurant-menu');
-    export import MapsSatellite = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/satellite');
-    export import MapsStoreMallDirectory = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/store-mall-directory');
-    export import MapsTerrain = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/terrain');
-    export import MapsTraffic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/traffic');
-    export import MapsZoomOutMap = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/maps/zoom-out-map');
-    export import NavigationApps = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/apps');
-    export import NavigationArrowBack = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/arrow-back');
-    export import NavigationArrowDownward = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/arrow-downward');
-    export import NavigationArrowDropDown = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/arrow-drop-down');
-    export import NavigationArrowDropDownCircle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/arrow-drop-down-circle');
-    export import NavigationArrowDropRight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation-arrow-drop-right');
-    export import NavigationArrowDropUp = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/arrow-drop-up');
-    export import NavigationArrowForward = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/arrow-forward');
-    export import NavigationArrowUpward = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/arrow-upward');
-    export import NavigationCancel = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/cancel');
-    export import NavigationCheck = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/check');
-    export import NavigationChevronLeft = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/chevron-left');
-    export import NavigationChevronRight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/chevron-right');
-    export import NavigationClose = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/close');
-    export import NavigationExpandLess = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/expand-less');
-    export import NavigationExpandMore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/expand-more');
-    export import NavigationFullscreen = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/fullscreen');
-    export import NavigationFullscreenExit = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/fullscreen-exit');
-    export import NavigationMenu = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/menu');
-    export import NavigationMoreHoriz = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/more-horiz');
-    export import NavigationMoreVert = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/more-vert');
-    export import NavigationRefresh = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/refresh');
-    export import NavigationSubdirectoryArrowLeft = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/subdirectory-arrow-left');
-    export import NavigationSubdirectoryArrowRight = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/subdirectory-arrow-right');
-    export import NavigationUnfoldLess = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/unfold-less');
-    export import NavigationUnfoldMore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/navigation/unfold-more');
-    export import NotificationAdb = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/adb');
-    export import NotificationAirlineSeatFlat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-flat');
-    export import NotificationAirlineSeatFlatAngled = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-flat-angled');
-    export import NotificationAirlineSeatIndividualSuite = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-individual-suite');
-    export import NotificationAirlineSeatLegroomExtra = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-legroom-extra');
-    export import NotificationAirlineSeatLegroomNormal = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-legroom-normal');
-    export import NotificationAirlineSeatLegroomReduced = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-legroom-reduced');
-    export import NotificationAirlineSeatReclineExtra = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-recline-extra');
-    export import NotificationAirlineSeatReclineNormal = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/airline-seat-recline-normal');
-    export import NotificationBluetoothAudio = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/bluetooth-audio');
-    export import NotificationConfirmationNumber = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/confirmation-number');
-    export import NotificationDiscFull = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/disc-full');
-    export import NotificationDoNotDisturb = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/do-not-disturb');
-    export import NotificationDoNotDisturbAlt = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/do-not-disturb-alt');
-    export import NotificationDriveEta = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/drive-eta');
-    export import NotificationEnhancedEncryption = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/enhanced-encryption');
-    export import NotificationEventAvailable = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/event-available');
-    export import NotificationEventBusy = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/event-busy');
-    export import NotificationEventNote = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/event-note');
-    export import NotificationFolderSpecial = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/folder-special');
-    export import NotificationLiveTv = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/live-tv');
-    export import NotificationMms = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/mms');
-    export import NotificationMore = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/more');
-    export import NotificationNetworkCheck = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/network-check');
-    export import NotificationNetworkLocked = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/network-locked');
-    export import NotificationNoEncryption = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/no-encryption');
-    export import NotificationOndemandVideo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/ondemand-video');
-    export import NotificationPersonalVideo = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/personal-video');
-    export import NotificationPhoneBluetoothSpeaker = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/phone-bluetooth-speaker');
-    export import NotificationPhoneForwarded = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/phone-forwarded');
-    export import NotificationPhoneInTalk = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/phone-in-talk');
-    export import NotificationPhoneLocked = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/phone-locked');
-    export import NotificationPhoneMissed = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/phone-missed');
-    export import NotificationPhonePaused = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/phone-paused');
-    export import NotificationPower = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/power');
-    export import NotificationRvHookup = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/rv-hookup');
-    export import NotificationSdCard = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/sd-card');
-    export import NotificationSimCardAlert = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/sim-card-alert');
-    export import NotificationSms = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/sms');
-    export import NotificationSmsFailed = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/sms-failed');
-    export import NotificationSync = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/sync');
-    export import NotificationSyncDisabled = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/sync-disabled');
-    export import NotificationSyncProblem = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/sync-problem');
-    export import NotificationSystemUpdate = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/system-update');
-    export import NotificationTapAndPlay = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/tap-and-play');
-    export import NotificationTimeToLeave = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/time-to-leave');
-    export import NotificationVibration = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/vibration');
-    export import NotificationVoiceChat = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/voice-chat');
-    export import NotificationVpnLock = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/vpn-lock');
-    export import NotificationWc = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/wc');
-    export import NotificationWifi = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/notification/wifi');
-    export import PlacesAcUnit = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/ac-unit');
-    export import PlacesAirportShuttle = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/airport-shuttle');
-    export import PlacesAllInclusive = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/all-inclusive');
-    export import PlacesBeachAccess = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/beach-access');
-    export import PlacesBusinessCenter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/business-center');
-    export import PlacesCasino = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/casino');
-    export import PlacesChildCare = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/child-care');
-    export import PlacesChildFriendly = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/child-friendly');
-    export import PlacesFitnessCenter = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/fitness-center');
-    export import PlacesFreeBreakfast = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/free-breakfast');
-    export import PlacesGolfCourse = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/golf-course');
-    export import PlacesHotTub = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/hot-tub');
-    export import PlacesKitchen = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/kitchen');
-    export import PlacesPool = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/pool');
-    export import PlacesRoomService = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/room-service');
-    export import PlacesSmokeFree = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/smoke-free');
-    export import PlacesSmokingRooms = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/smoking-rooms');
-    export import PlacesSpa = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/places/spa');
-    export import SocialCake = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/cake');
-    export import SocialDomain = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/domain');
-    export import SocialGroup = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/group');
-    export import SocialGroupAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/group-add');
-    export import SocialLocationCity = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/location-city');
-    export import SocialMood = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/mood');
-    export import SocialMoodBad = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/mood-bad');
-    export import SocialNotifications = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/notifications');
-    export import SocialNotificationsActive = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/notifications-active');
-    export import SocialNotificationsNone = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/notifications-none');
-    export import SocialNotificationsOff = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/notifications-off');
-    export import SocialNotificationsPaused = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/notifications-paused');
-    export import SocialPages = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/pages');
-    export import SocialPartyMode = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/party-mode');
-    export import SocialPeople = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/people');
-    export import SocialPeopleOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/people-outline');
-    export import SocialPerson = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/person');
-    export import SocialPersonAdd = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/person-add');
-    export import SocialPersonOutline = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/person-outline');
-    export import SocialPlusOne = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/plus-one');
-    export import SocialPoll = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/poll');
-    export import SocialPublic = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/public');
-    export import SocialSchool = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/school');
-    export import SocialShare = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/share');
-    export import SocialWhatshot = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/social/whatshot');
-    export import ToggleCheckBox = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/check-box');
-    export import ToggleCheckBoxOutlineBlank = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/check-box-outline-blank');
-    export import ToggleIndeterminateCheckBox = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/indeterminate-check-box');
-    export import ToggleRadioButtonChecked = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/radio-button-checked');
-    export import ToggleRadioButtonUnchecked = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/radio-button-unchecked');
-    export import ToggleStar = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/star');
-    export import ToggleStarBorder = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/star-border');
-    export import ToggleStarHalf = __MaterialUI.SvgIcon; // require('material-ui/svg-icons/toggle/star-half');
-}
-
-
-declare module 'material-ui/internal/AppCanvas' {
-    interface AppCanvasProps {
-    }
-    class AppCanvas extends __React.Component<AppCanvasProps, {}> {
-    }
-    export default AppCanvas;
-}
-declare module 'material-ui/internal/AutoLockScrolling' {
-    interface AutoLockScrollingProps {
-        lock: boolean;
-    }
-    class AutoLockScrolling extends __React.Component<AutoLockScrollingProps, {}> {
-    }
-    export default AutoLockScrolling;
-}
-declare module 'material-ui/internal/BeforeAfterWrapper' {
-    interface BeforeAfterWrapperProps {
-        afterElementType?: string,
-        afterStyle?: __React.CSSProperties,
-        beforeElementType?: string,
-        beforeStyle?: __React.CSSProperties,
-        elementType?: string,
-        style?: __React.CSSProperties,
-    }
-    class BeforeAfterWrapper extends __React.Component<BeforeAfterWrapperProps, {}> {
-    }
-    export default BeforeAfterWrapper;
-}
-declare module 'material-ui/internal/CircleRipple' {
-    interface CircleRippleProps {
-        aborted?: boolean;
-        color?: string;
-        opacity?: number;
-        style?: __React.CSSProperties;
-    }
-    class CircleRipple extends __React.Component<CircleRippleProps, {}> {
-    }
-    export default CircleRipple;
-}
-declare module 'material-ui/internal/ClearFix' {
-    interface ClearFixProps {
-        style?: __React.CSSProperties;
-    }
-    class ClearFix extends __React.Component<ClearFixProps, {}> {
-    }
-    export default ClearFix;
-}
-declare module 'material-ui/internal/ClickAwayListener' {
-    interface ClickAwayListenerProps {
-        onClickAway?: any,
-    }
-    class ClickAwayListener extends __React.Component<ClickAwayListenerProps, {}> {
-    }
-    export default ClickAwayListener;
-}
-declare module 'material-ui/internal/EnhancedButton' {
-    interface EnhancedButtonProps extends __MaterialUI.SharedEnhancedButtonProps<EnhancedButton> {
-    }
-    class EnhancedButton extends __React.Component<EnhancedButtonProps, {}> {
-    }
-    export default EnhancedButton;
-}
-declare module 'material-ui/internal/EnhancedSwitch' {
-    interface EnhancedSwitchProps extends __MaterialUI.Switches.CommonEnhancedSwitchProps<EnhancedSwitch> {
-    }
-    class EnhancedSwitch extends __React.Component<EnhancedSwitchProps, {}> {
-    }
-    export default EnhancedSwitch;
-}
-declare module 'material-ui/internal/ExpandTransition' {
-    interface ExpandTransitionProps {
-        enterDelay?: number;
-        loading?: boolean;
-        open?: boolean;
-        style?: __React.CSSProperties;
-        transitionDelay?: number;
-        transitionDuration?: number;
-    }
-    class ExpandTransition extends __React.Component<ExpandTransitionProps, {}> {
-    }
-    export default ExpandTransition;
-}
-declare module 'material-ui/internal/ExpandTransitionChild' {
-    interface ExpandTransitionChildProps {
-        enterDelay?: number;
-        style?: __React.CSSProperties;
-        transitionDelay?: number;
-        transitionDuration?: number;
-    }
-    class ExpandTransitionChild extends __React.Component<ExpandTransitionChildProps, {}> {
-    }
-    export default ExpandTransitionChild;
-}
-declare module 'material-ui/internal/FocusRipple' {
-    interface FocusRippleProps {
-        color?: string,
-        innerStyle?: __React.CSSProperties,
-        opacity?: number,
-        show?: boolean,
-        style?: __React.CSSProperties
-    }
-    class FocusRipple extends __React.Component<FocusRippleProps, {}> {
-    }
-    export default FocusRipple;
-}
-declare module 'material-ui/internal/Overlay' {
-    interface OverlayProps {
-        autoLockScrolling?: boolean;
-        show: boolean;
-        style?: __React.CSSProperties;
-        transitionEnabled?: boolean;
-    }
-    class Overlay extends __React.Component<OverlayProps, {}> {
-    }
-    export default Overlay;
-}
-declare module 'material-ui/internal/RenderToLayer' {
-    interface RenderToLayerProps {
-        componentClickAway?: Function;
-        open: boolean;
-        render: Function;
-        useLayerForClickAway?: boolean;
-    }
-    class RenderToLayer extends __React.Component<RenderToLayerProps, {}> {
-    }
-    export default RenderToLayer;
-}
-declare module 'material-ui/internal/ScaleIn' {
-    interface ScaleInProps {
-        childStyle?: __React.CSSProperties;
-        enterDelay?: number;
-        maxScale?: number;
-        minScale?: number;
-    }
-    class ScaleIn extends __React.Component<ScaleInProps, {}> {
-    }
-    export default ScaleIn;
-}
-declare module 'material-ui/internal/ScaleInChild' {
-    interface ScaleInChildProps {
-        enterDelay?: number;
-        maxScale?: number;
-        minScale?: number;
-        style?: __React.CSSProperties;
-    }
-    class ScaleInChild extends __React.Component<ScaleInChildProps, {}> {
-    }
-    export default ScaleInChild;
-}
-declare module 'material-ui/internal/SlideIn' {
-    interface SlideInProps {
-        childStyle?: __React.CSSProperties;
-        direction?: __MaterialUI.propTypes.direction;
-        enterDelay?: number;
-        style?: __React.CSSProperties;
-    }
-    class SlideIn extends __React.Component<SlideInProps, {}> {
-    }
-    export default SlideIn;
-}
-declare module 'material-ui/internal/SlideInChild' {
-    interface SlideInChildProps {
-        direction?: string,
-        enterDelay?: number;
-        getLeaveDirection: Function;
-        style?: __React.CSSProperties;
-    }
-    class SlideInChild extends __React.Component<SlideInChildProps, {}> {
-    }
-    export default SlideInChild;
-}
-declare module 'material-ui/internal/Tooltip' {
-    interface TooltipProps {
-        className?: string;
-        horizontalPosition?: __MaterialUI.propTypes.horizontal;
-        label: any;
-        show?: boolean;
-        style?: __React.CSSProperties;
-        touch?: boolean;
-        verticalPosition?: __MaterialUI.propTypes.vertical;
-    }
-    class Tooltip extends __React.Component<TooltipProps, {}> {
-    }
-    export default Tooltip;
-}
-declare module 'material-ui/internal/TouchRipple' {
-    interface TouchRippleProps {
-        abortOnScroll?: boolean,
-        centerRipple?: boolean;
-        color?: string;
-        opacity?: number;
-        style?: __React.CSSProperties
-    }
-    class TouchRipple extends __React.Component<TouchRippleProps, {}> {
-    }
-    export default TouchRipple;
-}

From 19f558b6c6aa49f1f627f6cc8f78f4ee22348746 Mon Sep 17 00:00:00 2001
From: Niklas Mollenhauer <nikeee@outlook.com>
Date: Sat, 19 Nov 2016 21:20:00 +0100
Subject: [PATCH 214/245] Fix command overloads

---
 yargs/index.d.ts     |  5 ++---
 yargs/yargs-tests.ts | 11 +++++------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/yargs/index.d.ts b/yargs/index.d.ts
index 69accf9d70..a1de96fbd5 100644
--- a/yargs/index.d.ts
+++ b/yargs/index.d.ts
@@ -65,11 +65,10 @@ declare namespace yargs {
         usage(options?: { [key: string]: Options }): Argv;
 
         command(command: string, description: string): Argv;
-        command(command: string, description: string, handler: (args: Argv) => void): Argv;
         command(command: string, description: string, builder: (args: Argv) => Argv): Argv;
         command(command: string, description: string, builder: { [optionName: string]: Options }): Argv;
-        command(command: string, description: string, builder: { [optionName: string]: Options }, handler: (args: Argv) => void): Argv;
-        command(command: string, description: string, builder: (args: Argv) => Argv, handler: (args: Argv) => void): Argv;
+        command(command: string, description: string, builder: { [optionName: string]: Options }, handler: (args: any) => void): Argv;
+        command(command: string, description: string, builder: (args: Argv) => Argv, handler: (args: any) => void): Argv;
         command(command: string, description: string, module: CommandModule): Argv;
         command(module: CommandModule): Argv;
 
diff --git a/yargs/yargs-tests.ts b/yargs/yargs-tests.ts
index c88f9954d8..bcdd0e5368 100644
--- a/yargs/yargs-tests.ts
+++ b/yargs/yargs-tests.ts
@@ -188,14 +188,13 @@ function command() {
 	var argv = yargs
 		.usage('npm <command>')
 		.command('install', 'tis a mighty fine package to install')
-		.command('publish', 'shiver me timbers, should you be sharing all that', yargs => {
-			argv = yargs.option('f', {
+		.command('publish', 'shiver me timbers, should you be sharing all that', yargs =>
+			yargs.option('f', {
 				alias: 'force',
 				description: 'yar, it usually be a bad idea'
 			})
 			.help('help')
-			.argv;
-		})
+		)
 		.command("build", "arghh, build it mate", {
 			tag: {
 				default: true,
@@ -247,8 +246,8 @@ function command() {
 					describe: 'the URL to make an HTTP request to'
 				})
 			},
-			function (argv) {
-				console.dir(argv)
+			function (argv: { url: string }) {
+				console.dir(argv.url)
 			}
 		)
 		.help()

From 8841dfc744bce6b2d3e075f7ace25c0c1e664c17 Mon Sep 17 00:00:00 2001
From: Andy <anhans@microsoft.com>
Date: Mon, 21 Nov 2016 12:58:06 -0800
Subject: [PATCH 215/245] Use index.d.ts only (not foo/foo.d.ts) (#12834)

* Use index.d.ts only (not foo/foo.d.ts)

* Convert more packages

* Remove unnecessary references
---
 3d-bin-packing/{3d-bin-packing.d.ts => index.d.ts}          | 0
 3d-bin-packing/tsconfig.json                                | 2 +-
 angular-q-spread/{angular-q-spread.d.ts => index.d.ts}      | 0
 angular-q-spread/tsconfig.json                              | 2 +-
 angular-websocket/angular-websocket-tests.ts                | 2 --
 angular-websocket/{angular-websocket.d.ts => index.d.ts}    | 0
 angular-websocket/tsconfig.json                             | 2 +-
 angular-xeditable/angular-xeditable-tests.ts                | 6 ++----
 angular-xeditable/{angular-xeditable.d.ts => index.d.ts}    | 0
 angular-xeditable/tsconfig.json                             | 2 +-
 .../{bootstrap-fileinput.d.ts => index.d.ts}                | 0
 bootstrap-fileinput/tsconfig.json                           | 2 +-
 chai-dom/chai-dom-tests.ts                                  | 2 --
 chai-dom/{chai-dom.d.ts => index.d.ts}                      | 0
 chai-dom/tsconfig.json                                      | 2 +-
 chai-enzyme/chai-enzyme-tests.tsx                           | 1 -
 chai-enzyme/{chai-enzyme.d.ts => index.d.ts}                | 0
 chai-enzyme/tsconfig.json                                   | 2 +-
 commangular/{commangular.d.ts => index.d.ts}                | 0
 commangular/tsconfig.json                                   | 2 +-
 connect-redis/connect-redis-tests.ts                        | 1 -
 connect-redis/{connect-redis.d.ts => index.d.ts}            | 0
 connect-redis/tsconfig.json                                 | 2 +-
 csv-parse/csv-parse-tests.ts                                | 4 +---
 csv-parse/{csv-parse.d.ts => index.d.ts}                    | 0
 csv-parse/tsconfig.json                                     | 2 +-
 d3kit/d3kit-tests.ts                                        | 1 -
 d3kit/{d3kit.d.ts => index.d.ts}                            | 0
 d3kit/tsconfig.json                                         | 2 +-
 daterangepicker/daterangepicker-tests.ts                    | 1 -
 daterangepicker/{daterangepicker.d.ts => index.d.ts}        | 5 ++---
 daterangepicker/tsconfig.json                               | 2 +-
 df-visible/df-visible-tests.ts                              | 2 --
 df-visible/{df-visible.d.ts => index.d.ts}                  | 0
 df-visible/tsconfig.json                                    | 2 +-
 dva/{dva.d.ts => index.d.ts}                                | 0
 dva/tsconfig.json                                           | 2 +-
 epub/epub-tests.ts                                          | 1 -
 epub/{epub.d.ts => index.d.ts}                              | 0
 epub/tsconfig.json                                          | 2 +-
 exorcist/exorcist-tests.ts                                  | 2 --
 exorcist/{exorcist.d.ts => index.d.ts}                      | 0
 exorcist/tsconfig.json                                      | 2 +-
 .../express-domain-middleware-tests.ts                      | 1 -
 .../{express-domain-middleware.d.ts => index.d.ts}          | 0
 express-domain-middleware/tsconfig.json                     | 2 +-
 fill-pdf/fill-pdf-tests.ts                                  | 2 --
 fill-pdf/{fill-pdf.d.ts => index.d.ts}                      | 0
 fill-pdf/tsconfig.json                                      | 2 +-
 fluent-ffmpeg/fluent-ffmpeg-tests.ts                        | 2 --
 fluent-ffmpeg/{fluent-ffmpeg.d.ts => index.d.ts}            | 0
 fluent-ffmpeg/tsconfig.json                                 | 2 +-
 fullpage.js/fullpage.js-tests.ts                            | 2 --
 fullpage.js/{fullpage.js.d.ts => index.d.ts}                | 0
 fullpage.js/tsconfig.json                                   | 2 +-
 .../{gulp-angular-templatecache.d.ts => index.d.ts}         | 0
 gulp-angular-templatecache/tsconfig.json                    | 2 +-
 gulp-help-doc/{gulp-help-doc.d.ts => index.d.ts}            | 0
 gulp-help-doc/tsconfig.json                                 | 2 +-
 gulp-insert/{gulp-insert.d.ts => index.d.ts}                | 0
 gulp-insert/tsconfig.json                                   | 2 +-
 html-pdf/{html-pdf.d.ts => index.d.ts}                      | 0
 html-pdf/tsconfig.json                                      | 2 +-
 html-webpack-plugin/html-webpack-plugin-tests.ts            | 2 --
 .../{html-webpack-plugin.d.ts => index.d.ts}                | 0
 html-webpack-plugin/tsconfig.json                           | 2 +-
 imagemapster/{imagemapster.d.ts => index.d.ts}              | 0
 imagemapster/tsconfig.json                                  | 2 +-
 intl-tel-input/{intl-tel-input.d.ts => index.d.ts}          | 0
 intl-tel-input/tsconfig.json                                | 2 +-
 .../{inversify-express-utils.d.ts => index.d.ts}            | 0
 inversify-express-utils/tsconfig.json                       | 2 +-
 .../{istanbul-middleware.d.ts => index.d.ts}                | 0
 istanbul-middleware/tsconfig.json                           | 2 +-
 jquery-mousewheel/{jquery-mousewheel.d.ts => index.d.ts}    | 0
 jquery-mousewheel/tsconfig.json                             | 2 +-
 .../{jquery-truncate-html.d.ts => index.d.ts}               | 0
 jquery-truncate-html/tsconfig.json                          | 2 +-
 jsoneditor/{jsoneditor.d.ts => index.d.ts}                  | 0
 jsoneditor/jsoneditor-tests.ts                              | 2 --
 jsoneditor/tsconfig.json                                    | 2 +-
 jsuite/{jsuite.d.ts => index.d.ts}                          | 0
 jsuite/tsconfig.json                                        | 2 +-
 karma-chai-sinon/{karma-chai-sinon.d.ts => index.d.ts}      | 0
 karma-chai-sinon/tsconfig.json                              | 2 +-
 koa-compress/{koa-compress.d.ts => index.d.ts}              | 0
 koa-compress/tsconfig.json                                  | 2 +-
 koa-hbs/{koa-hbs.d.ts => index.d.ts}                        | 0
 koa-hbs/tsconfig.json                                       | 2 +-
 .../{leaflet-geocoder-mapzen.d.ts => index.d.ts}            | 0
 leaflet-geocoder-mapzen/tsconfig.json                       | 2 +-
 .../{marker-animate-unobtrusive.d.ts => index.d.ts}         | 0
 marker-animate-unobtrusive/tsconfig.json                    | 2 +-
 masonry-layout/{masonry-layout.d.ts => index.d.ts}          | 0
 masonry-layout/tsconfig.json                                | 2 +-
 mitm/{mitm.d.ts => index.d.ts}                              | 0
 mitm/tsconfig.json                                          | 2 +-
 mongoose-paginate/{mongoose-paginate.d.ts => index.d.ts}    | 0
 mongoose-paginate/tsconfig.json                             | 2 +-
 multer-s3/{multer-s3.d.ts => index.d.ts}                    | 0
 multer-s3/tsconfig.json                                     | 2 +-
 musicmetadata/{musicmetadata.d.ts => index.d.ts}            | 0
 musicmetadata/tsconfig.json                                 | 2 +-
 nes/{nes.d.ts => index.d.ts}                                | 0
 nes/tsconfig.json                                           | 2 +-
 ngmap/{ngmap.d.ts => index.d.ts}                            | 0
 ngmap/tsconfig.json                                         | 2 +-
 ngreact/{ngreact.d.ts => index.d.ts}                        | 0
 ngreact/tsconfig.json                                       | 2 +-
 .../{nodemailer-ses-transport.d.ts => index.d.ts}           | 0
 nodemailer-ses-transport/tsconfig.json                      | 2 +-
 notify.js/{notify.js.d.ts => index.d.ts}                    | 0
 notify.js/tsconfig.json                                     | 2 +-
 nw.js/{nw.js.d.ts => index.d.ts}                            | 0
 nw.js/tsconfig.json                                         | 2 +-
 o.js/{o.js.d.ts => index.d.ts}                              | 0
 o.js/tsconfig.json                                          | 2 +-
 .../{passport-local-mongoose.d.ts => index.d.ts}            | 0
 passport-local-mongoose/tsconfig.json                       | 2 +-
 pino/{pino.d.ts => index.d.ts}                              | 0
 pino/tsconfig.json                                          | 2 +-
 pouchdb-upsert/{pouchdb-upsert.d.ts => index.d.ts}          | 0
 pouchdb-upsert/pouchdb-upsert-tests.ts                      | 2 --
 pouchdb-upsert/tsconfig.json                                | 2 +-
 rc-tooltip/{rc-tooltip.d.ts => index.d.ts}                  | 0
 rc-tooltip/tsconfig.json                                    | 2 +-
 react-autosuggest/{react-autosuggest.d.ts => index.d.ts}    | 0
 react-autosuggest/tsconfig.json                             | 2 +-
 react-big-calendar/{react-big-calendar.d.ts => index.d.ts}  | 0
 react-big-calendar/tsconfig.json                            | 2 +-
 react-breadcrumbs/{react-breadcrumbs.d.ts => index.d.ts}    | 0
 react-breadcrumbs/tsconfig.json                             | 2 +-
 .../{react-calendar-timeline.d.ts => index.d.ts}            | 0
 react-calendar-timeline/tsconfig.json                       | 2 +-
 react-codemirror/{react-codemirror.d.ts => index.d.ts}      | 0
 react-codemirror/tsconfig.json                              | 2 +-
 react-datepicker/{react-datepicker.d.ts => index.d.ts}      | 0
 react-datepicker/tsconfig.json                              | 2 +-
 .../{react-dnd-html5-backend.d.ts => index.d.ts}            | 0
 react-dnd-html5-backend/react-dnd-html5-backend-tests.ts    | 1 -
 react-dnd-html5-backend/tsconfig.json                       | 2 +-
 react-file-input/{react-file-input.d.ts => index.d.ts}      | 0
 react-file-input/tsconfig.json                              | 2 +-
 .../{react-file-reader-input.d.ts => index.d.ts}            | 0
 react-file-reader-input/tsconfig.json                       | 2 +-
 react-flexr/{react-flexr.d.ts => index.d.ts}                | 0
 react-flexr/tsconfig.json                                   | 2 +-
 react-fontawesome/{react-fontawesome.d.ts => index.d.ts}    | 0
 react-fontawesome/tsconfig.json                             | 2 +-
 react-imageloader/{react-imageloader.d.ts => index.d.ts}    | 0
 react-imageloader/tsconfig.json                             | 2 +-
 .../{react-is-deprecated.d.ts => index.d.ts}                | 0
 react-is-deprecated/tsconfig.json                           | 2 +-
 .../{react-jsonschema-form.d.ts => index.d.ts}              | 0
 react-jsonschema-form/tsconfig.json                         | 2 +-
 react-measure/{react-measure.d.ts => index.d.ts}            | 0
 react-measure/tsconfig.json                                 | 2 +-
 react-modal/{react-modal.d.ts => index.d.ts}                | 0
 react-modal/tsconfig.json                                   | 2 +-
 .../{react-motion-slider.d.ts => index.d.ts}                | 0
 react-motion-slider/tsconfig.json                           | 2 +-
 react-relay/{react-relay.d.ts => index.d.ts}                | 0
 react-relay/tsconfig.json                                   | 2 +-
 react-responsive/{react-responsive.d.ts => index.d.ts}      | 0
 react-responsive/tsconfig.json                              | 2 +-
 react-scrollbar/{react-scrollbar.d.ts => index.d.ts}        | 0
 react-scrollbar/tsconfig.json                               | 2 +-
 react-slick/{react-slick.d.ts => index.d.ts}                | 0
 react-slick/tsconfig.json                                   | 2 +-
 react-sortable-hoc/{react-sortable-hoc.d.ts => index.d.ts}  | 0
 react-sortable-hoc/tsconfig.json                            | 2 +-
 react-split-pane/{react-split-pane.d.ts => index.d.ts}      | 0
 react-split-pane/tsconfig.json                              | 2 +-
 react-swipeable/{react-swipeable.d.ts => index.d.ts}        | 0
 react-swipeable/tsconfig.json                               | 2 +-
 .../{react-textarea-autosize.d.ts => index.d.ts}            | 0
 react-textarea-autosize/tsconfig.json                       | 2 +-
 react-user-tour/{react-user-tour.d.ts => index.d.ts}        | 0
 react-user-tour/tsconfig.json                               | 2 +-
 redux-bootstrap/{redux-bootstrap.d.ts => index.d.ts}        | 0
 redux-bootstrap/tsconfig.json                               | 2 +-
 redux-mock-store/{redux-mock-store.d.ts => index.d.ts}      | 0
 redux-mock-store/tsconfig.json                              | 2 +-
 .../{redux-optimistic-ui.d.ts => index.d.ts}                | 0
 redux-optimistic-ui/tsconfig.json                           | 2 +-
 .../{redux-promise-middleware.d.ts => index.d.ts}           | 0
 redux-promise-middleware/tsconfig.json                      | 2 +-
 redux-storage/{redux-storage.d.ts => index.d.ts}            | 0
 redux-storage/tsconfig.json                                 | 2 +-
 redux-ui/{redux-ui.d.ts => index.d.ts}                      | 0
 redux-ui/tsconfig.json                                      | 2 +-
 restler/{restler.d.ts => index.d.ts}                        | 0
 restler/restler-tests.ts                                    | 2 --
 restler/tsconfig.json                                       | 2 +-
 rx-node/{rx-node.d.ts => index.d.ts}                        | 0
 rx-node/tsconfig.json                                       | 2 +-
 samchon-collection/{samchon-collection.d.ts => index.d.ts}  | 0
 samchon-collection/tsconfig.json                            | 2 +-
 samchon-library/{samchon-library.d.ts => index.d.ts}        | 0
 samchon-library/tsconfig.json                               | 2 +-
 samlp/{samlp.d.ts => index.d.ts}                            | 0
 samlp/tsconfig.json                                         | 2 +-
 set-cookie-parser/{set-cookie-parser.d.ts => index.d.ts}    | 0
 set-cookie-parser/tsconfig.json                             | 2 +-
 sinon-as-promised/{sinon-as-promised.d.ts => index.d.ts}    | 0
 sinon-as-promised/tsconfig.json                             | 2 +-
 socket.io-parser/{socket.io-parser.d.ts => index.d.ts}      | 0
 socket.io-parser/tsconfig.json                              | 2 +-
 spectacle/{spectacle.d.ts => index.d.ts}                    | 0
 spectacle/tsconfig.json                                     | 2 +-
 split2/{split2.d.ts => index.d.ts}                          | 0
 split2/tsconfig.json                                        | 2 +-
 sqs-consumer/{sqs-consumer.d.ts => index.d.ts}              | 0
 sqs-consumer/tsconfig.json                                  | 2 +-
 sqs-producer/{sqs-producer.d.ts => index.d.ts}              | 0
 sqs-producer/tsconfig.json                                  | 2 +-
 ssh2-sftp-client/{ssh2-sftp-client.d.ts => index.d.ts}      | 0
 ssh2-sftp-client/tsconfig.json                              | 2 +-
 .../{swagger-express-middleware.d.ts => index.d.ts}         | 0
 swagger-express-middleware/tsconfig.json                    | 2 +-
 tinder/{tinder.d.ts => index.d.ts}                          | 0
 tinder/tsconfig.json                                        | 2 +-
 torrent-stream/{torrent-stream.d.ts => index.d.ts}          | 0
 torrent-stream/tsconfig.json                                | 2 +-
 twit/{twit.d.ts => index.d.ts}                              | 0
 twit/tsconfig.json                                          | 2 +-
 v8-profiler/{v8-profiler.d.ts => index.d.ts}                | 0
 v8-profiler/tsconfig.json                                   | 2 +-
 v8-profiler/v8-profiler-tests.ts                            | 2 --
 victory/{victory.d.ts => index.d.ts}                        | 0
 victory/tsconfig.json                                       | 2 +-
 webpack-dev-server/{webpack-dev-server.d.ts => index.d.ts}  | 0
 webpack-dev-server/tsconfig.json                            | 2 +-
 webpack-dev-server/webpack-dev-server-tests.ts              | 4 +---
 .../{webpack-fail-plugin.d.ts => index.d.ts}                | 0
 webpack-fail-plugin/tsconfig.json                           | 2 +-
 webpack-merge/{webpack-merge.d.ts => index.d.ts}            | 0
 webpack-merge/tsconfig.json                                 | 2 +-
 webpack-stream/{webpack-stream.d.ts => index.d.ts}          | 0
 webpack-stream/tsconfig.json                                | 2 +-
 webpack-validator/{webpack-validator.d.ts => index.d.ts}    | 0
 webpack-validator/tsconfig.json                             | 2 +-
 why-did-you-update/{why-did-you-update.d.ts => index.d.ts}  | 0
 why-did-you-update/tsconfig.json                            | 2 +-
 winston-dynamodb/{winston-dynamodb.d.ts => index.d.ts}      | 0
 winston-dynamodb/tsconfig.json                              | 2 +-
 xmlpoke/{xmlpoke.d.ts => index.d.ts}                        | 0
 xmlpoke/tsconfig.json                                       | 2 +-
 248 files changed, 119 insertions(+), 157 deletions(-)
 rename 3d-bin-packing/{3d-bin-packing.d.ts => index.d.ts} (100%)
 rename angular-q-spread/{angular-q-spread.d.ts => index.d.ts} (100%)
 rename angular-websocket/{angular-websocket.d.ts => index.d.ts} (100%)
 rename angular-xeditable/{angular-xeditable.d.ts => index.d.ts} (100%)
 rename bootstrap-fileinput/{bootstrap-fileinput.d.ts => index.d.ts} (100%)
 rename chai-dom/{chai-dom.d.ts => index.d.ts} (100%)
 rename chai-enzyme/{chai-enzyme.d.ts => index.d.ts} (100%)
 rename commangular/{commangular.d.ts => index.d.ts} (100%)
 rename connect-redis/{connect-redis.d.ts => index.d.ts} (100%)
 rename csv-parse/{csv-parse.d.ts => index.d.ts} (100%)
 rename d3kit/{d3kit.d.ts => index.d.ts} (100%)
 rename daterangepicker/{daterangepicker.d.ts => index.d.ts} (98%)
 rename df-visible/{df-visible.d.ts => index.d.ts} (100%)
 rename dva/{dva.d.ts => index.d.ts} (100%)
 rename epub/{epub.d.ts => index.d.ts} (100%)
 rename exorcist/{exorcist.d.ts => index.d.ts} (100%)
 rename express-domain-middleware/{express-domain-middleware.d.ts => index.d.ts} (100%)
 rename fill-pdf/{fill-pdf.d.ts => index.d.ts} (100%)
 rename fluent-ffmpeg/{fluent-ffmpeg.d.ts => index.d.ts} (100%)
 rename fullpage.js/{fullpage.js.d.ts => index.d.ts} (100%)
 rename gulp-angular-templatecache/{gulp-angular-templatecache.d.ts => index.d.ts} (100%)
 rename gulp-help-doc/{gulp-help-doc.d.ts => index.d.ts} (100%)
 rename gulp-insert/{gulp-insert.d.ts => index.d.ts} (100%)
 rename html-pdf/{html-pdf.d.ts => index.d.ts} (100%)
 rename html-webpack-plugin/{html-webpack-plugin.d.ts => index.d.ts} (100%)
 rename imagemapster/{imagemapster.d.ts => index.d.ts} (100%)
 rename intl-tel-input/{intl-tel-input.d.ts => index.d.ts} (100%)
 rename inversify-express-utils/{inversify-express-utils.d.ts => index.d.ts} (100%)
 rename istanbul-middleware/{istanbul-middleware.d.ts => index.d.ts} (100%)
 rename jquery-mousewheel/{jquery-mousewheel.d.ts => index.d.ts} (100%)
 rename jquery-truncate-html/{jquery-truncate-html.d.ts => index.d.ts} (100%)
 rename jsoneditor/{jsoneditor.d.ts => index.d.ts} (100%)
 rename jsuite/{jsuite.d.ts => index.d.ts} (100%)
 rename karma-chai-sinon/{karma-chai-sinon.d.ts => index.d.ts} (100%)
 rename koa-compress/{koa-compress.d.ts => index.d.ts} (100%)
 rename koa-hbs/{koa-hbs.d.ts => index.d.ts} (100%)
 rename leaflet-geocoder-mapzen/{leaflet-geocoder-mapzen.d.ts => index.d.ts} (100%)
 rename marker-animate-unobtrusive/{marker-animate-unobtrusive.d.ts => index.d.ts} (100%)
 rename masonry-layout/{masonry-layout.d.ts => index.d.ts} (100%)
 rename mitm/{mitm.d.ts => index.d.ts} (100%)
 rename mongoose-paginate/{mongoose-paginate.d.ts => index.d.ts} (100%)
 rename multer-s3/{multer-s3.d.ts => index.d.ts} (100%)
 rename musicmetadata/{musicmetadata.d.ts => index.d.ts} (100%)
 rename nes/{nes.d.ts => index.d.ts} (100%)
 rename ngmap/{ngmap.d.ts => index.d.ts} (100%)
 rename ngreact/{ngreact.d.ts => index.d.ts} (100%)
 rename nodemailer-ses-transport/{nodemailer-ses-transport.d.ts => index.d.ts} (100%)
 rename notify.js/{notify.js.d.ts => index.d.ts} (100%)
 rename nw.js/{nw.js.d.ts => index.d.ts} (100%)
 rename o.js/{o.js.d.ts => index.d.ts} (100%)
 rename passport-local-mongoose/{passport-local-mongoose.d.ts => index.d.ts} (100%)
 rename pino/{pino.d.ts => index.d.ts} (100%)
 rename pouchdb-upsert/{pouchdb-upsert.d.ts => index.d.ts} (100%)
 rename rc-tooltip/{rc-tooltip.d.ts => index.d.ts} (100%)
 rename react-autosuggest/{react-autosuggest.d.ts => index.d.ts} (100%)
 rename react-big-calendar/{react-big-calendar.d.ts => index.d.ts} (100%)
 rename react-breadcrumbs/{react-breadcrumbs.d.ts => index.d.ts} (100%)
 rename react-calendar-timeline/{react-calendar-timeline.d.ts => index.d.ts} (100%)
 rename react-codemirror/{react-codemirror.d.ts => index.d.ts} (100%)
 rename react-datepicker/{react-datepicker.d.ts => index.d.ts} (100%)
 rename react-dnd-html5-backend/{react-dnd-html5-backend.d.ts => index.d.ts} (100%)
 rename react-file-input/{react-file-input.d.ts => index.d.ts} (100%)
 rename react-file-reader-input/{react-file-reader-input.d.ts => index.d.ts} (100%)
 rename react-flexr/{react-flexr.d.ts => index.d.ts} (100%)
 rename react-fontawesome/{react-fontawesome.d.ts => index.d.ts} (100%)
 rename react-imageloader/{react-imageloader.d.ts => index.d.ts} (100%)
 rename react-is-deprecated/{react-is-deprecated.d.ts => index.d.ts} (100%)
 rename react-jsonschema-form/{react-jsonschema-form.d.ts => index.d.ts} (100%)
 rename react-measure/{react-measure.d.ts => index.d.ts} (100%)
 rename react-modal/{react-modal.d.ts => index.d.ts} (100%)
 rename react-motion-slider/{react-motion-slider.d.ts => index.d.ts} (100%)
 rename react-relay/{react-relay.d.ts => index.d.ts} (100%)
 rename react-responsive/{react-responsive.d.ts => index.d.ts} (100%)
 rename react-scrollbar/{react-scrollbar.d.ts => index.d.ts} (100%)
 rename react-slick/{react-slick.d.ts => index.d.ts} (100%)
 rename react-sortable-hoc/{react-sortable-hoc.d.ts => index.d.ts} (100%)
 rename react-split-pane/{react-split-pane.d.ts => index.d.ts} (100%)
 rename react-swipeable/{react-swipeable.d.ts => index.d.ts} (100%)
 rename react-textarea-autosize/{react-textarea-autosize.d.ts => index.d.ts} (100%)
 rename react-user-tour/{react-user-tour.d.ts => index.d.ts} (100%)
 rename redux-bootstrap/{redux-bootstrap.d.ts => index.d.ts} (100%)
 rename redux-mock-store/{redux-mock-store.d.ts => index.d.ts} (100%)
 rename redux-optimistic-ui/{redux-optimistic-ui.d.ts => index.d.ts} (100%)
 rename redux-promise-middleware/{redux-promise-middleware.d.ts => index.d.ts} (100%)
 rename redux-storage/{redux-storage.d.ts => index.d.ts} (100%)
 rename redux-ui/{redux-ui.d.ts => index.d.ts} (100%)
 rename restler/{restler.d.ts => index.d.ts} (100%)
 rename rx-node/{rx-node.d.ts => index.d.ts} (100%)
 rename samchon-collection/{samchon-collection.d.ts => index.d.ts} (100%)
 rename samchon-library/{samchon-library.d.ts => index.d.ts} (100%)
 rename samlp/{samlp.d.ts => index.d.ts} (100%)
 rename set-cookie-parser/{set-cookie-parser.d.ts => index.d.ts} (100%)
 rename sinon-as-promised/{sinon-as-promised.d.ts => index.d.ts} (100%)
 rename socket.io-parser/{socket.io-parser.d.ts => index.d.ts} (100%)
 rename spectacle/{spectacle.d.ts => index.d.ts} (100%)
 rename split2/{split2.d.ts => index.d.ts} (100%)
 rename sqs-consumer/{sqs-consumer.d.ts => index.d.ts} (100%)
 rename sqs-producer/{sqs-producer.d.ts => index.d.ts} (100%)
 rename ssh2-sftp-client/{ssh2-sftp-client.d.ts => index.d.ts} (100%)
 rename swagger-express-middleware/{swagger-express-middleware.d.ts => index.d.ts} (100%)
 rename tinder/{tinder.d.ts => index.d.ts} (100%)
 rename torrent-stream/{torrent-stream.d.ts => index.d.ts} (100%)
 rename twit/{twit.d.ts => index.d.ts} (100%)
 rename v8-profiler/{v8-profiler.d.ts => index.d.ts} (100%)
 rename victory/{victory.d.ts => index.d.ts} (100%)
 rename webpack-dev-server/{webpack-dev-server.d.ts => index.d.ts} (100%)
 rename webpack-fail-plugin/{webpack-fail-plugin.d.ts => index.d.ts} (100%)
 rename webpack-merge/{webpack-merge.d.ts => index.d.ts} (100%)
 rename webpack-stream/{webpack-stream.d.ts => index.d.ts} (100%)
 rename webpack-validator/{webpack-validator.d.ts => index.d.ts} (100%)
 rename why-did-you-update/{why-did-you-update.d.ts => index.d.ts} (100%)
 rename winston-dynamodb/{winston-dynamodb.d.ts => index.d.ts} (100%)
 rename xmlpoke/{xmlpoke.d.ts => index.d.ts} (100%)

diff --git a/3d-bin-packing/3d-bin-packing.d.ts b/3d-bin-packing/index.d.ts
similarity index 100%
rename from 3d-bin-packing/3d-bin-packing.d.ts
rename to 3d-bin-packing/index.d.ts
diff --git a/3d-bin-packing/tsconfig.json b/3d-bin-packing/tsconfig.json
index ddad71a1fe..3d26767e8a 100644
--- a/3d-bin-packing/tsconfig.json
+++ b/3d-bin-packing/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "3d-bin-packing.d.ts",
+        "index.d.ts",
         "3d-bin-packing-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/angular-q-spread/angular-q-spread.d.ts b/angular-q-spread/index.d.ts
similarity index 100%
rename from angular-q-spread/angular-q-spread.d.ts
rename to angular-q-spread/index.d.ts
diff --git a/angular-q-spread/tsconfig.json b/angular-q-spread/tsconfig.json
index 3461eaa2db..3a3080cf81 100644
--- a/angular-q-spread/tsconfig.json
+++ b/angular-q-spread/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "files": [
-        "angular-q-spread.d.ts",
+        "index.d.ts",
         "angular-q-spread-tests.ts"
     ],
     "compilerOptions": {
diff --git a/angular-websocket/angular-websocket-tests.ts b/angular-websocket/angular-websocket-tests.ts
index e7cb30fe49..1df77b7a2a 100644
--- a/angular-websocket/angular-websocket-tests.ts
+++ b/angular-websocket/angular-websocket-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="angular-websocket.d.ts" />
-
 let dummySocket: ng.websocket.IWebSocket;
 let dummyPromise: ng.IPromise<void>;
 let dummyScope: ng.IScope;
diff --git a/angular-websocket/angular-websocket.d.ts b/angular-websocket/index.d.ts
similarity index 100%
rename from angular-websocket/angular-websocket.d.ts
rename to angular-websocket/index.d.ts
diff --git a/angular-websocket/tsconfig.json b/angular-websocket/tsconfig.json
index a340f7ffbd..e278ba9a25 100644
--- a/angular-websocket/tsconfig.json
+++ b/angular-websocket/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "files": [
-        "angular-websocket.d.ts",
+        "index.d.ts",
         "angular-websocket-tests.ts"
     ],
     "compilerOptions": {
diff --git a/angular-xeditable/angular-xeditable-tests.ts b/angular-xeditable/angular-xeditable-tests.ts
index 9264c47f41..57a3e53863 100644
--- a/angular-xeditable/angular-xeditable-tests.ts
+++ b/angular-xeditable/angular-xeditable-tests.ts
@@ -1,9 +1,7 @@
-/// <reference path="angular-xeditable.d.ts" />
-
-var myApp = angular.module('testModule', ['xeditable']);
+var myApp = angular.module('testModule', ['xeditable']);
 
 myApp.run(["editableOptions", (editableOptions: angular.xeditable.IEditableOptions) => {
-    
+
         editableOptions.activate = "select";
         editableOptions.activationEvent = "click";
         editableOptions.blurElem = "ignore";
diff --git a/angular-xeditable/angular-xeditable.d.ts b/angular-xeditable/index.d.ts
similarity index 100%
rename from angular-xeditable/angular-xeditable.d.ts
rename to angular-xeditable/index.d.ts
diff --git a/angular-xeditable/tsconfig.json b/angular-xeditable/tsconfig.json
index e81407b730..f85f2b4cef 100644
--- a/angular-xeditable/tsconfig.json
+++ b/angular-xeditable/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "files": [
-        "angular-xeditable.d.ts",
+        "index.d.ts",
         "angular-xeditable-tests.ts"
     ],
     "compilerOptions": {
diff --git a/bootstrap-fileinput/bootstrap-fileinput.d.ts b/bootstrap-fileinput/index.d.ts
similarity index 100%
rename from bootstrap-fileinput/bootstrap-fileinput.d.ts
rename to bootstrap-fileinput/index.d.ts
diff --git a/bootstrap-fileinput/tsconfig.json b/bootstrap-fileinput/tsconfig.json
index 5b7c6fc2bf..126718d584 100644
--- a/bootstrap-fileinput/tsconfig.json
+++ b/bootstrap-fileinput/tsconfig.json
@@ -13,6 +13,6 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "bootstrap-fileinput.d.ts"
+        "index.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/chai-dom/chai-dom-tests.ts b/chai-dom/chai-dom-tests.ts
index 2fca54765e..61b3b3c600 100644
--- a/chai-dom/chai-dom-tests.ts
+++ b/chai-dom/chai-dom-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="chai-dom.d.ts" />
-
 import * as chai from 'chai';
 import * as chaiDom from 'chai-dom';
 
diff --git a/chai-dom/chai-dom.d.ts b/chai-dom/index.d.ts
similarity index 100%
rename from chai-dom/chai-dom.d.ts
rename to chai-dom/index.d.ts
diff --git a/chai-dom/tsconfig.json b/chai-dom/tsconfig.json
index 79855c3e09..1e6e575470 100644
--- a/chai-dom/tsconfig.json
+++ b/chai-dom/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "chai-dom.d.ts",
+        "index.d.ts",
         "chai-dom-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/chai-enzyme/chai-enzyme-tests.tsx b/chai-enzyme/chai-enzyme-tests.tsx
index 0e491a7ba7..a70f7e7f96 100644
--- a/chai-enzyme/chai-enzyme-tests.tsx
+++ b/chai-enzyme/chai-enzyme-tests.tsx
@@ -1,5 +1,4 @@
 /// <reference types="react" />
-/// <reference path="./chai-enzyme.d.ts" />
 /// <reference types="enzyme" />
 /// <reference types="chai" />
 
diff --git a/chai-enzyme/chai-enzyme.d.ts b/chai-enzyme/index.d.ts
similarity index 100%
rename from chai-enzyme/chai-enzyme.d.ts
rename to chai-enzyme/index.d.ts
diff --git a/chai-enzyme/tsconfig.json b/chai-enzyme/tsconfig.json
index 81fa4a5105..6c0238d9d2 100644
--- a/chai-enzyme/tsconfig.json
+++ b/chai-enzyme/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "chai-enzyme.d.ts",
+        "index.d.ts",
         "chai-enzyme-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/commangular/commangular.d.ts b/commangular/index.d.ts
similarity index 100%
rename from commangular/commangular.d.ts
rename to commangular/index.d.ts
diff --git a/commangular/tsconfig.json b/commangular/tsconfig.json
index e52f7e1a12..1cc876f08d 100644
--- a/commangular/tsconfig.json
+++ b/commangular/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "commangular.d.ts",
+        "index.d.ts",
         "commangular-mock.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/connect-redis/connect-redis-tests.ts b/connect-redis/connect-redis-tests.ts
index 73e0e4d8f7..ed21f3b4be 100644
--- a/connect-redis/connect-redis-tests.ts
+++ b/connect-redis/connect-redis-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./connect-redis.d.ts" />
 /// <reference types="express-session" />
 
 import * as connectRedis from "connect-redis";
diff --git a/connect-redis/connect-redis.d.ts b/connect-redis/index.d.ts
similarity index 100%
rename from connect-redis/connect-redis.d.ts
rename to connect-redis/index.d.ts
diff --git a/connect-redis/tsconfig.json b/connect-redis/tsconfig.json
index 441b3c70c6..dadee4e1f8 100644
--- a/connect-redis/tsconfig.json
+++ b/connect-redis/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "connect-redis.d.ts",
+        "index.d.ts",
         "connect-redis-tests.ts"
     ]
 }
diff --git a/csv-parse/csv-parse-tests.ts b/csv-parse/csv-parse-tests.ts
index 3f552f1319..21df979d82 100644
--- a/csv-parse/csv-parse-tests.ts
+++ b/csv-parse/csv-parse-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="csv-parse.d.ts" />
-
 import parse = require('csv-parse');
 
 function callbackAPITest() {
@@ -38,7 +36,7 @@ import fs = require('fs');
 
 function pipeFunctionTest() {
     var transform = require('stream-transform');
-    
+
     var output:any = [];
     var parser = parse({delimiter: ':'})
     var input = fs.createReadStream('/etc/passwd');
diff --git a/csv-parse/csv-parse.d.ts b/csv-parse/index.d.ts
similarity index 100%
rename from csv-parse/csv-parse.d.ts
rename to csv-parse/index.d.ts
diff --git a/csv-parse/tsconfig.json b/csv-parse/tsconfig.json
index 9e359a8737..b3e05f504a 100644
--- a/csv-parse/tsconfig.json
+++ b/csv-parse/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "csv-parse.d.ts",
+        "index.d.ts",
         "csv-parse-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/d3kit/d3kit-tests.ts b/d3kit/d3kit-tests.ts
index 5eab2a4e79..d49891822b 100644
--- a/d3kit/d3kit-tests.ts
+++ b/d3kit/d3kit-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="d3kit.d.ts" />
 /// <reference types="d3" />
 /// <reference types="mocha" />
 /// <reference types="chai" />
diff --git a/d3kit/d3kit.d.ts b/d3kit/index.d.ts
similarity index 100%
rename from d3kit/d3kit.d.ts
rename to d3kit/index.d.ts
diff --git a/d3kit/tsconfig.json b/d3kit/tsconfig.json
index 1937b920e2..a60dcbb573 100644
--- a/d3kit/tsconfig.json
+++ b/d3kit/tsconfig.json
@@ -14,7 +14,7 @@
     "forceConsistentCasingInFileNames": true
   },
   "files": [
-    "d3kit.d.ts",
+    "index.d.ts",
     "d3kit-tests.ts"
   ]
 }
diff --git a/daterangepicker/daterangepicker-tests.ts b/daterangepicker/daterangepicker-tests.ts
index 0b8051b06a..38264bb0b3 100644
--- a/daterangepicker/daterangepicker-tests.ts
+++ b/daterangepicker/daterangepicker-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="daterangepicker.d.ts"/>
 import moment = require("moment")
 
 function tests_simple() {
diff --git a/daterangepicker/daterangepicker.d.ts b/daterangepicker/index.d.ts
similarity index 98%
rename from daterangepicker/daterangepicker.d.ts
rename to daterangepicker/index.d.ts
index 88cce7c0a2..68ae67c485 100644
--- a/daterangepicker/daterangepicker.d.ts
+++ b/daterangepicker/index.d.ts
@@ -167,6 +167,5 @@ declare namespace daterangepicker {
     }
 }
 
-declare module "daterangepicker" {
-    export = daterangepicker;
-}
+export = daterangepicker;
+export as namespace daterangepicker;
diff --git a/daterangepicker/tsconfig.json b/daterangepicker/tsconfig.json
index cbf48c5f61..77e00d0845 100644
--- a/daterangepicker/tsconfig.json
+++ b/daterangepicker/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "daterangepicker.d.ts",
+        "index.d.ts",
         "daterangepicker-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/df-visible/df-visible-tests.ts b/df-visible/df-visible-tests.ts
index c5a8f1bf2b..b4fe92fdf3 100644
--- a/df-visible/df-visible-tests.ts
+++ b/df-visible/df-visible-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="df-visible.d.ts" />
-
 // https://github.com/customd/jquery-visible/blob/master/examples/demo-basic.html
 $(function(){
 
diff --git a/df-visible/df-visible.d.ts b/df-visible/index.d.ts
similarity index 100%
rename from df-visible/df-visible.d.ts
rename to df-visible/index.d.ts
diff --git a/df-visible/tsconfig.json b/df-visible/tsconfig.json
index 49c372fd65..93d23458ce 100644
--- a/df-visible/tsconfig.json
+++ b/df-visible/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "df-visible.d.ts",
+        "index.d.ts",
         "df-visible-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/dva/dva.d.ts b/dva/index.d.ts
similarity index 100%
rename from dva/dva.d.ts
rename to dva/index.d.ts
diff --git a/dva/tsconfig.json b/dva/tsconfig.json
index 8c73ec457e..b9093241bb 100644
--- a/dva/tsconfig.json
+++ b/dva/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "dva.d.ts",
+        "index.d.ts",
         "dva-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/epub/epub-tests.ts b/epub/epub-tests.ts
index 6e61a26634..a69c543908 100644
--- a/epub/epub-tests.ts
+++ b/epub/epub-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="epub.d.ts" />
 import EPub = require("epub");
 
 var epub = new EPub("./file.epub");
diff --git a/epub/epub.d.ts b/epub/index.d.ts
similarity index 100%
rename from epub/epub.d.ts
rename to epub/index.d.ts
diff --git a/epub/tsconfig.json b/epub/tsconfig.json
index eda2b3868b..d1f91f6e53 100644
--- a/epub/tsconfig.json
+++ b/epub/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "epub.d.ts",
+        "index.d.ts",
         "epub-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/exorcist/exorcist-tests.ts b/exorcist/exorcist-tests.ts
index 26a1be0e07..3ac0d35c28 100644
--- a/exorcist/exorcist-tests.ts
+++ b/exorcist/exorcist-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="exorcist.d.ts" />
-
 import exorcist = require("exorcist");
 
 module ExorcistTest {
diff --git a/exorcist/exorcist.d.ts b/exorcist/index.d.ts
similarity index 100%
rename from exorcist/exorcist.d.ts
rename to exorcist/index.d.ts
diff --git a/exorcist/tsconfig.json b/exorcist/tsconfig.json
index e0ca3628a8..c57b04865a 100644
--- a/exorcist/tsconfig.json
+++ b/exorcist/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "exorcist.d.ts",
+        "index.d.ts",
         "exorcist-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/express-domain-middleware/express-domain-middleware-tests.ts b/express-domain-middleware/express-domain-middleware-tests.ts
index 446b732353..b506726ada 100644
--- a/express-domain-middleware/express-domain-middleware-tests.ts
+++ b/express-domain-middleware/express-domain-middleware-tests.ts
@@ -1,2 +1 @@
-/// <reference path="express-domain-middleware.d.ts" />
 import fn = require('express-domain-middleware');
diff --git a/express-domain-middleware/express-domain-middleware.d.ts b/express-domain-middleware/index.d.ts
similarity index 100%
rename from express-domain-middleware/express-domain-middleware.d.ts
rename to express-domain-middleware/index.d.ts
diff --git a/express-domain-middleware/tsconfig.json b/express-domain-middleware/tsconfig.json
index 456e26404a..48ef657c86 100644
--- a/express-domain-middleware/tsconfig.json
+++ b/express-domain-middleware/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "express-domain-middleware.d.ts",
+        "index.d.ts",
         "express-domain-middleware-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/fill-pdf/fill-pdf-tests.ts b/fill-pdf/fill-pdf-tests.ts
index e5b34cd943..44b4f23531 100644
--- a/fill-pdf/fill-pdf-tests.ts
+++ b/fill-pdf/fill-pdf-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path='fill-pdf.d.ts' />
-
 import * as fillPdf from 'fill-pdf';
 
 var formData: fillPdf.FormData = { FieldName: 'Text to put into form field' };
diff --git a/fill-pdf/fill-pdf.d.ts b/fill-pdf/index.d.ts
similarity index 100%
rename from fill-pdf/fill-pdf.d.ts
rename to fill-pdf/index.d.ts
diff --git a/fill-pdf/tsconfig.json b/fill-pdf/tsconfig.json
index 51c99ab9de..6190a7ae98 100644
--- a/fill-pdf/tsconfig.json
+++ b/fill-pdf/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "fill-pdf.d.ts",
+        "index.d.ts",
         "fill-pdf-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/fluent-ffmpeg/fluent-ffmpeg-tests.ts b/fluent-ffmpeg/fluent-ffmpeg-tests.ts
index 8b1031ff58..112d6de09b 100644
--- a/fluent-ffmpeg/fluent-ffmpeg-tests.ts
+++ b/fluent-ffmpeg/fluent-ffmpeg-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./fluent-ffmpeg.d.ts" />
-
 import ffmpeg = require("fluent-ffmpeg")
 
 let source: string, format: string, output: string
diff --git a/fluent-ffmpeg/fluent-ffmpeg.d.ts b/fluent-ffmpeg/index.d.ts
similarity index 100%
rename from fluent-ffmpeg/fluent-ffmpeg.d.ts
rename to fluent-ffmpeg/index.d.ts
diff --git a/fluent-ffmpeg/tsconfig.json b/fluent-ffmpeg/tsconfig.json
index 3e2fd3a624..e5256168e5 100644
--- a/fluent-ffmpeg/tsconfig.json
+++ b/fluent-ffmpeg/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "fluent-ffmpeg.d.ts",
+        "index.d.ts",
         "fluent-ffmpeg-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/fullpage.js/fullpage.js-tests.ts b/fullpage.js/fullpage.js-tests.ts
index 31e66fdd60..b8990ea9c8 100644
--- a/fullpage.js/fullpage.js-tests.ts
+++ b/fullpage.js/fullpage.js-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="fullpage.js.d.ts" />
-
 function test_public_methods() {
     $(() => {
         $('#fullpage').fullpage({
diff --git a/fullpage.js/fullpage.js.d.ts b/fullpage.js/index.d.ts
similarity index 100%
rename from fullpage.js/fullpage.js.d.ts
rename to fullpage.js/index.d.ts
diff --git a/fullpage.js/tsconfig.json b/fullpage.js/tsconfig.json
index 0e6588b0f4..736b4b1050 100644
--- a/fullpage.js/tsconfig.json
+++ b/fullpage.js/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "fullpage.js.d.ts",
+        "index.d.ts",
         "fullpage.js-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/gulp-angular-templatecache/gulp-angular-templatecache.d.ts b/gulp-angular-templatecache/index.d.ts
similarity index 100%
rename from gulp-angular-templatecache/gulp-angular-templatecache.d.ts
rename to gulp-angular-templatecache/index.d.ts
diff --git a/gulp-angular-templatecache/tsconfig.json b/gulp-angular-templatecache/tsconfig.json
index 6b3a7a2fa2..4a33a52943 100644
--- a/gulp-angular-templatecache/tsconfig.json
+++ b/gulp-angular-templatecache/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "gulp-angular-templatecache.d.ts",
+        "index.d.ts",
         "gulp-angular-templatecache-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/gulp-help-doc/gulp-help-doc.d.ts b/gulp-help-doc/index.d.ts
similarity index 100%
rename from gulp-help-doc/gulp-help-doc.d.ts
rename to gulp-help-doc/index.d.ts
diff --git a/gulp-help-doc/tsconfig.json b/gulp-help-doc/tsconfig.json
index f7206b7785..ba2c2857a0 100644
--- a/gulp-help-doc/tsconfig.json
+++ b/gulp-help-doc/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "gulp-help-doc.d.ts",
+        "index.d.ts",
         "gulp-help-doc-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/gulp-insert/gulp-insert.d.ts b/gulp-insert/index.d.ts
similarity index 100%
rename from gulp-insert/gulp-insert.d.ts
rename to gulp-insert/index.d.ts
diff --git a/gulp-insert/tsconfig.json b/gulp-insert/tsconfig.json
index 109f4aaa90..6de90874d4 100644
--- a/gulp-insert/tsconfig.json
+++ b/gulp-insert/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "gulp-insert.d.ts",
+        "index.d.ts",
         "gulp-insert-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/html-pdf/html-pdf.d.ts b/html-pdf/index.d.ts
similarity index 100%
rename from html-pdf/html-pdf.d.ts
rename to html-pdf/index.d.ts
diff --git a/html-pdf/tsconfig.json b/html-pdf/tsconfig.json
index b3b3941f12..7eafce4004 100644
--- a/html-pdf/tsconfig.json
+++ b/html-pdf/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "html-pdf.d.ts",
+        "index.d.ts",
         "html-pdf-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/html-webpack-plugin/html-webpack-plugin-tests.ts b/html-webpack-plugin/html-webpack-plugin-tests.ts
index 9aac8c9b98..9d4ec35e11 100644
--- a/html-webpack-plugin/html-webpack-plugin-tests.ts
+++ b/html-webpack-plugin/html-webpack-plugin-tests.ts
@@ -1,5 +1,3 @@
-///<reference path="html-webpack-plugin.d.ts" />
-
 import {Configuration} from "webpack";
 import HtmlWebpackPlugin = require("html-webpack-plugin");
 
diff --git a/html-webpack-plugin/html-webpack-plugin.d.ts b/html-webpack-plugin/index.d.ts
similarity index 100%
rename from html-webpack-plugin/html-webpack-plugin.d.ts
rename to html-webpack-plugin/index.d.ts
diff --git a/html-webpack-plugin/tsconfig.json b/html-webpack-plugin/tsconfig.json
index ea542ae271..b19027e8f0 100644
--- a/html-webpack-plugin/tsconfig.json
+++ b/html-webpack-plugin/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "html-webpack-plugin.d.ts",
+        "index.d.ts",
         "html-webpack-plugin-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/imagemapster/imagemapster.d.ts b/imagemapster/index.d.ts
similarity index 100%
rename from imagemapster/imagemapster.d.ts
rename to imagemapster/index.d.ts
diff --git a/imagemapster/tsconfig.json b/imagemapster/tsconfig.json
index 02230dff2f..e0bcab265e 100644
--- a/imagemapster/tsconfig.json
+++ b/imagemapster/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "imagemapster.d.ts",
+        "index.d.ts",
         "imagemapster-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/intl-tel-input/intl-tel-input.d.ts b/intl-tel-input/index.d.ts
similarity index 100%
rename from intl-tel-input/intl-tel-input.d.ts
rename to intl-tel-input/index.d.ts
diff --git a/intl-tel-input/tsconfig.json b/intl-tel-input/tsconfig.json
index 2290a860c8..2186d90c1d 100644
--- a/intl-tel-input/tsconfig.json
+++ b/intl-tel-input/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "intl-tel-input.d.ts",
+        "index.d.ts",
         "intl-tel-input-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/inversify-express-utils/inversify-express-utils.d.ts b/inversify-express-utils/index.d.ts
similarity index 100%
rename from inversify-express-utils/inversify-express-utils.d.ts
rename to inversify-express-utils/index.d.ts
diff --git a/inversify-express-utils/tsconfig.json b/inversify-express-utils/tsconfig.json
index c7e399100e..1a136bbfe3 100644
--- a/inversify-express-utils/tsconfig.json
+++ b/inversify-express-utils/tsconfig.json
@@ -14,7 +14,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "inversify-express-utils.d.ts",
+        "index.d.ts",
         "inversify-express-utils-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/istanbul-middleware/istanbul-middleware.d.ts b/istanbul-middleware/index.d.ts
similarity index 100%
rename from istanbul-middleware/istanbul-middleware.d.ts
rename to istanbul-middleware/index.d.ts
diff --git a/istanbul-middleware/tsconfig.json b/istanbul-middleware/tsconfig.json
index e755a0b80e..95df263847 100644
--- a/istanbul-middleware/tsconfig.json
+++ b/istanbul-middleware/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "istanbul-middleware.d.ts",
+        "index.d.ts",
         "istanbul-middleware-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/jquery-mousewheel/jquery-mousewheel.d.ts b/jquery-mousewheel/index.d.ts
similarity index 100%
rename from jquery-mousewheel/jquery-mousewheel.d.ts
rename to jquery-mousewheel/index.d.ts
diff --git a/jquery-mousewheel/tsconfig.json b/jquery-mousewheel/tsconfig.json
index 0c0c88bcb6..6c4ffbe27a 100644
--- a/jquery-mousewheel/tsconfig.json
+++ b/jquery-mousewheel/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "jquery-mousewheel.d.ts",
+        "index.d.ts",
         "jquery-mousewheel-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/jquery-truncate-html/jquery-truncate-html.d.ts b/jquery-truncate-html/index.d.ts
similarity index 100%
rename from jquery-truncate-html/jquery-truncate-html.d.ts
rename to jquery-truncate-html/index.d.ts
diff --git a/jquery-truncate-html/tsconfig.json b/jquery-truncate-html/tsconfig.json
index a282bbf024..d265c19db1 100644
--- a/jquery-truncate-html/tsconfig.json
+++ b/jquery-truncate-html/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "jquery-truncate-html.d.ts",
+        "index.d.ts",
         "jquery-truncate-html-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/jsoneditor/jsoneditor.d.ts b/jsoneditor/index.d.ts
similarity index 100%
rename from jsoneditor/jsoneditor.d.ts
rename to jsoneditor/index.d.ts
diff --git a/jsoneditor/jsoneditor-tests.ts b/jsoneditor/jsoneditor-tests.ts
index 99bbb51b92..3c8b66d76b 100644
--- a/jsoneditor/jsoneditor-tests.ts
+++ b/jsoneditor/jsoneditor-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="jsoneditor.d.ts" />
-
 import JSONEditor, {JSONEditorMode, JSONEditorNode, JSONEditorOptions} from 'jsoneditor';
 
 let options: JSONEditorOptions;
diff --git a/jsoneditor/tsconfig.json b/jsoneditor/tsconfig.json
index ac1de683cd..55b5ac9998 100644
--- a/jsoneditor/tsconfig.json
+++ b/jsoneditor/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "jsoneditor.d.ts",
+        "index.d.ts",
         "jsoneditor-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/jsuite/jsuite.d.ts b/jsuite/index.d.ts
similarity index 100%
rename from jsuite/jsuite.d.ts
rename to jsuite/index.d.ts
diff --git a/jsuite/tsconfig.json b/jsuite/tsconfig.json
index 0742f18c9f..79b9eb6b27 100644
--- a/jsuite/tsconfig.json
+++ b/jsuite/tsconfig.json
@@ -13,6 +13,6 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "jsuite.d.ts"
+        "index.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/karma-chai-sinon/karma-chai-sinon.d.ts b/karma-chai-sinon/index.d.ts
similarity index 100%
rename from karma-chai-sinon/karma-chai-sinon.d.ts
rename to karma-chai-sinon/index.d.ts
diff --git a/karma-chai-sinon/tsconfig.json b/karma-chai-sinon/tsconfig.json
index aef2986498..a7f480c167 100644
--- a/karma-chai-sinon/tsconfig.json
+++ b/karma-chai-sinon/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "karma-chai-sinon.d.ts",
+        "index.d.ts",
         "karma-chai-sinon-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/koa-compress/koa-compress.d.ts b/koa-compress/index.d.ts
similarity index 100%
rename from koa-compress/koa-compress.d.ts
rename to koa-compress/index.d.ts
diff --git a/koa-compress/tsconfig.json b/koa-compress/tsconfig.json
index 05c84b0a3a..3a922f661c 100644
--- a/koa-compress/tsconfig.json
+++ b/koa-compress/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "files": [
-        "koa-compress.d.ts",
+        "index.d.ts",
         "koa-compress-tests.ts"
     ],
     "compilerOptions": {
diff --git a/koa-hbs/koa-hbs.d.ts b/koa-hbs/index.d.ts
similarity index 100%
rename from koa-hbs/koa-hbs.d.ts
rename to koa-hbs/index.d.ts
diff --git a/koa-hbs/tsconfig.json b/koa-hbs/tsconfig.json
index c20e3481c9..ba124e4c80 100644
--- a/koa-hbs/tsconfig.json
+++ b/koa-hbs/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "koa-hbs.d.ts",
+        "index.d.ts",
         "koa-hbs-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/leaflet-geocoder-mapzen/leaflet-geocoder-mapzen.d.ts b/leaflet-geocoder-mapzen/index.d.ts
similarity index 100%
rename from leaflet-geocoder-mapzen/leaflet-geocoder-mapzen.d.ts
rename to leaflet-geocoder-mapzen/index.d.ts
diff --git a/leaflet-geocoder-mapzen/tsconfig.json b/leaflet-geocoder-mapzen/tsconfig.json
index 75d2cf911a..6fb796302e 100644
--- a/leaflet-geocoder-mapzen/tsconfig.json
+++ b/leaflet-geocoder-mapzen/tsconfig.json
@@ -10,7 +10,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "leaflet-geocoder-mapzen.d.ts",
+        "index.d.ts",
         "leaflet-geocoder-mapzen-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/marker-animate-unobtrusive/marker-animate-unobtrusive.d.ts b/marker-animate-unobtrusive/index.d.ts
similarity index 100%
rename from marker-animate-unobtrusive/marker-animate-unobtrusive.d.ts
rename to marker-animate-unobtrusive/index.d.ts
diff --git a/marker-animate-unobtrusive/tsconfig.json b/marker-animate-unobtrusive/tsconfig.json
index 3961120707..9398f7b73e 100644
--- a/marker-animate-unobtrusive/tsconfig.json
+++ b/marker-animate-unobtrusive/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "marker-animate-unobtrusive.d.ts",
+        "index.d.ts",
         "marker-animate-unobtrusive-tests.ts",
         "marker-animate-unobtrusive-amd-tests.ts"
     ]
diff --git a/masonry-layout/masonry-layout.d.ts b/masonry-layout/index.d.ts
similarity index 100%
rename from masonry-layout/masonry-layout.d.ts
rename to masonry-layout/index.d.ts
diff --git a/masonry-layout/tsconfig.json b/masonry-layout/tsconfig.json
index 0638ecd09d..125331bcd8 100644
--- a/masonry-layout/tsconfig.json
+++ b/masonry-layout/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "masonry-layout.d.ts",
+        "index.d.ts",
         "masonry-layout-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/mitm/mitm.d.ts b/mitm/index.d.ts
similarity index 100%
rename from mitm/mitm.d.ts
rename to mitm/index.d.ts
diff --git a/mitm/tsconfig.json b/mitm/tsconfig.json
index e14e440597..d37bc6fddb 100644
--- a/mitm/tsconfig.json
+++ b/mitm/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "mitm.d.ts",
+        "index.d.ts",
         "mitm-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/mongoose-paginate/mongoose-paginate.d.ts b/mongoose-paginate/index.d.ts
similarity index 100%
rename from mongoose-paginate/mongoose-paginate.d.ts
rename to mongoose-paginate/index.d.ts
diff --git a/mongoose-paginate/tsconfig.json b/mongoose-paginate/tsconfig.json
index 6cd106d699..a580a52c42 100644
--- a/mongoose-paginate/tsconfig.json
+++ b/mongoose-paginate/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "mongoose-paginate.d.ts",
+        "index.d.ts",
         "mongoose-paginate-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/multer-s3/multer-s3.d.ts b/multer-s3/index.d.ts
similarity index 100%
rename from multer-s3/multer-s3.d.ts
rename to multer-s3/index.d.ts
diff --git a/multer-s3/tsconfig.json b/multer-s3/tsconfig.json
index 04e16429ee..e05b4498c8 100644
--- a/multer-s3/tsconfig.json
+++ b/multer-s3/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "multer-s3.d.ts",
+        "index.d.ts",
         "multer-s3-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/musicmetadata/musicmetadata.d.ts b/musicmetadata/index.d.ts
similarity index 100%
rename from musicmetadata/musicmetadata.d.ts
rename to musicmetadata/index.d.ts
diff --git a/musicmetadata/tsconfig.json b/musicmetadata/tsconfig.json
index d403132a8d..aaecf53410 100644
--- a/musicmetadata/tsconfig.json
+++ b/musicmetadata/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "musicmetadata.d.ts",
+        "index.d.ts",
         "musicmetadata-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/nes/nes.d.ts b/nes/index.d.ts
similarity index 100%
rename from nes/nes.d.ts
rename to nes/index.d.ts
diff --git a/nes/tsconfig.json b/nes/tsconfig.json
index c0b45f689b..283844577b 100644
--- a/nes/tsconfig.json
+++ b/nes/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "nes.d.ts",
+        "index.d.ts",
         "nes-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/ngmap/ngmap.d.ts b/ngmap/index.d.ts
similarity index 100%
rename from ngmap/ngmap.d.ts
rename to ngmap/index.d.ts
diff --git a/ngmap/tsconfig.json b/ngmap/tsconfig.json
index d86f53d20a..132e6d6842 100644
--- a/ngmap/tsconfig.json
+++ b/ngmap/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "ngmap.d.ts",
+        "index.d.ts",
         "ngmap-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/ngreact/ngreact.d.ts b/ngreact/index.d.ts
similarity index 100%
rename from ngreact/ngreact.d.ts
rename to ngreact/index.d.ts
diff --git a/ngreact/tsconfig.json b/ngreact/tsconfig.json
index 1b80eaf055..194de86d87 100644
--- a/ngreact/tsconfig.json
+++ b/ngreact/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "ngreact.d.ts",
+        "index.d.ts",
         "ngreact-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/nodemailer-ses-transport/nodemailer-ses-transport.d.ts b/nodemailer-ses-transport/index.d.ts
similarity index 100%
rename from nodemailer-ses-transport/nodemailer-ses-transport.d.ts
rename to nodemailer-ses-transport/index.d.ts
diff --git a/nodemailer-ses-transport/tsconfig.json b/nodemailer-ses-transport/tsconfig.json
index 8aa631bf9a..6e77bfb4f1 100644
--- a/nodemailer-ses-transport/tsconfig.json
+++ b/nodemailer-ses-transport/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "nodemailer-ses-transport.d.ts",
+        "index.d.ts",
         "nodemailer-ses-transport-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/notify.js/notify.js.d.ts b/notify.js/index.d.ts
similarity index 100%
rename from notify.js/notify.js.d.ts
rename to notify.js/index.d.ts
diff --git a/notify.js/tsconfig.json b/notify.js/tsconfig.json
index 1c62932129..520d32ba10 100644
--- a/notify.js/tsconfig.json
+++ b/notify.js/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "notify.js.d.ts",
+        "index.d.ts",
         "notify.js.tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/nw.js/nw.js.d.ts b/nw.js/index.d.ts
similarity index 100%
rename from nw.js/nw.js.d.ts
rename to nw.js/index.d.ts
diff --git a/nw.js/tsconfig.json b/nw.js/tsconfig.json
index 63803a69d9..61fc71fe70 100644
--- a/nw.js/tsconfig.json
+++ b/nw.js/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "nw.js.d.ts",
+        "index.d.ts",
         "nw.js-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/o.js/o.js.d.ts b/o.js/index.d.ts
similarity index 100%
rename from o.js/o.js.d.ts
rename to o.js/index.d.ts
diff --git a/o.js/tsconfig.json b/o.js/tsconfig.json
index a630e4dee7..9902659eec 100644
--- a/o.js/tsconfig.json
+++ b/o.js/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "o.js.d.ts",
+        "index.d.ts",
         "o.js-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/passport-local-mongoose/passport-local-mongoose.d.ts b/passport-local-mongoose/index.d.ts
similarity index 100%
rename from passport-local-mongoose/passport-local-mongoose.d.ts
rename to passport-local-mongoose/index.d.ts
diff --git a/passport-local-mongoose/tsconfig.json b/passport-local-mongoose/tsconfig.json
index 96c1a13bf1..a30ca49bbf 100644
--- a/passport-local-mongoose/tsconfig.json
+++ b/passport-local-mongoose/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "passport-local-mongoose.d.ts",
+        "index.d.ts",
         "passport-local-mongoose-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/pino/pino.d.ts b/pino/index.d.ts
similarity index 100%
rename from pino/pino.d.ts
rename to pino/index.d.ts
diff --git a/pino/tsconfig.json b/pino/tsconfig.json
index d1c0f04972..f80ebefe14 100644
--- a/pino/tsconfig.json
+++ b/pino/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "pino.d.ts",
+        "index.d.ts",
         "pino-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/pouchdb-upsert/pouchdb-upsert.d.ts b/pouchdb-upsert/index.d.ts
similarity index 100%
rename from pouchdb-upsert/pouchdb-upsert.d.ts
rename to pouchdb-upsert/index.d.ts
diff --git a/pouchdb-upsert/pouchdb-upsert-tests.ts b/pouchdb-upsert/pouchdb-upsert-tests.ts
index fa4eb83af3..5ed17266b1 100644
--- a/pouchdb-upsert/pouchdb-upsert-tests.ts
+++ b/pouchdb-upsert/pouchdb-upsert-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./pouchdb-upsert.d.ts" />
-
 import * as pouchdbUpsert from 'pouchdb-upsert';
 PouchDB.plugin(pouchdbUpsert);
 
diff --git a/pouchdb-upsert/tsconfig.json b/pouchdb-upsert/tsconfig.json
index a88f26d221..a0719c3eaf 100644
--- a/pouchdb-upsert/tsconfig.json
+++ b/pouchdb-upsert/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "pouchdb-upsert.d.ts",
+        "index.d.ts",
         "pouchdb-upsert-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/rc-tooltip/rc-tooltip.d.ts b/rc-tooltip/index.d.ts
similarity index 100%
rename from rc-tooltip/rc-tooltip.d.ts
rename to rc-tooltip/index.d.ts
diff --git a/rc-tooltip/tsconfig.json b/rc-tooltip/tsconfig.json
index 3ad29fc103..2f9aa65a4b 100644
--- a/rc-tooltip/tsconfig.json
+++ b/rc-tooltip/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "rc-tooltip.d.ts",
+        "index.d.ts",
         "rc-tooltip-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-autosuggest/react-autosuggest.d.ts b/react-autosuggest/index.d.ts
similarity index 100%
rename from react-autosuggest/react-autosuggest.d.ts
rename to react-autosuggest/index.d.ts
diff --git a/react-autosuggest/tsconfig.json b/react-autosuggest/tsconfig.json
index 3f2805e714..6c2ea102f6 100644
--- a/react-autosuggest/tsconfig.json
+++ b/react-autosuggest/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-autosuggest.d.ts",
+        "index.d.ts",
         "react-autosuggest-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-big-calendar/react-big-calendar.d.ts b/react-big-calendar/index.d.ts
similarity index 100%
rename from react-big-calendar/react-big-calendar.d.ts
rename to react-big-calendar/index.d.ts
diff --git a/react-big-calendar/tsconfig.json b/react-big-calendar/tsconfig.json
index ef22e3c080..219b769f52 100644
--- a/react-big-calendar/tsconfig.json
+++ b/react-big-calendar/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-big-calendar.d.ts",
+        "index.d.ts",
         "react-big-calendar-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-breadcrumbs/react-breadcrumbs.d.ts b/react-breadcrumbs/index.d.ts
similarity index 100%
rename from react-breadcrumbs/react-breadcrumbs.d.ts
rename to react-breadcrumbs/index.d.ts
diff --git a/react-breadcrumbs/tsconfig.json b/react-breadcrumbs/tsconfig.json
index 5fc6650176..79fc7c00c4 100644
--- a/react-breadcrumbs/tsconfig.json
+++ b/react-breadcrumbs/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-breadcrumbs.d.ts",
+        "index.d.ts",
         "react-breadcrumbs-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-calendar-timeline/react-calendar-timeline.d.ts b/react-calendar-timeline/index.d.ts
similarity index 100%
rename from react-calendar-timeline/react-calendar-timeline.d.ts
rename to react-calendar-timeline/index.d.ts
diff --git a/react-calendar-timeline/tsconfig.json b/react-calendar-timeline/tsconfig.json
index 4bd69bf193..7e2c69e149 100644
--- a/react-calendar-timeline/tsconfig.json
+++ b/react-calendar-timeline/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-calendar-timeline.d.ts",
+        "index.d.ts",
         "react-calendar-timeline-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-codemirror/react-codemirror.d.ts b/react-codemirror/index.d.ts
similarity index 100%
rename from react-codemirror/react-codemirror.d.ts
rename to react-codemirror/index.d.ts
diff --git a/react-codemirror/tsconfig.json b/react-codemirror/tsconfig.json
index 2c0e4d2ad5..1a0d6a5a8b 100644
--- a/react-codemirror/tsconfig.json
+++ b/react-codemirror/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-codemirror.d.ts",
+        "index.d.ts",
         "react-codemirror-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-datepicker/react-datepicker.d.ts b/react-datepicker/index.d.ts
similarity index 100%
rename from react-datepicker/react-datepicker.d.ts
rename to react-datepicker/index.d.ts
diff --git a/react-datepicker/tsconfig.json b/react-datepicker/tsconfig.json
index 60fcd89c5f..8f2905ef26 100644
--- a/react-datepicker/tsconfig.json
+++ b/react-datepicker/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-datepicker.d.ts",
+        "index.d.ts",
         "react-datepicker-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-dnd-html5-backend/react-dnd-html5-backend.d.ts b/react-dnd-html5-backend/index.d.ts
similarity index 100%
rename from react-dnd-html5-backend/react-dnd-html5-backend.d.ts
rename to react-dnd-html5-backend/index.d.ts
diff --git a/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts b/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
index 6a94717e92..670790c46a 100644
--- a/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
+++ b/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
@@ -1,4 +1,3 @@
-///<reference path="react-dnd-html5-backend.d.ts" />
 "use strict";
 
 // Test adapted from the ReactDnD chess game tutorial:
diff --git a/react-dnd-html5-backend/tsconfig.json b/react-dnd-html5-backend/tsconfig.json
index b7ef8e9789..68c26e2605 100644
--- a/react-dnd-html5-backend/tsconfig.json
+++ b/react-dnd-html5-backend/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "react-dnd-html5-backend.d.ts",
+        "index.d.ts",
         "react-dnd-html5-backend-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/react-file-input/react-file-input.d.ts b/react-file-input/index.d.ts
similarity index 100%
rename from react-file-input/react-file-input.d.ts
rename to react-file-input/index.d.ts
diff --git a/react-file-input/tsconfig.json b/react-file-input/tsconfig.json
index 6e2b25f0d2..25521dc631 100644
--- a/react-file-input/tsconfig.json
+++ b/react-file-input/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-file-input.d.ts",
+        "index.d.ts",
         "react-file-input-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-file-reader-input/react-file-reader-input.d.ts b/react-file-reader-input/index.d.ts
similarity index 100%
rename from react-file-reader-input/react-file-reader-input.d.ts
rename to react-file-reader-input/index.d.ts
diff --git a/react-file-reader-input/tsconfig.json b/react-file-reader-input/tsconfig.json
index ec09339b0e..968de91e87 100644
--- a/react-file-reader-input/tsconfig.json
+++ b/react-file-reader-input/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-file-reader-input.d.ts",
+        "index.d.ts",
         "react-file-reader-input-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-flexr/react-flexr.d.ts b/react-flexr/index.d.ts
similarity index 100%
rename from react-flexr/react-flexr.d.ts
rename to react-flexr/index.d.ts
diff --git a/react-flexr/tsconfig.json b/react-flexr/tsconfig.json
index 658fa94b63..4ae2aa3a91 100644
--- a/react-flexr/tsconfig.json
+++ b/react-flexr/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-flexr.d.ts",
+        "index.d.ts",
         "react-flexr-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-fontawesome/react-fontawesome.d.ts b/react-fontawesome/index.d.ts
similarity index 100%
rename from react-fontawesome/react-fontawesome.d.ts
rename to react-fontawesome/index.d.ts
diff --git a/react-fontawesome/tsconfig.json b/react-fontawesome/tsconfig.json
index 9d1784f8a7..136824e9bc 100644
--- a/react-fontawesome/tsconfig.json
+++ b/react-fontawesome/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-fontawesome.d.ts",
+        "index.d.ts",
         "react-fontawesome-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-imageloader/react-imageloader.d.ts b/react-imageloader/index.d.ts
similarity index 100%
rename from react-imageloader/react-imageloader.d.ts
rename to react-imageloader/index.d.ts
diff --git a/react-imageloader/tsconfig.json b/react-imageloader/tsconfig.json
index ce35e9adb2..457ffae645 100644
--- a/react-imageloader/tsconfig.json
+++ b/react-imageloader/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-imageloader.d.ts",
+        "index.d.ts",
         "react-imageloader-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-is-deprecated/react-is-deprecated.d.ts b/react-is-deprecated/index.d.ts
similarity index 100%
rename from react-is-deprecated/react-is-deprecated.d.ts
rename to react-is-deprecated/index.d.ts
diff --git a/react-is-deprecated/tsconfig.json b/react-is-deprecated/tsconfig.json
index f9d5739a14..c5cf1213a3 100644
--- a/react-is-deprecated/tsconfig.json
+++ b/react-is-deprecated/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-is-deprecated.d.ts",
+        "index.d.ts",
         "react-is-deprecated-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/react-jsonschema-form/react-jsonschema-form.d.ts b/react-jsonschema-form/index.d.ts
similarity index 100%
rename from react-jsonschema-form/react-jsonschema-form.d.ts
rename to react-jsonschema-form/index.d.ts
diff --git a/react-jsonschema-form/tsconfig.json b/react-jsonschema-form/tsconfig.json
index b70a03d4ba..f1b6bb257d 100644
--- a/react-jsonschema-form/tsconfig.json
+++ b/react-jsonschema-form/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-jsonschema-form.d.ts",
+        "index.d.ts",
         "react-jsonschema-form-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-measure/react-measure.d.ts b/react-measure/index.d.ts
similarity index 100%
rename from react-measure/react-measure.d.ts
rename to react-measure/index.d.ts
diff --git a/react-measure/tsconfig.json b/react-measure/tsconfig.json
index 0a0e3ad58e..99338af61d 100644
--- a/react-measure/tsconfig.json
+++ b/react-measure/tsconfig.json
@@ -15,7 +15,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "react-measure.d.ts",
+        "index.d.ts",
         "react-measure-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-modal/react-modal.d.ts b/react-modal/index.d.ts
similarity index 100%
rename from react-modal/react-modal.d.ts
rename to react-modal/index.d.ts
diff --git a/react-modal/tsconfig.json b/react-modal/tsconfig.json
index 87f956ff88..61490f70b7 100644
--- a/react-modal/tsconfig.json
+++ b/react-modal/tsconfig.json
@@ -14,7 +14,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "react-modal.d.ts",
+        "index.d.ts",
         "react-modal-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-motion-slider/react-motion-slider.d.ts b/react-motion-slider/index.d.ts
similarity index 100%
rename from react-motion-slider/react-motion-slider.d.ts
rename to react-motion-slider/index.d.ts
diff --git a/react-motion-slider/tsconfig.json b/react-motion-slider/tsconfig.json
index 09a7065508..d93775736c 100644
--- a/react-motion-slider/tsconfig.json
+++ b/react-motion-slider/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-motion-slider.d.ts",
+        "index.d.ts",
         "react-motion-slider-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-relay/react-relay.d.ts b/react-relay/index.d.ts
similarity index 100%
rename from react-relay/react-relay.d.ts
rename to react-relay/index.d.ts
diff --git a/react-relay/tsconfig.json b/react-relay/tsconfig.json
index c3b3c4e209..c3fca33dab 100644
--- a/react-relay/tsconfig.json
+++ b/react-relay/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-relay.d.ts",
+        "index.d.ts",
         "react-relay-test.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-responsive/react-responsive.d.ts b/react-responsive/index.d.ts
similarity index 100%
rename from react-responsive/react-responsive.d.ts
rename to react-responsive/index.d.ts
diff --git a/react-responsive/tsconfig.json b/react-responsive/tsconfig.json
index a15be69b1e..2b46a3f997 100644
--- a/react-responsive/tsconfig.json
+++ b/react-responsive/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-responsive.d.ts",
+        "index.d.ts",
         "react-responsive-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-scrollbar/react-scrollbar.d.ts b/react-scrollbar/index.d.ts
similarity index 100%
rename from react-scrollbar/react-scrollbar.d.ts
rename to react-scrollbar/index.d.ts
diff --git a/react-scrollbar/tsconfig.json b/react-scrollbar/tsconfig.json
index 1f4f102561..940cf56fbd 100644
--- a/react-scrollbar/tsconfig.json
+++ b/react-scrollbar/tsconfig.json
@@ -14,7 +14,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "react-scrollbar.d.ts",
+        "index.d.ts",
         "react-scrollbar-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-slick/react-slick.d.ts b/react-slick/index.d.ts
similarity index 100%
rename from react-slick/react-slick.d.ts
rename to react-slick/index.d.ts
diff --git a/react-slick/tsconfig.json b/react-slick/tsconfig.json
index f29388a78f..1a32f8f96a 100644
--- a/react-slick/tsconfig.json
+++ b/react-slick/tsconfig.json
@@ -14,7 +14,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "react-slick.d.ts",
+        "index.d.ts",
         "react-slick-test.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-sortable-hoc/react-sortable-hoc.d.ts b/react-sortable-hoc/index.d.ts
similarity index 100%
rename from react-sortable-hoc/react-sortable-hoc.d.ts
rename to react-sortable-hoc/index.d.ts
diff --git a/react-sortable-hoc/tsconfig.json b/react-sortable-hoc/tsconfig.json
index 595b57b362..9873b4d2be 100644
--- a/react-sortable-hoc/tsconfig.json
+++ b/react-sortable-hoc/tsconfig.json
@@ -14,7 +14,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "react-sortable-hoc.d.ts",
+        "index.d.ts",
         "react-sortable-hoc-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-split-pane/react-split-pane.d.ts b/react-split-pane/index.d.ts
similarity index 100%
rename from react-split-pane/react-split-pane.d.ts
rename to react-split-pane/index.d.ts
diff --git a/react-split-pane/tsconfig.json b/react-split-pane/tsconfig.json
index e6db5fa417..f476a14fd6 100644
--- a/react-split-pane/tsconfig.json
+++ b/react-split-pane/tsconfig.json
@@ -14,7 +14,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "react-split-pane.d.ts",
+        "index.d.ts",
         "react-split-pane-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-swipeable/react-swipeable.d.ts b/react-swipeable/index.d.ts
similarity index 100%
rename from react-swipeable/react-swipeable.d.ts
rename to react-swipeable/index.d.ts
diff --git a/react-swipeable/tsconfig.json b/react-swipeable/tsconfig.json
index 02fd1d28d5..0ae8b22d4e 100644
--- a/react-swipeable/tsconfig.json
+++ b/react-swipeable/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-swipeable.d.ts",
+        "index.d.ts",
         "react-swipeable-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-textarea-autosize/react-textarea-autosize.d.ts b/react-textarea-autosize/index.d.ts
similarity index 100%
rename from react-textarea-autosize/react-textarea-autosize.d.ts
rename to react-textarea-autosize/index.d.ts
diff --git a/react-textarea-autosize/tsconfig.json b/react-textarea-autosize/tsconfig.json
index 5f7456c652..90f12412d1 100644
--- a/react-textarea-autosize/tsconfig.json
+++ b/react-textarea-autosize/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-textarea-autosize.d.ts",
+        "index.d.ts",
         "react-textarea-autosize-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/react-user-tour/react-user-tour.d.ts b/react-user-tour/index.d.ts
similarity index 100%
rename from react-user-tour/react-user-tour.d.ts
rename to react-user-tour/index.d.ts
diff --git a/react-user-tour/tsconfig.json b/react-user-tour/tsconfig.json
index 6ba3336beb..2a7f80fd83 100644
--- a/react-user-tour/tsconfig.json
+++ b/react-user-tour/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "react-user-tour.d.ts",
+        "index.d.ts",
         "react-user-tour-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/redux-bootstrap/redux-bootstrap.d.ts b/redux-bootstrap/index.d.ts
similarity index 100%
rename from redux-bootstrap/redux-bootstrap.d.ts
rename to redux-bootstrap/index.d.ts
diff --git a/redux-bootstrap/tsconfig.json b/redux-bootstrap/tsconfig.json
index e5e83c285f..264ed2e6be 100644
--- a/redux-bootstrap/tsconfig.json
+++ b/redux-bootstrap/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "redux-bootstrap.d.ts",
+        "index.d.ts",
         "redux-bootstrap-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/redux-mock-store/redux-mock-store.d.ts b/redux-mock-store/index.d.ts
similarity index 100%
rename from redux-mock-store/redux-mock-store.d.ts
rename to redux-mock-store/index.d.ts
diff --git a/redux-mock-store/tsconfig.json b/redux-mock-store/tsconfig.json
index 9e015629bd..1e0540ee2f 100644
--- a/redux-mock-store/tsconfig.json
+++ b/redux-mock-store/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "redux-mock-store.d.ts",
+        "index.d.ts",
         "redux-mock-store-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/redux-optimistic-ui/redux-optimistic-ui.d.ts b/redux-optimistic-ui/index.d.ts
similarity index 100%
rename from redux-optimistic-ui/redux-optimistic-ui.d.ts
rename to redux-optimistic-ui/index.d.ts
diff --git a/redux-optimistic-ui/tsconfig.json b/redux-optimistic-ui/tsconfig.json
index 8de339b93a..0f4499bc00 100644
--- a/redux-optimistic-ui/tsconfig.json
+++ b/redux-optimistic-ui/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "redux-optimistic-ui.d.ts",
+        "index.d.ts",
         "redux-optimistic-ui-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/redux-promise-middleware/redux-promise-middleware.d.ts b/redux-promise-middleware/index.d.ts
similarity index 100%
rename from redux-promise-middleware/redux-promise-middleware.d.ts
rename to redux-promise-middleware/index.d.ts
diff --git a/redux-promise-middleware/tsconfig.json b/redux-promise-middleware/tsconfig.json
index 380792b821..4b98cbafa9 100644
--- a/redux-promise-middleware/tsconfig.json
+++ b/redux-promise-middleware/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "redux-promise-middleware.d.ts",
+        "index.d.ts",
         "redux-promise-middleware-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/redux-storage/redux-storage.d.ts b/redux-storage/index.d.ts
similarity index 100%
rename from redux-storage/redux-storage.d.ts
rename to redux-storage/index.d.ts
diff --git a/redux-storage/tsconfig.json b/redux-storage/tsconfig.json
index 2559181263..08ffc4fd8c 100644
--- a/redux-storage/tsconfig.json
+++ b/redux-storage/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "redux-storage.d.ts",
+        "index.d.ts",
         "redux-storage-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/redux-ui/redux-ui.d.ts b/redux-ui/index.d.ts
similarity index 100%
rename from redux-ui/redux-ui.d.ts
rename to redux-ui/index.d.ts
diff --git a/redux-ui/tsconfig.json b/redux-ui/tsconfig.json
index 7bfc0fc3b7..b79ee9a548 100644
--- a/redux-ui/tsconfig.json
+++ b/redux-ui/tsconfig.json
@@ -15,7 +15,7 @@
         "experimentalDecorators": true
     },
     "files": [
-        "redux-ui.d.ts",
+        "index.d.ts",
         "redux-ui-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/restler/restler.d.ts b/restler/index.d.ts
similarity index 100%
rename from restler/restler.d.ts
rename to restler/index.d.ts
diff --git a/restler/restler-tests.ts b/restler/restler-tests.ts
index 8c53455d08..5cb11d71c1 100644
--- a/restler/restler-tests.ts
+++ b/restler/restler-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="restler.d.ts" />
-
 import rest = require("restler");
 
 rest.get("http://google.com").on("complete", function(result) {
diff --git a/restler/tsconfig.json b/restler/tsconfig.json
index 4d717eca0b..0944a4d389 100644
--- a/restler/tsconfig.json
+++ b/restler/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "restler.d.ts",
+        "index.d.ts",
         "restler-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/rx-node/rx-node.d.ts b/rx-node/index.d.ts
similarity index 100%
rename from rx-node/rx-node.d.ts
rename to rx-node/index.d.ts
diff --git a/rx-node/tsconfig.json b/rx-node/tsconfig.json
index e3bd39f99b..c54c9376e0 100644
--- a/rx-node/tsconfig.json
+++ b/rx-node/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "rx-node.d.ts",
+        "index.d.ts",
         "rx-node-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/samchon-collection/samchon-collection.d.ts b/samchon-collection/index.d.ts
similarity index 100%
rename from samchon-collection/samchon-collection.d.ts
rename to samchon-collection/index.d.ts
diff --git a/samchon-collection/tsconfig.json b/samchon-collection/tsconfig.json
index a429882ac7..8059eff31e 100644
--- a/samchon-collection/tsconfig.json
+++ b/samchon-collection/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "samchon-collection.d.ts",
+        "index.d.ts",
         "samchon-collection-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/samchon-library/samchon-library.d.ts b/samchon-library/index.d.ts
similarity index 100%
rename from samchon-library/samchon-library.d.ts
rename to samchon-library/index.d.ts
diff --git a/samchon-library/tsconfig.json b/samchon-library/tsconfig.json
index e0415f7dce..8a82cba20e 100644
--- a/samchon-library/tsconfig.json
+++ b/samchon-library/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "samchon-library.d.ts",
+        "index.d.ts",
         "samchon-library-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/samlp/samlp.d.ts b/samlp/index.d.ts
similarity index 100%
rename from samlp/samlp.d.ts
rename to samlp/index.d.ts
diff --git a/samlp/tsconfig.json b/samlp/tsconfig.json
index b15ade33c8..232e1c91c9 100644
--- a/samlp/tsconfig.json
+++ b/samlp/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "samlp.d.ts",
+        "index.d.ts",
         "samlp-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/set-cookie-parser/set-cookie-parser.d.ts b/set-cookie-parser/index.d.ts
similarity index 100%
rename from set-cookie-parser/set-cookie-parser.d.ts
rename to set-cookie-parser/index.d.ts
diff --git a/set-cookie-parser/tsconfig.json b/set-cookie-parser/tsconfig.json
index a913efaa2f..7421e98713 100644
--- a/set-cookie-parser/tsconfig.json
+++ b/set-cookie-parser/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "set-cookie-parser.d.ts",
+        "index.d.ts",
         "set-cookie-parser-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/sinon-as-promised/sinon-as-promised.d.ts b/sinon-as-promised/index.d.ts
similarity index 100%
rename from sinon-as-promised/sinon-as-promised.d.ts
rename to sinon-as-promised/index.d.ts
diff --git a/sinon-as-promised/tsconfig.json b/sinon-as-promised/tsconfig.json
index 401bb42813..e0f4115b31 100644
--- a/sinon-as-promised/tsconfig.json
+++ b/sinon-as-promised/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "sinon-as-promised.d.ts",
+        "index.d.ts",
         "sinon-as-promised-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/socket.io-parser/socket.io-parser.d.ts b/socket.io-parser/index.d.ts
similarity index 100%
rename from socket.io-parser/socket.io-parser.d.ts
rename to socket.io-parser/index.d.ts
diff --git a/socket.io-parser/tsconfig.json b/socket.io-parser/tsconfig.json
index 3f1b76a17d..5f4cc707bf 100644
--- a/socket.io-parser/tsconfig.json
+++ b/socket.io-parser/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "socket.io-parser.d.ts",
+        "index.d.ts",
         "socket.io-parser-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/spectacle/spectacle.d.ts b/spectacle/index.d.ts
similarity index 100%
rename from spectacle/spectacle.d.ts
rename to spectacle/index.d.ts
diff --git a/spectacle/tsconfig.json b/spectacle/tsconfig.json
index 3c7af053b3..8744505972 100644
--- a/spectacle/tsconfig.json
+++ b/spectacle/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "spectacle.d.ts",
+        "index.d.ts",
         "spectacle-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/split2/split2.d.ts b/split2/index.d.ts
similarity index 100%
rename from split2/split2.d.ts
rename to split2/index.d.ts
diff --git a/split2/tsconfig.json b/split2/tsconfig.json
index c53b9e6d26..fe7b3061f4 100644
--- a/split2/tsconfig.json
+++ b/split2/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "split2.d.ts",
+        "index.d.ts",
         "split2-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/sqs-consumer/sqs-consumer.d.ts b/sqs-consumer/index.d.ts
similarity index 100%
rename from sqs-consumer/sqs-consumer.d.ts
rename to sqs-consumer/index.d.ts
diff --git a/sqs-consumer/tsconfig.json b/sqs-consumer/tsconfig.json
index b485ab29dd..309e7f7fe2 100644
--- a/sqs-consumer/tsconfig.json
+++ b/sqs-consumer/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "sqs-consumer.d.ts",
+        "index.d.ts",
         "sqs-consumer-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/sqs-producer/sqs-producer.d.ts b/sqs-producer/index.d.ts
similarity index 100%
rename from sqs-producer/sqs-producer.d.ts
rename to sqs-producer/index.d.ts
diff --git a/sqs-producer/tsconfig.json b/sqs-producer/tsconfig.json
index 375eb798b3..12076b1b87 100644
--- a/sqs-producer/tsconfig.json
+++ b/sqs-producer/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "sqs-producer.d.ts",
+        "index.d.ts",
         "sqs-producer-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/ssh2-sftp-client/ssh2-sftp-client.d.ts b/ssh2-sftp-client/index.d.ts
similarity index 100%
rename from ssh2-sftp-client/ssh2-sftp-client.d.ts
rename to ssh2-sftp-client/index.d.ts
diff --git a/ssh2-sftp-client/tsconfig.json b/ssh2-sftp-client/tsconfig.json
index 205f36fe68..c63555d3d9 100644
--- a/ssh2-sftp-client/tsconfig.json
+++ b/ssh2-sftp-client/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "ssh2-sftp-client.d.ts",
+        "index.d.ts",
         "ssh2-sftp-client-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/swagger-express-middleware/swagger-express-middleware.d.ts b/swagger-express-middleware/index.d.ts
similarity index 100%
rename from swagger-express-middleware/swagger-express-middleware.d.ts
rename to swagger-express-middleware/index.d.ts
diff --git a/swagger-express-middleware/tsconfig.json b/swagger-express-middleware/tsconfig.json
index b9091e6829..8b0d9bbded 100644
--- a/swagger-express-middleware/tsconfig.json
+++ b/swagger-express-middleware/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "swagger-express-middleware.d.ts",
+        "index.d.ts",
         "swagger-express-middleware-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/tinder/tinder.d.ts b/tinder/index.d.ts
similarity index 100%
rename from tinder/tinder.d.ts
rename to tinder/index.d.ts
diff --git a/tinder/tsconfig.json b/tinder/tsconfig.json
index 891c7e47a7..4c7ff01101 100644
--- a/tinder/tsconfig.json
+++ b/tinder/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "tinder.d.ts",
+        "index.d.ts",
         "tinder-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/torrent-stream/torrent-stream.d.ts b/torrent-stream/index.d.ts
similarity index 100%
rename from torrent-stream/torrent-stream.d.ts
rename to torrent-stream/index.d.ts
diff --git a/torrent-stream/tsconfig.json b/torrent-stream/tsconfig.json
index d19142a503..b6662c06b2 100644
--- a/torrent-stream/tsconfig.json
+++ b/torrent-stream/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "torrent-stream.d.ts",
+        "index.d.ts",
         "torrent-stream-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/twit/twit.d.ts b/twit/index.d.ts
similarity index 100%
rename from twit/twit.d.ts
rename to twit/index.d.ts
diff --git a/twit/tsconfig.json b/twit/tsconfig.json
index 0b866f484a..aaed4adfad 100644
--- a/twit/tsconfig.json
+++ b/twit/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "twit.d.ts",
+        "index.d.ts",
         "twit-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/v8-profiler/v8-profiler.d.ts b/v8-profiler/index.d.ts
similarity index 100%
rename from v8-profiler/v8-profiler.d.ts
rename to v8-profiler/index.d.ts
diff --git a/v8-profiler/tsconfig.json b/v8-profiler/tsconfig.json
index d7b22ff846..a7f491edce 100644
--- a/v8-profiler/tsconfig.json
+++ b/v8-profiler/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "v8-profiler.d.ts",
+        "index.d.ts",
         "v8-profiler-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/v8-profiler/v8-profiler-tests.ts b/v8-profiler/v8-profiler-tests.ts
index aebaee7a15..635dee085f 100644
--- a/v8-profiler/v8-profiler-tests.ts
+++ b/v8-profiler/v8-profiler-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="v8-profiler.d.ts" />
-
 import * as fs from "fs";
 import * as profiler from "v8-profiler";
 
diff --git a/victory/victory.d.ts b/victory/index.d.ts
similarity index 100%
rename from victory/victory.d.ts
rename to victory/index.d.ts
diff --git a/victory/tsconfig.json b/victory/tsconfig.json
index 35f1bf290d..9da672453f 100644
--- a/victory/tsconfig.json
+++ b/victory/tsconfig.json
@@ -15,7 +15,7 @@
         "jsx": "react"
     },
     "files": [
-        "victory.d.ts",
+        "index.d.ts",
         "victory-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/webpack-dev-server/webpack-dev-server.d.ts b/webpack-dev-server/index.d.ts
similarity index 100%
rename from webpack-dev-server/webpack-dev-server.d.ts
rename to webpack-dev-server/index.d.ts
diff --git a/webpack-dev-server/tsconfig.json b/webpack-dev-server/tsconfig.json
index 2332ded163..c505986fbb 100644
--- a/webpack-dev-server/tsconfig.json
+++ b/webpack-dev-server/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "webpack-dev-server.d.ts",
+        "index.d.ts",
         "webpack-dev-server-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/webpack-dev-server/webpack-dev-server-tests.ts b/webpack-dev-server/webpack-dev-server-tests.ts
index 8761eb9a59..21af59885a 100644
--- a/webpack-dev-server/webpack-dev-server-tests.ts
+++ b/webpack-dev-server/webpack-dev-server-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="webpack-dev-server.d.ts" />
-
 import * as webpack from 'webpack';
 import * as WebpackDevServer from 'webpack-dev-server';
 var compiler = webpack({});
@@ -20,7 +18,7 @@ server = new WebpackDevServer(compiler, {
     // Enable special support for Hot Module Replacement
     // Page is no longer updated, but a "webpackHotUpdate" message is send to the content
     // Use "webpack/hot/dev-server" as additional module in your entry point
-    // Note: this does _not_ add the `HotModuleReplacementPlugin` like the CLI option does. 
+    // Note: this does _not_ add the `HotModuleReplacementPlugin` like the CLI option does.
 
     // Set this as true if you want to access dev server from arbitrary url.
     // This is handy if you are using a html5 router.
diff --git a/webpack-fail-plugin/webpack-fail-plugin.d.ts b/webpack-fail-plugin/index.d.ts
similarity index 100%
rename from webpack-fail-plugin/webpack-fail-plugin.d.ts
rename to webpack-fail-plugin/index.d.ts
diff --git a/webpack-fail-plugin/tsconfig.json b/webpack-fail-plugin/tsconfig.json
index b2dcb556ba..45da9eda05 100644
--- a/webpack-fail-plugin/tsconfig.json
+++ b/webpack-fail-plugin/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "webpack-fail-plugin.d.ts",
+        "index.d.ts",
         "webpack-fail-plugin-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/webpack-merge/webpack-merge.d.ts b/webpack-merge/index.d.ts
similarity index 100%
rename from webpack-merge/webpack-merge.d.ts
rename to webpack-merge/index.d.ts
diff --git a/webpack-merge/tsconfig.json b/webpack-merge/tsconfig.json
index 9a790a0d67..1ac41b1a73 100644
--- a/webpack-merge/tsconfig.json
+++ b/webpack-merge/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "webpack-merge.d.ts",
+        "index.d.ts",
         "webpack-merge-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/webpack-stream/webpack-stream.d.ts b/webpack-stream/index.d.ts
similarity index 100%
rename from webpack-stream/webpack-stream.d.ts
rename to webpack-stream/index.d.ts
diff --git a/webpack-stream/tsconfig.json b/webpack-stream/tsconfig.json
index 22cb00921f..b5b8e7f1bf 100644
--- a/webpack-stream/tsconfig.json
+++ b/webpack-stream/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "webpack-stream.d.ts",
+        "index.d.ts",
         "webpack-stream-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/webpack-validator/webpack-validator.d.ts b/webpack-validator/index.d.ts
similarity index 100%
rename from webpack-validator/webpack-validator.d.ts
rename to webpack-validator/index.d.ts
diff --git a/webpack-validator/tsconfig.json b/webpack-validator/tsconfig.json
index 6361cb196b..eba1923f74 100644
--- a/webpack-validator/tsconfig.json
+++ b/webpack-validator/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "webpack-validator.d.ts",
+        "index.d.ts",
         "webpack-validator-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/why-did-you-update/why-did-you-update.d.ts b/why-did-you-update/index.d.ts
similarity index 100%
rename from why-did-you-update/why-did-you-update.d.ts
rename to why-did-you-update/index.d.ts
diff --git a/why-did-you-update/tsconfig.json b/why-did-you-update/tsconfig.json
index 4ce50757f7..912bd84be8 100644
--- a/why-did-you-update/tsconfig.json
+++ b/why-did-you-update/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "why-did-you-update.d.ts",
+        "index.d.ts",
         "why-did-you-update-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/winston-dynamodb/winston-dynamodb.d.ts b/winston-dynamodb/index.d.ts
similarity index 100%
rename from winston-dynamodb/winston-dynamodb.d.ts
rename to winston-dynamodb/index.d.ts
diff --git a/winston-dynamodb/tsconfig.json b/winston-dynamodb/tsconfig.json
index c5b2035097..ddfaa0fb8c 100644
--- a/winston-dynamodb/tsconfig.json
+++ b/winston-dynamodb/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "winston-dynamodb.d.ts",
+        "index.d.ts",
         "winston-dynamodb-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/xmlpoke/xmlpoke.d.ts b/xmlpoke/index.d.ts
similarity index 100%
rename from xmlpoke/xmlpoke.d.ts
rename to xmlpoke/index.d.ts
diff --git a/xmlpoke/tsconfig.json b/xmlpoke/tsconfig.json
index 7157d9aad3..d2ab396bd2 100644
--- a/xmlpoke/tsconfig.json
+++ b/xmlpoke/tsconfig.json
@@ -13,7 +13,7 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "xmlpoke.d.ts",
+        "index.d.ts",
         "xmlpoke-tests.ts"
     ]
 }
\ No newline at end of file

From cabf8113509bfa84ee3281c693ad5f814d5d03e3 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 13:14:36 -0800
Subject: [PATCH 216/245] Fix angular-sanitive/touchspin, electron,
 eventemitter3 and pg merge

---
 angular-sanitize/angular-sanitize-tests.ts |   2 +-
 angular-sanitize/index.d.ts                |  12 +-
 angular-touchspin/index.d.ts               |  54 +--
 electron/electron.d.ts                     |  10 -
 electron/github-electron-main-tests.ts     |  46 ++
 electron/index.d.ts                        | 476 +++++++++++++++++++--
 eventemitter3/eventemitter3-tests.ts       |   6 +-
 eventemitter3/eventemitter3.d.ts           | 109 -----
 eventemitter3/index.d.ts                   | 111 +++--
 pg/index.d.ts                              |   6 +-
 10 files changed, 577 insertions(+), 255 deletions(-)
 delete mode 100644 electron/electron.d.ts
 delete mode 100644 eventemitter3/eventemitter3.d.ts

diff --git a/angular-sanitize/angular-sanitize-tests.ts b/angular-sanitize/angular-sanitize-tests.ts
index e002bdca37..b093f2bbb0 100644
--- a/angular-sanitize/angular-sanitize-tests.ts
+++ b/angular-sanitize/angular-sanitize-tests.ts
@@ -4,5 +4,5 @@ declare var $sanitizeService: ng.sanitize.ISanitizeService;
 shouldBeString = $sanitizeService(shouldBeString);
 
 declare var $linky: ng.sanitize.filter.ILinky;
-shouldBeString = $linky(shouldBeString);
+shouldBeString = $linky(shouldBeString, "target");
 shouldBeString = $linky(shouldBeString, shouldBeString);
diff --git a/angular-sanitize/index.d.ts b/angular-sanitize/index.d.ts
index 3aedca87cc..59bce54abf 100644
--- a/angular-sanitize/index.d.ts
+++ b/angular-sanitize/index.d.ts
@@ -31,6 +31,14 @@ declare module 'angular' {
             // Supports http/https/ftp/mailto and plain email address links.
             // see http://code.angularjs.org/1.2.0/docs/api/ngSanitize.filter:linky
             interface ILinky {
-            (text: string, target: string, attributes?: { [attribute: string]: string } | ((url: string) => { [attribute: string]: string })): string;
+                (text: string, target: string, attributes?: { [attribute: string]: string } | ((url: string) => { [attribute: string]: string })): string;
+            }
         }
-}
\ No newline at end of file
+        ///////////////////////////////////////////////////////////////////////////////
+        // Extend angular $filter declarations to include filters from angular.sanitize module
+        ///////////////////////////////////////////////////////////////////////////////
+        interface IFilterService {
+            (name: 'linky'): angular.sanitize.filter.ILinky;
+        }
+    }
+}
diff --git a/angular-touchspin/index.d.ts b/angular-touchspin/index.d.ts
index ee670a9af3..01dc3a8cbb 100644
--- a/angular-touchspin/index.d.ts
+++ b/angular-touchspin/index.d.ts
@@ -8,33 +8,35 @@
 declare let angularTouchSpin: string;
 export = angularTouchSpin;
 
-declare namespace angular.touchspin {
-    interface ITouchSpinOptions {
-        min?: number;
-        max?: number;
-        step?: number;
-        decimals?: number;
-        stepInterval?: number;
-        forceStepDivisibility?: string; // none | floor | round | ceil
-        stepIntervalDelay?: number;
-        verticalButtons?: boolean;
-        verticalUpClass?: string;
-        verticalDownClass?: string;
-        initVal?: number;
-        prefix?: string;
-        postfix?: string;
-        prefixExtraClass?: string;
-        postfixExtraClass?: string;
-        mousewheel?: boolean;
-        buttonDownClass?: string;
-        buttonUpClass?: string;
-        buttonDownTxt?: string;
-        buttonUpTxt?: string;
-    }
+declare module "angular" {
+    namespace touchspin {
+        interface ITouchSpinOptions {
+            min?: number;
+            max?: number;
+            step?: number;
+            decimals?: number;
+            stepInterval?: number;
+            forceStepDivisibility?: string; // none | floor | round | ceil
+            stepIntervalDelay?: number;
+            verticalButtons?: boolean;
+            verticalUpClass?: string;
+            verticalDownClass?: string;
+            initVal?: number;
+            prefix?: string;
+            postfix?: string;
+            prefixExtraClass?: string;
+            postfixExtraClass?: string;
+            mousewheel?: boolean;
+            buttonDownClass?: string;
+            buttonUpClass?: string;
+            buttonDownTxt?: string;
+            buttonUpTxt?: string;
+        }
 
-    interface ITouchSpinConfig extends ITouchSpinOptions { }
+        interface ITouchSpinConfig extends ITouchSpinOptions { }
 
-    interface ITouchSpinConfigProvider {
-        defaults(touchSpinOptions: ITouchSpinOptions): void;
+        interface ITouchSpinConfigProvider {
+            defaults(touchSpinOptions: ITouchSpinOptions): void;
+        }
     }
 }
diff --git a/electron/electron.d.ts b/electron/electron.d.ts
deleted file mode 100644
index 5e331b3e47..0000000000
--- a/electron/electron.d.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// Type definitions for electron 1.3.3
-// Project: https://github.com/electron-userland/electron-prebuilt
-// Definitions by: rhysd <https://github.com/rhysd>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare module 'electron' {
-	var electron: string;
-	export = electron;
-}
-
diff --git a/electron/github-electron-main-tests.ts b/electron/github-electron-main-tests.ts
index df5e6723eb..f333e86ec7 100644
--- a/electron/github-electron-main-tests.ts
+++ b/electron/github-electron-main-tests.ts
@@ -9,6 +9,7 @@ import {
 	ipcMain,
 	Menu,
 	MenuItem,
+	net,
 	powerMonitor,
 	powerSaveBlocker,
 	protocol,
@@ -732,6 +733,51 @@ Menu.buildFromTemplate([
 	{ label: '3', position: 'endof=numbers' }
 ]);
 
+// net
+// https://github.com/electron/electron/blob/master/docs/api/net.md
+
+app.on('ready', () => {
+	const request = net.request('https://github.com')
+	request.setHeader('Some-Custom-Header-Name', 'Some-Custom-Header-Value');
+	let header = request.getHeader('Some-Custom-Header-Name');
+	request.removeHeader('Some-Custom-Header-Name');
+	request.on('response', (response) => {
+		console.log(`Status code: ${response.statusCode}`);
+		console.log(`Status message: ${response.statusMessage}`);
+		console.log(`Headers: ${JSON.stringify(response.headers)}`);
+		console.log(`Http version: ${response.httpVersion}`);
+		console.log(`Major Http version: ${response.httpVersionMajor}`);
+		console.log(`Minor Http version: ${response.httpVersionMinor}`);
+		response.on('data', (chunk) => {
+			console.log(`BODY: ${chunk}`);
+		})
+		response.on('end', () => {
+			console.log('No more data in response.');
+		})
+		response.on('error', () => {
+			console.log('"error" event emitted');
+		});
+		response.on('aborted', () => {
+			console.log('"aborted" event emitted');
+		});
+	})
+	request.on('login', (authInfo, callback) => {
+		callback('username', 'password');
+	});
+	request.on('finish', () => {
+		console.log('"finish" event emitted');
+	});
+	request.on('abort', () => {
+		console.log('"abort" event emitted');
+	});
+	request.on('error', () => {
+		console.log('"error" event emitted');
+	});
+	request.write('Hello World!', 'utf-8', () => { });
+	request.end('Hello World!', 'utf-8', () => { });
+	request.abort();
+})
+
 // power-monitor
 // https://github.com/atom/electron/blob/master/docs/api/power-monitor.md
 
diff --git a/electron/index.d.ts b/electron/index.d.ts
index e24716a48d..d55b47df4c 100644
--- a/electron/index.d.ts
+++ b/electron/index.d.ts
@@ -1,28 +1,15 @@
-// Type definitions for Electron v1.3.6
+// Type definitions for Electron v1.4.5
 // Project: http://electron.atom.io/
-// Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>
+// Definitions by: jedmao <https://github.com/jedmao/>, rhysd <https://rhysd.github.io>, Milan Burda <https://github.com/miniak/>, aliib <https://github.com/aliib>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
 declare namespace Electron {
 
-	class EventEmitter extends NodeJS.EventEmitter {
-		addListener(event: string, listener: Function): this;
-		on(event: string, listener: Function): this;
-		once(event: string, listener: Function): this;
-		removeListener(event: string, listener: Function): this;
-		removeAllListeners(event?: string): this;
-		setMaxListeners(n: number): this;
-		getMaxListeners(): number;
-		listeners(event: string): Function[];
-		emit(event: string, ...args: any[]): boolean;
-		listenerCount(type: string): number;
-	}
-
 	interface Event {
 		preventDefault: Function;
-		sender: EventEmitter;
+		sender: NodeJS.EventEmitter;
 	}
 
 	type Point = {
@@ -42,6 +29,17 @@ declare namespace Electron {
 		height: number;
 	}
 
+	interface Destroyable {
+		/**
+		 * Destroys the object.
+		 */
+		destroy(): void;
+		/**
+		 * @returns Whether the object is destroyed.
+		 */
+		isDestroyed(): boolean;
+	}
+
 	// https://github.com/electron/electron/blob/master/docs/api/app.md
 
 	/**
@@ -176,7 +174,7 @@ declare namespace Electron {
 		/**
 		 * Emitted when the gpu process crashes.
 		 */
-		on(event: 'gpu-process-crashed', listener: Function): this;
+		on(event: 'gpu-process-crashed', listener: (event: Event, killed: boolean) => void): this;
 		/**
 		 * Emitted when Chrome's accessibility support changes.
 		 *
@@ -425,6 +423,13 @@ declare namespace Electron {
 		 * Note: This API is only available on macOS and Windows.
 		 */
 		setLoginItemSettings(settings: LoginItemSettings): void;
+		/**
+		 * Set the about panel options. This will override the values defined in the app's .plist file.
+		 * See the Apple docs for more details.
+		 *
+		 * Note: This API is only available on macOS.
+		 */
+		setAboutPanelOptions(options: AboutPanelOptions): void;
 		commandLine: CommandLine;
 		/**
 		 * Note: This API is only available on macOS.
@@ -686,6 +691,29 @@ declare namespace Electron {
 		restoreState?: boolean;
 	}
 
+	interface AboutPanelOptions {
+		/**
+		 * The app's name.
+		 */
+		applicationName?: string;
+		/**
+		 * The app's version.
+		 */
+		applicationVersion?: string;
+		/**
+		 * Copyright information.
+		 */
+		copyright?: string;
+		/**
+		 * Credit information.
+		 */
+		credits?: string;
+		/**
+		 * The app's build version number.
+		 */
+		version?: string;
+	}
+
 	// https://github.com/electron/electron/blob/master/docs/api/auto-updater.md
 
 	/**
@@ -740,7 +768,7 @@ declare namespace Electron {
 	 * The BrowserWindow class gives you ability to create a browser window.
 	 * You can also create a window without chrome by using Frameless Window API.
 	 */
-	class BrowserWindow extends EventEmitter {
+	class BrowserWindow extends NodeJS.EventEmitter implements Destroyable {
 		/**
 		 * Emitted when the document changed its title,
 		 * calling event.preventDefault() would prevent the native window’s title to change.
@@ -841,6 +869,11 @@ declare namespace Electron {
 		 * Note: This is only implemented on macOS.
 		 */
 		on(event: 'scroll-touch-end', listener: Function): this;
+		/**
+		 * Emitted when scroll wheel event phase filed upon reaching the edge of element.
+		 * Note: This is only implemented on macOS.
+		 */
+		on(event: 'scroll-touch-edge', listener: Function): this;
 		/**
 		 * Emitted on 3-finger swipe.
 		 * Note: This is only implemented on macOS.
@@ -1099,7 +1132,7 @@ declare namespace Electron {
 		 * setting this, the window is still a normal window, not a toolbox window
 		 * which can not be focused on.
 		 */
-		setAlwaysOnTop(flag: boolean): void;
+		setAlwaysOnTop(flag: boolean, level?: WindowLevel): void;
 		/**
 		 * @returns Whether the window is always on top of other windows.
 		 */
@@ -1352,8 +1385,8 @@ declare namespace Electron {
 		getChildWindows(): BrowserWindow[];
 	}
 
+	type WindowLevel = 'normal' | 'floating' | 'torn-off-menu' | 'modal-panel' | 'main-menu' | 'status' | 'pop-up-menu' | 'screen-saver' | 'dock';
 	type SwipeDirection = 'up' | 'right' | 'down' | 'left';
-
 	type ThumbarButtonFlags = 'enabled' | 'disabled' | 'dismissonclick' | 'nobackground' | 'hidden' | 'noninteractive';
 
 	interface ThumbarButton {
@@ -1533,6 +1566,11 @@ declare namespace Electron {
 		 * Default: false.
 		 */
 		offscreen?: boolean;
+		/**
+		 * Whether to enable Chromium OS-level sandbox.
+		 * Default: false.
+		 */
+		sandbox?: boolean;
 	}
 
 	interface BrowserWindowOptions {
@@ -2527,7 +2565,7 @@ declare namespace Electron {
 	 *
 	 * Each menu consists of multiple menu items, and each menu item can have a submenu.
 	 */
-	class Menu extends EventEmitter {
+	class Menu extends NodeJS.EventEmitter {
 		/**
 		 * Creates a new menu.
 		 */
@@ -2589,6 +2627,7 @@ declare namespace Electron {
 		static createEmpty(): NativeImage;
 		/**
 		 * Creates a new NativeImage instance from file located at path.
+		 * This method returns an empty image if the path does not exist, cannot be read, or is not a valid image.
 		 */
 		static createFromPath(path: string): NativeImage;
 		/**
@@ -2621,7 +2660,7 @@ declare namespace Electron {
 		 */
 		getBitmap(): Buffer;
 		/**
-		 * @returns string The data URL of the image.
+		 * @returns The data URL of the image.
 		 */
 		toDataURL(): string;
 		/**
@@ -2631,11 +2670,11 @@ declare namespace Electron {
 		 */
 		getNativeHandle(): Buffer;
 		/**
-		 * @returns boolean Whether the image is empty.
+		 * @returns Whether the image is empty.
 		 */
 		isEmpty(): boolean;
 		/**
-		 * @returns {} The size of the image.
+		 * @returns The size of the image.
 		 */
 		getSize(): Size;
 		/**
@@ -2648,6 +2687,247 @@ declare namespace Electron {
 		isTemplateImage(): boolean;
 	}
 
+	// https://github.com/electron/electron/blob/master/docs/api/net.md
+
+	/**
+	 * The net module is a client-side API for issuing HTTP(S) requests.
+	 * It is similar to the HTTP and HTTPS modules of Node.js but uses Chromium’s native
+	 * networking library instead of the Node.js implementation, offering better support
+	 * for web proxies.
+	 * The following is a non-exhaustive list of why you may consider using the net module
+	 * instead of the native Node.js modules:
+	 * - Automatic management of system proxy configuration, support of the wpad protocol
+	 * and proxy pac configuration files.
+	 * - Automatic tunneling of HTTPS requests.
+	 * - Support for authenticating proxies using basic, digest, NTLM, Kerberos or negotiate
+	 * authentication schemes.
+	 * - Support for traffic monitoring proxies: Fiddler-like proxies used for access control
+	 * and monitoring.
+	 *
+	 * The net module API has been specifically designed to mimic, as closely as possible,
+	 * the familiar Node.js API. The API components including classes, methods,
+	 * properties and event names are similar to those commonly used in Node.js.
+	 *
+	 * The net API can be used only after the application emits the ready event.
+	 * Trying to use the module before the ready event will throw an error.
+	 */
+	interface Net extends NodeJS.EventEmitter {
+		/**
+		 * @param options The ClientRequest constructor options.
+		 * @param callback A one time listener for the response event.
+		 *
+		 * @returns a ClientRequest instance using the provided options which are directly
+		 * forwarded to the ClientRequest constructor.
+		 */
+		request(options: string | RequestOptions, callback?: (response: IncomingMessage) => void): ClientRequest;
+	}
+
+	/**
+	 * The RequestOptions interface allows to define various options for an HTTP request.
+	 */
+	interface RequestOptions {
+		/**
+		 * The HTTP request method. Defaults to the GET method.
+		 */
+		method?: string;
+		/**
+		 * The request URL. Must be provided in the absolute form with the protocol
+		 * scheme specified as http or https.
+		 */
+		url?: string;
+		/**
+		 * The Session instance with which the request is associated.
+		 */
+		session?: Session;
+		/**
+		 * The name of the partition with which the request is associated.
+		 * Defaults to the empty string. The session option prevails on partition.
+		 * Thus if a session is explicitly specified, partition is ignored.
+		 */
+		partition?: string;
+		/**
+		 * The protocol scheme in the form ‘scheme:’. Currently supported values are ‘http:’ or ‘https:’.
+		 * Defaults to ‘http:’.
+		 */
+		Protocol?: 'http:' | 'https:';
+		/**
+		 * The server host provided as a concatenation of the hostname and the port number ‘hostname:port’.
+		 */
+		host?: string;
+		/**
+		 * The server host name.
+		 */
+		hostname?: string;
+		/**
+		 * The server’s listening port number.
+		 */
+		port?: number;
+		/**
+		 * The path part of the request URL.
+		 */
+		path?: string;
+		/**
+		 * A map specifying extra HTTP header name/value.
+		 */
+		headers?: { [key: string]: any };
+	}
+
+	/**
+	 * The ClientRequest class represents an HTTP request.
+	 */
+	class ClientRequest extends NodeJS.EventEmitter {
+		/**
+		 * Emitted when an HTTP response is received for the request. 
+		 */
+		on(event: 'response', listener: (response: IncomingMessage) => void): this;
+		/**
+		 * Emitted when an authenticating proxy is asking for user credentials.
+		 * The callback function is expected to be called back with user credentials.
+		 * Providing empty credentials will cancel the request and report an authentication
+		 * error on the response object.
+		 */
+		on(event: 'login', listener: (authInfo: LoginAuthInfo, callback: (username?: string, password?: string) => void) => void): this;
+		/**
+		 * Emitted just after the last chunk of the request’s data has been written into
+		 * the request object.
+		 */
+		on(event: 'finish', listener: () => void): this;
+		/**
+		 * Emitted when the request is aborted. The abort event will not be fired if the
+		 * request is already closed.
+		 */
+		on(event: 'abort', listener: () => void): this;
+		/**
+		 * Emitted when the net module fails to issue a network request.
+		 * Typically when the request object emits an error event, a close event will
+		 * subsequently follow and no response object will be provided.
+		 */
+		on(event: 'error', listener: (error: Error) => void): this;
+		/**
+		 * Emitted as the last event in the HTTP request-response transaction.
+		 * The close event indicates that no more events will be emitted on either the
+		 * request or response objects.
+		 */
+		on(event: 'close', listener: () => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * A Boolean specifying whether the request will use HTTP chunked transfer encoding or not.
+		 * Defaults to false. The property is readable and writable, however it can be set only before
+		 * the first write operation as the HTTP headers are not yet put on the wire.
+		 * Trying to set the chunkedEncoding property after the first write will throw an error.
+		 *
+		 * Using chunked encoding is strongly recommended if you need to send a large request
+		 * body as data will be streamed in small chunks instead of being internally buffered
+		 * inside Electron process memory.
+		 */
+		chunkedEncoding: boolean;
+		/**
+		 * @param options If options is a String, it is interpreted as the request URL.
+		 * If it is an object, it is expected to be a RequestOptions.
+		 * @param callback A one time listener for the response event.
+		 */
+		constructor(options: string | RequestOptions, callback?: (response: IncomingMessage) => void);
+		/**
+		 * Adds an extra HTTP header. The header name will issued as it is without lowercasing.
+		 * It can be called only before first write. Calling this method after the first write
+		 * will throw an error.
+		 * @param name An extra HTTP header name.
+		 * @param value An extra HTTP header value.
+		 */
+		setHeader(name: string, value: string): void;
+		/**
+		 * @param name Specify an extra header name.
+		 * @returns The value of a previously set extra header name.
+		 */
+		getHeader(name: string): string;
+		/**
+		 * Removes a previously set extra header name. This method can be called only before first write.
+		 * Trying to call it after the first write will throw an error.
+		 * @param name Specify an extra header name.
+		 */
+		removeHeader(name: string): void;
+		/**
+		 * Adds a chunk of data to the request body. The first write operation may cause the
+		 * request headers to be issued on the wire.
+		 * After the first write operation, it is not allowed to add or remove a custom header.
+		 * @param chunk A chunk of the request body’s data. If it is a string, it is converted
+		 * into a Buffer using the specified encoding.
+		 * @param encoding Used to convert string chunks into Buffer objects. Defaults to ‘utf-8’.
+		 * @param callback Called after the write operation ends.
+		 */
+		write(chunk: string | Buffer, encoding?: string, callback?: Function): boolean;
+		/**
+		 * Sends the last chunk of the request data. Subsequent write or end operations will not be allowed.
+		 * The finish event is emitted just after the end operation.
+		 * @param chunk A chunk of the request body’s data. If it is a string, it is converted into
+		 * a Buffer using the specified encoding.
+		 * @param encoding Used to convert string chunks into Buffer objects. Defaults to ‘utf-8’.
+		 * @param callback Called after the write operation ends.
+		 *
+		 */
+		end(chunk?: string | Buffer, encoding?: string, callback?: Function): boolean;
+		/**
+		 * Cancels an ongoing HTTP transaction. If the request has already emitted the close event,
+		 * the abort operation will have no effect.
+		 * Otherwise an ongoing event will emit abort and close events.
+		 * Additionally, if there is an ongoing response object,it will emit the aborted event.
+		 */
+		abort(): void
+	}
+
+	/**
+	 * An IncomingMessage represents an HTTP response.
+	 */
+	interface IncomingMessage extends NodeJS.ReadableStream {
+		/**
+		 * The data event is the usual method of transferring response data into applicative code.
+		 */
+		on(event: 'data', listener: (chunk: Buffer) => void): this;
+		/**
+		 * Indicates that response body has ended.
+		 */
+		on(event: 'end', listener: () => void): this;
+		/**
+		 * Emitted when a request has been canceled during an ongoing HTTP transaction.
+		 */
+		on(event: 'aborted', listener: () => void): this;
+		/**
+		 * Emitted when an error was encountered while streaming response data events.
+		 * For instance, if the server closes the underlying while the response is still
+		 * streaming, an error event will be emitted on the response object and a close
+		 * event will subsequently follow on the request object.
+		 */
+		on(event: 'error', listener: (error: Error) => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * An Integer indicating the HTTP response status code.
+		 */
+		statusCode: number;
+		/**
+		 * A String representing the HTTP status message.
+		 */
+		statusMessage: string;
+		/**
+		 * An object representing the response HTTP headers. The headers object is formatted as follows:
+		 * - All header names are lowercased.
+		 * - Each header name produces an array-valued property on the headers object.
+		 * - Each header value is pushed into the array associated with its header name.
+		 */
+		headers: Headers;
+		/**
+		 * A string indicating the HTTP protocol version number. Typical values are ‘1.0’ or ‘1.1’.
+		 */
+		httpVersion: string;
+		/**
+		 * An integer-valued read-only property that returns the HTTP major version number.
+		 */
+		httpVersionMajor: number;
+		/**
+		 * An integer-valued read-only property that returns the HTTP minor version number.
+		 */
+		httpVersionMinor: number;
+	}
+
 	// https://github.com/electron/electron/blob/master/docs/api/power-monitor.md
 
 	/**
@@ -2683,7 +2963,7 @@ declare namespace Electron {
 	interface PowerSaveBlocker {
 		/**
 		 * Starts preventing the system from entering lower-power mode.
-		 * @returns an integer identifying the power save blocker.
+		 * @returns The blocker ID that is assigned to this power blocker.
 		 * Note: prevent-display-sleep has higher has precedence over prevent-app-suspension.
 		 */
 		start(type: 'prevent-app-suspension' | 'prevent-display-sleep'): number;
@@ -2694,7 +2974,7 @@ declare namespace Electron {
 		stop(id: number): void;
 		/**
 		 * @param id The power save blocker id returned by powerSaveBlocker.start.
-		 * @returns a boolean whether the corresponding powerSaveBlocker has started.
+		 * @returns Whether the corresponding powerSaveBlocker has started.
 		 */
 		isStarted(id: number): boolean;
 	}
@@ -2769,8 +3049,18 @@ declare namespace Electron {
 		referrer: string;
 		method: string;
 		uploadData?: {
+			/**
+			 * Content being sent.
+			 */
 			bytes: Buffer,
-			file: string
+			/**
+			 * Path of file being uploaded.
+			 */
+			file: string,
+			/**
+			 * UUID of blob data. Use session.getBlobData method to retrieve the data.
+			 */
+			blobUUID: string;
 		}[];
 	}
 
@@ -2801,7 +3091,7 @@ declare namespace Electron {
 	interface StringProtocolCallback extends ProtocolCallback {
 		(str: string): void;
 		(obj: {
-			data: Buffer,
+			data: string,
 			mimeType: string,
 			charset?: string
 		}): void;
@@ -2924,7 +3214,7 @@ declare namespace Electron {
 	 * You can also access the session of existing pages by using
 	 * the session property of webContents which is a property of BrowserWindow.
 	 */
-	class Session extends EventEmitter {
+	class Session extends NodeJS.EventEmitter {
 		/**
 		 * @returns a new Session instance from partition string.
 		 */
@@ -3016,6 +3306,10 @@ declare namespace Electron {
 		 * @returns The user agent for this session.
 		 */
 		getUserAgent(): string;
+		/**
+		 * Returns the blob data associated with the identifier.
+		 */
+		getBlobData(identifier: string, callback: (result: Buffer) => void): void;
 		/**
 		 * The webRequest API set allows to intercept and modify contents of a request at various stages of its lifetime.
 		 */
@@ -3116,6 +3410,11 @@ declare namespace Electron {
 	}
 
 	interface Cookie {
+		/**
+		 * Emitted when a cookie is changed because it was added, edited, removed, or expired.
+		 */
+		on(event: 'changed', listener: (event: Event, cookie: Cookie, cause: CookieChangedCause) => void): this;
+		on(event: string, listener: Function): this;
 		/**
 		 * The name of the cookie.
 		 */
@@ -3155,6 +3454,8 @@ declare namespace Electron {
 		expirationDate?: number;
 	}
 
+	type CookieChangedCause = 'explicit' | 'overwrite' | 'expired' | 'evicted' | 'expired-overwrite';
+
 	interface CookieDetails {
 		/**
 		 * The URL associated with the cookie.
@@ -3317,6 +3618,10 @@ declare namespace Electron {
 			 * Path of file being uploaded.
 			 */
 			file: string;
+			/**
+			 * UUID of blob data. Use session.getBlobData method to retrieve the data.
+			 */
+			blobUUID: string;
 		}
 
 		interface BeforeRequestDetails extends Details {
@@ -3491,18 +3796,69 @@ declare namespace Electron {
 
 	// https://github.com/electron/electron/blob/master/docs/api/system-preferences.md
 
+	type SystemColor =
+		'3d-dark-shadow' |            // Dark shadow for three-dimensional display elements.
+		'3d-face' |                   // Face color for three-dimensional display elements and for dialog box backgrounds.
+		'3d-highlight' |              // Highlight color for three-dimensional display elements.
+		'3d-light' |                  // Light color for three-dimensional display elements.
+		'3d-shadow' |                 // Shadow color for three-dimensional display elements.
+		'active-border' |             // Active window border.
+		'active-caption' |            // Active window title bar. Specifies the left side color in the color gradient of an active window's title bar if the gradient effect is enabled.
+		'active-caption-gradient' |   // Right side color in the color gradient of an active window's title bar.
+		'app-workspace' |             // Background color of multiple document interface (MDI) applications.
+		'button-text' |               // Text on push buttons.
+		'caption-text' |              // Text in caption, size box, and scroll bar arrow box.
+		'desktop' |                   // Desktop background color.
+		'disabled-text' |             // Grayed (disabled) text.
+		'highlight' |                 // Item(s) selected in a control.
+		'highlight-text' |            // Text of item(s) selected in a control.
+		'hotlight' |                  // Color for a hyperlink or hot-tracked item.
+		'inactive-border' |           // Inactive window border.
+		'inactive-caption' |          // Inactive window caption. Specifies the left side color in the color gradient of an inactive window's title bar if the gradient effect is enabled.
+		'inactive-caption-gradient' | // Right side color in the color gradient of an inactive window's title bar.
+		'inactive-caption-text' |     // Color of text in an inactive caption.
+		'info-background' |           // Background color for tooltip controls.
+		'info-text' |                 // Text color for tooltip controls.
+		'menu' |                      // Menu background.
+		'menu-highlight' |            // The color used to highlight menu items when the menu appears as a flat menu.
+		'menubar' |                   // The background color for the menu bar when menus appear as flat menus.
+		'menu-text' |                 // Text in menus.
+		'scrollbar' |                 // Scroll bar gray area.
+		'window' |                    // Window background.
+		'window-frame' |              // Window frame.
+		'window-text'; // Text in windows.
+
 	/**
 	 * Get system preferences.
 	 */
 	interface SystemPreferences {
 		/**
-		 * @returns If the system is in Dark Mode.
+		 * Note: This is only implemented on Windows.
+		 */
+		on(event: 'accent-color-changed', listener: (event: Event, newColor: string) => void): this;
+		/**
+		 * Note: This is only implemented on Windows.
+		 */
+		on(event: 'color-changed', listener: (event: Event) => void): this;
+		/**
+		 * Note: This is only implemented on Windows.
+		 */
+		on(event: 'inverted-color-scheme-changed', listener: (
+			event: Event,
+			/**
+			 * @param invertedColorScheme true if an inverted color scheme, such as a high contrast theme, is being used, false otherwise.
+			 */
+			invertedColorScheme: boolean
+		) => void): this;
+		on(event: string, listener: Function): this;
+		/**
+		 * @returns Whether the system is in Dark Mode.
 		 *
 		 * Note: This is only implemented on macOS.
 		 */
 		isDarkMode(): boolean;
 		/**
-		 * @returns If the Swipe between pages setting is on.
+		 * @returns Whether the Swipe between pages setting is on.
 		 *
 		 * Note: This is only implemented on macOS.
 		 */
@@ -3549,13 +3905,29 @@ declare namespace Electron {
 		 */
 		getUserDefault(key: string, type: 'string' | 'boolean' | 'integer' | 'float' | 'double' | 'url' | 'array' | 'dictionary'): any;
 		/**
-		 * This method returns true if DWM composition (Aero Glass) is enabled,
-		 * and false otherwise. You can use it to determine if you should create
-		 * a transparent window or not (transparent windows won’t work correctly when DWM composition is disabled).
+		 * @returns Whether DWM composition (Aero Glass) is enabled.
 		 *
 		 * Note: This is only implemented on Windows.
 		 */
 		isAeroGlassEnabled(): boolean;
+		/**
+		 * @returns The users current system wide color preference in the form of an RGBA hexadecimal string.
+		 *
+		 * Note: This is only implemented on Windows.
+		 */
+		getAccentColor(): string;
+		/**
+		 * @returns true if an inverted color scheme, such as a high contrast theme, is active, false otherwise.
+		 *
+		 * Note: This is only implemented on Windows.
+		 */
+		isInvertedColorScheme(): boolean;
+		/**
+		 * @returns The system color setting in RGB hexadecimal form (#ABCDEF). See the Windows docs for more details.
+		 *
+		 * Note: This is only implemented on Windows.
+		 */
+		getColor(color: SystemColor): string;
 	}
 
 	// https://github.com/electron/electron/blob/master/docs/api/tray.md
@@ -3563,7 +3935,7 @@ declare namespace Electron {
 	/**
 	 * A Tray represents an icon in an operating system's notification area.
 	 */
-	interface Tray extends NodeJS.EventEmitter {
+	class Tray extends NodeJS.EventEmitter implements Destroyable {
 		/**
 		 * Emitted when the tray icon is clicked.
 		 * Note: The bounds payload is only implemented on macOS and Windows.
@@ -3628,7 +4000,7 @@ declare namespace Electron {
 		/**
 		 * Creates a new tray icon associated with the image.
 		 */
-		new(image: NativeImage|string): Tray;
+		constructor(image: NativeImage|string);
 		/**
 		 * Destroys the tray icon immediately.
 		 */
@@ -3679,6 +4051,10 @@ declare namespace Electron {
 		 * @returns The bounds of this tray icon.
 		 */
 		getBounds(): Rectangle;
+		/**
+		 * @returns Whether the tray icon is destroyed.
+		 */
+		isDestroyed(): boolean;
 	}
 
 	interface Modifiers {
@@ -3822,7 +4198,7 @@ declare namespace Electron {
 		/**
 		 * Emitted when the renderer process has crashed.
 		 */
-		on(event: 'crashed', listener: Function): this;
+		on(event: 'crashed', listener: (event: Event, killed: boolean) => void): this;
 		/**
 		 * Emitted when a plugin process has crashed.
 		 */
@@ -3934,9 +4310,13 @@ declare namespace Electron {
 		 */
 		getTitle(): string;
 		/**
-		 * @returns The favicon of the web page.
+		 * @returns Whether the web page is destroyed.
 		 */
-		getFavicon(): NativeImage;
+		isDestroyed(): boolean;
+		/**
+		 * @returns Whether the web page is focused.
+		 */
+		isFocused(): boolean;
 		/**
 		 * @returns Whether web page is still loading resources.
 		 */
@@ -4237,6 +4617,10 @@ declare namespace Electron {
 		 * If offscreen rendering is enabled returns the current frame rate.
 		 */
 		getFrameRate(): number;
+		/**
+		 * If offscreen rendering is enabled invalidates the frame and generates a new one through the 'paint' event.
+		 */
+		invalidate(): void;
 		/**
 		 * Sets the item as dragging item for current drag-drop operation.
 		 */
@@ -4438,7 +4822,7 @@ declare namespace Electron {
 		[key: string]: string;
 	}
 
-	type NewWindowDisposition = 'default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'other';
+	type NewWindowDisposition = 'default' | 'foreground-tab' | 'background-tab' | 'new-window' | 'save-to-disk' | 'other';
 
 	/**
 	 * Specifies the action to take place when ending webContents.findInPage request.
@@ -4881,6 +5265,15 @@ declare namespace Electron {
 		 * A list of strings which specifies the blink features to be disabled separated by ,.
 		 */
 		disableblinkfeatures: string;
+		/**
+		 * A value that links the webview to a specific webContents.
+		 * When a webview first loads a new webContents is created and this attribute is set
+		 * to its instance identifier. Setting this attribute on a new or existing webview connects
+		 * it to the existing webContents that currently renders in a different webview.
+		 *
+		 * The existing webview will see the destroy event and will then create a new webContents when a new url is loaded.
+		 */
+		guestinstance: string;
 		/**
 		 * Loads the url in the webview, the url must contain the protocol prefix, e.g. the http:// or file://.
 		 */
@@ -5413,13 +5806,14 @@ declare namespace Electron {
 		globalShortcut: Electron.GlobalShortcut;
 		Menu: typeof Electron.Menu;
 		MenuItem: typeof Electron.MenuItem;
+		net: Electron.Net;
 		powerMonitor: Electron.PowerMonitor;
 		powerSaveBlocker: Electron.PowerSaveBlocker;
 		protocol: Electron.Protocol;
 		screen: Electron.Screen;
 		session: typeof Electron.Session;
 		systemPreferences: Electron.SystemPreferences;
-		Tray: Electron.Tray;
+		Tray: typeof Electron.Tray;
 		webContents: Electron.WebContentsStatic;
 	}
 
diff --git a/eventemitter3/eventemitter3-tests.ts b/eventemitter3/eventemitter3-tests.ts
index e8d28c1201..4e531a8010 100644
--- a/eventemitter3/eventemitter3-tests.ts
+++ b/eventemitter3/eventemitter3-tests.ts
@@ -1,10 +1,6 @@
-///<reference types="node" />
-///<reference types="mocha" />
-///<reference types="eventemitter3" />
-
 'use strict';
 
-import EventEmitter = require('eventemitter3');
+import * as EventEmitter from 'eventemitter3';
 
 const eventName = 'test';
 const eventSymbol = Symbol('test');
diff --git a/eventemitter3/eventemitter3.d.ts b/eventemitter3/eventemitter3.d.ts
deleted file mode 100644
index 96af62c94b..0000000000
--- a/eventemitter3/eventemitter3.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-// Type definitions for EventEmitter3 1.2.0
-// Project: https://github.com/primus/eventemitter3
-// Definitions by: Yuichi Murata <https://github.com/mrk21>, Leon Yu <https://github.com/leonyu>, Boriss Nazarovs <https://github.com/Stubb0rn>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-declare namespace EventEmitter3 {
-    /**
-     * Minimal EventEmitter interface that is molded against the Node.js
-     * EventEmitter interface.
-     */
-    class EventEmitter {
-        constructor();
-
-        /**
-         * Return an array listing the events for which the emitter has registered listeners.
-         *
-         * @returns {(string|symbol)[]}
-         */
-        eventNames(): (string|symbol)[];
-
-        /**
-         * Return the listeners registered for a given event.
-         *
-         * @param {(string|symbol)} event The event name.
-         * @returns {Function[]}
-         */
-        listeners(event: string|symbol): Function[];
-
-        /**
-         * Check if there listeners for a given event.
-         * If `exists` argument is not `true` lists listeners.
-         *
-         * @param {(string|symbol)} event The event name.
-         * @param {boolean} exists Only check if there are listeners.
-         * @returns {boolean}
-         */
-        listeners(event: string|symbol, exists: boolean): boolean;
-
-        /**
-         * Calls each of the listeners registered for a given event.
-         *
-         * @param {(string|symbol)} event The event name.
-         * @param {...*} args Arguments that are passed to registered listeners
-         * @returns {boolean} `true` if the event had listeners, else `false`.
-         */
-        emit(event: string|symbol, ...args: any[]): boolean;
-
-        /**
-         * Add a listener for a given event.
-         *
-         * @param {(string|symbol)} event The event name.
-         * @param {Function} fn The listener function.
-         * @param {*} [context=this] The context to invoke the listener with.
-         * @returns {EventEmitter} `this`.
-         */
-        on(event: string|symbol, fn: Function, context?: any): this;
-
-        /**
-         * Add a one-time listener for a given event.
-         *
-         * @param {(string|symbol)} event The event name.
-         * @param {Function} fn The listener function.
-         * @param {*} [context=this] The context to invoke the listener with.
-         * @returns {EventEmitter} `this`.
-         */
-        once(event: string|symbol, fn: Function, context?: any): this;
-
-        /**
-         * Remove the listeners of a given event.
-         *
-         * @param {(string|symbol)} event The event name.
-         * @param {Function} fn Only remove the listeners that match this function.
-         * @param {*} context Only remove the listeners that have this context.
-         * @param {boolean} once Only remove one-time listeners.
-         * @returns {EventEmitter} `this`.
-         */
-        removeListener(event: string|symbol, fn?: Function, context?: any, once?: boolean): this;
-
-        /**
-         * Remove all listeners, or those of the specified event.
-         *
-         * @param {(string|symbol)} event The event name.
-         * @returns {EventEmitter} `this`.
-         */
-        removeAllListeners(event?: string|symbol): this;
-
-        /**
-         * Alias method for `removeListener`
-         */
-        off(event: string|symbol, fn?: Function, context?: any, once?: boolean): this;
-
-        /**
-         * Alias method for `on`
-         */
-        addListener(event: string|symbol, fn: Function, context?: any): this;
-
-        /**
-         * This function doesn't apply anymore.
-         * @deprecated
-         */
-        setMaxListeners(): this;
-
-        static prefixed: string|boolean;
-    }
-}
-
-declare module 'eventemitter3' {
-    export = EventEmitter3.EventEmitter;
-}
diff --git a/eventemitter3/index.d.ts b/eventemitter3/index.d.ts
index 31ede80c21..9c1fe2397e 100644
--- a/eventemitter3/index.d.ts
+++ b/eventemitter3/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for EventEmitter3 1.1.1
+// Type definitions for EventEmitter3 1.2.0
 // Project: https://github.com/primus/eventemitter3
-// Definitions by: Yuichi Murata <https://github.com/mrk21>, Leon Yu <https://github.com/leonyu>
+// Definitions by: Yuichi Murata <https://github.com/mrk21>, Leon Yu <https://github.com/leonyu>, Boriss Nazarovs <https://github.com/Stubb0rn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = EventEmitter;
@@ -10,6 +10,10 @@ declare namespace EventEmitter {
 }
 
 type self = EventEmitter;
+/**
+ * Minimal EventEmitter interface that is molded against the Node.js
+ * EventEmitter interface.
+ */
 declare class EventEmitter {
     static prefixed: string | boolean;
 
@@ -28,96 +32,91 @@ declare class EventEmitter {
     constructor();
 
     /**
-     * Return a list of assigned event listeners.
+     * Return an array listing the events for which the emitter has registered listeners.
      *
-     * @param {String} event The events that should be listed.
-     * @returns {Array}
-     * @api public
+     * @returns {(string | symbol)[]}
      */
-    listeners(event?: string): Function[];
+    eventNames(): (string | symbol)[];
 
     /**
-     * Return a list of assigned event listeners.
+     * Return the listeners registered for a given event.
      *
-     * @param {String} event The events that should be listed.
-     * @param {Boolean} exists We only need to know if there are listeners.
-     * @returns {Boolean}
-     * @api public
+     * @param {(string | symbol)} event The event name.
+     * @returns {Function[]}
      */
-    listeners(event: string, param: boolean): boolean;
+    listeners(event: string | symbol): Function[];
 
     /**
-     * Emit an event to all registered event listeners.
+     * Check if there listeners for a given event.
+     * If `exists` argument is not `true` lists listeners.
      *
-     * @param {String} event The name of the event.
-     * @returns {Boolean} Indication if we've emitted an event.
-     * @api public
+     * @param {(string | symbol)} event The event name.
+     * @param {boolean} exists Only check if there are listeners.
+     * @returns {boolean}
      */
-    emit(event: string, ...args: any[]): boolean;
+    listeners(event: string | symbol, exists: boolean): boolean;
 
     /**
-     * Register a new EventListener for the given event.
+     * Calls each of the listeners registered for a given event.
      *
-     * @param {String} event Name of the event.
-     * @param {Function} fn Callback function.
-     * @param {Mixed} [context=this] The context of the function.
-     * @api public
+     * @param {(string | symbol)} event The event name.
+     * @param {...*} args Arguments that are passed to registered listeners
+     * @returns {boolean} `true` if the event had listeners, else `false`.
      */
-    on(event: string, fn: Function, context?: any): EventEmitter;
+    emit(event: string | symbol, ...args: any[]): boolean;
 
     /**
-     * Add an EventListener that's only called once.
+     * Add a listener for a given event.
      *
-     * @param {String} event Name of the event.
-     * @param {Function} fn Callback function.
-     * @param {Mixed} [context=this] The context of the function.
-     * @api public
+     * @param {(string | symbol)} event The event name.
+     * @param {Function} fn The listener function.
+     * @param {*} [context=this] The context to invoke the listener with.
+     * @returns {EventEmitter} `this`.
      */
-    once(event: string, fn: Function, context?: any): EventEmitter;
+    on(event: string | symbol, fn: Function, context?: any): this;
 
     /**
-     * Remove event listeners.
+     * Add a one-time listener for a given event.
      *
-     * @param {String} event The event we want to remove.
-     * @param {Function} fn The listener that we need to find.
-     * @param {Mixed} context Only remove listeners matching this context.
-     * @param {Boolean} once Only remove once listeners.
-     * @api public
+     * @param {(string | symbol)} event The event name.
+     * @param {Function} fn The listener function.
+     * @param {*} [context=this] The context to invoke the listener with.
+     * @returns {EventEmitter} `this`.
      */
-    removeListener(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
+    once(event: string | symbol, fn: Function, context?: any): this;
 
     /**
-     * Remove all listeners or only the listeners for the specified event.
+     * Remove the listeners of a given event.
      *
-     * @param {String} event The event want to remove all listeners for.
-     * @api public
+     * @param {(string | symbol)} event The event name.
+     * @param {Function} fn Only remove the listeners that match this function.
+     * @param {*} context Only remove the listeners that have this context.
+     * @param {boolean} once Only remove one-time listeners.
+     * @returns {EventEmitter} `this`.
      */
-    removeAllListeners(event?: string): EventEmitter;
+    removeListener(event: string | symbol, fn?: Function, context?: any, once?: boolean): this;
 
     /**
-     * Remove event listeners.
+     * Remove all listeners, or those of the specified event.
      *
-     * @param {String} event The event we want to remove.
-     * @param {Function} fn The listener that we need to find.
-     * @param {Mixed} context Only remove listeners matching this context.
-     * @param {Boolean} once Only remove once listeners.
-     * @api public
+     * @param {(string | symbol)} event The event name.
+     * @returns {EventEmitter} `this`.
      */
-    off(event: string, fn?: Function, context?: any, once?: boolean): EventEmitter;
+    removeAllListeners(event?: string | symbol): this;
 
     /**
-     * Register a new EventListener for the given event.
-     *
-     * @param {String} event Name of the event.
-     * @param {Function} fn Callback function.
-     * @param {Mixed} [context=this] The context of the function.
-     * @api public
+     * Alias method for `removeListener`
      */
-    addListener(event: string, fn: Function, context?: any): EventEmitter;
+    off(event: string | symbol, fn?: Function, context?: any, once?: boolean): this;
+
+    /**
+     * Alias method for `on`
+     */
+    addListener(event: string | symbol, fn: Function, context?: any): this;
 
     /**
      * This function doesn't apply anymore.
      * @deprecated
      */
-    setMaxListeners(): EventEmitter;
+    setMaxListeners(): this;
 }
diff --git a/pg/index.d.ts b/pg/index.d.ts
index 3fee125390..ebf86d9850 100644
--- a/pg/index.d.ts
+++ b/pg/index.d.ts
@@ -127,8 +127,4 @@ export declare class Events extends events.EventEmitter {
     public on(event: string, listener: Function): this;
 }
 
-declare namespace types {
-    function setTypeParser<T>(typeId: number, parser: (value: string) => T): void;
-}
-
-export const types: typeof pgTypes;
\ No newline at end of file
+export const types: typeof pgTypes;

From 6a4479ce36855621671c0569b3093162ba945976 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 13:40:52 -0800
Subject: [PATCH 217/245] More fixes for various merge problems

---
 angular-sanitize/index.d.ts           |   27 +-
 eventemitter3/eventemitter3-tests.ts  |    7 +-
 hapi-decorators/index.d.ts            |   32 +-
 hapi/index.d.ts                       |   85 +-
 material-ui/index.d.ts                |  476 +-
 material-ui/material-ui-tests.tsx     | 7030 ++++++++++++-------------
 pg/index.d.ts                         |   23 +-
 react-native-sortable-list/index.d.ts |    6 +-
 8 files changed, 3841 insertions(+), 3845 deletions(-)

diff --git a/angular-sanitize/index.d.ts b/angular-sanitize/index.d.ts
index 59bce54abf..c9d4f35e51 100644
--- a/angular-sanitize/index.d.ts
+++ b/angular-sanitize/index.d.ts
@@ -26,19 +26,24 @@ declare module 'angular' {
         // see https://github.com/angular/angular.js/tree/v1.2.0/src/ngSanitize/filter
         ///////////////////////////////////////////////////////////////////////////
         export namespace filter {
-
-            // Finds links in text input and turns them into html links.
-            // Supports http/https/ftp/mailto and plain email address links.
-            // see http://code.angularjs.org/1.2.0/docs/api/ngSanitize.filter:linky
+            /**
+             * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and plain email address links.
+             * @param text Input text.
+             * @param target ILinkyTargetType Window (_blank|_self|_parent|_top) or named frame to open links in.
+             * @param attributes Add custom attributes to the link element.
+             * @return Html-linkified and sanitized text.
+             * see https://docs.angularjs.org/api/ngSanitize/filter/linky
+             */
             interface ILinky {
                 (text: string, target: string, attributes?: { [attribute: string]: string } | ((url: string) => { [attribute: string]: string })): string;
             }
         }
-        ///////////////////////////////////////////////////////////////////////////////
-        // Extend angular $filter declarations to include filters from angular.sanitize module
-        ///////////////////////////////////////////////////////////////////////////////
-        interface IFilterService {
-            (name: 'linky'): angular.sanitize.filter.ILinky;
-        }
+
+	///////////////////////////////////////////////////////////////////////////////
+	// Extend angular $filter declarations to include filters from angular.sanitize module
+	///////////////////////////////////////////////////////////////////////////////
+	interface IFilterService {
+	    (name: 'linky'): angular.sanitize.filter.ILinky;
+	}
     }
-}
+}
\ No newline at end of file
diff --git a/eventemitter3/eventemitter3-tests.ts b/eventemitter3/eventemitter3-tests.ts
index 4e531a8010..9c8e379ec9 100644
--- a/eventemitter3/eventemitter3-tests.ts
+++ b/eventemitter3/eventemitter3-tests.ts
@@ -3,7 +3,7 @@
 import * as EventEmitter from 'eventemitter3';
 
 const eventName = 'test';
-const eventSymbol = Symbol('test');
+const eventSymbol: symbol = Symbol('test');
 const fn = () => console.log(1);
 
 // Extending EventEmitter
@@ -35,10 +35,9 @@ ee.eventNames().every((event) => {
         return false;
     } else {
         return event.length > 0;
-      }
+    }
 });
 
-
 // EventEmitter.listeners()
 // should return array of functions
 ee.listeners(eventName).map((listener) => {
@@ -114,4 +113,4 @@ ee.removeAllListeners(eventName).test();
 
 // EventEmitter.setMaxListeners()
 // should support fluent interface
-ee.setMaxListeners().test();
+ee.setMaxListeners().test();
\ No newline at end of file
diff --git a/hapi-decorators/index.d.ts b/hapi-decorators/index.d.ts
index 63d8f989ec..c58a1a6052 100644
--- a/hapi-decorators/index.d.ts
+++ b/hapi-decorators/index.d.ts
@@ -33,15 +33,15 @@ interface IValidateConfig {
     /** validation rules for incoming request headers.Values allowed:
      * trueany headers allowed (no validation performed).This is the default.
      falseno headers allowed (this will cause all valid HTTP requests to fail).
-     a Joi validation object.
-     a validation function using the signature function(value, options, next) where:
-     valuethe object containing the request headers.
-     optionsthe server validation options.
-     next(err, value)the callback function called when validation is completed.
-    */
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the request headers.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed.
+        */
     headers?: boolean | hapi.IJoi | hapi.IValidationFunction;
     /** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
-        trueany path parameters allowed (no validation performed).This is the default.
+     trueany path parameters allowed (no validation performed).This is the default.
         falseno path variables allowed.
         a Joi validation object.
         a validation function using the signature function(value, options, next) where:
@@ -50,7 +50,7 @@ interface IValidateConfig {
         next(err, value)the callback function called when validation is completed. */
     params?: boolean | hapi.IJoi | hapi.IValidationFunction;
     /** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
-        trueany query parameters allowed (no validation performed).This is the default.
+     trueany query parameters allowed (no validation performed).This is the default.
         falseno query parameters allowed.
         a Joi validation object.
         a validation function using the signature function(value, options, next) where:
@@ -59,18 +59,18 @@ interface IValidateConfig {
         next(err, value)the callback function called when validation is completed. */
     query?: boolean | hapi.IJoi | hapi.IValidationFunction;
     /**  validation rules for an incoming request payload (request body).Values allowed:
-         trueany payload allowed (no validation performed).This is the default.
-         falseno payload allowed.
-         a Joi validation object.
-         a validation function using the signature function(value, options, next) where:
-         valuethe object containing the payload object.
-         optionsthe server validation options.
-         next(err, value)the callback function called when validation is completed.  */
+     trueany payload allowed (no validation performed).This is the default.
+        falseno payload allowed.
+        a Joi validation object.
+        a validation function using the signature function(value, options, next) where:
+        valuethe object containing the payload object.
+        optionsthe server validation options.
+        next(err, value)the callback function called when validation is completed.  */
     payload?: boolean | hapi.IJoi | hapi.IValidationFunction;
     /** an optional object with error fields copied into every validation error response. */
     errorFields?: any;
     /** determines how to handle invalid requests.Allowed values are:
-        'error'return a Bad Request (400) error response.This is the default value.
+     'error'return a Bad Request (400) error response.This is the default value.
         'log'log the error but continue processing the request.
         'ignore'take no action.
         OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
diff --git a/hapi/index.d.ts b/hapi/index.d.ts
index 7b8348d720..5eaf43d7fa 100644
--- a/hapi/index.d.ts
+++ b/hapi/index.d.ts
@@ -73,6 +73,37 @@ export interface ICatBoxCacheOptions {
     /**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
     shared?: boolean;
 }
+	
+	/** policy configuration for the "CatBox" module and server method options. */
+	export interface ICatBoxCachePolicyOptions {
+		/** the cache name configured in server.cache. Defaults to the default cache. */
+		cache?: string;
+		/** string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. When called within a server method, defaults to '#name' where 'name' is the server method name. Required when called outside of a plugin. */
+		segment?: string;
+		/** if true, allows multiple cache provisions to share the same segment. Default to false. */
+		shared?: boolean;
+		/** relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt. */
+		expiresIn?: number;
+		/** time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn. */
+		expiresAt?: number;
+		/** a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy. */
+		generateFunc?: Function;
+		/** number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn. */
+		staleIn?: number;
+		/** number of milliseconds to wait before checking if an item is stale. */
+		staleTimeout?: number;
+		/** number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests. Required if generateFunc is present. Set to false to disable timeouts which may cause all get() requests to get stuck forever. */
+		generateTimeout?: number;
+		/** if true, an error or timeout in the generateFunc causes the stale value to be evicted from the cache. Defaults to true */
+		dropOnError?: boolean;
+		/** if false, an upstream cache read error will stop the cache.get() method from calling the generate function and will instead pass back the cache error. Defaults to true. */
+		generateOnReadError?: boolean;
+		/** if false, an upstream cache write error when calling cache.get() will be passed back with the generated value when calling. Defaults to true. */
+		generateIgnoreWriteError?: boolean;
+		/** number of milliseconds while generateFunc call is in progress for a given id, before a subsequent generateFunc call is allowed. Defaults to 0 (no blocking of concurrent generateFunc calls beyond staleTimeout). */
+		pendingGenerateTimeout?: number;
+	}
+
 
 /** Any connections configuration server defaults can be included to override and customize the individual connection. */
 export interface IServerConnectionOptions extends IConnectionConfigurationServerDefaults {
@@ -103,6 +134,8 @@ export interface IServerConnectionOptions extends IConnectionConfigurationServer
 export interface IConnectionConfigurationServerDefaults {
     /**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
     app?: any;
+		/** if false, response content encoding is disabled. Defaults to true */
+		compression?: boolean;
     /**  connection load limits configuration where:  */
     load?: {
         /**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
@@ -238,8 +271,8 @@ export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions
     /**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
     defaultExtension?: string;
 }
-	
-	
+
+
 interface IReplyMethods {
 	/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
 	 * The data argument is only used for passing back authentication data and is ignored elsewhere. */
@@ -303,12 +336,12 @@ interface IReplyMethods {
 	FLOW CONTROL:
 	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
 export interface IReply extends IReplyMethods {
-	<T>(err: Error,
-		result?: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T,
-		/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-		credentialData?: any): IBoom;
-	/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-	<T>(result: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T): Response;
+    <T>(err: Error,
+        result?: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T,
+        /**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+        credentialData?: any): IBoom;
+    /**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+    <T>(result: string | number | boolean | Buffer | stream.Stream | IPromise<T> | T): Response;
 }
 
 /**  Concludes the handler activity by setting a response and returning control over to the framework where:
@@ -318,18 +351,22 @@ export interface IReply extends IReplyMethods {
 	FLOW CONTROL:
 	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
 export interface IStrictReply<T> extends IReplyMethods {
-	(err: Error,
-		result?: IPromise<T> | T,
-		/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
-		credentialData?: any): IBoom;
-	/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
-	(result: IPromise<T> | T): Response;
+    (err: Error,
+        result?: IPromise<T> | T,
+        /**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+        credentialData?: any): IBoom;
+    /**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+    (result: IPromise<T> | T): Response;
 }
 
 export interface ISessionHandler {
     (request: Request, reply: IReply): void;
+	}
+
+	export interface IStrictSessionHandler {
     <T>(request: Request, reply: IStrictReply<T>): void;
 }
+
 export interface IRequestHandler<T> {
     (request: Request): T;
 }
@@ -493,7 +530,7 @@ export interface IRouteAdditionalConfigurationOptions {
     };
 
     /**  an alternative location for the route handler option. */
-    handler?: ISessionHandler | string | IRouteHandlerConfig;
+		handler?: ISessionHandler | IStrictSessionHandler | string | IRouteHandlerConfig;
     /** an optional unique identifier used to look up the route using server.lookup(). */
     id?: number;
     /** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
@@ -892,7 +929,7 @@ export interface IRouteConfiguration {
     /**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
     vhost?: string;
     /**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
-    handler?: ISessionHandler | string | IRouteHandlerConfig;
+		handler?: ISessionHandler | IStrictSessionHandler | string | IRouteHandlerConfig;
     /** - additional route options.*/
     config?: IRouteAdditionalConfigurationOptions;
 }
@@ -1103,7 +1140,7 @@ export interface IServerMethod {
  generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
 export interface IServerMethodOptions {
     bind?: any;
-    cache?: ICatBoxCacheOptions;
+		cache?: ICatBoxCachePolicyOptions;
     callback?: boolean;
     generateKey?(args: any[]): string;
 }
@@ -1870,7 +1907,9 @@ export class Server extends Events.EventEmitter {
 		}
 		}
 		});*/
-        strategy(name: string, scheme: any, mode?: boolean | string, options?: any): void;
+			strategy(name: string, scheme: string, mode?: boolean | string, options?: any): void;
+			strategy(name: string, scheme: string, mode?: boolean | string): void;
+			strategy(name: string, scheme: string, options?:any): void;
 
 		/** server.auth.test(strategy, request, next)
 		 Tests a request against an authentication strategy where:
@@ -1937,7 +1976,7 @@ export class Server extends Events.EventEmitter {
 	// value === { capital: 'oslo' };
 	});
 	});*/
-    cache(options: ICatBoxCacheOptions): void;
+		cache(options: ICatBoxCachePolicyOptions): void;
 
 	/** server.connection([options])
 	 Adds an incoming server connection
@@ -2040,10 +2079,10 @@ export class Server extends Events.EventEmitter {
 	 server.route({ method: 'GET', path: '/test', handler: handler });
 	 server.start();
 	 // All requests will get routed to '/test'*/
-     ext(event: RequestExtPoints, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
-     ext<T>(event: RequestExtPoints, method: (request: Request, reply: IStrictReply<T>, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
-     ext(event: ServerExtPoints, method: (server: Server, next: (err?: any) => void, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
- 
+    ext(event: RequestExtPoints, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
+    ext<T>(event: RequestExtPoints, method: (request: Request, reply: IStrictReply<T>, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
+    ext(event: ServerExtPoints, method: (server: Server, next: (err?: any) => void, bind?: any) => void, options?: { before: string | string[]; after: string | string[]; bind?: any }): void;
+
 	/** server.handler(name, method)
 	 Registers a new handler type to be used in routes where:
 	 name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
diff --git a/material-ui/index.d.ts b/material-ui/index.d.ts
index 3b186a4966..a75fa9a369 100644
--- a/material-ui/index.d.ts
+++ b/material-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for material-ui v0.15.1
+// Type definitions for material-ui v0.16.0
 // Project: https://github.com/callemall/material-ui
 // Definitions by: Nathan Brown <https://github.com/ngbrown>, Oliver Herrmann <https://github.com/herrmanno>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -93,9 +93,10 @@ declare namespace __MaterialUI {
     }
 
     // What's common between React.TouchEventHandler and React.MouseEventHandler
-    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> { }
+    interface TouchTapEventHandler extends React.EventHandler<TouchTapEvent> {
+    }
 
-    interface ThemeWrapperProps extends React.Props<ThemeWrapper> {
+    interface ThemeWrapperProps {
         theme: Styles.MuiTheme;
     }
     export class ThemeWrapper extends React.Component<ThemeWrapperProps, {}> {
@@ -134,12 +135,13 @@ declare namespace __MaterialUI {
             clockCircleColor?: string;
             shadowColor?: string;
         }
+        export var ThemePalette: ThemePalette;
         interface MuiTheme {
             spacing?: Spacing;
             fontFamily?: string;
             palette?: ThemePalette;
             isRtl?: boolean;
-            userAgent?: string;
+            userAgent?: string | boolean;
             zIndex?: zIndex;
             baseTheme?: RawTheme;
             rawTheme?: RawTheme;
@@ -450,32 +452,14 @@ declare namespace __MaterialUI {
 
         export function muiThemeable<TComponent extends React.Component<P, S>, P, S>(): (component: TComponent) => TComponent;
 
-        //** @deprecated use MuiThemeProvider instead **/
-        export function themeDecorator(muiTheme: Styles.MuiTheme): <TFunction extends Function>(Component: TFunction) => TFunction;
-
-        interface MuiThemeProviderProps extends React.Props<MuiThemeProvider> {
+        interface MuiThemeProviderProps {
             muiTheme?: Styles.MuiTheme;
         }
-        export class MuiThemeProvider extends React.Component<MuiThemeProviderProps, {}>{
+        export class MuiThemeProvider extends React.Component<MuiThemeProviderProps, {}> {
         }
 
         export function getMuiTheme(...muiTheme: MuiTheme[]): MuiTheme;
 
-        interface ThemeManager {
-            //** @deprecated ThemeManager is deprecated. please import getMuiTheme directly from "material-ui/styles/getMuiTheme" **/
-            getMuiTheme(baseTheme: RawTheme, muiTheme?: MuiTheme): MuiTheme;
-
-            //** @deprecated modifyRawThemeSpacing is deprecated. please use getMuiTheme to modify your theme directly. http://www.material-ui.com/#/customization/themes **/
-            modifyRawThemeSpacing(muiTheme: MuiTheme, newSpacing: Spacing): MuiTheme;
-
-            //** @deprecated modifyRawThemePalette is deprecated. please use getMuiTheme to modify your theme directly. http://www.material-ui.com/#/customization/themes **/
-            modifyRawThemePalette(muiTheme: MuiTheme, newPaletteKeys: ThemePalette): MuiTheme;
-
-            //** @deprecated modifyRawThemeFontFamily is deprecated. please use getMuiTheme to modify your theme directly. http://www.material-ui.com/#/customization/themes **/
-            modifyRawThemeFontFamily(muiTheme: MuiTheme, newFontFamily: string): MuiTheme;
-        }
-        export var ThemeManager: ThemeManager;
-
         interface Transitions {
             easeOut(duration?: string, property?: string | string[], delay?: string, easeFunction?: string): string;
             create(duration?: string, property?: string, delay?: string, easeFunction?: string): string;
@@ -501,15 +485,9 @@ declare namespace __MaterialUI {
             fontStyleButtonFontSize: number;
         }
         export var Typography: Typography;
-
-        //** @deprecated use darkBaseTheme instead **/
-        export var DarkRawTheme: RawTheme;
-
-        //** @deprecated use lightBaseTheme instead **/
-        export var LightRawTheme: RawTheme;
     }
 
-    interface AppBarProps extends React.Props<AppBar> {
+    interface AppBarProps {
         className?: string;
         iconClassNameLeft?: string;
         iconClassNameRight?: string;
@@ -526,10 +504,10 @@ declare namespace __MaterialUI {
         titleStyle?: React.CSSProperties;
         zDepth?: number;
     }
-    export class AppBar extends React.Component<AppBarProps, {}>{
+    export class AppBar extends React.Component<AppBarProps, {}> {
     }
 
-    interface AppCanvasProps extends React.Props<AppCanvas> {
+    interface AppCanvasProps {
     }
     export class AppCanvas extends React.Component<AppCanvasProps, {}> {
     }
@@ -550,9 +528,10 @@ declare namespace __MaterialUI {
 
     type AutoCompleteDataItem = { text: string, value: React.ReactNode } | string;
     type AutoCompleteDataSource = { text: string, value: React.ReactNode }[] | string[];
-    interface AutoCompleteProps extends React.Props<AutoComplete> {
+    interface AutoCompleteProps {
         anchorOrigin?: propTypes.origin;
         animated?: boolean;
+        animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
         dataSource: AutoCompleteDataSource;
         disableFocusRipple?: boolean;
         errorStyle?: React.CSSProperties;
@@ -577,21 +556,22 @@ declare namespace __MaterialUI {
         searchText?: string;
         style?: React.CSSProperties;
         targetOrigin?: propTypes.origin;
-        /** @deprecated Instead, use openOnFocus */
-        triggerUpdateOnFocus?: boolean;
+        textFieldStyle?: React.CSSProperties;
     }
     export class AutoComplete extends React.Component<AutoCompleteProps, {}> {
         static noFilter: () => boolean;
         static defaultFilter: (searchText: string, key: string) => boolean;
         static caseSensitiveFilter: (searchText: string, key: string) => boolean;
         static caseInsensitiveFilter: (searchText: string, key: string) => boolean;
+
         static levenshteinDistanceFilter(distanceLessThan: number): (searchText: string, key: string) => boolean;
+
         static fuzzyFilter: (searchText: string, key: string) => boolean;
         static Item: Menus.MenuItem;
         static Divider: Divider;
     }
 
-    interface AvatarProps extends React.Props<Avatar> {
+    interface AvatarProps {
         backgroundColor?: string;
         className?: string;
         color?: string;
@@ -603,7 +583,7 @@ declare namespace __MaterialUI {
     export class Avatar extends React.Component<AvatarProps, {}> {
     }
 
-    interface BadgeProps extends React.Props<Badge> {
+    interface BadgeProps {
         badgeContent: React.ReactNode;
         badgeStyle?: React.CSSProperties;
         className?: string;
@@ -614,7 +594,7 @@ declare namespace __MaterialUI {
     export class Badge extends React.Component<BadgeProps, {}> {
     }
 
-    interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
+    interface BeforeAfterWrapperProps {
         afterElementType?: string;
         afterStyle?: React.CSSProperties;
         beforeElementType?: string;
@@ -626,15 +606,15 @@ declare namespace __MaterialUI {
     }
 
     // non generally overridden elements of EnhancedButton
-    interface SharedEnhancedButtonProps<T> extends React.Props<T> {
+    interface SharedEnhancedButtonProps<T> {
         centerRipple?: boolean;
         disableFocusRipple?: boolean;
         disableKeyboardFocus?: boolean;
         disableTouchRipple?: boolean;
         focusRippleColor?: string;
         focusRippleOpacity?: number;
+        href?: string;
         keyboardFocused?: boolean;
-        linkButton?: boolean;
         onBlur?: React.FocusEventHandler<{}>;
         onFocus?: React.FocusEventHandler<{}>;
         onKeyboardFocus?: (e: React.FocusEvent<{}>, isKeyboardFocused: boolean) => void;
@@ -644,6 +624,7 @@ declare namespace __MaterialUI {
         onClick?: React.MouseEventHandler<{}>;
         style?: React.CSSProperties;
         tabIndex?: number;
+        target?: string;
         touchRippleColor?: string;
         touchRippleOpacity?: number;
         type?: string;
@@ -663,7 +644,6 @@ declare namespace __MaterialUI {
         backgroundColor?: string;
         disabled?: boolean;
         hoverColor?: string;
-        href?: string;
         icon?: React.ReactNode;
         label?: React.ReactNode;
         labelPosition?: "before" | "after";
@@ -690,7 +670,6 @@ declare namespace __MaterialUI {
         disabledBackgroundColor?: string;
         disabledLabelColor?: string;
         fullWidth?: boolean;
-        href?: string;
         icon?: React.ReactNode;
         label?: React.ReactNode;
         labelColor?: string;
@@ -717,10 +696,8 @@ declare namespace __MaterialUI {
         className?: string;
         disabled?: boolean;
         disabledColor?: string;
-        href?: string;
         iconClassName?: string;
         iconStyle?: React.CSSProperties;
-        linkButton?: boolean;
         mini?: boolean;
         onMouseDown?: React.MouseEventHandler<{}>;
         onMouseEnter?: React.MouseEventHandler<{}>;
@@ -759,7 +736,8 @@ declare namespace __MaterialUI {
 
     namespace Card {
 
-        interface CardProps extends React.Props<Card> {
+        interface CardProps {
+            className?: string;
             actAsExpander?: boolean;
             containerStyle?: React.CSSProperties;
             expandable?: boolean;
@@ -772,7 +750,7 @@ declare namespace __MaterialUI {
         export class Card extends React.Component<CardProps, {}> {
         }
 
-        interface CardActionsProps extends React.Props<CardActions> {
+        interface CardActionsProps {
             actAsExpander?: boolean;
             expandable?: boolean;
             showExpandableButton?: boolean;
@@ -781,7 +759,7 @@ declare namespace __MaterialUI {
         export class CardActions extends React.Component<CardActionsProps, {}> {
         }
 
-        interface CardExpandableProps extends React.Props<CardExpandable> {
+        interface CardExpandableProps {
             expanded?: boolean;
             onExpanding?: (isExpanded: boolean) => void;
             style?: React.CSSProperties;
@@ -789,7 +767,7 @@ declare namespace __MaterialUI {
         export class CardExpandable extends React.Component<CardExpandableProps, {}> {
         }
 
-        interface CardHeaderProps extends React.Props<CardHeader> {
+        interface CardHeaderProps {
             actAsExpander?: boolean;
             avatar?: React.ReactNode;
             expandable?: boolean;
@@ -806,7 +784,7 @@ declare namespace __MaterialUI {
         export class CardHeader extends React.Component<CardHeaderProps, {}> {
         }
 
-        interface CardMediaProps extends React.Props<CardMedia> {
+        interface CardMediaProps {
             actAsExpander?: boolean;
             expandable?: boolean;
             mediaStyle?: React.CSSProperties;
@@ -819,7 +797,7 @@ declare namespace __MaterialUI {
         export class CardMedia extends React.Component<CardMediaProps, {}> {
         }
 
-        interface CardTextProps extends React.Props<CardText> {
+        interface CardTextProps {
             actAsExpander?: boolean;
             color?: string;
             expandable?: boolean;
@@ -828,7 +806,7 @@ declare namespace __MaterialUI {
         export class CardText extends React.Component<CardTextProps, {}> {
         }
 
-        interface CardTitleProps extends React.Props<CardTitle> {
+        interface CardTitleProps {
             actAsExpander?: boolean;
             expandable?: boolean;
             showExpandableButton?: boolean;
@@ -844,7 +822,7 @@ declare namespace __MaterialUI {
         }
     }
 
-    interface ChipProps extends React.Props<Chip> {
+    interface ChipProps {
         backgroundColor?: string;
         className?: string;
         labelColor?: string;
@@ -857,13 +835,14 @@ declare namespace __MaterialUI {
     }
 
     namespace DatePicker {
-        interface DatePickerProps extends React.Props<DatePicker> {
+        interface DatePickerProps {
             // <TextField/> is the element that get the 'other' properties
             DateTimeFormat?: Intl.DateTimeFormat;
             autoOk?: boolean;
             cancelLabel?: React.ReactNode;
             container?: "dialog" | "inline";
             defaultDate?: Date;
+            dialogContainerStyle?: React.CSSProperties;
             disableYearSelection?: boolean;
             disabled?: boolean;
             firstDayOfWeek?: number;
@@ -882,8 +861,6 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
             textFieldStyle?: React.CSSProperties;
             value?: Date;
-            /** @deprecated use cancelLabel and okLabel instead */
-            wordings?: { ok: string, cancel: string };
 
             // From <TextField />
             className?: string;
@@ -911,9 +888,10 @@ declare namespace __MaterialUI {
         export class DatePicker extends React.Component<DatePickerProps, {}> {
         }
 
-        interface DatePickerDialogProps extends React.Props<DatePickerDialog> {
+        interface DatePickerDialogProps {
             // <Container/> is the element that get the 'other' properties
             DateTimeFormat?: Intl.DateTimeFormat;
+            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
             autoOk?: boolean;
             cancelLabel?: React.ReactNode;
             container?: "dialog" | "inline";
@@ -930,7 +908,6 @@ declare namespace __MaterialUI {
             onShow?: () => void;
             shouldDisableDate?: (day: Date) => boolean;
             style?: React.CSSProperties;
-            wordings?: { ok: string, cancel: string };
         }
         export class DatePickerDialog extends React.Component<DatePickerDialogProps, {}> {
         }
@@ -971,15 +948,15 @@ declare namespace __MaterialUI {
     export class Dialog extends React.Component<DialogProps, {}> {
     }
 
-    interface DividerProps extends React.Props<Divider> {
+    interface DividerProps {
         className?: string;
         inset?: boolean;
         style?: React.CSSProperties;
     }
-    export class Divider extends React.Component<DividerProps, {}>{
+    export class Divider extends React.Component<DividerProps, {}> {
     }
 
-    interface DrawerProps extends React.Props<Drawer> {
+    interface DrawerProps {
         className?: string;
         containerClassName?: string;
         containerStyle?: React.CSSProperties;
@@ -999,16 +976,16 @@ declare namespace __MaterialUI {
     }
 
     namespace GridList {
-        interface GridListProps extends React.Props<GridList> {
+        interface GridListProps {
             cellHeight?: number;
             cols?: number;
             padding?: number;
             style?: React.CSSProperties;
         }
-        export class GridList extends React.Component<GridListProps, {}>{
+        export class GridList extends React.Component<GridListProps, {}> {
         }
 
-        interface GridTileProps extends React.Props<GridTile> {
+        interface GridTileProps {
             actionIcon?: React.ReactElement<any>;
             actionPosition?: "left" | "right";
             cols?: number;
@@ -1020,7 +997,7 @@ declare namespace __MaterialUI {
             titleBackground?: string;
             titlePosition?: "top" | "bottom";
         }
-        export class GridTile extends React.Component<GridTileProps, {}>{
+        export class GridTile extends React.Component<GridTileProps, {}> {
         }
     }
 
@@ -1048,22 +1025,14 @@ declare namespace __MaterialUI {
     }
 
     namespace List {
-        interface ListProps extends React.Props<List> {
+        interface ListProps {
             // <Paper/> is the element that get the 'other' properties
-            /** @deprecated nest the Subheader component directly inside the List instead */
-            insetSubheader?: boolean;
             style?: React.CSSProperties;
-            /** @deprecated nest the Subheader component directly inside the List instead */
-            subheader?: string;
-            /** @deprecated nest the Subheader component directly inside the List instead */
-            subheaderStyle?: React.CSSProperties;
-            /** @deprecated wrap it in `Paper` or another component that provides zDepth instead */
-            zDepth?: number;
         }
         export class List extends React.Component<ListProps, {}> {
         }
 
-        interface ListItemProps extends React.HTMLAttributes<{}>, React.Props<ListItem> {
+        interface ListItemProps extends EnhancedButtonProps {
             // <EnhancedButton/> is the element that get the 'other' properties
             autoGenerateNestedIndicator?: boolean;
             disableKeyboardFocus?: boolean;
@@ -1083,6 +1052,7 @@ declare namespace __MaterialUI {
             onNestedListToggle?: (item: ListItem) => void;
             onTouchStart?: React.TouchEventHandler<{}>;
             onTouchTap?: TouchTapEventHandler;
+            open?: boolean;
             primaryText?: React.ReactNode;
             primaryTogglesNestedList?: boolean;
             rightAvatar?: React.ReactElement<any>;
@@ -1100,8 +1070,6 @@ declare namespace __MaterialUI {
             onChange?: (e: TouchTapEvent, value: any) => void;
             selectedItemStyle?: React.CSSProperties;
             value?: any;
-            /** @deprecated use the value and onChange property instead */
-            valueLink?: { value: any; requestChange: (e: TouchTapEvent, value: any) => void };
         }
 
         // union types for higher order components in TypeScript 1.8: https://github.com/Microsoft/TypeScript/issues/4362
@@ -1109,10 +1077,8 @@ declare namespace __MaterialUI {
     }
 
     namespace Menus {
-        interface MenuProps extends React.Props<Menu> {
+        interface MenuProps {
             // <List/> is the element that get the 'other' properties
-            /** @deprecated Instead, use a Popover */
-            animated?: boolean;
             autoWidth?: boolean;
             desktop?: boolean;
             disableAutoFocus?: boolean;
@@ -1124,21 +1090,18 @@ declare namespace __MaterialUI {
             onEscKeyDown?: React.KeyboardEventHandler<{}>;
             onItemTouchTap?: (e: TouchTapEvent, item: MenuItem) => void;
             onKeyDown?: React.KeyboardEventHandler<{}>;
-            /** @deprecated Instead, use a Popover */
-            openDirection?: propTypes.corners;
             selectedMenuItemStyle?: React.CSSProperties;
             style?: React.CSSProperties;
             value?: any | any[];
             valueLink?: ReactLink<any | any[]>;
             width?: string | number;
-            /** @deprecated wrap it in `Paper` or another component that provides zDepth instead */
-            zDepth?: number;
         }
-        export class Menu extends React.Component<MenuProps, {}>{
+        export class Menu extends React.Component<MenuProps, {}> {
         }
 
-        interface MenuItemProps extends React.HTMLAttributes<{}>, React.Props<MenuItem> {
+        interface MenuItemProps extends List.ListItemProps {
             // <ListItem/> is the element that get the 'other' properties
+            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
             checked?: boolean;
             desktop?: boolean;
             disabled?: boolean;
@@ -1148,21 +1111,19 @@ declare namespace __MaterialUI {
             leftIcon?: React.ReactElement<any>;
             menuItems?: React.ReactNode;
             onTouchTap?: TouchTapEventHandler;
+            primaryText?: React.ReactNode;
             rightIcon?: React.ReactElement<any>;
             secondaryText?: React.ReactNode;
             style?: React.CSSProperties;
             value?: any;
-
-            // useful attributes passed to <ListItem/>
-            primaryText?: React.ReactNode;
-            secondaryTextLines?: number; // 1 or 2
         }
-        export class MenuItem extends React.Component<MenuItemProps, {}>{
+        export class MenuItem extends React.Component<MenuItemProps, {}> {
         }
 
-        interface IconMenuProps extends React.Props<IconMenu> {
+        interface IconMenuProps {
             // <Menu/> is the element that get the 'other' properties
             anchorOrigin?: propTypes.origin;
+            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
             className?: string;
             iconButtonElement: React.ReactElement<IconButtonProps>;
             iconStyle?: React.CSSProperties;
@@ -1189,8 +1150,6 @@ declare namespace __MaterialUI {
             multiple?: boolean;
             onChange?: (e: TouchTapEvent, itemValue: any | any[]) => void;
             onKeyDown?: React.KeyboardEventHandler<{}>;
-            /** @deprecated Instead, use a Popover */
-            openDirection?: string;
             selectedMenuItemStyle?: React.CSSProperties;
             value?: any | any[];
             valueLink?: ReactLink<any | any[]>;
@@ -1199,9 +1158,10 @@ declare namespace __MaterialUI {
         export class IconMenu extends React.Component<IconMenuProps, {}> {
         }
 
-        interface DropDownMenuProps extends React.Props<DropDownMenu> {
+        interface DropDownMenuProps {
             // <div/> is the element that gets the 'other' properties
             animated?: boolean;
+            animation?: React.ComponentClass<Popover.PopoverAnimationProps>;
             autoWidth?: boolean;
             className?: string;
             disabled?: boolean;
@@ -1244,7 +1204,7 @@ declare namespace __MaterialUI {
             style?: React.CSSProperties;
         }
 
-        interface PopoverProps extends React.Props<Popover> {
+        interface PopoverProps {
             anchorEl?: React.ReactInstance;
             anchorOrigin?: propTypes.origin;
             animated?: boolean;
@@ -1259,27 +1219,27 @@ declare namespace __MaterialUI {
             useLayerForClickAway?: boolean;
             zDepth?: number;
         }
-        export class Popover extends React.Component<PopoverProps, {}>{
+        export class Popover extends React.Component<PopoverProps, {}> {
         }
 
-        interface PopoverAnimationVerticalProps extends PopoverAnimationProps, React.Props<PopoverAnimationVertical> {
+        interface PopoverAnimationVerticalProps extends PopoverAnimationProps {
             className?: string;
             targetOrigin?: propTypes.origin;
             zDepth?: number;
         }
-        export class PopoverAnimationVertical extends React.Component<PopoverAnimationVerticalProps, {}>{
+        export class PopoverAnimationVertical extends React.Component<PopoverAnimationVerticalProps, {}> {
         }
 
-        interface PopoverAnimationDefaultProps extends PopoverAnimationProps, React.Props<PopoverAnimationDefault> {
+        interface PopoverAnimationDefaultProps extends PopoverAnimationProps {
             className?: string;
             targetOrigin?: propTypes.origin;
             zDepth?: number;
         }
-        export class PopoverAnimationDefault extends React.Component<PopoverAnimationDefaultProps, {}>{
+        export class PopoverAnimationDefault extends React.Component<PopoverAnimationDefaultProps, {}> {
         }
     }
 
-    interface CircularProgressProps extends React.Props<CircularProgress> {
+    interface CircularProgressProps {
         color?: string;
         innerStyle?: React.CSSProperties;
         max?: number;
@@ -1293,7 +1253,7 @@ declare namespace __MaterialUI {
     export class CircularProgress extends React.Component<CircularProgressProps, {}> {
     }
 
-    interface LinearProgressProps extends React.Props<LinearProgress> {
+    interface LinearProgressProps {
         color?: string;
         max?: number;
         min?: number;
@@ -1304,7 +1264,7 @@ declare namespace __MaterialUI {
     export class LinearProgress extends React.Component<LinearProgressProps, {}> {
     }
 
-    interface RefreshIndicatorProps extends React.Props<RefreshIndicator> {
+    interface RefreshIndicatorProps {
         color?: string;
         left: number;
         loadingColor?: string;
@@ -1317,7 +1277,7 @@ declare namespace __MaterialUI {
     export class RefreshIndicator extends React.Component<RefreshIndicatorProps, {}> {
     }
 
-    interface SelectFieldProps extends React.Props<SelectField> {
+    interface SelectFieldProps {
         // <DropDownMenu/> is the element that get the 'other' properties
         autoWidth?: boolean;
         disabled?: boolean;
@@ -1332,8 +1292,6 @@ declare namespace __MaterialUI {
         iconStyle?: React.CSSProperties;
         id?: string;
         labelStyle?: React.CSSProperties;
-        /** @deprecated use composability instead */
-        menuItems?: any[];
         onBlur?: React.FocusEventHandler<{}>;
         onChange?: (e: TouchTapEvent, index: number, menuItemValue: any) => void;
         onFocus?: React.FocusEventHandler<{}>;
@@ -1353,7 +1311,8 @@ declare namespace __MaterialUI {
     export class SelectField extends React.Component<SelectFieldProps, {}> {
     }
 
-    interface SliderProps extends React.Props<Slider> {
+    interface SliderProps {
+        axis?: 'x' | 'x-reverse' | 'y' | 'y-reverse';
         defaultValue?: number;
         description?: string;
         disableFocusRipple?: boolean;
@@ -1368,6 +1327,7 @@ declare namespace __MaterialUI {
         onDragStop?: React.MouseEventHandler<{}>;
         onFocus?: React.FocusEventHandler<{}>;
         required?: boolean;
+        sliderStyle?: React.CSSProperties,
         step?: number;
         style?: React.CSSProperties;
         value?: number;
@@ -1433,14 +1393,13 @@ declare namespace __MaterialUI {
             labelStyle?: React.CSSProperties;
             onCheck?: (event: React.MouseEvent<{}>, checked: boolean) => void;
             style?: React.CSSProperties;
-            /** @deprecated Use uncheckedIcon instead */
-            unCheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
             uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
             valueLink?: ReactLink<boolean>;
         }
         export class Checkbox extends React.Component<CheckboxProps, {}> {
             /** @deprecated Use checked property instead */
             isChecked(): void;
+
             /** @deprecated Use checked property instead */
             setChecked(newCheckedValue: boolean): void;
         }
@@ -1455,25 +1414,28 @@ declare namespace __MaterialUI {
             onCheck?: (e: React.FormEvent<{}>, selected: string) => void;
             style?: React.CSSProperties;
             uncheckedIcon?: React.ReactElement<{ style?: React.CSSProperties }>; // Normally an SvgIcon
-            value?: string;
+            value?: any;
         }
         export class RadioButton extends React.Component<RadioButtonProps, {}> {
             isChecked(): boolean;
+
             getValue(): string;
         }
 
-        interface RadioButtonGroupProps extends React.Props<RadioButtonGroup> {
+        interface RadioButtonGroupProps {
             className?: string;
-            defaultSelected?: string;
+            defaultSelected?: any;
             labelPosition?: "left" | "right";
             name: string;
             onChange?: (e: React.FormEvent<{}>, selected: string) => void;
             style?: React.CSSProperties;
-            valueSelected?: string;
+            valueSelected?: any;
         }
         export class RadioButtonGroup extends React.Component<RadioButtonGroupProps, {}> {
             clearValue(): void;
+
             getSelectedValue(): string;
+
             setSelectedValue(newSelectionValue: string): void;
         }
 
@@ -1499,12 +1461,13 @@ declare namespace __MaterialUI {
         }
         export class Toggle extends React.Component<ToggleProps, {}> {
             isToggled(): boolean;
+
             setToggled(newToggledValue: boolean): void;
         }
     }
 
-    interface SnackbarProps extends React.Props<Snackbar> {
-        action?: string;
+    interface SnackbarProps {
+        action?: React.ReactNode;
         autoHideDuration?: number;
         bodyStyle?: React.CSSProperties;
         className?: string;
@@ -1519,13 +1482,13 @@ declare namespace __MaterialUI {
     }
 
     namespace Stepper {
-        interface StepProps extends React.Props<Step> {
+        interface StepProps {
             active?: boolean;
             completed?: boolean;
             disabled?: boolean;
             style?: React.CSSProperties;
         }
-        export class Step extends React.Component<StepProps, {}>{
+        export class Step extends React.Component<StepProps, {}> {
         }
 
         interface StepButtonProps extends SharedEnhancedButtonProps<StepButton> {
@@ -1538,25 +1501,25 @@ declare namespace __MaterialUI {
             onTouchStart?: React.TouchEventHandler<{}>;
             style?: React.CSSProperties;
         }
-        export class StepButton extends React.Component<StepButtonProps, {}>{
+        export class StepButton extends React.Component<StepButtonProps, {}> {
         }
 
-        interface StepContentProps extends React.Props<StepContent> {
+        interface StepContentProps {
             active?: boolean;
             last?: boolean;
             style?: React.CSSProperties;
         }
-        export class StepContent extends React.Component<StepContentProps, {}>{
+        export class StepContent extends React.Component<StepContentProps, {}> {
         }
 
-        interface StepLabelProps extends React.Props<StepLabel> {
+        interface StepLabelProps {
             active?: boolean;
             completed?: boolean;
             disabled?: boolean;
             icon?: React.ReactNode | string | number;
             style?: React.CSSProperties;
         }
-        export class StepLabel extends React.Component<StepLabelProps, {}>{
+        export class StepLabel extends React.Component<StepLabelProps, {}> {
         }
 
         interface SnackbarProps extends React.Props<Snackbar> {
@@ -1576,25 +1539,25 @@ declare namespace __MaterialUI {
             openOnMount?: boolean; // DEPRECATED
         }
 
-        interface StepperProps extends React.Props<Stepper> {
+        interface StepperProps {
             activeStep?: number;
             linear?: boolean;
             orientation?: "horizontal" | "vertical";
             style?: React.CSSProperties;
         }
-        export class Stepper extends React.Component<StepperProps, {}>{
+        export class Stepper extends React.Component<StepperProps, {}> {
         }
     }
 
-    interface SubheaderProps extends React.Props<Subheader> {
+    interface SubheaderProps {
         inset?: boolean;
         style?: React.CSSProperties;
     }
-    export class Subheader extends React.Component<SubheaderProps, {}>{
+    export class Subheader extends React.Component<SubheaderProps, {}> {
     }
 
     namespace Table {
-        interface TableProps extends React.Props<Table> {
+        interface TableProps {
             allRowsSelected?: boolean;
             bodyStyle?: React.CSSProperties;
             className?: string;
@@ -1617,7 +1580,7 @@ declare namespace __MaterialUI {
         export class Table extends React.Component<TableProps, {}> {
         }
 
-        interface TableRowProps extends React.Props<TableRow> {
+        interface TableRowProps {
             // <tr/> is element that get the 'other' properties
             className?: string;
             displayBorder?: boolean;
@@ -1644,7 +1607,7 @@ declare namespace __MaterialUI {
         export class TableRow extends React.Component<TableRowProps, {}> {
         }
 
-        interface TableRowColumnProps extends React.Props<TableRowColumn> {
+        interface TableRowColumnProps {
             // <td/> is element that get the 'other' properties
             className?: string;
             columnNumber?: number;
@@ -1664,7 +1627,7 @@ declare namespace __MaterialUI {
         export class TableRowColumn extends React.Component<TableRowColumnProps, {}> {
         }
 
-        interface TableHeaderProps extends React.Props<TableHeader> {
+        interface TableHeaderProps {
             adjustForCheckbox?: boolean;
             className?: string;
             displaySelectAll?: boolean;
@@ -1678,7 +1641,7 @@ declare namespace __MaterialUI {
         export class TableHeader extends React.Component<TableHeaderProps, {}> {
         }
 
-        interface TableHeaderColumnProps extends React.Props<TableHeaderColumn> {
+        interface TableHeaderColumnProps {
             // <th/> is element that get the 'other' properties
             className?: string;
             columnNumber?: number;
@@ -1694,7 +1657,7 @@ declare namespace __MaterialUI {
         export class TableHeaderColumn extends React.Component<TableHeaderColumnProps, {}> {
         }
 
-        interface TableBodyProps extends React.Props<TableBody> {
+        interface TableBodyProps {
             /** @deprecated Instead, use property on Table */
             allRowsSelected?: boolean;
             className?: string;
@@ -1724,7 +1687,7 @@ declare namespace __MaterialUI {
         export class TableBody extends React.Component<TableBodyProps, {}> {
         }
 
-        interface TableFooterProps extends React.Props<TableFooter> {
+        interface TableFooterProps {
             // <tfoot/> is element that get the 'other' properties
             adjustForCheckbox?: boolean;
             className?: string;
@@ -1735,7 +1698,7 @@ declare namespace __MaterialUI {
     }
 
     namespace Tabs {
-        interface TabsProps extends React.Props<Tabs> {
+        interface TabsProps {
             className?: string;
             contentContainerClassName?: string;
             contentContainerStyle?: React.CSSProperties;
@@ -1764,7 +1727,7 @@ declare namespace __MaterialUI {
         }
     }
 
-    interface TextFieldProps extends React.Props<TextField> {
+    interface TextFieldProps {
         className?: string;
         defaultValue?: string | number;
         disabled?: boolean;
@@ -1783,7 +1746,6 @@ declare namespace __MaterialUI {
         name?: string;
         onBlur?: React.FocusEventHandler<{}>;
         onChange?: React.FormEventHandler<{}>;
-        /** @deprecated Use onKeyDown and check for keycode instead. */
         onEnterKeyDown?: React.KeyboardEventHandler<{}>;
         onFocus?: React.FocusEventHandler<{}>;
         onKeyDown?: React.KeyboardEventHandler<{}>;
@@ -1800,13 +1762,17 @@ declare namespace __MaterialUI {
     }
     export class TextField extends React.Component<TextFieldProps, {}> {
         blur(): void;
+
         focus(): void;
+
         select(): void;
+
         getValue(): string;
+
         getInputNode(): HTMLInputElement;
     }
 
-    interface TimePickerProps extends React.Props<TimePicker> {
+    interface TimePickerProps {
         // <TextField/> is element that get the 'other' properties
         autoOk?: boolean;
         cancelLabel?: React.ReactNode;
@@ -1854,16 +1820,13 @@ declare namespace __MaterialUI {
         underlineStyle?: React.CSSProperties;
     }
     export class TimePicker extends React.Component<TimePickerProps, {}> {
-        /** @deprecated Use defaultTime instead. */
-        getTime(): Date;
-        /** @deprecated Use defaultTime instead. */
-        setTime(time: Date): void;
         focus(): void;
+
         openDialog(): void;
     }
 
     export namespace Toolbar {
-        interface ToolbarProps extends React.Props<Toolbar> {
+        interface ToolbarProps {
             className?: string;
             noGutter?: boolean;
             style?: React.CSSProperties;
@@ -1871,7 +1834,7 @@ declare namespace __MaterialUI {
         export class Toolbar extends React.Component<ToolbarProps, {}> {
         }
 
-        interface ToolbarGroupProps extends React.Props<ToolbarGroup> {
+        interface ToolbarGroupProps {
             className?: string;
             firstChild?: boolean;
             float?: "left" | "right";
@@ -1881,7 +1844,7 @@ declare namespace __MaterialUI {
         export class ToolbarGroup extends React.Component<ToolbarGroupProps, {}> {
         }
 
-        interface ToolbarSeparatorProps extends React.Props<ToolbarSeparator> {
+        interface ToolbarSeparatorProps {
             className?: string;
             style?: React.CSSProperties;
         }
@@ -1904,13 +1867,21 @@ declare namespace __MaterialUI {
                 values: number[];
             }
             function convertColorToString(color: any): string;
+
             function convertHexToRGB(color: string): string;
+
             function decomposeColor(color: string): MuiColorObject;
+
             function getContrastRatio(foreground: string, background: string): number;
+
             function getLuminance(color: string): number;
+
             function emphasize(color: string, coefficient?: number): string;
+
             function fade(color: string, value: number): string;
+
             function darken(color: string, coefficient: number): string;
+
             function lighten(color: string, coefficient: number): string;
         }
 
@@ -2107,8 +2078,8 @@ declare module 'material-ui/List/ListItem' {
 }
 
 declare module 'material-ui/List/makeSelectable' {
-    export import MakeSelectable = __MaterialUI.List.makeSelectable;
-    export default MakeSelectable;
+    export import makeSelectable = __MaterialUI.List.makeSelectable;
+    export default makeSelectable;
 }
 
 declare module "material-ui/Menu" {
@@ -6821,7 +6792,6 @@ declare module 'material-ui/styles' {
     export import LightRawTheme = __MaterialUI.Styles.lightBaseTheme;
     export import getMuiTheme = __MaterialUI.Styles.getMuiTheme;
     export import spacing = __MaterialUI.Styles.Spacing;
-    export import themeManager = __MaterialUI.Styles.ThemeManager;
     export import transitions = __MaterialUI.Styles.Transitions;
     export import typography = __MaterialUI.Styles.Typography;
     export import zIndex = __MaterialUI.Styles.zIndex;
@@ -6850,11 +6820,6 @@ declare module 'material-ui/styles/spacing' {
     export default Spacing;
 }
 
-declare module 'material-ui/styles/themeManager' {
-    export import ThemeManager = __MaterialUI.Styles.ThemeManager;
-    export default ThemeManager;
-}
-
 declare module 'material-ui/styles/transitions' {
     export import Transitions = __MaterialUI.Styles.Transitions;
     export default Transitions;
@@ -6870,28 +6835,11 @@ declare module 'material-ui/styles/baseThemes/lightBaseTheme' {
     export default lightBaseTheme;
 }
 
-//** @deprecated use lightBaseTheme instead **/
-declare module 'material-ui/styles/raw-themes/light-raw-theme' {
-    export import LightRawTheme = __MaterialUI.Styles.LightRawTheme;
-    export default LightRawTheme;
-}
-
 declare module 'material-ui/styles/baseThemes/darkBaseTheme' {
     export import darkBaseTheme = __MaterialUI.Styles.darkBaseTheme;
     export default darkBaseTheme;
 }
 
-//** @deprecated use darkBaseTheme instead **/
-declare module 'material-ui/styles/raw-themes/dark-raw-theme' {
-    export import DarkRawTheme = __MaterialUI.Styles.DarkRawTheme;
-    export default DarkRawTheme;
-}
-
-declare module 'material-ui/styles/themeDecorator' {
-    export import themeDecorator = __MaterialUI.Styles.themeDecorator;
-    export default themeDecorator;
-}
-
 declare module 'material-ui/styles/zIndex' {
     export import zIndex = __MaterialUI.Styles.zIndex;
     export default zIndex;
@@ -7310,16 +7258,16 @@ declare module 'material-ui/utils/events' {
     export default Events;
 }
 declare module 'material-ui/utils/withWidth' {
-  export const SMALL: number;
-  export const MEDIUM: number;
-  export const LARGE: number;
+    export const SMALL: number;
+    export const MEDIUM: number;
+    export const LARGE: number;
 
-  interface Options {
-      largeWidth?: number;
-      mediumWidth?: number;
-      resizeInterval?: number;
-  }
-  export default function withWidth<C extends Function>(options?: Options): (component: C) => C;
+    interface Options {
+        largeWidth?: number;
+        mediumWidth?: number;
+        resizeInterval?: number;
+    }
+    export default function withWidth<C extends Function>(options?: Options): (component: C) => C;
 }
 
 declare namespace __MaterialUI.Styles {
@@ -8542,175 +8490,177 @@ declare module "material-ui/svg-icons" {
 declare module 'material-ui/internal/AppCanvas' {
   interface AppCanvasProps extends React.Props<AppCanvas> { }
   class AppCanvas extends React.Component<AppCanvasProps, {}> { }
-  export default AppCanvas;
+    export default AppCanvas;
 }
 declare module 'material-ui/internal/AutoLockScrolling' {
   interface AutoLockScrollingProps extends React.Props<AutoLockScrolling> {
-    lock: boolean;
-  }
+        lock: boolean;
+    }
   class AutoLockScrolling extends React.Component<AutoLockScrollingProps, {}> { }
-  export default AutoLockScrolling;
+    export default AutoLockScrolling;
 }
 declare module 'material-ui/internal/BeforeAfterWrapper' {
   interface BeforeAfterWrapperProps extends React.Props<BeforeAfterWrapper> {
-    afterElementType?: string,
+        afterElementType?: string,
     afterStyle?: React.CSSProperties,
-    beforeElementType?: string,
+        beforeElementType?: string,
     beforeStyle?: React.CSSProperties,
-    elementType?: string,
+        elementType?: string,
     style?: React.CSSProperties,
-  }
+    }
   class BeforeAfterWrapper extends React.Component<BeforeAfterWrapperProps, {}> { }
-  export default BeforeAfterWrapper;
+    export default BeforeAfterWrapper;
 }
 declare module 'material-ui/internal/CircleRipple' {
   interface CircleRippleProps extends React.Props<CircleRipple> {
-    aborted?: boolean;
-    color?: string;
-    opacity?: number;
+        aborted?: boolean;
+        color?: string;
+        opacity?: number;
     style?: React.CSSProperties;
-  }
+    }
   class CircleRipple extends React.Component<CircleRippleProps, {}> { }
-  export default CircleRipple;
+    export default CircleRipple;
 }
 declare module 'material-ui/internal/ClearFix' {
   interface ClearFixProps extends React.Props<ClearFix> {
     style?: React.CSSProperties;
-  }
+    }
   class ClearFix extends React.Component<ClearFixProps, {}> { }
-  export default ClearFix;
+    export default ClearFix;
 }
 declare module 'material-ui/internal/ClickAwayListener' {
   interface ClickAwayListenerProps extends React.Props<ClickAwayListener> {
-    onClickAway?: any,
-  }
+        onClickAway?: any,
+    }
   class ClickAwayListener extends React.Component<ClickAwayListenerProps, {}> { }
-  export default ClickAwayListener;
+    export default ClickAwayListener;
 }
 declare module 'material-ui/internal/EnhancedButton' {
-  interface EnhancedButtonProps extends __MaterialUI.SharedEnhancedButtonProps<EnhancedButton> {}
+    interface EnhancedButtonProps extends __MaterialUI.SharedEnhancedButtonProps<EnhancedButton> {
+    }
   class EnhancedButton extends React.Component<EnhancedButtonProps, {}> {}
-  export default EnhancedButton;
+    export default EnhancedButton;
 }
 declare module 'material-ui/internal/EnhancedSwitch' {
-  interface EnhancedSwitchProps extends __MaterialUI.Switches.CommonEnhancedSwitchProps<EnhancedSwitch> {}
+    interface EnhancedSwitchProps extends __MaterialUI.Switches.CommonEnhancedSwitchProps<EnhancedSwitch> {
+    }
   class EnhancedSwitch extends React.Component<EnhancedSwitchProps, {}> {}
-  export default EnhancedSwitch;
+    export default EnhancedSwitch;
 }
 declare module 'material-ui/internal/ExpandTransition' {
   interface ExpandTransitionProps extends React.Props<ExpandTransition> {
-    enterDelay?: number;
-    loading?: boolean;
-    open?: boolean;
+        enterDelay?: number;
+        loading?: boolean;
+        open?: boolean;
     style?: React.CSSProperties;
-    transitionDelay?: number;
-    transitionDuration?: number;
-  }
+        transitionDelay?: number;
+        transitionDuration?: number;
+    }
   class ExpandTransition extends React.Component<ExpandTransitionProps, {}> { }
-  export default ExpandTransition;
+    export default ExpandTransition;
 }
 declare module 'material-ui/internal/ExpandTransitionChild' {
   interface ExpandTransitionChildProps extends React.Props<ExpandTransitionChild> {
-    enterDelay?: number;
+        enterDelay?: number;
     style?: React.CSSProperties;
-    transitionDelay?: number;
-    transitionDuration?: number;
-  }
+        transitionDelay?: number;
+        transitionDuration?: number;
+    }
   class ExpandTransitionChild extends React.Component<ExpandTransitionChildProps, {}> { }
-  export default ExpandTransitionChild;
+    export default ExpandTransitionChild;
 }
 declare module 'material-ui/internal/FocusRipple' {
   interface FocusRippleProps extends React.Props<FocusRipple> {
-    color?: string,
+        color?: string,
     innerStyle?: React.CSSProperties,
-    opacity?: number,
-    show?: boolean,
+        opacity?: number,
+        show?: boolean,
     style?: React.CSSProperties
-  }
+    }
   class FocusRipple extends React.Component<FocusRippleProps, {}> { }
-  export default FocusRipple;
+    export default FocusRipple;
 }
 declare module 'material-ui/internal/Overlay' {
   interface OverlayProps extends React.Props<Overlay> {
-    autoLockScrolling?: boolean;
-    show: boolean;
+        autoLockScrolling?: boolean;
+        show: boolean;
     style?: React.CSSProperties;
-    transitionEnabled?: boolean;
-  }
+        transitionEnabled?: boolean;
+    }
   class Overlay extends React.Component<OverlayProps, {}> { }
-  export default Overlay;
+    export default Overlay;
 }
 declare module 'material-ui/internal/RenderToLayer' {
   interface RenderToLayerProps extends React.Props<RenderToLayer> {
-    componentClickAway?: Function;
-    open: boolean;
-    render: Function;
-    useLayerForClickAway?: boolean;
-  }
+        componentClickAway?: Function;
+        open: boolean;
+        render: Function;
+        useLayerForClickAway?: boolean;
+    }
   class RenderToLayer extends React.Component<RenderToLayerProps, {}> { }
-  export default RenderToLayer;
+    export default RenderToLayer;
 }
 declare module 'material-ui/internal/ScaleIn' {
   interface ScaleInProps extends React.Props<ScaleIn> {
     childStyle?: React.CSSProperties;
-    enterDelay?: number;
-    maxScale?: number;
-    minScale?: number;
-  }
+        enterDelay?: number;
+        maxScale?: number;
+        minScale?: number;
+    }
   class ScaleIn extends React.Component<ScaleInProps, {}> { }
-  export default ScaleIn;
+    export default ScaleIn;
 }
 declare module 'material-ui/internal/ScaleInChild' {
   interface ScaleInChildProps extends React.Props<ScaleInChild> {
-    enterDelay?: number;
-    maxScale?: number;
-    minScale?: number;
+        enterDelay?: number;
+        maxScale?: number;
+        minScale?: number;
     style?: React.CSSProperties;
-  }
+    }
   class ScaleInChild extends React.Component<ScaleInChildProps, {}> { }
-  export default ScaleInChild;
+    export default ScaleInChild;
 }
 declare module 'material-ui/internal/SlideIn' {
   interface SlideInProps extends React.Props<SlideIn> {
     childStyle?: React.CSSProperties;
-    direction?: __MaterialUI.propTypes.direction;
-    enterDelay?: number;
+        direction?: __MaterialUI.propTypes.direction;
+        enterDelay?: number;
     style?: React.CSSProperties;
-  }
+    }
   class SlideIn extends React.Component<SlideInProps, {}> { }
-  export default SlideIn;
+    export default SlideIn;
 }
 declare module 'material-ui/internal/SlideInChild' {
   interface SlideInChildProps extends React.Props<SlideInChild> {
-    direction?: string,
-    enterDelay?: number;
-    getLeaveDirection: Function;
+        direction?: string,
+        enterDelay?: number;
+        getLeaveDirection: Function;
     style?: React.CSSProperties;
-  }
+    }
   class SlideInChild extends React.Component<SlideInChildProps, {}> { }
-  export default SlideInChild;
+    export default SlideInChild;
 }
 declare module 'material-ui/internal/Tooltip' {
   interface TooltipProps extends React.Props<Tooltip> {
-    className?: string;
-    horizontalPosition?: __MaterialUI.propTypes.horizontal;
-    label: any;
-    show?: boolean;
+        className?: string;
+        horizontalPosition?: __MaterialUI.propTypes.horizontal;
+        label: any;
+        show?: boolean;
     style?: React.CSSProperties;
-    touch?: boolean;
-    verticalPosition?: __MaterialUI.propTypes.vertical;
-  }
+        touch?: boolean;
+        verticalPosition?: __MaterialUI.propTypes.vertical;
+    }
   class Tooltip extends React.Component<TooltipProps, {}> { }
-  export default Tooltip;
+    export default Tooltip;
 }
 declare module 'material-ui/internal/TouchRipple' {
   interface TouchRippleProps extends React.Props<TouchRipple> {
-    abortOnScroll?: boolean,
-    centerRipple?: boolean;
-    color?: string;
-    opacity?: number;
+        abortOnScroll?: boolean,
+        centerRipple?: boolean;
+        color?: string;
+        opacity?: number;
     style?: React.CSSProperties
-  }
+    }
   class TouchRipple extends React.Component<TouchRippleProps, {}> { }
-  export default TouchRipple;
+    export default TouchRipple;
 }
diff --git a/material-ui/material-ui-tests.tsx b/material-ui/material-ui-tests.tsx
index f9b992f875..d1654cbd9d 100644
--- a/material-ui/material-ui-tests.tsx
+++ b/material-ui/material-ui-tests.tsx
@@ -1,7 +1,7 @@
-///<reference types='react' />
-///<reference types='react-dom' />
-///<reference types='react-tap-event-plugin' />
-///<reference types='material-ui' />
+/// <reference types="react" />
+/// <reference types="react-dom" />
+/// <reference types="react-tap-event-plugin" />
+/// <reference types="material-ui" />
 
 import * as React from 'react';
 import {Component, PropTypes} from 'react';
@@ -109,148 +109,148 @@ import injectTapEventPlugin = require('react-tap-event-plugin');
 injectTapEventPlugin();
 
 function handleTouchTap() {
-    alert('onTouchTap triggered on the title component');
+  alert('onTouchTap triggered on the title component');
 }
 
 const styles = {
-    title: {
-        cursor: 'pointer',
-    },
-    exampleImageInput: {
-        cursor: 'pointer',
-        position: 'absolute',
-        top: 0,
-        bottom: 0,
-        right: 0,
-        left: 0,
-        width: '100%',
-        opacity: 0,
-    },
-    button: {
-        margin: 12,
-    },
-    chip: {
-        margin: 4
-    },
-    smallIcon: {
-        width: 36,
-        height: 36,
-    },
-    mediumIcon: {
-        width: 48,
-        height: 48,
-    },
-    largeIcon: {
-        width: 60,
-        height: 60,
-    },
-    small: {
-        width: 72,
-        height: 72,
-        padding: 16,
-    },
-    medium: {
-        width: 96,
-        height: 96,
-        padding: 24,
-    },
-    large: {
-        width: 120,
-        height: 120,
-        padding: 30,
-    },
-    radioButton: {
-        marginTop: 16,
-    },
-    root: {
-        display: 'flex',
-        flexWrap: 'wrap',
-        justifyContent: 'space-around' as 'space-around',
-    },
-    gridList: {
-        width: 500,
-        height: 500,
-        overflowY: 'auto',
-        marginBottom: 24,
-    },
-    paper: {
-        display: 'inline-block',
-        float: 'left',
-        margin: '16px 32px 16px 0',
-    },
-    rightIcon: {
-        textAlign: 'center',
-        lineHeight: '24px',
-    },
-    customWidth: {
-        width: 200,
-    },
-    h3: {
-        marginTop: 20,
-        fontWeight: 400,
-    },
-    block: {
-        display: 'flex',
-        maxWidth: 250,
-    },
-    block2: {
-        margin: 10,
-    },
-    container: {
-        position: 'relative',
-    },
-    refresh: {
-        display: 'inline-block',
-        position: 'relative',
-    },
-    checkbox: {
-        marginBottom: 16,
-    },
-    toggle: {
-        marginBottom: 16,
-    },
-    propContainer: {
-        width: 200,
-        overflow: 'hidden',
-        margin: '20px auto 0',
-    },
-    propToggleHeader: {
-        margin: '20px auto 10px',
-    },
-    headline: {
-        fontSize: 24,
-        paddingTop: 16,
-        marginBottom: 12,
-        fontWeight: 400,
-    },
-    errorStyle: {
-        color: orange500,
-    },
-    underlineStyle: {
-        borderColor: orange500,
-    },
-    floatingLabelStyle: {
-        color: orange500,
-    },
-    floatingLabelFocusStyle: {
-        color: blue500,
-    },
+  title: {
+    cursor: 'pointer',
+  },
+  exampleImageInput: {
+    cursor: 'pointer',
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    right: 0,
+    left: 0,
+    width: '100%',
+    opacity: 0,
+  },
+  button: {
+    margin: 12,
+  },
+  chip: {
+    margin: 4
+  },
+  smallIcon: {
+    width: 36,
+    height: 36,
+  },
+  mediumIcon: {
+    width: 48,
+    height: 48,
+  },
+  largeIcon: {
+    width: 60,
+    height: 60,
+  },
+  small: {
+    width: 72,
+    height: 72,
+    padding: 16,
+  },
+  medium: {
+    width: 96,
+    height: 96,
+    padding: 24,
+  },
+  large: {
+    width: 120,
+    height: 120,
+    padding: 30,
+  },
+  radioButton: {
+    marginTop: 16,
+  },
+  root: {
+    display: 'flex',
+    flexWrap: 'wrap',
+    justifyContent: 'space-around',
+  } as React.CSSProperties,
+  gridList: {
+    width: 500,
+    height: 500,
+    overflowY: 'auto',
+    marginBottom: 24,
+  },
+  paper: {
+    display: 'inline-block',
+    float: 'left',
+    margin: '16px 32px 16px 0',
+  },
+  rightIcon: {
+    textAlign: 'center',
+    lineHeight: '24px',
+  },
+  customWidth: {
+    width: 200,
+  },
+  h3: {
+    marginTop: 20,
+    fontWeight: 400,
+  },
+  block: {
+    display: 'flex',
+    maxWidth: 250,
+  },
+  block2: {
+    margin: 10,
+  },
+  container: {
+    position: 'relative',
+  },
+  refresh: {
+    display: 'inline-block',
+    position: 'relative',
+  },
+  checkbox: {
+    marginBottom: 16,
+  },
+  toggle: {
+    marginBottom: 16,
+  },
+  propContainer: {
+    width: 200,
+    overflow: 'hidden',
+    margin: '20px auto 0',
+  },
+  propToggleHeader: {
+    margin: '20px auto 10px',
+  },
+  headline: {
+    fontSize: 24,
+    paddingTop: 16,
+    marginBottom: 12,
+    fontWeight: 400,
+  },
+  errorStyle: {
+    color: orange500,
+  },
+  underlineStyle: {
+    borderColor: orange500,
+  },
+  floatingLabelStyle: {
+    color: orange500,
+  },
+  floatingLabelFocusStyle: {
+    color: blue500,
+  },
 };
 
 const style = {
-    marginRight: 20,
-    marginLeft: 20,
-    display: 'inline-block',
-    margin: '16px 32px 16px 0',
+  marginRight: 20,
+  marginLeft: 20,
+  display: 'inline-block',
+  margin: '16px 32px 16px 0',
 };
 
 const customContentStyle = {
-    width: '100%',
-    maxWidth: 'none',
+  width: '100%',
+  maxWidth: 'none',
 };
 
 const iconStyles = {
-    marginRight: 24,
+  marginRight: 24,
 };
 
 // "http://www.material-ui.com/#/customization/themes"
@@ -259,107 +259,107 @@ const iconStyles = {
 // and then update the keys for each component that depends on it.
 // More on Colors: http://www.material-ui.com/#/customization/colors
 const muiTheme = getMuiTheme({
-    palette: {
-        textColor: cyan500,
-    },
-    appBar: {
-        height: 50,
-    },
+  palette: {
+    textColor: cyan500,
+  },
+  appBar: {
+    height: 50,
+  },
 });
 
 const darkMuiTheme = getMuiTheme(darkBaseTheme);
 
 const lightBaseTheme = {
-    spacing: {
-        iconSize: 24,
-        desktopGutter: 24,
-        desktopGutterMore: 32,
-        desktopGutterLess: 16,
-        desktopGutterMini: 8,
-        desktopKeylineIncrement: 64,
-        desktopDropDownMenuItemHeight: 32,
-        desktopDropDownMenuFontSize: 15,
-        desktopDrawerMenuItemHeight: 48,
-        desktopSubheaderHeight: 48,
-        desktopToolbarHeight: 56,
-    },
-    fontFamily: 'Roboto, sans-serif',
-    palette: {
-        primary1Color: cyan500,
-        primary2Color: cyan700,
-        primary3Color: grey400,
-        accent1Color: pinkA200,
-        accent2Color: grey100,
-        accent3Color: grey500,
-        textColor: darkBlack,
-        alternateTextColor: white,
-        canvasColor: white,
-        borderColor: grey300,
-        disabledColor: fade(darkBlack, 0.3),
-        pickerHeaderColor: cyan500,
-        clockCircleColor: fade(darkBlack, 0.07),
-        shadowColor: fullBlack,
-    },
+  spacing: {
+    iconSize: 24,
+    desktopGutter: 24,
+    desktopGutterMore: 32,
+    desktopGutterLess: 16,
+    desktopGutterMini: 8,
+    desktopKeylineIncrement: 64,
+    desktopDropDownMenuItemHeight: 32,
+    desktopDropDownMenuFontSize: 15,
+    desktopDrawerMenuItemHeight: 48,
+    desktopSubheaderHeight: 48,
+    desktopToolbarHeight: 56,
+  },
+  fontFamily: 'Roboto, sans-serif',
+  palette: {
+    primary1Color: cyan500,
+    primary2Color: cyan700,
+    primary3Color: grey400,
+    accent1Color: pinkA200,
+    accent2Color: grey100,
+    accent3Color: grey500,
+    textColor: darkBlack,
+    alternateTextColor: white,
+    canvasColor: white,
+    borderColor: grey300,
+    disabledColor: fade(darkBlack, 0.3),
+    pickerHeaderColor: cyan500,
+    clockCircleColor: fade(darkBlack, 0.07),
+    shadowColor: fullBlack,
+  },
 };
 
 const lightMuiTheme = getMuiTheme(lightBaseTheme);
 
 
 class DeepDownTheTree extends React.Component<{} & {muiTheme: MuiTheme}, {}> {
-    static propTypes: React.ValidationMap<any> = {
-        muiTheme: React.PropTypes.object.isRequired,
-    };
+  static propTypes: React.ValidationMap<any> = {
+    muiTheme: React.PropTypes.object.isRequired,
+  };
 
-    render() {
-        return (
-            <span style={{color: this.props.muiTheme.palette.textColor}}>
+  render() {
+    return (
+      <span style={{color: this.props.muiTheme.palette.textColor}}>
         Hello World!
       </span>
-        );
-    }
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/customization/inline-styles"
 const InlineStylesCheckbox = () => (
-    <Checkbox
-        id="checkboxId1"
-        name="checkboxName1"
-        value="checkboxValue1"
-        label="went for a run today"
-        style={{
+  <Checkbox
+    id="checkboxId1"
+    name="checkboxName1"
+    value="checkboxValue1"
+    label="went for a run today"
+    style={{
       width: '50%',
       margin: '0 auto'
     }}
-        iconStyle={{
+    iconStyle={{
       fill: '#FF4081'
     }}
-    />
+  />
 );
 
 
 // "http://www.material-ui.com/#/components/app-bar"
 const AppBarExampleIcon = () => (
-    <AppBar
-        title="Title"
-        iconClassNameRight="muidocs-icon-navigation-expand-more"
-    />
+  <AppBar
+    title="Title"
+    iconClassNameRight="muidocs-icon-navigation-expand-more"
+  />
 );
 
 const AppBarExampleIconButton = () => (
-    <AppBar
-        title={<span style={styles.title}>Title</span>}
-        onTitleTouchTap={handleTouchTap}
-        iconElementLeft={<IconButton><NavigationClose /></IconButton>}
-        iconElementRight={<FlatButton label="Save" />}
-    />
+  <AppBar
+    title={<span style={styles.title}>Title</span>}
+    onTitleTouchTap={handleTouchTap}
+    iconElementLeft={<IconButton><NavigationClose /></IconButton>}
+    iconElementRight={<FlatButton label="Save" />}
+  />
 );
 
 const AppBarExampleIconMenu = () => (
-    <AppBar
-        title="Title"
-        iconElementLeft={<IconButton><NavigationClose /></IconButton>}
-        iconElementRight={
+  <AppBar
+    title="Title"
+    iconElementLeft={<IconButton><NavigationClose /></IconButton>}
+    iconElementRight={
       <IconMenu
         iconButtonElement={
           <IconButton><MoreVertIcon /></IconButton>
@@ -372,192 +372,192 @@ const AppBarExampleIconMenu = () => (
         <MenuItem primaryText="Sign out" />
       </IconMenu>
     }
-    />
+  />
 );
 
 // "http://www.material-ui.com/#/components/auto-complete"
 export class AutoCompleteExampleSimple extends React.Component<{}, {dataSource: string[]}> {
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            dataSource: [],
-        };
-    }
-
-    handleUpdateInput = (value) => {
-        this.setState({
-            dataSource: [
-                value,
-                value + value,
-                value + value + value,
-            ],
-        });
+    this.state = {
+      dataSource: [],
     };
+  }
 
-    render() {
-        return (
-            <div>
-                <AutoComplete
-                    hintText="Type anything"
-                    dataSource={this.state.dataSource}
-                    onUpdateInput={this.handleUpdateInput}
-                />
-                <AutoComplete
-                    hintText="Type anything"
-                    dataSource={this.state.dataSource}
-                    onUpdateInput={this.handleUpdateInput}
-                    floatingLabelText="Full width"
-                    fullWidth={true}
+  handleUpdateInput = (value) => {
+    this.setState({
+      dataSource: [
+        value,
+        value + value,
+        value + value + value,
+      ],
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <AutoComplete
+          hintText="Type anything"
+          dataSource={this.state.dataSource}
+          onUpdateInput={this.handleUpdateInput}
+        />
+        <AutoComplete
+          hintText="Type anything"
+          dataSource={this.state.dataSource}
+          onUpdateInput={this.handleUpdateInput}
+          floatingLabelText="Full width"
+          fullWidth={true}
                     popoverProps={{
             animated: true
           }}
-                />
-            </div>
-        );
-    }
+        />
+      </div>
+    );
+  }
 }
 
 const dataSource1 = [
-    {
-        text: 'text-value1',
-        value: (
-            <MenuItem
-                primaryText="text-value1"
-                secondaryText="&#9786;"
-            />
-        ),
-    },
-    {
-        text: 'text-value2',
-        value: (
-            <MenuItem
-                primaryText="text-value2"
-                secondaryText="&#9786;"
-            />
-        ),
-    },
+  {
+    text: 'text-value1',
+    value: (
+      <MenuItem
+        primaryText="text-value1"
+        secondaryText="&#9786;"
+      />
+    ),
+  },
+  {
+    text: 'text-value2',
+    value: (
+      <MenuItem
+        primaryText="text-value2"
+        secondaryText="&#9786;"
+      />
+    ),
+  },
 ];
 
 const dataSource2 = ['12345', '23456', '34567'];
 
 const dataSource3 = [
-    {text: 'Some Text', value: 'someFirstValue'},
-    {text: 'Some Text', value: 'someSecondValue'},
+  {text: 'Some Text', value: 'someFirstValue'},
+  {text: 'Some Text', value: 'someSecondValue'},
 ];
 
 const AutoCompleteExampleNoFilter = () => (
-    <div>
-        <AutoComplete
-            hintText="text-value data"
-            filter={AutoComplete.noFilter}
-            dataSource={dataSource1}
-        /><br />
-        <AutoComplete
-            floatingLabelText="showAllItems"
-            filter={AutoComplete.noFilter}
-            openOnFocus={true}
-            dataSource={dataSource2}
-        /><br />
-        <AutoComplete
-            floatingLabelText="Same text, different values"
-            filter={AutoComplete.noFilter}
-            openOnFocus={true}
-            dataSource={dataSource3}
-        />
-    </div>
+  <div>
+    <AutoComplete
+      hintText="text-value data"
+      filter={AutoComplete.noFilter}
+      dataSource={dataSource1}
+    /><br />
+    <AutoComplete
+      floatingLabelText="showAllItems"
+      filter={AutoComplete.noFilter}
+      openOnFocus={true}
+      dataSource={dataSource2}
+    /><br />
+    <AutoComplete
+      floatingLabelText="Same text, different values"
+      filter={AutoComplete.noFilter}
+      openOnFocus={true}
+      dataSource={dataSource3}
+    />
+  </div>
 );
 
 const colors = [
-    'Red',
-    'Orange',
-    'Yellow',
-    'Green',
-    'Blue',
-    'Purple',
-    'Black',
-    'White',
+  'Red',
+  'Orange',
+  'Yellow',
+  'Green',
+  'Blue',
+  'Purple',
+  'Black',
+  'White',
 ];
 
 const fruit = [
-    'Apple', 'Apricot', 'Avocado',
-    'Banana', 'Bilberry', 'Blackberry', 'Blackcurrant', 'Blueberry',
-    'Boysenberry', 'Blood Orange',
-    'Cantaloupe', 'Currant', 'Cherry', 'Cherimoya', 'Cloudberry',
-    'Coconut', 'Cranberry', 'Clementine',
-    'Damson', 'Date', 'Dragonfruit', 'Durian',
-    'Elderberry',
-    'Feijoa', 'Fig',
-    'Goji berry', 'Gooseberry', 'Grape', 'Grapefruit', 'Guava',
-    'Honeydew', 'Huckleberry',
-    'Jabouticaba', 'Jackfruit', 'Jambul', 'Jujube', 'Juniper berry',
-    'Kiwi fruit', 'Kumquat',
-    'Lemon', 'Lime', 'Loquat', 'Lychee',
-    'Nectarine',
-    'Mango', 'Marion berry', 'Melon', 'Miracle fruit', 'Mulberry', 'Mandarine',
-    'Olive', 'Orange',
-    'Papaya', 'Passionfruit', 'Peach', 'Pear', 'Persimmon', 'Physalis', 'Plum', 'Pineapple',
-    'Pumpkin', 'Pomegranate', 'Pomelo', 'Purple Mangosteen',
-    'Quince',
-    'Raspberry', 'Raisin', 'Rambutan', 'Redcurrant',
-    'Salal berry', 'Satsuma', 'Star fruit', 'Strawberry', 'Squash', 'Salmonberry',
-    'Tamarillo', 'Tamarind', 'Tomato', 'Tangerine',
-    'Ugli fruit',
-    'Watermelon',
+  'Apple', 'Apricot', 'Avocado',
+  'Banana', 'Bilberry', 'Blackberry', 'Blackcurrant', 'Blueberry',
+  'Boysenberry', 'Blood Orange',
+  'Cantaloupe', 'Currant', 'Cherry', 'Cherimoya', 'Cloudberry',
+  'Coconut', 'Cranberry', 'Clementine',
+  'Damson', 'Date', 'Dragonfruit', 'Durian',
+  'Elderberry',
+  'Feijoa', 'Fig',
+  'Goji berry', 'Gooseberry', 'Grape', 'Grapefruit', 'Guava',
+  'Honeydew', 'Huckleberry',
+  'Jabouticaba', 'Jackfruit', 'Jambul', 'Jujube', 'Juniper berry',
+  'Kiwi fruit', 'Kumquat',
+  'Lemon', 'Lime', 'Loquat', 'Lychee',
+  'Nectarine',
+  'Mango', 'Marion berry', 'Melon', 'Miracle fruit', 'Mulberry', 'Mandarine',
+  'Olive', 'Orange',
+  'Papaya', 'Passionfruit', 'Peach', 'Pear', 'Persimmon', 'Physalis', 'Plum', 'Pineapple',
+  'Pumpkin', 'Pomegranate', 'Pomelo', 'Purple Mangosteen',
+  'Quince',
+  'Raspberry', 'Raisin', 'Rambutan', 'Redcurrant',
+  'Salal berry', 'Satsuma', 'Star fruit', 'Strawberry', 'Squash', 'Salmonberry',
+  'Tamarillo', 'Tamarind', 'Tomato', 'Tangerine',
+  'Ugli fruit',
+  'Watermelon',
 ];
 
 const AutoCompleteExampleFilters = () => (
-    <div>
-        <AutoComplete
-            floatingLabelText="Type 'r', case insensitive"
-            filter={AutoComplete.caseInsensitiveFilter}
-            dataSource={colors}
-        />
-        <br />
-        <AutoComplete
-            floatingLabelText="Type 'peah', fuzzy search"
-            filter={AutoComplete.fuzzyFilter}
-            dataSource={fruit}
-            maxSearchResults={5}
-        />
-    </div>
+  <div>
+    <AutoComplete
+      floatingLabelText="Type 'r', case insensitive"
+      filter={AutoComplete.caseInsensitiveFilter}
+      dataSource={colors}
+    />
+    <br />
+    <AutoComplete
+      floatingLabelText="Type 'peah', fuzzy search"
+      filter={AutoComplete.fuzzyFilter}
+      dataSource={fruit}
+      maxSearchResults={5}
+    />
+  </div>
 );
 
 // "http://www.material-ui.com/#/components/avatar"
 const AvatarExampleSimple = () => (
-    <List>
-        <ListItem
-            disabled={true}
-            leftAvatar={
+  <List>
+    <ListItem
+      disabled={true}
+      leftAvatar={
         <Avatar src="images/uxceo-128.jpg" />
       }
-        >
-            Image Avatar
-        </ListItem>
-        <ListItem
-            disabled={true}
-            leftAvatar={
+    >
+      Image Avatar
+    </ListItem>
+    <ListItem
+      disabled={true}
+      leftAvatar={
         <Avatar
           src="images/uxceo-128.jpg"
           size={30}
           style={style}
         />
       }
-        >
-            Image Avatar with custom size
-        </ListItem>
-        <ListItem
-            disabled={true}
-            leftAvatar={
+    >
+      Image Avatar with custom size
+    </ListItem>
+    <ListItem
+      disabled={true}
+      leftAvatar={
         <Avatar icon={<FontIcon className="muidocs-icon-communication-voicemail" />} />
       }
-        >
-            FontIcon Avatar
-        </ListItem>
-        <ListItem
-            disabled={true}
-            leftAvatar={
+    >
+      FontIcon Avatar
+    </ListItem>
+    <ListItem
+      disabled={true}
+      leftAvatar={
         <Avatar
           icon={<FontIcon className="muidocs-icon-communication-voicemail" />}
           color={blue300}
@@ -566,20 +566,20 @@ const AvatarExampleSimple = () => (
           style={style}
         />
       }
-        >
-            FontIcon Avatar with custom colors and size
-        </ListItem>
-        <ListItem
-            disabled={true}
-            leftAvatar={
+    >
+      FontIcon Avatar with custom colors and size
+    </ListItem>
+    <ListItem
+      disabled={true}
+      leftAvatar={
         <Avatar icon={<FileFolder />} />
       }
-        >
-            SvgIcon Avatar
-        </ListItem>
-        <ListItem
-            disabled={true}
-            leftAvatar={
+    >
+      SvgIcon Avatar
+    </ListItem>
+    <ListItem
+      disabled={true}
+      leftAvatar={
         <Avatar
           icon={<FileFolder />}
           color={orange200}
@@ -588,18 +588,18 @@ const AvatarExampleSimple = () => (
           style={style}
         />
       }
-        >
-            SvgIcon Avatar with custom colors and size
-        </ListItem>
-        <ListItem
-            disabled={true}
-            leftAvatar={<Avatar>A</Avatar>}
-        >
-            Letter Avatar
-        </ListItem>
-        <ListItem
-            disabled={true}
-            leftAvatar={
+    >
+      SvgIcon Avatar with custom colors and size
+    </ListItem>
+    <ListItem
+      disabled={true}
+      leftAvatar={<Avatar>A</Avatar>}
+    >
+      Letter Avatar
+    </ListItem>
+    <ListItem
+      disabled={true}
+      leftAvatar={
         <Avatar
           color={deepOrange300}
           backgroundColor={purple500}
@@ -609,1269 +609,1269 @@ const AvatarExampleSimple = () => (
           A
         </Avatar>
       }
-        >
-            Letter Avatar with custom colors and size
-        </ListItem>
-    </List>
+    >
+      Letter Avatar with custom colors and size
+    </ListItem>
+  </List>
 );
 
 
 // "http://www.material-ui.com/#/components/badge"
 const BadgeExampleSimple = () => (
-    <div>
-        <Badge
-            badgeContent={4}
-            primary={true}
-        >
-            <NotificationsIcon />
-        </Badge>
-        <Badge
-            badgeContent={10}
-            secondary={true}
-            badgeStyle={{top: 12, right: 12}}
-        >
-            <IconButton tooltip="Notifications">
-                <NotificationsIcon />
-            </IconButton>
-        </Badge>
-    </div>
+  <div>
+    <Badge
+      badgeContent={4}
+      primary={true}
+    >
+      <NotificationsIcon />
+    </Badge>
+    <Badge
+      badgeContent={10}
+      secondary={true}
+      badgeStyle={{top: 12, right: 12}}
+    >
+      <IconButton tooltip="Notifications">
+        <NotificationsIcon />
+      </IconButton>
+    </Badge>
+  </div>
 );
 
 const BadgeExampleContent = () => (
-    <div>
-        <Badge
-            badgeContent={<IconButton tooltip="Backup"><UploadIcon /></IconButton>}
-        >
-            <FolderIcon />
-        </Badge>
-        <Badge
-            badgeContent="&copy;"
-            badgeStyle={{fontSize: 20}}
-        >
-            Company Name
-        </Badge>
-    </div>
+  <div>
+    <Badge
+      badgeContent={<IconButton tooltip="Backup"><UploadIcon /></IconButton>}
+    >
+      <FolderIcon />
+    </Badge>
+    <Badge
+      badgeContent="&copy;"
+      badgeStyle={{fontSize: 20}}
+    >
+      Company Name
+    </Badge>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/flat-button"
 const FlatButtonExampleSimple = () => (
-    <div>
+  <div>
         <FlatButton label="Default"/>
         <FlatButton label="Primary" primary={true}/>
         <FlatButton label="Secondary" secondary={true}/>
         <FlatButton label="Disabled" disabled={true}/>
-    </div>
+  </div>
 );
 
 const FlatButtonExampleComplex = () => (
-    <div>
-        <FlatButton label="Choose an Image" labelPosition="before">
+  <div>
+    <FlatButton label="Choose an Image" labelPosition="before">
             <input type="file" style={styles.exampleImageInput}/>
-        </FlatButton>
+    </FlatButton>
 
-        <FlatButton
-            label={<span>Label before</span>}
-            labelPosition="before"
-            primary={true}
-            style={styles.button}
-            icon={<ActionAndroid />}
-        />
+    <FlatButton
+      label={<span>Label before</span>}
+      labelPosition="before"
+      primary={true}
+      style={styles.button}
+      icon={<ActionAndroid />}
+    />
 
-        <FlatButton
-            label="GitHub Link"
-            href="https://github.com/callemall/material-ui"
-            secondary={true}
-            icon={<FontIcon className="muidocs-icon-custom-github" />}
-        />
+    <FlatButton
+      label="GitHub Link"
+      href="https://github.com/callemall/material-ui"
+      secondary={true}
+      icon={<FontIcon className="muidocs-icon-custom-github" />}
+    />
 
-    </div>
+  </div>
 );
 
 const FlatButtonExampleIcon = () => (
-    <div>
-        <FlatButton
-            icon={<ActionAndroid />}
-            style={style}
-        />
-        <FlatButton
-            backgroundColor="#a4c639"
-            hoverColor="#8AA62F"
-            icon={<ActionAndroid color={fullWhite} />}
-            style={style}
-        />
-        <FlatButton
-            href="https://github.com/callemall/material-ui"
-            secondary={true}
-            icon={<FontIcon className="muidocs-icon-custom-github" />}
-            style={style}
-        />
-    </div>
+  <div>
+    <FlatButton
+      icon={<ActionAndroid />}
+      style={style}
+    />
+    <FlatButton
+      backgroundColor="#a4c639"
+      hoverColor="#8AA62F"
+      icon={<ActionAndroid color={fullWhite} />}
+      style={style}
+    />
+    <FlatButton
+      href="https://github.com/callemall/material-ui"
+      secondary={true}
+      icon={<FontIcon className="muidocs-icon-custom-github" />}
+      style={style}
+    />
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/raised-button"
 const RaisedButtonExampleSimple = () => (
-    <div>
+  <div>
         <RaisedButton label="Default" style={style}/>
         <RaisedButton label="Primary" primary={true} style={style}/>
         <RaisedButton label="Secondary" secondary={true} style={style}/>
         <RaisedButton label="Disabled" disabled={true} style={style}/>
-    </div>
+  </div>
 );
 
 const RaisedButtonExampleComplex = () => (
-    <div>
-        <RaisedButton
-            label="Choose an Image"
-            labelPosition="before"
-            style={styles.button}
-        >
+  <div>
+    <RaisedButton
+      label="Choose an Image"
+      labelPosition="before"
+      style={styles.button}
+    >
             <input type="file" style={styles.exampleImageInput}/>
-        </RaisedButton>
-        <RaisedButton
+    </RaisedButton>
+    <RaisedButton
             buttonStyle={styles.button}
-            label={<span>Label before</span>}
-            labelPosition="before"
-            primary={true}
-            icon={<ActionAndroid />}
-        />
-        <RaisedButton
-            label="Github Link"
-            href="https://github.com/callemall/material-ui"
-            secondary={true}
-            style={styles.button}
-            icon={<FontIcon className="muidocs-icon-custom-github" />}
-        />
-    </div>
+      label={<span>Label before</span>}
+      labelPosition="before"
+      primary={true}
+      icon={<ActionAndroid />}
+    />
+    <RaisedButton
+      label="Github Link"
+      href="https://github.com/callemall/material-ui"
+      secondary={true}
+      style={styles.button}
+      icon={<FontIcon className="muidocs-icon-custom-github" />}
+    />
+  </div>
 );
 
 const RaisedButtonExampleIcon = () => (
-    <div>
-        <RaisedButton
-            icon={<ActionAndroid />}
-            style={style}
-        />
-        <RaisedButton
-            backgroundColor="#a4c639"
-            icon={<ActionAndroid color={fullWhite} />}
-            style={style}
-        />
-        <RaisedButton
-            href="https://github.com/callemall/material-ui"
-            secondary={true}
-            icon={<FontIcon className="muidocs-icon-custom-github" />}
-            style={style}
-        />
-    </div>
+  <div>
+    <RaisedButton
+      icon={<ActionAndroid />}
+      style={style}
+    />
+    <RaisedButton
+      backgroundColor="#a4c639"
+      icon={<ActionAndroid color={fullWhite} />}
+      style={style}
+    />
+    <RaisedButton
+      href="https://github.com/callemall/material-ui"
+      secondary={true}
+      icon={<FontIcon className="muidocs-icon-custom-github" />}
+      style={style}
+    />
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/floating-action-button"
 const FloatingActionButtonExampleSimple = () => (
-    <div>
-        <FloatingActionButton style={style}>
-            <ContentAdd />
-        </FloatingActionButton>
+  <div>
+    <FloatingActionButton style={style}>
+      <ContentAdd />
+    </FloatingActionButton>
 
-        <FloatingActionButton mini={true} style={style}>
-            <ContentAdd />
-        </FloatingActionButton>
+    <FloatingActionButton mini={true} style={style}>
+      <ContentAdd />
+    </FloatingActionButton>
 
-        <FloatingActionButton secondary={true} style={style}>
-            <ContentAdd />
-        </FloatingActionButton>
+    <FloatingActionButton secondary={true} style={style}>
+      <ContentAdd />
+    </FloatingActionButton>
 
-        <FloatingActionButton mini={true} secondary={true} style={style}>
-            <ContentAdd />
-        </FloatingActionButton>
+    <FloatingActionButton mini={true} secondary={true} style={style}>
+      <ContentAdd />
+    </FloatingActionButton>
 
-        <FloatingActionButton disabled={true} style={style}>
-            <ContentAdd />
-        </FloatingActionButton>
+    <FloatingActionButton disabled={true} style={style}>
+      <ContentAdd />
+    </FloatingActionButton>
 
-        <FloatingActionButton mini={true} disabled={true} style={style}>
-            <ContentAdd />
-        </FloatingActionButton>
-    </div>
+    <FloatingActionButton mini={true} disabled={true} style={style}>
+      <ContentAdd />
+    </FloatingActionButton>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/icon-button"
 const IconButtonExampleSimple = () => (
-    <div>
+  <div>
         <IconButton iconClassName="muidocs-icon-custom-github"/>
         <IconButton iconClassName="muidocs-icon-custom-github" disabled={true}/>
-    </div>
+  </div>
 );
 
 const IconButtonExampleComplex = () => (
-    <div>
-        <IconButton tooltip="Font Icon">
+  <div>
+    <IconButton tooltip="Font Icon">
             <FontIcon className="muidocs-icon-action-home"/>
-        </IconButton>
+    </IconButton>
 
-        <IconButton tooltip="SVG Icon">
-            <ActionHome />
-        </IconButton>
+    <IconButton tooltip="SVG Icon">
+      <ActionHome />
+    </IconButton>
 
-        <IconButton
-            iconClassName="material-icons"
-            tooltip="Ligature"
-        >
-            home
-        </IconButton>
-    </div>
+    <IconButton
+      iconClassName="material-icons"
+      tooltip="Ligature"
+    >
+      home
+    </IconButton>
+  </div>
 );
 
 const IconButtonExampleSize = () => (
-    <div>
-        <IconButton>
-            <ActionHome />
-        </IconButton>
+  <div>
+    <IconButton>
+      <ActionHome />
+    </IconButton>
 
-        <IconButton
-            iconStyle={styles.smallIcon}
-            style={styles.small}
-        >
-            <ActionHome />
-        </IconButton>
+    <IconButton
+      iconStyle={styles.smallIcon}
+      style={styles.small}
+    >
+      <ActionHome />
+    </IconButton>
 
-        <IconButton
-            iconStyle={styles.mediumIcon}
-            style={styles.medium}
-        >
-            <ActionHome />
-        </IconButton>
+    <IconButton
+      iconStyle={styles.mediumIcon}
+      style={styles.medium}
+    >
+      <ActionHome />
+    </IconButton>
 
-        <IconButton
-            iconStyle={styles.largeIcon}
-            style={styles.large}
-        >
-            <ActionHome />
-        </IconButton>
-    </div>
+    <IconButton
+      iconStyle={styles.largeIcon}
+      style={styles.large}
+    >
+      <ActionHome />
+    </IconButton>
+  </div>
 );
 
 const IconButtonExampleTooltip = () => (
-    <div>
-        <IconButton
-            iconClassName="muidocs-icon-custom-github" tooltip="bottom-right"
-            tooltipPosition="bottom-right"
-        />
-        <IconButton
-            iconClassName="muidocs-icon-custom-github" tooltip="bottom-center"
-            tooltipPosition="bottom-center"
-        />
-        <IconButton
-            iconClassName="muidocs-icon-custom-github" tooltip="bottom-left"
-            tooltipPosition="bottom-left"
-        />
-        <IconButton
-            iconClassName="muidocs-icon-custom-github" tooltip="top-right"
-            tooltipPosition="top-right"
-        />
-        <IconButton
-            iconClassName="muidocs-icon-custom-github" tooltip="top-center"
-            tooltipPosition="top-center"
-        />
-        <IconButton
-            iconClassName="muidocs-icon-custom-github" tooltip="top-left"
-            tooltipPosition="top-left"
-        />
-    </div>
+  <div>
+    <IconButton
+      iconClassName="muidocs-icon-custom-github" tooltip="bottom-right"
+      tooltipPosition="bottom-right"
+    />
+    <IconButton
+      iconClassName="muidocs-icon-custom-github" tooltip="bottom-center"
+      tooltipPosition="bottom-center"
+    />
+    <IconButton
+      iconClassName="muidocs-icon-custom-github" tooltip="bottom-left"
+      tooltipPosition="bottom-left"
+    />
+    <IconButton
+      iconClassName="muidocs-icon-custom-github" tooltip="top-right"
+      tooltipPosition="top-right"
+    />
+    <IconButton
+      iconClassName="muidocs-icon-custom-github" tooltip="top-center"
+      tooltipPosition="top-center"
+    />
+    <IconButton
+      iconClassName="muidocs-icon-custom-github" tooltip="top-left"
+      tooltipPosition="top-left"
+    />
+  </div>
 );
 
 const IconButtonExampleTouch = () => (
-    <div>
-        <IconButton tooltip="bottom-right" touch={true} tooltipPosition="bottom-right">
-            <ActionGrade />
-        </IconButton>
-        <IconButton tooltip="bottom-center" touch={true} tooltipPosition="bottom-center">
-            <ActionGrade />
-        </IconButton>
-        <IconButton tooltip="bottom-left" touch={true} tooltipPosition="bottom-left">
-            <ActionGrade />
-        </IconButton>
-        <IconButton tooltip="top-right" touch={true} tooltipPosition="top-right">
-            <ActionGrade />
-        </IconButton>
-        <IconButton tooltip="top-center" touch={true} tooltipPosition="top-center">
-            <ActionGrade />
-        </IconButton>
-        <IconButton tooltip="top-left" touch={true} tooltipPosition="top-left">
-            <ActionGrade />
-        </IconButton>
-    </div>
+  <div>
+    <IconButton tooltip="bottom-right" touch={true} tooltipPosition="bottom-right">
+      <ActionGrade />
+    </IconButton>
+    <IconButton tooltip="bottom-center" touch={true} tooltipPosition="bottom-center">
+      <ActionGrade />
+    </IconButton>
+    <IconButton tooltip="bottom-left" touch={true} tooltipPosition="bottom-left">
+      <ActionGrade />
+    </IconButton>
+    <IconButton tooltip="top-right" touch={true} tooltipPosition="top-right">
+      <ActionGrade />
+    </IconButton>
+    <IconButton tooltip="top-center" touch={true} tooltipPosition="top-center">
+      <ActionGrade />
+    </IconButton>
+    <IconButton tooltip="top-left" touch={true} tooltipPosition="top-left">
+      <ActionGrade />
+    </IconButton>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/card"
 const CardExampleWithAvatar = () => (
-    <Card>
-        <CardHeader
-            title="URL Avatar"
-            subtitle="Subtitle"
-            avatar="http://lorempixel.com/100/100/nature/"
-        />
-        <CardMedia
-            overlay={<CardTitle title="Overlay title" subtitle="Overlay subtitle" />}
-        >
+  <Card>
+    <CardHeader
+      title="URL Avatar"
+      subtitle="Subtitle"
+      avatar="http://lorempixel.com/100/100/nature/"
+    />
+    <CardMedia
+      overlay={<CardTitle title="Overlay title" subtitle="Overlay subtitle" />}
+    >
             <img src="http://lorempixel.com/600/337/nature/"/>
-        </CardMedia>
+    </CardMedia>
         <CardTitle title="Card title" subtitle="Card subtitle"/>
-        <CardText>
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+    <CardText>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
       Donec mattis pretium massa. Aliquam erat volutpat. Nulla facilisi.
       Donec vulputate interdum sollicitudin. Nunc lacinia auctor quam sed pellentesque.
       Aliquam dui mauris, mattis quis lacus id, pellentesque lobortis odio.
-        </CardText>
-        <CardActions>
+    </CardText>
+    <CardActions>
             <FlatButton label="Action1"/>
             <FlatButton label="Action2"/>
-        </CardActions>
-    </Card>
+    </CardActions>
+  </Card>
 );
 
 const CardExampleWithoutAvatar = () => (
-    <Card>
-        <CardHeader
-            title="Without Avatar"
-            subtitle="Subtitle"
-            actAsExpander={true}
-            showExpandableButton={true}
-        />
-        <CardText expandable={true}>
-            Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+  <Card>
+    <CardHeader
+      title="Without Avatar"
+      subtitle="Subtitle"
+      actAsExpander={true}
+      showExpandableButton={true}
+    />
+    <CardText expandable={true}>
+      Lorem ipsum dolor sit amet, consectetur adipiscing elit.
       Donec mattis pretium massa. Aliquam erat volutpat. Nulla facilisi.
       Donec vulputate interdum sollicitudin. Nunc lacinia auctor quam sed pellentesque.
       Aliquam dui mauris, mattis quis lacus id, pellentesque lobortis odio.
-        </CardText>
-        <CardActions expandable={true}>
+    </CardText>
+    <CardActions expandable={true}>
             <FlatButton label="Action1"/>
             <FlatButton label="Action2"/>
-        </CardActions>
-    </Card>
+    </CardActions>
+  </Card>
 );
 
 class CardExampleControlled extends React.Component<{}, {expanded: boolean}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            expanded: false,
-        };
-    }
-
-    handleExpandChange = (expanded) => {
-        this.setState({expanded: expanded});
+  constructor(props) {
+    super(props);
+    this.state = {
+      expanded: false,
     };
+  }
 
-    handleToggle = (event, toggle) => {
-        this.setState({expanded: toggle});
-    };
+  handleExpandChange = (expanded) => {
+    this.setState({expanded: expanded});
+  };
 
-    handleExpand = () => {
-        this.setState({expanded: true});
-    };
+  handleToggle = (event, toggle) => {
+    this.setState({expanded: toggle});
+  };
 
-    handleReduce = () => {
-        this.setState({expanded: false});
-    };
+  handleExpand = () => {
+    this.setState({expanded: true});
+  };
 
-    render() {
-        return (
-            <Card expanded={this.state.expanded} onExpandChange={this.handleExpandChange}>
-                <CardHeader
-                    title="URL Avatar"
-                    subtitle="Subtitle"
-                    avatar="http://lorempixel.com/100/100/nature/"
-                    actAsExpander={true}
-                    showExpandableButton={true}
-                />
-                <CardText>
-                    <Toggle
-                        toggled={this.state.expanded}
-                        onToggle={this.handleToggle}
-                        labelPosition="right"
-                        label="This toggle controls the expanded state of the component."
-                    />
-                </CardText>
-                <CardMedia
-                    expandable={true}
-                    overlay={<CardTitle title="Overlay title" subtitle="Overlay subtitle" />}
-                >
+  handleReduce = () => {
+    this.setState({expanded: false});
+  };
+
+  render() {
+    return (
+      <Card expanded={this.state.expanded} onExpandChange={this.handleExpandChange}>
+        <CardHeader
+          title="URL Avatar"
+          subtitle="Subtitle"
+          avatar="http://lorempixel.com/100/100/nature/"
+          actAsExpander={true}
+          showExpandableButton={true}
+        />
+        <CardText>
+          <Toggle
+            toggled={this.state.expanded}
+            onToggle={this.handleToggle}
+            labelPosition="right"
+            label="This toggle controls the expanded state of the component."
+          />
+        </CardText>
+        <CardMedia
+          expandable={true}
+          overlay={<CardTitle title="Overlay title" subtitle="Overlay subtitle" />}
+        >
                     <img src="http://lorempixel.com/600/337/nature/"/>
-                </CardMedia>
+        </CardMedia>
                 <CardTitle title="Card title" subtitle="Card subtitle" expandable={true}/>
-                <CardText expandable={true}>
-                    Lorem ipsum dolor sit amet, consectetur adipiscing elit.
+        <CardText expandable={true}>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit.
           Donec mattis pretium massa. Aliquam erat volutpat. Nulla facilisi.
           Donec vulputate interdum sollicitudin. Nunc lacinia auctor quam sed pellentesque.
           Aliquam dui mauris, mattis quis lacus id, pellentesque lobortis odio.
-                </CardText>
-                <CardActions>
+        </CardText>
+        <CardActions>
                     <FlatButton label="Expand" onTouchTap={this.handleExpand}/>
                     <FlatButton label="Reduce" onTouchTap={this.handleReduce}/>
-                </CardActions>
-            </Card>
-        );
-    }
+        </CardActions>
+      </Card>
+    );
+  }
 }
 
 // "http://www.material-ui.com/#/components/chip"
 const ChipExampleSimple = () => (
-    <div>
-        <Chip>Basic Chip</Chip>
-        <Chip backgroundColor={blue300}>Blue Background</Chip>
-        <Chip labelColor={blue500}>Blue Label Color</Chip>
-        <Chip><Avatar size={32} color={blue300} backgroundColor={indigo900}>UI</Avatar> Avatar</Chip>
-        <Chip style={styles.chip}>Styled</Chip>
-    </div>
+  <div>
+    <Chip>Basic Chip</Chip>
+    <Chip backgroundColor={blue300}>Blue Background</Chip>
+    <Chip labelColor={blue500}>Blue Label Color</Chip>
+    <Chip><Avatar size={32} color={blue300} backgroundColor={indigo900}>UI</Avatar> Avatar</Chip>
+    <Chip style={styles.chip}>Styled</Chip>
+  </div>
 );
 
 class ChipExampleComplex extends React.Component<{}, {}> {
-    handleRequestDelete = () => {
-        alert('You clicked the delete button.');
-    }
+  handleRequestDelete = () => {
+    alert('You clicked the delete button.');
+  }
 
-    handleTouchTap = () => {
-        alert('You clicked the Chip.');
-    }
+  handleTouchTap = () => {
+    alert('You clicked the Chip.');
+  }
 
-    render() {
-        return (
-            <div>
-                <Chip onTouchTap={this.handleTouchTap} onRequestDelete={this.handleRequestDelete}>Click Me</Chip>
-            </div>
-        );
-    }
+  render() {
+    return (
+      <div>
+        <Chip onTouchTap={this.handleTouchTap} onRequestDelete={this.handleRequestDelete}>Click Me</Chip>
+      </div>
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/date-picker"
 const DatePickerExampleSimple = () => (
-    <div>
+  <div>
         <DatePicker hintText="Portrait Dialog"/>
         <DatePicker hintText="Landscape Dialog" mode="landscape"/>
         <DatePicker hintText="Dialog Disabled" disabled={true}/>
-    </div>
+  </div>
 );
 
 const DatePickerExampleInline = () => (
-    <div>
+  <div>
         <DatePicker hintText="Portrait Inline Dialog" container="inline"/>
         <DatePicker hintText="Landscape Inline Dialog" container="inline" mode="landscape"/>
-    </div>
+  </div>
 );
 
 const optionsStyle = {
-    maxWidth: 255,
-    marginRight: 'auto',
+  maxWidth: 255,
+  marginRight: 'auto',
 };
 
 interface DatePickerExampleToggleState {
-    minDate?: Date;
-    maxDate?: Date;
-    autoOk?: boolean;
-    disableYearSelection?: boolean;
+  minDate?: Date;
+  maxDate?: Date;
+  autoOk?: boolean;
+  disableYearSelection?: boolean;
 }
 
 class DatePickerExampleToggle extends React.Component<{}, DatePickerExampleToggleState> {
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        const minDate = new Date();
-        const maxDate = new Date();
-        minDate.setFullYear(minDate.getFullYear() - 1);
-        minDate.setHours(0, 0, 0, 0);
-        maxDate.setFullYear(maxDate.getFullYear() + 1);
-        maxDate.setHours(0, 0, 0, 0);
+    const minDate = new Date();
+    const maxDate = new Date();
+    minDate.setFullYear(minDate.getFullYear() - 1);
+    minDate.setHours(0, 0, 0, 0);
+    maxDate.setFullYear(maxDate.getFullYear() + 1);
+    maxDate.setHours(0, 0, 0, 0);
 
-        this.state = {
-            minDate: minDate,
-            maxDate: maxDate,
-            autoOk: false,
-            disableYearSelection: false,
-        };
-    }
-
-    handleChangeMinDate = (event, date) => {
-        this.setState({
-            minDate: date,
-        });
+    this.state = {
+      minDate: minDate,
+      maxDate: maxDate,
+      autoOk: false,
+      disableYearSelection: false,
     };
+  }
 
-    handleChangeMaxDate = (event, date) => {
-        this.setState({
-            maxDate: date,
-        });
-    };
+  handleChangeMinDate = (event, date) => {
+    this.setState({
+      minDate: date,
+    });
+  };
 
-    handleToggle = (event, toggled) => {
-        this.setState({
-            [event.target.name]: toggled,
-        });
-    };
+  handleChangeMaxDate = (event, date) => {
+    this.setState({
+      maxDate: date,
+    });
+  };
 
-    render() {
-        return (
-            <div>
-                <DatePicker
-                    floatingLabelText="Ranged Date Picker"
-                    autoOk={this.state.autoOk}
-                    minDate={this.state.minDate}
-                    maxDate={this.state.maxDate}
-                    disableYearSelection={this.state.disableYearSelection}
-                />
-                <div style={optionsStyle}>
-                    <DatePicker
-                        onChange={this.handleChangeMinDate}
-                        autoOk={this.state.autoOk}
-                        floatingLabelText="Min Date"
-                        defaultDate={this.state.minDate}
-                        disableYearSelection={this.state.disableYearSelection}
-                    />
-                    <DatePicker
-                        onChange={this.handleChangeMaxDate}
-                        autoOk={this.state.autoOk}
-                        floatingLabelText="Max Date"
-                        defaultDate={this.state.maxDate}
-                        disableYearSelection={this.state.disableYearSelection}
-                    />
-                    <Toggle
-                        name="autoOk"
-                        value="autoOk"
-                        label="Auto Ok"
-                        toggled={this.state.autoOk}
-                        onToggle={this.handleToggle}
-                    />
-                    <Toggle
-                        name="disableYearSelection"
-                        value="disableYearSelection"
-                        label="Disable Year Selection"
-                        toggled={this.state.disableYearSelection}
-                        onToggle={this.handleToggle}
-                    />
-                </div>
-            </div>
-        );
-    }
+  handleToggle = (event, toggled) => {
+    this.setState({
+      [event.target.name]: toggled,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <DatePicker
+          floatingLabelText="Ranged Date Picker"
+          autoOk={this.state.autoOk}
+          minDate={this.state.minDate}
+          maxDate={this.state.maxDate}
+          disableYearSelection={this.state.disableYearSelection}
+        />
+        <div style={optionsStyle}>
+          <DatePicker
+            onChange={this.handleChangeMinDate}
+            autoOk={this.state.autoOk}
+            floatingLabelText="Min Date"
+            defaultDate={this.state.minDate}
+            disableYearSelection={this.state.disableYearSelection}
+          />
+          <DatePicker
+            onChange={this.handleChangeMaxDate}
+            autoOk={this.state.autoOk}
+            floatingLabelText="Max Date"
+            defaultDate={this.state.maxDate}
+            disableYearSelection={this.state.disableYearSelection}
+          />
+          <Toggle
+            name="autoOk"
+            value="autoOk"
+            label="Auto Ok"
+            toggled={this.state.autoOk}
+            onToggle={this.handleToggle}
+          />
+          <Toggle
+            name="disableYearSelection"
+            value="disableYearSelection"
+            label="Disable Year Selection"
+            toggled={this.state.disableYearSelection}
+            onToggle={this.handleToggle}
+          />
+        </div>
+      </div>
+    );
+  }
 }
 
 class DatePickerExampleControlled extends React.Component<{}, {controlledDate?: Date}> {
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            controlledDate: null,
-        };
-    }
-
-    handleChange = (event, date) => {
-        this.setState({
-            controlledDate: date,
-        });
+    this.state = {
+      controlledDate: null,
     };
+  }
 
-    render() {
-        return (
-            <DatePicker
-                hintText="Controlled Date Input"
-                value={this.state.controlledDate}
-                onChange={this.handleChange}
-            />
-        );
-    }
+  handleChange = (event, date) => {
+    this.setState({
+      controlledDate: date,
+    });
+  };
+
+  render() {
+    return (
+      <DatePicker
+        hintText="Controlled Date Input"
+        value={this.state.controlledDate}
+        onChange={this.handleChange}
+      />
+    );
+  }
 }
 
 function disableWeekends(date) {
-    return date.getDay() === 0 || date.getDay() === 6;
+  return date.getDay() === 0 || date.getDay() === 6;
 }
 function disableRandomDates() {
-    return Math.random() > 0.7;
+  return Math.random() > 0.7;
 }
 const DatePickerExampleDisableDates = () => (
-    <div>
+  <div>
         <DatePicker hintText="Weekends Disabled" shouldDisableDate={disableWeekends}/>
         <DatePicker hintText="Random Dates Disabled" shouldDisableDate={disableRandomDates}/>
-    </div>
+  </div>
 );
 
 let DateTimeFormat = new Intl.DateTimeFormat('fr');
 const DatePickerExampleInternational = () => (
-    <div>
-        <DatePicker
-            hintText="fr locale"
-            DateTimeFormat={DateTimeFormat}
-            okLabel="OK"
-            cancelLabel="Annuler"
-            locale="fr"
-        />
-        <DatePicker
-            hintText="en-US locale"
-            locale="en-US"
-            firstDayOfWeek={0}
-        />
-        <DatePicker
-            hintText="Custom date format"
-            firstDayOfWeek={0}
-            formatDate={new Intl.DateTimeFormat('en-US', {
+  <div>
+    <DatePicker
+      hintText="fr locale"
+      DateTimeFormat={DateTimeFormat}
+      okLabel="OK"
+      cancelLabel="Annuler"
+      locale="fr"
+    />
+    <DatePicker
+      hintText="en-US locale"
+      locale="en-US"
+      firstDayOfWeek={0}
+    />
+    <DatePicker
+      hintText="Custom date format"
+      firstDayOfWeek={0}
+      formatDate={new Intl.DateTimeFormat('en-US', {
         day: 'numeric',
         month: 'long',
         year: 'numeric',
       }).format}
-        />
-    </div>
+    />
+  </div>
 );
 
 
 // "http://material-ui.com/#/components/dialog"
 class DialogExampleSimple extends React.Component<{}, {open?: boolean}> {
-    state = {
-        open: false,
-    };
+  state = {
+    open: false,
+  };
 
-    handleOpen = () => {
-        this.setState({open: true});
-    };
+  handleOpen = () => {
+    this.setState({open: true});
+  };
 
-    handleClose = () => {
-        this.setState({open: false});
-    };
+  handleClose = () => {
+    this.setState({open: false});
+  };
 
-    render() {
-        const actions = [
-            <FlatButton
-                label="Cancel"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-            <FlatButton
-                label="Submit"
-                primary={true}
-                keyboardFocused={true}
-                onTouchTap={this.handleClose}
-            />,
-        ];
+  render() {
+    const actions = [
+      <FlatButton
+        label="Cancel"
+        primary={true}
+        onTouchTap={this.handleClose}
+      />,
+      <FlatButton
+        label="Submit"
+        primary={true}
+        keyboardFocused={true}
+        onTouchTap={this.handleClose}
+      />,
+    ];
 
-        return (
-            <div>
+    return (
+      <div>
                 <RaisedButton label="Dialog" onTouchTap={this.handleOpen}/>
-                <Dialog
-                    title="Dialog With Actions"
-                    actions={actions}
-                    modal={false}
-                    open={this.state.open}
-                    onRequestClose={this.handleClose}
-                >
-                    The actions in this window were passed in as an array of React objects.
-                </Dialog>
-            </div>
-        );
-    }
+        <Dialog
+          title="Dialog With Actions"
+          actions={actions}
+          modal={false}
+          open={this.state.open}
+          onRequestClose={this.handleClose}
+        >
+          The actions in this window were passed in as an array of React objects.
+        </Dialog>
+      </div>
+    );
+  }
 }
 
 class DialogExampleModal extends React.Component<{}, {open?: boolean}> {
-    state = {
-        open: false,
-    };
+  state = {
+    open: false,
+  };
 
-    handleOpen = () => {
-        this.setState({open: true});
-    };
+  handleOpen = () => {
+    this.setState({open: true});
+  };
 
-    handleClose = () => {
-        this.setState({open: false});
-    };
+  handleClose = () => {
+    this.setState({open: false});
+  };
 
-    render() {
-        const actions = [
-            <FlatButton
-                label="Cancel"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-            <FlatButton
-                label="Submit"
-                primary={true}
-                disabled={true}
-                onTouchTap={this.handleClose}
-            />,
-        ];
+  render() {
+    const actions = [
+      <FlatButton
+        label="Cancel"
+        primary={true}
+        onTouchTap={this.handleClose}
+      />,
+      <FlatButton
+        label="Submit"
+        primary={true}
+        disabled={true}
+        onTouchTap={this.handleClose}
+      />,
+    ];
 
-        return (
-            <div>
+    return (
+      <div>
                 <RaisedButton label="Modal Dialog" onTouchTap={this.handleOpen}/>
-                <Dialog
-                    title="Dialog With Actions"
-                    actions={actions}
-                    modal={true}
-                    open={this.state.open}
-                >
-                    Only actions can close this dialog.
-                </Dialog>
-            </div>
-        );
-    }
+        <Dialog
+          title="Dialog With Actions"
+          actions={actions}
+          modal={true}
+          open={this.state.open}
+        >
+          Only actions can close this dialog.
+        </Dialog>
+      </div>
+    );
+  }
 }
 
 class DialogExampleCustomWidth extends React.Component<{}, {open?: boolean}> {
-    state = {
-        open: false,
-    };
+  state = {
+    open: false,
+  };
 
-    handleOpen = () => {
-        this.setState({open: true});
-    };
+  handleOpen = () => {
+    this.setState({open: true});
+  };
 
-    handleClose = () => {
-        this.setState({open: false});
-    };
+  handleClose = () => {
+    this.setState({open: false});
+  };
 
-    render() {
-        const actions = [
-            <FlatButton
-                label="Cancel"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-            <FlatButton
-                label="Submit"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-        ];
+  render() {
+    const actions = [
+      <FlatButton
+        label="Cancel"
+        primary={true}
+        onTouchTap={this.handleClose}
+      />,
+      <FlatButton
+        label="Submit"
+        primary={true}
+        onTouchTap={this.handleClose}
+      />,
+    ];
 
-        return (
-            <div>
+    return (
+      <div>
                 <RaisedButton label="Dialog With Custom Width" onTouchTap={this.handleOpen}/>
-                <Dialog
-                    title="Dialog With Custom Width"
-                    actions={actions}
-                    modal={true}
-                    contentStyle={customContentStyle}
-                    open={this.state.open}
-                >
-                    This dialog spans the entire width of the screen.
-                </Dialog>
-            </div>
-        );
-    }
+        <Dialog
+          title="Dialog With Custom Width"
+          actions={actions}
+          modal={true}
+          contentStyle={customContentStyle}
+          open={this.state.open}
+        >
+          This dialog spans the entire width of the screen.
+        </Dialog>
+      </div>
+    );
+  }
 }
 
 class DialogExampleDialogDatePicker extends React.Component<{}, {open?: boolean}> {
-    state = {
-        open: false,
-    };
+  state = {
+    open: false,
+  };
 
-    handleOpen = () => {
-        this.setState({open: true});
-    };
+  handleOpen = () => {
+    this.setState({open: true});
+  };
 
-    handleClose = () => {
-        this.setState({open: false});
-    };
+  handleClose = () => {
+    this.setState({open: false});
+  };
 
-    render() {
-        const actions = [
-            <FlatButton
-                label="Ok"
-                primary={true}
-                keyboardFocused={true}
-                onTouchTap={this.handleClose}
-            />,
-        ];
+  render() {
+    const actions = [
+      <FlatButton
+        label="Ok"
+        primary={true}
+        keyboardFocused={true}
+        onTouchTap={this.handleClose}
+      />,
+    ];
 
-        return (
-            <div>
+    return (
+      <div>
                 <RaisedButton label="Dialog With Date Picker" onTouchTap={this.handleOpen}/>
-                <Dialog
-                    title="Dialog With Date Picker"
-                    actions={actions}
-                    modal={false}
-                    open={this.state.open}
-                    onRequestClose={this.handleClose}
-                >
-                    Open a Date Picker dialog from within a dialog.
+        <Dialog
+          title="Dialog With Date Picker"
+          actions={actions}
+          modal={false}
+          open={this.state.open}
+          onRequestClose={this.handleClose}
+        >
+          Open a Date Picker dialog from within a dialog.
                     <DatePicker hintText="Date Picker"/>
-                </Dialog>
-            </div>
-        );
-    }
+        </Dialog>
+      </div>
+    );
+  }
 }
 
 class DialogExampleScrollable extends React.Component<{}, {open?: boolean}> {
-    state = {
-        open: false,
-    };
+  state = {
+    open: false,
+  };
 
-    handleOpen = () => {
-        this.setState({open: true});
-    };
+  handleOpen = () => {
+    this.setState({open: true});
+  };
 
-    handleClose = () => {
-        this.setState({open: false});
-    };
+  handleClose = () => {
+    this.setState({open: false});
+  };
 
-    render() {
-        const actions = [
-            <FlatButton
-                label="Cancel"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-            <FlatButton
-                label="Submit"
-                primary={true}
-                keyboardFocused={true}
-                onTouchTap={this.handleClose}
-            />,
-        ];
+  render() {
+    const actions = [
+      <FlatButton
+        label="Cancel"
+        primary={true}
+        onTouchTap={this.handleClose}
+      />,
+      <FlatButton
+        label="Submit"
+        primary={true}
+        keyboardFocused={true}
+        onTouchTap={this.handleClose}
+      />,
+    ];
 
-        const radios = [];
-        for (let i = 0; i < 30; i++) {
-            radios.push(
-                <RadioButton
-                    key={i}
-                    value={`value${i + 1}`}
-                    label={`Option ${i + 1}`}
-                    style={styles.radioButton}
-                />
-            );
-        }
-
-        return (
-            <div>
-                <RaisedButton label="Scrollable Dialog" onTouchTap={this.handleOpen}/>
-                <Dialog
-                    title="Scrollable Dialog"
-                    actions={actions}
-                    modal={false}
-                    open={this.state.open}
-                    onRequestClose={this.handleClose}
-                    autoScrollBodyContent={true}
-                >
-                    <RadioButtonGroup name="shipSpeed" defaultSelected="not_light">
-                        {radios}
-                    </RadioButtonGroup>
-                </Dialog>
-            </div>
-        );
+    const radios = [];
+    for (let i = 0; i < 30; i++) {
+      radios.push(
+        <RadioButton
+          key={i}
+          value={`value${i + 1}`}
+          label={`Option ${i + 1}`}
+          style={styles.radioButton}
+        />
+      );
     }
+
+    return (
+      <div>
+                <RaisedButton label="Scrollable Dialog" onTouchTap={this.handleOpen}/>
+        <Dialog
+          title="Scrollable Dialog"
+          actions={actions}
+          modal={false}
+          open={this.state.open}
+          onRequestClose={this.handleClose}
+          autoScrollBodyContent={true}
+        >
+          <RadioButtonGroup name="shipSpeed" defaultSelected="not_light">
+            {radios}
+          </RadioButtonGroup>
+        </Dialog>
+      </div>
+    );
+  }
 }
 
 class DialogExampleAlert extends React.Component<{}, {open?: boolean}> {
-    state = {
-        open: false,
-    };
+  state = {
+    open: false,
+  };
 
-    handleOpen = () => {
-        this.setState({open: true});
-    };
+  handleOpen = () => {
+    this.setState({open: true});
+  };
 
-    handleClose = () => {
-        this.setState({open: false});
-    };
+  handleClose = () => {
+    this.setState({open: false});
+  };
 
-    render() {
-        const actions = [
-            <FlatButton
-                label="Cancel"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-            <FlatButton
-                label="Discard"
-                primary={true}
-                onTouchTap={this.handleClose}
-            />,
-        ];
+  render() {
+    const actions = [
+      <FlatButton
+        label="Cancel"
+        primary={true}
+        onTouchTap={this.handleClose}
+      />,
+      <FlatButton
+        label="Discard"
+        primary={true}
+        onTouchTap={this.handleClose}
+      />,
+    ];
 
-        return (
-            <div>
+    return (
+      <div>
                 <RaisedButton label="Alert" onTouchTap={this.handleOpen}/>
-                <Dialog
-                    actions={actions}
-                    modal={false}
-                    open={this.state.open}
-                    onRequestClose={this.handleClose}
-                >
-                    Discard draft?
-                </Dialog>
-            </div>
-        );
-    }
+        <Dialog
+          actions={actions}
+          modal={false}
+          open={this.state.open}
+          onRequestClose={this.handleClose}
+        >
+          Discard draft?
+        </Dialog>
+      </div>
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/divider"
 const DividerExampleForm = () => (
-    <Paper zDepth={2}>
+  <Paper zDepth={2}>
         <TextField hintText="First name" style={style} underlineShow={false}/>
-        <Divider />
+    <Divider />
         <TextField hintText="Middle name" style={style} underlineShow={false}/>
-        <Divider />
+    <Divider />
         <TextField hintText="Last name" style={style} underlineShow={false}/>
-        <Divider />
+    <Divider />
         <TextField hintText="Email address" style={style} underlineShow={false}/>
-        <Divider />
-    </Paper>
+    <Divider />
+  </Paper>
 );
 
 const DividerExampleList = () => (
-    <Paper height={250}>
-        <List>
+  <Paper height={250}>
+    <List>
             <ListItem insetChildren={true} primaryText="Janet Perkins Bennet"/>
             <ListItem insetChildren={true} primaryText="Peter Carlsson"/>
-        </List>
+    </List>
         <Divider inset={true}/>
-        <List>
+    <List>
             <ListItem insetChildren={true} primaryText="Aaron Bennet"/>
             <ListItem insetChildren={true} primaryText="Abbey Christensen"/>
-        </List>
-    </Paper>
+    </List>
+  </Paper>
 );
 
 const DividerExampleMenu = () => (
-    <Menu desktop={true} style={style}>
+  <Menu desktop={true} style={style}>
         <MenuItem primaryText="Settings"/>
         <MenuItem primaryText="Help &amp; feedback"/>
-        <Divider />
+    <Divider />
         <MenuItem primaryText="Sign out"/>
-    </Menu>
+  </Menu>
 );
 
 
 // "http://www.material-ui.com/#/components/drawer"
 class DrawerSimpleExample extends React.Component<{}, {open?: boolean}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {open: false};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {open: false};
+  }
 
-    handleToggle = () => this.setState({open: !this.state.open});
+  handleToggle = () => this.setState({open: !this.state.open});
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    label="Toggle Drawer"
-                    onTouchTap={this.handleToggle}
-                />
-                <Drawer open={this.state.open}>
-                    <MenuItem>Menu Item</MenuItem>
-                    <MenuItem>Menu Item 2</MenuItem>
-                </Drawer>
-            </div>
-        );
-    }
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          label="Toggle Drawer"
+          onTouchTap={this.handleToggle}
+        />
+        <Drawer open={this.state.open}>
+          <MenuItem>Menu Item</MenuItem>
+          <MenuItem>Menu Item 2</MenuItem>
+        </Drawer>
+      </div>
+    );
+  }
 }
 
 class DrawerUndockedExample extends React.Component<{}, {open?: boolean}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {open: false};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {open: false};
+  }
 
-    handleToggle = () => this.setState({open: !this.state.open});
+  handleToggle = () => this.setState({open: !this.state.open});
 
-    handleClose = () => this.setState({open: false});
+  handleClose = () => this.setState({open: false});
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    label="Open Drawer"
-                    onTouchTap={this.handleToggle}
-                />
-                <Drawer
-                    docked={false}
-                    width={200}
-                    open={this.state.open}
-                    onRequestChange={(open) => this.setState({open})}
-                >
-                    <MenuItem onTouchTap={this.handleClose}>Menu Item</MenuItem>
-                    <MenuItem onTouchTap={this.handleClose}>Menu Item 2</MenuItem>
-                </Drawer>
-            </div>
-        );
-    }
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          label="Open Drawer"
+          onTouchTap={this.handleToggle}
+        />
+        <Drawer
+          docked={false}
+          width={200}
+          open={this.state.open}
+          onRequestChange={(open) => this.setState({open})}
+        >
+          <MenuItem onTouchTap={this.handleClose}>Menu Item</MenuItem>
+          <MenuItem onTouchTap={this.handleClose}>Menu Item 2</MenuItem>
+        </Drawer>
+      </div>
+    );
+  }
 }
 
 class DrawerOpenRightExample extends React.Component<{}, {open?: boolean}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {open: false};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {open: false};
+  }
 
-    handleToggle = () => this.setState({open: !this.state.open});
+  handleToggle = () => this.setState({open: !this.state.open});
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    label="Toggle Drawer"
-                    onTouchTap={this.handleToggle}
-                />
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          label="Toggle Drawer"
+          onTouchTap={this.handleToggle}
+        />
                 <Drawer width={200} openSecondary={true} open={this.state.open}>
                     <AppBar title="AppBar"/>
-                </Drawer>
-            </div>
-        );
-    }
+        </Drawer>
+      </div>
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/grid-list"
 const tilesData: {img: string, title: string, author: string, featured?: boolean}[] = [
-    {
-        img: 'images/grid-list/00-52-29-429_640.jpg',
-        title: 'Breakfast',
-        author: 'jill111',
-        featured: true,
-    },
-    {
-        img: 'images/grid-list/burger-827309_640.jpg',
-        title: 'Tasty burger',
-        author: 'pashminu',
-    },
-    {
-        img: 'images/grid-list/camera-813814_640.jpg',
-        title: 'Camera',
-        author: 'Danson67',
-    },
-    {
-        img: 'images/grid-list/morning-819362_640.jpg',
-        title: 'Morning',
-        author: 'fancycrave1',
-    },
-    {
-        img: 'images/grid-list/hats-829509_640.jpg',
-        title: 'Hats',
-        author: 'Hans',
-    },
-    {
-        img: 'images/grid-list/honey-823614_640.jpg',
-        title: 'Honey',
-        author: 'fancycravel',
-    },
-    {
-        img: 'images/grid-list/vegetables-790022_640.jpg',
-        title: 'Vegetables',
-        author: 'jill111',
-    },
-    {
-        img: 'images/grid-list/water-plant-821293_640.jpg',
-        title: 'Water plant',
-        author: 'BkrmadtyaKarki',
-    },
+  {
+    img: 'images/grid-list/00-52-29-429_640.jpg',
+    title: 'Breakfast',
+    author: 'jill111',
+    featured: true,
+  },
+  {
+    img: 'images/grid-list/burger-827309_640.jpg',
+    title: 'Tasty burger',
+    author: 'pashminu',
+  },
+  {
+    img: 'images/grid-list/camera-813814_640.jpg',
+    title: 'Camera',
+    author: 'Danson67',
+  },
+  {
+    img: 'images/grid-list/morning-819362_640.jpg',
+    title: 'Morning',
+    author: 'fancycrave1',
+  },
+  {
+    img: 'images/grid-list/hats-829509_640.jpg',
+    title: 'Hats',
+    author: 'Hans',
+  },
+  {
+    img: 'images/grid-list/honey-823614_640.jpg',
+    title: 'Honey',
+    author: 'fancycravel',
+  },
+  {
+    img: 'images/grid-list/vegetables-790022_640.jpg',
+    title: 'Vegetables',
+    author: 'jill111',
+  },
+  {
+    img: 'images/grid-list/water-plant-821293_640.jpg',
+    title: 'Water plant',
+    author: 'BkrmadtyaKarki',
+  },
 ];
 
 const GridListExampleSimple = () => (
-    <div style={styles.root}>
-        <GridList
-            cellHeight={200}
-            style={styles.gridList}
+  <div style={styles.root}>
+    <GridList
+      cellHeight={200}
+      style={styles.gridList}
+    >
+      <Subheader>December</Subheader>
+      {tilesData.map((tile) => (
+        <GridTile
+          key={tile.img}
+          title={tile.title}
+          subtitle={<span>by <b>{tile.author}</b></span>}
+          actionIcon={<IconButton><StarBorder color="white" /></IconButton>}
         >
-            <Subheader>December</Subheader>
-            {tilesData.map((tile) => (
-                <GridTile
-                    key={tile.img}
-                    title={tile.title}
-                    subtitle={<span>by <b>{tile.author}</b></span>}
-                    actionIcon={<IconButton><StarBorder color="white" /></IconButton>}
-                >
                     <img src={tile.img}/>
-                </GridTile>
-            ))}
-        </GridList>
-    </div>
+        </GridTile>
+      ))}
+    </GridList>
+  </div>
 );
 
 const GridListExampleComplex = () => (
-    <div style={styles.root}>
-        <GridList
-            cols={2}
-            cellHeight={200}
-            padding={1}
-            style={styles.gridList}
+  <div style={styles.root}>
+    <GridList
+      cols={2}
+      cellHeight={200}
+      padding={1}
+      style={styles.gridList}
+    >
+      {tilesData.map((tile) => (
+        <GridTile
+          key={tile.img}
+          title={tile.title}
+          actionIcon={<IconButton><StarBorder color="white" /></IconButton>}
+          actionPosition="left"
+          titlePosition="top"
+          titleBackground="linear-gradient(to bottom, rgba(0,0,0,0.7) 0%,rgba(0,0,0,0.3) 70%,rgba(0,0,0,0) 100%)"
+          cols={tile.featured ? 2 : 1}
+          rows={tile.featured ? 2 : 1}
         >
-            {tilesData.map((tile) => (
-                <GridTile
-                    key={tile.img}
-                    title={tile.title}
-                    actionIcon={<IconButton><StarBorder color="white" /></IconButton>}
-                    actionPosition="left"
-                    titlePosition="top"
-                    titleBackground="linear-gradient(to bottom, rgba(0,0,0,0.7) 0%,rgba(0,0,0,0.3) 70%,rgba(0,0,0,0) 100%)"
-                    cols={tile.featured ? 2 : 1}
-                    rows={tile.featured ? 2 : 1}
-                >
                     <img src={tile.img}/>
-                </GridTile>
-            ))}
-        </GridList>
-    </div>
+        </GridTile>
+      ))}
+    </GridList>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/font-icon"
 const FontIconExampleSimple = () => (
-    <div>
-        <FontIcon
-            className="muidocs-icon-action-home"
-            style={iconStyles}
-        />
+  <div>
+    <FontIcon
+      className="muidocs-icon-action-home"
+      style={iconStyles}
+    />
 
-        <FontIcon
-            className="muidocs-icon-action-home"
-            style={iconStyles}
-            color={blue500}
-        />
+    <FontIcon
+      className="muidocs-icon-action-home"
+      style={iconStyles}
+      color={blue500}
+    />
 
-        <FontIcon
-            className="muidocs-icon-action-home"
-            style={iconStyles}
-            color={red500}
-            hoverColor={greenA200}
-        />
-    </div>
+    <FontIcon
+      className="muidocs-icon-action-home"
+      style={iconStyles}
+      color={red500}
+      hoverColor={greenA200}
+    />
+  </div>
 );
 
 const FontIconExampleIcons = () => (
-    <div>
-        <FontIcon className="material-icons" style={iconStyles}>home</FontIcon>
-        <FontIcon className="material-icons" style={iconStyles} color={red500}>flight_takeoff</FontIcon>
-        <FontIcon className="material-icons" style={iconStyles} color={yellow500}>cloud_download</FontIcon>
-        <FontIcon className="material-icons" style={iconStyles} color={blue500}>videogame_asset</FontIcon>
-    </div>
+  <div>
+    <FontIcon className="material-icons" style={iconStyles}>home</FontIcon>
+    <FontIcon className="material-icons" style={iconStyles} color={red500}>flight_takeoff</FontIcon>
+    <FontIcon className="material-icons" style={iconStyles} color={yellow500}>cloud_download</FontIcon>
+    <FontIcon className="material-icons" style={iconStyles} color={blue500}>videogame_asset</FontIcon>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/svg-icon"
 const HomeIcon = (props) => (
-    <SvgIcon {...props}>
+  <SvgIcon {...props}>
         <path d="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z"/>
-    </SvgIcon>
+  </SvgIcon>
 );
 
 const SvgIconExampleSimple = () => (
-    <div>
+  <div>
         <HomeIcon style={iconStyles}/>
         <HomeIcon style={iconStyles} color={blue500}/>
         <HomeIcon style={iconStyles} color={red500} hoverColor={greenA200}/>
-    </div>
+  </div>
 );
 
 const SvgIconExampleIcons = () => (
-    <div>
+  <div>
         <ActionHome style={iconStyles}/>
         <ActionFlightTakeoff style={iconStyles} color={red500}/>
         <FileCloudDownload style={iconStyles} color={yellow500}/>
         <HardwareVideogameAsset style={iconStyles} color={blue500}/>
-    </div>
+  </div>
 );
 
 
 // "http://material-ui.com/#/components/lists"
 const ListExampleSimple = () => (
-    <Paper>
-        <List>
+  <Paper>
+    <List>
             <ListItem primaryText="Inbox" leftIcon={<ContentInbox />}/>
             <ListItem primaryText="Starred" leftIcon={<ActionGrade />}/>
             <ListItem primaryText="Sent mail" leftIcon={<ContentSend />}/>
             <ListItem primaryText="Drafts" leftIcon={<ContentDrafts />}/>
             <ListItem primaryText="Inbox" leftIcon={<ContentInbox />}/>
-        </List>
-        <Divider />
-        <List>
+    </List>
+    <Divider />
+    <List>
             <ListItem primaryText="All mail" rightIcon={<ActionInfo />}/>
             <ListItem primaryText="Trash" rightIcon={<ActionInfo />}/>
             <ListItem primaryText="Spam" rightIcon={<ActionInfo />}/>
             <ListItem primaryText="Follow up" rightIcon={<ActionInfo />}/>
-        </List>
-    </Paper>
+    </List>
+  </Paper>
 );
 
 const ListExampleChat = () => (
-    <Paper>
-        <List>
-            <Subheader>Recent chats</Subheader>
-            <ListItem
-                primaryText="Brendan Lim"
-                leftAvatar={<Avatar src="images/ok-128.jpg" />}
-                rightIcon={<CommunicationChatBubble />}
-            />
-            <ListItem
-                primaryText="Eric Hoffman"
-                leftAvatar={<Avatar src="images/kolage-128.jpg" />}
-                rightIcon={<CommunicationChatBubble />}
-            />
-            <ListItem
-                primaryText="Grace Ng"
-                leftAvatar={<Avatar src="images/uxceo-128.jpg" />}
-                rightIcon={<CommunicationChatBubble />}
-            />
-            <ListItem
-                primaryText="Kerem Suer"
-                leftAvatar={<Avatar src="images/kerem-128.jpg" />}
-                rightIcon={<CommunicationChatBubble />}
-            />
-            <ListItem
-                primaryText="Raquel Parrado"
-                leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
-                rightIcon={<CommunicationChatBubble />}
-            />
-        </List>
-        <Divider />
-        <List>
-            <Subheader>Previous chats</Subheader>
-            <ListItem
-                primaryText="Chelsea Otakan"
-                leftAvatar={<Avatar src="images/chexee-128.jpg" />}
-            />
-            <ListItem
-                primaryText="James Anderson"
-                leftAvatar={<Avatar src="images/jsa-128.jpg" />}
-            />
-        </List>
-    </Paper>
+  <Paper>
+    <List>
+      <Subheader>Recent chats</Subheader>
+      <ListItem
+        primaryText="Brendan Lim"
+        leftAvatar={<Avatar src="images/ok-128.jpg" />}
+        rightIcon={<CommunicationChatBubble />}
+      />
+      <ListItem
+        primaryText="Eric Hoffman"
+        leftAvatar={<Avatar src="images/kolage-128.jpg" />}
+        rightIcon={<CommunicationChatBubble />}
+      />
+      <ListItem
+        primaryText="Grace Ng"
+        leftAvatar={<Avatar src="images/uxceo-128.jpg" />}
+        rightIcon={<CommunicationChatBubble />}
+      />
+      <ListItem
+        primaryText="Kerem Suer"
+        leftAvatar={<Avatar src="images/kerem-128.jpg" />}
+        rightIcon={<CommunicationChatBubble />}
+      />
+      <ListItem
+        primaryText="Raquel Parrado"
+        leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
+        rightIcon={<CommunicationChatBubble />}
+      />
+    </List>
+    <Divider />
+    <List>
+      <Subheader>Previous chats</Subheader>
+      <ListItem
+        primaryText="Chelsea Otakan"
+        leftAvatar={<Avatar src="images/chexee-128.jpg" />}
+      />
+      <ListItem
+        primaryText="James Anderson"
+        leftAvatar={<Avatar src="images/jsa-128.jpg" />}
+      />
+    </List>
+  </Paper>
 );
 
 const ListExampleContacts = () => (
-    <Paper>
-        <List>
-            <ListItem
-                primaryText="Chelsea Otakan"
-                leftIcon={<ActionGrade color={pinkA200} />}
-                rightAvatar={<Avatar src="images/chexee-128.jpg" />}
-            />
-            <ListItem
-                primaryText="Eric Hoffman"
-                insetChildren={true}
-                rightAvatar={<Avatar src="images/kolage-128.jpg" />}
-            />
-            <ListItem
-                primaryText="James Anderson"
-                insetChildren={true}
-                rightAvatar={<Avatar src="images/jsa-128.jpg" />}
-            />
-            <ListItem
-                primaryText="Kerem Suer"
-                insetChildren={true}
-                rightAvatar={<Avatar src="images/kerem-128.jpg" />}
-            />
-        </List>
+  <Paper>
+    <List>
+      <ListItem
+        primaryText="Chelsea Otakan"
+        leftIcon={<ActionGrade color={pinkA200} />}
+        rightAvatar={<Avatar src="images/chexee-128.jpg" />}
+      />
+      <ListItem
+        primaryText="Eric Hoffman"
+        insetChildren={true}
+        rightAvatar={<Avatar src="images/kolage-128.jpg" />}
+      />
+      <ListItem
+        primaryText="James Anderson"
+        insetChildren={true}
+        rightAvatar={<Avatar src="images/jsa-128.jpg" />}
+      />
+      <ListItem
+        primaryText="Kerem Suer"
+        insetChildren={true}
+        rightAvatar={<Avatar src="images/kerem-128.jpg" />}
+      />
+    </List>
         <Divider inset={true}/>
-        <List>
-            <ListItem
-                primaryText="Adelle Charles"
-                leftAvatar={
+    <List>
+      <ListItem
+        primaryText="Adelle Charles"
+        leftAvatar={
           <Avatar
             color={pinkA200} backgroundColor={transparent}
             style={{left: 8}}
@@ -1879,82 +1879,82 @@ const ListExampleContacts = () => (
             A
           </Avatar>
         }
-                rightAvatar={<Avatar src="images/adellecharles-128.jpg" />}
-            />
-            <ListItem
-                primaryText="Adham Dannaway"
-                insetChildren={true}
-                rightAvatar={<Avatar src="images/adhamdannaway-128.jpg" />}
-            />
-            <ListItem
-                primaryText="Allison Grayce"
-                insetChildren={true}
-                rightAvatar={<Avatar src="images/allisongrayce-128.jpg" />}
-            />
-            <ListItem
-                primaryText="Angel Ceballos"
-                insetChildren={true}
-                rightAvatar={<Avatar src="images/angelceballos-128.jpg" />}
-            />
-        </List>
-    </Paper>
+        rightAvatar={<Avatar src="images/adellecharles-128.jpg" />}
+      />
+      <ListItem
+        primaryText="Adham Dannaway"
+        insetChildren={true}
+        rightAvatar={<Avatar src="images/adhamdannaway-128.jpg" />}
+      />
+      <ListItem
+        primaryText="Allison Grayce"
+        insetChildren={true}
+        rightAvatar={<Avatar src="images/allisongrayce-128.jpg" />}
+      />
+      <ListItem
+        primaryText="Angel Ceballos"
+        insetChildren={true}
+        rightAvatar={<Avatar src="images/angelceballos-128.jpg" />}
+      />
+    </List>
+  </Paper>
 );
 
 const ListExampleFolder = () => (
-    <Paper>
-        <List>
-            <Subheader inset={true}>Folders</Subheader>
-            <ListItem
-                leftAvatar={<Avatar icon={<FileFolder />} />}
-                rightIcon={<ActionInfo />}
-                primaryText="Photos"
-                secondaryText="Jan 9, 2014"
-            />
-            <ListItem
-                leftAvatar={<Avatar icon={<FileFolder />} />}
-                rightIcon={<ActionInfo />}
-                primaryText="Recipes"
-                secondaryText="Jan 17, 2014"
-            />
-            <ListItem
-                leftAvatar={<Avatar icon={<FileFolder />} />}
-                rightIcon={<ActionInfo />}
-                primaryText="Work"
-                secondaryText="Jan 28, 2014"
-            />
-        </List>
+  <Paper>
+    <List>
+      <Subheader inset={true}>Folders</Subheader>
+      <ListItem
+        leftAvatar={<Avatar icon={<FileFolder />} />}
+        rightIcon={<ActionInfo />}
+        primaryText="Photos"
+        secondaryText="Jan 9, 2014"
+      />
+      <ListItem
+        leftAvatar={<Avatar icon={<FileFolder />} />}
+        rightIcon={<ActionInfo />}
+        primaryText="Recipes"
+        secondaryText="Jan 17, 2014"
+      />
+      <ListItem
+        leftAvatar={<Avatar icon={<FileFolder />} />}
+        rightIcon={<ActionInfo />}
+        primaryText="Work"
+        secondaryText="Jan 28, 2014"
+      />
+    </List>
         <Divider inset={true}/>
-        <List>
-            <Subheader inset={true}>Files</Subheader>
-            <ListItem
-                leftAvatar={<Avatar icon={<ActionAssignment />} backgroundColor={blue500} />}
-                rightIcon={<ActionInfo />}
-                primaryText="Vacation itinerary"
-                secondaryText="Jan 20, 2014"
-            />
-            <ListItem
-                leftAvatar={<Avatar icon={<EditorInsertChart />} backgroundColor={yellow600} />}
-                rightIcon={<ActionInfo />}
-                primaryText="Kitchen remodel"
-                secondaryText="Jan 10, 2014"
-            />
-        </List>
-    </Paper>
+    <List>
+      <Subheader inset={true}>Files</Subheader>
+      <ListItem
+        leftAvatar={<Avatar icon={<ActionAssignment />} backgroundColor={blue500} />}
+        rightIcon={<ActionInfo />}
+        primaryText="Vacation itinerary"
+        secondaryText="Jan 20, 2014"
+      />
+      <ListItem
+        leftAvatar={<Avatar icon={<EditorInsertChart />} backgroundColor={yellow600} />}
+        rightIcon={<ActionInfo />}
+        primaryText="Kitchen remodel"
+        secondaryText="Jan 10, 2014"
+      />
+    </List>
+  </Paper>
 );
 
 const ListExampleNested = () => (
-    <Paper>
-        <List>
-            <Subheader>Nested List Items</Subheader>
+  <Paper>
+    <List>
+      <Subheader>Nested List Items</Subheader>
             <ListItem primaryText="Sent mail" leftIcon={<ContentSend />}/>
             <ListItem primaryText="Drafts" leftIcon={<ContentDrafts />}/>
-            <ListItem
-                primaryText="Inbox"
-                leftIcon={<ContentInbox />}
-                initiallyOpen={true}
+      <ListItem
+        primaryText="Inbox"
+        leftIcon={<ContentInbox />}
+        initiallyOpen={true}
                 open={true}
-                primaryTogglesNestedList={true}
-                nestedItems={[
+        primaryTogglesNestedList={true}
+        nestedItems={[
           <ListItem
             key={1}
             primaryText="Starred"
@@ -1970,458 +1970,458 @@ const ListExampleNested = () => (
             ]}
           />,
         ]}
-            />
-        </List>
-    </Paper>
+      />
+    </List>
+  </Paper>
 );
 
 const ListExampleSettings = () => (
-    <div>
-        <Paper>
-            <List>
-                <Subheader>General</Subheader>
-                <ListItem
-                    primaryText="Profile photo"
-                    secondaryText="Change your Google+ profile photo"
-                />
-                <ListItem
-                    primaryText="Show your status"
-                    secondaryText="Your status is visible to everyone you use with"
-                />
-            </List>
-            <Divider />
-            <List>
-                <Subheader>Hangout Notifications</Subheader>
-                <ListItem
-                    leftCheckbox={<Checkbox />}
-                    primaryText="Notifications"
-                    secondaryText="Allow notifications"
-                />
-                <ListItem
-                    leftCheckbox={<Checkbox />}
-                    primaryText="Sounds"
-                    secondaryText="Hangouts message"
-                />
-                <ListItem
-                    leftCheckbox={<Checkbox />}
-                    primaryText="Video sounds"
-                    secondaryText="Hangouts video call"
-                />
-            </List>
-        </Paper>
-        <Paper>
-            <List>
-                <ListItem
-                    primaryText="When calls and notifications arrive"
-                    secondaryText="Always interrupt"
-                />
-            </List>
-            <Divider />
-            <List>
-                <Subheader>Priority Interruptions</Subheader>
+  <div>
+    <Paper>
+      <List>
+        <Subheader>General</Subheader>
+        <ListItem
+          primaryText="Profile photo"
+          secondaryText="Change your Google+ profile photo"
+        />
+        <ListItem
+          primaryText="Show your status"
+          secondaryText="Your status is visible to everyone you use with"
+        />
+      </List>
+      <Divider />
+      <List>
+        <Subheader>Hangout Notifications</Subheader>
+        <ListItem
+          leftCheckbox={<Checkbox />}
+          primaryText="Notifications"
+          secondaryText="Allow notifications"
+        />
+        <ListItem
+          leftCheckbox={<Checkbox />}
+          primaryText="Sounds"
+          secondaryText="Hangouts message"
+        />
+        <ListItem
+          leftCheckbox={<Checkbox />}
+          primaryText="Video sounds"
+          secondaryText="Hangouts video call"
+        />
+      </List>
+    </Paper>
+    <Paper>
+      <List>
+        <ListItem
+          primaryText="When calls and notifications arrive"
+          secondaryText="Always interrupt"
+        />
+      </List>
+      <Divider />
+      <List>
+        <Subheader>Priority Interruptions</Subheader>
                 <ListItem primaryText="Events and reminders" rightToggle={<Toggle />}/>
                 <ListItem primaryText="Calls" rightToggle={<Toggle />}/>
                 <ListItem primaryText="Messages" rightToggle={<Toggle />}/>
-            </List>
-            <Divider />
-            <List>
-                <Subheader>Hangout Notifications</Subheader>
+      </List>
+      <Divider />
+      <List>
+        <Subheader>Hangout Notifications</Subheader>
                 <ListItem primaryText="Notifications" leftCheckbox={<Checkbox />}/>
                 <ListItem primaryText="Sounds" leftCheckbox={<Checkbox />}/>
                 <ListItem primaryText="Video sounds" leftCheckbox={<Checkbox />}/>
-            </List>
-        </Paper>
-    </div>
+      </List>
+    </Paper>
+  </div>
 );
 
 const ListExamplePhone = () => (
-    <Paper>
-        <List>
-            <ListItem
-                leftIcon={<CommunicationCall color={indigo500} />}
-                rightIcon={<CommunicationChatBubble />}
-                primaryText="(650) 555 - 1234"
-                secondaryText="Mobile"
-            />
-            <ListItem
-                insetChildren={true}
-                rightIcon={<CommunicationChatBubble />}
-                primaryText="(323) 555 - 6789"
-                secondaryText="Work"
-            />
-        </List>
+  <Paper>
+    <List>
+      <ListItem
+        leftIcon={<CommunicationCall color={indigo500} />}
+        rightIcon={<CommunicationChatBubble />}
+        primaryText="(650) 555 - 1234"
+        secondaryText="Mobile"
+      />
+      <ListItem
+        insetChildren={true}
+        rightIcon={<CommunicationChatBubble />}
+        primaryText="(323) 555 - 6789"
+        secondaryText="Work"
+      />
+    </List>
         <Divider inset={true}/>
-        <List>
-            <ListItem
-                leftIcon={<CommunicationEmail color={indigo500} />}
-                primaryText="aliconnors@example.com"
-                secondaryText="Personal"
-            />
-            <ListItem
-                insetChildren={true}
-                primaryText="ali_connors@example.com"
-                secondaryText="Work"
-            />
-        </List>
-    </Paper>
+    <List>
+      <ListItem
+        leftIcon={<CommunicationEmail color={indigo500} />}
+        primaryText="aliconnors@example.com"
+        secondaryText="Personal"
+      />
+      <ListItem
+        insetChildren={true}
+        primaryText="ali_connors@example.com"
+        secondaryText="Work"
+      />
+    </List>
+  </Paper>
 );
 
 const iconButtonElement = (
-    <IconButton
-        touch={true}
-        tooltip="more"
-        tooltipPosition="bottom-left"
-    >
+  <IconButton
+    touch={true}
+    tooltip="more"
+    tooltipPosition="bottom-left"
+  >
         <MoreVertIcon color={grey400}/>
-    </IconButton>
+  </IconButton>
 );
 
 const rightIconMenu = (
-    <IconMenu iconButtonElement={iconButtonElement}>
-        <MenuItem>Reply</MenuItem>
-        <MenuItem>Forward</MenuItem>
-        <MenuItem>Delete</MenuItem>
-    </IconMenu>
+  <IconMenu iconButtonElement={iconButtonElement}>
+    <MenuItem>Reply</MenuItem>
+    <MenuItem>Forward</MenuItem>
+    <MenuItem>Delete</MenuItem>
+  </IconMenu>
 );
 
 const ListExampleMessages = () => (
-    <div>
-        <Paper>
-            <List>
-                <Subheader>Today</Subheader>
-                <ListItem
-                    leftAvatar={<Avatar src="images/ok-128.jpg" />}
-                    primaryText="Brunch this weekend?"
-                    secondaryText={
+  <div>
+    <Paper>
+      <List>
+        <Subheader>Today</Subheader>
+        <ListItem
+          leftAvatar={<Avatar src="images/ok-128.jpg" />}
+          primaryText="Brunch this weekend?"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Brendan Lim</span> --
               I&apos;ll be in your neighborhood doing errands this weekend. Do you want to grab brunch?
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/kolage-128.jpg" />}
-                    primaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/kolage-128.jpg" />}
+          primaryText={
             <p>Summer BBQ&nbsp;&nbsp;<span style={{color: lightBlack}}>4</span></p>
           }
-                    secondaryText={
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>to me, Scott, Jennifer</span> --
               Wish I could come, but I&apos;m out of town this weekend.
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/uxceo-128.jpg" />}
-                    primaryText="Oui oui"
-                    secondaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/uxceo-128.jpg" />}
+          primaryText="Oui oui"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Grace Ng</span> --
               Do you have Paris recommendations? Have you ever been?
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/kerem-128.jpg" />}
-                    primaryText="Birdthday gift"
-                    secondaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/kerem-128.jpg" />}
+          primaryText="Birdthday gift"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Kerem Suer</span> --
               Do you have any ideas what we can get Heidi for her birthday? How about a pony?
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
-                    primaryText="Recipe to try"
-                    secondaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
+          primaryText="Recipe to try"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Raquel Parrado</span> --
               We should eat this: grated squash. Corn and tomatillo tacos.
             </p>
           }
-                    secondaryTextLines={2}
-                />
-            </List>
-        </Paper>
-        <Paper>
-            <List>
-                <Subheader>Today</Subheader>
-                <ListItem
-                    leftAvatar={<Avatar src="images/ok-128.jpg" />}
-                    rightIconButton={rightIconMenu}
-                    primaryText="Brendan Lim"
-                    secondaryText={
+          secondaryTextLines={2}
+        />
+      </List>
+    </Paper>
+    <Paper>
+      <List>
+        <Subheader>Today</Subheader>
+        <ListItem
+          leftAvatar={<Avatar src="images/ok-128.jpg" />}
+          rightIconButton={rightIconMenu}
+          primaryText="Brendan Lim"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Brunch this weekend?</span><br />
               I&apos;ll be in your neighborhood doing errands this weekend. Do you want to grab brunch?
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/kolage-128.jpg" />}
-                    rightIconButton={rightIconMenu}
-                    primaryText="me, Scott, Jennifer"
-                    secondaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/kolage-128.jpg" />}
+          rightIconButton={rightIconMenu}
+          primaryText="me, Scott, Jennifer"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Summer BBQ</span><br />
               Wish I could come, but I&apos;m out of town this weekend.
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/uxceo-128.jpg" />}
-                    rightIconButton={rightIconMenu}
-                    primaryText="Grace Ng"
-                    secondaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/uxceo-128.jpg" />}
+          rightIconButton={rightIconMenu}
+          primaryText="Grace Ng"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Oui oui</span><br />
               Do you have any Paris recs? Have you ever been?
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/kerem-128.jpg" />}
-                    rightIconButton={rightIconMenu}
-                    primaryText="Kerem Suer"
-                    secondaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/kerem-128.jpg" />}
+          rightIconButton={rightIconMenu}
+          primaryText="Kerem Suer"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Birthday gift</span><br />
               Do you have any ideas what we can get Heidi for her birthday? How about a pony?
             </p>
           }
-                    secondaryTextLines={2}
-                />
+          secondaryTextLines={2}
+        />
                 <Divider inset={true}/>
-                <ListItem
-                    leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
-                    rightIconButton={rightIconMenu}
-                    primaryText="Raquel Parrado"
-                    secondaryText={
+        <ListItem
+          leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
+          rightIconButton={rightIconMenu}
+          primaryText="Raquel Parrado"
+          secondaryText={
             <p>
               <span style={{color: darkBlack}}>Recipe to try</span><br />
               We should eat this: grated squash. Corn and tomatillo tacos.
             </p>
           }
-                    secondaryTextLines={2}
-                />
-            </List>
-        </Paper>
-    </div>
+          secondaryTextLines={2}
+        />
+      </List>
+    </Paper>
+  </div>
 );
 
 function wrapState(ComposedComponent: React.ComponentClass<__MaterialUI.List.SelectableProps>) {
-    return class SelectableList extends Component<{defaultValue: number}, {selectedIndex: number}> {
-        static propTypes = {
-            children: PropTypes.node.isRequired,
-            defaultValue: PropTypes.number.isRequired,
-        };
-
-        componentWillMount() {
-            this.setState({
-                selectedIndex: this.props.defaultValue,
-            });
-        }
-
-        handleRequestChange = (event, index) => {
-            this.setState({
-                selectedIndex: index,
-            });
-        };
-
-        render() {
-            return (
-                <ComposedComponent
-                    value={this.state.selectedIndex}
-                    onChange={this.handleRequestChange}
-                >
-                    {this.props.children}
-                </ComposedComponent>
-            );
-        }
+  return class SelectableList extends Component<{defaultValue: number}, {selectedIndex: number}> {
+    static propTypes = {
+      children: PropTypes.node.isRequired,
+      defaultValue: PropTypes.number.isRequired,
     };
+
+    componentWillMount() {
+      this.setState({
+        selectedIndex: this.props.defaultValue,
+      });
+    }
+
+    handleRequestChange = (event, index) => {
+      this.setState({
+        selectedIndex: index,
+      });
+    };
+
+    render() {
+      return (
+        <ComposedComponent
+          value={this.state.selectedIndex}
+          onChange={this.handleRequestChange}
+        >
+          {this.props.children}
+        </ComposedComponent>
+      );
+    }
+  };
 }
 
 let SelectableList = wrapState(makeSelectable(List));
 
 const ListExampleSelectable = () => (
-    <Paper>
-        <SelectableList defaultValue={3}>
-            <Subheader>Selectable Contacts</Subheader>
-            <ListItem
-                value={1}
-                primaryText="Brendan Lim"
-                leftAvatar={<Avatar src="images/ok-128.jpg" />}
-                nestedItems={[
+  <Paper>
+    <SelectableList defaultValue={3}>
+      <Subheader>Selectable Contacts</Subheader>
+      <ListItem
+        value={1}
+        primaryText="Brendan Lim"
+        leftAvatar={<Avatar src="images/ok-128.jpg" />}
+        nestedItems={[
           <ListItem
             value={2}
             primaryText="Grace Ng"
             leftAvatar={<Avatar src="images/uxceo-128.jpg" />}
           />,
         ]}
-            />
-            <ListItem
-                value={3}
-                primaryText="Kerem Suer"
-                leftAvatar={<Avatar src="images/kerem-128.jpg" />}
-            />
-            <ListItem
-                value={4}
-                primaryText="Eric Hoffman"
-                leftAvatar={<Avatar src="images/kolage-128.jpg" />}
-            />
-            <ListItem
-                value={5}
-                primaryText="Raquel Parrado"
-                leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
-            />
-        </SelectableList>
-    </Paper>
+      />
+      <ListItem
+        value={3}
+        primaryText="Kerem Suer"
+        leftAvatar={<Avatar src="images/kerem-128.jpg" />}
+      />
+      <ListItem
+        value={4}
+        primaryText="Eric Hoffman"
+        leftAvatar={<Avatar src="images/kolage-128.jpg" />}
+      />
+      <ListItem
+        value={5}
+        primaryText="Raquel Parrado"
+        leftAvatar={<Avatar src="images/raquelromanp-128.jpg" />}
+      />
+    </SelectableList>
+  </Paper>
 );
 
 
 // "http://www.material-ui.com/#/components/menu"
 const MenuExampleSimple = () => (
-    <div>
-        <Paper style={style}>
-            <Menu>
+  <div>
+    <Paper style={style}>
+      <Menu>
                 <MenuItem primaryText="Maps"/>
                 <MenuItem primaryText="Books"/>
                 <MenuItem primaryText="Flights"/>
                 <MenuItem primaryText="Apps"/>
-            </Menu>
-        </Paper>
-        <Paper style={style}>
-            <Menu>
+      </Menu>
+    </Paper>
+    <Paper style={style}>
+      <Menu>
                 <MenuItem primaryText="Refresh"/>
                 <MenuItem primaryText="Help &amp; feedback"/>
                 <MenuItem primaryText="Settings"/>
                 <MenuItem primaryText="Sign out"/>
-            </Menu>
-        </Paper>
-    </div>
+      </Menu>
+    </Paper>
+  </div>
 );
 
 const MenuExampleDisable = () => (
-    <div>
-        <Paper style={style}>
-            <Menu desktop={true}>
+  <div>
+    <Paper style={style}>
+      <Menu desktop={true}>
                 <MenuItem primaryText="Back"/>
                 <MenuItem primaryText="Forward" disabled={true}/>
-                <Divider />
+        <Divider />
                 <MenuItem primaryText="Recently closed" disabled={true}/>
                 <MenuItem primaryText="Google" disabled={true}/>
                 <MenuItem primaryText="YouTube"/>
-            </Menu>
-        </Paper>
-        <Paper style={style}>
-            <Menu desktop={true}>
+      </Menu>
+    </Paper>
+    <Paper style={style}>
+      <Menu desktop={true}>
                 <MenuItem primaryText="Undo"/>
                 <MenuItem primaryText="Redo" disabled={true}/>
-                <Divider />
+        <Divider />
                 <MenuItem primaryText="Cut" disabled={true}/>
                 <MenuItem primaryText="Copy" disabled={true}/>
                 <MenuItem primaryText="Paste"/>
-            </Menu>
-        </Paper>
-    </div>
+      </Menu>
+    </Paper>
+  </div>
 );
 
 const MenuExampleIcons = () => (
-    <div>
-        <Paper style={styles.paper}>
-            <Menu>
+  <div>
+    <Paper style={styles.paper}>
+      <Menu>
                 <MenuItem primaryText="Preview" leftIcon={<RemoveRedEye />}/>
                 <MenuItem primaryText="Share" leftIcon={<PersonAdd />}/>
                 <MenuItem primaryText="Get links" leftIcon={<ContentLink />}/>
-                <Divider />
+        <Divider />
                 <MenuItem primaryText="Make a copy" leftIcon={<ContentCopy />}/>
                 <MenuItem primaryText="Download" leftIcon={<Download />}/>
-                <Divider />
+        <Divider />
                 <MenuItem primaryText="Remove" leftIcon={<Delete />}/>
-            </Menu>
-        </Paper>
-        <Paper style={styles.paper}>
-            <Menu>
+      </Menu>
+    </Paper>
+    <Paper style={styles.paper}>
+      <Menu>
                 <MenuItem primaryText="Clear Config"/>
                 <MenuItem primaryText="New Config" rightIcon={<PersonAdd />}/>
                 <MenuItem primaryText="Project" rightIcon={<FontIcon className="material-icons">settings</FontIcon>}/>
-                <MenuItem
-                    primaryText="Workspace"
-                    rightIcon={
+        <MenuItem
+          primaryText="Workspace"
+          rightIcon={
             <FontIcon className="material-icons" style={{color: '#559'}}>settings</FontIcon>
           }
-                />
+        />
                 <MenuItem primaryText="Paragraph" rightIcon={<b style={styles.rightIcon}>¶</b>}/>
                 <MenuItem primaryText="Section" rightIcon={<b style={styles.rightIcon}>§</b>}/>
-            </Menu>
-        </Paper>
-    </div>
+      </Menu>
+    </Paper>
+  </div>
 );
 
 const MenuExampleSecondary = () => (
-    <div>
-        <Paper style={style}>
-            <Menu desktop={true} width={256}>
+  <div>
+    <Paper style={style}>
+      <Menu desktop={true} width={256}>
                 <MenuItem primaryText="Bold" secondaryText="&#8984;B"/>
                 <MenuItem primaryText="Italic" secondaryText="&#8984;I"/>
                 <MenuItem primaryText="Underline" secondaryText="&#8984;U"/>
                 <MenuItem primaryText="Strikethrough" secondaryText="Alt+Shift+5"/>
                 <MenuItem primaryText="Superscript" secondaryText="&#8984;."/>
                 <MenuItem primaryText="Subscript" secondaryText="&#8984;,"/>
-                <Divider />
+        <Divider />
                 <MenuItem primaryText="Paragraph styles" rightIcon={<ArrowDropRight />}/>
                 <MenuItem primaryText="Align" rightIcon={<ArrowDropRight />}/>
                 <MenuItem primaryText="Line spacing" rightIcon={<ArrowDropRight />}/>
                 <MenuItem primaryText="Numbered list" rightIcon={<ArrowDropRight />}/>
                 <MenuItem primaryText="List options" rightIcon={<ArrowDropRight />}/>
-                <Divider />
+        <Divider />
                 <MenuItem primaryText="Clear formatting" secondaryText="&#8984;/"/>
-            </Menu>
-        </Paper>
-        <Paper style={style}>
-            <Menu desktop={true} width={256}>
+      </Menu>
+    </Paper>
+    <Paper style={style}>
+      <Menu desktop={true} width={256}>
                 <MenuItem primaryText="Open" secondaryText="Cmd + O"/>
                 <MenuItem primaryText="Paste in place" secondaryText="Shift + V"/>
                 <MenuItem primaryText="Research" secondaryText="Opt + Shift + Cmd + I"/>
-            </Menu>
-        </Paper>
-        <Paper style={style}>
-            <Menu desktop={true} width={256}>
+      </Menu>
+    </Paper>
+    <Paper style={style}>
+      <Menu desktop={true} width={256}>
                 <MenuItem primaryText="Open" secondaryText="&#8984;O"/>
                 <MenuItem primaryText="Paste in place" secondaryText="&#8679;&#8984;V"/>
                 <MenuItem primaryText="Research" secondaryText="&#8997;&#8679;&#8984;I"/>
-            </Menu>
-        </Paper>
-    </div>
+      </Menu>
+    </Paper>
+  </div>
 );
 
 const MenuExampleNested = () => (
-    <div>
-        <Paper style={style}>
-            <Menu desktop={true} width={320}>
+  <div>
+    <Paper style={style}>
+      <Menu desktop={true} width={320}>
                 <MenuItem primaryText="Single" insetChildren={true}/>
                 <MenuItem primaryText="1.15" insetChildren={true}/>
                 <MenuItem primaryText="Double" insetChildren={true}/>
-                <MenuItem
-                    primaryText="Custom: 1.2"
-                    checked={true}
-                    rightIcon={<ArrowDropRight />}
-                    menuItems={[
+        <MenuItem
+          primaryText="Custom: 1.2"
+          checked={true}
+          rightIcon={<ArrowDropRight />}
+          menuItems={[
             <MenuItem
               primaryText="Show"
               rightIcon={<ArrowDropRight />}
@@ -2436,160 +2436,160 @@ const MenuExampleNested = () => (
             <MenuItem primaryText="Page breaks" insetChildren={true} />,
             <MenuItem primaryText="Rules" checked={true} />,
           ]}
-                />
-                <Divider />
+        />
+        <Divider />
                 <MenuItem primaryText="Add space before paragraph"/>
                 <MenuItem primaryText="Add space after paragraph"/>
-                <Divider />
+        <Divider />
                 <MenuItem primaryText="Custom spacing..."/>
-            </Menu>
-        </Paper>
-    </div>
+      </Menu>
+    </Paper>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/icon-menu"
 const IconMenuExampleSimple = () => (
-    <div>
-        <IconMenu
-            animated={true}
-            iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
-            anchorOrigin={{horizontal: 'left', vertical: 'top'}}
-            targetOrigin={{horizontal: 'left', vertical: 'top'}}
-        >
+  <div>
+    <IconMenu
+      animated={true}
+      iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
+      anchorOrigin={{horizontal: 'left', vertical: 'top'}}
+      targetOrigin={{horizontal: 'left', vertical: 'top'}}
+    >
             <MenuItem primaryText="Refresh"/>
             <MenuItem primaryText="Send feedback"/>
             <MenuItem primaryText="Settings"/>
             <MenuItem primaryText="Help"/>
             <MenuItem primaryText="Sign out"/>
-        </IconMenu>
-        <IconMenu
-            animated={false}
-            iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
-            anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
-            targetOrigin={{horizontal: 'left', vertical: 'bottom'}}
-        >
+    </IconMenu>
+    <IconMenu
+      animated={false}
+      iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
+      anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
+      targetOrigin={{horizontal: 'left', vertical: 'bottom'}}
+    >
             <MenuItem primaryText="Refresh"/>
             <MenuItem primaryText="Send feedback"/>
             <MenuItem primaryText="Settings"/>
             <MenuItem primaryText="Help"/>
             <MenuItem primaryText="Sign out"/>
-        </IconMenu>
-        <IconMenu
-            iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
-            anchorOrigin={{horizontal: 'right', vertical: 'bottom'}}
-            targetOrigin={{horizontal: 'right', vertical: 'bottom'}}
-        >
+    </IconMenu>
+    <IconMenu
+      iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
+      anchorOrigin={{horizontal: 'right', vertical: 'bottom'}}
+      targetOrigin={{horizontal: 'right', vertical: 'bottom'}}
+    >
             <MenuItem primaryText="Refresh"/>
             <MenuItem primaryText="Send feedback"/>
             <MenuItem primaryText="Settings"/>
             <MenuItem primaryText="Help"/>
             <MenuItem primaryText="Sign out"/>
-        </IconMenu>
-        <IconMenu
-            iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
-            anchorOrigin={{horizontal: 'right', vertical: 'top'}}
-            targetOrigin={{horizontal: 'right', vertical: 'top'}}
-        >
+    </IconMenu>
+    <IconMenu
+      iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
+      anchorOrigin={{horizontal: 'right', vertical: 'top'}}
+      targetOrigin={{horizontal: 'right', vertical: 'top'}}
+    >
             <MenuItem primaryText="Refresh"/>
             <MenuItem primaryText="Send feedback"/>
             <MenuItem primaryText="Settings"/>
             <MenuItem primaryText="Help"/>
             <MenuItem primaryText="Sign out"/>
-        </IconMenu>
-    </div>
+    </IconMenu>
+  </div>
 );
 
 interface IconMenuExampleControlledState {
-    valueSingle?: string;
-    valueMultiple?: string[];
-    openMenu?: boolean;
+  valueSingle?: string;
+  valueMultiple?: string[];
+  openMenu?: boolean;
 }
 
 class IconMenuExampleControlled extends React.Component<{}, IconMenuExampleControlledState> {
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            valueSingle: '3',
-            valueMultiple: ['3', '5'],
-        };
-    }
-
-    handleChangeSingle = (event, value) => {
-        this.setState({
-            valueSingle: value,
-        });
+    this.state = {
+      valueSingle: '3',
+      valueMultiple: ['3', '5'],
     };
+  }
 
-    handleChangeMultiple = (event, value) => {
-        this.setState({
-            valueMultiple: value,
-        });
-    };
+  handleChangeSingle = (event, value) => {
+    this.setState({
+      valueSingle: value,
+    });
+  };
 
-    handleOpenMenu = () => {
-        this.setState({
-            openMenu: true,
-        });
-    }
+  handleChangeMultiple = (event, value) => {
+    this.setState({
+      valueMultiple: value,
+    });
+  };
 
-    handleOnRequestChange = (value) => {
-        this.setState({
-            openMenu: value,
-        });
-    }
+  handleOpenMenu = () => {
+    this.setState({
+      openMenu: true,
+    });
+  }
 
-    render() {
-        return (
-            <div>
-                <IconMenu
-                    iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
-                    onChange={this.handleChangeSingle}
-                    value={this.state.valueSingle}
-                >
+  handleOnRequestChange = (value) => {
+    this.setState({
+      openMenu: value,
+    });
+  }
+
+  render() {
+    return (
+      <div>
+        <IconMenu
+          iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
+          onChange={this.handleChangeSingle}
+          value={this.state.valueSingle}
+        >
                     <MenuItem value="1" primaryText="Refresh"/>
                     <MenuItem value="2" primaryText="Send feedback"/>
                     <MenuItem value="3" primaryText="Settings"/>
                     <MenuItem value="4" primaryText="Help"/>
                     <MenuItem value="5" primaryText="Sign out"/>
-                </IconMenu>
-                <IconMenu
-                    iconButtonElement={<IconButton><ContentFilter /></IconButton>}
-                    onChange={this.handleChangeMultiple}
-                    value={this.state.valueMultiple}
-                    multiple={true}
-                >
+        </IconMenu>
+        <IconMenu
+          iconButtonElement={<IconButton><ContentFilter /></IconButton>}
+          onChange={this.handleChangeMultiple}
+          value={this.state.valueMultiple}
+          multiple={true}
+        >
                     <MenuItem value="1" primaryText="Blu-ray"/>
                     <MenuItem value="2" primaryText="Cassette"/>
                     <MenuItem value="3" primaryText="CD"/>
                     <MenuItem value="4" primaryText="DVD Audio"/>
                     <MenuItem value="5" primaryText="Hybrid SACD"/>
                     <MenuItem value="6" primaryText="Vinyl"/>
-                </IconMenu>
-                <IconMenu
-                    iconButtonElement={<IconButton><FileFileDownload /></IconButton>}
-                    open={this.state.openMenu}
-                    onRequestChange={this.handleOnRequestChange}
-                >
+        </IconMenu>
+        <IconMenu
+          iconButtonElement={<IconButton><FileFileDownload /></IconButton>}
+          open={this.state.openMenu}
+          onRequestChange={this.handleOnRequestChange}
+        >
                     <MenuItem value="1" primaryText="Windows App"/>
                     <MenuItem value="2" primaryText="Mac App"/>
                     <MenuItem value="3" primaryText="Android App"/>
                     <MenuItem value="4" primaryText="iOS App"/>
-                </IconMenu>
+        </IconMenu>
                 <RaisedButton onTouchTap={this.handleOpenMenu} label="Downloads"/>
-            </div>
-        );
-    }
+      </div>
+    );
+  }
 }
 
 const IconMenuExampleScrollable = () => (
-    <IconMenu
-        iconButtonElement={<IconButton><MapsPlace /></IconButton>}
-        anchorOrigin={{horizontal: 'left', vertical: 'top'}}
-        targetOrigin={{horizontal: 'left', vertical: 'top'}}
-        maxHeight={272}
-    >
+  <IconMenu
+    iconButtonElement={<IconButton><MapsPlace /></IconButton>}
+    anchorOrigin={{horizontal: 'left', vertical: 'top'}}
+    targetOrigin={{horizontal: 'left', vertical: 'top'}}
+    maxHeight={272}
+  >
         <MenuItem value="AL" primaryText="Alabama"/>
         <MenuItem value="AK" primaryText="Alaska"/>
         <MenuItem value="AZ" primaryText="Arizona"/>
@@ -2641,106 +2641,106 @@ const IconMenuExampleScrollable = () => (
         <MenuItem value="WV" primaryText="West Virginia"/>
         <MenuItem value="WI" primaryText="Wisconsin"/>
         <MenuItem value="WY" primaryText="Wyoming"/>
-    </IconMenu>
+  </IconMenu>
 );
 
 const IconMenuExampleNested = () => (
-    <div>
-        <IconMenu
-            iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
-            anchorOrigin={{horizontal: 'left', vertical: 'top'}}
-            targetOrigin={{horizontal: 'left', vertical: 'top'}}
-        >
-            <MenuItem
-                primaryText="Copy &amp; Paste"
-                rightIcon={<ArrowDropRight />}
-                menuItems={[
+  <div>
+    <IconMenu
+      iconButtonElement={<IconButton><MoreVertIcon /></IconButton>}
+      anchorOrigin={{horizontal: 'left', vertical: 'top'}}
+      targetOrigin={{horizontal: 'left', vertical: 'top'}}
+    >
+      <MenuItem
+        primaryText="Copy &amp; Paste"
+        rightIcon={<ArrowDropRight />}
+        menuItems={[
           <MenuItem primaryText="Cut" />,
           <MenuItem primaryText="Copy" />,
           <Divider />,
           <MenuItem primaryText="Paste" />,
         ]}
-            />
+      />
 
-            <MenuItem
-                primaryText="Case Tools"
-                rightIcon={<ArrowDropRight />}
-                menuItems={[
+      <MenuItem
+        primaryText="Case Tools"
+        rightIcon={<ArrowDropRight />}
+        menuItems={[
           <MenuItem primaryText="UPPERCASE" />,
           <MenuItem primaryText="lowercase" />,
           <MenuItem primaryText="CamelCase" />,
           <MenuItem primaryText="Propercase" />,
         ]}
-            />
-            <Divider />
+      />
+      <Divider />
             <MenuItem primaryText="Download" leftIcon={<Download />}/>
-            <Divider />
+      <Divider />
             <MenuItem value="Del" primaryText="Delete"/>
 
-        </IconMenu>
-    </div>
+    </IconMenu>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/dropdown-menu"
 class DropDownMenuSimpleExample extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: 1};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: 1};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <div>
-                <DropDownMenu animated={false} value={this.state.value} onChange={this.handleChange}>
+  render() {
+    return (
+      <div>
+        <DropDownMenu animated={false} value={this.state.value} onChange={this.handleChange}>
                     <MenuItem value={1} primaryText="Never"/>
                     <MenuItem value={2} primaryText="Every Night"/>
                     <MenuItem value={3} primaryText="Weeknights"/>
                     <MenuItem value={4} primaryText="Weekends"/>
                     <MenuItem value={5} primaryText="Weekly"/>
-                </DropDownMenu>
-                <br />
-                <DropDownMenu
-                    animated={true}
-                    value={this.state.value}
-                    onChange={this.handleChange}
-                    style={styles.customWidth}
-                    autoWidth={false}
-                >
+        </DropDownMenu>
+        <br />
+        <DropDownMenu
+          animated={true}
+          value={this.state.value}
+          onChange={this.handleChange}
+          style={styles.customWidth}
+          autoWidth={false}
+        >
                     <MenuItem value={1} primaryText="Custom width"/>
                     <MenuItem value={2} primaryText="Every Night"/>
                     <MenuItem value={3} primaryText="Weeknights"/>
                     <MenuItem value={4} primaryText="Weekends"/>
                     <MenuItem value={5} primaryText="Weekly"/>
-                </DropDownMenu>
-            </div>
-        );
-    }
+        </DropDownMenu>
+      </div>
+    );
+  }
 }
 
 class DropDownMenuOpenImmediateExample extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: 2};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: 2};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <DropDownMenu value={this.state.value} onChange={this.handleChange} openImmediately={true}>
+  render() {
+    return (
+      <DropDownMenu value={this.state.value} onChange={this.handleChange} openImmediately={true}>
                 <MenuItem value={1} primaryText="Never"/>
                 <MenuItem value={2} primaryText="Every Night"/>
                 <MenuItem value={3} primaryText="Weeknights"/>
                 <MenuItem value={4} primaryText="Weekends"/>
                 <MenuItem value={5} primaryText="Weekly"/>
-            </DropDownMenu>
-        );
-    }
+      </DropDownMenu>
+    );
+  }
 }
 
 const items: React.ReactElement<__MaterialUI.Menus.MenuItemProps>[] = [];
@@ -2750,387 +2750,387 @@ for (let i = 0; i < 100; i++) {
 
 class DropDownMenuLongMenuExample extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: 10};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: 10};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <DropDownMenu maxHeight={300} value={this.state.value} onChange={this.handleChange}>
-                {items}
-            </DropDownMenu>
-        );
-    }
+  render() {
+    return (
+      <DropDownMenu maxHeight={300} value={this.state.value} onChange={this.handleChange}>
+        {items}
+      </DropDownMenu>
+    );
+  }
 }
 
 class DropDownMenuLabeledExample extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: 2};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: 2};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <DropDownMenu value={this.state.value} onChange={this.handleChange}>
+  render() {
+    return (
+      <DropDownMenu value={this.state.value} onChange={this.handleChange}>
                 <MenuItem value={1} label="5 am - 12 pm" primaryText="Morning"/>
                 <MenuItem value={2} label="12 pm - 5 pm" primaryText="Afternoon"/>
                 <MenuItem value={3} label="5 pm - 9 pm" primaryText="Evening"/>
                 <MenuItem value={4} label="9 pm - 5 am" primaryText="Night"/>
-            </DropDownMenu>
-        );
-    }
+      </DropDownMenu>
+    );
+  }
 }
 
 
 // "http://material-ui.com/#/components/paper"
 const PaperExampleSimple = () => (
-    <div>
+  <div>
         <Paper style={style} zDepth={1}/>
         <Paper style={style} zDepth={2}/>
         <Paper style={style} zDepth={3}/>
         <Paper style={style} zDepth={4}/>
         <Paper style={style} zDepth={5}/>
-    </div>
+  </div>
 );
 
 const PaperExampleRounded = () => (
-    <div>
+  <div>
         <Paper style={style} zDepth={1} rounded={false}/>
         <Paper style={style} zDepth={2} rounded={false}/>
         <Paper style={style} zDepth={3} rounded={false}/>
         <Paper style={style} zDepth={4} rounded={false}/>
         <Paper style={style} zDepth={5} rounded={false}/>
-    </div>
+  </div>
 );
 
 const PaperExampleCircle = () => (
-    <div>
+  <div>
         <Paper style={style} zDepth={1} circle={true}/>
         <Paper style={style} zDepth={2} circle={true}/>
         <Paper style={style} zDepth={3} circle={true}/>
         <Paper style={style} zDepth={4} circle={true}/>
         <Paper style={style} zDepth={5} circle={true}/>
-    </div>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/popover"
 class PopoverExampleSimple extends React.Component<{}, {open?: boolean, anchorEl?: React.ReactInstance}> {
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            open: false,
-        };
-    }
-
-    handleTouchTap = (event) => {
-        // This prevents ghost click.
-        event.preventDefault();
-
-        this.setState({
-            open: true,
-            anchorEl: event.currentTarget,
-        });
+    this.state = {
+      open: false,
     };
+  }
 
-    handleRequestClose = () => {
-        this.setState({
-            open: false,
-        });
-    };
+  handleTouchTap = (event) => {
+    // This prevents ghost click.
+    event.preventDefault();
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    onTouchTap={this.handleTouchTap}
-                    label="Click me"
-                />
-                <Popover
-                    open={this.state.open}
-                    anchorEl={this.state.anchorEl}
-                    anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
-                    targetOrigin={{horizontal: 'left', vertical: 'top'}}
-                    onRequestClose={this.handleRequestClose}
-                >
-                    <Menu>
+    this.setState({
+      open: true,
+      anchorEl: event.currentTarget,
+    });
+  };
+
+  handleRequestClose = () => {
+    this.setState({
+      open: false,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          onTouchTap={this.handleTouchTap}
+          label="Click me"
+        />
+        <Popover
+          open={this.state.open}
+          anchorEl={this.state.anchorEl}
+          anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
+          targetOrigin={{horizontal: 'left', vertical: 'top'}}
+          onRequestClose={this.handleRequestClose}
+        >
+          <Menu>
                         <MenuItem primaryText="Refresh"/>
                         <MenuItem primaryText="Help &amp; feedback"/>
                         <MenuItem primaryText="Settings"/>
                         <MenuItem primaryText="Sign out"/>
-                    </Menu>
-                </Popover>
-            </div>
-        );
-    }
+          </Menu>
+        </Popover>
+      </div>
+    );
+  }
 }
 
 class PopoverExampleAnimation extends React.Component<{}, {open?: boolean, anchorEl?: React.ReactInstance}> {
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            open: false,
-        };
-    }
-
-    handleTouchTap = (event) => {
-        // This prevents ghost click.
-        event.preventDefault();
-        this.setState({
-            open: true,
-            anchorEl: event.currentTarget,
-        });
+    this.state = {
+      open: false,
     };
+  }
 
-    handleRequestClose = () => {
-        this.setState({
-            open: false,
-        });
-    };
+  handleTouchTap = (event) => {
+    // This prevents ghost click.
+    event.preventDefault();
+    this.setState({
+      open: true,
+      anchorEl: event.currentTarget,
+    });
+  };
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    onTouchTap={this.handleTouchTap}
-                    label="Click me"
-                />
-                <Popover
-                    open={this.state.open}
-                    anchorEl={this.state.anchorEl}
-                    anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
-                    targetOrigin={{horizontal: 'left', vertical: 'top'}}
-                    onRequestClose={this.handleRequestClose}
-                    animation={PopoverAnimationVertical}
-                >
-                    <Menu>
+  handleRequestClose = () => {
+    this.setState({
+      open: false,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          onTouchTap={this.handleTouchTap}
+          label="Click me"
+        />
+        <Popover
+          open={this.state.open}
+          anchorEl={this.state.anchorEl}
+          anchorOrigin={{horizontal: 'left', vertical: 'bottom'}}
+          targetOrigin={{horizontal: 'left', vertical: 'top'}}
+          onRequestClose={this.handleRequestClose}
+          animation={PopoverAnimationVertical}
+        >
+          <Menu>
                         <MenuItem primaryText="Refresh"/>
                         <MenuItem primaryText="Help &amp; feedback"/>
                         <MenuItem primaryText="Settings"/>
                         <MenuItem primaryText="Sign out"/>
-                    </Menu>
-                </Popover>
-            </div>
-        );
-    }
+          </Menu>
+        </Popover>
+      </div>
+    );
+  }
 }
 
 interface PopoverExampleConfigurableState {
-    open?: boolean;
-    anchorOrigin?: __MaterialUI.propTypes.origin;
-    targetOrigin?: __MaterialUI.propTypes.origin;
-    anchorEl?: React.ReactInstance;
+  open?: boolean;
+  anchorOrigin?: __MaterialUI.propTypes.origin;
+  targetOrigin?: __MaterialUI.propTypes.origin;
+  anchorEl?: React.ReactInstance;
 }
 
 class PopoverExampleConfigurable extends React.Component<{}, PopoverExampleConfigurableState> {
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            open: false,
-            anchorOrigin: {
-                horizontal: 'left',
-                vertical: 'bottom',
-            },
-            targetOrigin: {
-                horizontal: 'left',
-                vertical: 'top',
-            },
-        };
-    }
-
-    handleTouchTap = (event) => {
-        // This prevents ghost click.
-        event.preventDefault();
-        this.setState({
-            open: true,
-            anchorEl: event.currentTarget,
-        });
+    this.state = {
+      open: false,
+      anchorOrigin: {
+        horizontal: 'left',
+        vertical: 'bottom',
+      },
+      targetOrigin: {
+        horizontal: 'left',
+        vertical: 'top',
+      },
     };
+  }
 
-    handleRequestClose = () => {
-        this.setState({
-            open: false,
-        });
-    };
+  handleTouchTap = (event) => {
+    // This prevents ghost click.
+    event.preventDefault();
+    this.setState({
+      open: true,
+      anchorEl: event.currentTarget,
+    });
+  };
 
-    setAnchor = (positionElement, position) => {
-        const {anchorOrigin} = this.state;
-        anchorOrigin[positionElement] = position;
+  handleRequestClose = () => {
+    this.setState({
+      open: false,
+    });
+  };
 
-        this.setState({
-            anchorOrigin: anchorOrigin,
-        });
-    };
+  setAnchor = (positionElement, position) => {
+    const {anchorOrigin} = this.state;
+    anchorOrigin[positionElement] = position;
 
-    setTarget = (positionElement, position) => {
-        const {targetOrigin} = this.state;
-        targetOrigin[positionElement] = position;
+    this.setState({
+      anchorOrigin: anchorOrigin,
+    });
+  };
 
-        this.setState({
-            targetOrigin: targetOrigin,
-        });
-    };
+  setTarget = (positionElement, position) => {
+    const {targetOrigin} = this.state;
+    targetOrigin[positionElement] = position;
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    onTouchTap={this.handleTouchTap}
-                    label="Click me"
-                />
-                <h3 style={styles.h3}>Current Settings</h3>
-                <pre>
+    this.setState({
+      targetOrigin: targetOrigin,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          onTouchTap={this.handleTouchTap}
+          label="Click me"
+        />
+        <h3 style={styles.h3}>Current Settings</h3>
+        <pre>
           anchorOrigin: {JSON.stringify(this.state.anchorOrigin)}
-                    <br />
+          <br />
           targetOrigin: {JSON.stringify(this.state.targetOrigin)}
         </pre>
-                <h3 style={styles.h3}>Position Options</h3>
-                <p>Use the settings below to toggle the positioning of the popovers above</p>
-                <h3 style={styles.h3}>Anchor Origin</h3>
-                <div style={styles.block}>
-                    <div style={styles.block2}>
-                        <span>Vertical</span>
-                        <RadioButton
-                            onClick={this.setAnchor.bind(this, 'vertical', 'top')}
-                            label="Top" checked={this.state.anchorOrigin.vertical === 'top'}
-                        />
-                        <RadioButton
-                            onClick={this.setAnchor.bind(this, 'vertical', 'center')}
-                            label="Center" checked={this.state.anchorOrigin.vertical === 'center'}
-                        />
-                        <RadioButton
-                            onClick={this.setAnchor.bind(this, 'vertical', 'bottom')}
-                            label="Bottom" checked={this.state.anchorOrigin.vertical === 'bottom'}
-                        />
-                    </div>
-                    <div style={styles.block2}>
-                        <span>Horizontal</span>
-                        <RadioButton
-                            onClick={this.setAnchor.bind(this, 'horizontal', 'left')}
-                            label="Left" checked={this.state.anchorOrigin.horizontal === 'left'}
-                        />
-                        <RadioButton
-                            onClick={this.setAnchor.bind(this, 'horizontal', 'middle')}
-                            label="Middle" checked={this.state.anchorOrigin.horizontal === 'middle'}
-                        />
-                        <RadioButton
-                            onClick={this.setAnchor.bind(this, 'horizontal', 'right')}
-                            label="Right" checked={this.state.anchorOrigin.horizontal === 'right'}
-                        />
-                    </div>
-                </div>
-                <h3 style={styles.h3}>Target Origin</h3>
-                <div style={styles.block}>
-                    <div style={styles.block2}>
-                        <span>Vertical</span>
-                        <RadioButton
-                            onClick={this.setTarget.bind(this, 'vertical', 'top')}
-                            label="Top" checked={this.state.targetOrigin.vertical === 'top'}
-                        />
-                        <RadioButton
-                            onClick={this.setTarget.bind(this, 'vertical', 'center')}
-                            label="Center" checked={this.state.targetOrigin.vertical === 'center'}
-                        />
-                        <RadioButton
-                            onClick={this.setTarget.bind(this, 'vertical', 'bottom')}
-                            label="Bottom" checked={this.state.targetOrigin.vertical === 'bottom'}
-                        />
-                    </div>
-                    <div style={styles.block2}>
-                        <span>Horizontal</span>
-                        <RadioButton
-                            onClick={this.setTarget.bind(this, 'horizontal', 'left')}
-                            label="Left" checked={this.state.targetOrigin.horizontal === 'left'}
-                        />
-                        <RadioButton
-                            onClick={this.setTarget.bind(this, 'horizontal', 'middle')}
-                            label="Middle" checked={this.state.targetOrigin.horizontal === 'middle'}
-                        />
-                        <RadioButton
-                            onClick={this.setTarget.bind(this, 'horizontal', 'right')}
-                            label="Right" checked={this.state.targetOrigin.horizontal === 'right'}
-                        />
-                    </div>
-                </div>
-                <Popover
-                    open={this.state.open}
-                    anchorEl={this.state.anchorEl}
-                    anchorOrigin={this.state.anchorOrigin}
-                    targetOrigin={this.state.targetOrigin}
-                    onRequestClose={this.handleRequestClose}
-                >
-                    <Menu>
+        <h3 style={styles.h3}>Position Options</h3>
+        <p>Use the settings below to toggle the positioning of the popovers above</p>
+        <h3 style={styles.h3}>Anchor Origin</h3>
+        <div style={styles.block}>
+          <div style={styles.block2}>
+            <span>Vertical</span>
+            <RadioButton
+              onClick={this.setAnchor.bind(this, 'vertical', 'top')}
+              label="Top" checked={this.state.anchorOrigin.vertical === 'top'}
+            />
+            <RadioButton
+              onClick={this.setAnchor.bind(this, 'vertical', 'center')}
+              label="Center" checked={this.state.anchorOrigin.vertical === 'center'}
+            />
+            <RadioButton
+              onClick={this.setAnchor.bind(this, 'vertical', 'bottom')}
+              label="Bottom" checked={this.state.anchorOrigin.vertical === 'bottom'}
+            />
+          </div>
+          <div style={styles.block2}>
+            <span>Horizontal</span>
+            <RadioButton
+              onClick={this.setAnchor.bind(this, 'horizontal', 'left')}
+              label="Left" checked={this.state.anchorOrigin.horizontal === 'left'}
+            />
+            <RadioButton
+              onClick={this.setAnchor.bind(this, 'horizontal', 'middle')}
+              label="Middle" checked={this.state.anchorOrigin.horizontal === 'middle'}
+            />
+            <RadioButton
+              onClick={this.setAnchor.bind(this, 'horizontal', 'right')}
+              label="Right" checked={this.state.anchorOrigin.horizontal === 'right'}
+            />
+          </div>
+        </div>
+        <h3 style={styles.h3}>Target Origin</h3>
+        <div style={styles.block}>
+          <div style={styles.block2}>
+            <span>Vertical</span>
+            <RadioButton
+              onClick={this.setTarget.bind(this, 'vertical', 'top')}
+              label="Top" checked={this.state.targetOrigin.vertical === 'top'}
+            />
+            <RadioButton
+              onClick={this.setTarget.bind(this, 'vertical', 'center')}
+              label="Center" checked={this.state.targetOrigin.vertical === 'center'}
+            />
+            <RadioButton
+              onClick={this.setTarget.bind(this, 'vertical', 'bottom')}
+              label="Bottom" checked={this.state.targetOrigin.vertical === 'bottom'}
+            />
+          </div>
+          <div style={styles.block2}>
+            <span>Horizontal</span>
+            <RadioButton
+              onClick={this.setTarget.bind(this, 'horizontal', 'left')}
+              label="Left" checked={this.state.targetOrigin.horizontal === 'left'}
+            />
+            <RadioButton
+              onClick={this.setTarget.bind(this, 'horizontal', 'middle')}
+              label="Middle" checked={this.state.targetOrigin.horizontal === 'middle'}
+            />
+            <RadioButton
+              onClick={this.setTarget.bind(this, 'horizontal', 'right')}
+              label="Right" checked={this.state.targetOrigin.horizontal === 'right'}
+            />
+          </div>
+        </div>
+        <Popover
+          open={this.state.open}
+          anchorEl={this.state.anchorEl}
+          anchorOrigin={this.state.anchorOrigin}
+          targetOrigin={this.state.targetOrigin}
+          onRequestClose={this.handleRequestClose}
+        >
+          <Menu>
                         <MenuItem primaryText="Refresh"/>
                         <MenuItem primaryText="Help &amp; feedback"/>
                         <MenuItem primaryText="Settings"/>
                         <MenuItem primaryText="Sign out"/>
-                    </Menu>
-                </Popover>
-            </div>
-        );
-    }
+          </Menu>
+        </Popover>
+      </div>
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/circular-progress"
 const CircularProgressExampleSimple = () => (
-    <div>
-        <CircularProgress />
+  <div>
+    <CircularProgress />
         <CircularProgress size={1.5}/>
         <CircularProgress size={2} thickness={1.5}/>
-    </div>
+  </div>
 );
 
 class CircularProgressExampleDeterminate extends React.Component<{}, {completed?: number}> {
-    private timer: number;
+  private timer: number;
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            completed: 0,
-        };
+    this.state = {
+      completed: 0,
+    };
+  }
+
+  componentDidMount() {
+    this.timer = setTimeout(() => this.progress(5), 1000);
+  }
+
+  componentWillUnmount() {
+    clearTimeout(this.timer);
+  }
+
+  progress(completed) {
+    if (completed > 100) {
+      this.setState({completed: 100});
+    } else {
+      this.setState({completed});
+      const diff = Math.random() * 10;
+      this.timer = setTimeout(() => this.progress(completed + diff), 1000);
     }
+  }
 
-    componentDidMount() {
-        this.timer = setTimeout(() => this.progress(5), 1000);
-    }
-
-    componentWillUnmount() {
-        clearTimeout(this.timer);
-    }
-
-    progress(completed) {
-        if (completed > 100) {
-            this.setState({completed: 100});
-        } else {
-            this.setState({completed});
-            const diff = Math.random() * 10;
-            this.timer = setTimeout(() => this.progress(completed + diff), 1000);
-        }
-    }
-
-    render() {
-        return (
-            <div>
+  render() {
+    return (
+      <div>
                 <CircularProgress mode="determinate" value={this.state.completed}/>
                 <CircularProgress mode="determinate" value={this.state.completed} size={1.5}/>
                 <CircularProgress mode="determinate" value={this.state.completed} size={2}/>
-            </div>
-        );
-    }
+      </div>
+    );
+  }
 }
 
 
@@ -3140,194 +3140,194 @@ const LinearProgressExampleSimple = () => (
 );
 
 class LinearProgressExampleDeterminate extends React.Component<{}, {completed?: number}> {
-    private timer: number;
+  private timer: number;
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            completed: 0,
-        };
+    this.state = {
+      completed: 0,
+    };
+  }
+
+  componentDidMount() {
+    this.timer = setTimeout(() => this.progress(5), 1000);
+  }
+
+  componentWillUnmount() {
+    clearTimeout(this.timer);
+  }
+
+  progress(completed) {
+    if (completed > 100) {
+      this.setState({completed: 100});
+    } else {
+      this.setState({completed});
+      const diff = Math.random() * 10;
+      this.timer = setTimeout(() => this.progress(completed + diff), 1000);
     }
+  }
 
-    componentDidMount() {
-        this.timer = setTimeout(() => this.progress(5), 1000);
-    }
-
-    componentWillUnmount() {
-        clearTimeout(this.timer);
-    }
-
-    progress(completed) {
-        if (completed > 100) {
-            this.setState({completed: 100});
-        } else {
-            this.setState({completed});
-            const diff = Math.random() * 10;
-            this.timer = setTimeout(() => this.progress(completed + diff), 1000);
-        }
-    }
-
-    render() {
-        return (
+  render() {
+    return (
             <LinearProgress mode="determinate" value={this.state.completed}/>
-        );
-    }
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/refresh-indicator"
 const RefreshIndicatorExampleSimple = () => (
-    <div style={styles.container}>
-        <RefreshIndicator
-            percentage={30}
-            size={40}
-            left={10}
-            top={0}
-            status="ready"
-            style={styles.refresh}
-        />
-        <RefreshIndicator
-            percentage={60}
-            size={50}
-            left={65}
-            top={0}
-            status="ready"
-            style={styles.refresh}
-        />
-        <RefreshIndicator
-            percentage={80}
-            size={60}
-            left={120}
-            top={0}
-            color={"red"}
-            status="ready"
-            style={styles.refresh}
-        />
-        <RefreshIndicator
-            percentage={100}
-            size={70}
-            left={175}
-            top={0}
-            color={"red"} // Overridden by percentage={100}
-            status="ready"
-            style={styles.refresh}
-        />
-    </div>
+  <div style={styles.container}>
+    <RefreshIndicator
+      percentage={30}
+      size={40}
+      left={10}
+      top={0}
+      status="ready"
+      style={styles.refresh}
+    />
+    <RefreshIndicator
+      percentage={60}
+      size={50}
+      left={65}
+      top={0}
+      status="ready"
+      style={styles.refresh}
+    />
+    <RefreshIndicator
+      percentage={80}
+      size={60}
+      left={120}
+      top={0}
+      color={"red"}
+      status="ready"
+      style={styles.refresh}
+    />
+    <RefreshIndicator
+      percentage={100}
+      size={70}
+      left={175}
+      top={0}
+      color={"red"} // Overridden by percentage={100}
+      status="ready"
+      style={styles.refresh}
+    />
+  </div>
 );
 
 const RefreshIndicatorExampleLoading = () => (
-    <div style={styles.container}>
-        <RefreshIndicator
-            size={40}
-            left={10}
-            top={0}
-            status="loading"
-            style={styles.refresh}
-        />
-        <RefreshIndicator
-            size={50}
-            left={70}
-            top={0}
-            loadingColor={"#FF9800"}
-            status="loading"
-            style={styles.refresh}
-        />
-    </div>
+  <div style={styles.container}>
+    <RefreshIndicator
+      size={40}
+      left={10}
+      top={0}
+      status="loading"
+      style={styles.refresh}
+    />
+    <RefreshIndicator
+      size={50}
+      left={70}
+      top={0}
+      loadingColor={"#FF9800"}
+      status="loading"
+      style={styles.refresh}
+    />
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/select-field"
 class SelectFieldExampleSimple extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: 1};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: 1};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <div>
-                <SelectField value={this.state.value} onChange={this.handleChange}>
+  render() {
+    return (
+      <div>
+        <SelectField value={this.state.value} onChange={this.handleChange}>
                     <MenuItem value={1} primaryText="Never"/>
                     <MenuItem value={2} primaryText="Every Night"/>
                     <MenuItem value={3} primaryText="Weeknights"/>
                     <MenuItem value={4} primaryText="Weekends"/>
                     <MenuItem value={5} primaryText="Weekly"/>
-                </SelectField>
-                <br />
-                <SelectField value={1} disabled={true}>
+        </SelectField>
+        <br />
+        <SelectField value={1} disabled={true}>
                     <MenuItem value={1} primaryText="Disabled"/>
                     <MenuItem value={2} primaryText="Every Night"/>
-                </SelectField>
-                <br />
-                <SelectField
-                    value={this.state.value}
-                    onChange={this.handleChange}
-                    style={styles.customWidth}
-                >
+        </SelectField>
+        <br />
+        <SelectField
+          value={this.state.value}
+          onChange={this.handleChange}
+          style={styles.customWidth}
+        >
                     <MenuItem value={1} primaryText="Custom width"/>
                     <MenuItem value={2} primaryText="Every Night"/>
                     <MenuItem value={3} primaryText="Weeknights"/>
                     <MenuItem value={4} primaryText="Weekends"/>
                     <MenuItem value={5} primaryText="Weekly"/>
-                </SelectField>
-                <br />
-                <SelectField
-                    value={this.state.value}
-                    onChange={this.handleChange}
-                    autoWidth={true}
-                >
+        </SelectField>
+        <br />
+        <SelectField
+          value={this.state.value}
+          onChange={this.handleChange}
+          autoWidth={true}
+        >
                     <MenuItem value={1} primaryText="Auto width"/>
                     <MenuItem value={2} primaryText="Every Night"/>
                     <MenuItem value={3} primaryText="Weeknights"/>
                     <MenuItem value={4} primaryText="Weekends"/>
                     <MenuItem value={5} primaryText="Weekly"/>
-                </SelectField>
-            </div>
-        );
-    }
+        </SelectField>
+      </div>
+    );
+  }
 }
 
 class SelectFieldLongMenuExample extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: 10};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: 10};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <SelectField maxHeight={300} value={this.state.value} onChange={this.handleChange}>
-                {items}
-            </SelectField>
-        );
-    }
+  render() {
+    return (
+      <SelectField maxHeight={300} value={this.state.value} onChange={this.handleChange}>
+        {items}
+      </SelectField>
+    );
+  }
 }
 
 class SelectFieldExampleCustomLabel extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: 1};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: 1};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <SelectField value={this.state.value} onChange={this.handleChange}>
+  render() {
+    return (
+      <SelectField value={this.state.value} onChange={this.handleChange}>
                 <MenuItem value={1} label="5 am - 12 pm" primaryText="Morning"/>
                 <MenuItem value={2} label="12 pm - 5 pm" primaryText="Afternoon"/>
                 <MenuItem value={3} label="5 pm - 9 pm" primaryText="Evening"/>
                 <MenuItem value={4} label="9 pm - 5 am" primaryText="Night"/>
-            </SelectField>
-        );
-    }
+      </SelectField>
+    );
+  }
 }
 
 const itemsPeriod = [
@@ -3340,91 +3340,91 @@ const itemsPeriod = [
 
 export default class SelectFieldExampleFloatingLabel extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: null};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: null};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <div>
-                <SelectField
-                    value={this.state.value}
-                    onChange={this.handleChange}
-                    floatingLabelText="Floating Label Text"
-                >
-                    {itemsPeriod}
-                </SelectField>
-                <br />
-                <SelectField
-                    value={this.state.value}
-                    onChange={this.handleChange}
-                    floatingLabelFixed={true}
-                    floatingLabelText="Styled Floating Label Text"
-                    floatingLabelStyle={{color: 'red'}}
-                >
-                    {itemsPeriod}
-                </SelectField>
-            </div>
-        );
-    }
+  render() {
+    return (
+      <div>
+        <SelectField
+          value={this.state.value}
+          onChange={this.handleChange}
+          floatingLabelText="Floating Label Text"
+        >
+          {itemsPeriod}
+        </SelectField>
+        <br />
+        <SelectField
+          value={this.state.value}
+          onChange={this.handleChange}
+          floatingLabelFixed={true}
+          floatingLabelText="Styled Floating Label Text"
+          floatingLabelStyle={{color: 'red'}}
+        >
+          {itemsPeriod}
+        </SelectField>
+      </div>
+    );
+  }
 }
 
 class SelectFieldExampleError extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value: null};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value: null};
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        const {value} = this.state;
+  render() {
+    const {value} = this.state;
 
-        const night = value === 2 || value === 3;
+    const night = value === 2 || value === 3;
 
-        return (
-            <div>
-                <SelectField
-                    value={value}
-                    onChange={this.handleChange}
-                    errorText={!night && 'Should be Night'}
-                >
-                    {itemsPeriod}
-                </SelectField>
-                <br />
-                <SelectField
-                    value={value}
-                    onChange={this.handleChange}
-                    errorText={night && 'Should not be Night (Custom error style)'}
-                    errorStyle={{color: 'orange'}}
-                >
-                    {itemsPeriod}
-                </SelectField>
-            </div>
-        );
-    }
+    return (
+      <div>
+        <SelectField
+          value={value}
+          onChange={this.handleChange}
+          errorText={!night && 'Should be Night'}
+        >
+          {itemsPeriod}
+        </SelectField>
+        <br />
+        <SelectField
+          value={value}
+          onChange={this.handleChange}
+          errorText={night && 'Should not be Night (Custom error style)'}
+          errorStyle={{color: 'orange'}}
+        >
+          {itemsPeriod}
+        </SelectField>
+      </div>
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/slider"
 const SliderExampleSimple = () => (
-    <div>
-        <Slider />
+  <div>
+    <Slider />
         <Slider defaultValue={0.5}/>
         <Slider defaultValue={1}/>
-    </div>
+  </div>
 );
 
 const SliderExampleDisabled = () => (
-    <div>
+  <div>
         <Slider disabled={true}/>
         <Slider disabled={true} value={0.5}/>
         <Slider disabled={true} value={1}/>
-    </div>
+  </div>
 );
 
 const SliderExampleStep = () => (
@@ -3433,870 +3433,870 @@ const SliderExampleStep = () => (
 
 class SliderExampleControlled extends React.Component<{}, {firstSlider?: number, secondSlider?: number}> {
 
-    state = {
-        firstSlider: 0.5,
-        secondSlider: 50,
-    }
+  state = {
+    firstSlider: 0.5,
+    secondSlider: 50,
+  }
 
-    handleFirstSlider(event, value) {
-        this.setState({firstSlider: value});
-    }
+  handleFirstSlider(event, value) {
+    this.setState({firstSlider: value});
+  }
 
-    handleSecondSlider(event, value) {
-        this.setState({secondSlider: value});
-    }
+  handleSecondSlider(event, value) {
+    this.setState({secondSlider: value});
+  }
 
-    render() {
-        return (
-            <div>
-                <Slider
-                    defaultValue={0.5}
-                    value={this.state.firstSlider}
-                    onChange={this.handleFirstSlider.bind(this)}
-                />
-                <p>
-                    <span>{'The value of this slider is: '}</span>
-                    <span>{this.state.firstSlider}</span>
-                    <span>{' from a range of 0 to 1 inclusive'}</span>
-                </p>
-                <Slider
-                    min={0}
-                    max={100}
-                    step={1}
-                    defaultValue={50}
-                    value={this.state.secondSlider}
-                    onChange={this.handleSecondSlider.bind(this)}
-                />
-                <p>
-                    <span>{'The value of this slider is: '}</span>
-                    <span>{this.state.secondSlider}</span>
-                    <span>{' from a range of 0 to 100 inclusive'}</span>
-                </p>
-            </div>
-        );
-    }
+  render() {
+    return (
+      <div>
+        <Slider
+          defaultValue={0.5}
+          value={this.state.firstSlider}
+          onChange={this.handleFirstSlider.bind(this)}
+        />
+        <p>
+          <span>{'The value of this slider is: '}</span>
+          <span>{this.state.firstSlider}</span>
+          <span>{' from a range of 0 to 1 inclusive'}</span>
+        </p>
+        <Slider
+          min={0}
+          max={100}
+          step={1}
+          defaultValue={50}
+          value={this.state.secondSlider}
+          onChange={this.handleSecondSlider.bind(this)}
+        />
+        <p>
+          <span>{'The value of this slider is: '}</span>
+          <span>{this.state.secondSlider}</span>
+          <span>{' from a range of 0 to 100 inclusive'}</span>
+        </p>
+      </div>
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/checkbox"
 const CheckboxExampleSimple = () => (
-    <div style={styles.block}>
-        <Checkbox
-            label="Simple"
-            style={styles.checkbox}
-        />
-        <Checkbox
-            label="Checked by default"
-            defaultChecked={true}
-            style={styles.checkbox}
-        />
-        <Checkbox
-            checkedIcon={<ActionFavorite />}
-            uncheckedIcon={<ActionFavoriteBorder />}
-            label="Custom icon"
-            style={styles.checkbox}
-        />
-        <Checkbox
-            label="Disabled unchecked"
-            disabled={true}
-            style={styles.checkbox}
-        />
-        <Checkbox
-            label="Disabled checked"
-            checked={true}
-            disabled={true}
-            style={styles.checkbox}
-        />
-        <Checkbox
-            label="Label on the left"
-            labelPosition="left"
-            style={styles.checkbox}
-        />
-    </div>
+  <div style={styles.block}>
+    <Checkbox
+      label="Simple"
+      style={styles.checkbox}
+    />
+    <Checkbox
+      label="Checked by default"
+      defaultChecked={true}
+      style={styles.checkbox}
+    />
+    <Checkbox
+      checkedIcon={<ActionFavorite />}
+      uncheckedIcon={<ActionFavoriteBorder />}
+      label="Custom icon"
+      style={styles.checkbox}
+    />
+    <Checkbox
+      label="Disabled unchecked"
+      disabled={true}
+      style={styles.checkbox}
+    />
+    <Checkbox
+      label="Disabled checked"
+      checked={true}
+      disabled={true}
+      style={styles.checkbox}
+    />
+    <Checkbox
+      label="Label on the left"
+      labelPosition="left"
+      style={styles.checkbox}
+    />
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/radio-button"
 const RadioButtonExampleSimple = () => (
-    <div>
-        <RadioButtonGroup name="shipSpeed" defaultSelected="not_light">
-            <RadioButton
-                value="light"
-                label="Simple"
-                style={styles.radioButton}
-            />
-            <RadioButton
-                value="not_light"
-                label="Selected by default"
-                style={styles.radioButton}
-            />
-            <RadioButton
-                value="ludicrous"
-                label="Custom icon"
-                checkedIcon={<ActionFavorite />}
-                uncheckedIcon={<ActionFavoriteBorder />}
-                style={styles.radioButton}
-            />
-        </RadioButtonGroup>
-        <RadioButtonGroup name="shipName" defaultSelected="community">
-            <RadioButton
-                value="enterprise"
-                label="Disabled unchecked"
-                disabled={true}
-                style={styles.radioButton}
-            />
-            <RadioButton
-                value="community"
-                label="Disabled checked"
-                disabled={true}
-                style={styles.radioButton}
-            />
-        </RadioButtonGroup>
-        <RadioButtonGroup name="notRight" labelPosition="left" style={styles.block}>
-            <RadioButton
-                value="reverse"
-                label="Label on the left"
-                style={styles.radioButton}
-            />
-        </RadioButtonGroup>
-    </div>
+  <div>
+    <RadioButtonGroup name="shipSpeed" defaultSelected="not_light">
+      <RadioButton
+        value="light"
+        label="Simple"
+        style={styles.radioButton}
+      />
+      <RadioButton
+        value="not_light"
+        label="Selected by default"
+        style={styles.radioButton}
+      />
+      <RadioButton
+        value="ludicrous"
+        label="Custom icon"
+        checkedIcon={<ActionFavorite />}
+        uncheckedIcon={<ActionFavoriteBorder />}
+        style={styles.radioButton}
+      />
+    </RadioButtonGroup>
+    <RadioButtonGroup name="shipName" defaultSelected="community">
+      <RadioButton
+        value="enterprise"
+        label="Disabled unchecked"
+        disabled={true}
+        style={styles.radioButton}
+      />
+      <RadioButton
+        value="community"
+        label="Disabled checked"
+        disabled={true}
+        style={styles.radioButton}
+      />
+    </RadioButtonGroup>
+    <RadioButtonGroup name="notRight" labelPosition="left" style={styles.block}>
+      <RadioButton
+        value="reverse"
+        label="Label on the left"
+        style={styles.radioButton}
+      />
+    </RadioButtonGroup>
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/toggle"
 const ToggleExampleSimple = () => (
-    <div style={styles.block}>
-        <Toggle
-            label="Simple"
-            style={styles.toggle}
-        />
-        <Toggle
-            label="Toggled by default"
-            defaultToggled={true}
-            style={styles.toggle}
-        />
-        <Toggle
-            label="Disabled"
-            disabled={true}
-            style={styles.toggle}
-        />
-        <Toggle
-            label="Label on the right"
-            labelPosition="right"
-            style={styles.toggle}
-            thumbSwitchedStyle={styles.toggle}
-            trackSwitchedStyle={styles.toggle}
-        />
-    </div>
+  <div style={styles.block}>
+    <Toggle
+      label="Simple"
+      style={styles.toggle}
+    />
+    <Toggle
+      label="Toggled by default"
+      defaultToggled={true}
+      style={styles.toggle}
+    />
+    <Toggle
+      label="Disabled"
+      disabled={true}
+      style={styles.toggle}
+    />
+    <Toggle
+      label="Label on the right"
+      labelPosition="right"
+      style={styles.toggle}
+      thumbSwitchedStyle={styles.toggle}
+      trackSwitchedStyle={styles.toggle}
+    />
+  </div>
 );
 
 
 // "http://material-ui.com/#/components/snackbar"
 class SnackbarExampleSimple extends React.Component<{}, {open?: boolean}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            open: false,
-        };
-    }
-
-    handleTouchTap = () => {
-        this.setState({
-            open: true,
-        });
+  constructor(props) {
+    super(props);
+    this.state = {
+      open: false,
     };
+  }
 
-    handleRequestClose = () => {
-        this.setState({
-            open: false,
-        });
-    };
+  handleTouchTap = () => {
+    this.setState({
+      open: true,
+    });
+  };
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    onTouchTap={this.handleTouchTap}
-                    label="Add to my calendar"
-                />
-                <Snackbar
-                    open={this.state.open}
-                    message="Event added to your calendar"
-                    autoHideDuration={4000}
-                    onRequestClose={this.handleRequestClose}
+  handleRequestClose = () => {
+    this.setState({
+      open: false,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          onTouchTap={this.handleTouchTap}
+          label="Add to my calendar"
+        />
+        <Snackbar
+          open={this.state.open}
+          message="Event added to your calendar"
+          autoHideDuration={4000}
+          onRequestClose={this.handleRequestClose}
                     contentStyle={{margin: 16}}
-                />
-            </div>
-        );
-    }
+        />
+      </div>
+    );
+  }
 }
 
 class SnackbarExampleAction extends React.Component<{}, {open?: boolean, autoHideDuration?: number, message?: string}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            autoHideDuration: 4000,
-            message: 'Event added to your calendar',
-            open: false,
-        };
-    }
-
-    handleTouchTap = () => {
-        this.setState({
-            open: true,
-        });
+  constructor(props) {
+    super(props);
+    this.state = {
+      autoHideDuration: 4000,
+      message: 'Event added to your calendar',
+      open: false,
     };
+  }
 
-    handleActionTouchTap = () => {
-        this.setState({
-            open: false,
-        });
-        alert('Event removed from your calendar.');
-    };
+  handleTouchTap = () => {
+    this.setState({
+      open: true,
+    });
+  };
 
-    handleChangeDuration = (event) => {
-        const value = event.target.value;
-        this.setState({
-            autoHideDuration: value.length > 0 ? parseInt(value) : 0,
-        });
-    };
+  handleActionTouchTap = () => {
+    this.setState({
+      open: false,
+    });
+    alert('Event removed from your calendar.');
+  };
 
-    handleRequestClose = () => {
-        this.setState({
-            open: false,
-        });
-    };
+  handleChangeDuration = (event) => {
+    const value = event.target.value;
+    this.setState({
+      autoHideDuration: value.length > 0 ? parseInt(value) : 0,
+    });
+  };
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    onTouchTap={this.handleTouchTap}
-                    label="Add to my calendar"
-                />
-                <br />
-                <TextField
-                    floatingLabelText="Auto Hide Duration in ms"
-                    value={this.state.autoHideDuration}
-                    onChange={this.handleChangeDuration}
-                />
-                <Snackbar
-                    open={this.state.open}
-                    message={this.state.message}
-                    action="undo"
-                    autoHideDuration={this.state.autoHideDuration}
-                    onActionTouchTap={this.handleActionTouchTap}
-                    onRequestClose={this.handleRequestClose}
-                />
-            </div>
-        );
-    }
+  handleRequestClose = () => {
+    this.setState({
+      open: false,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          onTouchTap={this.handleTouchTap}
+          label="Add to my calendar"
+        />
+        <br />
+        <TextField
+          floatingLabelText="Auto Hide Duration in ms"
+          value={this.state.autoHideDuration}
+          onChange={this.handleChangeDuration}
+        />
+        <Snackbar
+          open={this.state.open}
+          message={this.state.message}
+          action="undo"
+          autoHideDuration={this.state.autoHideDuration}
+          onActionTouchTap={this.handleActionTouchTap}
+          onRequestClose={this.handleRequestClose}
+        />
+      </div>
+    );
+  }
 }
 
 class SnackbarExampleTwice extends React.Component<{}, {open?: boolean, message?: string}> {
 
-    private timer: number;
+  private timer: number;
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            message: 'Event 1 added to your calendar',
-            open: false,
-        };
-        this.timer = undefined;
-    }
-
-    componentWillUnMount() {
-        clearTimeout(this.timer);
-    }
-
-    handleTouchTap = () => {
-        this.setState({
-            open: true,
-        });
-
-        this.timer = setTimeout(() => {
-            this.setState({
-                message: `Event ${Math.round(Math.random() * 100)} added to your calendar`,
-            });
-        }, 1500);
+  constructor(props) {
+    super(props);
+    this.state = {
+      message: 'Event 1 added to your calendar',
+      open: false,
     };
+    this.timer = undefined;
+  }
 
-    handleRequestClose = () => {
-        this.setState({
-            open: false,
-        });
-    };
+  componentWillUnMount() {
+    clearTimeout(this.timer);
+  }
 
-    render() {
-        return (
-            <div>
-                <RaisedButton
-                    onTouchTap={this.handleTouchTap}
-                    label="Add to my calendar two times"
-                />
-                <Snackbar
-                    open={this.state.open}
-                    message={this.state.message}
-                    action="undo"
-                    autoHideDuration={3000}
-                    onRequestClose={this.handleRequestClose}
-                />
-            </div>
-        );
-    }
+  handleTouchTap = () => {
+    this.setState({
+      open: true,
+    });
+
+    this.timer = setTimeout(() => {
+      this.setState({
+        message: `Event ${Math.round(Math.random() * 100)} added to your calendar`,
+      });
+    }, 1500);
+  };
+
+  handleRequestClose = () => {
+    this.setState({
+      open: false,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <RaisedButton
+          onTouchTap={this.handleTouchTap}
+          label="Add to my calendar two times"
+        />
+        <Snackbar
+          open={this.state.open}
+          message={this.state.message}
+          action="undo"
+          autoHideDuration={3000}
+          onRequestClose={this.handleRequestClose}
+        />
+      </div>
+    );
+  }
 }
 
 
 // "http://www.material-ui.com/#/components/stepper"
 class HorizontalLinearStepper extends React.Component<{}, {stepIndex?: number, finished?: boolean}> {
 
-    state = {
-        finished: false,
-        stepIndex: 0,
-    };
+  state = {
+    finished: false,
+    stepIndex: 0,
+  };
 
-    handleNext = () => {
-        const {stepIndex} = this.state;
-        this.setState({
-            stepIndex: stepIndex + 1,
-            finished: stepIndex >= 2,
-        });
-    };
+  handleNext = () => {
+    const {stepIndex} = this.state;
+    this.setState({
+      stepIndex: stepIndex + 1,
+      finished: stepIndex >= 2,
+    });
+  };
 
-    handlePrev = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex > 0) {
-            this.setState({stepIndex: stepIndex - 1});
-        }
-    };
-
-    getStepContent(stepIndex) {
-        switch (stepIndex) {
-            case 0:
-                return 'Select campaign settings...';
-            case 1:
-                return 'What is an ad group anyways?';
-            case 2:
-                return 'This is the bit I really care about!';
-            default:
-                return 'You\'re a long way from home sonny jim!';
-        }
+  handlePrev = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex > 0) {
+      this.setState({stepIndex: stepIndex - 1});
     }
+  };
 
-    render() {
-        const {finished, stepIndex} = this.state;
-        const contentStyle = {margin: '0 16px'};
+  getStepContent(stepIndex) {
+    switch (stepIndex) {
+      case 0:
+        return 'Select campaign settings...';
+      case 1:
+        return 'What is an ad group anyways?';
+      case 2:
+        return 'This is the bit I really care about!';
+      default:
+        return 'You\'re a long way from home sonny jim!';
+    }
+  }
 
-        return (
-            <div style={{width: '100%', maxWidth: 700, margin: 'auto'}}>
-                <Stepper activeStep={stepIndex}>
-                    <Step>
-                        <StepLabel>Select campaign settings</StepLabel>
-                    </Step>
-                    <Step>
-                        <StepLabel>Create an ad group</StepLabel>
-                    </Step>
-                    <Step>
-                        <StepLabel>Create an ad</StepLabel>
-                    </Step>
-                </Stepper>
-                <div style={contentStyle}>
-                    {finished ? (
-                        <p>
-                            <a
-                                href="#"
-                                onClick={(event) => {
+  render() {
+    const {finished, stepIndex} = this.state;
+    const contentStyle = {margin: '0 16px'};
+
+    return (
+      <div style={{width: '100%', maxWidth: 700, margin: 'auto'}}>
+        <Stepper activeStep={stepIndex}>
+          <Step>
+            <StepLabel>Select campaign settings</StepLabel>
+          </Step>
+          <Step>
+            <StepLabel>Create an ad group</StepLabel>
+          </Step>
+          <Step>
+            <StepLabel>Create an ad</StepLabel>
+          </Step>
+        </Stepper>
+        <div style={contentStyle}>
+          {finished ? (
+            <p>
+              <a
+                href="#"
+                onClick={(event) => {
                   event.preventDefault();
                   this.setState({stepIndex: 0, finished: false});
                 }}
-                            >
-                                Click here
-                            </a> to reset the example.
-                        </p>
-                    ) : (
-                        <div>
-                            <p>{this.getStepContent(stepIndex)}</p>
-                            <div style={{marginTop: 12}}>
-                                <FlatButton
-                                    label="Back"
-                                    disabled={stepIndex === 0}
-                                    onTouchTap={this.handlePrev}
-                                    style={{marginRight: 12}}
-                                />
-                                <RaisedButton
-                                    label={stepIndex === 2 ? 'Finish' : 'Next'}
-                                    primary={true}
-                                    onTouchTap={this.handleNext}
-                                />
-                            </div>
-                        </div>
-                    )}
-                </div>
+              >
+                Click here
+              </a> to reset the example.
+            </p>
+          ) : (
+            <div>
+              <p>{this.getStepContent(stepIndex)}</p>
+              <div style={{marginTop: 12}}>
+                <FlatButton
+                  label="Back"
+                  disabled={stepIndex === 0}
+                  onTouchTap={this.handlePrev}
+                  style={{marginRight: 12}}
+                />
+                <RaisedButton
+                  label={stepIndex === 2 ? 'Finish' : 'Next'}
+                  primary={true}
+                  onTouchTap={this.handleNext}
+                />
+              </div>
             </div>
-        );
-    }
+          )}
+        </div>
+      </div>
+    );
+  }
 }
 
 class VerticalLinearStepper extends React.Component<{}, {stepIndex?: number, finished?: boolean}> {
 
-    state = {
-        finished: false,
-        stepIndex: 0,
-    };
+  state = {
+    finished: false,
+    stepIndex: 0,
+  };
 
-    handleNext = () => {
-        const {stepIndex} = this.state;
-        this.setState({
-            stepIndex: stepIndex + 1,
-            finished: stepIndex >= 2,
-        });
-    };
+  handleNext = () => {
+    const {stepIndex} = this.state;
+    this.setState({
+      stepIndex: stepIndex + 1,
+      finished: stepIndex >= 2,
+    });
+  };
 
-    handlePrev = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex > 0) {
-            this.setState({stepIndex: stepIndex - 1});
-        }
-    };
-
-    renderStepActions(step) {
-        const {stepIndex} = this.state;
-
-        return (
-            <div style={{margin: '12px 0'}}>
-                <RaisedButton
-                    label={stepIndex === 2 ? 'Finish' : 'Next'}
-                    disableTouchRipple={true}
-                    disableFocusRipple={true}
-                    primary={true}
-                    onTouchTap={this.handleNext}
-                    style={{marginRight: 12}}
-                />
-                {step > 0 && (
-                    <FlatButton
-                        label="Back"
-                        disabled={stepIndex === 0}
-                        disableTouchRipple={true}
-                        disableFocusRipple={true}
-                        onTouchTap={this.handlePrev}
-                    />
-                )}
-            </div>
-        );
+  handlePrev = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex > 0) {
+      this.setState({stepIndex: stepIndex - 1});
     }
+  };
 
-    render() {
-        const {finished, stepIndex} = this.state;
+  renderStepActions(step) {
+    const {stepIndex} = this.state;
 
-        return (
-            <div style={{width: 380, height: 400, margin: 'auto'}}>
-                <Stepper activeStep={stepIndex} orientation="vertical">
-                    <Step>
-                        <StepLabel>Select campaign settings</StepLabel>
-                        <StepContent>
-                            <p>
-                                For each ad campaign that you create, you can control how much
+    return (
+      <div style={{margin: '12px 0'}}>
+        <RaisedButton
+          label={stepIndex === 2 ? 'Finish' : 'Next'}
+          disableTouchRipple={true}
+          disableFocusRipple={true}
+          primary={true}
+          onTouchTap={this.handleNext}
+          style={{marginRight: 12}}
+        />
+        {step > 0 && (
+          <FlatButton
+            label="Back"
+            disabled={stepIndex === 0}
+            disableTouchRipple={true}
+            disableFocusRipple={true}
+            onTouchTap={this.handlePrev}
+          />
+        )}
+      </div>
+    );
+  }
+
+  render() {
+    const {finished, stepIndex} = this.state;
+
+    return (
+      <div style={{width: 380, height: 400, margin: 'auto'}}>
+        <Stepper activeStep={stepIndex} orientation="vertical">
+          <Step>
+            <StepLabel>Select campaign settings</StepLabel>
+            <StepContent>
+              <p>
+                For each ad campaign that you create, you can control how much
                 you're willing to spend on clicks and conversions, which networks
                 and geographical locations you want your ads to show on, and more.
-                            </p>
-                            {this.renderStepActions(0)}
-                        </StepContent>
-                    </Step>
-                    <Step>
-                        <StepLabel>Create an ad group</StepLabel>
-                        <StepContent>
-                            <p>An ad group contains one or more ads which target a shared set of keywords.</p>
-                            {this.renderStepActions(1)}
-                        </StepContent>
-                    </Step>
-                    <Step>
-                        <StepLabel>Create an ad</StepLabel>
-                        <StepContent>
-                            <p>
-                                Try out different ad text to see what brings in the most customers,
+              </p>
+              {this.renderStepActions(0)}
+            </StepContent>
+          </Step>
+          <Step>
+            <StepLabel>Create an ad group</StepLabel>
+            <StepContent>
+              <p>An ad group contains one or more ads which target a shared set of keywords.</p>
+              {this.renderStepActions(1)}
+            </StepContent>
+          </Step>
+          <Step>
+            <StepLabel>Create an ad</StepLabel>
+            <StepContent>
+              <p>
+                Try out different ad text to see what brings in the most customers,
                 and learn how to enhance your ads using features like ad extensions.
                 If you run into any problems with your ads, find out how to tell if
                 they're running and how to resolve approval issues.
-                            </p>
-                            {this.renderStepActions(2)}
-                        </StepContent>
-                    </Step>
-                </Stepper>
-                {finished && (
-                    <p style={{margin: '20px 0', textAlign: 'center'}}>
-                        <a
-                            href="#"
-                            onClick={(event) => {
+              </p>
+              {this.renderStepActions(2)}
+            </StepContent>
+          </Step>
+        </Stepper>
+        {finished && (
+          <p style={{margin: '20px 0', textAlign: 'center'}}>
+            <a
+              href="#"
+              onClick={(event) => {
                 event.preventDefault();
                 this.setState({stepIndex: 0, finished: false});
               }}
-                        >
-                            Click here
-                        </a> to reset the example.
-                    </p>
-                )}
-            </div>
-        );
-    }
+            >
+              Click here
+            </a> to reset the example.
+          </p>
+        )}
+      </div>
+    );
+  }
 }
 
 class HorizontalNonLinearStepper extends React.Component<{}, {stepIndex?: number}> {
 
-    state = {
-        stepIndex: 0,
-    };
+  state = {
+    stepIndex: 0,
+  };
 
-    handleNext = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex < 2) {
-            this.setState({stepIndex: stepIndex + 1});
-        }
-    };
-
-    handlePrev = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex > 0) {
-            this.setState({stepIndex: stepIndex - 1});
-        }
-    };
-
-    getStepContent(stepIndex) {
-        switch (stepIndex) {
-            case 0:
-                return 'Select campaign settings...';
-            case 1:
-                return 'What is an ad group anyways?';
-            case 2:
-                return 'This is the bit I really care about!';
-            default:
-                return 'You\'re a long way from home sonny jim!';
-        }
+  handleNext = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex < 2) {
+      this.setState({stepIndex: stepIndex + 1});
     }
+  };
 
-    render() {
-        const {stepIndex} = this.state;
-        const contentStyle = {margin: '0 16px'};
-
-        return (
-            <div style={{width: '100%', maxWidth: 700, margin: 'auto'}}>
-                <Stepper linear={false} activeStep={stepIndex}>
-                    <Step>
-                        <StepButton onClick={() => this.setState({stepIndex: 0})}>
-                            Select campaign settings
-                        </StepButton>
-                    </Step>
-                    <Step>
-                        <StepButton onClick={() => this.setState({stepIndex: 1})}>
-                            Create an ad group
-                        </StepButton>
-                    </Step>
-                    <Step>
-                        <StepButton onClick={() => this.setState({stepIndex: 2})}>
-                            Create an ad
-                        </StepButton>
-                    </Step>
-                </Stepper>
-                <div style={contentStyle}>
-                    <p>{this.getStepContent(stepIndex)}</p>
-                    <div style={{marginTop: 12}}>
-                        <FlatButton
-                            label="Back"
-                            disabled={stepIndex === 0}
-                            onTouchTap={this.handlePrev}
-                            style={{marginRight: 12}}
-                        />
-                        <RaisedButton
-                            label="Next"
-                            disabled={stepIndex === 2}
-                            primary={true}
-                            onTouchTap={this.handleNext}
-                        />
-                    </div>
-                </div>
-            </div>
-        );
+  handlePrev = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex > 0) {
+      this.setState({stepIndex: stepIndex - 1});
     }
+  };
+
+  getStepContent(stepIndex) {
+    switch (stepIndex) {
+      case 0:
+        return 'Select campaign settings...';
+      case 1:
+        return 'What is an ad group anyways?';
+      case 2:
+        return 'This is the bit I really care about!';
+      default:
+        return 'You\'re a long way from home sonny jim!';
+    }
+  }
+
+  render() {
+    const {stepIndex} = this.state;
+    const contentStyle = {margin: '0 16px'};
+
+    return (
+      <div style={{width: '100%', maxWidth: 700, margin: 'auto'}}>
+        <Stepper linear={false} activeStep={stepIndex}>
+          <Step>
+            <StepButton onClick={() => this.setState({stepIndex: 0})}>
+              Select campaign settings
+            </StepButton>
+          </Step>
+          <Step>
+            <StepButton onClick={() => this.setState({stepIndex: 1})}>
+              Create an ad group
+            </StepButton>
+          </Step>
+          <Step>
+            <StepButton onClick={() => this.setState({stepIndex: 2})}>
+              Create an ad
+            </StepButton>
+          </Step>
+        </Stepper>
+        <div style={contentStyle}>
+          <p>{this.getStepContent(stepIndex)}</p>
+          <div style={{marginTop: 12}}>
+            <FlatButton
+              label="Back"
+              disabled={stepIndex === 0}
+              onTouchTap={this.handlePrev}
+              style={{marginRight: 12}}
+            />
+            <RaisedButton
+              label="Next"
+              disabled={stepIndex === 2}
+              primary={true}
+              onTouchTap={this.handleNext}
+            />
+          </div>
+        </div>
+      </div>
+    );
+  }
 }
 
 class VerticalNonLinear extends React.Component<{}, {stepIndex?: number}> {
 
-    state = {
-        stepIndex: 0,
-    };
+  state = {
+    stepIndex: 0,
+  };
 
-    handleNext = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex < 2) {
-            this.setState({stepIndex: stepIndex + 1});
-        }
-    };
-
-    handlePrev = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex > 0) {
-            this.setState({stepIndex: stepIndex - 1});
-        }
-    };
-
-    renderStepActions(step) {
-        return (
-            <div style={{margin: '12px 0'}}>
-                <RaisedButton
-                    label="Next"
-                    disableTouchRipple={true}
-                    disableFocusRipple={true}
-                    primary={true}
-                    onTouchTap={this.handleNext}
-                    style={{marginRight: 12}}
-                />
-                {step > 0 && (
-                    <FlatButton
-                        label="Back"
-                        disableTouchRipple={true}
-                        disableFocusRipple={true}
-                        onTouchTap={this.handlePrev}
-                    />
-                )}
-            </div>
-        );
+  handleNext = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex < 2) {
+      this.setState({stepIndex: stepIndex + 1});
     }
+  };
 
-    render() {
-        const {stepIndex} = this.state;
+  handlePrev = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex > 0) {
+      this.setState({stepIndex: stepIndex - 1});
+    }
+  };
 
-        return (
-            <div style={{width: 380, height: 400, margin: 'auto'}}>
-                <Stepper
-                    activeStep={stepIndex}
-                    linear={false}
-                    orientation="vertical"
-                >
-                    <Step>
-                        <StepButton onClick={() => this.setState({stepIndex: 0})}>
-                            Select campaign settings
-                        </StepButton>
-                        <StepContent>
-                            <p>
-                                For each ad campaign that you create, you can control how much
+  renderStepActions(step) {
+    return (
+      <div style={{margin: '12px 0'}}>
+        <RaisedButton
+          label="Next"
+          disableTouchRipple={true}
+          disableFocusRipple={true}
+          primary={true}
+          onTouchTap={this.handleNext}
+          style={{marginRight: 12}}
+        />
+        {step > 0 && (
+          <FlatButton
+            label="Back"
+            disableTouchRipple={true}
+            disableFocusRipple={true}
+            onTouchTap={this.handlePrev}
+          />
+        )}
+      </div>
+    );
+  }
+
+  render() {
+    const {stepIndex} = this.state;
+
+    return (
+      <div style={{width: 380, height: 400, margin: 'auto'}}>
+        <Stepper
+          activeStep={stepIndex}
+          linear={false}
+          orientation="vertical"
+        >
+          <Step>
+            <StepButton onClick={() => this.setState({stepIndex: 0})}>
+              Select campaign settings
+            </StepButton>
+            <StepContent>
+              <p>
+                For each ad campaign that you create, you can control how much
                 you're willing to spend on clicks and conversions, which networks
                 and geographical locations you want your ads to show on, and more.
-                            </p>
-                            {this.renderStepActions(0)}
-                        </StepContent>
-                    </Step>
-                    <Step>
-                        <StepButton onClick={() => this.setState({stepIndex: 1})}>
-                            Create an ad group
-                        </StepButton>
-                        <StepContent>
-                            <p>An ad group contains one or more ads which target a shared set of keywords.</p>
-                            {this.renderStepActions(1)}
-                        </StepContent>
-                    </Step>
-                    <Step>
-                        <StepButton onClick={() => this.setState({stepIndex: 2})}>
-                            Create an ad
-                        </StepButton>
-                        <StepContent>
-                            <p>
-                                Try out different ad text to see what brings in the most customers,
+              </p>
+              {this.renderStepActions(0)}
+            </StepContent>
+          </Step>
+          <Step>
+            <StepButton onClick={() => this.setState({stepIndex: 1})}>
+              Create an ad group
+            </StepButton>
+            <StepContent>
+              <p>An ad group contains one or more ads which target a shared set of keywords.</p>
+              {this.renderStepActions(1)}
+            </StepContent>
+          </Step>
+          <Step>
+            <StepButton onClick={() => this.setState({stepIndex: 2})}>
+              Create an ad
+            </StepButton>
+            <StepContent>
+              <p>
+                Try out different ad text to see what brings in the most customers,
                 and learn how to enhance your ads using features like ad extensions.
                 If you run into any problems with your ads, find out how to tell if
                 they're running and how to resolve approval issues.
-                            </p>
-                            {this.renderStepActions(2)}
-                        </StepContent>
-                    </Step>
-                </Stepper>
-            </div>
-        );
-    }
+              </p>
+              {this.renderStepActions(2)}
+            </StepContent>
+          </Step>
+        </Stepper>
+      </div>
+    );
+  }
 }
 
 const getStyles = () => {
-    return {
-        root: {
-            width: '100%',
-            maxWidth: 700,
-            margin: 'auto',
-        },
-        content: {
-            margin: '0 16px',
-        },
-        actions: {
-            marginTop: 12,
-        },
-        backButton: {
-            marginRight: 12,
-        },
-    };
+  return {
+    root: {
+      width: '100%',
+      maxWidth: 700,
+      margin: 'auto',
+    },
+    content: {
+      margin: '0 16px',
+    },
+    actions: {
+      marginTop: 12,
+    },
+    backButton: {
+      marginRight: 12,
+    },
+  };
 };
 
 class GranularControlStepper extends React.Component<{}, {stepIndex?: number, visited?: number[]}> {
 
-    state = {
-        stepIndex: null,
-        visited: [],
-    };
+  state = {
+    stepIndex: null,
+    visited: [],
+  };
 
-    componentWillMount() {
-        const {stepIndex, visited} = this.state;
-        this.setState({visited: visited.concat(stepIndex)});
+  componentWillMount() {
+    const {stepIndex, visited} = this.state;
+    this.setState({visited: visited.concat(stepIndex)});
+  }
+
+  componentWillUpdate(nextProps, nextState) {
+    const {stepIndex, visited} = nextState;
+    if (visited.indexOf(stepIndex) === -1) {
+      this.setState({visited: visited.concat(stepIndex)});
     }
+  }
 
-    componentWillUpdate(nextProps, nextState) {
-        const {stepIndex, visited} = nextState;
-        if (visited.indexOf(stepIndex) === -1) {
-            this.setState({visited: visited.concat(stepIndex)});
-        }
+  handleNext = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex < 2) {
+      this.setState({stepIndex: stepIndex + 1});
     }
+  };
 
-    handleNext = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex < 2) {
-            this.setState({stepIndex: stepIndex + 1});
-        }
-    };
-
-    handlePrev = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex > 0) {
-            this.setState({stepIndex: stepIndex - 1});
-        }
-    };
-
-    getStepContent(stepIndex) {
-        switch (stepIndex) {
-            case 0:
-                return 'Select campaign settings...';
-            case 1:
-                return 'What is an ad group anyways?';
-            case 2:
-                return 'This is the bit I really care about!';
-            default:
-                return 'Click a step to get started.';
-        }
+  handlePrev = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex > 0) {
+      this.setState({stepIndex: stepIndex - 1});
     }
+  };
 
-    render() {
-        const {stepIndex, visited} = this.state;
-        const styles = getStyles();
+  getStepContent(stepIndex) {
+    switch (stepIndex) {
+      case 0:
+        return 'Select campaign settings...';
+      case 1:
+        return 'What is an ad group anyways?';
+      case 2:
+        return 'This is the bit I really care about!';
+      default:
+        return 'Click a step to get started.';
+    }
+  }
 
-        return (
-            <div style={styles.root}>
-                <p>
-                    <a
-                        href="#"
-                        onClick={(event) => {
+  render() {
+    const {stepIndex, visited} = this.state;
+    const styles = getStyles();
+
+    return (
+      <div style={styles.root}>
+        <p>
+          <a
+            href="#"
+            onClick={(event) => {
               event.preventDefault();
               this.setState({stepIndex: null, visited: []});
             }}
-                    >
-                        Click here
-                    </a> to reset the example.
-                </p>
-                <Stepper linear={false}>
-                    <Step completed={visited.indexOf(0) !== -1} active={stepIndex === 0}>
-                        <StepButton onClick={() => this.setState({stepIndex: 0})}>
-                            Select campaign settings
-                        </StepButton>
-                    </Step>
-                    <Step completed={visited.indexOf(1) !== -1} active={stepIndex === 1}>
-                        <StepButton onClick={() => this.setState({stepIndex: 1})}>
-                            Create an ad group
-                        </StepButton>
-                    </Step>
-                    <Step completed={visited.indexOf(2) !== -1} active={stepIndex === 2}>
-                        <StepButton onClick={() => this.setState({stepIndex: 2})}>
-                            Create an ad
-                        </StepButton>
-                    </Step>
-                </Stepper>
-                <div style={styles.content}>
-                    <p>{this.getStepContent(stepIndex)}</p>
-                    {stepIndex !== null && (
-                        <div style={styles.actions}>
-                            <FlatButton
-                                label="Back"
-                                disabled={stepIndex === 0}
-                                onTouchTap={this.handlePrev}
-                                style={styles.backButton}
-                            />
-                            <RaisedButton
-                                label="Next"
-                                primary={true}
-                                onTouchTap={this.handleNext}
-                            />
-                        </div>
-                    )}
-                </div>
+          >
+            Click here
+          </a> to reset the example.
+        </p>
+        <Stepper linear={false}>
+          <Step completed={visited.indexOf(0) !== -1} active={stepIndex === 0}>
+            <StepButton onClick={() => this.setState({stepIndex: 0})}>
+              Select campaign settings
+            </StepButton>
+          </Step>
+          <Step completed={visited.indexOf(1) !== -1} active={stepIndex === 1}>
+            <StepButton onClick={() => this.setState({stepIndex: 1})}>
+              Create an ad group
+            </StepButton>
+          </Step>
+          <Step completed={visited.indexOf(2) !== -1} active={stepIndex === 2}>
+            <StepButton onClick={() => this.setState({stepIndex: 2})}>
+              Create an ad
+            </StepButton>
+          </Step>
+        </Stepper>
+        <div style={styles.content}>
+          <p>{this.getStepContent(stepIndex)}</p>
+          {stepIndex !== null && (
+            <div style={styles.actions}>
+              <FlatButton
+                label="Back"
+                disabled={stepIndex === 0}
+                onTouchTap={this.handlePrev}
+                style={styles.backButton}
+              />
+              <RaisedButton
+                label="Next"
+                primary={true}
+                onTouchTap={this.handleNext}
+              />
             </div>
-        );
-    }
+          )}
+        </div>
+      </div>
+    );
+  }
 }
 
 class CustomIcon extends React.Component<{}, {stepIndex?: number}> {
 
-    state = {
-        stepIndex: 0,
-    };
+  state = {
+    stepIndex: 0,
+  };
 
-    handleNext = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex < 2) {
-            this.setState({stepIndex: stepIndex + 1});
-        }
-    };
-
-    handlePrev = () => {
-        const {stepIndex} = this.state;
-        if (stepIndex > 0) {
-            this.setState({stepIndex: stepIndex - 1});
-        }
-    };
-
-    getStepContent(stepIndex) {
-        switch (stepIndex) {
-            case 0:
-                return 'Select campaign settings...';
-            case 1:
-                return 'What is an ad group anyways?';
-            case 2:
-                return 'This is the bit I really care about!';
-            default:
-                return 'You\'re a long way from home sonny jim!';
-        }
+  handleNext = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex < 2) {
+      this.setState({stepIndex: stepIndex + 1});
     }
+  };
 
-    render() {
-        return (
-            <div style={{width: '100%', maxWidth: 700, margin: 'auto'}}>
-                <Stepper linear={false}>
-                    <Step completed={false}>
-                        <StepLabel>
-                            Select campaign settings
-                        </StepLabel>
-                    </Step>
-                    <Step completed={false}>
-                        <StepLabel
-                            icon={<WarningIcon color={red500} />}
-                            style={{color: red500}}
-                        >
-                            Create an ad group
-                        </StepLabel>
-                    </Step>
-                    <Step completed={false}>
-                        <StepLabel>
-                            Create an ad
-                        </StepLabel>
-                    </Step>
-                </Stepper>
-            </div>
-        );
+  handlePrev = () => {
+    const {stepIndex} = this.state;
+    if (stepIndex > 0) {
+      this.setState({stepIndex: stepIndex - 1});
     }
+  };
+
+  getStepContent(stepIndex) {
+    switch (stepIndex) {
+      case 0:
+        return 'Select campaign settings...';
+      case 1:
+        return 'What is an ad group anyways?';
+      case 2:
+        return 'This is the bit I really care about!';
+      default:
+        return 'You\'re a long way from home sonny jim!';
+    }
+  }
+
+  render() {
+    return (
+      <div style={{width: '100%', maxWidth: 700, margin: 'auto'}}>
+        <Stepper linear={false}>
+          <Step completed={false}>
+            <StepLabel>
+              Select campaign settings
+            </StepLabel>
+          </Step>
+          <Step completed={false}>
+            <StepLabel
+              icon={<WarningIcon color={red500} />}
+              style={{color: red500}}
+            >
+              Create an ad group
+            </StepLabel>
+          </Step>
+          <Step completed={false}>
+            <StepLabel>
+              Create an ad
+            </StepLabel>
+          </Step>
+        </Stepper>
+      </div>
+    );
+  }
 }
 
 
@@ -4305,587 +4305,587 @@ class CustomIcon extends React.Component<{}, {stepIndex?: number}> {
 
 // "http://www.material-ui.com/#/components/table"
 const TableExampleSimple = () => (
-    <Table>
-        <TableHeader>
-            <TableRow>
-                <TableHeaderColumn>ID</TableHeaderColumn>
-                <TableHeaderColumn>Name</TableHeaderColumn>
-                <TableHeaderColumn>Status</TableHeaderColumn>
-            </TableRow>
-        </TableHeader>
-        <TableBody>
-            <TableRow>
-                <TableRowColumn>1</TableRowColumn>
-                <TableRowColumn>John Smith</TableRowColumn>
-                <TableRowColumn>Employed</TableRowColumn>
-            </TableRow>
-            <TableRow>
-                <TableRowColumn>2</TableRowColumn>
-                <TableRowColumn>Randal White</TableRowColumn>
-                <TableRowColumn>Unemployed</TableRowColumn>
-            </TableRow>
-            <TableRow>
-                <TableRowColumn>3</TableRowColumn>
-                <TableRowColumn>Stephanie Sanders</TableRowColumn>
-                <TableRowColumn>Employed</TableRowColumn>
-            </TableRow>
-            <TableRow>
-                <TableRowColumn>4</TableRowColumn>
-                <TableRowColumn>Steve Brown</TableRowColumn>
-                <TableRowColumn>Employed</TableRowColumn>
-            </TableRow>
-        </TableBody>
-    </Table>
+  <Table>
+    <TableHeader>
+      <TableRow>
+        <TableHeaderColumn>ID</TableHeaderColumn>
+        <TableHeaderColumn>Name</TableHeaderColumn>
+        <TableHeaderColumn>Status</TableHeaderColumn>
+      </TableRow>
+    </TableHeader>
+    <TableBody>
+      <TableRow>
+        <TableRowColumn>1</TableRowColumn>
+        <TableRowColumn>John Smith</TableRowColumn>
+        <TableRowColumn>Employed</TableRowColumn>
+      </TableRow>
+      <TableRow>
+        <TableRowColumn>2</TableRowColumn>
+        <TableRowColumn>Randal White</TableRowColumn>
+        <TableRowColumn>Unemployed</TableRowColumn>
+      </TableRow>
+      <TableRow>
+        <TableRowColumn>3</TableRowColumn>
+        <TableRowColumn>Stephanie Sanders</TableRowColumn>
+        <TableRowColumn>Employed</TableRowColumn>
+      </TableRow>
+      <TableRow>
+        <TableRowColumn>4</TableRowColumn>
+        <TableRowColumn>Steve Brown</TableRowColumn>
+        <TableRowColumn>Employed</TableRowColumn>
+      </TableRow>
+    </TableBody>
+  </Table>
 );
 
 const tableData: {name: string, status: string, selected?: boolean}[] = [
-    {
-        name: 'John Smith',
-        status: 'Employed',
-        selected: true,
-    },
-    {
-        name: 'Randal White',
-        status: 'Unemployed',
-    },
-    {
-        name: 'Stephanie Sanders',
-        status: 'Employed',
-        selected: true,
-    },
-    {
-        name: 'Steve Brown',
-        status: 'Employed',
-    },
-    {
-        name: 'Joyce Whitten',
-        status: 'Employed',
-    },
-    {
-        name: 'Samuel Roberts',
-        status: 'Employed',
-    },
-    {
-        name: 'Adam Moore',
-        status: 'Employed',
-    },
+  {
+    name: 'John Smith',
+    status: 'Employed',
+    selected: true,
+  },
+  {
+    name: 'Randal White',
+    status: 'Unemployed',
+  },
+  {
+    name: 'Stephanie Sanders',
+    status: 'Employed',
+    selected: true,
+  },
+  {
+    name: 'Steve Brown',
+    status: 'Employed',
+  },
+  {
+    name: 'Joyce Whitten',
+    status: 'Employed',
+  },
+  {
+    name: 'Samuel Roberts',
+    status: 'Employed',
+  },
+  {
+    name: 'Adam Moore',
+    status: 'Employed',
+  },
 ];
 
 interface TableExampleComplexState {
-    fixedHeader?: boolean,
-    fixedFooter?: boolean,
-    stripedRows?: boolean,
-    showRowHover?: boolean,
-    selectable?: boolean,
-    multiSelectable?: boolean,
-    enableSelectAll?: boolean,
-    deselectOnClickaway?: boolean,
-    showCheckboxes?: boolean,
-    height?: string,
+  fixedHeader?: boolean,
+  fixedFooter?: boolean,
+  stripedRows?: boolean,
+  showRowHover?: boolean,
+  selectable?: boolean,
+  multiSelectable?: boolean,
+  enableSelectAll?: boolean,
+  deselectOnClickaway?: boolean,
+  showCheckboxes?: boolean,
+  height?: string,
 }
 
 class TableExampleComplex extends React.Component<{}, TableExampleComplexState> {
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            fixedHeader: true,
-            fixedFooter: true,
-            stripedRows: false,
-            showRowHover: false,
-            selectable: true,
-            multiSelectable: false,
-            enableSelectAll: false,
-            deselectOnClickaway: true,
-            showCheckboxes: true,
-            height: '300px',
-        };
-    }
-
-    handleToggle = (event, toggled) => {
-        this.setState({
-            [event.target.name]: toggled,
-        });
+    this.state = {
+      fixedHeader: true,
+      fixedFooter: true,
+      stripedRows: false,
+      showRowHover: false,
+      selectable: true,
+      multiSelectable: false,
+      enableSelectAll: false,
+      deselectOnClickaway: true,
+      showCheckboxes: true,
+      height: '300px',
     };
+  }
 
-    handleChange = (event) => {
-        this.setState({height: event.target.value});
-    };
+  handleToggle = (event, toggled) => {
+    this.setState({
+      [event.target.name]: toggled,
+    });
+  };
 
-    render() {
-        return (
-            <div>
-                <Table
-                    height={this.state.height}
-                    fixedHeader={this.state.fixedHeader}
-                    fixedFooter={this.state.fixedFooter}
-                    selectable={this.state.selectable}
-                    multiSelectable={this.state.multiSelectable}
-                >
-                    <TableHeader
-                        displaySelectAll={this.state.showCheckboxes}
-                        adjustForCheckbox={this.state.showCheckboxes}
-                        enableSelectAll={this.state.enableSelectAll}
-                    >
-                        <TableRow>
-                            <TableHeaderColumn colSpan={3} tooltip="Super Header" style={{textAlign: 'center'}}>
-                                Super Header
-                            </TableHeaderColumn>
-                        </TableRow>
-                        <TableRow>
-                            <TableHeaderColumn tooltip="The ID">ID</TableHeaderColumn>
-                            <TableHeaderColumn tooltip="The Name">Name</TableHeaderColumn>
-                            <TableHeaderColumn tooltip="The Status">Status</TableHeaderColumn>
-                        </TableRow>
-                    </TableHeader>
-                    <TableBody
-                        displayRowCheckbox={this.state.showCheckboxes}
-                        deselectOnClickaway={this.state.deselectOnClickaway}
-                        showRowHover={this.state.showRowHover}
-                        stripedRows={this.state.stripedRows}
-                    >
+  handleChange = (event) => {
+    this.setState({height: event.target.value});
+  };
+
+  render() {
+    return (
+      <div>
+        <Table
+          height={this.state.height}
+          fixedHeader={this.state.fixedHeader}
+          fixedFooter={this.state.fixedFooter}
+          selectable={this.state.selectable}
+          multiSelectable={this.state.multiSelectable}
+        >
+          <TableHeader
+            displaySelectAll={this.state.showCheckboxes}
+            adjustForCheckbox={this.state.showCheckboxes}
+            enableSelectAll={this.state.enableSelectAll}
+          >
+            <TableRow>
+              <TableHeaderColumn colSpan={3} tooltip="Super Header" style={{textAlign: 'center'}}>
+                Super Header
+              </TableHeaderColumn>
+            </TableRow>
+            <TableRow>
+              <TableHeaderColumn tooltip="The ID">ID</TableHeaderColumn>
+              <TableHeaderColumn tooltip="The Name">Name</TableHeaderColumn>
+              <TableHeaderColumn tooltip="The Status">Status</TableHeaderColumn>
+            </TableRow>
+          </TableHeader>
+          <TableBody
+            displayRowCheckbox={this.state.showCheckboxes}
+            deselectOnClickaway={this.state.deselectOnClickaway}
+            showRowHover={this.state.showRowHover}
+            stripedRows={this.state.stripedRows}
+          >
                         {tableData.map((row, index) => (
-                            <TableRow key={index} selected={row.selected}>
-                                <TableRowColumn>{index}</TableRowColumn>
-                                <TableRowColumn>{row.name}</TableRowColumn>
-                                <TableRowColumn>{row.status}</TableRowColumn>
-                            </TableRow>
-                        ))}
-                    </TableBody>
-                    <TableFooter
-                        adjustForCheckbox={this.state.showCheckboxes}
-                    >
-                        <TableRow>
-                            <TableRowColumn>ID</TableRowColumn>
-                            <TableRowColumn>Name</TableRowColumn>
-                            <TableRowColumn>Status</TableRowColumn>
-                        </TableRow>
-                        <TableRow>
-                            <TableRowColumn colSpan={3} style={{textAlign: 'center'}}>
-                                Super Footer
-                            </TableRowColumn>
-                        </TableRow>
-                    </TableFooter>
-                </Table>
+              <TableRow key={index} selected={row.selected}>
+                <TableRowColumn>{index}</TableRowColumn>
+                <TableRowColumn>{row.name}</TableRowColumn>
+                <TableRowColumn>{row.status}</TableRowColumn>
+              </TableRow>
+              ))}
+          </TableBody>
+          <TableFooter
+            adjustForCheckbox={this.state.showCheckboxes}
+          >
+            <TableRow>
+              <TableRowColumn>ID</TableRowColumn>
+              <TableRowColumn>Name</TableRowColumn>
+              <TableRowColumn>Status</TableRowColumn>
+            </TableRow>
+            <TableRow>
+              <TableRowColumn colSpan={3} style={{textAlign: 'center'}}>
+                Super Footer
+              </TableRowColumn>
+            </TableRow>
+          </TableFooter>
+        </Table>
 
-                <div style={styles.propContainer}>
-                    <h3>Table Properties</h3>
-                    <TextField
-                        floatingLabelText="Table Body Height"
-                        defaultValue={this.state.height}
-                        onChange={this.handleChange}
-                    />
-                    <Toggle
-                        name="fixedHeader"
-                        label="Fixed Header"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.fixedHeader}
-                    />
-                    <Toggle
-                        name="fixedFooter"
-                        label="Fixed Footer"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.fixedFooter}
-                    />
-                    <Toggle
-                        name="selectable"
-                        label="Selectable"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.selectable}
-                    />
-                    <Toggle
-                        name="multiSelectable"
-                        label="Multi-Selectable"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.multiSelectable}
-                    />
-                    <Toggle
-                        name="enableSelectAll"
-                        label="Enable Select All"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.enableSelectAll}
-                    />
-                    <h3 style={styles.propToggleHeader}>TableBody Properties</h3>
-                    <Toggle
-                        name="deselectOnClickaway"
-                        label="Deselect On Clickaway"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.deselectOnClickaway}
-                    />
-                    <Toggle
-                        name="stripedRows"
-                        label="Stripe Rows"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.stripedRows}
-                    />
-                    <Toggle
-                        name="showRowHover"
-                        label="Show Row Hover"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.showRowHover}
-                    />
-                    <h3 style={styles.propToggleHeader}>Multiple Properties</h3>
-                    <Toggle
-                        name="showCheckboxes"
-                        label="Show Checkboxes"
-                        onToggle={this.handleToggle}
-                        defaultToggled={this.state.showCheckboxes}
-                    />
-                </div>
-            </div>
-        );
-    }
+        <div style={styles.propContainer}>
+          <h3>Table Properties</h3>
+          <TextField
+            floatingLabelText="Table Body Height"
+            defaultValue={this.state.height}
+            onChange={this.handleChange}
+          />
+          <Toggle
+            name="fixedHeader"
+            label="Fixed Header"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.fixedHeader}
+          />
+          <Toggle
+            name="fixedFooter"
+            label="Fixed Footer"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.fixedFooter}
+          />
+          <Toggle
+            name="selectable"
+            label="Selectable"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.selectable}
+          />
+          <Toggle
+            name="multiSelectable"
+            label="Multi-Selectable"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.multiSelectable}
+          />
+          <Toggle
+            name="enableSelectAll"
+            label="Enable Select All"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.enableSelectAll}
+          />
+          <h3 style={styles.propToggleHeader}>TableBody Properties</h3>
+          <Toggle
+            name="deselectOnClickaway"
+            label="Deselect On Clickaway"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.deselectOnClickaway}
+          />
+          <Toggle
+            name="stripedRows"
+            label="Stripe Rows"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.stripedRows}
+          />
+          <Toggle
+            name="showRowHover"
+            label="Show Row Hover"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.showRowHover}
+          />
+          <h3 style={styles.propToggleHeader}>Multiple Properties</h3>
+          <Toggle
+            name="showCheckboxes"
+            label="Show Checkboxes"
+            onToggle={this.handleToggle}
+            defaultToggled={this.state.showCheckboxes}
+          />
+        </div>
+      </div>
+    );
+  }
 }
 
 // "http://www.material-ui.com/#/components/tabs"
 function handleActive(tab) {
-    alert(`A tab with this value property ${tab.props.value} was activated.`);
+  alert(`A tab with this value property ${tab.props.value} was activated.`);
 }
 
 const TabsExampleSimple = () => (
-    <Tabs>
+  <Tabs>
         <Tab label="Item One">
-            <div>
-                <h2 style={styles.headline}>Tab One</h2>
-                <p>
-                    This is an example tab.
-                </p>
-                <p>
-                    You can put any sort of HTML or react component in here. It even keeps the component state!
-                </p>
+      <div>
+        <h2 style={styles.headline}>Tab One</h2>
+        <p>
+          This is an example tab.
+        </p>
+        <p>
+          You can put any sort of HTML or react component in here. It even keeps the component state!
+        </p>
                 <Slider name="slider0" defaultValue={0.5}/>
-            </div>
-        </Tab>
+      </div>
+    </Tab>
         <Tab label="Item Two">
-            <div>
-                <h2 style={styles.headline}>Tab Two</h2>
-                <p>
-                    This is another example tab.
-                </p>
-            </div>
-        </Tab>
-        <Tab
-            label="onActive"
-            value="/home"
-            onActive={handleActive}
-        >
-            <div>
-                <h2 style={styles.headline}>Tab Three</h2>
-                <p>
-                    This is a third example tab.
-                </p>
-            </div>
-        </Tab>
-    </Tabs>
+      <div>
+        <h2 style={styles.headline}>Tab Two</h2>
+        <p>
+          This is another example tab.
+        </p>
+      </div>
+    </Tab>
+    <Tab
+      label="onActive"
+      value="/home"
+      onActive={handleActive}
+    >
+      <div>
+        <h2 style={styles.headline}>Tab Three</h2>
+        <p>
+          This is a third example tab.
+        </p>
+      </div>
+    </Tab>
+  </Tabs>
 );
 
 class TabsExampleControlled extends React.Component<{}, {value?: string}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            value: 'a',
-        };
-    }
-
-    handleChange = (value) => {
-        this.setState({
-            value: value,
-        });
+  constructor(props) {
+    super(props);
+    this.state = {
+      value: 'a',
     };
+  }
 
-    render() {
-        return (
-            <Tabs
-                value={this.state.value}
-                onChange={this.handleChange}
-            >
+  handleChange = (value) => {
+    this.setState({
+      value: value,
+    });
+  };
+
+  render() {
+    return (
+      <Tabs
+        value={this.state.value}
+        onChange={this.handleChange}
+      >
                 <Tab label="Tab A" value="a">
-                    <div>
-                        <h2 style={styles.headline}>Controllable Tab A</h2>
-                        <p>
-                            Tabs are also controllable if you want to programmatically pass them their values.
+          <div>
+            <h2 style={styles.headline}>Controllable Tab A</h2>
+            <p>
+              Tabs are also controllable if you want to programmatically pass them their values.
               This allows for more functionality in Tabs such as not
               having any Tab selected or assigning them different values.
-                        </p>
-                    </div>
-                </Tab>
-                <Tab label="Tab B" value="b">
-                    <div>
-                        <h2 style={styles.headline}>Controllable Tab B</h2>
-                        <p>
-                            This is another example of a controllable tab. Remember, if you
+            </p>
+          </div>
+        </Tab>
+        <Tab label="Tab B" value="b">
+          <div>
+            <h2 style={styles.headline}>Controllable Tab B</h2>
+            <p>
+              This is another example of a controllable tab. Remember, if you
               use controllable Tabs, you need to give all of your tabs values or else
               you wont be able to select them.
-                        </p>
-                    </div>
-                </Tab>
-            </Tabs>
-        );
-    }
+            </p>
+          </div>
+        </Tab>
+      </Tabs>
+    );
+  }
 }
 
 const TabsExampleIcon = () => (
-    <Tabs>
+  <Tabs>
         <Tab icon={<FontIcon className="muidocs-icon-action-home" />}/>
         <Tab icon={<ActionFlightTakeoff />}/>
         <Tab icon={<FontIcon className="material-icons">favorite</FontIcon>}/>
-    </Tabs>
+  </Tabs>
 );
 
 const TabsExampleIconText = () => (
-    <Tabs>
-        <Tab
-            icon={<FontIcon className="material-icons">phone</FontIcon>}
-            label="RECENTS"
-        />
-        <Tab
-            icon={<FontIcon className="material-icons">favorite</FontIcon>}
-            label="FAVORITES"
-        />
-        <Tab
-            icon={<MapsPersonPin />}
-            label="NEARBY"
-        />
-    </Tabs>
+  <Tabs>
+    <Tab
+      icon={<FontIcon className="material-icons">phone</FontIcon>}
+      label="RECENTS"
+    />
+    <Tab
+      icon={<FontIcon className="material-icons">favorite</FontIcon>}
+      label="FAVORITES"
+    />
+    <Tab
+      icon={<MapsPersonPin />}
+      label="NEARBY"
+    />
+  </Tabs>
 );
 
 
 // "http://www.material-ui.com/#/components/text-field"
 const TextFieldExampleSimple = () => (
-    <div>
-        <TextField
-            hintText="Hint Text"
-        /><br />
-        <br />
-        <TextField
-            hintText="The hint text can be as long as you want, it will wrap."
-        /><br />
-        <TextField
-            id="text-field-default"
-            defaultValue="Default Value"
-        /><br />
-        <TextField
-            hintText="Hint Text"
-            floatingLabelText="Floating Label Text"
-        /><br />
-        <TextField
-            hintText="Hint Text"
-            floatingLabelText="Fixed Floating Label Text"
-            floatingLabelFixed={true}
-        /><br />
-        <TextField
-            hintText="Password Field"
-            floatingLabelText="Password"
-            type="password"
-        /><br />
-        <TextField
-            hintText="MultiLine with rows: 2 and rowsMax: 4"
-            multiLine={true}
-            rows={2}
-            rowsMax={4}
-        /><br />
-        <TextField
-            hintText="Message Field"
-            floatingLabelText="MultiLine and FloatingLabel"
-            multiLine={true}
-            rows={2}
-        /><br />
-        <TextField
-            hintText="Full width"
-            fullWidth={true}
-        />
-    </div>
+  <div>
+    <TextField
+      hintText="Hint Text"
+    /><br />
+    <br />
+    <TextField
+      hintText="The hint text can be as long as you want, it will wrap."
+    /><br />
+    <TextField
+      id="text-field-default"
+      defaultValue="Default Value"
+    /><br />
+    <TextField
+      hintText="Hint Text"
+      floatingLabelText="Floating Label Text"
+    /><br />
+    <TextField
+      hintText="Hint Text"
+      floatingLabelText="Fixed Floating Label Text"
+      floatingLabelFixed={true}
+    /><br />
+    <TextField
+      hintText="Password Field"
+      floatingLabelText="Password"
+      type="password"
+    /><br />
+    <TextField
+      hintText="MultiLine with rows: 2 and rowsMax: 4"
+      multiLine={true}
+      rows={2}
+      rowsMax={4}
+    /><br />
+    <TextField
+      hintText="Message Field"
+      floatingLabelText="MultiLine and FloatingLabel"
+      multiLine={true}
+      rows={2}
+    /><br />
+    <TextField
+      hintText="Full width"
+      fullWidth={true}
+    />
+  </div>
 );
 
 const TextFieldExampleError = () => (
-    <div>
-        <TextField
-            hintText="Hint Text"
-            errorText="This field is required"
-        /><br />
-        <TextField
-            hintText="Hint Text"
-            errorText="The error text can be as long as you want, it will wrap."
-        /><br />
-        <TextField
-            hintText="Hint Text"
-            errorText="This field is required"
-            floatingLabelText="Floating Label Text"
-        /><br />
-        <TextField
-            hintText="Message Field"
-            errorText="This field is required."
-            floatingLabelText="MultiLine and FloatingLabel"
-            multiLine={true}
-            rows={2}
-        /><br />
-    </div>
+  <div>
+    <TextField
+      hintText="Hint Text"
+      errorText="This field is required"
+    /><br />
+    <TextField
+      hintText="Hint Text"
+      errorText="The error text can be as long as you want, it will wrap."
+    /><br />
+    <TextField
+      hintText="Hint Text"
+      errorText="This field is required"
+      floatingLabelText="Floating Label Text"
+    /><br />
+    <TextField
+      hintText="Message Field"
+      errorText="This field is required."
+      floatingLabelText="MultiLine and FloatingLabel"
+      multiLine={true}
+      rows={2}
+    /><br />
+  </div>
 );
 
 const TextFieldExampleCustomize = () => (
-    <div>
-        <TextField
-            hintText="Styled Hint Text"
-            hintStyle={styles.errorStyle}
-        /><br />
-        <TextField
-            hintText="Custom error color"
-            errorText="This field is required."
-            errorStyle={styles.errorStyle}
-        /><br />
-        <TextField
-            hintText="Custom Underline Color"
-            underlineStyle={styles.underlineStyle}
-        /><br />
-        <TextField
-            hintText="Custom Underline Focus Color"
-            underlineFocusStyle={styles.underlineStyle}
-        /><br />
-        <TextField
-            floatingLabelText="Styled Floating Label Text"
-            floatingLabelStyle={styles.floatingLabelStyle}
-            floatingLabelFocusStyle={styles.floatingLabelFocusStyle}
-        />
-    </div>
+  <div>
+    <TextField
+      hintText="Styled Hint Text"
+      hintStyle={styles.errorStyle}
+    /><br />
+    <TextField
+      hintText="Custom error color"
+      errorText="This field is required."
+      errorStyle={styles.errorStyle}
+    /><br />
+    <TextField
+      hintText="Custom Underline Color"
+      underlineStyle={styles.underlineStyle}
+    /><br />
+    <TextField
+      hintText="Custom Underline Focus Color"
+      underlineFocusStyle={styles.underlineStyle}
+    /><br />
+    <TextField
+      floatingLabelText="Styled Floating Label Text"
+      floatingLabelStyle={styles.floatingLabelStyle}
+      floatingLabelFocusStyle={styles.floatingLabelFocusStyle}
+    />
+  </div>
 );
 
 const TextFieldExampleDisabled = () => (
-    <div>
-        <TextField
-            disabled={true}
-            hintText="Disabled Hint Text"
-        /><br />
-        <TextField
-            disabled={true}
-            id="text-field-disabled"
-            defaultValue="Disabled Value"
-        /><br />
-        <TextField
-            disabled={true}
-            hintText="Disabled Hint Text"
-            floatingLabelText="Floating Label Text"
-        /><br />
-        <TextField
-            disabled={true}
-            hintText="Disabled Hint Text"
-            defaultValue="Disabled With Floating Label"
-            floatingLabelText="Floating Label Text"
-        />
-    </div>
+  <div>
+    <TextField
+      disabled={true}
+      hintText="Disabled Hint Text"
+    /><br />
+    <TextField
+      disabled={true}
+      id="text-field-disabled"
+      defaultValue="Disabled Value"
+    /><br />
+    <TextField
+      disabled={true}
+      hintText="Disabled Hint Text"
+      floatingLabelText="Floating Label Text"
+    /><br />
+    <TextField
+      disabled={true}
+      hintText="Disabled Hint Text"
+      defaultValue="Disabled With Floating Label"
+      floatingLabelText="Floating Label Text"
+    />
+  </div>
 );
 
 class TextFieldExampleControlled extends React.Component<{}, {value?: string}> {
 
-    constructor(props) {
-        super(props);
+  constructor(props) {
+    super(props);
 
-        this.state = {
-            value: 'Property Value',
-        };
-    }
-
-    handleChange = (event) => {
-        this.setState({
-            value: event.target.value,
-        });
+    this.state = {
+      value: 'Property Value',
     };
+  }
 
-    render() {
-        return (
-            <div>
-                <TextField
-                    id="text-field-controlled"
-                    value={this.state.value}
-                    onChange={this.handleChange}
-                />
-            </div>
-        );
-    }
+  handleChange = (event) => {
+    this.setState({
+      value: event.target.value,
+    });
+  };
+
+  render() {
+    return (
+      <div>
+        <TextField
+          id="text-field-controlled"
+          value={this.state.value}
+          onChange={this.handleChange}
+        />
+      </div>
+    );
+  }
 }
 
 // "http://www.material-ui.com/#/components/time-picker"
 const TimePickerExampleSimple = () => (
-    <div>
-        <TimePicker
-            hintText="12hr Format"
-        />
-        <TimePicker
-            format="24hr"
-            hintText="24hr Format"
-        />
-        <TimePicker
-            disabled={true}
-            format="24hr"
-            hintText="Disabled TimePicker"
-        />
-    </div>
+  <div>
+    <TimePicker
+      hintText="12hr Format"
+    />
+    <TimePicker
+      format="24hr"
+      hintText="24hr Format"
+    />
+    <TimePicker
+      disabled={true}
+      format="24hr"
+      hintText="Disabled TimePicker"
+    />
+  </div>
 );
 
 class TimePickerExampleComplex extends React.Component<{}, {value24?: Date, value12?: Date}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {value24: null, value12: null};
-    }
+  constructor(props) {
+    super(props);
+    this.state = {value24: null, value12: null};
+  }
 
-    handleChangeTimePicker24 = (event, date) => {
-        this.setState({value24: date});
-    };
+  handleChangeTimePicker24 = (event, date) => {
+    this.setState({value24: date});
+  };
 
-    handleChangeTimePicker12 = (event, date) => {
-        this.setState({value12: date});
-    };
+  handleChangeTimePicker12 = (event, date) => {
+    this.setState({value12: date});
+  };
 
-    render() {
-        return (
-            <div>
-                <TimePicker
-                    format="ampm"
-                    hintText="12hr Format"
-                    value={this.state.value12}
-                    onChange={this.handleChangeTimePicker12}
-                />
-                <TimePicker
-                    format="24hr"
-                    hintText="24hr Format"
-                    value={this.state.value24}
-                    onChange={this.handleChangeTimePicker24}
-                />
-            </div>
-        );
-    }
+  render() {
+    return (
+      <div>
+        <TimePicker
+          format="ampm"
+          hintText="12hr Format"
+          value={this.state.value12}
+          onChange={this.handleChangeTimePicker12}
+        />
+        <TimePicker
+          format="24hr"
+          hintText="24hr Format"
+          value={this.state.value24}
+          onChange={this.handleChangeTimePicker24}
+        />
+      </div>
+    );
+  }
 }
 
 const TimePickerInternational = () => (
-    <div>
-        <TimePicker
-            hintText="Custom Labels"
-            okLabel="确定"
-            cancelLabel="取消"
-        />
-    </div>
+  <div>
+    <TimePicker
+      hintText="Custom Labels"
+      okLabel="确定"
+      cancelLabel="取消"
+    />
+  </div>
 );
 
 
 // "http://www.material-ui.com/#/components/toolbar"
 class ToolbarExamplesSimple extends React.Component<{}, {value?: number}> {
 
-    constructor(props) {
-        super(props);
-        this.state = {
-            value: 3,
-        };
-    }
+  constructor(props) {
+    super(props);
+    this.state = {
+      value: 3,
+    };
+  }
 
-    handleChange = (event, index, value) => this.setState({value});
+  handleChange = (event, index, value) => this.setState({value});
 
-    render() {
-        return (
-            <Toolbar>
-                <ToolbarGroup firstChild={true}>
-                    <DropDownMenu value={this.state.value} onChange={this.handleChange}>
+  render() {
+    return (
+      <Toolbar>
+        <ToolbarGroup firstChild={true}>
+          <DropDownMenu value={this.state.value} onChange={this.handleChange}>
                         <MenuItem value={1} primaryText="All Broadcasts"/>
                         <MenuItem value={2} primaryText="All Voice"/>
                         <MenuItem value={3} primaryText="All Text"/>
@@ -4893,27 +4893,27 @@ class ToolbarExamplesSimple extends React.Component<{}, {value?: number}> {
                         <MenuItem value={5} primaryText="Complete Text"/>
                         <MenuItem value={6} primaryText="Active Voice"/>
                         <MenuItem value={7} primaryText="Active Text"/>
-                    </DropDownMenu>
-                </ToolbarGroup>
-                <ToolbarGroup>
+          </DropDownMenu>
+        </ToolbarGroup>
+        <ToolbarGroup>
                     <ToolbarTitle text="Options"/>
                     <FontIcon className="muidocs-icon-custom-sort"/>
-                    <ToolbarSeparator />
+          <ToolbarSeparator />
                     <RaisedButton label="Create Broadcast" primary={true}/>
-                    <IconMenu
-                        iconButtonElement={
+          <IconMenu
+            iconButtonElement={
               <IconButton touch={true}>
                 <NavigationExpandMoreIcon />
               </IconButton>
             }
-                    >
+          >
                         <MenuItem primaryText="Download"/>
                         <MenuItem primaryText="More Info"/>
-                    </IconMenu>
-                </ToolbarGroup>
-            </Toolbar>
-        );
-    }
+          </IconMenu>
+        </ToolbarGroup>
+      </Toolbar>
+    );
+  }
 }
 
 const componentWithWidth = withWidth()(ToolbarExamplesSimple);
@@ -4925,17 +4925,17 @@ interface MaterialUiTestsState {
 class MaterialUiTests extends React.Component<{}, MaterialUiTestsState> {
 
     render() {
-        return (
-            <MuiThemeProvider muiTheme={getMuiTheme()}>
+    return (
+      <MuiThemeProvider muiTheme={getMuiTheme()}>
                 <AppBar title="My AppBar"/>
 
-            </MuiThemeProvider>
-        );
-    }
+      </MuiThemeProvider>
+    );
+  }
 }
 
 // "http://www.material-ui.com/#/get-started/usage"
 ReactDOM.render(
-    <MaterialUiTests />,
-    document.getElementById('app')
-);
+  <MaterialUiTests />,
+  document.getElementById('app')
+);
\ No newline at end of file
diff --git a/pg/index.d.ts b/pg/index.d.ts
index ebf86d9850..84414b451d 100644
--- a/pg/index.d.ts
+++ b/pg/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for pg
+// Type definitions for pg 6.1.0
 // Project: https://github.com/brianc/node-postgres
 // Definitions by: Phips Peter <http://pspeter3.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,9 +6,10 @@
 /// <reference types="node" />
 /// <reference types="pg-types" />
 
+
 import events = require("events");
 import stream = require("stream");
-import pgTypes = require("pg-types");
+    import pgTypes = require("pg-types");
 
 export declare function connect(connection: string, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
 export declare function connect(config: ClientConfig, callback: (err: Error, client: Client, done: (err?: any) => void) => void): void;
@@ -35,13 +36,13 @@ export interface ClientConfig extends ConnectionConfig {
 }
 
 export interface PoolConfig extends ClientConfig {
-    // properties from module 'node-pool'
-    max?: number;
-    min?: number;
-    refreshIdle?: boolean;
-    idleTimeoutMillis?: number;
-    reapIntervalMillis?: number;
-    returnToHead?: boolean;
+      // properties from module 'node-pool'
+      max?: number;
+      min?: number;
+      refreshIdle?: boolean;
+      idleTimeoutMillis?: number;
+      reapIntervalMillis?: number;
+      returnToHead?: boolean;
 }
 
 export interface QueryConfig {
@@ -91,7 +92,7 @@ export declare class Client extends events.EventEmitter {
     constructor(connection: string);
     constructor(config: ClientConfig);
 
-    connect(callback?: (err:Error) => void): void;
+        connect(callback?: (err:Error) => void): void;
     end(): void;
     release(): void;
 
@@ -128,3 +129,5 @@ export declare class Events extends events.EventEmitter {
 }
 
 export const types: typeof pgTypes;
+
+
diff --git a/react-native-sortable-list/index.d.ts b/react-native-sortable-list/index.d.ts
index a62dcfcc88..8774c2ad1f 100644
--- a/react-native-sortable-list/index.d.ts
+++ b/react-native-sortable-list/index.d.ts
@@ -7,7 +7,7 @@ import * as React from 'react';
 
 type DataKey = string | number;
 
-export type DataValue = any
+type DataValue = any
 
 type DataByNumber = {
     [key: number]: DataValue
@@ -17,7 +17,7 @@ type DataByString = {
     [key: string]: DataValue
 }
 
-export type Data = DataByNumber | DataByString;
+type Data = DataByNumber | DataByString;
 
 export interface RowProps {
     active: boolean
@@ -86,4 +86,4 @@ interface SortableListStatic extends React.ClassicComponentClass<SortableListPro
 declare var SortableList: SortableListStatic;
 declare type SortableList = SortableListStatic;
 
-export default SortableList;
+export default SortableList;
\ No newline at end of file

From 6f67cd5b11241003d622c857a2093fb50b29c1d4 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Mon, 21 Nov 2016 13:49:26 -0800
Subject: [PATCH 218/245] Re-re-redo line conversion of gapi.analytics

---
 gapi.analytics/gapi.analytics-tests.ts | 132 ++++++-------
 gapi.analytics/gapi.analytics.d.ts     | 252 ++++++++++++-------------
 2 files changed, 192 insertions(+), 192 deletions(-)

diff --git a/gapi.analytics/gapi.analytics-tests.ts b/gapi.analytics/gapi.analytics-tests.ts
index a6aea00796..78b30e1745 100644
--- a/gapi.analytics/gapi.analytics-tests.ts
+++ b/gapi.analytics/gapi.analytics-tests.ts
@@ -1,66 +1,66 @@
-// Type definitions for Google Analytics API
-
-/// <reference path="../gapi/gapi.d.ts" />
-/// <reference path="./gapi.analytics.d.ts" />
-
-function test_namespace() {
-	var analytics : boolean = gapi.client.analytics instanceof Object;
-	
-	var provisioning : boolean = gapi.client.analytics.provisioning.createAccountTicket instanceof Function;
-	analytics = analytics && provisioning;
-
-	var data : boolean = gapi.client.analytics.data.ga.get instanceof Function;
-	data = data && gapi.client.analytics.data.mcf.get instanceof Function;
-	data = data && gapi.client.analytics.data.realtime.get instanceof Function;
-	analytics = analytics && data;
-
-	interface AnalyticsParameter {
-		"type"              ?: string;
-		"description"       ?: string;
-		"default"           ?: string;
-		"enum"              ?: string[];
-		"enumDescriptions"  ?: string[];
-		"location"          ?: string;
-	}
-    var kBI : AnalyticsParameter = gapi.client.analytics.kB.parameters.alt;
-	var kB = !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.fields;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.key;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.oauth_token;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.prettyPrint;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.quotaUser;
-	kB = kB && !!kBI;
-    kBI = gapi.client.analytics.kB.parameters.userIP;
-	kB = kB && !!kBI;
-	analytics = analytics && kB;
-
-	var management : boolean = gapi.client.analytics.management.accountSummaries.list instanceof Function;
-	management = management && gapi.client.analytics.management.accountUserLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.accounts.list instanceof Function;
-	management = management && gapi.client.analytics.management.customDataSources.list instanceof Function;
-	management = management && gapi.client.analytics.management.customDimensions.list instanceof Function;
-	management = management && gapi.client.analytics.management.customMetrics.list instanceof Function;
-	management = management && gapi.client.analytics.management.experiments.list instanceof Function;
-	management = management && gapi.client.analytics.management.filters.list instanceof Function;
-	management = management && gapi.client.analytics.management.goals.list instanceof Function;
-	management = management && gapi.client.analytics.management.profileFilterLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.profileUserLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.profiles.list instanceof Function;
-	management = management && gapi.client.analytics.management.remarketingAudience.list instanceof Function;
-	management = management && gapi.client.analytics.management.segments.list instanceof Function;
-	management = management && gapi.client.analytics.management.unsampledReports.list instanceof Function;
-	management = management && gapi.client.analytics.management.uploads.list instanceof Function;
-	management = management && gapi.client.analytics.management.webPropertyAdWordsLinks.list instanceof Function;
-	management = management && gapi.client.analytics.management.webproperties.list instanceof Function;
-	management = management && gapi.client.analytics.management.webpropertyUserLinks.list instanceof Function;
-	analytics = analytics && management;
-
-	var metadata : boolean = gapi.client.analytics.metadata.column.list instanceof Function;
-	analytics = analytics && metadata;
-	
-	return analytics;
-}
+// Type definitions for Google Analytics API
+
+/// <reference path="../gapi/gapi.d.ts" />
+/// <reference path="./gapi.analytics.d.ts" />
+
+function test_namespace() {
+	var analytics : boolean = gapi.client.analytics instanceof Object;
+	
+	var provisioning : boolean = gapi.client.analytics.provisioning.createAccountTicket instanceof Function;
+	analytics = analytics && provisioning;
+
+	var data : boolean = gapi.client.analytics.data.ga.get instanceof Function;
+	data = data && gapi.client.analytics.data.mcf.get instanceof Function;
+	data = data && gapi.client.analytics.data.realtime.get instanceof Function;
+	analytics = analytics && data;
+
+	interface AnalyticsParameter {
+		"type"              ?: string;
+		"description"       ?: string;
+		"default"           ?: string;
+		"enum"              ?: string[];
+		"enumDescriptions"  ?: string[];
+		"location"          ?: string;
+	}
+    var kBI : AnalyticsParameter = gapi.client.analytics.kB.parameters.alt;
+	var kB = !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.fields;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.key;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.oauth_token;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.prettyPrint;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.quotaUser;
+	kB = kB && !!kBI;
+    kBI = gapi.client.analytics.kB.parameters.userIP;
+	kB = kB && !!kBI;
+	analytics = analytics && kB;
+
+	var management : boolean = gapi.client.analytics.management.accountSummaries.list instanceof Function;
+	management = management && gapi.client.analytics.management.accountUserLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.accounts.list instanceof Function;
+	management = management && gapi.client.analytics.management.customDataSources.list instanceof Function;
+	management = management && gapi.client.analytics.management.customDimensions.list instanceof Function;
+	management = management && gapi.client.analytics.management.customMetrics.list instanceof Function;
+	management = management && gapi.client.analytics.management.experiments.list instanceof Function;
+	management = management && gapi.client.analytics.management.filters.list instanceof Function;
+	management = management && gapi.client.analytics.management.goals.list instanceof Function;
+	management = management && gapi.client.analytics.management.profileFilterLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.profileUserLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.profiles.list instanceof Function;
+	management = management && gapi.client.analytics.management.remarketingAudience.list instanceof Function;
+	management = management && gapi.client.analytics.management.segments.list instanceof Function;
+	management = management && gapi.client.analytics.management.unsampledReports.list instanceof Function;
+	management = management && gapi.client.analytics.management.uploads.list instanceof Function;
+	management = management && gapi.client.analytics.management.webPropertyAdWordsLinks.list instanceof Function;
+	management = management && gapi.client.analytics.management.webproperties.list instanceof Function;
+	management = management && gapi.client.analytics.management.webpropertyUserLinks.list instanceof Function;
+	analytics = analytics && management;
+
+	var metadata : boolean = gapi.client.analytics.metadata.column.list instanceof Function;
+	analytics = analytics && metadata;
+	
+	return analytics;
+}
diff --git a/gapi.analytics/gapi.analytics.d.ts b/gapi.analytics/gapi.analytics.d.ts
index dc49ffd617..34027c9d47 100644
--- a/gapi.analytics/gapi.analytics.d.ts
+++ b/gapi.analytics/gapi.analytics.d.ts
@@ -1,126 +1,126 @@
-// Type definitions for Google Analytics API
-// Project: https://developers.google.com/analytics/devguides/reporting/core/v4/
-// Definitions by: César Costas <https://github.com/gatsbimantico>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-/// <reference path="../gapi/gapi.d.ts" />
-
-declare namespace gapi.client.analytics {}
-declare namespace gapi.client.analytics.provisioning {
-    export function createAccountTicket() : Promise<any>;
-}
-
-interface DataQuery {
-    "ids"                   ?: string;
-    "start-date"            ?: string;
-    "30daysAgo"             ?: string;
-    "end-date"              ?: string;
-    "yesterday"             ?: string;
-    "metrics"               ?: string;
-    "dimensions"            ?: string;
-    "sort"                  ?: string;
-    "filters"               ?: string;
-    "segment"               ?: string;
-    "samplingLevel"         ?: string;
-    "include-empty-rows"    ?: string;
-    "start-index"           ?: string;
-    "max-results"           ?: string;
-}
-declare namespace gapi.client.analytics.data {}
-declare namespace gapi.client.analytics.data.ga {
-    export function get(data ?: DataQuery) : Promise<any>;
-}
-declare namespace gapi.client.analytics.data.mcf {
-    export function get(data ?: DataQuery) : Promise<any>;
-}
-declare namespace gapi.client.analytics.data.realtime {
-    export function get(data ?: DataQuery) : Promise<any>;
-}
-
-declare namespace gapi.client.analytics.kB {}
-declare namespace gapi.client.analytics.kB.parameters {
-	export interface AnalyticsParameter {
-		"type"              ?: string;
-		"description"       ?: string;
-		"default"           ?: string;
-		"enum"              ?: string[];
-		"enumDescriptions"  ?: string[];
-		"location"          ?: string;
-	}
-	export class alt implements AnalyticsParameter {}
-	export class fields implements AnalyticsParameter {}
-	export class key implements AnalyticsParameter {}
-	export class oauth_token implements AnalyticsParameter {}
-	export class prettyPrint implements AnalyticsParameter {}
-	export class quotaUser implements AnalyticsParameter {}
-	export class userIP implements AnalyticsParameter {}
-}
-
-interface View {
-    accountId       ?: string;
-    webPropertyId   ?: string;
-    webViewId       ?: string;
-}
-declare namespace gapi.client.analytics.management {}
-declare namespace gapi.client.analytics.management.accountSummaries {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.accountUserLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.accounts {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.customDataSources {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.customDimensions {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.customMetrics {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.experiments {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.filters {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.goals {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.profileFilterLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.profileUserLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.profiles {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.remarketingAudience {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.segments {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.unsampledReports {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.uploads {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.webPropertyAdWordsLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.webproperties {
-    export function list(view ?: View) : Promise<any>;
-}
-declare namespace gapi.client.analytics.management.webpropertyUserLinks {
-    export function list(view ?: View) : Promise<any>;
-}
-
-declare namespace gapi.client.analytics.metadata {}
-declare namespace gapi.client.analytics.metadata.column {
-    export function list() : Promise<any>;
-}
+// Type definitions for Google Analytics API
+// Project: https://developers.google.com/analytics/devguides/reporting/core/v4/
+// Definitions by: César Costas <https://github.com/gatsbimantico>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="../gapi/gapi.d.ts" />
+
+declare namespace gapi.client.analytics {}
+declare namespace gapi.client.analytics.provisioning {
+    export function createAccountTicket() : Promise<any>;
+}
+
+interface DataQuery {
+    "ids"                   ?: string;
+    "start-date"            ?: string;
+    "30daysAgo"             ?: string;
+    "end-date"              ?: string;
+    "yesterday"             ?: string;
+    "metrics"               ?: string;
+    "dimensions"            ?: string;
+    "sort"                  ?: string;
+    "filters"               ?: string;
+    "segment"               ?: string;
+    "samplingLevel"         ?: string;
+    "include-empty-rows"    ?: string;
+    "start-index"           ?: string;
+    "max-results"           ?: string;
+}
+declare namespace gapi.client.analytics.data {}
+declare namespace gapi.client.analytics.data.ga {
+    export function get(data ?: DataQuery) : Promise<any>;
+}
+declare namespace gapi.client.analytics.data.mcf {
+    export function get(data ?: DataQuery) : Promise<any>;
+}
+declare namespace gapi.client.analytics.data.realtime {
+    export function get(data ?: DataQuery) : Promise<any>;
+}
+
+declare namespace gapi.client.analytics.kB {}
+declare namespace gapi.client.analytics.kB.parameters {
+	export interface AnalyticsParameter {
+		"type"              ?: string;
+		"description"       ?: string;
+		"default"           ?: string;
+		"enum"              ?: string[];
+		"enumDescriptions"  ?: string[];
+		"location"          ?: string;
+	}
+	export class alt implements AnalyticsParameter {}
+	export class fields implements AnalyticsParameter {}
+	export class key implements AnalyticsParameter {}
+	export class oauth_token implements AnalyticsParameter {}
+	export class prettyPrint implements AnalyticsParameter {}
+	export class quotaUser implements AnalyticsParameter {}
+	export class userIP implements AnalyticsParameter {}
+}
+
+interface View {
+    accountId       ?: string;
+    webPropertyId   ?: string;
+    webViewId       ?: string;
+}
+declare namespace gapi.client.analytics.management {}
+declare namespace gapi.client.analytics.management.accountSummaries {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.accountUserLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.accounts {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.customDataSources {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.customDimensions {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.customMetrics {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.experiments {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.filters {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.goals {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.profileFilterLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.profileUserLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.profiles {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.remarketingAudience {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.segments {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.unsampledReports {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.uploads {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.webPropertyAdWordsLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.webproperties {
+    export function list(view ?: View) : Promise<any>;
+}
+declare namespace gapi.client.analytics.management.webpropertyUserLinks {
+    export function list(view ?: View) : Promise<any>;
+}
+
+declare namespace gapi.client.analytics.metadata {}
+declare namespace gapi.client.analytics.metadata.column {
+    export function list() : Promise<any>;
+}

From 8105872391e98fdd094d62f9c782ad88f0be498e Mon Sep 17 00:00:00 2001
From: James Garner <j@jada.io>
Date: Mon, 21 Nov 2016 22:27:37 +0000
Subject: [PATCH 219/245] StereoCamera has eyeSep property
 https://github.com/mrdoob/three.js/pull/9432/files

---
 three/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/three/index.d.ts b/three/index.d.ts
index 75c3332ec6..1a691e7878 100644
--- a/three/index.d.ts
+++ b/three/index.d.ts
@@ -669,6 +669,7 @@ declare namespace THREE {
         constructor();
 
         aspect: number;
+        eyeSep: number;
         cameraL: PerspectiveCamera;
         cameraR: PerspectiveCamera;
 

From 49d3e9fafb3c4046b6814691aef9660a683445ef Mon Sep 17 00:00:00 2001
From: Simon <simonxca@yahoo.ca>
Date: Mon, 21 Nov 2016 20:25:25 -0500
Subject: [PATCH 220/245] update to 4.6.8, clean up old issues fixes #12385
 fixes #11729

---
 mongoose/mongoose.d.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mongoose/mongoose.d.ts b/mongoose/mongoose.d.ts
index 38d0a5cab8..17f821e82c 100644
--- a/mongoose/mongoose.d.ts
+++ b/mongoose/mongoose.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mongoose 4.5.9
+// Type definitions for Mongoose 4.6.8
 // Project: http://mongoosejs.com/
 // Definitions by: simonxca <https://github.com/simonxca/>, horiuchi <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -285,6 +285,9 @@ declare module "mongoose" {
     open(connection_string: string, database?: string, port?: number,
       options?: ConnectionOpenOptions, callback?: (err: any) => void): any;
 
+    /** Helper for dropDatabase() */
+    dropDatabase(callback?: (err: any) => void): Promise<void>;
+
     /**
      * Opens the connection to a replica set.
      * @param uris comma-separated mongodb:// URIs
@@ -659,6 +662,8 @@ declare module "mongoose" {
     methods: any;
     /** Object of currently defined statics on this schema. */
     statics: any;
+    /** The original object passed to the schema constructor */
+    obj: any;
   }
 
   interface SchemaOptions {

From 2ad81bfbeb5360b70c5100f51faf943586099270 Mon Sep 17 00:00:00 2001
From: Simon <simonxca@yahoo.ca>
Date: Mon, 21 Nov 2016 20:33:57 -0500
Subject: [PATCH 221/245] update to 4.6.8, clean up old issues fixes #11079

---
 mongoose/index.d.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/mongoose/index.d.ts b/mongoose/index.d.ts
index 150d94b2df..3dc0b0d0b0 100644
--- a/mongoose/index.d.ts
+++ b/mongoose/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mongoose 4.5.4
+// Type definitions for Mongoose 4.6.8
 // Project: http://mongoosejs.com/
 // Definitions by: simonxca <https://github.com/simonxca/>, horiuchi <https://github.com/horiuchi/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -285,6 +285,9 @@ declare module "mongoose" {
     open(connection_string: string, database?: string, port?: number,
       options?: ConnectionOpenOptions, callback?: (err: any) => void): any;
 
+    /** Helper for dropDatabase() */
+    dropDatabase(callback?: (err: any) => void): Promise<void>;
+
     /**
      * Opens the connection to a replica set.
      * @param uris comma-separated mongodb:// URIs
@@ -659,6 +662,8 @@ declare module "mongoose" {
     methods: any;
     /** Object of currently defined statics on this schema. */
     statics: any;
+    /** The original object passed to the schema constructor */
+    obj: any;
   }
 
   interface SchemaOptions {

From 947c9afb55a009a8e4f531d7f886cd504350a357 Mon Sep 17 00:00:00 2001
From: Brian Michalski <bmichalski@gmail.com>
Date: Mon, 21 Nov 2016 21:00:47 -0500
Subject: [PATCH 222/245] Move gapi.client.request options to an interface.
 (#12835)

---
 gapi/gapi.d.ts | 46 ++++++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/gapi/gapi.d.ts b/gapi/gapi.d.ts
index 6d7e18a12e..54806755e8 100644
--- a/gapi/gapi.d.ts
+++ b/gapi/gapi.d.ts
@@ -127,27 +127,7 @@ declare namespace gapi.auth {
 }
 
 declare namespace gapi.client {
-    /**
-    * Loads the client library interface to a particular API. If a callback is not provided, a promise is returned.
-    * @param name The name of the API to load.
-    * @param version The version of the API to load.
-    * @return promise The promise that get's resolved after the request is finished.
-    */
-    export function load(name: string, version: string): Promise<void>
-
-    /**
-    * Loads the client library interface to a particular API. The new API interface will be in the form gapi.client.api.collection.method.
-    * @param name The name of the API to load.
-    * @param version The version of the API to load
-    * @param callback the function that is called once the API interface is loaded
-    * @param url optional, the url of your app - if using Google's APIs, don't set it
-    */
-    export function load(name: string, version: string, callback: () => any, url?: string): void;
-    /**
-    * Creates a HTTP request for making RESTful requests.
-    * An object encapsulating the various arguments for this method.
-    */
-    export function request(args: {
+    interface RequestOptions {
         /**
          * The URL to handle the request
          */
@@ -172,7 +152,29 @@ declare namespace gapi.client {
          * If supplied, the request is executed immediately and no gapi.client.HttpRequest object is returned
          */
         callback?: () => any;
-    }): HttpRequest<any>;
+    }
+
+    /**
+    * Loads the client library interface to a particular API. If a callback is not provided, a promise is returned.
+    * @param name The name of the API to load.
+    * @param version The version of the API to load.
+    * @return promise The promise that get's resolved after the request is finished.
+    */
+    export function load(name: string, version: string): Promise<void>
+
+    /**
+    * Loads the client library interface to a particular API. The new API interface will be in the form gapi.client.api.collection.method.
+    * @param name The name of the API to load.
+    * @param version The version of the API to load
+    * @param callback the function that is called once the API interface is loaded
+    * @param url optional, the url of your app - if using Google's APIs, don't set it
+    */
+    export function load(name: string, version: string, callback: () => any, url?: string): void;
+    /**
+    * Creates a HTTP request for making RESTful requests.
+    * An object encapsulating the various arguments for this method.
+    */
+    export function request(args: RequestOptions): HttpRequest<any>;
     /**
     * Creates an RPC Request directly. The method name and version identify the method to be executed and the RPC params are provided upon RPC creation.
     * @param method The method to be executed.

From 5fc9a83c880df7379dfe2300aa5b27641794c455 Mon Sep 17 00:00:00 2001
From: Simon <simonxca@yahoo.ca>
Date: Mon, 21 Nov 2016 21:07:49 -0500
Subject: [PATCH 223/245] update mongoose deep populate options fixes #11571

---
 mongoose/mongoose.d.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mongoose/mongoose.d.ts b/mongoose/mongoose.d.ts
index 17f821e82c..96c03c438a 100644
--- a/mongoose/mongoose.d.ts
+++ b/mongoose/mongoose.d.ts
@@ -813,7 +813,8 @@ declare module "mongoose" {
      */
     populate(callback: (err: any, res: this) => void): this;
     populate(path: string, callback?: (err: any, res: this) => void): this;
-    populate(options: ModelPopulateOptions, callback?: (err: any, res: this) => void): this;
+    populate(options: ModelPopulateOptions | ModelPopulateOptions[],
+      callback?: (err: any, res: this) => void): this;
 
     /** Gets _id(s) used during population of the given path. If the path was not populated, undefined is returned. */
     populated(path: string): any;
@@ -1454,7 +1455,7 @@ declare module "mongoose" {
      */
     populate(path: string | Object, select?: string | Object, model?: any,
       match?: Object, options?: Object): this;
-    populate(options: ModelPopulateOptions): this;
+    populate(options: ModelPopulateOptions | ModelPopulateOptions[]): this;
 
     /**
      * Determines the MongoDB nodes from which to read.
@@ -2428,6 +2429,8 @@ declare module "mongoose" {
     model?: string;
     /** optional query options like sort, limit, etc */
     options?: Object;
+    /** deep populate */
+    populate?: ModelPopulateOptions | ModelPopulateOptions[]
   }
 
   interface ModelUpdateOptions {

From afca71ea172620485b380abe10db9f52a5db7d3c Mon Sep 17 00:00:00 2001
From: Simon <simonxca@yahoo.ca>
Date: Mon, 21 Nov 2016 21:17:27 -0500
Subject: [PATCH 224/245] update mongoose deep populate options

---
 mongoose/index.d.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mongoose/index.d.ts b/mongoose/index.d.ts
index 3dc0b0d0b0..f862d3b3d1 100644
--- a/mongoose/index.d.ts
+++ b/mongoose/index.d.ts
@@ -813,7 +813,7 @@ declare module "mongoose" {
      */
     populate(callback: (err: any, res: this) => void): this;
     populate(path: string, callback?: (err: any, res: this) => void): this;
-    populate(options: ModelPopulateOptions, callback?: (err: any, res: this) => void): this;
+    populate(options: ModelPopulateOptions | ModelPopulateOptions[], callback?: (err: any, res: this) => void): this;
 
     /** Gets _id(s) used during population of the given path. If the path was not populated, undefined is returned. */
     populated(path: string): any;
@@ -1454,7 +1454,7 @@ declare module "mongoose" {
      */
     populate(path: string | Object, select?: string | Object, model?: any,
       match?: Object, options?: Object): this;
-    populate(options: ModelPopulateOptions): this;
+    populate(options: ModelPopulateOptions | ModelPopulateOptions[]): this;
 
     /**
      * Determines the MongoDB nodes from which to read.
@@ -2428,6 +2428,8 @@ declare module "mongoose" {
     model?: string;
     /** optional query options like sort, limit, etc */
     options?: Object;
+    /** deep populate */
+    populate?: ModelPopulateOptions | ModelPopulateOptions[]
   }
 
   interface ModelUpdateOptions {

From 2bf6317d73cd15af45f1b8535cac29f14d6f6fe1 Mon Sep 17 00:00:00 2001
From: Kei Son <heyacct@gmail.com>
Date: Tue, 22 Nov 2016 11:23:56 +0900
Subject: [PATCH 225/245] Typings for oauth2orize (#12712)

* Typings for oauth2orize

* Adopt @andy-ms ' review

* Change IssuedFunction more simpler
---
 oauth2orize/index.d.ts           | 79 ++++++++++++++++++++++++++++++
 oauth2orize/oauth2orize-tests.ts | 84 ++++++++++++++++++++++++++++++++
 oauth2orize/tsconfig.json        | 20 ++++++++
 3 files changed, 183 insertions(+)
 create mode 100644 oauth2orize/index.d.ts
 create mode 100644 oauth2orize/oauth2orize-tests.ts
 create mode 100644 oauth2orize/tsconfig.json

diff --git a/oauth2orize/index.d.ts b/oauth2orize/index.d.ts
new file mode 100644
index 0000000000..b36272dee6
--- /dev/null
+++ b/oauth2orize/index.d.ts
@@ -0,0 +1,79 @@
+// Type definitions for oauth2orize v1.5.1
+// Project: https://github.com/jaredhanson/oauth2orize/
+// Definitions by: Wonshik Kim <https://github.com/wokim/>, Kei Son <https://github.com/heycalmdown>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as http from "http";
+
+interface ServerOptions {
+  store: any;
+  loadTransaction: boolean;
+}
+export function createServer(options?: ServerOptions): OAuth2Server;
+
+export interface AuthorizeOptions {
+  idLength?: number;
+  sessionKey?: string;
+}
+
+export interface ErrorHandlerOptions {
+  mode?: string;
+}
+
+type MiddlewareFunction = (req: http.IncomingMessage, res: http.ServerResponse, next: Function) => void;
+type ValidatedFunction = (err: Error | null, client?: any, redirectURI?: string) => void;
+type IssuedFunction = (err: Error | null, accessToken?: string | boolean, refreshToken?: string, params?: any) => void;
+
+export class OAuth2Server {
+  exchange(fn: MiddlewareFunction): OAuth2Server;
+  exchange(type: string, fn: MiddlewareFunction): OAuth2Server;
+  // Parses requests to obtain authorization
+  authorize    (options: AuthorizeOptions, validate: (clientId: string, redirectURI: string, validated: ValidatedFunction) => void): MiddlewareFunction;
+  authorization(options: AuthorizeOptions, validate: (clientId: string, redirectURI: string, validated: ValidatedFunction) => void): MiddlewareFunction;
+  authorize    (validate: (clientId: string, redirectURI: string, validated: ValidatedFunction) => void): MiddlewareFunction;
+  authorization(validate: (clientId: string, redirectURI: string, validated: ValidatedFunction) => void): MiddlewareFunction;
+
+  token(options?: any): MiddlewareFunction;
+  errorHandler(options?: any): (err: Error, req: http.IncomingMessage, res: http.ServerResponse, next: any) => void;
+  serializeClient(fn: (client: any, done: (err: Error | null, id: string) => void) => void): void;
+  serializeClient(client: any, done: (err: Error | null, id: string) => void): void;
+  deserializeClient(fn: (id: string, done: (err: Error | null, client?: any | boolean) => void) => void): void;
+  deserializeClient(obj: any, done: (err: Error | null, client?: any | boolean) => void): void;
+}
+
+export namespace exchange {
+  interface Options {
+    // The 'user' property of `req` holds the authenticated user.  In the case
+    // of the token endpoint, the property will contain the OAuth 2.0 client.
+    userProperty?: string;
+
+    // For maximum flexibility, multiple scope spearators can optionally be
+    // allowed.  This allows the server to accept clients that separate scope
+    // with either space or comma (' ', ',').  This violates the specification,
+    // but achieves compatibility with existing client libraries that are already
+    // deployed.
+    scopeSeparator?: string;
+  }
+
+  function authorizationCode(options: Options, issue: (client: any, code: string, redirectURI: string, issued: IssuedFunction) => void): MiddlewareFunction;
+  function authorizationCode(issue: (client: any, code: string, redirectURI: string, issued: IssuedFunction) => void): MiddlewareFunction;
+  function code(options: Options, issue: (client: any, code: string, redirectURI: string, issued: IssuedFunction) => void): MiddlewareFunction;
+  function code(issue: (client: any, code: string, redirectURI: string, issued: IssuedFunction) => void): MiddlewareFunction;
+
+  function clientCredentials(options: Options, issue: (client: any, scope: string[], issued: IssuedFunction) => void): MiddlewareFunction;
+  function clientCredentials(options: Options, issue: (client: any, issued: IssuedFunction) => void): MiddlewareFunction;
+  function clientCredentials(issue: (client: any, scope: string[], issued: IssuedFunction) => void): MiddlewareFunction;
+  function clientCredentials(issue: (client: any, issued: IssuedFunction) => void): MiddlewareFunction;
+
+  function password(options: Options, issue: (client: any, username: string, password: string, scope: string[], issued: IssuedFunction) => void): MiddlewareFunction;
+  function password(options: Options, issue: (client: any, username: string, password: string, issued: IssuedFunction) => void): MiddlewareFunction;
+  function password(issue: (client: any, username: string, password: string, scope: string[], issued: IssuedFunction) => void): MiddlewareFunction;
+  function password(issue: (client: any, username: string, password: string, issued: IssuedFunction) => void): MiddlewareFunction;
+
+  function refreshToken(options: Options, issue: (client: any, refreshToken: string, scope: string[], issued: IssuedFunction) => void): MiddlewareFunction;
+  function refreshToken(options: Options, issue: (client: any, refreshToken: string, issued: IssuedFunction) => void): MiddlewareFunction;
+  function refreshToken(issue: (client: any, refreshToken: string, scope: string[], issued: IssuedFunction) => void): MiddlewareFunction;
+  function refreshToken(issue: (client: any, refreshToken: string, issued: IssuedFunction) => void): MiddlewareFunction;
+}
diff --git a/oauth2orize/oauth2orize-tests.ts b/oauth2orize/oauth2orize-tests.ts
new file mode 100644
index 0000000000..9795b3e89e
--- /dev/null
+++ b/oauth2orize/oauth2orize-tests.ts
@@ -0,0 +1,84 @@
+import * as oauth2orize from 'oauth2orize';
+import * as http from 'http';
+
+// from https://github.com/jaredhanson/oauth2orize/
+
+// Create an OAuth Server
+const server = oauth2orize.createServer();
+
+// Register Grants
+// server.grant(oauth2orize.grant.code(function(client, redirectURI, user, ares, done) {
+//   var code = utils.uid(16);
+
+//   var ac = new AuthorizationCode(code, client.id, redirectURI, user.id, ares.scope);
+//   ac.save(function(err) {
+//     if (err) { return done(err); }
+//     return done(null, code);
+//   });
+// }));
+
+
+// Register Exchanges
+class AuthorizationCode {
+  static findOne(code: string, callback: (err: Error, code: {
+    clientId: string, userId: string, redirectURI: string, scope: string
+  }) => void): void {}
+}
+
+server.exchange(oauth2orize.exchange.code(function(client, code, redirectURI, done) {
+  AuthorizationCode.findOne(code, function(err, code) {
+    if (err) { return done(err); }
+    if (client.id !== code.clientId) { return done(null, false); }
+    if (redirectURI !== code.redirectURI) { return done(null, false); }
+
+    // var token = utils.uid(256);
+    // var at = new AccessToken(token, code.userId, code.clientId, code.scope);
+    // at.save(function(err) {
+    //   if (err) { return done(err); }
+    //   return done(null, token);
+    // });
+  });
+}));
+
+// Implement Authorization Endpoint
+class Clients {
+  static findOne(id: string, callback: (err: Error, client?: Clients) => void): void {
+    callback(new Error(), {} as Clients);
+  }
+  redirectURI: string;
+}
+
+// app.get('/dialog/authorize',
+  // login.ensureLoggedIn(),
+  server.authorize(function(clientID, redirectURI, done) {
+    Clients.findOne(clientID, function(err, client) {
+      if (err) { return done(err); }
+      if (!client) { return done(null, false); }
+      if (client.redirectURI != redirectURI) { return done(null, false); }
+      return done(null, client, client.redirectURI);
+    });
+  }),
+  function(req: http.IncomingMessage, res: http.ServerResponse) {
+    // res.render('dialog', { transactionID: req.oauth2.transactionID,
+    //                        user: req.user, client: req.oauth2.client });
+  }
+// );
+
+// Session Serialization
+server.serializeClient(function(client, done) {
+  return done(null, client.id);
+});
+
+server.deserializeClient(function(id, done) {
+  Clients.findOne(id, function(err, client) {
+    if (err) { return done(err); }
+    return done(null, client);
+  });
+});
+
+// Implement Token Endpoint
+// app.post('/token',
+  // passport.authenticate(['basic', 'oauth2-client-password'], { session: false }),
+  server.token(),
+  server.errorHandler()
+// );
diff --git a/oauth2orize/tsconfig.json b/oauth2orize/tsconfig.json
new file mode 100644
index 0000000000..d188681ac4
--- /dev/null
+++ b/oauth2orize/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "moduleResolution": "node",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "oauth2orize-tests.ts"
+    ]
+}

From 27a9d53693fea45cc2a5ed7b388d1cc4af1a80fc Mon Sep 17 00:00:00 2001
From: heycalmdown <heyacct@gmail.com>
Date: Fri, 11 Nov 2016 17:53:12 +0900
Subject: [PATCH 226/245] Add configs(cli, npm, syslog)

- refactor to abstract configs
---
 winston/index.d.ts       | 135 +++++++++++++++++++++++++++++++++------
 winston/winston-tests.ts |  20 ++++++
 2 files changed, 136 insertions(+), 19 deletions(-)

diff --git a/winston/index.d.ts b/winston/index.d.ts
index 0b10766d10..54d5a0e713 100644
--- a/winston/index.d.ts
+++ b/winston/index.d.ts
@@ -17,7 +17,88 @@ declare var winston: winston.Winston;
 export = winston;
 
 declare namespace winston {
+    export interface AbstractConfigLevels {
+        [key: string]: number;
+    }
+
+    export interface AbstractConfigColors {
+        [key: string]: string;
+    }
+
+    export interface AbstractConfig {
+        levels: AbstractConfigLevels;
+        colors: AbstractConfigColors;
+    }
+
+    export interface CliConfigLevels extends AbstractConfigLevels {
+        error: number;
+        warn: number;
+        help: number;
+        data: number;
+        info: number;
+        debug: number;
+        prompt: number;
+        verbose: number;
+        input: number;
+        silly: number;
+    }
+
+    export interface CliConfigColors extends AbstractConfigColors {
+        error: string;
+        warn: string;
+        help: string;
+        data: string;
+        info: string;
+        debug: string;
+        prompt: string;
+        verbose: string;
+        input: string;
+        silly: string;
+    }
+    export interface NpmConfigLevels extends AbstractConfigLevels {
+        error: number;
+        warn: number;
+        info: number;
+        verbose: number;
+        debug: number;
+        silly: number;
+    }
+    export interface NpmConfigColors extends AbstractConfigColors {
+        error: string;
+        warn: string;
+        info: string;
+        verbose: string;
+        debug: string;
+        silly: string;
+    }
+    export interface SyslogConfigLevels extends AbstractConfigLevels {
+        emerg: number;
+        alert: number;
+        crit: number;
+        error: number;
+        warning: number;
+        notice: number;
+        info: number;
+        debug: number;
+    }
+    export interface SyslogConfigColors extends AbstractConfigColors {
+        emerg: string;
+        alert: string;
+        crit: string;
+        error: string;
+        warning: string;
+        notice: string;
+        info: string;
+        debug: string;
+    }
+
     export interface Winston {
+        config: {
+            cli: {levels: CliConfigLevels, colors: CliConfigColors},
+            npm: {levels: NpmConfigLevels, colors: NpmConfigColors},
+            syslog: {levels: SyslogConfigLevels, colors: SyslogConfigColors}
+        };
+
         transports: winston.Transports;
         Transport: winston.TransportStatic;
         Logger: winston.LoggerStatic;
@@ -48,8 +129,8 @@ declare namespace winston {
         remove(transport: winston.TransportInstance): winston.LoggerInstance;
         startTimer(): winston.ProfileHandler;
         profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): winston.LoggerInstance;
-        addColors(target: any): any;
-        setLevels(target: any): any;
+        addColors(target: AbstractConfigColors): any;
+        setLevels(target: AbstractConfigLevels): any;
         cli(): winston.LoggerInstance;
         close(): void;
         configure(options: winston.LoggerOptions): void;
@@ -110,16 +191,30 @@ declare namespace winston {
     export interface LoggerInstance extends NodeJS.EventEmitter {
         rewriters: Array<MetadataRewriter>;
         filters: Array<MetadataFilter>;
-        transports: Array<TransportInstance>;
+        transports: {[key: string]: TransportInstance};
 
         extend(target: any): LoggerInstance;
 
         log: LogMethod;
 
-        debug: LeveledLogMethod;
-        info: LeveledLogMethod;
-        warn: LeveledLogMethod;
+        // for cli levels
         error: LeveledLogMethod;
+        warn: LeveledLogMethod;
+        help: LeveledLogMethod;
+        data: LeveledLogMethod;
+        info: LeveledLogMethod;
+        debug: LeveledLogMethod;
+        prompt: LeveledLogMethod;
+        verbose: LeveledLogMethod;
+        input: LeveledLogMethod;
+        silly: LeveledLogMethod;
+
+        // for syslog levels only
+        emerg: LeveledLogMethod
+        alert: LeveledLogMethod;
+        crit: LeveledLogMethod;
+        warning: LeveledLogMethod;
+        notice: LeveledLogMethod;
 
         query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
         query(callback: (err: Error, results: any) => void): any;
@@ -133,9 +228,9 @@ declare namespace winston {
         startTimer(): ProfileHandler;
         profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
         configure(options: LoggerOptions): void;
-        setLevels(target: any): any;
+        setLevels(target: AbstractConfigLevels): any;
         cli(): LoggerInstance;
-
+        
         level: string;
     }
 
@@ -144,6 +239,8 @@ declare namespace winston {
         rewriters?: TransportInstance[];
         exceptionHandlers?: TransportInstance[];
         handleExceptions?: boolean;
+        level?: string;
+        levels?: AbstractConfigLevels,
 
         /**
          * @type {(boolean|(err: Error) => void)}
@@ -265,7 +362,7 @@ declare namespace winston {
         has(id: string): boolean;
         close(id: string): void;
         options: LoggerOptions;
-        loggers: any;
+        loggers: {[key: string]: LoggerInstance};
         default: LoggerOptions;
     }
 
@@ -308,8 +405,8 @@ declare namespace winston {
         host?: string;
         port?: number;
         auth?: {
-            username: string;
-            password: string;
+        username: string;
+        password: string;
         };
         path?: string;
     }
@@ -329,8 +426,8 @@ declare namespace winston {
         filename?: string;
         dirname?: string;
         options?: {
-            flags?: string;
-            highWaterMark?: number;
+        flags?: string;
+        highWaterMark?: number;
         };
         stream?: NodeJS.WritableStream;
     }
@@ -347,8 +444,8 @@ declare namespace winston {
         filename?: string;
         dirname?: string;
         options?: {
-            flags?: string;
-            highWaterMark?: number;
+        flags?: string;
+        highWaterMark?: number;
         };
         stream?: NodeJS.WritableStream;
     }
@@ -363,9 +460,9 @@ declare namespace winston {
     export interface WebhookTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
         method?: string;
         ssl?: {
-            key?: any;
-            cert?: any;
-            ca: any;
+        key?: any;
+        cert?: any;
+        ca: any;
         };
     }
 
@@ -404,4 +501,4 @@ declare namespace winston {
     interface LogCallback {
         (error?: any, level?: string, msg?: string, meta?: any): void;
     }
-}
\ No newline at end of file
+}
diff --git a/winston/winston-tests.ts b/winston/winston-tests.ts
index dae649d1f9..589a0fc226 100644
--- a/winston/winston-tests.ts
+++ b/winston/winston-tests.ts
@@ -267,3 +267,23 @@ var logger: winston.LoggerInstance = new (winston.Logger)({
 logger.configure({ level: 'silly' });
 
 winston.default.warn("Don't export reserved words in JavaScript!");
+
+winston.default.setLevels(winston.config.syslog.levels);
+winston.addColors(winston.config.syslog.colors);
+winston.default.emerg('syslog!');
+
+// module augment for custom level log
+// https://github.com/winstonjs/winston#using-custom-logging-levels
+// https://github.com/Microsoft/TypeScript/issues/7545
+declare module 'winston' {
+  interface LoggerInstance {
+    yay: winston.LeveledLogMethod;
+  }
+}
+const customLevelLogger = new winston.Logger({
+  levels: {yay: 0, haha: 1, hoho: 2},
+  transports: [
+    new (winston.transports.Console)()
+  ]
+});
+customLevelLogger.yay('yay!');

From e9696401d4e27290e317825984ded0bb62ffc9b0 Mon Sep 17 00:00:00 2001
From: heycalmdown <heyacct@gmail.com>
Date: Tue, 15 Nov 2016 13:32:57 +0900
Subject: [PATCH 227/245] Fix indent

---
 winston/index.d.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/winston/index.d.ts b/winston/index.d.ts
index 54d5a0e713..6460caeecc 100644
--- a/winston/index.d.ts
+++ b/winston/index.d.ts
@@ -405,8 +405,8 @@ declare namespace winston {
         host?: string;
         port?: number;
         auth?: {
-        username: string;
-        password: string;
+            username: string;
+            password: string;
         };
         path?: string;
     }
@@ -426,8 +426,8 @@ declare namespace winston {
         filename?: string;
         dirname?: string;
         options?: {
-        flags?: string;
-        highWaterMark?: number;
+            flags?: string;
+            highWaterMark?: number;
         };
         stream?: NodeJS.WritableStream;
     }
@@ -444,8 +444,8 @@ declare namespace winston {
         filename?: string;
         dirname?: string;
         options?: {
-        flags?: string;
-        highWaterMark?: number;
+            flags?: string;
+            highWaterMark?: number;
         };
         stream?: NodeJS.WritableStream;
     }
@@ -460,9 +460,9 @@ declare namespace winston {
     export interface WebhookTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
         method?: string;
         ssl?: {
-        key?: any;
-        cert?: any;
-        ca: any;
+            key?: any;
+            cert?: any;
+            ca: any;
         };
     }
 

From b952cbe30bb17d29ebd1fbf085adba8bb4387f1a Mon Sep 17 00:00:00 2001
From: Steve Jenkins <steve@skysteve.com>
Date: Tue, 22 Nov 2016 08:42:09 +0000
Subject: [PATCH 228/245] update as per comment

---
 promise-polyfill/index.d.ts | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/promise-polyfill/index.d.ts b/promise-polyfill/index.d.ts
index 442e8461ec..703f7a6a8c 100644
--- a/promise-polyfill/index.d.ts
+++ b/promise-polyfill/index.d.ts
@@ -3,21 +3,4 @@
 // Definitions by: Steve Jenkins <https://github.com/skysteve>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export as namespace Promise;
-
-export = Promise;
-declare var Promise: Promise.IPromise;
-
-declare namespace Promise {
-	export interface IPromise {
-		new <T>(resolver: (resolve: (value: T) => void, reject: (reason: any) => void) => void): IThenable<T>;
-		resolve: <T>(value: T) => IThenable<T>;
-		reject: <T>(value: T) => IThenable<T>;
-		all: (array: Array<IThenable<any>>) => IThenable<Array<any>>;
-	}
-
-	export interface IThenable<T> {
-		then<R>(onFulfilled?: (value: T) => IThenable<R>|R, onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
-		catch<R>(onRejected?: (error: any) => IThenable<R>|R): IThenable<R>;
-	}
-}
+export default Promise;
\ No newline at end of file

From 2f92400b504f48d3bbe02662574994409bea93a0 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 22 Nov 2016 08:58:23 -0800
Subject: [PATCH 229/245] More fixes to adjust to released compiler

---
 async/async-tests.ts                   | 6 +++---
 diff-match-patch/index.d.ts            | 7 -------
 ng-file-upload/ng-file-upload-tests.ts | 2 +-
 rethinkdb/tsconfig.json                | 4 ++--
 4 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/async/async-tests.ts b/async/async-tests.ts
index 2cc419510e..2a21a6cabb 100644
--- a/async/async-tests.ts
+++ b/async/async-tests.ts
@@ -78,7 +78,7 @@ async.foldl(numArray, 0, reducer, function (err, result) { });
 async.reduceRight(numArray, 0, reducer, function (err, result) { });
 async.foldr(numArray, 0, reducer, function (err, result) { });
 
-async.detect(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err,result:string) { });
+async.detect(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err: Error,result:string) { });
 async.detectSeries(['file1', 'file2', 'file3'], funcStringCbErrBoolean, function (err,result) { });
 async.detectLimit(['file1', 'file2', 'file3'], 2, funcStringCbErrBoolean, function (err,result) { });
 
@@ -271,7 +271,7 @@ async.waterfall([
 ], function (err, result) { });
 
 
-var q = async.queue<any,Error>(function (task: any, callback) {
+var q = async.queue<any,Error>(function (task: any, callback: () => void) {
     console.log('hello ' + task.name);
     callback();
 }, 2);
@@ -324,7 +324,7 @@ q.resume();
 q.kill();
 
 // tests for strongly typed tasks
-var q2 = async.queue<string,Error>(function (task: string, callback) {
+var q2 = async.queue<string,Error>(function (task: string, callback: () => void) {
     console.log('Task: ' + task);
     callback();
 }, 1);
diff --git a/diff-match-patch/index.d.ts b/diff-match-patch/index.d.ts
index 5c30a98074..cfaeace764 100644
--- a/diff-match-patch/index.d.ts
+++ b/diff-match-patch/index.d.ts
@@ -5,13 +5,6 @@
 
 
 type Diff = [number, string];
-export class Patch {
-    diffs: Diff[];
-    start1: number;
-    start2: number;
-    length1: number;
-    length2: number;
-}
 
 export declare class Patch {
     diffs: Diff[];
diff --git a/ng-file-upload/ng-file-upload-tests.ts b/ng-file-upload/ng-file-upload-tests.ts
index 0bca49ea91..3f3f264c2b 100644
--- a/ng-file-upload/ng-file-upload-tests.ts
+++ b/ng-file-upload/ng-file-upload-tests.ts
@@ -85,7 +85,7 @@ class UploadController {
 				ratio: 0.9,
 				centerCrop: true,
 				restoreExif: true,
-				resizeIf: (width, height) => {
+                                resizeIf: (width: number, height: number) => {
 					return true;
 				}
 			})
diff --git a/rethinkdb/tsconfig.json b/rethinkdb/tsconfig.json
index c619586ad6..7d547239ee 100644
--- a/rethinkdb/tsconfig.json
+++ b/rethinkdb/tsconfig.json
@@ -1,6 +1,6 @@
 {
     "compilerOptions": {
-        "module": "es6",
+        "module": "commonjs",
         "target": "es6",
         "noImplicitAny": false,
         "strictNullChecks": false,
@@ -16,4 +16,4 @@
         "index.d.ts",
         "rethinkdb-tests.ts"
     ]
-}
\ No newline at end of file
+}

From 3c209cb7bf5573b09c09be5c11fd4c3f46fbc3d5 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 22 Nov 2016 09:48:00 -0800
Subject: [PATCH 230/245] Upgrade master-only packages to types-2.0

---
 math3d/index.d.ts                            | 168 ++++++++++++++++++
 math3d/math3d-tests.ts                       |   7 +
 math3d/math3d.d.ts                           | 170 -------------------
 math3d/tsconfig.json                         |  19 +++
 math3d/tslint.json                           |   1 +
 plugapi/{plugapi.d.ts => index.d.ts}         |   3 +-
 plugapi/plugapi-tests.ts                     |   4 +-
 plugapi/tsconfig.json                        |  19 +++
 plugapi/tslint.json                          |   1 +
 random-seed/{random-seed.d.ts => index.d.ts} |  10 +-
 random-seed/random-seed-tests.ts             |   1 -
 random-seed/tsconfig.json                    |  19 +++
 random-seed/tslint.json                      |   1 +
 13 files changed, 240 insertions(+), 183 deletions(-)
 create mode 100644 math3d/index.d.ts
 create mode 100644 math3d/math3d-tests.ts
 delete mode 100644 math3d/math3d.d.ts
 create mode 100644 math3d/tsconfig.json
 create mode 100644 math3d/tslint.json
 rename plugapi/{plugapi.d.ts => index.d.ts} (99%)
 create mode 100644 plugapi/tsconfig.json
 create mode 100644 plugapi/tslint.json
 rename random-seed/{random-seed.d.ts => index.d.ts} (83%)
 create mode 100644 random-seed/tsconfig.json
 create mode 100644 random-seed/tslint.json

diff --git a/math3d/index.d.ts b/math3d/index.d.ts
new file mode 100644
index 0000000000..84365604ba
--- /dev/null
+++ b/math3d/index.d.ts
@@ -0,0 +1,168 @@
+// Type definitions for math3.d.ts
+// Project: https://github.com/adragonite/math3d
+// Definitions by: Laszlo Jakab <https://github.com/laszlojakab>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+
+export class Vector3 {
+    constructor(x?: number, y?: number, z?: number);
+
+    public static back: Vector3;
+    public static down: Vector3;
+    public static forward: Vector3;
+    public static left: Vector3;
+    public static one: Vector3;
+    public static right: Vector3;
+    public static up: Vector3;
+    public static zero: Vector3;
+    public static dimension: number;
+    public static FromVector4: (vector4: Vector4) => Vector3;
+
+    public homogeneous: Vector4;
+    public magnitude: number;
+    public values: number[];
+    public vector4: Vector4;
+    public x: number;
+    public y: number;
+    public z: number;
+
+    public add(vector3: Vector3): Vector3;
+    public average(vector3: Vector3): Vector3;
+    public cross(vector3: Vector3): Vector3;
+    public distanceTo(vector3: Vector3): number;
+    public dot(vector3: Vector3): number;
+    public equals(vector3: Vector3): boolean;
+    public mulScalar(scalar: Number): Vector3;
+    public negate(): Vector3;
+    public normalize(): Vector3;
+    public scale(vector3: Vector3): Vector3;
+    public sub(vector3: Vector3): Vector3;
+    public toString(): string;
+}
+
+export class Vector4 {
+    constructor(x?: number, y?: number, z?: number, w?: number);
+
+    public static one: Vector4;
+    public static zero: Vector4;
+    public static dimension: number;
+
+    public magnitude: number;
+    public values: number[];
+    public x: number;
+    public y: number;
+    public z: number;
+    public w: number;
+
+    public add(vector4: Vector4): Vector4;
+    public distanceTo(vector4: Vector4): number;
+    public dot(vector4: Vector4): number;
+    public equals(vector4: Vector4): boolean;
+    public mulScalar(scalar: Number): Vector4;
+    public negate(): Vector4;
+    public normalize(): Vector3;
+    public sub(vector4: Vector4): Vector3;
+    public toString(): string;
+}
+
+export class Quaternion {
+    constructor(x?: number, y?: number, z?: number, w?: number);
+    public static Euler(x?: number, y?: number, z?: number): Quaternion;
+    public static AngleAxis(axis: Vector3, angle: number): Quaternion;
+
+    public static identity: Quaternion;
+    public static zero: Quaternion;
+
+    public angleAxis: { axis: Vector3, angle: number };
+    public eulerAngles: { x: number, y: number, z: number };
+    public x: number;
+    public y: number;
+    public z: number;
+    public w: number;
+
+    public angleTo(quaternion: Quaternion): number;
+    public conjugate(): Quaternion;
+    public distanceTo(quaternion: Quaternion): number;
+    public dot(quaternion: Quaternion): number;
+    public equals(quaternion: Quaternion): boolean;
+    public inverse(): Quaternion;
+    public mul(quaternion: Quaternion): Quaternion;
+    public mulVector3(vector3: Vector3): Vector3;
+    public toString(): string;
+}
+
+export class Matrix4x4 {
+    constructor(data: number[]);
+
+    public static FlipMatrix(flipX: boolean, flipY: boolean, flipZ: boolean): Matrix4x4;
+    public static ScaleMatrix(scale: number | Vector3): Matrix4x4;
+    public static RotationMatrix(quaternion: Quaternion): Matrix4x4;
+    public static TranslationMatrix(translation: Vector3): Matrix4x4;
+    public static TRS(translation: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+    public static LocalToWorldMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+    public static WorldToLocalMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+
+    public static identity: Matrix4x4;
+    public static zero: Matrix4x4;
+
+    public columns: number[][];
+    public m11: number;
+    public m12: number;
+    public m13: number;
+    public m14: number;
+    public m21: number;
+    public m22: number;
+    public m23: number;
+    public m24: number;
+    public m31: number;
+    public m32: number;
+    public m33: number;
+    public m34: number;
+    public m41: number;
+    public m42: number;
+    public m43: number;
+    public m44: number;
+    public rows: number[][];
+    public size: { rows: number, columns: number };
+    public values: number[];
+
+    public determinant(): number
+    public inverse(): Matrix4x4;
+    public negate(): Matrix4x4;
+    public transpose(): Matrix4x4;
+    public add(matrix4x4: Matrix4x4): Matrix4x4;
+    public sub(matrix4x4: Matrix4x4): Matrix4x4;
+    public mul(matrix4x4: Matrix4x4): Matrix4x4;
+    public mulScalar(scalar: Number): Matrix4x4;
+    public mulVector3(vector3: Vector3): Vector3;
+}
+
+export class Transform {
+    constructor(position?: Vector3, rotation?: Quaternion);
+
+    public forward: Vector3;
+    public localPosition: Vector3;
+    public localRotation: Quaternion;
+    public localToWorldMatrix: Matrix4x4;
+    public name: string;
+    public parent: Transform;
+    public position: Vector3;
+    public right: Vector3;
+    public root: Transform;
+    public rotation: Vector3;
+    public up: Vector3;
+    public worldToLocalMatrix: Matrix4x4;
+
+    public addChild(child: Transform): void;
+    public inverseTransformPosition(position: Vector3): Vector3;
+    public removeChild(child: Transform): void;
+    public transformPosition(position: Vector3): Vector3;
+    public translate(translation: Vector3, relativeTo?: Transform.Space): Transform;
+    public rotate(x: number, y: number, z: number, relativeTo?: Transform.Space): Transform;
+}
+
+export module Transform {
+    export enum Space {
+        Self,
+        World
+    }
+}
diff --git a/math3d/math3d-tests.ts b/math3d/math3d-tests.ts
new file mode 100644
index 0000000000..d04ddbefb9
--- /dev/null
+++ b/math3d/math3d-tests.ts
@@ -0,0 +1,7 @@
+import * as math3d from 'math3d';
+const v = new math3d.Vector3(1, 2, 3);
+v.add(new math3d.Vector3(0, 0, 1));
+new math3d.Matrix4x4([1,1,1,1,
+                      2,2,2,2,
+                      3,3,3,3,
+                      4,4,4,4]);
diff --git a/math3d/math3d.d.ts b/math3d/math3d.d.ts
deleted file mode 100644
index 4d89db48ac..0000000000
--- a/math3d/math3d.d.ts
+++ /dev/null
@@ -1,170 +0,0 @@
-// Type definitions for math3.d.ts
-// Project: https://github.com/adragonite/math3d
-// Definitions by: Laszlo Jakab <https://github.com/laszlojakab>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
-
-declare module "math3d" {
-    export class Vector3 {
-        constructor(x?: number, y?: number, z?: number);
-
-        public static back: Vector3;
-        public static down: Vector3;
-        public static forward: Vector3;
-        public static left: Vector3;
-        public static one: Vector3;
-        public static right: Vector3;
-        public static up: Vector3;
-        public static zero: Vector3;
-        public static dimension: number;
-        public static FromVector4: (vector4: Vector4) => Vector3;
-
-        public homogeneous: Vector4;
-        public magnitude: number;
-        public values: number[];
-        public vector4: Vector4;
-        public x: number;
-        public y: number;
-        public z: number;
-
-        public add(vector3: Vector3): Vector3;
-        public average(vector3: Vector3): Vector3;
-        public cross(vector3: Vector3): Vector3;
-        public distanceTo(vector3: Vector3): number;
-        public dot(vector3: Vector3): number;
-        public equals(vector3: Vector3): boolean;
-        public mulScalar(scalar: Number): Vector3;
-        public negate(): Vector3;
-        public normalize(): Vector3;
-        public scale(vector3: Vector3): Vector3;
-        public sub(vector3: Vector3): Vector3;
-        public toString(): string;
-    }
-
-    export class Vector4 {
-        constructor(x?: number, y?: number, z?: number, w?: number);
-
-        public static one: Vector4;
-        public static zero: Vector4;
-        public static dimension: number;
-
-        public magnitude: number;
-        public values: number[];
-        public x: number;
-        public y: number;
-        public z: number;
-        public w: number;
-
-        public add(vector4: Vector4): Vector4;
-        public distanceTo(vector4: Vector4): number;
-        public dot(vector4: Vector4): number;
-        public equals(vector4: Vector4): boolean;
-        public mulScalar(scalar: Number): Vector4;
-        public negate(): Vector4;
-        public normalize(): Vector3;
-        public sub(vector4: Vector4): Vector3;
-        public toString(): string;
-    }
-
-    export class Quaternion {
-        constructor(x?: number, y?: number, z?: number, w?: number);
-        public static Euler(x?: number, y?: number, z?: number): Quaternion;
-        public static AngleAxis(axis: Vector3, angle: number): Quaternion;
-
-        public static identity: Quaternion;
-        public static zero: Quaternion;
-
-        public angleAxis: { axis: Vector3, angle: number };
-        public eulerAngles: { x: number, y: number, z: number };
-        public x: number;
-        public y: number;
-        public z: number;
-        public w: number;
-
-        public angleTo(quaternion: Quaternion): number;
-        public conjugate(): Quaternion;
-        public distanceTo(quaternion: Quaternion): number;
-        public dot(quaternion: Quaternion): number;
-        public equals(quaternion: Quaternion): boolean;
-        public inverse(): Quaternion;
-        public mul(quaternion: Quaternion): Quaternion;
-        public mulVector3(vector3: Vector3): Vector3;
-        public toString(): string;
-    }
-
-    export class Matrix4x4 {
-        constructor(data: number[]);
-
-        public static FlipMatrix(flipX: boolean, flipY: boolean, flipZ: boolean): Matrix4x4;
-        public static ScaleMatrix(scale: number | Vector3): Matrix4x4;
-        public static RotationMatrix(quaternion: Quaternion): Matrix4x4;
-        public static TranslationMatrix(translation: Vector3): Matrix4x4;
-        public static TRS(translation: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
-        public static LocalToWorldMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
-        public static WorldToLocalMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
-
-        public static identity: Matrix4x4;
-        public static zero: Matrix4x4;
-
-        public columns: number[][];
-        public m11: number;
-        public m12: number;
-        public m13: number;
-        public m14: number;
-        public m21: number;
-        public m22: number;
-        public m23: number;
-        public m24: number;
-        public m31: number;
-        public m32: number;
-        public m33: number;
-        public m34: number;
-        public m41: number;
-        public m42: number;
-        public m43: number;
-        public m44: number;
-        public rows: number[][];
-        public size: { rows: number, columns: number };
-        public values: number[];
-
-        public determinant(): number
-        public inverse(): Matrix4x4;
-        public negate(): Matrix4x4;
-        public transpose(): Matrix4x4;
-        public add(matrix4x4: Matrix4x4): Matrix4x4;
-        public sub(matrix4x4: Matrix4x4): Matrix4x4;
-        public mul(matrix4x4: Matrix4x4): Matrix4x4;
-        public mulScalar(scalar: Number): Matrix4x4;
-        public mulVector3(vector3: Vector3): Vector3;
-    }
-
-    export class Transform {
-        constructor(position?: Vector3, rotation?: Quaternion);
-
-        public forward: Vector3;
-        public localPosition: Vector3;
-        public localRotation: Quaternion;
-        public localToWorldMatrix: Matrix4x4;
-        public name: string;
-        public parent: Transform;
-        public position: Vector3;
-        public right: Vector3;
-        public root: Transform;
-        public rotation: Vector3;
-        public up: Vector3;
-        public worldToLocalMatrix: Matrix4x4;
-
-        public addChild(child: Transform): void;
-        public inverseTransformPosition(position: Vector3): Vector3;
-        public removeChild(child: Transform): void;
-        public transformPosition(position: Vector3): Vector3;
-        public translate(translation: Vector3, relativeTo?: Transform.Space): Transform;
-        public rotate(x: number, y: number, z: number, relativeTo?: Transform.Space): Transform;
-    }
-
-    export module Transform {
-        export enum Space {
-            Self,
-            World
-        }
-    }
-}
diff --git a/math3d/tsconfig.json b/math3d/tsconfig.json
new file mode 100644
index 0000000000..2f4e358aaf
--- /dev/null
+++ b/math3d/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "math3d-tests.ts"
+    ]
+}
diff --git a/math3d/tslint.json b/math3d/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/math3d/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/plugapi/plugapi.d.ts b/plugapi/index.d.ts
similarity index 99%
rename from plugapi/plugapi.d.ts
rename to plugapi/index.d.ts
index 90351ac53a..bb8b656fac 100644
--- a/plugapi/plugapi.d.ts
+++ b/plugapi/index.d.ts
@@ -2,7 +2,6 @@
 // Project: https://www.npmjs.com/package/plugapi
 // Definitions by: Brice Theurillat <https://github.com/BNedry/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
 declare module "plugapi" {
     interface PlugLogin {
         email: string;
@@ -417,4 +416,4 @@ declare module "plugapi" {
 
     var PlugAPI: PlugAPIStatic;
     export = PlugAPI;
-}
\ No newline at end of file
+}
diff --git a/plugapi/plugapi-tests.ts b/plugapi/plugapi-tests.ts
index 279a5b659d..17197f9c1a 100644
--- a/plugapi/plugapi-tests.ts
+++ b/plugapi/plugapi-tests.ts
@@ -1,5 +1,3 @@
-/// <reference path="./plugapi.d.ts" />
-
 import * as PlugAPI from "plugapi";
 
 new PlugAPI({
@@ -32,4 +30,4 @@ new PlugAPI({
     } else {
         console.log("Error initializing plugAPI: " + err);
     }
-});
\ No newline at end of file
+});
diff --git a/plugapi/tsconfig.json b/plugapi/tsconfig.json
new file mode 100644
index 0000000000..36b84a69c2
--- /dev/null
+++ b/plugapi/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "plugapi-tests.ts"
+    ]
+}
diff --git a/plugapi/tslint.json b/plugapi/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/plugapi/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }
diff --git a/random-seed/random-seed.d.ts b/random-seed/index.d.ts
similarity index 83%
rename from random-seed/random-seed.d.ts
rename to random-seed/index.d.ts
index 2dcb02d1e6..cdd63a140c 100644
--- a/random-seed/random-seed.d.ts
+++ b/random-seed/index.d.ts
@@ -3,9 +3,7 @@
 // Definitions by: Endel Dreyer <https://github.com/endel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare module "random-seed" {
-
-  export interface RandomSeed {
+export interface RandomSeed {
     range (range: number): number;
     random (): number;
     floatBetween (min: number, max: number): number;
@@ -21,8 +19,6 @@ declare module "random-seed" {
     initState (): void;
 
     done (): void;
-  }
-
-  export function create (seed?: string): RandomSeed;
-
 }
+
+export function create (seed?: string): RandomSeed;
diff --git a/random-seed/random-seed-tests.ts b/random-seed/random-seed-tests.ts
index de49c65e45..9eb399eff5 100644
--- a/random-seed/random-seed-tests.ts
+++ b/random-seed/random-seed-tests.ts
@@ -1,4 +1,3 @@
-/// <reference path="./random-seed.d.ts" />
 import { RandomSeed, create } from "random-seed";
 
 // these generators produce different numbers
diff --git a/random-seed/tsconfig.json b/random-seed/tsconfig.json
new file mode 100644
index 0000000000..19bb011f0d
--- /dev/null
+++ b/random-seed/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "strictNullChecks": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "random-seed-tests.ts"
+    ]
+}
diff --git a/random-seed/tslint.json b/random-seed/tslint.json
new file mode 100644
index 0000000000..377cc837d4
--- /dev/null
+++ b/random-seed/tslint.json
@@ -0,0 +1 @@
+{ "extends": "../tslint.json" }

From a8662b0fe8b6b2181c94294fea426eac1873251b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Tue, 22 Nov 2016 10:33:26 -0800
Subject: [PATCH 231/245] Fix lint (and fully upgrade plugapi to 2.0)

---
 math3d/index.d.ts        | 246 +++++++++++++++++++--------------------
 plugapi/index.d.ts       | 213 +++++++++++++++++----------------
 plugapi/plugapi-tests.ts |   2 +-
 3 files changed, 229 insertions(+), 232 deletions(-)

diff --git a/math3d/index.d.ts b/math3d/index.d.ts
index 84365604ba..8981aaf1a9 100644
--- a/math3d/index.d.ts
+++ b/math3d/index.d.ts
@@ -6,161 +6,161 @@
 export class Vector3 {
     constructor(x?: number, y?: number, z?: number);
 
-    public static back: Vector3;
-    public static down: Vector3;
-    public static forward: Vector3;
-    public static left: Vector3;
-    public static one: Vector3;
-    public static right: Vector3;
-    public static up: Vector3;
-    public static zero: Vector3;
-    public static dimension: number;
-    public static FromVector4: (vector4: Vector4) => Vector3;
+    static back: Vector3;
+    static down: Vector3;
+    static forward: Vector3;
+    static left: Vector3;
+    static one: Vector3;
+    static right: Vector3;
+    static up: Vector3;
+    static zero: Vector3;
+    static dimension: number;
+    static FromVector4: (vector4: Vector4) => Vector3;
 
-    public homogeneous: Vector4;
-    public magnitude: number;
-    public values: number[];
-    public vector4: Vector4;
-    public x: number;
-    public y: number;
-    public z: number;
+    homogeneous: Vector4;
+    magnitude: number;
+    values: number[];
+    vector4: Vector4;
+    x: number;
+    y: number;
+    z: number;
 
-    public add(vector3: Vector3): Vector3;
-    public average(vector3: Vector3): Vector3;
-    public cross(vector3: Vector3): Vector3;
-    public distanceTo(vector3: Vector3): number;
-    public dot(vector3: Vector3): number;
-    public equals(vector3: Vector3): boolean;
-    public mulScalar(scalar: Number): Vector3;
-    public negate(): Vector3;
-    public normalize(): Vector3;
-    public scale(vector3: Vector3): Vector3;
-    public sub(vector3: Vector3): Vector3;
-    public toString(): string;
+    add(vector3: Vector3): Vector3;
+    average(vector3: Vector3): Vector3;
+    cross(vector3: Vector3): Vector3;
+    distanceTo(vector3: Vector3): number;
+    dot(vector3: Vector3): number;
+    equals(vector3: Vector3): boolean;
+    mulScalar(scalar: number): Vector3;
+    negate(): Vector3;
+    normalize(): Vector3;
+    scale(vector3: Vector3): Vector3;
+    sub(vector3: Vector3): Vector3;
+    toString(): string;
 }
 
 export class Vector4 {
     constructor(x?: number, y?: number, z?: number, w?: number);
 
-    public static one: Vector4;
-    public static zero: Vector4;
-    public static dimension: number;
+    static one: Vector4;
+    static zero: Vector4;
+    static dimension: number;
 
-    public magnitude: number;
-    public values: number[];
-    public x: number;
-    public y: number;
-    public z: number;
-    public w: number;
+    magnitude: number;
+    values: number[];
+    x: number;
+    y: number;
+    z: number;
+    w: number;
 
-    public add(vector4: Vector4): Vector4;
-    public distanceTo(vector4: Vector4): number;
-    public dot(vector4: Vector4): number;
-    public equals(vector4: Vector4): boolean;
-    public mulScalar(scalar: Number): Vector4;
-    public negate(): Vector4;
-    public normalize(): Vector3;
-    public sub(vector4: Vector4): Vector3;
-    public toString(): string;
+    add(vector4: Vector4): Vector4;
+    distanceTo(vector4: Vector4): number;
+    dot(vector4: Vector4): number;
+    equals(vector4: Vector4): boolean;
+    mulScalar(scalar: number): Vector4;
+    negate(): Vector4;
+    normalize(): Vector3;
+    sub(vector4: Vector4): Vector3;
+    toString(): string;
 }
 
 export class Quaternion {
     constructor(x?: number, y?: number, z?: number, w?: number);
-    public static Euler(x?: number, y?: number, z?: number): Quaternion;
-    public static AngleAxis(axis: Vector3, angle: number): Quaternion;
+    static Euler(x?: number, y?: number, z?: number): Quaternion;
+    static AngleAxis(axis: Vector3, angle: number): Quaternion;
 
-    public static identity: Quaternion;
-    public static zero: Quaternion;
+    static identity: Quaternion;
+    static zero: Quaternion;
 
-    public angleAxis: { axis: Vector3, angle: number };
-    public eulerAngles: { x: number, y: number, z: number };
-    public x: number;
-    public y: number;
-    public z: number;
-    public w: number;
+    angleAxis: { axis: Vector3, angle: number };
+    eulerAngles: { x: number, y: number, z: number };
+    x: number;
+    y: number;
+    z: number;
+    w: number;
 
-    public angleTo(quaternion: Quaternion): number;
-    public conjugate(): Quaternion;
-    public distanceTo(quaternion: Quaternion): number;
-    public dot(quaternion: Quaternion): number;
-    public equals(quaternion: Quaternion): boolean;
-    public inverse(): Quaternion;
-    public mul(quaternion: Quaternion): Quaternion;
-    public mulVector3(vector3: Vector3): Vector3;
-    public toString(): string;
+    angleTo(quaternion: Quaternion): number;
+    conjugate(): Quaternion;
+    distanceTo(quaternion: Quaternion): number;
+    dot(quaternion: Quaternion): number;
+    equals(quaternion: Quaternion): boolean;
+    inverse(): Quaternion;
+    mul(quaternion: Quaternion): Quaternion;
+    mulVector3(vector3: Vector3): Vector3;
+    toString(): string;
 }
 
 export class Matrix4x4 {
     constructor(data: number[]);
 
-    public static FlipMatrix(flipX: boolean, flipY: boolean, flipZ: boolean): Matrix4x4;
-    public static ScaleMatrix(scale: number | Vector3): Matrix4x4;
-    public static RotationMatrix(quaternion: Quaternion): Matrix4x4;
-    public static TranslationMatrix(translation: Vector3): Matrix4x4;
-    public static TRS(translation: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
-    public static LocalToWorldMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
-    public static WorldToLocalMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+    static FlipMatrix(flipX: boolean, flipY: boolean, flipZ: boolean): Matrix4x4;
+    static ScaleMatrix(scale: number | Vector3): Matrix4x4;
+    static RotationMatrix(quaternion: Quaternion): Matrix4x4;
+    static TranslationMatrix(translation: Vector3): Matrix4x4;
+    static TRS(translation: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+    static LocalToWorldMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
+    static WorldToLocalMatrix(position: Vector3, rotation: Quaternion, scale: number | Vector3): Matrix4x4;
 
-    public static identity: Matrix4x4;
-    public static zero: Matrix4x4;
+    static identity: Matrix4x4;
+    static zero: Matrix4x4;
 
-    public columns: number[][];
-    public m11: number;
-    public m12: number;
-    public m13: number;
-    public m14: number;
-    public m21: number;
-    public m22: number;
-    public m23: number;
-    public m24: number;
-    public m31: number;
-    public m32: number;
-    public m33: number;
-    public m34: number;
-    public m41: number;
-    public m42: number;
-    public m43: number;
-    public m44: number;
-    public rows: number[][];
-    public size: { rows: number, columns: number };
-    public values: number[];
+    columns: number[][];
+    m11: number;
+    m12: number;
+    m13: number;
+    m14: number;
+    m21: number;
+    m22: number;
+    m23: number;
+    m24: number;
+    m31: number;
+    m32: number;
+    m33: number;
+    m34: number;
+    m41: number;
+    m42: number;
+    m43: number;
+    m44: number;
+    rows: number[][];
+    size: { rows: number, columns: number };
+    values: number[];
 
-    public determinant(): number
-    public inverse(): Matrix4x4;
-    public negate(): Matrix4x4;
-    public transpose(): Matrix4x4;
-    public add(matrix4x4: Matrix4x4): Matrix4x4;
-    public sub(matrix4x4: Matrix4x4): Matrix4x4;
-    public mul(matrix4x4: Matrix4x4): Matrix4x4;
-    public mulScalar(scalar: Number): Matrix4x4;
-    public mulVector3(vector3: Vector3): Vector3;
+    determinant(): number
+    inverse(): Matrix4x4;
+    negate(): Matrix4x4;
+    transpose(): Matrix4x4;
+    add(matrix4x4: Matrix4x4): Matrix4x4;
+    sub(matrix4x4: Matrix4x4): Matrix4x4;
+    mul(matrix4x4: Matrix4x4): Matrix4x4;
+    mulScalar(scalar: number): Matrix4x4;
+    mulVector3(vector3: Vector3): Vector3;
 }
 
 export class Transform {
     constructor(position?: Vector3, rotation?: Quaternion);
 
-    public forward: Vector3;
-    public localPosition: Vector3;
-    public localRotation: Quaternion;
-    public localToWorldMatrix: Matrix4x4;
-    public name: string;
-    public parent: Transform;
-    public position: Vector3;
-    public right: Vector3;
-    public root: Transform;
-    public rotation: Vector3;
-    public up: Vector3;
-    public worldToLocalMatrix: Matrix4x4;
+    forward: Vector3;
+    localPosition: Vector3;
+    localRotation: Quaternion;
+    localToWorldMatrix: Matrix4x4;
+    name: string;
+    parent: Transform;
+    position: Vector3;
+    right: Vector3;
+    root: Transform;
+    rotation: Vector3;
+    up: Vector3;
+    worldToLocalMatrix: Matrix4x4;
 
-    public addChild(child: Transform): void;
-    public inverseTransformPosition(position: Vector3): Vector3;
-    public removeChild(child: Transform): void;
-    public transformPosition(position: Vector3): Vector3;
-    public translate(translation: Vector3, relativeTo?: Transform.Space): Transform;
-    public rotate(x: number, y: number, z: number, relativeTo?: Transform.Space): Transform;
+    addChild(child: Transform): void;
+    inverseTransformPosition(position: Vector3): Vector3;
+    removeChild(child: Transform): void;
+    transformPosition(position: Vector3): Vector3;
+    translate(translation: Vector3, relativeTo?: Transform.Space): Transform;
+    rotate(x: number, y: number, z: number, relativeTo?: Transform.Space): Transform;
 }
 
-export module Transform {
+export namespace Transform {
     export enum Space {
         Self,
         World
diff --git a/plugapi/index.d.ts b/plugapi/index.d.ts
index bb8b656fac..794fa01d46 100644
--- a/plugapi/index.d.ts
+++ b/plugapi/index.d.ts
@@ -2,20 +2,21 @@
 // Project: https://www.npmjs.com/package/plugapi
 // Definitions by: Brice Theurillat <https://github.com/BNedry/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-declare module "plugapi" {
-    interface PlugLogin {
+declare namespace PlugAPI {
+
+    export interface PlugLogin {
         email: string;
         password: string;
     }
 
-    interface Notification {
+    export interface Notification {
         action: string;
         id: number;
         timestamp: string;
         value: string;
     }
 
-    interface RawChatMessage {
+    export interface RawChatMessage {
         cid: string;
         message: string;
         sub: number;
@@ -23,7 +24,7 @@ declare module "plugapi" {
         un: string;
     }
 
-    interface Media {
+    export interface Media {
         author: string;
         format: number;
         image: string;
@@ -33,7 +34,7 @@ declare module "plugapi" {
         id: number;
     }
 
-    interface Score {
+    export interface Score {
         positive: number;
         listeners: number;
         grabs: number;
@@ -41,23 +42,23 @@ declare module "plugapi" {
         skipped: number;
     }
 
-    interface LastPlay {
+    export interface LastPlay {
         dj: User.DJ;
         media: Media;
         score: Score;
     }
 
-    interface FollowJoinData {
+    export interface FollowJoinData {
         r: number;
         un: string;
         id: string;
     }
 
-    interface LogObject {
+    export interface LogObject {
         log: () => void;
     }
 
-    namespace User {
+    export namespace User {
         interface Default {
             username: string;
             language: string;
@@ -109,7 +110,7 @@ declare module "plugapi" {
         }
     }
 
-    namespace Enum {
+    export namespace Enum {
         interface RoomRole {
             NONE: number;
             RESIDENTDJ: number;
@@ -216,36 +217,36 @@ declare module "plugapi" {
         }
     }
 
-    namespace Event {
+    export namespace Event {
         interface BoothCycle {
             moderator: string;
             cycle: boolean;
         }
-        
+
         interface BoothLocked {
             m: string;
             c: boolean;
             ml: string;
             f: boolean;
         }
-        
+
         interface Chat {
             raw: RawChatMessage;
             id: string;
             from: User.User;
             message: string;
-            mentions: Array<any>;
+            mentions: any[];
             muted: boolean;
             type: string;
         }
-        
+
         interface ChatDelete {
             mi: number;
             chatID: string;
         }
-        
+
         type Grab = number;
-        
+
         interface Advance {
             media: Media;
             startTime: string;
@@ -255,12 +256,12 @@ declare module "plugapi" {
             playlistID: number;
             lastPlay: LastPlay;
         }
-        
+
         interface DJListUpdate {
             djs: User.DJ[];
             remove: string;
         }
-        
+
         interface Emote {
             fromID: string;
             message: string;
@@ -268,17 +269,17 @@ declare module "plugapi" {
             type: string;
             chatID: string;
         }
-        
+
         interface FollowJoin {
             data: FollowJoinData;
             type: string;
         }
-        
+
         interface ModAddDJ {
             moderator: string;
             username: string;
         }
-        
+
         interface ModBan {
             moderator: string;
             username: string;
@@ -286,37 +287,37 @@ declare module "plugapi" {
             ref: string;
             reason: string;
         }
-        
+
         interface ModMoveDJ {
             moderator: string;
             index: number;
             old: number;
             userID: string;
         }
-        
+
         interface ModRemoveDJ {
             moderator: string;
             username: string;
             userID: string;
         }
-        
+
         interface ModSkip {
             mi: number;
             m: string;
         }
-        
+
         interface RoomMinChatLevelUpdate {
             level: number;
             id: number;
             user: User.User;
         }
-        
+
         type RoomJoin = string;
-        
+
         type UserJoin = User.User;
-        
+
         type UserLeave = User.User;
-        
+
         interface UserUpdate {
             username: string;
             status: number;
@@ -329,91 +330,87 @@ declare module "plugapi" {
             curatorPoints: number;
             djPoints: number;
         }
-        
+
         interface Vote {
             i: number;
             v: number;
         }
-        
+
         interface Command extends Event.Chat {
             command: string;
             args: string[];
-            respond: Function;
-            respondTimeout: Function;
-            havePermission: Function;
-            isFrom: Function;
+            respond: (...args: any[]) => any;
+            respondTimeout: (...args: any[]) => any;
+            havePermission: (...args: any[]) => boolean;
+            isFrom: (...args: any[]) => boolean;
         }
     }
 
-    interface PlugAPIInstance {
-        deleteAllChat: boolean;
-        multiLine: boolean;
-        multiLineLimit: number;
-
-        connect(room: string): void;
-        changeDJCycle(enabled: boolean, callback?: () => void): boolean;
-        changeRoom(room: string, callback?: () => void): void;
-        close(): void;
-        getAdmins(): User.Extended[];
-        getAmbassadors(): User.Extended[];
-        getAudience(): User.Audience[];
-        getDJ(): User.DJ;
-        getDJs(): User.DJ[];
-        getHost(): User.Extended;
-        getMedia(): Media;
-        getRoomScore(): Score;
-        getSelf(): User.Audience;
-        getStaff(): User.Extended[];
-        getTimeElapsed(): number;
-        getTimeRemaining(): number;
-        getUser(userID: number): User.DJ;
-        getUsers(): User.DJ[];
-        getWaitList(): User.Extended;
-        getWaitListPosition(userID: number): number;
-        havePermission(userID: number, permission: number, global?: boolean): boolean;
-        joinBooth(callback?: () => void): boolean;
-        leaveBooth(callback?: () => void): boolean;
-        selfSkip(callback?: () => void): boolean;
-        sendChat(msg: string, timeout?: number): void;
-        setLogger(logObject: LogObject): boolean;
-
-        on(event: "boothCycle", callback: (data: Event.BoothCycle) => void): void;
-        on(event: "boothLocked", callback: (data: Event.BoothLocked) => void): void;
-        on(event: "chat", callback: (data: Event.Chat) => void): void;
-        on(event: "chatDelete", callback: (data: Event.ChatDelete) => void): void;
-        on(event: "grab", callback: (data: Event.Grab) => void): void;
-        on(event: "advance", callback: (data: Event.Advance) => void): void;
-        on(event: "djListUpdate", callback: (data: Event.DJListUpdate) => void): void;
-        on(event: "emote", callback: (data: Event.Emote) => void): void;
-        on(event: "followJoin", callback: (data: Event.FollowJoin) => void): void;
-        on(event: "modAddDJ", callback: (data: Event.ModAddDJ) => void): void;
-        on(event: "modBan", callback: (data: Event.ModBan) => void): void;
-        on(event: "modMoveDJ", callback: (data: Event.ModMoveDJ) => void): void;
-        on(event: "modRemoveDJ", callback: (data: Event.ModRemoveDJ) => void): void;
-        on(event: "modSkip", callback: (data: Event.ModSkip) => void): void;
-        on(event: "roomMinChatLevelUpdate", callback: (data: Event.RoomMinChatLevelUpdate) => void): void;
-        on(event: "roomJoin", callback: (data: Event.RoomJoin) => void): void;
-        on(event: "userJoin", callback: (data: Event.UserJoin) => void): void;
-        on(event: "userLeave", callback: (data: Event.UserLeave) => void): void;
-        on(event: "userUpdate", callback: (data: Event.UserUpdate) => void): void;
-        on(event: "vote", callback: (data: Event.Vote) => void): void;
-        on(event: "command", callback: (data: Event.Command) => void): void;
-        on(event: string, callback: (data: any) => void): void;
-    }
-
-    interface PlugAPIStatic {
-        new (login: PlugLogin, callback?: (error: Error, bot: PlugAPIInstance) => void): PlugAPIInstance;
-        new (login: PlugLogin, callback?: (bot: PlugAPIInstance) => void): PlugAPIInstance;
-        ROOM_ROLE: Enum.RoomRole;
-        GLOBAL_ROLES: Enum.GlobalRole;
-        STATUS: Enum.Status;
-        BAN: Enum.Ban;
-        BAN_REASON: Enum.BanReason;
-        MUTE: Enum.Mute;
-        MUTE_REASON: Enum.MuteReason;
-        events: Enum.Events;
-    }
-
-    var PlugAPI: PlugAPIStatic;
-    export = PlugAPI;
+    export var ROOM_ROLE: Enum.RoomRole;
+    export var GLOBAL_ROLES: Enum.GlobalRole;
+    export var STATUS: Enum.Status;
+    export var BAN: Enum.Ban;
+    export var BAN_REASON: Enum.BanReason;
+    export var MUTE: Enum.Mute;
+    export var MUTE_REASON: Enum.MuteReason;
+    export var events: Enum.Events;
 }
+
+declare class PlugAPI {
+    constructor(login: PlugAPI.PlugLogin, callback?: (error: Error, bot: PlugAPI) => void);
+    constructor(login: PlugAPI.PlugLogin, callback?: (bot: PlugAPI) => void);
+    deleteAllChat: boolean;
+    multiLine: boolean;
+    multiLineLimit: number;
+
+    connect(room: string): void;
+    changeDJCycle(enabled: boolean, callback?: () => void): boolean;
+    changeRoom(room: string, callback?: () => void): void;
+    close(): void;
+    getAdmins(): PlugAPI.User.Extended[];
+    getAmbassadors(): PlugAPI.User.Extended[];
+    getAudience(): PlugAPI.User.Audience[];
+    getDJ(): PlugAPI.User.DJ;
+    getDJs(): PlugAPI.User.DJ[];
+    getHost(): PlugAPI.User.Extended;
+    getMedia(): PlugAPI.Media;
+    getRoomScore(): PlugAPI.Score;
+    getSelf(): PlugAPI.User.Audience;
+    getStaff(): PlugAPI.User.Extended[];
+    getTimeElapsed(): number;
+    getTimeRemaining(): number;
+    getUser(userID: number): PlugAPI.User.DJ;
+    getUsers(): PlugAPI.User.DJ[];
+    getWaitList(): PlugAPI.User.Extended;
+    getWaitListPosition(userID: number): number;
+    havePermission(userID: number, permission: number, global?: boolean): boolean;
+    joinBooth(callback?: () => void): boolean;
+    leaveBooth(callback?: () => void): boolean;
+    selfSkip(callback?: () => void): boolean;
+    sendChat(msg: string, timeout?: number): void;
+    setLogger(logObject: PlugAPI.LogObject): boolean;
+
+    on(event: "boothCycle", callback: (data: PlugAPI.Event.BoothCycle) => void): void;
+    on(event: "boothLocked", callback: (data: PlugAPI.Event.BoothLocked) => void): void;
+    on(event: "chat", callback: (data: PlugAPI.Event.Chat) => void): void;
+    on(event: "chatDelete", callback: (data: PlugAPI.Event.ChatDelete) => void): void;
+    on(event: "grab", callback: (data: PlugAPI.Event.Grab) => void): void;
+    on(event: "advance", callback: (data: PlugAPI.Event.Advance) => void): void;
+    on(event: "djListUpdate", callback: (data: PlugAPI.Event.DJListUpdate) => void): void;
+    on(event: "emote", callback: (data: PlugAPI.Event.Emote) => void): void;
+    on(event: "followJoin", callback: (data: PlugAPI.Event.FollowJoin) => void): void;
+    on(event: "modAddDJ", callback: (data: PlugAPI.Event.ModAddDJ) => void): void;
+    on(event: "modBan", callback: (data: PlugAPI.Event.ModBan) => void): void;
+    on(event: "modMoveDJ", callback: (data: PlugAPI.Event.ModMoveDJ) => void): void;
+    on(event: "modRemoveDJ", callback: (data: PlugAPI.Event.ModRemoveDJ) => void): void;
+    on(event: "modSkip", callback: (data: PlugAPI.Event.ModSkip) => void): void;
+    on(event: "roomMinChatLevelUpdate", callback: (data: PlugAPI.Event.RoomMinChatLevelUpdate) => void): void;
+    on(event: "roomJoin", callback: (data: PlugAPI.Event.RoomJoin) => void): void;
+    on(event: "userJoin", callback: (data: PlugAPI.Event.UserJoin) => void): void;
+    on(event: "userLeave", callback: (data: PlugAPI.Event.UserLeave) => void): void;
+    on(event: "userUpdate", callback: (data: PlugAPI.Event.UserUpdate) => void): void;
+    on(event: "vote", callback: (data: PlugAPI.Event.Vote) => void): void;
+    on(event: "command", callback: (data: PlugAPI.Event.Command) => void): void;
+    on(event: string, callback: (data: any) => void): void;
+}
+export = PlugAPI;
diff --git a/plugapi/plugapi-tests.ts b/plugapi/plugapi-tests.ts
index 17197f9c1a..d9a0845997 100644
--- a/plugapi/plugapi-tests.ts
+++ b/plugapi/plugapi-tests.ts
@@ -1,4 +1,4 @@
-import * as PlugAPI from "plugapi";
+import PlugAPI = require("plugapi");
 
 new PlugAPI({
     email: "",

From 0514660017f931e31d84de41929a385a8330ecd5 Mon Sep 17 00:00:00 2001
From: Andrey Kurdyumov <kant2002@gmail.com>
Date: Wed, 23 Nov 2016 12:40:31 +0600
Subject: [PATCH 232/245] Add missing onError

See http://knockoutjs.com/documentation/asynchronous-error-handling.html for justification
---
 knockout/index.d.ts | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/knockout/index.d.ts b/knockout/index.d.ts
index 3db35f7578..a4ca8573ae 100644
--- a/knockout/index.d.ts
+++ b/knockout/index.d.ts
@@ -587,6 +587,12 @@ interface KnockoutStatic {
     /////////////////////////////////
 
     tasks: KnockoutTasks;
+    
+    /////////////////////////////////
+    // utils.js
+    /////////////////////////////////
+
+    onError: (error: Error) => any;
 }
 
 interface KnockoutBindingProvider {

From 1377fae49d0bc202c9f9580a1b1bcf869f330f67 Mon Sep 17 00:00:00 2001
From: "ali.ibrahim" <ali.ibrahim@thomsonreuters.com>
Date: Wed, 23 Nov 2016 14:40:48 +0100
Subject: [PATCH 233/245] Fixing type declaration for the headers property of
 net.IncomingMessage.

---
 electron/index.d.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/electron/index.d.ts b/electron/index.d.ts
index d55b47df4c..864c9991eb 100644
--- a/electron/index.d.ts
+++ b/electron/index.d.ts
@@ -2913,7 +2913,9 @@ declare namespace Electron {
 		 * - Each header name produces an array-valued property on the headers object.
 		 * - Each header value is pushed into the array associated with its header name.
 		 */
-		headers: Headers;
+		headers: {
+			[key: string]: string[]
+		};
 		/**
 		 * A string indicating the HTTP protocol version number. Typical values are ‘1.0’ or ‘1.1’.
 		 */

From 6d1d3060813f59e23c816d8f96c08d8f5d97b264 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 23 Nov 2016 11:12:28 -0800
Subject: [PATCH 234/245] Make `IAnimateService.closeAndFlush` return void

---
 angular-mocks/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/angular-mocks/index.d.ts b/angular-mocks/index.d.ts
index b14cf70a3b..8aa172e293 100644
--- a/angular-mocks/index.d.ts
+++ b/angular-mocks/index.d.ts
@@ -311,7 +311,7 @@ declare module 'angular' {
       /**
        * This method will close all pending animations (both Javascript and CSS) and it will also flush any remaining animation frames and/or callbacks.
        */
-      closeAndFlush();
+      closeAndFlush(): void;
 
       /**
        * This method is used to flush the pending callbacks and animation frames to either start an animation or conclude an animation. Note that this will not actually close an actively running animation (see `closeAndFlush()` for that).

From 17716416accb146650fb09850b4fadbc76874251 Mon Sep 17 00:00:00 2001
From: Grant Nestor <grantnestor@gmail.com>
Date: Wed, 23 Nov 2016 11:15:01 -0800
Subject: [PATCH 235/245] Fix `shouldExpandNode` type for react-json-tree

---
 react-json-tree/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/react-json-tree/index.d.ts b/react-json-tree/index.d.ts
index 2721604f3b..dd20fdb6e6 100644
--- a/react-json-tree/index.d.ts
+++ b/react-json-tree/index.d.ts
@@ -15,7 +15,7 @@ export interface JSONTreeProps extends Props<JSONTreeComponent> {
     invertTheme?: boolean;
     keyPath?: [string | number];
     sortObjectKeys?: Function | boolean;
-    shouldExpandNode?: (keyName: string, data: [any] | {}, level: number) => boolean;
+    shouldExpandNode?: (keyPath: (string | number)[], data: [any] | {}, level: number) => boolean;
     getItemString?: (type: string, data: [any] | {}, itemType: string, itemString: string) => JSX.Element;
     labelRenderer?: (raw: [string, string]) => JSX.Element;
     valueRenderer?: (raw: string) => JSX.Element;

From ed0ef6e409b56c6b01a8a1ebcece5d6c5b2d681f Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 13:49:04 -0800
Subject: [PATCH 236/245] Rename "stats" to "stats.js"

---
 {stats => stats.js}/index.d.ts                     | 0
 stats/stats-tests.ts => stats.js/stats.js-tests.ts | 0
 {stats => stats.js}/tsconfig.json                  | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename {stats => stats.js}/index.d.ts (100%)
 rename stats/stats-tests.ts => stats.js/stats.js-tests.ts (100%)
 rename {stats => stats.js}/tsconfig.json (92%)

diff --git a/stats/index.d.ts b/stats.js/index.d.ts
similarity index 100%
rename from stats/index.d.ts
rename to stats.js/index.d.ts
diff --git a/stats/stats-tests.ts b/stats.js/stats.js-tests.ts
similarity index 100%
rename from stats/stats-tests.ts
rename to stats.js/stats.js-tests.ts
diff --git a/stats/tsconfig.json b/stats.js/tsconfig.json
similarity index 92%
rename from stats/tsconfig.json
rename to stats.js/tsconfig.json
index 65aba4f5c6..033ca3099f 100644
--- a/stats/tsconfig.json
+++ b/stats.js/tsconfig.json
@@ -14,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "stats-tests.ts"
+        "stats.js-tests.ts"
     ]
 }
\ No newline at end of file

From 0294941be7105f32508e8db736527241e37acb6f Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 23 Nov 2016 15:07:53 -0800
Subject: [PATCH 237/245] Re-do @SONIC3D commit e4c0114

---
 dat-gui/index.d.ts | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/dat-gui/index.d.ts b/dat-gui/index.d.ts
index 7d1e2147d7..a38699e0bb 100644
--- a/dat-gui/index.d.ts
+++ b/dat-gui/index.d.ts
@@ -43,20 +43,15 @@ declare namespace dat {
         updateDisplay(): void;
 
         // gui properties in dat/gui/GUI.js
-        parent(): GUI;
-        scrollable(): boolean;
-        autoPlace(): boolean;
-        preset(): string;
-        preset(s: string): void;
-        width(): number;
-        width(n: number): void;
-        name(): string;
-        name(s: string): void;
-        closed(): boolean;
-        closed(b: boolean): void;
-        load(): Object;
-        useLocalStorage(): boolean;
-        useLocalStorage(b: boolean): void;
+        readonly parent: GUI;
+        readonly scrollable: boolean;
+        readonly autoPlace: boolean;
+        preset: string;
+        width: number;
+        name: string;
+        closed: boolean;
+        readonly load: Object;
+        useLocalStorage: boolean;
     }
 
     export interface GUIParams{

From a077e4d2e4145119e286b7b3d5dd79a8d90c022f Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 12:43:27 -0800
Subject: [PATCH 238/245] db.js types should declare the "db.js" module, not
 "db"

---
 db.js/db.js-tests.ts |  2 +-
 db.js/index.d.ts     | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/db.js/db.js-tests.ts b/db.js/db.js-tests.ts
index e7fb297aed..169d5725d1 100644
--- a/db.js/db.js-tests.ts
+++ b/db.js/db.js-tests.ts
@@ -1,4 +1,4 @@
-// Test file for db.js Definition file
+import db = require("db.js");
 
 /* Type for use in tests */
 
diff --git a/db.js/index.d.ts b/db.js/index.d.ts
index 83e21fa529..fa962dc0a3 100644
--- a/db.js/index.d.ts
+++ b/db.js/index.d.ts
@@ -7,7 +7,7 @@ declare module DbJs {
     interface ErrorListener {
         (err: Error): void;
     }
-    
+
     interface OpenOptions {
         server: string;
         version: number;
@@ -29,14 +29,14 @@ declare module DbJs {
     interface CountableQuery<T> {
         count(): ExecutableQuery<T>;
     }
-    
+
     interface KeysQuery<T> extends DescableQuery<T>, ExecutableQuery<T>, FilterableQuery<T>, DistinctableQuery<T>, MappableQuery<T>    {
-    } 
+    }
 
     interface KeyableQuery<T> {
         keys(): KeysQuery<T>;
     }
-    
+
     interface FilterQuery<T> extends KeyableQuery<T>, ExecutableQuery<T>, FilterableQuery<T>, DescableQuery<T>, DistinctableQuery<T>, ModifiableQuery<T>, LimitableQuery<T>, MappableQuery<T> {
     }
 
@@ -44,14 +44,14 @@ declare module DbJs {
         filter<TValue>(index: string, value: TValue): FilterQuery<T>;
         filter(filter: (value: T) => boolean): FilterQuery<T>;
     }
-    
-    interface DescQuery<T> extends KeyableQuery<T>, CountableQuery<T>, ExecutableQuery<T>, FilterableQuery<T>, DescableQuery<T>, ModifiableQuery<T>, MappableQuery<T> {    
+
+    interface DescQuery<T> extends KeyableQuery<T>, CountableQuery<T>, ExecutableQuery<T>, FilterableQuery<T>, DescableQuery<T>, ModifiableQuery<T>, MappableQuery<T> {
     }
 
     interface DescableQuery<T> {
         desc(): DescQuery<T>;
     }
-    
+
     interface DistinctQuery<T> extends KeyableQuery<T>, ExecutableQuery<T>, FilterableQuery<T>, DescableQuery<T>, ModifiableQuery<T>, MappableQuery<T>, CountableQuery<T> {
     }
 
@@ -71,7 +71,7 @@ declare module DbJs {
     interface MappableQuery<T> {
         map<TMap>(fn: (value: T) => TMap): Query<TMap>;
     }
-    
+
     interface Query<T> extends Promise<T>, KeyableQuery<T>, ExecutableQuery<T>, FilterableQuery<T>, DescableQuery<T>, DistinctableQuery<T>, ModifiableQuery<T>, LimitableQuery<T>, MappableQuery<T>, CountableQuery<T> {
     }
 
@@ -93,11 +93,11 @@ declare module DbJs {
         getIndexedDB(): IDBDatabase;
         close(): void;
     }
-    
+
     interface IndexAccessibleServer {
         [store: string]: TypedObjectStoreServer<any>;
     }
-    
+
     interface ObjectStoreServer {
         add<T>(table: string, entity: T): Promise<T>;
         add<T>(table: string, ...entities: T[]): Promise<T[]>;
@@ -142,11 +142,11 @@ declare module DbJs {
         query(index: string): IndexQuery<T>;
         count(key: any): Promise<number>;
     }
-    
+
     type Server = DbJs.IndexAccessibleServer & DbJs.ObjectStoreServer & DbJs.BaseServer;
 }
 
-declare module "db" {
+declare module "db.js" {
     var db: DbJs.DbJsStatic;
     export = db;
 }

From f89b8d87ba0bdd7c746c1bac53cf866a3c7480ab Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 12:32:23 -0800
Subject: [PATCH 239/245] Convert algoliasearch to a module

---
 .../algoliasearch-client-js-tests.ts          |    3 +-
 algoliasearch-client-js/index.d.ts            | 3085 ++++++++---------
 algoliasearch-client-js/tsconfig.json         |    2 +-
 3 files changed, 1524 insertions(+), 1566 deletions(-)

diff --git a/algoliasearch-client-js/algoliasearch-client-js-tests.ts b/algoliasearch-client-js/algoliasearch-client-js-tests.ts
index 82d57c55e0..a3a04aadc2 100644
--- a/algoliasearch-client-js/algoliasearch-client-js-tests.ts
+++ b/algoliasearch-client-js/algoliasearch-client-js-tests.ts
@@ -1,5 +1,6 @@
-
 import algoliasearch = require('algoliasearch');
+import { ClientOptions, SynonymOption, AlgoliaUserKeyOptions, SearchSynonymOptions,
+    AlgoliaSecuredApiOptions, AlgoliaIndexSettings, AlgoliaQueryParameters, AlgoliaIndex } from "algoliasearch";
 
 var _clientOptions: ClientOptions = {
     timeout : 12,
diff --git a/algoliasearch-client-js/index.d.ts b/algoliasearch-client-js/index.d.ts
index b0eeb9968b..582e91999b 100644
--- a/algoliasearch-client-js/index.d.ts
+++ b/algoliasearch-client-js/index.d.ts
@@ -3,1569 +3,1526 @@
 // Definitions by: Baptiste Coquelle <https://github.com/cbaptiste>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface AlgoliaResponse {
-    /**
-     * Contains all the hits matching the query
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    hits: any[];
-    /**
-     * Current page
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    page: number;
-    /**
-     * Number of total hits matching the query
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    nbHits: number;
-    /**
-     * Number of pages
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    nbPage: number;
-    /**
-     * Number of hits per pages
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    hitsPerPage: number;
-    /**
-     * Engine processing time (excluding network transfer)
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    processingTimeMS: number;
-    /**
-     * Query used to perform the search
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    query: string;
-    /**
-     * GET parameters used to perform the search
-     * https://github.com/algolia/algoliasearch-client-js#response-format
-     */
-    params: string;
-}
-/*
- Interface for the algolia client object
- */
-interface AlgoliaClient {
-    /**
-     * Initialization of the index
-     * @param name: index name
-     * return algolia index object
-     * https://github.com/algolia/algoliasearch-client-js#init-index---initindex
-     */
-    initIndex(name: string): AlgoliaIndex;
-    /**
-     * Query on multiple index
-     * @param queries index name, query and query parameters
-     * @param cb callback(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
-     */
-    search(queries: { indexName: string, query: string, options: AlgoliaQueryParameters }, cb: (err: Error, res: any) => void): void;
-    /**
-     * Query on multiple index
-     * @param queries index name, query and query parameters
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
-     */
-    search(queries: { indexName: string, query: string, options: AlgoliaQueryParameters }): Promise<AlgoliaResponse>;
-    /**
-     * clear browser cache
-     * https://github.com/algolia/algoliasearch-client-js#cache
-     */
-    clearCache(): void;
-    /**
-     * kill alive connections
-     * https://github.com/algolia/algoliasearch-client-js#keep-alive
-     */
-    destroy(): void;
-    /**
-     * List all your indices along with their associated information (number of entries, disk size, etc.)
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
-     */
-    listIndexes(cb: (err: Error, res: any) => void): void;
-    /**
-     * List all your indices along with their associated information (number of entries, disk size, etc.)
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
-     */
-    listIndexes(): Promise<any>;
-    /**
-     * Delete a specific index
-     * @param name
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
-     */
-    deleteIndex(name: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Delete a specific index
-     * @param name
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
-     */
-    deleteIndex(name: string): Promise<any>;
-    /**
-     * Copy an  index from a specific index to a new one
-     * @param from origin index
-     * @param to destination index
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
-     */
-    copyIndex(from: string, to: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Copy an  index from a specific index to a new one
-     * @param from origin index
-     * @param to destination index
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
-     */
-    copyIndex(from: string, to: string): Promise<any>;
-    /**
-     * Move index to a new one (and will overwrite the original one)
-     * @param from origin index
-     * @param to destination index
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
-     */
-    moveIndex(from: string, to: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Move index to a new one (and will overwrite the original one)
-     * @param from origin index
-     * @param to destination index
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
-     */
-    moveIndex(from: string, to: string): Promise<any>;
-    /**
-     * Generate a public API key
-     * @param key api key
-     * @param filters
-     * https://github.com/algolia/algoliasearch-client-js#generate-key---generatesecuredapikey
-     */
-    generateSecuredApiKey(key: string, filters: AlgoliaSecuredApiOptions): void;
-    /**
-     * Perform multiple operations with one API call to reduce latency
-     * @param action
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-     */
-    batch(action: AlgoliaAction, cb: (err: Error, res: any) => void): void;
-    /**
-     * Perform multiple operations with one API call to reduce latency
-     * @param action
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-     */
-    batch(action: AlgoliaAction): Promise<any>;
-    /**
-     * Lists global API Keys
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-     */
-    listUserKeys(cb: (err: Error, res: any) => void): void;
-    /**
-     * Lists global API Keys
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-     */
-    listUserKeys(): Promise<any>;
-    /**
-     * Add global API Keys
-     * @param scopes
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[], cb: (err: Error, res: any) => void): void;
-    /**
-     * Add global API Keys
-     * @param scopes
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[]): Promise<any>;
-    /**
-     * Add global API Key
-     * @param scopes
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-    /**
-     * Add global API Key
-     * @param scopes
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[], options: AlgoliaUserKeyOptions): Promise<any>;
-    /**
-     * Update global API key
-     * @param key
-     * @param scopes
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[], cb: (err: Error, res: any) => void): void;
-    /**
-     * Update global API key
-     * @param key
-     * @param scopes
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[]): Promise<any>;
-    /**
-     * Update global API key
-     * @param key
-     * @param scopes
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-    /**
-     * Update global API key
-     * @param key
-     * @param scopes
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions): Promise<any>;
-    /**
-     * Gets the rights of a global key
-     * @param key
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    getUserKeyACL(key: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Gets the rights of a global key
-     * @param key
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    getUserKeyACL(key: string): Promise<any>;
-    /**
-     * Deletes a global key
-     * @param key
-     * @param cb(err,res)
-     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-     */
-    deleteUserKey(key: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Deletes a global key
-     * @param key
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-     */
-    deleteUserKey(key: string): Promise<any>;
-    /**
-     * Get 1000 last events
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-     */
-    getLogs(options: LogsOptions, cb: (err: Error, res: any) => void): void;
-    /**
-     * Get 1000 last events
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-     */
-    getLogs(options: LogsOptions): Promise<any>;
-}
-/**
- * Interface for the index algolia object
- */
-interface AlgoliaIndex {
-    /**
-     * Gets a specific object
-     * @param objectID
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-     */
-    getObject(objectID: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Gets specific attributes from an object
-     * @param objectID
-     * @param attributes
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-     */
-    getObject(objectID: string, attributes: string[], cb: (err: Error, res: any) => void): void;
-    /**
-     * Gets a list of objects
-     * @param objectIDs
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-     */
-    getObjects(objectIDs: string[], cb: (err: Error, res: any) => void): void;
-    /**
-     * Add a specific object
-     * @param object without objectID
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-     */
-    addObject(object: {}, cb: (err: Error, res: any) => void): void;
-    /**
-     * Add a list of objects
-     * @param object with objectID
-     * @param objectID
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-     */
-    addObject(object: {}, objectID: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Add list of objects
-     * @param objects
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-     */
-    addObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
-    /**
-     * Add or replace a specific object
-     * @param object
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    saveObject(object: {}, cb: (err: Error, res: any) => void): void;
-    /**
-     * Add or replace several objects
-     * @param objects
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    saveObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
-    /**
-     * Update parameters of a specific object
-     * @param object
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    partialUpdateObject(object: {}, cb: (err: Error, res: any) => void): void;
-    /**
-     * Update parameters of a list of objects
-     * @param objects
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    partialUpdateObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
-    /**
-     * Delete a specific object
-     * @param objectID
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-     */
-    deleteObject(objectID: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Delete a list of objects
-     * @param objectIDs
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-     */
-    deleteObjects(objectIDs: string[], cb: (err: Error, res: any) => void): void;
-    /**
-     * Delete objects that matches the query
-     * @param query
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
-     */
-    deleteByQuery(query: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Delete objects that matches the query
-     * @param query
-     * @param params of the object
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
-     */
-    deleteByQuery(query: string, params: {}, cb: (err: Error, res: any) => void): void;
-    /**
-     * Wait for an indexing task to be compete
-     * @param taskID
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
-     */
-    waitTask(taskID: number, cb: (err: Error, res: any) => void): void;
-    /**
-     * Get an index settings
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
-     */
-    getSettings(cb: (err: Error, res: any) => void): void;
-    /**
-     * Set an index settings
-     * @param settings
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
-     */
-    setSettings(settings: AlgoliaIndexSettings, cb: (err: Error, res: any) => void): void;
-    /**
-     * Clear cache of an index
-     * https://github.com/algolia/algoliasearch-client-js#cache
-     */
-    clearCache(): void;
-    /**
-     * Clear an index content
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
-     */
-    clearIndex(cb: (err: Error, res: any) => void): void;
-    /**
-     * Save a synonym object
-     * @param synonym
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-     */
-    saveSynonym(synonym: AlgoliaSynonym, option: SynonymOption, cb: (err: Error, res: any) => void): void;
-    /**
-     * Save a synonym object
-     * @param synonyms
-     * @param options
-     * @param cb(err, res)
-     */
-    batchSynonyms(synonyms: AlgoliaSynonym[], options: SynonymOption, cb: (err: Error, res: any) => void): void;
-    /**
-     * Delete a specific synonym
-     * @param identifier
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
-     */
-    deleteSynonym(identifier: string, options: SynonymOption, cb: (err: Error, res: any) => void): void;
-    /**
-     * Clear all synonyms of an index
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
-     */
-    clearSynonyms(options: SynonymOption, cb: (err: Error, res: any) => void): void;
-    /**
-     * Get a specific synonym
-     * @param identifier
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
-     */
-    getSynonym(identifier: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Search a synonyms
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-     */
-    searchSynonyms(options: SearchSynonymOptions, cb: (err: Error, res: any) => void): void;
-    /**
-     * List index user keys
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
-     */
-    listUserKeys(cb: (err: Error, res: any) => void): void;
-    /**
-     * Add key for this index
-     * @param scopes
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[], cb: (err: Error, res: any) => void): void;
-    /**
-     * Add key for this index
-     * @param scopes
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-    /**
-     * Update a key for this index
-     * @param key
-     * @param scopes
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[], cb: (err: Error, res: any) => void): void;
-    /**
-     * Update a key for this index
-     * @param key
-     * @param scopes
-     * @param options
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
-    /**
-     * Gets the rights of an index specific key
-     * @param key
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getuserkeyacl
-     */
-    getUserKeyACL(key: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Deletes an index specific key
-     * @param key
-     * @param cb(err, res)
-     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-     */
-    deleteUserKey(key: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Gets a specific object
-     * @param objectID
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-     */
-    getObject(objectID: string): Promise<any> ;
-    /**
-     * Gets specific attributes from an object
-     * @param objectID
-     * @param attributes
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-     */
-    getObject(objectID: string, attributes: string[]): Promise<any> ;
-    /**
-     * Gets a list of objects
-     * @param objectIDs
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
-     */
-    getObjects(objectIDs: string[]): Promise<any> ;
-    /**
-     * Add a specific object
-     * @param object without objectID
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-     */
-    addObject(object: {}): Promise<any> ;
-    /**
-     * Add a list of objects
-     * @param object with objectID
-     * @param objectID
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-     */
-    addObject(object: {}, objectID: string): Promise<any> ;
-    /**
-     * Add list of objects
-     * @param objects
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
-     */
-    addObjects(objects: [{}]): Promise<any> ;
-    /**
-     * Add or replace a specific object
-     * @param object
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    saveObject(object: {}): Promise<any> ;
-    /**
-     * Add or replace several objects
-     * @param objects
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    saveObjects(objects: [{}]): Promise<any> ;
-    /**
-     * Update parameters of a specific object
-     * @param object
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    partialUpdateObject(object: {}): Promise<any> ;
-    /**
-     * Update parameters of a list of objects
-     * @param objects
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
-     */
-    partialUpdateObjects(objects: [{}]): Promise<any> ;
-    /**
-     * Delete a specific object
-     * @param objectID
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-     */
-    deleteObject(objectID: string): Promise<any> ;
-    /**
-     * Delete a list of objects
-     * @param objectIDs
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
-     */
-    deleteObjects(objectIDs: string[]): Promise<any> ;
-    /**
-     * Delete objects that matches the query
-     * @param query
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
-     */
-    deleteByQuery(query: string): Promise<any> ;
-    /**
-     * Delete objects that matches the query
-     * @param query
-     * @param params of the object
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
-     */
-    deleteByQuery(query: string, params: {}): Promise<any> ;
-    /**
-     * Wait for an indexing task to be compete
-     * @param taskID
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
-     */
-    waitTask(taskID: number): Promise<any> ;
-    /**
-     * Get an index settings
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
-     */
-    getSettings(): Promise<any> ;
-    /**
-     * Set an index settings
-     * @param settings
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
-     */
-    setSettings(settings: AlgoliaIndexSettings): Promise<any> ;
-    /**
-     * Search in an index
-     * @param params query parameter
-     * return {Promise}
-     * @param err() error callback
-     * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
-     */
-    search(params: AlgoliaQueryParameters): Promise<any> ;
-    /**
-     * Search in an index
-     * @param params query parameter
-     * @param cb(err, res)
-     * @param err() error callback
-     * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
-     */
-    search(params: AlgoliaQueryParameters, cb: (err: Error, res: any) => void): void;
-    /**
-     * Browse an index
-     * @param query
-     * @param cb(err, content)
-     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-     */
-    browse(query: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Browse an index
-     * @param query
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-     */
-    browse(query: string): Promise<AlgoliaBrowseResponse>;
-    /**
-     * Browse an index from a cursor
-     * @param cursor
-     * @param cb(err, content)
-     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-     */
-    browseFrom(cursor: string, cb: (err: Error, res: any) => void): void;
-    /**
-     * Browse an index from a cursor
-     * @param cursor
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-     */
-    browseFrom(cursor: string): Promise<AlgoliaBrowseResponse>;
-    /**
-     * Browse an entire index
-     * return Promise
-     * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
-     */
-    browseAll(): Promise<AlgoliaResponse>;
-    /**
-     * Clear an index content
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
-     */
-    clearIndex(): Promise<any> ;
-    /**
-     * Save a synonym object
-     * @param synonym
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-     */
-    saveSynonym(synonym: AlgoliaSynonym, option: SynonymOption): Promise<any> ;
-    /**
-     * Save a synonym object
-     * @param synonyms
-     * @param options
-     * return {Promise}
-     */
-    batchSynonyms(synonyms: AlgoliaSynonym[], options: SynonymOption): Promise<any> ;
-    /**
-     * Delete a specific synonym
-     * @param identifier
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
-     */
-    deleteSynonym(identifier: string, options: SynonymOption): Promise<any> ;
-    /**
-     * Clear all synonyms of an index
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
-     */
-    clearSynonyms(options: SynonymOption): Promise<any> ;
-    /**
-     * Get a specific synonym
-     * @param identifier
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
-     */
-    getSynonym(identifier: string): Promise<any> ;
-    /**
-     * Search a synonyms
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-     */
-    searchSynonyms(options: SearchSynonymOptions): Promise<any> ;
-    /**
-     * List index user keys
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
-     */
-    listUserKeys(): Promise<any> ;
-    /**
-     * Add key for this index
-     * @param scopes
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[]): Promise<any> ;
-    /**
-     * Add key for this index
-     * @param scopes
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    addUserKey(scopes: string[], options: AlgoliaUserKeyOptions): Promise<any> ;
-    /**
-     * Update a key for this index
-     * @param key
-     * @param scopes
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[]): Promise<any> ;
-    /**
-     * Update a key for this index
-     * @param key
-     * @param scopes
-     * @param options
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
-     */
-    updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions): Promise<any> ;
-    /**
-     * Gets the rights of an index specific key
-     * @param key
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getuserkeyacl
-     */
-    getUserKeyACL(key: string): Promise<any> ;
-    /**
-     * Deletes an index specific key
-     * @param key
-     * return {Promise}
-     * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
-     */
-    deleteUserKey(key: string): Promise<any> ;
-}
-/*
- Interface describing available options when initializing a client
- */
-interface ClientOptions {
-    /**
-     * Timeout for requests to our servers, in milliseconds
-     * default: 15s (node), 2s (browser)
-     * https://github.com/algolia/algoliasearch-client-js#client-options
-     */
-    timeout?: number;
-    /**
-     * Protocol to use when communicating with algolia
-     * default: current protocol(browser), https(node)
-     * https://github.com/algolia/algoliasearch-client-js#client-options
-     */
-    protocol?: string;
-    /**
-     * (node only) httpAgent instance to use when communicating with Algolia servers.
-     * https://github.com/algolia/algoliasearch-client-js#client-options
-     */
-    httpAgent?: any;
-    /**
-     * read: array of read hosts to use to call Algolia servers, computed automatically
-     * write: array of read hosts to use to call Algolia servers, computed automatically
-     * https://github.com/algolia/algoliasearch-client-js#client-options
-     */
-    hosts?: { read?: string[], write?: string[] };
-}
-/*
- Interface describing options available for gettings the logs
- */
-interface LogsOptions {
-    /**
-     * Specify the first entry to retrieve (0-based, 0 is the most recent log entry).
-     * default: 0
-     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-     */
-    offset?: number;
-    /**
-     * Specify the maximum number of entries to retrieve starting at the offset.
-     * default: 10
-     * maximum: 1000
-     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-     */
-    length?: number;
-    /**
-     * @deprecated
-     * Retrieve only logs with an HTTP code different than 200 or 201
-     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-     */
-    onlyErrors?: boolean;
-    /**
-     * Specify the type of logs to retrieve
-     * 'query' Retrieve only the queries
-     * 'build' Retrieve only the build operations
-     * 'error' Retrieve only the errors (same as onlyErrors parameters)
-     * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
-     */
-        type?: string;
-}
-/**
- * Describe the action object used for batch operation
- */
-interface AlgoliaAction {
-    /**
-     * Type of the batch action
-     * values: addObject, updateObject, partialUpdateObject, partialUpdateObjectNoCreate, deleteObject
-     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-     */
-    action: string;
-    /**
-     * Name of the index where the bact will be performed
-     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-     */
-    indexName: string;
-    /**
-     * Object
-     * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
-     */
-    body: {};
-}
-/**
- * Describes the option used when creating user key
- */
-interface AlgoliaUserKeyOptions {
-    /**
-     * Add a validity period. The key will be valid for a specific period of time (in seconds).
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    validity?: number;
-    /**
-     * Specify the maximum number of API calls allowed from an IP address per hour
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    maxQueriesPerIPPerHour?: number;
-    /**
-     * Specify the maximum number of hits this API key can retrieve in one call
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    maxHitsPerQuery?: boolean;
-    /**
-     * Specify the list of targeted indices
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    indexes?: string[];
-    /**
-     * Specify the list of referers
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    referers?: string[];
-    /**
-     * Specify the list of query parameters
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    queryParameters?: AlgoliaQueryParameters;
-    /**
-     * Specify a description to describe where the key is used.
-     * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
-     */
-    description?: string;
-}
-/**
- * Describes option used when making operation on synonyms
- */
-interface SynonymOption {
-    /**
-     * You can forward all settings updates to the slaves of an index
-     * https://github.com/algolia/algoliasearch-client-js#slave-settings
-     */
-    forwardToSlaves?: boolean;
-    /**
-     * Replace all existing synonyms on the index with the content of the batch
-     * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
-     */
-    replaceExistingSynonyms?: boolean;
-}
-/**
- * Describes options used when searching for synonyms
- */
-interface SearchSynonymOptions {
-    /**
-     * The actual search query to find synonyms
-     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-     */
-    query?: string;
-    /**
-     * The page to fetch when browsing through several pages of results
-     * default: 100
-     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-     */
-    page?: number;
-    /**
-     * Restrict the search to a specific type of synonym
-     * Use an empty string to search all types (default behavior)
-     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-     */
-        type?: string;
-    /**
-     * Number of hits per page
-     * default: 100
-     * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
-     */
-    hitsPerPage?: number
-}
-interface AlgoliaBrowseResponse {
-    cursor?: string,
-    hits: any[],
-    params: string,
-    query: string,
-    processingTimeMS: number
-}
-/**
- * Describes a synonym object
- */
-interface AlgoliaSynonym {
-    /**
-     * ObjectID of the synonym
-     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-     */
-    objectID: string;
-    /**
-     * Type of synonym
-     * values: synonym,oneWaySynonym
-     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-     */
-        type: string;
-    /**
-     * Values used for the synonym
-     * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
-     */
-    synonyms: string[];
-}
-/**
- * Describes the options used when generating new api keys
- */
-interface AlgoliaSecuredApiOptions {
-    /**
-     * Filter the query with numeric, facet or/and tag filters
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#filters-1
-     */
-    filters?: string;
-    /**
-     * Defines the expiration date of the API key
-     * https://github.com/algolia/algoliasearch-client-js#valid-until
-     */
-    validUntil?: number;
-    /**
-     * Restricts the key to a list of index names allowed for the secured API key
-     * https://github.com/algolia/algoliasearch-client-js#index-restriction
-     */
-    restrictIndices?: string;
-    /**
-     * Allows you to restrict a single user to performing a maximum of N API calls per hour
-     * https://github.com/algolia/algoliasearch-client-js#user-rate-limiting
-     */
-    userToken?: string;
+declare namespace algoliasearch {
+    interface AlgoliaResponse {
+        /**
+         * Contains all the hits matching the query
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        hits: any[];
+        /**
+         * Current page
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        page: number;
+        /**
+         * Number of total hits matching the query
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        nbHits: number;
+        /**
+         * Number of pages
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        nbPage: number;
+        /**
+         * Number of hits per pages
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        hitsPerPage: number;
+        /**
+         * Engine processing time (excluding network transfer)
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        processingTimeMS: number;
+        /**
+         * Query used to perform the search
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        query: string;
+        /**
+         * GET parameters used to perform the search
+         * https://github.com/algolia/algoliasearch-client-js#response-format
+         */
+        params: string;
+    }
+    /*
+    Interface for the algolia client object
+    */
+    interface AlgoliaClient {
+        /**
+         * Initialization of the index
+         * @param name: index name
+         * return algolia index object
+         * https://github.com/algolia/algoliasearch-client-js#init-index---initindex
+         */
+        initIndex(name: string): AlgoliaIndex;
+        /**
+         * Query on multiple index
+         * @param queries index name, query and query parameters
+         * @param cb callback(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
+         */
+        search(queries: { indexName: string, query: string, options: AlgoliaQueryParameters }, cb: (err: Error, res: any) => void): void;
+        /**
+         * Query on multiple index
+         * @param queries index name, query and query parameters
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#multiple-queries---multiplequeries
+         */
+        search(queries: { indexName: string, query: string, options: AlgoliaQueryParameters }): Promise<AlgoliaResponse>;
+        /**
+         * clear browser cache
+         * https://github.com/algolia/algoliasearch-client-js#cache
+         */
+        clearCache(): void;
+        /**
+         * kill alive connections
+         * https://github.com/algolia/algoliasearch-client-js#keep-alive
+         */
+        destroy(): void;
+        /**
+         * List all your indices along with their associated information (number of entries, disk size, etc.)
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
+         */
+        listIndexes(cb: (err: Error, res: any) => void): void;
+        /**
+         * List all your indices along with their associated information (number of entries, disk size, etc.)
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#list-indices---listindexes
+         */
+        listIndexes(): Promise<any>;
+        /**
+         * Delete a specific index
+         * @param name
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
+         */
+        deleteIndex(name: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Delete a specific index
+         * @param name
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#delete-index---deleteindex
+         */
+        deleteIndex(name: string): Promise<any>;
+        /**
+         * Copy an  index from a specific index to a new one
+         * @param from origin index
+         * @param to destination index
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
+         */
+        copyIndex(from: string, to: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Copy an  index from a specific index to a new one
+         * @param from origin index
+         * @param to destination index
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#copy-index---copyindex
+         */
+        copyIndex(from: string, to: string): Promise<any>;
+        /**
+         * Move index to a new one (and will overwrite the original one)
+         * @param from origin index
+         * @param to destination index
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
+         */
+        moveIndex(from: string, to: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Move index to a new one (and will overwrite the original one)
+         * @param from origin index
+         * @param to destination index
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#move-index---moveindex
+         */
+        moveIndex(from: string, to: string): Promise<any>;
+        /**
+         * Generate a public API key
+         * @param key api key
+         * @param filters
+         * https://github.com/algolia/algoliasearch-client-js#generate-key---generatesecuredapikey
+         */
+        generateSecuredApiKey(key: string, filters: AlgoliaSecuredApiOptions): void;
+        /**
+         * Perform multiple operations with one API call to reduce latency
+         * @param action
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+         */
+        batch(action: AlgoliaAction, cb: (err: Error, res: any) => void): void;
+        /**
+         * Perform multiple operations with one API call to reduce latency
+         * @param action
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+         */
+        batch(action: AlgoliaAction): Promise<any>;
+        /**
+         * Lists global API Keys
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+         */
+        listUserKeys(cb: (err: Error, res: any) => void): void;
+        /**
+         * Lists global API Keys
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+         */
+        listUserKeys(): Promise<any>;
+        /**
+         * Add global API Keys
+         * @param scopes
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        addUserKey(scopes: string[], cb: (err: Error, res: any) => void): void;
+        /**
+         * Add global API Key
+         * @param scopes
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        addUserKey(scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
+        /**
+         * Add global API Keys
+         * @param scopes
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        addUserKey(scopes: string[], options?: AlgoliaUserKeyOptions): Promise<any>;
+        /**
+         * Update global API key
+         * @param key
+         * @param scopes
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        updateUserKey(key: string, scopes: string[], cb: (err: Error, res: any) => void): void;
+        /**
+         * Update global API key
+         * @param key
+         * @param scopes
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
+        /**
+         * Update global API key
+         * @param key
+         * @param scopes
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        updateUserKey(key: string, scopes: string[], options?: AlgoliaUserKeyOptions): Promise<any>;
+        /**
+         * Gets the rights of a global key
+         * @param key
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        getUserKeyACL(key: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Gets the rights of a global key
+         * @param key
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        getUserKeyACL(key: string): Promise<any>;
+        /**
+         * Deletes a global key
+         * @param key
+         * @param cb(err,res)
+         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
+         */
+        deleteUserKey(key: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Deletes a global key
+         * @param key
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
+         */
+        deleteUserKey(key: string): Promise<any>;
+        /**
+         * Get 1000 last events
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+         */
+        getLogs(options: LogsOptions, cb: (err: Error, res: any) => void): void;
+        /**
+         * Get 1000 last events
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+         */
+        getLogs(options: LogsOptions): Promise<any>;
+    }
+    /**
+     * Interface for the index algolia object
+     */
+    interface AlgoliaIndex {
+        /**
+         * Gets a specific object
+         * @param objectID
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+         */
+        getObject(objectID: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Gets specific attributes from an object
+         * @param objectID
+         * @param attributes
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+         */
+        getObject(objectID: string, attributes: string[], cb: (err: Error, res: any) => void): void;
+        /**
+         * Gets a list of objects
+         * @param objectIDs
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+         */
+        getObjects(objectIDs: string[], cb: (err: Error, res: any) => void): void;
+        /**
+         * Add a specific object
+         * @param object without objectID
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+         */
+        addObject(object: {}, cb: (err: Error, res: any) => void): void;
+        /**
+         * Add a list of objects
+         * @param object with objectID
+         * @param objectID
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+         */
+        addObject(object: {}, objectID: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Add list of objects
+         * @param objects
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+         */
+        addObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
+        /**
+         * Add or replace a specific object
+         * @param object
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        saveObject(object: {}, cb: (err: Error, res: any) => void): void;
+        /**
+         * Add or replace several objects
+         * @param objects
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        saveObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
+        /**
+         * Update parameters of a specific object
+         * @param object
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        partialUpdateObject(object: {}, cb: (err: Error, res: any) => void): void;
+        /**
+         * Update parameters of a list of objects
+         * @param objects
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        partialUpdateObjects(objects: [{}], cb: (err: Error, res: any) => void): void;
+        /**
+         * Delete a specific object
+         * @param objectID
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+         */
+        deleteObject(objectID: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Delete a list of objects
+         * @param objectIDs
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+         */
+        deleteObjects(objectIDs: string[], cb: (err: Error, res: any) => void): void;
+        /**
+         * Delete objects that matches the query
+         * @param query
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
+         */
+        deleteByQuery(query: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Delete objects that matches the query
+         * @param query
+         * @param params of the object
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
+         */
+        deleteByQuery(query: string, params: {}, cb: (err: Error, res: any) => void): void;
+        /**
+         * Wait for an indexing task to be compete
+         * @param taskID
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
+         */
+        waitTask(taskID: number, cb: (err: Error, res: any) => void): void;
+        /**
+         * Get an index settings
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
+         */
+        getSettings(cb: (err: Error, res: any) => void): void;
+        /**
+         * Set an index settings
+         * @param settings
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
+         */
+        setSettings(settings: AlgoliaIndexSettings, cb: (err: Error, res: any) => void): void;
+        /**
+         * Clear cache of an index
+         * https://github.com/algolia/algoliasearch-client-js#cache
+         */
+        clearCache(): void;
+        /**
+         * Clear an index content
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
+         */
+        clearIndex(cb: (err: Error, res: any) => void): void;
+        /**
+         * Save a synonym object
+         * @param synonym
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+         */
+        saveSynonym(synonym: AlgoliaSynonym, option: SynonymOption, cb: (err: Error, res: any) => void): void;
+        /**
+         * Save a synonym object
+         * @param synonyms
+         * @param options
+         * @param cb(err, res)
+         */
+        batchSynonyms(synonyms: AlgoliaSynonym[], options: SynonymOption, cb: (err: Error, res: any) => void): void;
+        /**
+         * Delete a specific synonym
+         * @param identifier
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
+         */
+        deleteSynonym(identifier: string, options: SynonymOption, cb: (err: Error, res: any) => void): void;
+        /**
+         * Clear all synonyms of an index
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
+         */
+        clearSynonyms(options: SynonymOption, cb: (err: Error, res: any) => void): void;
+        /**
+         * Get a specific synonym
+         * @param identifier
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
+         */
+        getSynonym(identifier: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Search a synonyms
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+         */
+        searchSynonyms(options: SearchSynonymOptions, cb: (err: Error, res: any) => void): void;
+        /**
+         * List index user keys
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
+         */
+        listUserKeys(cb: (err: Error, res: any) => void): void;
+        /**
+         * Add key for this index
+         * @param scopes
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        addUserKey(scopes: string[], cb: (err: Error, res: any) => void): void;
+        /**
+         * Add key for this index
+         * @param scopes
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        addUserKey(scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
+        /**
+         * Update a key for this index
+         * @param key
+         * @param scopes
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        updateUserKey(key: string, scopes: string[], cb: (err: Error, res: any) => void): void;
+        /**
+         * Update a key for this index
+         * @param key
+         * @param scopes
+         * @param options
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions, cb: (err: Error, res: any) => void): void;
+        /**
+         * Gets the rights of an index specific key
+         * @param key
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getuserkeyacl
+         */
+        getUserKeyACL(key: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Deletes an index specific key
+         * @param key
+         * @param cb(err, res)
+         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
+         */
+        deleteUserKey(key: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Gets specific attributes from an object
+         * @param objectID
+         * @param attributes
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+         */
+        getObject(objectID: string, attributes?: string[]): Promise<any> ;
+        /**
+         * Gets a list of objects
+         * @param objectIDs
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#find-by-ids---getobjects
+         */
+        getObjects(objectIDs: string[]): Promise<any> ;
+        /**
+         * Add a list of objects
+         * @param object with objectID
+         * @param objectID
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+         */
+        addObject(object: {}, objectID?: string): Promise<any> ;
+        /**
+         * Add list of objects
+         * @param objects
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#add-objects---addobjects
+         */
+        addObjects(objects: [{}]): Promise<any> ;
+        /**
+         * Add or replace a specific object
+         * @param object
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        saveObject(object: {}): Promise<any> ;
+        /**
+         * Add or replace several objects
+         * @param objects
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        saveObjects(objects: [{}]): Promise<any> ;
+        /**
+         * Update parameters of a specific object
+         * @param object
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        partialUpdateObject(object: {}): Promise<any> ;
+        /**
+         * Update parameters of a list of objects
+         * @param objects
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-objects---saveobjects
+         */
+        partialUpdateObjects(objects: [{}]): Promise<any> ;
+        /**
+         * Delete a specific object
+         * @param objectID
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+         */
+        deleteObject(objectID: string): Promise<any> ;
+        /**
+         * Delete a list of objects
+         * @param objectIDs
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#delete-objects---deleteobjects
+         */
+        deleteObjects(objectIDs: string[]): Promise<any> ;
+        /**
+         * Delete objects that matches the query
+         * @param query
+         * @param params of the object
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#delete-by-query---deletebyquery
+         */
+        deleteByQuery(query: string, params?: {}): Promise<any> ;
+        /**
+         * Wait for an indexing task to be compete
+         * @param taskID
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#wait-for-operations---waittask
+         */
+        waitTask(taskID: number): Promise<any> ;
+        /**
+         * Get an index settings
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#get-settings---getsettings
+         */
+        getSettings(): Promise<any> ;
+        /**
+         * Set an index settings
+         * @param settings
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#set-settings---setsettings
+         */
+        setSettings(settings: AlgoliaIndexSettings): Promise<any> ;
+        /**
+         * Search in an index
+         * @param params query parameter
+         * return {Promise}
+         * @param err() error callback
+         * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
+         */
+        search(params: AlgoliaQueryParameters): Promise<any> ;
+        /**
+         * Search in an index
+         * @param params query parameter
+         * @param cb(err, res)
+         * @param err() error callback
+         * https://github.com/algolia/algoliasearch-client-js#search-in-an-index---search
+         */
+        search(params: AlgoliaQueryParameters, cb: (err: Error, res: any) => void): void;
+        /**
+         * Browse an index
+         * @param query
+         * @param cb(err, content)
+         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+         */
+        browse(query: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Browse an index
+         * @param query
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+         */
+        browse(query: string): Promise<AlgoliaBrowseResponse>;
+        /**
+         * Browse an index from a cursor
+         * @param cursor
+         * @param cb(err, content)
+         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+         */
+        browseFrom(cursor: string, cb: (err: Error, res: any) => void): void;
+        /**
+         * Browse an index from a cursor
+         * @param cursor
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+         */
+        browseFrom(cursor: string): Promise<AlgoliaBrowseResponse>;
+        /**
+         * Browse an entire index
+         * return Promise
+         * https://github.com/algolia/algoliasearch-client-js#backup--export-an-index---browse
+         */
+        browseAll(): Promise<AlgoliaResponse>;
+        /**
+         * Clear an index content
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#clear-index---clearindex
+         */
+        clearIndex(): Promise<any> ;
+        /**
+         * Save a synonym object
+         * @param synonym
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+         */
+        saveSynonym(synonym: AlgoliaSynonym, option: SynonymOption): Promise<any> ;
+        /**
+         * Save a synonym object
+         * @param synonyms
+         * @param options
+         * return {Promise}
+         */
+        batchSynonyms(synonyms: AlgoliaSynonym[], options: SynonymOption): Promise<any> ;
+        /**
+         * Delete a specific synonym
+         * @param identifier
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
+         */
+        deleteSynonym(identifier: string, options: SynonymOption): Promise<any> ;
+        /**
+         * Clear all synonyms of an index
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#clear-all-synonyms---clearsynonyms
+         */
+        clearSynonyms(options: SynonymOption): Promise<any> ;
+        /**
+         * Get a specific synonym
+         * @param identifier
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#get-synonym---getsynonym
+         */
+        getSynonym(identifier: string): Promise<any> ;
+        /**
+         * Search a synonyms
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+         */
+        searchSynonyms(options: SearchSynonymOptions): Promise<any> ;
+        /**
+         * List index user keys
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#list-api-keys---listapikeys
+         */
+        listUserKeys(): Promise<any> ;
+        /**
+         * Add key for this index
+         * @param scopes
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        addUserKey(scopes: string[], options?: AlgoliaUserKeyOptions): Promise<any> ;
+        /**
+         * Update a key for this index
+         * @param key
+         * @param scopes
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        updateUserKey(key: string, scopes: string[]): Promise<any> ;
+        /**
+         * Update a key for this index
+         * @param key
+         * @param scopes
+         * @param options
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#update-user-key---updateuserkey
+         */
+        updateUserKey(key: string, scopes: string[], options: AlgoliaUserKeyOptions): Promise<any> ;
+        /**
+         * Gets the rights of an index specific key
+         * @param key
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#get-key-permissions---getuserkeyacl
+         */
+        getUserKeyACL(key: string): Promise<any> ;
+        /**
+         * Deletes an index specific key
+         * @param key
+         * return {Promise}
+         * https://github.com/algolia/algoliasearch-client-js#delete-user-key---deleteuserkey
+         */
+        deleteUserKey(key: string): Promise<any> ;
+    }
+    /*
+    Interface describing available options when initializing a client
+    */
+    interface ClientOptions {
+        /**
+         * Timeout for requests to our servers, in milliseconds
+         * default: 15s (node), 2s (browser)
+         * https://github.com/algolia/algoliasearch-client-js#client-options
+         */
+        timeout?: number;
+        /**
+         * Protocol to use when communicating with algolia
+         * default: current protocol(browser), https(node)
+         * https://github.com/algolia/algoliasearch-client-js#client-options
+         */
+        protocol?: string;
+        /**
+         * (node only) httpAgent instance to use when communicating with Algolia servers.
+         * https://github.com/algolia/algoliasearch-client-js#client-options
+         */
+        httpAgent?: any;
+        /**
+         * read: array of read hosts to use to call Algolia servers, computed automatically
+         * write: array of read hosts to use to call Algolia servers, computed automatically
+         * https://github.com/algolia/algoliasearch-client-js#client-options
+         */
+        hosts?: { read?: string[], write?: string[] };
+    }
+    /*
+    Interface describing options available for gettings the logs
+    */
+    interface LogsOptions {
+        /**
+         * Specify the first entry to retrieve (0-based, 0 is the most recent log entry).
+         * default: 0
+         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+         */
+        offset?: number;
+        /**
+         * Specify the maximum number of entries to retrieve starting at the offset.
+         * default: 10
+         * maximum: 1000
+         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+         */
+        length?: number;
+        /**
+         * @deprecated
+         * Retrieve only logs with an HTTP code different than 200 or 201
+         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+         */
+        onlyErrors?: boolean;
+        /**
+         * Specify the type of logs to retrieve
+         * 'query' Retrieve only the queries
+         * 'build' Retrieve only the build operations
+         * 'error' Retrieve only the errors (same as onlyErrors parameters)
+         * https://github.com/algolia/algoliasearch-client-js#get-logs---getlogs
+         */
+            type?: string;
+    }
+    /**
+     * Describe the action object used for batch operation
+     */
+    interface AlgoliaAction {
+        /**
+         * Type of the batch action
+         * values: addObject, updateObject, partialUpdateObject, partialUpdateObjectNoCreate, deleteObject
+         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+         */
+        action: string;
+        /**
+         * Name of the index where the bact will be performed
+         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+         */
+        indexName: string;
+        /**
+         * Object
+         * https://github.com/algolia/algoliasearch-client-js#custom-batch---batch
+         */
+        body: {};
+    }
+    /**
+     * Describes the option used when creating user key
+     */
+    interface AlgoliaUserKeyOptions {
+        /**
+         * Add a validity period. The key will be valid for a specific period of time (in seconds).
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        validity?: number;
+        /**
+         * Specify the maximum number of API calls allowed from an IP address per hour
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        maxQueriesPerIPPerHour?: number;
+        /**
+         * Specify the maximum number of hits this API key can retrieve in one call
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        maxHitsPerQuery?: boolean;
+        /**
+         * Specify the list of targeted indices
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        indexes?: string[];
+        /**
+         * Specify the list of referers
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        referers?: string[];
+        /**
+         * Specify the list of query parameters
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        queryParameters?: AlgoliaQueryParameters;
+        /**
+         * Specify a description to describe where the key is used.
+         * https://github.com/algolia/algoliasearch-client-js#add-user-key---adduserkey
+         */
+        description?: string;
+    }
+    /**
+     * Describes option used when making operation on synonyms
+     */
+    interface SynonymOption {
+        /**
+         * You can forward all settings updates to the slaves of an index
+         * https://github.com/algolia/algoliasearch-client-js#slave-settings
+         */
+        forwardToSlaves?: boolean;
+        /**
+         * Replace all existing synonyms on the index with the content of the batch
+         * https://github.com/algolia/algoliasearch-client-js#batch-synonyms---batchsynonyms
+         */
+        replaceExistingSynonyms?: boolean;
+    }
+    /**
+     * Describes options used when searching for synonyms
+     */
+    interface SearchSynonymOptions {
+        /**
+         * The actual search query to find synonyms
+         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+         */
+        query?: string;
+        /**
+         * The page to fetch when browsing through several pages of results
+         * default: 100
+         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+         */
+        page?: number;
+        /**
+         * Restrict the search to a specific type of synonym
+         * Use an empty string to search all types (default behavior)
+         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+         */
+            type?: string;
+        /**
+         * Number of hits per page
+         * default: 100
+         * https://github.com/algolia/algoliasearch-client-js#search-synonyms---searchsynonyms
+         */
+        hitsPerPage?: number;
+    }
+    interface AlgoliaBrowseResponse {
+        cursor?: string;
+        hits: any[];
+        params: string;
+        query: string;
+        processingTimeMS: number;
+    }
+    /**
+     * Describes a synonym object
+     */
+    interface AlgoliaSynonym {
+        /**
+         * ObjectID of the synonym
+         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+         */
+        objectID: string;
+        /**
+         * Type of synonym
+         * values: synonym,oneWaySynonym
+         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+         */
+            type: string;
+        /**
+         * Values used for the synonym
+         * https://github.com/algolia/algoliasearch-client-js#save-synonym---savesynonym
+         */
+        synonyms: string[];
+    }
+    /**
+     * Describes the options used when generating new api keys
+     */
+    interface AlgoliaSecuredApiOptions {
+        /**
+         * Filter the query with numeric, facet or/and tag filters
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#filters-1
+         */
+        filters?: string;
+        /**
+         * Defines the expiration date of the API key
+         * https://github.com/algolia/algoliasearch-client-js#valid-until
+         */
+        validUntil?: number;
+        /**
+         * Restricts the key to a list of index names allowed for the secured API key
+         * https://github.com/algolia/algoliasearch-client-js#index-restriction
+         */
+        restrictIndices?: string;
+        /**
+         * Allows you to restrict a single user to performing a maximum of N API calls per hour
+         * https://github.com/algolia/algoliasearch-client-js#user-rate-limiting
+         */
+        userToken?: string;
+    }
+
+    /**
+     * Describes the settings available for configure your index
+     */
+    interface AlgoliaIndexSettings {
+        /**
+         * The list of attributes you want index
+         * default: *
+         * https://github.com/algolia/algoliasearch-client-js#attributestoindex
+         */
+        attributesToIndex?: string[];
+        /**
+         * The list of attributes you want to use for faceting
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#attributesforfaceting
+         */
+        attributesforFaceting?: string[];
+        /**
+         * The list of attributes that cannot be retrieved at query time
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#unretrievableattributes
+         */
+        unretrievableAttributes?: string[];
+        /**
+         * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer
+         * default: *
+         * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
+         */
+        attributesToRetrieve?: string[];
+        /**
+         * Controls the way results are sorted
+         * default: ['typo', 'geo', 'words', 'filters', 'proximity', 'attribute', 'exact', 'custom']
+         * https://github.com/algolia/algoliasearch-client-js#ranking
+         */
+        ranking?: string[];
+        /**
+         * Lets you specify part of the ranking
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#customranking
+         */
+        customRanking?: string[];
+        /**
+         * The list of indices on which you want to replicate all write operations
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#slaves
+         */
+        slaves?: string[];
+        /**
+         * Limit the number of facet values returned for each facet
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
+         */
+        maxValuesPerFacet?: string;
+        /**
+         * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
+         */
+        attributesToHighlight?: string[];
+        /**
+         * Default list of attributes to snippet alongside the number of words to return
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
+         */
+        attributesToSnippet?: string[];
+        /**
+         * Specify the string that is inserted before the highlighted parts in the query result
+         * default: <em>
+         * https://github.com/algolia/algoliasearch-client-js#highlightpretag
+         */
+        highlightPreTag?: string;
+        /**
+         * Specify the string that is inserted after the highlighted parts in the query result
+         * default: </em>
+         * https://github.com/algolia/algoliasearch-client-js#highlightposttag
+         */
+        highlightPostTag?: string;
+        /**
+         * String used as an ellipsis indicator when a snippet is truncated.
+         * default: …
+         * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
+         */
+        snippetEllipsisText?: string;
+        /**
+         * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
+         */
+        restrictHighlightAndSnippetArrays?: boolean;
+        /**
+         * Pagination parameter used to select the number of hits per page
+         * default: 20
+         * https://github.com/algolia/algoliasearch-client-js#hitsperpage
+         */
+        hitsPerPage?: number;
+        /**
+         * The minimum number of characters needed to accept one typo
+         * default: 4
+         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
+         */
+        minWordSizefor1Typo?: number;
+        /**
+         * The minimum number of characters needed to accept two typos.
+         * default: 8
+         * https://github.com/algolia/algoliasearch-client-js#highlightposttag
+         */
+        minWordSizefor2Typos?: number;
+        /**
+         * This option allows you to control the number of typos allowed in the result set
+         * default: true
+         * 'true' The typo tolerance is enabled and all matching hits are retrieved (default behavior).
+         * 'false' The typo tolerance is disabled. All results with typos will be hidden.
+         * 'min' Only keep results with the minimum number of typos. For example, if one result matches without typos, then all results with typos will be hidden.
+         * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
+         * https://github.com/algolia/algoliasearch-client-js#typotolerance
+         */
+        typoTolerance?: any;
+        /**
+         * If set to false, disables typo tolerance on numeric tokens (numbers).
+         * default: true
+         * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
+         */
+        allowTyposOnNumericTokens?: boolean;
+        /**
+         * If set to true, plural won't be considered as a typo
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
+         */
+        ignorePlurals?: boolean;
+        /**
+         * List of attributes on which you want to disable typo tolerance
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
+         */
+        disableTypoToleranceOnAttributes?: string;
+        /**
+         * Specify the separators (punctuation characters) to index.
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#separatorstoindex
+         */
+        separatorsToIndex?: string;
+        /**
+         * Selects how the query words are interpreted
+         * default: 'prefixLast'
+         * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
+         * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
+         * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
+         * https://github.com/algolia/algoliasearch-client-js#querytype
+         */
+        queryType?: any;
+        /**
+         * This option is used to select a strategy in order to avoid having an empty result page
+         * default: 'none'
+         * 'lastWords' When a query does not return any results, the last word will be added as optional
+         * 'firstWords' When a query does not return any results, the first word will be added as optional
+         * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
+         * 'none' No specific processing is done when a query does not return any results
+         * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
+         */
+        removeWordsIfNoResults?: string;
+        /**
+         * Enables the advanced query syntax
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
+         */
+        advancedSyntax?: boolean;
+        /**
+         * A string that contains the comma separated list of words that should be considered as optional when found in the query
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#optionalwords
+         */
+        optionalWords?: string[];
+        /**
+         * Remove stop words from the query before executing it
+         * default: false
+         * true|false: enable or disable stop words for all 41 supported languages; or
+         * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
+         * https://github.com/algolia/algoliasearch-client-js#removestopwords
+         */
+        removeStopWords?: string[];
+        /**
+         * List of attributes on which you want to disable prefix matching
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#disableprefixonattributes
+         */
+        disablePrefixOnAttributes?: string[];
+        /**
+         * List of attributes on which you want to disable the computation of exact criteria
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
+         */
+        disableExactOnAttributes?: string[];
+        /**
+         * This parameter control how the exact ranking criterion is computed when the query contains one word
+         * default: attribute
+         * 'none': no exact on single word query
+         * 'word': exact set to 1 if the query word is found in the record
+         * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
+         * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
+         */
+        exactOnSingleWordQuery?: string;
+        /**
+         * Specify the list of approximation that should be considered as an exact match in the ranking formula
+         * default: ['ignorePlurals', 'singleWordSynonym']
+         * 'ignorePlurals': alternative words added by the ignorePlurals feature
+         * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
+         * 'multiWordsSynonym': multiple-words synonym
+         * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
+         */
+        alternativesAsExact?: any;
+        /**
+         * The name of the attribute used for the Distinct feature
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#attributefordistinct
+         */
+        attributeForDistinct?: string;
+        /**
+         * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
+         * https://github.com/algolia/algoliasearch-client-js#distinct
+         */
+        distinct?: any;
+        /**
+         * All numerical attributes are automatically indexed as numerical filters
+         * default ''
+         * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
+         */
+        numericAttributesToIndex?: string[];
+        /**
+         * Allows compression of big integer arrays.
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#allowcompressionofintegerarray
+         */
+        allowCompressionOfIntegerArray?: boolean;
+        /**
+         * Specify alternative corrections that you want to consider.
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#altcorrections
+         */
+        altCorrections?: [{}];
+        /**
+         * Configure the precision of the proximity ranking criterion
+         * default: 1
+         * https://github.com/algolia/algoliasearch-client-js#minproximity
+         */
+        minProximity?: number;
+        /**
+         * This is an advanced use-case to define a token substitutable by a list of words without having the original token searchable
+         * default: ''
+         * https://github.com/algolia/algoliasearch-client-js#placeholders
+         */
+        placeholders?: any;
+    }
+
+    interface AlgoliaQueryParameters {
+        /**
+         * Query string used to perform the search
+         * default: ''
+         * https://github.com/algolia/algoliasearch-client-js#query
+         */
+        query?: string;
+        /**
+         * Filter the query with numeric, facet or/and tag filters
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#filters
+         */
+        filters?: string;
+        /**
+         * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer.
+         * default: *
+         * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
+         */
+        attributesToRetrieve?: string[];
+        /**
+         * List of attributes you want to use for textual search
+         * default: attributeToIndex
+         * https://github.com/algolia/algoliasearch-client-js#restrictsearchableattributes
+         */
+        restrictSearchableAttributes?: string[];
+        /**
+         * You can use facets to retrieve only a part of your attributes declared in attributesForFaceting attributes
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#facets
+         */
+        facets?: string;
+        /**
+         * Limit the number of facet values returned for each facet.
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
+         */
+        maxValuesPerFacet?: string;
+        /**
+         * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
+         */
+        attributesToHighlight?: string[];
+        /**
+         * Default list of attributes to snippet alongside the number of words to return
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
+         */
+        attributesToSnippet?: string[];
+        /**
+         * Specify the string that is inserted before the highlighted parts in the query result
+         * default: <em>
+         * https://github.com/algolia/algoliasearch-client-js#highlightpretag
+         */
+        highlightPreTag?: string;
+        /**
+         * Specify the string that is inserted after the highlighted parts in the query result
+         * default: </em>
+         * https://github.com/algolia/algoliasearch-client-js#highlightposttag
+         */
+        highlightPostTag?: string;
+        /**
+         * String used as an ellipsis indicator when a snippet is truncated.
+         * default: …
+         * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
+         */
+        snippetEllipsisText?: string;
+        /**
+         * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
+         */
+        restrictHighlightAndSnippetArrays?: boolean;
+        /**
+         * Pagination parameter used to select the number of hits per page
+         * default: 20
+         * https://github.com/algolia/algoliasearch-client-js#hitsperpage
+         */
+        hitsPerPage?: number;
+        /**
+         * Pagination parameter used to select the page to retrieve.
+         * default: 0
+         * https://github.com/algolia/algoliasearch-client-js#page
+         */
+        page?: number;
+        /**
+         * Offset of the first hit to return
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#offset
+         */
+        offset?: number;
+        /**
+         * Number of hits to return.
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#length
+         */
+        length?: number;
+        /**
+         * The minimum number of characters needed to accept one typo.
+         * default: 4
+         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
+         */
+        minWordSizefor1Typo?: number;
+        /**
+         * The minimum number of characters needed to accept two typo.
+         * fault: 8
+         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
+         */
+        minWordSizefor2Typos?: number;
+        /**
+         * This option allows you to control the number of typos allowed in the result set:
+         * default: true
+         * 'true' The typo tolerance is enabled and all matching hits are retrieved
+         * 'false' The typo tolerance is disabled. All results with typos will be hidden.
+         * 'min' Only keep results with the minimum number of typos
+         * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
+         * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
+         */
+        typoTolerance?: boolean;
+        /**
+         * If set to false, disables typo tolerance on numeric tokens (numbers).
+         * default:
+         * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
+         */
+        allowTyposOnNumericTokens?: boolean;
+        /**
+         * If set to true, plural won't be considered as a typo
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
+         */
+        ignorePlurals?: boolean;
+        /**
+         * List of attributes on which you want to disable typo tolerance
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
+         */
+        disableTypoToleranceOnAttributes?: string;
+        /**
+         * Search for entries around a given location
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#aroundlatlng
+         */
+        aroundLatLng?: string;
+        /**
+         * Search for entries around a given latitude/longitude automatically computed from user IP address.
+         * default: ""
+         * https://github.com/algolia/algoliasearch-client-js#aroundlatlngviaip
+         */
+        aroundLatLngViaIP?: string;
+        /**
+         * Control the radius associated with a geo search. Defined in meters.
+         * default: null
+         * You can specify aroundRadius=all if you want to compute the geo distance without filtering in a geo area
+         * https://github.com/algolia/algoliasearch-client-js#aroundradius
+         */
+        aroundRadius?: any;
+        /**
+         * Control the precision of a geo search
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#aroundprecision
+         */
+        aroundPrecision?: number;
+        /**
+         * Define the minimum radius used for a geo search when aroundRadius is not set.
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#minimumaroundradius
+         */
+        minimumAroundRadius?: number;
+        /**
+         * Search entries inside a given area defined by the two extreme points of a rectangle
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#insideboundingbox
+         */
+        insideBoundingBox?: string;
+        /**
+         * Selects how the query words are interpreted
+         * default: 'prefixLast'
+         * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
+         * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
+         * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
+         * https://github.com/algolia/algoliasearch-client-js#querytype
+         */
+        queryType?: any;
+        /**
+         * Search entries inside a given area defined by a set of points
+         * defauly: ''
+         * https://github.com/algolia/algoliasearch-client-js#insidepolygon
+         */
+        insidePolygon?: string;
+        /**
+         * This option is used to select a strategy in order to avoid having an empty result page
+         * default: 'none'
+         * 'lastWords' When a query does not return any results, the last word will be added as optional
+         * 'firstWords' When a query does not return any results, the first word will be added as optional
+         * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
+         * 'none' No specific processing is done when a query does not return any results
+         * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
+         */
+        removeWordsIfNoResults?: string;
+        /**
+         * Enables the advanced query syntax
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
+         */
+        advancedSyntax?: boolean;
+        /**
+         * A string that contains the comma separated list of words that should be considered as optional when found in the query
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#optionalwords
+         */
+        optionalWords?: string[];
+        /**
+         * Remove stop words from the query before executing it
+         * default: false
+         * true|false: enable or disable stop words for all 41 supported languages; or
+         * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
+         * https://github.com/algolia/algoliasearch-client-js#removestopwords
+         */
+        removeStopWords?: string[];
+        /**
+         * List of attributes on which you want to disable the computation of exact criteria
+         * default: []
+         * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
+         */
+        disableExactOnAttributes?: string[];
+        /**
+         * This parameter control how the exact ranking criterion is computed when the query contains one word
+         * default: attribute
+         * 'none': no exact on single word query
+         * 'word': exact set to 1 if the query word is found in the record
+         * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
+         * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
+         */
+        exactOnSingleWordQuery?: string;
+        /**
+         * Specify the list of approximation that should be considered as an exact match in the ranking formula
+         * default: ['ignorePlurals', 'singleWordSynonym']
+         * 'ignorePlurals': alternative words added by the ignorePlurals feature
+         * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
+         * 'multiWordsSynonym': multiple-words synonym
+         * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
+         */
+        alternativesAsExact?: any;
+        /**
+         * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
+         * https://github.com/algolia/algoliasearch-client-js#distinct
+         */
+        distinct?: any;
+        /**
+         * If set to true, the result hits will contain ranking information in the _rankingInfo attribute.
+         * default: false
+         * https://github.com/algolia/algoliasearch-client-js#getrankinginfo
+         */
+        getRankingInfo?: boolean;
+        /**
+         * All numerical attributes are automatically indexed as numerical filters
+         * default: ''
+         * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
+         */
+        numericAttributesToIndex?: string[];
+        /**
+         * @deprecated please use filters instead
+         * A string that contains the comma separated list of numeric filters you want to apply.
+         * https://github.com/algolia/algoliasearch-client-js#numericfilters-deprecated
+         */
+        numericFilters?: string[];
+        /**
+         * @deprecated
+         * Filter the query by a set of tags.
+         * https://github.com/algolia/algoliasearch-client-js#tagfilters-deprecated
+         */
+        tagFilters?: string;
+        /**
+         * @deprecated
+         * Filter the query by a set of facets.
+         * https://github.com/algolia/algoliasearch-client-js#facetfilters-deprecated
+         */
+        facetFilters?: string;
+        /**
+         * If set to false, this query will not be taken into account in the analytics feature.
+         * default true
+         * https://github.com/algolia/algoliasearch-client-js#analytics
+         */
+        analytics?: boolean;
+        /**
+         * If set, tag your query with the specified identifiers
+         * default: null
+         * https://github.com/algolia/algoliasearch-client-js#analyticstags
+         */
+        analyticsTags?: string[];
+        /**
+         * If set to false, the search will not use the synonyms defined for the targeted index.
+         * default: true
+         * https://github.com/algolia/algoliasearch-client-js#synonyms
+         */
+        synonyms?: boolean;
+        /**
+         * If set to false, words matched via synonym expansion will not be replaced by the matched synonym in the highlighted result.
+         * default: true
+         * https://github.com/algolia/algoliasearch-client-js#replacesynonymsinhighlight
+         */
+        replaceSynonymsInHighlight?: boolean;
+        /**
+         * Configure the precision of the proximity ranking criterion
+         * default: 1
+         * https://github.com/algolia/algoliasearch-client-js#minproximity
+         */
+        minProximity?: number;
+    }
 }
 
-/**
- * Describes the settings available for configure your index
- */
-interface AlgoliaIndexSettings {
-    /**
-     * The list of attributes you want index
-     * default: *
-     * https://github.com/algolia/algoliasearch-client-js#attributestoindex
-     */
-    attributesToIndex?: string[];
-    /**
-     * The list of attributes you want to use for faceting
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#attributesforfaceting
-     */
-    attributesforFaceting?: string[];
-    /**
-     * The list of attributes that cannot be retrieved at query time
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#unretrievableattributes
-     */
-    unretrievableAttributes?: string[];
-    /**
-     * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer
-     * default: *
-     * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
-     */
-    attributesToRetrieve?: string[];
-    /**
-     * Controls the way results are sorted
-     * default: ['typo', 'geo', 'words', 'filters', 'proximity', 'attribute', 'exact', 'custom']
-     * https://github.com/algolia/algoliasearch-client-js#ranking
-     */
-    ranking?: string[];
-    /**
-     * Lets you specify part of the ranking
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#customranking
-     */
-    customRanking?: string[];
-    /**
-     * The list of indices on which you want to replicate all write operations
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#slaves
-     */
-    slaves?: string[];
-    /**
-     * Limit the number of facet values returned for each facet
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
-     */
-    maxValuesPerFacet?: string;
-    /**
-     * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
-     */
-    attributesToHighlight?: string[];
-    /**
-     * Default list of attributes to snippet alongside the number of words to return
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
-     */
-    attributesToSnippet?: string[];
-    /**
-     * Specify the string that is inserted before the highlighted parts in the query result
-     * default: <em>
-     * https://github.com/algolia/algoliasearch-client-js#highlightpretag
-     */
-    highlightPreTag?: string;
-    /**
-     * Specify the string that is inserted after the highlighted parts in the query result
-     * default: </em>
-     * https://github.com/algolia/algoliasearch-client-js#highlightposttag
-     */
-    highlightPostTag?: string;
-    /**
-     * String used as an ellipsis indicator when a snippet is truncated.
-     * default: …
-     * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
-     */
-    snippetEllipsisText?: string;
-    /**
-     * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
-     */
-    restrictHighlightAndSnippetArrays?: boolean;
-    /**
-     * Pagination parameter used to select the number of hits per page
-     * default: 20
-     * https://github.com/algolia/algoliasearch-client-js#hitsperpage
-     */
-    hitsPerPage?: number;
-    /**
-     * The minimum number of characters needed to accept one typo
-     * default: 4
-     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
-     */
-    minWordSizefor1Typo?: number;
-    /**
-     * The minimum number of characters needed to accept two typos.
-     * default: 8
-     * https://github.com/algolia/algoliasearch-client-js#highlightposttag
-     */
-    minWordSizefor2Typos?: number;
-    /**
-     * This option allows you to control the number of typos allowed in the result set
-     * default: true
-     * 'true' The typo tolerance is enabled and all matching hits are retrieved (default behavior).
-     * 'false' The typo tolerance is disabled. All results with typos will be hidden.
-     * 'min' Only keep results with the minimum number of typos. For example, if one result matches without typos, then all results with typos will be hidden.
-     * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
-     * https://github.com/algolia/algoliasearch-client-js#typotolerance
-     */
-    typoTolerance?: any;
-    /**
-     * If set to false, disables typo tolerance on numeric tokens (numbers).
-     * default: true
-     * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
-     */
-    allowTyposOnNumericTokens?: boolean;
-    /**
-     * If set to true, plural won't be considered as a typo
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
-     */
-    ignorePlurals?: boolean;
-    /**
-     * List of attributes on which you want to disable typo tolerance
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
-     */
-    disableTypoToleranceOnAttributes?: string;
-    /**
-     * Specify the separators (punctuation characters) to index.
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#separatorstoindex
-     */
-    separatorsToIndex?: string;
-    /**
-     * Selects how the query words are interpreted
-     * default: 'prefixLast'
-     * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
-     * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
-     * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
-     * https://github.com/algolia/algoliasearch-client-js#querytype
-     */
-    queryType?: any;
-    /**
-     * This option is used to select a strategy in order to avoid having an empty result page
-     * default: 'none'
-     * 'lastWords' When a query does not return any results, the last word will be added as optional
-     * 'firstWords' When a query does not return any results, the first word will be added as optional
-     * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
-     * 'none' No specific processing is done when a query does not return any results
-     * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
-     */
-    removeWordsIfNoResults?: string;
-    /**
-     * Enables the advanced query syntax
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
-     */
-    advancedSyntax?: boolean;
-    /**
-     * A string that contains the comma separated list of words that should be considered as optional when found in the query
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#optionalwords
-     */
-    optionalWords?: string[];
-    /**
-     * Remove stop words from the query before executing it
-     * default: false
-     * true|false: enable or disable stop words for all 41 supported languages; or
-     * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
-     * https://github.com/algolia/algoliasearch-client-js#removestopwords
-     */
-    removeStopWords?: string[];
-    /**
-     * List of attributes on which you want to disable prefix matching
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#disableprefixonattributes
-     */
-    disablePrefixOnAttributes?: string[];
-    /**
-     * List of attributes on which you want to disable the computation of exact criteria
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
-     */
-    disableExactOnAttributes?: string[];
-    /**
-     * This parameter control how the exact ranking criterion is computed when the query contains one word
-     * default: attribute
-     * 'none': no exact on single word query
-     * 'word': exact set to 1 if the query word is found in the record
-     * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
-     * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
-     */
-    exactOnSingleWordQuery?: string;
-    /**
-     * Specify the list of approximation that should be considered as an exact match in the ranking formula
-     * default: ['ignorePlurals', 'singleWordSynonym']
-     * 'ignorePlurals': alternative words added by the ignorePlurals feature
-     * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
-     * 'multiWordsSynonym': multiple-words synonym
-     * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
-     */
-    alternativesAsExact?: any;
-    /**
-     * The name of the attribute used for the Distinct feature
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#attributefordistinct
-     */
-    attributeForDistinct?: string;
-    /**
-     * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
-     * https://github.com/algolia/algoliasearch-client-js#distinct
-     */
-    distinct?: any;
-    /**
-     * All numerical attributes are automatically indexed as numerical filters
-     * default ''
-     * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
-     */
-    numericAttributesToIndex?: string[];
-    /**
-     * Allows compression of big integer arrays.
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#allowcompressionofintegerarray
-     */
-    allowCompressionOfIntegerArray?: boolean;
-    /**
-     * Specify alternative corrections that you want to consider.
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#altcorrections
-     */
-    altCorrections?: [{}];
-    /**
-     * Configure the precision of the proximity ranking criterion
-     * default: 1
-     * https://github.com/algolia/algoliasearch-client-js#minproximity
-     */
-    minProximity?: number;
-    /**
-     * This is an advanced use-case to define a token substitutable by a list of words without having the original token searchable
-     * default: ''
-     * https://github.com/algolia/algoliasearch-client-js#placeholders
-     */
-    placeholders?: any;
-}
-
-interface AlgoliaQueryParameters {
-    /**
-     * Query string used to perform the search
-     * default: ''
-     * https://github.com/algolia/algoliasearch-client-js#query
-     */
-    query?: string;
-    /**
-     * Filter the query with numeric, facet or/and tag filters
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#filters
-     */
-    filters?: string;
-    /**
-     * A string that contains the list of attributes you want to retrieve in order to minimize the size of the JSON answer.
-     * default: *
-     * https://github.com/algolia/algoliasearch-client-js#attributestoretrieve
-     */
-    attributesToRetrieve?: string[];
-    /**
-     * List of attributes you want to use for textual search
-     * default: attributeToIndex
-     * https://github.com/algolia/algoliasearch-client-js#restrictsearchableattributes
-     */
-    restrictSearchableAttributes?: string[];
-    /**
-     * You can use facets to retrieve only a part of your attributes declared in attributesForFaceting attributes
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#facets
-     */
-    facets?: string;
-    /**
-     * Limit the number of facet values returned for each facet.
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#maxvaluesperfacet
-     */
-    maxValuesPerFacet?: string;
-    /**
-     * Default list of attributes to highlight. If set to null, all indexed attributes are highlighted.
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#attributestohighlight
-     */
-    attributesToHighlight?: string[];
-    /**
-     * Default list of attributes to snippet alongside the number of words to return
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#attributestosnippet
-     */
-    attributesToSnippet?: string[];
-    /**
-     * Specify the string that is inserted before the highlighted parts in the query result
-     * default: <em>
-     * https://github.com/algolia/algoliasearch-client-js#highlightpretag
-     */
-    highlightPreTag?: string;
-    /**
-     * Specify the string that is inserted after the highlighted parts in the query result
-     * default: </em>
-     * https://github.com/algolia/algoliasearch-client-js#highlightposttag
-     */
-    highlightPostTag?: string;
-    /**
-     * String used as an ellipsis indicator when a snippet is truncated.
-     * default: …
-     * https://github.com/algolia/algoliasearch-client-js#snippetellipsistext
-     */
-    snippetEllipsisText?: string;
-    /**
-     * If set to true, restrict arrays in highlights and snippets to items that matched the query at least partially else return all array items in highlights and snippets
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#restricthighlightandsnippetarrays
-     */
-    restrictHighlightAndSnippetArrays?: boolean;
-    /**
-     * Pagination parameter used to select the number of hits per page
-     * default: 20
-     * https://github.com/algolia/algoliasearch-client-js#hitsperpage
-     */
-    hitsPerPage?: number;
-    /**
-     * Pagination parameter used to select the page to retrieve.
-     * default: 0
-     * https://github.com/algolia/algoliasearch-client-js#page
-     */
-    page?: number;
-    /**
-     * Offset of the first hit to return
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#offset
-     */
-    offset?: number;
-    /**
-     * Number of hits to return.
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#length
-     */
-    length?: number;
-    /**
-     * The minimum number of characters needed to accept one typo.
-     * default: 4
-     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor1typo
-     */
-    minWordSizefor1Typo?: number;
-    /**
-     * The minimum number of characters needed to accept two typo.
-     * fault: 8
-     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
-     */
-    minWordSizefor2Typos?: number;
-    /**
-     * This option allows you to control the number of typos allowed in the result set:
-     * default: true
-     * 'true' The typo tolerance is enabled and all matching hits are retrieved
-     * 'false' The typo tolerance is disabled. All results with typos will be hidden.
-     * 'min' Only keep results with the minimum number of typos
-     * 'strict' Hits matching with 2 typos are not retrieved if there are some matching without typos.
-     * https://github.com/algolia/algoliasearch-client-js#minwordsizefor2typos
-     */
-    typoTolerance?: boolean;
-    /**
-     * If set to false, disables typo tolerance on numeric tokens (numbers).
-     * default:
-     * https://github.com/algolia/algoliasearch-client-js#allowtyposonnumerictokens
-     */
-    allowTyposOnNumericTokens?: boolean;
-    /**
-     * If set to true, plural won't be considered as a typo
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#ignoreplurals
-     */
-    ignorePlurals?: boolean;
-    /**
-     * List of attributes on which you want to disable typo tolerance
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#disabletypotoleranceonattributes
-     */
-    disableTypoToleranceOnAttributes?: string;
-    /**
-     * Search for entries around a given location
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#aroundlatlng
-     */
-    aroundLatLng?: string;
-    /**
-     * Search for entries around a given latitude/longitude automatically computed from user IP address.
-     * default: ""
-     * https://github.com/algolia/algoliasearch-client-js#aroundlatlngviaip
-     */
-    aroundLatLngViaIP?: string;
-    /**
-     * Control the radius associated with a geo search. Defined in meters.
-     * default: null
-     * You can specify aroundRadius=all if you want to compute the geo distance without filtering in a geo area
-     * https://github.com/algolia/algoliasearch-client-js#aroundradius
-     */
-    aroundRadius?: any;
-    /**
-     * Control the precision of a geo search
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#aroundprecision
-     */
-    aroundPrecision?: number;
-    /**
-     * Define the minimum radius used for a geo search when aroundRadius is not set.
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#minimumaroundradius
-     */
-    minimumAroundRadius?: number;
-    /**
-     * Search entries inside a given area defined by the two extreme points of a rectangle
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#insideboundingbox
-     */
-    insideBoundingBox?: string;
-    /**
-     * Selects how the query words are interpreted
-     * default: 'prefixLast'
-     * 'prefixAll' All query words are interpreted as prefixes. This option is not recommended.
-     * 'prefixLast' Only the last word is interpreted as a prefix (default behavior).
-     * 'prefixNone' No query word is interpreted as a prefix. This option is not recommended.
-     * https://github.com/algolia/algoliasearch-client-js#querytype
-     */
-    queryType?: any;
-    /**
-     * Search entries inside a given area defined by a set of points
-     * defauly: ''
-     * https://github.com/algolia/algoliasearch-client-js#insidepolygon
-     */
-    insidePolygon?: string;
-    /**
-     * This option is used to select a strategy in order to avoid having an empty result page
-     * default: 'none'
-     * 'lastWords' When a query does not return any results, the last word will be added as optional
-     * 'firstWords' When a query does not return any results, the first word will be added as optional
-     * 'allOptional' When a query does not return any results, a second trial will be made with all words as optional
-     * 'none' No specific processing is done when a query does not return any results
-     * https://github.com/algolia/algoliasearch-client-js#removewordsifnoresults
-     */
-    removeWordsIfNoResults?: string;
-    /**
-     * Enables the advanced query syntax
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#advancedsyntax
-     */
-    advancedSyntax?: boolean;
-    /**
-     * A string that contains the comma separated list of words that should be considered as optional when found in the query
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#optionalwords
-     */
-    optionalWords?: string[];
-    /**
-     * Remove stop words from the query before executing it
-     * default: false
-     * true|false: enable or disable stop words for all 41 supported languages; or
-     * a list of language ISO codes (as a comma-separated string) for which stop words should be enable
-     * https://github.com/algolia/algoliasearch-client-js#removestopwords
-     */
-    removeStopWords?: string[];
-    /**
-     * List of attributes on which you want to disable the computation of exact criteria
-     * default: []
-     * https://github.com/algolia/algoliasearch-client-js#disableexactonattributes
-     */
-    disableExactOnAttributes?: string[];
-    /**
-     * This parameter control how the exact ranking criterion is computed when the query contains one word
-     * default: attribute
-     * 'none': no exact on single word query
-     * 'word': exact set to 1 if the query word is found in the record
-     * 'attribute': exact set to 1 if there is an attribute containing a string equals to the query
-     * https://github.com/algolia/algoliasearch-client-js#exactonsinglewordquery
-     */
-    exactOnSingleWordQuery?: string;
-    /**
-     * Specify the list of approximation that should be considered as an exact match in the ranking formula
-     * default: ['ignorePlurals', 'singleWordSynonym']
-     * 'ignorePlurals': alternative words added by the ignorePlurals feature
-     * 'singleWordSynonym': single-word synonym (For example "NY" = "NYC")
-     * 'multiWordsSynonym': multiple-words synonym
-     * https://github.com/algolia/algoliasearch-client-js#alternativesasexact
-     */
-    alternativesAsExact?: any;
-    /**
-     * If set to 1, enables the distinct feature, disabled by default, if the attributeForDistinct index setting is set.
-     * https://github.com/algolia/algoliasearch-client-js#distinct
-     */
-    distinct?: any;
-    /**
-     * If set to true, the result hits will contain ranking information in the _rankingInfo attribute.
-     * default: false
-     * https://github.com/algolia/algoliasearch-client-js#getrankinginfo
-     */
-    getRankingInfo?: boolean;
-    /**
-     * All numerical attributes are automatically indexed as numerical filters
-     * default: ''
-     * https://github.com/algolia/algoliasearch-client-js#numericattributestoindex
-     */
-    numericAttributesToIndex?: string[];
-    /**
-     * @deprecated please use filters instead
-     * A string that contains the comma separated list of numeric filters you want to apply.
-     * https://github.com/algolia/algoliasearch-client-js#numericfilters-deprecated
-     */
-    numericFilters?: string[];
-    /**
-     * @deprecated
-     * Filter the query by a set of tags.
-     * https://github.com/algolia/algoliasearch-client-js#tagfilters-deprecated
-     */
-    tagFilters?: string;
-    /**
-     * @deprecated
-     * Filter the query by a set of facets.
-     * https://github.com/algolia/algoliasearch-client-js#facetfilters-deprecated
-     */
-    facetFilters?: string;
-    /**
-     * If set to false, this query will not be taken into account in the analytics feature.
-     * default true
-     * https://github.com/algolia/algoliasearch-client-js#analytics
-     */
-    analytics?: boolean;
-    /**
-     * If set, tag your query with the specified identifiers
-     * default: null
-     * https://github.com/algolia/algoliasearch-client-js#analyticstags
-     */
-    analyticsTags?: string[];
-    /**
-     * If set to false, the search will not use the synonyms defined for the targeted index.
-     * default: true
-     * https://github.com/algolia/algoliasearch-client-js#synonyms
-     */
-    synonyms?: boolean;
-    /**
-     * If set to false, words matched via synonym expansion will not be replaced by the matched synonym in the highlighted result.
-     * default: true
-     * https://github.com/algolia/algoliasearch-client-js#replacesynonymsinhighlight
-     */
-    replaceSynonymsInHighlight?: boolean;
-    /**
-     * Configure the precision of the proximity ranking criterion
-     * default: 1
-     * https://github.com/algolia/algoliasearch-client-js#minproximity
-     */
-    minProximity?: number;
-}
-
-declare module "algoliasearch" {
-    function algoliasearch(applicationId: string, apiKey: string, options?: ClientOptions) : AlgoliaClient;
-    export = algoliasearch;
-}
+declare function algoliasearch(applicationId: string, apiKey: string, options?: algoliasearch.ClientOptions): algoliasearch.AlgoliaClient;
+export = algoliasearch;
diff --git a/algoliasearch-client-js/tsconfig.json b/algoliasearch-client-js/tsconfig.json
index d8c5e4f8f1..323a28e879 100644
--- a/algoliasearch-client-js/tsconfig.json
+++ b/algoliasearch-client-js/tsconfig.json
@@ -14,6 +14,6 @@
     },
     "files": [
         "index.d.ts",
-        "algoliasearch-client-js-tests.ts"
+        "algoliasearch-tests.ts"
     ]
 }
\ No newline at end of file

From 578ab24317fb4c6014358d3b83afc8d760fcff65 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 12:27:09 -0800
Subject: [PATCH 240/245] Rename files

---
 .../algoliasearch-tests.ts                                        | 0
 {algoliasearch-client-js => algoliasearch}/index.d.ts             | 0
 {algoliasearch-client-js => algoliasearch}/tsconfig.json          | 0
 3 files changed, 0 insertions(+), 0 deletions(-)
 rename algoliasearch-client-js/algoliasearch-client-js-tests.ts => algoliasearch/algoliasearch-tests.ts (100%)
 rename {algoliasearch-client-js => algoliasearch}/index.d.ts (100%)
 rename {algoliasearch-client-js => algoliasearch}/tsconfig.json (100%)

diff --git a/algoliasearch-client-js/algoliasearch-client-js-tests.ts b/algoliasearch/algoliasearch-tests.ts
similarity index 100%
rename from algoliasearch-client-js/algoliasearch-client-js-tests.ts
rename to algoliasearch/algoliasearch-tests.ts
diff --git a/algoliasearch-client-js/index.d.ts b/algoliasearch/index.d.ts
similarity index 100%
rename from algoliasearch-client-js/index.d.ts
rename to algoliasearch/index.d.ts
diff --git a/algoliasearch-client-js/tsconfig.json b/algoliasearch/tsconfig.json
similarity index 100%
rename from algoliasearch-client-js/tsconfig.json
rename to algoliasearch/tsconfig.json

From 7f5e86720059f0cb7527020b97c41ca3cfc84472 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 23 Nov 2016 15:10:43 -0800
Subject: [PATCH 241/245] Redo @asurinov's commit a01bba4

---
 underscore/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/underscore/index.d.ts b/underscore/index.d.ts
index b8f7bf4c33..48452b9e2e 100644
--- a/underscore/index.d.ts
+++ b/underscore/index.d.ts
@@ -3672,7 +3672,7 @@ declare module _ {
         * @param predicate Predicate function.
         * @param context `this` object in `iterator`, optional.
         */
-        findKey<T>(obj: _.Dictionary<T>, predicate: _.ObjectIterator<T, boolean>, context?: any): T
+        findKey<T>(obj: _.Dictionary<T>, predicate: _.ObjectIterator<T, boolean>, context?: any): string;
 
         /**
         * Return a copy of the object, filtered to only have values for the whitelisted keys

From a27a96e68dcfdbfcaf4fb740d6015873167952a3 Mon Sep 17 00:00:00 2001
From: Andy Hanson <anhans@microsoft.com>
Date: Thu, 17 Nov 2016 10:58:38 -0800
Subject: [PATCH 242/245] Convert "amplify" to a module, and "amplify-deferred"
 to a module augmentation

---
 amplify-deferred/amplify-deferred-tests.ts | 260 ----------------
 amplify-deferred/index.d.ts                | 196 ++----------
 amplify-deferred/tslint.json               |   6 +
 amplify/amplifyjs-tests.ts                 |  10 +-
 amplify/index.d.ts                         | 341 ++++++++++-----------
 amplify/tslint.json                        |   7 +
 6 files changed, 210 insertions(+), 610 deletions(-)
 create mode 100644 amplify-deferred/tslint.json
 create mode 100644 amplify/tslint.json

diff --git a/amplify-deferred/amplify-deferred-tests.ts b/amplify-deferred/amplify-deferred-tests.ts
index 9482a8ef02..a4c7c656c4 100644
--- a/amplify-deferred/amplify-deferred-tests.ts
+++ b/amplify-deferred/amplify-deferred-tests.ts
@@ -1,265 +1,5 @@
-
-/// <reference types="jquery" />
-
-// Copied examples directly from AmplifyJs site
-
-// Subscribe and publish with no data
-
-amplify.subscribe("nodataexample", function () {
-    alert("nodataexample topic published!");
-});
-
-// Subscribe and publish with data
-
-amplify.publish("nodataexample");
-
-amplify.subscribe("dataexample", function (data) {
-    alert(data.foo); // bar
-});
-
-
-amplify.publish("dataexample", { foo: "bar" });
-
-amplify.subscribe("dataexample2", function (param1, param2) {
-    alert(param1 + param2); // barbaz
-});
-
-//...
-
-amplify.publish("dataexample2", "bar", "baz");
-
-// Subscribe and publish with context and data
-
-amplify.subscribe("datacontextexample", $("p:first"), function (data) {
-    this.text(data.exampleText); // first p element would have "foo bar baz" as text
-});
-
-amplify.publish("datacontextexample", { exampleText: "foo bar baz" });
-
-// Subscribe to a topic with high priority
-
-amplify.subscribe("priorityexample", function (data) {
-    alert(data.foo);
-});
-
-amplify.subscribe("priorityexample", function (data) {
-    if (data.foo === "oops") {
-        return false;
-    }
-}, 1);
-
-
-// Store data with amplify storage picking the default storage technology:
-
-amplify.publish("priorityexample", { foo: "bar" });
-amplify.publish("priorityexample", { foo: "oops" });
-
-amplify.store("storeExample1", { foo: "bar" });
-amplify.store("storeExample2", "baz");
-// retrieve the data later via the key
-var myStoredValue = amplify.store("storeExample1"),
-    myStoredValue2 = amplify.store("storeExample2"),
-    myStoredValues = amplify.store();
-myStoredValue.foo; // bar
-myStoredValue2; // baz
-myStoredValues.storeExample1.foo; // bar
-myStoredValues.storeExample2; // baz
-
-// Store data explicitly with session storage
-
-amplify.store.sessionStorage("explicitExample", { foo2: "baz" });
-// retrieve the data later via the key
-var myStoredValue2 = amplify.store.sessionStorage("explicitExample");
-myStoredValue2.foo2; // baz
-
-
-// REQUEST
-
-// Set up and use a request utilizing Ajax
-
-
-amplify.request.define("ajaxExample1", "ajax", {
-    url: "/myApiUrl",
-    dataType: "json",
-    type: "GET"
-});
-
-// later in code
-amplify.request("ajaxExample1", function (data) {
-    data.foo; // bar
-});
-
-// Set up and use a request utilizing Ajax and Caching
-
-amplify.request.define("ajaxExample2", "ajax", {
-    url: "/myApiUrl",
-    dataType: "json",
-    type: "GET",
-    cache: "persist"
-});
-
-// later in code
-amplify.request("ajaxExample2", function (data) {
-    data.foo; // bar
-});
-
-// a second call will result in pulling from the cache
-amplify.request("ajaxExample2", function (data) {
-    data.baz; // qux
-})
-
-// Set up and use a RESTful request utilizing Ajax
-
-amplify.request.define("ajaxRESTFulExample", "ajax", {
-    url: "/myRestFulApi/{type}/{id}",
-    type: "GET"
-})
-
-// later in code
-amplify.request("ajaxRESTFulExample",
-    {
-        type: "foo",
-        id: "bar"
-    },
-    function (data) {
-        // /myRESTFulApi/foo/bar was the URL used
-        data.foo; // bar
-    }
-    );
-
-// POST data with Ajax
-
-amplify.request.define("ajaxPostExample", "ajax", {
-    url: "/myRestFulApi",
-    type: "POST"
-})
-
-// later in code
-amplify.request("ajaxPostExample",
-    {
-        type: "foo",
-        id: "bar"
-    },
-    function (data) {
-        data.foo; // bar
-    }
-    );
-// Using data maps
-
-//  When searching Twitter, the key for the search phrase is q.If we want a more descriptive name, such as term, we can use a data map:
-
-amplify.request.define("twitter-search", "ajax", {
-    url: "http://search.twitter.com/search.json",
-    dataType: "jsonp",
-    dataMap: {
-        term: "q"
-    }
-});
-
-amplify.request("twitter-search", { term: "amplifyjs" });
-
-// Similarly, we can create a request that searches for mentions, by accepting a username:
-
-amplify.request.define("twitter-mentions", "ajax", {
-    url: "http://search.twitter.com/search.json",
-    dataType: "jsonp",
-    dataMap: function (data) {
-        return {
-            q: "@" + data.user
-        };
-    }
-});
-
-amplify.request("twitter-mentions", { user: "amplifyjs" });
-
-// Setting up and using decoders
-
-//Example:
-
-var appEnvelopeDecoder: amplifyDecoder = function (data, status, xhr, success, error) {
-    if (data.status === "success") {
-        success(data.data);
-    } else if (data.status === "fail" || data.status === "error") {
-        error(data.message, data.status);
-    } else {
-        error(data.message, "fatal");
-    }
-};
-
-//a new decoder can be added to the amplifyDecoders interface
-interface amplifyDecoders {
-    appEnvelope: amplifyDecoder;
-}
-
-amplify.request.decoders.appEnvelope = appEnvelopeDecoder;
-
-//but you can also just add it via an index
-amplify.request.decoders['appEnvelopeStr'] = appEnvelopeDecoder;
-
-
-amplify.request.define("decoderExample", "ajax", {
-    url: "/myAjaxUrl",
-    type: "POST",
-    decoder: "appEnvelope"
-});
-
-amplify.request({
-    resourceId: "decoderExample",
-    success: function (data) {
-        data.foo; // bar
-    },
-    error: function (message, level) {
-        alert("always handle errors with alerts.");
-    }
-});
-
-// POST with caching and single - use decoder
-
-// Example:
-
-amplify.request.define("decoderSingleExample", "ajax", {
-    url: "/myAjaxUrl",
-    type: "POST",
-    decoder: function (data, status, xhr, success, error) {
-        if (data.status === "success") {
-            success(data.data);
-        } else if (data.status === "fail" || data.status === "error") {
-            error(data.message, data.status);
-        } else {
-            error(data.message, "fatal");
-        }
-    }
-});
-
-amplify.request({
-    resourceId: "decoderSingleExample",
-    success: function (data) {
-        data.foo; // bar
-    },
-    error: function (message, level) {
-        alert("always handle errors with alerts.");
-    }
-});
-// Handling Status
-// Status in Success and Error Callbacks
-
-// amplify.request comes with built in support for status.The status parameter appears in the default success or error callbacks when using an ajax definition.
-
-amplify.request.define("statusExample1", "ajax", {
-    //...
-});
-
-amplify.request({
-    resourceId: "statusExample1",
-    success: function (data, status) {
-    },
-    error: function (data, status) {
-    }
-});
-
 amplify.request({
     resourceId: "statusExample1"
 }).done(function (data, status) {
 }).fail(function (data, status) {
 }).always(function (data, status) { });
-
diff --git a/amplify-deferred/index.d.ts b/amplify-deferred/index.d.ts
index 3736a6644b..24f88455e9 100644
--- a/amplify-deferred/index.d.ts
+++ b/amplify-deferred/index.d.ts
@@ -5,178 +5,26 @@
 
 /// <reference types="jquery" />
 
-interface amplifyRequestSettings {
-    resourceId: string;
-    data?: any;
-    success?: (...args: any[]) => void;
-    error?: (...args: any[]) => void;
+import * as amplify from "amplify";
+
+declare module "amplify" {
+    interface Request {
+        /***
+        * Request a resource.
+        * resourceId: Identifier string for the resource.
+        * data: A set of key/value pairs of data to be sent to the resource.
+        * callback: A function to invoke if the resource is retrieved successfully.
+        */
+        (resourceId: string, hash?: any, callback?: Function): JQueryPromise<any>;
+
+        /***
+        * Request a resource.
+        * settings: A set of key/value pairs of settings for the request.
+        *   resourceId: Identifier string for the resource.
+        *   data (optional): Data associated with the request.
+        *   success (optional): Function to invoke on success.
+        *   error (optional): Function to invoke on error.
+        */
+        (settings: RequestSettings): JQueryPromise<any>;
+    }
 }
-
-interface amplifyDecoder {
-    (
-        data?: any,
-        status?: string,
-        xhr?: JQueryXHR,
-        success?: (...args: any[]) => void,
-        error?: (...args: any[]) => void
-        ): void
-}
-
-interface amplifyDecoders {
-    [decoderName: string]: amplifyDecoder;
-    jsSend: amplifyDecoder;
-}
-
-interface amplifyAjaxSettings extends JQueryAjaxSettings {
-    cache?: any;
-    dataMap?: {} | ((data: any) => {});
-    decoder?: any /* string or amplifyDecoder */;
-}
-
-interface amplifyRequest {
-
-    /***
-    * Request a resource.
-    * resourceId: Identifier string for the resource.
-    * data: A set of key/value pairs of data to be sent to the resource.
-    * callback: A function to invoke if the resource is retrieved successfully.
-    */
-    (resourceId: string, hash?: any, callback?: Function): JQueryPromise<any>;
-
-    /***
-    * Request a resource.
-    * settings: A set of key/value pairs of settings for the request.
-    *   resourceId: Identifier string for the resource.
-    *   data (optional): Data associated with the request.
-    *   success (optional): Function to invoke on success.
-    *   error (optional): Function to invoke on error.
-    */
-    (settings: amplifyRequestSettings): JQueryPromise<any>;
-
-    /***
-    * Define a resource.
-    * resourceId: Identifier string for the resource.
-    * requestType: The type of data retrieval method from the server. See the request types sections for more information.
-    * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
-    *   Any settings found in jQuery.ajax().
-    *   cache: See the cache section for more details.
-    *   decoder: See the decoder section for more details.
-    */
-    define(resourceId: string, requestType: string, settings?: amplifyAjaxSettings): void;
-
-    /***
-    * Define a custom request.
-    * resourceId: Identifier string for the resource.
-    * resource: Function to handle requests. Receives a hash with the following properties:
-    *   resourceId: Identifier string for the resource.
-    *   data: Data provided by the user.
-    *   success: Callback to invoke on success.
-    *   error: Callback to invoke on error.
-    */
-    define(resourceId: string, resource: (settings: amplifyRequestSettings) => void): void;
-
-    decoders: amplifyDecoders;
-    cache: any;
-}
-
-interface amplifySubscribe {
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    */
-    (topic: string, callback: Function): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * context: What this will be when the callback is invoked.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, context: any, callback: Function, priority?: number): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, callback: Function, priority?: number): void;
-}
-interface amplifyStorageTypeStore {
-    /***
-    * Stores a value for a given key using the default storage type.
-    * 
-    * key: Identifier for the value being stored.
-    * value: The value to store. The value can be anything that can be serialized as JSON.
-    * [options]: A set of key/value pairs that relate to settings for storing the value.
-    */
-    (key: string, value: any, options?: any): void;
-
-    /***
-    * Gets a stored value based on the key.
-    */
-    (key: string): any;
-
-    /***
-    * Gets a hash of all stored values.
-    */
-    (): any;
-}
-
-interface amplifyStore extends amplifyStorageTypeStore {
-
-    /*** 
-    * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    localStorage: amplifyStorageTypeStore;
-
-    /*** 
-    * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    sessionStorage: amplifyStorageTypeStore;
-
-    /***
-    * Firefox 2+
-    */
-    globalStorage: amplifyStorageTypeStore;
-    
-    /***
-    * IE 5 - 7
-    */
-    userData: amplifyStorageTypeStore;
-
-    /***
-    * An in-memory store is provided as a fallback if none of the other storage types are available.
-    */
-    memory: amplifyStorageTypeStore;
-
-
-}
-
-interface amplifyStatic {
-
-    subscribe: amplifySubscribe;
-
-    /***
-    * Remove a subscription.
-    * topic: The topic being unsubscribed from.
-    * callback: The callback that was originally subscribed.
-    */
-    unsubscribe(topic: string, callback: Function): void;
-
-    /***
-    * Publish a message.
-    * topic: The name of the message to publish.
-    * Any additional parameters will be passed to the subscriptions.
-    * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
-    */
-    publish(topic: string, ...args: any[]): boolean;
-
-    store: amplifyStore;
-
-    request: amplifyRequest;
-
-}
-
-declare var amplify: amplifyStatic;
-
diff --git a/amplify-deferred/tslint.json b/amplify-deferred/tslint.json
new file mode 100644
index 0000000000..0f47deabb4
--- /dev/null
+++ b/amplify-deferred/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "forbidden-types": false
+    }
+}
\ No newline at end of file
diff --git a/amplify/amplifyjs-tests.ts b/amplify/amplifyjs-tests.ts
index ec3807435d..f844642b8e 100644
--- a/amplify/amplifyjs-tests.ts
+++ b/amplify/amplifyjs-tests.ts
@@ -1,6 +1,8 @@
 
 /// <reference types="jquery" />
 
+import amplify = require("amplify");
+
 // Copied examples directly from AmplifyJs site
 
 // Subscribe and publish with no data
@@ -176,7 +178,7 @@ amplify.request("twitter-mentions", { user: "amplifyjs" });
 
 //Example:
 
-var appEnvelopeDecoder: amplifyDecoder = function (data, status, xhr, success, error) {
+var appEnvelopeDecoder: amplify.Decoder = function (data, status, xhr, success, error) {
     if (data.status === "success") {
         success(data.data);
     } else if (data.status === "fail" || data.status === "error") {
@@ -187,8 +189,10 @@ var appEnvelopeDecoder: amplifyDecoder = function (data, status, xhr, success, e
 };
 
 //a new decoder can be added to the amplifyDecoders interface
-interface amplifyDecoders {
-    appEnvelope: amplifyDecoder;
+declare module "amplify" {
+    interface Decoders {
+        appEnvelope: amplify.Decoder;
+    }
 }
 
 amplify.request.decoders.appEnvelope = appEnvelopeDecoder;
diff --git a/amplify/index.d.ts b/amplify/index.d.ts
index 8955fdc7de..ee14a6891e 100644
--- a/amplify/index.d.ts
+++ b/amplify/index.d.ts
@@ -5,178 +5,173 @@
 
 /// <reference types="jquery" />
 
-interface amplifyRequestSettings {
-    resourceId: string;
-    data?: any;
-    success?: (...args: any[]) => void;
-    error?: (...args: any[]) => void;
+declare namespace amplify {
+    interface RequestSettings {
+        resourceId: string;
+        data?: any;
+        success?: (...args: any[]) => void;
+        error?: (...args: any[]) => void;
+    }
+
+    type Decoder =
+        (
+            data?: any,
+            status?: string,
+            xhr?: JQueryXHR,
+            success?: (...args: any[]) => void,
+            error?: (...args: any[]) => void
+        ) => void;
+
+    interface Decoders {
+        [decoderName: string]: Decoder;
+        jsSend: Decoder;
+    }
+
+    interface AjaxSettings extends JQueryAjaxSettings  {
+        cache?: any;
+        dataMap?: {} | ((data: any) => {});
+        decoder?: any /* string or amplifyDecoder */;
+    }
+
+    interface Request {
+
+        /***
+        * Request a resource.
+        * resourceId: Identifier string for the resource.
+        * data: A set of key/value pairs of data to be sent to the resource.
+        * callback: A function to invoke if the resource is retrieved successfully.
+        */
+        (resourceId: string, hash?: any, callback?: Function): void;
+
+        /***
+        * Request a resource.
+        * settings: A set of key/value pairs of settings for the request.
+        *   resourceId: Identifier string for the resource.
+        *   data (optional): Data associated with the request.
+        *   success (optional): Function to invoke on success.
+        *   error (optional): Function to invoke on error.
+        */
+        (settings: RequestSettings): any;
+
+        /***
+        * Define a resource.
+        * resourceId: Identifier string for the resource.
+        * requestType: The type of data retrieval method from the server. See the request types sections for more information.
+        * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
+        *   Any settings found in jQuery.ajax().
+        *   cache: See the cache section for more details.
+        *   decoder: See the decoder section for more details.
+        */
+        define(resourceId: string, requestType: string, settings?: AjaxSettings): void;
+
+        /***
+        * Define a custom request.
+        * resourceId: Identifier string for the resource.
+        * resource: Function to handle requests. Receives a hash with the following properties:
+        *   resourceId: Identifier string for the resource.
+        *   data: Data provided by the user.
+        *   success: Callback to invoke on success.
+        *   error: Callback to invoke on error.
+        */
+        define(resourceId: string, resource: (settings: RequestSettings) => void): void;
+
+        decoders: Decoders;
+        cache: any;
+    }
+
+    interface Subscribe {
+        /***
+        * Subscribe to a message.
+        * topic: Name of the message to subscribe to.
+        * callback: Function to invoke when the message is published.
+        * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+        */
+        (topic: string, callback: Function, priority?: number): void;
+        /***
+        * Subscribe to a message.
+        * topic: Name of the message to subscribe to.
+        * context: What this will be when the callback is invoked.
+        * callback: Function to invoke when the message is published.
+        * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
+        */
+        (topic: string, context: any, callback: Function, priority?: number): void;
+    }
+    interface StorageTypeStore {
+        /***
+        * Stores a value for a given key using the default storage type.
+        *
+        * key: Identifier for the value being stored.
+        * value: The value to store. The value can be anything that can be serialized as JSON.
+        * [options]: A set of key/value pairs that relate to settings for storing the value.
+        */
+        (key: string, value: any, options?: any): void;
+
+        /***
+        * Gets a stored value based on the key.
+        */
+        (key: string): any;
+
+        /***
+        * Gets a hash of all stored values.
+        */
+        (): any;
+    }
+
+    interface Store extends StorageTypeStore {
+
+        /***
+        * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+        */
+        localStorage: StorageTypeStore;
+
+        /***
+        * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
+        */
+        sessionStorage: StorageTypeStore;
+
+        /***
+        * Firefox 2+
+        */
+        globalStorage: StorageTypeStore;
+
+        /***
+        * IE 5 - 7
+        */
+        userData: StorageTypeStore;
+
+        /***
+        * An in-memory store is provided as a fallback if none of the other storage types are available.
+        */
+        memory: StorageTypeStore;
+
+
+    }
+
+    interface Static {
+
+        subscribe: Subscribe;
+
+        /***
+        * Remove a subscription.
+        * topic: The topic being unsubscribed from.
+        * callback: The callback that was originally subscribed.
+        */
+        unsubscribe(topic: string, callback: Function): void;
+
+        /***
+        * Publish a message.
+        * topic: The name of the message to publish.
+        * Any additional parameters will be passed to the subscriptions.
+        * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
+        */
+        publish(topic: string, ...args: any[]): boolean;
+
+        store: Store;
+
+        request: Request;
+    }
 }
 
-interface amplifyDecoder {
-    (   
-        data?: any, 
-        status?: string, 
-        xhr?: JQueryXHR, 
-        success?: (...args: any[]) => void,
-        error?: (...args: any[]) => void
-    ): void
-}
-
-interface amplifyDecoders {
-    [decoderName: string]: amplifyDecoder;
-    jsSend: amplifyDecoder;
-}
-
-interface amplifyAjaxSettings extends JQueryAjaxSettings  {
-    cache?: any;
-    dataMap?: {} | ((data: any) => {});
-    decoder?: any /* string or amplifyDecoder */;
-}
-
-interface amplifyRequest {
-
-    /***
-    * Request a resource.
-    * resourceId: Identifier string for the resource.
-    * data: A set of key/value pairs of data to be sent to the resource.
-    * callback: A function to invoke if the resource is retrieved successfully.
-    */
-    (resourceId: string, hash?: any, callback?: Function): void;
-
-    /***
-    * Request a resource.
-    * settings: A set of key/value pairs of settings for the request.
-    *   resourceId: Identifier string for the resource.
-    *   data (optional): Data associated with the request.
-    *   success (optional): Function to invoke on success.
-    *   error (optional): Function to invoke on error.
-    */
-    (settings: amplifyRequestSettings): any;
-
-    /***
-    * Define a resource.
-    * resourceId: Identifier string for the resource.
-    * requestType: The type of data retrieval method from the server. See the request types sections for more information.
-    * settings: A set of key/value pairs that relate to the server communication technology. The following settings are available:
-    *   Any settings found in jQuery.ajax().
-    *   cache: See the cache section for more details.
-    *   decoder: See the decoder section for more details.
-    */
-    define(resourceId: string, requestType: string, settings?: amplifyAjaxSettings): void;
-
-    /***
-    * Define a custom request.
-    * resourceId: Identifier string for the resource.
-    * resource: Function to handle requests. Receives a hash with the following properties:
-    *   resourceId: Identifier string for the resource.
-    *   data: Data provided by the user.
-    *   success: Callback to invoke on success.
-    *   error: Callback to invoke on error.
-    */
-    define(resourceId: string, resource: (settings: amplifyRequestSettings) => void): void;
-    
-    decoders: amplifyDecoders;
-    cache: any;
-}
-
-interface amplifySubscribe {
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    */
-    (topic: string, callback: Function): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * context: What this will be when the callback is invoked.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, context: any, callback: Function, priority?: number): void;
-    /***
-    * Subscribe to a message.
-    * topic: Name of the message to subscribe to.
-    * callback: Function to invoke when the message is published.
-    * [priority]: Priority relative to other subscriptions for the same message. Lower values have higher priority. Default is 10.
-    */
-    (topic: string, callback: Function, priority?: number): void;
-}
-interface amplifyStorageTypeStore {
-    /***
-    * Stores a value for a given key using the default storage type.
-    * 
-    * key: Identifier for the value being stored.
-    * value: The value to store. The value can be anything that can be serialized as JSON.
-    * [options]: A set of key/value pairs that relate to settings for storing the value.
-    */
-    (key: string, value: any, options?: any): void;
-
-    /***
-    * Gets a stored value based on the key.
-    */
-    (key: string): any;
-
-    /***
-    * Gets a hash of all stored values.
-    */
-    (): any;
-}
-
-interface amplifyStore extends amplifyStorageTypeStore{
-
-    /*** 
-    * IE 8+, Firefox 3.5+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    localStorage: amplifyStorageTypeStore;
-
-    /*** 
-    * IE 8+, Firefox 2+, Safari 4+, Chrome, Opera 10.5+, iPhone 2+, Android 2+
-    */
-    sessionStorage: amplifyStorageTypeStore;
-
-    /***
-    * Firefox 2+
-    */
-    globalStorage: amplifyStorageTypeStore;
-    
-    /***
-    * IE 5 - 7
-    */
-    userData: amplifyStorageTypeStore;
-
-    /***
-    * An in-memory store is provided as a fallback if none of the other storage types are available.
-    */
-    memory: amplifyStorageTypeStore;
-    
-    
-}
-
-interface amplifyStatic {
-
-    subscribe: amplifySubscribe;
-
-    /***
-    * Remove a subscription.
-    * topic: The topic being unsubscribed from.
-    * callback: The callback that was originally subscribed.
-    */
-    unsubscribe(topic: string, callback: Function): void;
-
-    /***
-    * Publish a message.
-    * topic: The name of the message to publish.
-    * Any additional parameters will be passed to the subscriptions.
-    * amplify.publish returns a boolean indicating whether any subscriptions returned false. The return value is true if none of the subscriptions returned false, and false otherwise. Note that only one subscription can return false because doing so will prevent additional subscriptions from being invoked.
-    */
-    publish(topic: string, ...args: any[]): boolean;
-
-    store: amplifyStore;
-
-    request: amplifyRequest;
-
-}
-
-declare var amplify: amplifyStatic;
-declare module "amplify" { export =amplify; }
+declare var amplify: amplify.Static;
+export = amplify;
+export as namespace amplify;
diff --git a/amplify/tslint.json b/amplify/tslint.json
new file mode 100644
index 0000000000..2d6cd90f81
--- /dev/null
+++ b/amplify/tslint.json
@@ -0,0 +1,7 @@
+{
+    "extends": "../tslint.json",
+    "rules": {
+        "forbidden-types": false,
+        "unified-signatures": false
+    }
+}
\ No newline at end of file

From 53038c8080e7bb3636852e9aee874db2b236d16b Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Wed, 23 Nov 2016 15:53:32 -0800
Subject: [PATCH 243/245] Make xrm tests pass strictNullChecks again

The recent change to SuccessCallbackDelegate was made with
strictNullChecks off in master.
---
 xrm/xrm-tests.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xrm/xrm-tests.ts b/xrm/xrm-tests.ts
index a1e7b69cb7..65ae6e0184 100644
--- a/xrm/xrm-tests.ts
+++ b/xrm/xrm-tests.ts
@@ -72,7 +72,7 @@ if (Xrm.Page.data.process != null)
 
 /// Demonstrate v7.1 Quick Create form
 
-Xrm.Utility.openQuickCreate("account").then(( object ) => { alert( `Newly created record Id: ${object.savedEntityReference.id}` ); }, (error) => {console.log(`Code: ${error.errorCode}, Message: ${error.message}`)});
+Xrm.Utility.openQuickCreate("account").then(( object ) => { if (object) alert( `Newly created record Id: ${object.savedEntityReference.id}` ); }, (error) => {console.log(`Code: ${error.errorCode}, Message: ${error.message}`)});
 
 /// Make all controls visible.
 

From 19a466bce5b2b3419f355491fdf273f5c56bdb7b Mon Sep 17 00:00:00 2001
From: Andrey Kyrdyumov <kant2002@gmail.com>
Date: Thu, 24 Nov 2016 10:01:15 +0600
Subject: [PATCH 244/245] Make strickter onError signature and make it optional

---
 knockout/index.d.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/knockout/index.d.ts b/knockout/index.d.ts
index a4ca8573ae..970a4e9a08 100644
--- a/knockout/index.d.ts
+++ b/knockout/index.d.ts
@@ -592,7 +592,7 @@ interface KnockoutStatic {
     // utils.js
     /////////////////////////////////
 
-    onError: (error: Error) => any;
+    onError?: (error: Error) => void;
 }
 
 interface KnockoutBindingProvider {

From 5e221bedd9ed166334bce857f23fac97df116ca4 Mon Sep 17 00:00:00 2001
From: Nathan Shively-Sanders <nathansa@microsoft.com>
Date: Thu, 24 Nov 2016 07:56:58 -0800
Subject: [PATCH 245/245] Revert "More accurate hinted and inferred types for
 react-redux connect()"

This reverts commit 27b98d0580fd39f4b99041191ee57373c71998c5.
---
 react-redux/index.d.ts            | 211 +++++------
 react-redux/react-redux-tests.tsx | 590 ++++++++++++++----------------
 2 files changed, 380 insertions(+), 421 deletions(-)

diff --git a/react-redux/index.d.ts b/react-redux/index.d.ts
index ecdd84bb59..3303908a01 100644
--- a/react-redux/index.d.ts
+++ b/react-redux/index.d.ts
@@ -6,119 +6,102 @@
 import * as React from 'react';
 import * as Redux from 'redux';
 
-export = ReactRedux;
+type ComponentClass<P> = React.ComponentClass<P>;
+type StatelessComponent<P> = React.StatelessComponent<P>;
+type ReactNode = React.ReactNode;
+type Store<S> = Redux.Store<S>;
+type Dispatch<S> = Redux.Dispatch<S>;
+type ActionCreator<A> = Redux.ActionCreator<A>;
 
-declare namespace ReactRedux {
-
-    type ComponentType<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
-
-    interface ComponentDecorator<M, P> {
-        <TargetClass extends ComponentType<M>>(component: TargetClass): TargetClass & ConnectClass<P, TargetClass>;
-    }
-
-    interface ConnectState<S> {
-        storeState: S
-    }
-
-    class Connect<P, S> extends React.Component<P, ConnectState<S>> {
-        version: number;
-        store: Redux.Store<S>;
-        state: ConnectState<S>;
-    }
-
-    interface ConnectClass<P, W> extends React.ComponentClass<P> {
-        constructor<S>(props?: P, context?: any): Connect<P, S>;
-        WrappedComponent: W;
-    }
-
-    export type DefaultStateProps = {};
-    export type DefaultDispatchProps = { dispatch: Redux.Dispatch<any> };
-    export type DefaultMergedProps<TStateProps, TDispatchProps, TOwnProps> = TOwnProps & TStateProps & TDispatchProps;
-
-    /**
-     * Connects a React component to a Redux store.
-     *
-     * - Without arguments, just wraps the component, without changing the behavior / props
-     *
-     * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
-     * is to override ownProps (as stated in the docs), so what remains is everything that's
-     * not a state or dispatch prop
-     *
-     * - When 3rd param is passed, we don't know if ownProps propagate and whether they
-     * should be valid component props, because it depends on mergeProps implementation.
-     * As such, it is the user's responsibility to extend ownProps interface from state or
-     * dispatch props or both when applicable
-     *
-     * @param mapStateToProps
-     * @param mapDispatchToProps
-     * @param mergeProps
-     * @param options
-     */
-    export function connect<TOwnProps>(
-        mapStateToProps?: FuncOrSelf<InferableMapStateToProps<TOwnProps>>,
-        mapDispatchToProps?: FuncOrSelf<InferableMapDispatchToPropsFunction<TOwnProps> | MapDispatchToPropsObject>,
-        mergeProps?: void,
-        options?: Options
-    ): ComponentDecorator<any, TOwnProps>;
-
-    export function connect<TStateProps, TDispatchProps, TOwnProps>(
-        mapStateToProps?: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
-        mapDispatchToProps?: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>,
-        mergeProps?: void,
-        options?: Options
-    ): ComponentDecorator<DefaultMergedProps<TStateProps, TDispatchProps, TOwnProps>, TOwnProps>;
-
-    export function connect<TStateProps, TDispatchProps, TOwnProps, TMergedProps>(
-        mapStateToProps?: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
-        mapDispatchToProps?: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>,
-        mergeProps?: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
-        options?: Options
-    ): ComponentDecorator<TMergedProps, TOwnProps>;
-
-    type FuncOrSelf<T> = (() => T) | T;
-
-    type MapStateToProps<TStateProps, TOwnProps> = (state: any, ownProps?: TOwnProps) => TStateProps;
-
-    type InferableMapStateToProps<TOwnProps> = <TStateProps>(state: any, ownProps?: TOwnProps) => TStateProps;
-
-    type MapDispatchToPropsFunction<TDispatchProps, TOwnProps> = (dispatch: Redux.Dispatch<any>, ownProps?: TOwnProps) => TDispatchProps;
-
-    type InferableMapDispatchToPropsFunction<TOwnProps> = <TDispatchProps>(dispatch: Redux.Dispatch<any>, ownProps?: TOwnProps) => TDispatchProps;
-
-    type MapDispatchToPropsObject = {
-        [name: string]: Redux.ActionCreator<any>;
-    }
-
-    type MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps> =
-        (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps) => TMergedProps;
-
-    export interface Options {
-        /**
-         * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
-         * preventing unnecessary updates, assuming that the component is a “pure” component
-         * and does not rely on any input or state other than its props and the selected Redux store’s state.
-         * Defaults to true.
-         * @default true
-         */
-        pure?: boolean;
-        /**
-         * If true, stores a ref to the wrapped component instance and makes it available via
-         * getWrappedInstance() method. Defaults to false.
-         */
-        withRef?: boolean;
-    }
-
-    export interface ProviderProps {
-        /**
-         * The single Redux store in your application.
-         */
-        store?: Redux.Store<any>;
-        children?: React.ReactNode;
-    }
-
-    /**
-     * Makes the Redux store available to the connect() calls in the component hierarchy below.
-     */
-    export class Provider extends React.Component<ProviderProps, {}> {
-    }
+interface ComponentDecorator<TOriginalProps, TOwnProps> {
+    (component: ComponentClass<TOriginalProps> | StatelessComponent<TOriginalProps>): ComponentClass<TOwnProps>;
 }
+
+/**
+ * Decorator that infers the type from the original component
+ *
+ * Can't use the above decorator because it would default the type to {}
+ */
+export interface InferableComponentDecorator {
+    <P, TComponentConstruct extends (ComponentClass<P> | StatelessComponent<P>)>(component: TComponentConstruct): TComponentConstruct;
+}
+
+/**
+ * Connects a React component to a Redux store.
+ *
+ * - Without arguments, just wraps the component, without changing the behavior / props
+ *
+ * - If 2 params are passed (3rd param, mergeProps, is skipped), default behavior
+ * is to override ownProps (as stated in the docs), so what remains is everything that's
+ * not a state or dispatch prop
+ *
+ * - When 3rd param is passed, we don't know if ownProps propagate and whether they
+ * should be valid component props, because it depends on mergeProps implementation.
+ * As such, it is the user's responsibility to extend ownProps interface from state or
+ * dispatch props or both when applicable
+ *
+ * @param mapStateToProps
+ * @param mapDispatchToProps
+ * @param mergeProps
+ * @param options
+ */
+export declare function connect(): InferableComponentDecorator;
+
+export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
+    mapStateToProps: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
+    mapDispatchToProps?: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+
+export declare function connect<TStateProps, TDispatchProps, TOwnProps>(
+    mapStateToProps: FuncOrSelf<MapStateToProps<TStateProps, TOwnProps>>,
+    mapDispatchToProps: FuncOrSelf<MapDispatchToPropsFunction<TDispatchProps, TOwnProps> | MapDispatchToPropsObject>,
+    mergeProps: MergeProps<TStateProps, TDispatchProps, TOwnProps>,
+    options?: Options
+): ComponentDecorator<TStateProps & TDispatchProps, TOwnProps>;
+
+type FuncOrSelf<T> = T | (() => T);
+
+interface MapStateToProps<TStateProps, TOwnProps> {
+    (state: any, ownProps?: TOwnProps): TStateProps;
+}
+
+interface MapDispatchToPropsFunction<TDispatchProps, TOwnProps> {
+    (dispatch: Dispatch<any>, ownProps?: TOwnProps): TDispatchProps;
+}
+
+interface MapDispatchToPropsObject {
+    [name: string]: ActionCreator<any>;
+}
+
+interface MergeProps<TStateProps, TDispatchProps, TOwnProps> {
+    (stateProps: TStateProps, dispatchProps: TDispatchProps, ownProps: TOwnProps): TStateProps & TDispatchProps;
+}
+
+interface Options {
+    /**
+     * If true, implements shouldComponentUpdate and shallowly compares the result of mergeProps,
+     * preventing unnecessary updates, assuming that the component is a “pure” component
+     * and does not rely on any input or state other than its props and the selected Redux store’s state.
+     * Defaults to true.
+     * @default true
+     */
+    pure?: boolean;
+    /**
+    * If true, stores a ref to the wrapped component instance and makes it available via 
+    * getWrappedInstance() method. Defaults to false.
+    */
+    withRef?: boolean;
+}
+
+export interface ProviderProps {
+    /**
+     * The single Redux store in your application.
+     */
+    store?: Store<any>;
+    children?: ReactNode;
+}
+
+/**
+ * Makes the Redux store available to the connect() calls in the component hierarchy below.
+ */
+export class Provider extends React.Component<ProviderProps, {}> { }
diff --git a/react-redux/react-redux-tests.tsx b/react-redux/react-redux-tests.tsx
index e8aac5dfb3..8c552c8272 100644
--- a/react-redux/react-redux-tests.tsx
+++ b/react-redux/react-redux-tests.tsx
@@ -8,7 +8,7 @@ import { Component, ReactElement } from 'react';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
 import { Router, RouterState } from 'react-router';
-import { ActionCreator, Store, Dispatch, bindActionCreators } from 'redux';
+import { Store, Dispatch, bindActionCreators } from 'redux';
 import { connect, Provider } from 'react-redux';
 import objectAssign = require('object-assign');
 import * as History from 'history';
@@ -17,324 +17,302 @@ import * as History from 'history';
 // Quick Start
 // https://github.com/rackt/react-redux/blob/master/docs/quick-start.md#quick-start
 //
-namespace TestQuickStartExample {
-    interface CounterStateProps {
-        value: number;
-    }
-    interface CounterDispatchProps {
-        onIncrement: ActionCreator<CounterState>;
-    }
-    interface CounterState {
-        counter: number;
-    }
-    declare var increment: Function;
 
-    class Counter extends Component<CounterStateProps & CounterDispatchProps, CounterState> {
-        render() {
-            return (
-                <button onClick={this.props.onIncrement}>
-                    {this.props.value}
-                </button>
-            );
-        }
-    }
+interface CounterState {
+    counter: number;
+}
+declare var increment: Function;
 
-    const mapStateToProps = (state: CounterState) => ({
+class Counter extends Component<any, any> {
+    render() {
+        return (
+            <button onClick={this.props.onIncrement}>
+                {this.props.value}
+            </button>
+        );
+    }
+}
+
+function mapStateToProps(state: CounterState) {
+    return {
         value: state.counter
-    });
+    };
+}
 
-    // Which action creators does it want to receive by props?
-    const mapDispatchToProps = (dispatch: Dispatch<CounterState>) => ({
+// Which action creators does it want to receive by props?
+function mapDispatchToProps(dispatch: Dispatch<CounterState>) {
+    return {
         onIncrement: () => dispatch(increment())
+    };
+}
+
+connect(
+    mapStateToProps,
+    mapDispatchToProps
+)(Counter);
+
+
+@connect(mapStateToProps)
+class CounterContainer extends Component<any, any> {
+
+}
+
+// Ensure connect's first two arguments can be replaced by wrapper functions
+interface ICounterStateProps {
+    value: number
+}
+interface ICounterDispatchProps {
+    onIncrement: () => void
+}
+connect<ICounterStateProps, ICounterDispatchProps, {}>(
+    () => mapStateToProps,
+    () => mapDispatchToProps
+)(Counter);
+// only first argument
+connect<ICounterStateProps, {}, {}>(
+    () => mapStateToProps
+)(Counter);
+// wrap only one argument
+connect<ICounterStateProps, ICounterDispatchProps, {}>(
+    mapStateToProps,
+    () => mapDispatchToProps
+)(Counter);
+// with extra arguments
+connect<ICounterStateProps, ICounterDispatchProps, {}>(
+    () => mapStateToProps,
+    () => mapDispatchToProps,
+    (s: ICounterStateProps, d: ICounterDispatchProps) =>
+        objectAssign({}, s, d),
+    { pure: true }
+)(Counter);
+
+
+class App extends Component<any, any> {
+    render(): JSX.Element {
+        // ...
+        return null;
+    }
+}
+
+const targetEl = document.getElementById('root');
+
+ReactDOM.render((
+    <Provider store={store}>
+        {() => <App />}
+    </Provider>
+), targetEl);
+
+//
+// API
+// https://github.com/rackt/react-redux/blob/master/docs/api.md
+//
+declare var store: Store<TodoState>;
+declare var routerState: RouterState;
+declare var history: History.History;
+class MyRootComponent extends Component<any, any> {
+
+}
+class TodoApp extends Component<any, any> {
+
+}
+interface TodoState {
+    todos: string[]|string;
+}
+interface TodoProps {
+    userId: number;
+}
+interface DispatchProps {
+    addTodo(userId: number, text: string): void;
+    action: Function;
+}
+declare var actionCreators: () => {
+    action: Function;
+}
+declare var addTodo: () => { type: string; };
+declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
+declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
+
+ReactDOM.render(
+  <Provider store={store}>
+    {() => <MyRootComponent />}
+  </Provider>,
+  document.body
+);
+
+//TODO: for React Router 0.13
+////TODO: error TS2339: Property 'run' does not exist on type 'typeof "react-router"'.
+////TODO: error TS2339: Property 'HistoryLocation' does not exist on type 'typeof "react-router"'.
+//declare var routes: any;
+//Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
+//    ReactDOM.render(
+//        <Provider store={store}>
+//            {/*
+//             //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
+//             {() => <Handler routerState={routerState} />} // note "routerState" here: important to pass it down
+//            */}
+//        </Provider>,
+//        document.getElementById('root')
+//    );
+//});
+
+
+//TODO: for React Router 1.0
+ReactDOM.render(
+    <Provider store={store}>
+        {() => <Router history={history}>...</Router>}
+    </Provider>,
+    targetEl
+);
+
+// Inject just dispatch and don't listen to store
+
+connect()(TodoApp);
+
+// Inject dispatch and every field in the global state
+
+connect((state: TodoState) => state)(TodoApp);
+
+// Inject dispatch and todos
+
+function mapStateToProps2(state: TodoState) {
+    return { todos: state.todos };
+}
+
+export default connect(mapStateToProps2)(TodoApp);
+
+// Inject todos and all action creators (addTodo, completeTodo, ...)
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+connect(mapStateToProps2, actionCreators)(TodoApp);
+
+// Inject todos and all action creators (addTodo, completeTodo, ...) as actions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps2(dispatch: Dispatch<TodoState>) {
+    return { actions: bindActionCreators(actionCreators, dispatch) };
+}
+
+connect(mapStateToProps2, mapDispatchToProps2)(TodoApp);
+
+// Inject todos and a specific action creator (addTodo)
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps3(dispatch: Dispatch<TodoState>) {
+    return bindActionCreators({ addTodo }, dispatch);
+}
+
+connect(mapStateToProps2, mapDispatchToProps3)(TodoApp);
+
+// Inject todos, todoActionCreators as todoActions, and counterActionCreators as counterActions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps4(dispatch: Dispatch<TodoState>) {
+    return {
+        todoActions: bindActionCreators(todoActionCreators, dispatch),
+        counterActions: bindActionCreators(counterActionCreators, dispatch)
+    };
+}
+
+connect(mapStateToProps2, mapDispatchToProps4)(TodoApp);
+
+// Inject todos, and todoActionCreators and counterActionCreators together as actions
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps5(dispatch: Dispatch<TodoState>) {
+    return {
+        actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
+    };
+}
+
+connect(mapStateToProps2, mapDispatchToProps5)(TodoApp);
+
+// Inject todos, and all todoActionCreators and counterActionCreators directly as props
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mapDispatchToProps6(dispatch: Dispatch<TodoState>) {
+    return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
+}
+
+connect(mapStateToProps2, mapDispatchToProps6)(TodoApp);
+
+// Inject todos of a specific user depending on props
+
+function mapStateToProps3(state: TodoState, ownProps: TodoProps): TodoState {
+    return { todos: state.todos[ownProps.userId] };
+}
+
+connect(mapStateToProps3)(TodoApp);
+
+// Inject todos of a specific user depending on props, and inject props.userId into the action
+
+//function mapStateToProps(state) {
+//    return { todos: state.todos };
+//}
+
+function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
+    return objectAssign({}, ownProps, dispatchProps, {
+        todos: stateProps.todos[ownProps.userId],
+        addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
     });
-
-    connect(
-        mapStateToProps,
-        mapDispatchToProps
-    )(Counter);
-
-    // https://github.com/Microsoft/TypeScript/issues/4881
-    //@connect(mapStateToProps)
-    //class WrappedCounter extends Component<CounterStateProps & CounterDispatchProps, CounterState> {
-    //}
-    //React.createElement(WrappedCounter, {});
-    // As a workaround, declare state and dispatch props as optional
-    interface OptionalCounterStateProps {
-        value?: number;
-    }
-    interface OptionalCounterDispatchProps {
-        onIncrement?: ActionCreator<CounterState>;
-    }
-    interface Props {
-        requiredOwnProp: string
-    }
-    @connect(mapStateToProps)
-    class WrappedCounter extends Component<Props & OptionalCounterStateProps & OptionalCounterDispatchProps, CounterState> {
-    }
-    React.createElement(WrappedCounter, { requiredOwnProp: 'here I am' });
-
-    // Ensure connect's first two arguments can be replaced by wrapper functions
-    connect<CounterStateProps, CounterDispatchProps, {}>(
-        () => mapStateToProps,
-        () => mapDispatchToProps
-    )(Counter);
-    // only first argument
-    connect<CounterStateProps, {}, {}>(
-        () => mapStateToProps
-    )(Counter);
-    // wrap only one argument
-    connect<CounterStateProps, CounterDispatchProps, {}>(
-        mapStateToProps,
-        () => mapDispatchToProps
-    )(Counter);
-    // with extra arguments
-    connect<CounterStateProps, CounterDispatchProps, {}, CounterStateProps & CounterDispatchProps>(
-        () => mapStateToProps,
-        () => mapDispatchToProps,
-        (stateProps: CounterStateProps, dispatchProps: CounterDispatchProps) =>
-            objectAssign({}, stateProps, dispatchProps),
-        { pure: true }
-    )(Counter);
 }
 
-namespace TestTodosApp {
-
-    class App extends Component<any, any> {
-        render(): JSX.Element {
-            // ...
-            return null;
-        }
-    }
-
-    const targetEl = document.getElementById('root');
-
-    ReactDOM.render((
-        <Provider store={store}>
-            {() => <App />}
-        </Provider>
-    ), targetEl);
-
-    //
-    // API
-    // https://github.com/rackt/react-redux/blob/master/docs/api.md
-    //
-    declare var store: Store<TodoState>;
-    declare var routerState: RouterState;
-    declare var history: History.History;
-    class MyRootComponent extends Component<{}, RouterState> {
-    }
-    class TodoApp extends Component<any, TodoState> {
-    }
-    interface TodoState {
-        todos: string[] | string;
-    }
-    interface TodoProps {
-        userId: number;
-    }
-    interface DispatchProps {
-        addTodo(userId: number, text: string): void;
-        action: Function;
-    }
-    declare var actionCreators: () => {
-        action: Function;
-    }
-    declare var addTodo: () => { type: string; };
-    declare var todoActionCreators: { [type: string]: (...args: any[]) => any; };
-    declare var counterActionCreators: { [type: string]: (...args: any[]) => any; };
-
-    ReactDOM.render(
-        <Provider store={store}>
-            {() => <MyRootComponent />}
-        </Provider>,
-        document.body
-    );
-
-    //TODO: for React Router 0.13
-    ////TODO: error TS2339: Property 'run' does not exist on type 'typeof "react-router"'.
-    ////TODO: error TS2339: Property 'HistoryLocation' does not exist on type 'typeof "react-router"'.
-    //declare var routes: any;
-    //Router.run(routes, Router.HistoryLocation, (Handler, routerState) => { // note "routerState" here
-    //    ReactDOM.render(
-    //        <Provider store={store}>
-    //            {/*
-    //             //TODO: error TS2339: Property 'routerState' does not exist on type 'RouteProp'.
-    //             {() => <Handler routerState={routerState} />} // note "routerState" here: important to pass it down
-    //            */}
-    //        </Provider>,
-    //        document.getElementById('root')
-    //    );
-    //});
+connect(mapStateToProps2, actionCreators, mergeProps)(TodoApp);
 
 
-    //TODO: for React Router 1.0
-    ReactDOM.render(
-        <Provider store={store}>
-            {() => <Router history={history}>...</Router>}
-        </Provider>,
-        targetEl
-    );
 
-    // Inject just dispatch and don't listen to store
 
-    connect()(TodoApp);
 
-    // Inject dispatch and every field in the global state
-
-    connect((state: TodoState) => state)(TodoApp);
-
-    // Inject dispatch and todos
-
-    function mapStateToProps(state: TodoState) {
-        return { todos: state.todos };
-    }
-
-    connect(mapStateToProps)(TodoApp);
-
-    // Inject todos and all action creators (addTodo, completeTodo, ...)
-
-    //function mapStateToProps(state) {
-    //    return { todos: state.todos };
-    //}
-
-    connect(mapStateToProps, actionCreators)(TodoApp);
-
-    // Inject todos and all action creators (addTodo, completeTodo, ...) as actions
-
-    //function mapStateToProps(state) {
-    //    return { todos: state.todos };
-    //}
-
-    function mapDispatchToProps(dispatch: Dispatch<TodoState>) {
-        return { actions: bindActionCreators(actionCreators, dispatch) };
-    }
-
-    connect(mapStateToProps, mapDispatchToProps)(TodoApp);
-
-    // Inject todos and a specific action creator (addTodo)
-
-    //function mapStateToProps(state) {
-    //    return { todos: state.todos };
-    //}
-
-    function mapDispatchToProps2(dispatch: Dispatch<TodoState>) {
-        return bindActionCreators({ addTodo }, dispatch);
-    }
-
-    connect(mapStateToProps, mapDispatchToProps2)(TodoApp);
-
-    // Inject todos, todoActionCreators as todoActions, and counterActionCreators as counterActions
-
-    //function mapStateToProps(state) {
-    //    return { todos: state.todos };
-    //}
-
-    function mapDispatchToProps3(dispatch: Dispatch<TodoState>) {
-        return {
-            todoActions: bindActionCreators(todoActionCreators, dispatch),
-            counterActions: bindActionCreators(counterActionCreators, dispatch)
-        };
-    }
-
-    connect(mapStateToProps, mapDispatchToProps3)(TodoApp);
-
-    // Inject todos, and todoActionCreators and counterActionCreators together as actions
-
-    //function mapStateToProps(state) {
-    //    return { todos: state.todos };
-    //}
-
-    function mapDispatchToProps4(dispatch: Dispatch<TodoState>) {
-        return {
-            actions: bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch)
-        };
-    }
-
-    connect(mapStateToProps, mapDispatchToProps4)(TodoApp);
-
-    // Inject todos, and all todoActionCreators and counterActionCreators directly as props
-
-    //function mapStateToProps(state) {
-    //    return { todos: state.todos };
-    //}
-
-    function mapDispatchToProps5(dispatch: Dispatch<TodoState>) {
-        return bindActionCreators(objectAssign({}, todoActionCreators, counterActionCreators), dispatch);
-    }
-
-    connect(mapStateToProps, mapDispatchToProps5)(TodoApp);
-
-    // Inject todos of a specific user depending on props
-
-    function mapStateToProps2(state: TodoState, ownProps: TodoProps): TodoState {
-        return { todos: state.todos[ownProps.userId] };
-    }
-
-    connect(mapStateToProps2)(TodoApp);
-
-    // Inject todos of a specific user depending on props, and inject props.userId into the action
-
-    //function mapStateToProps(state) {
-    //    return { todos: state.todos };
-    //}
-
-    function mergeProps(stateProps: TodoState, dispatchProps: DispatchProps, ownProps: TodoProps): DispatchProps & TodoState & TodoProps {
-        return objectAssign({}, ownProps, dispatchProps, {
-            todos: stateProps.todos[ownProps.userId],
-            addTodo: (text: string) => dispatchProps.addTodo(ownProps.userId, text)
-        });
-    }
-
-    connect(mapStateToProps, actionCreators, mergeProps)(TodoApp);
+interface TestProp {
+    property1: number;
+    someOtherProperty?: string;
 }
-
-namespace TestComponent {
-    declare var store: Store<TestState>;
-    interface TestProps {
-        property1: number;
-        someOtherProperty?: string;
-    }
-    interface TestState {
-        isLoaded: boolean;
-        state1: number;
-    }
-    class TestComponent extends Component<TestProps, TestState> {
-        static staticMethod(): number {
-            return 0;
-        }
-    }
-    // Own properties can't be always be inferred, so a single type parameter will do
-    const WrappedTestComponent = connect<TestProps>()(TestComponent);
-
-    // return value of the connect()(TestComponent) is of the type TestComponent
-    let ATestComponent: typeof TestComponent = null;
-    ATestComponent = TestComponent;
-    ATestComponent = WrappedTestComponent;
-    // Wrapped component is accessible
-    WrappedTestComponent.WrappedComponent === TestComponent
-    // Static properties are accessible
-    WrappedTestComponent.staticMethod();
-
-    <TestComponent property1={42}/>;
-    <WrappedTestComponent property1={42}/>;
-    <ATestComponent property1={42}/>;
-
-    class NonComponent {
-    }
-    // this doesn't compile
-    //connect()(NonComponent);
-
-    // stateless functions
-    interface HelloMessageProps {
-        name: string;
-    }
-    function HelloMessage(props: HelloMessageProps) {
-        return <div>Hello {props.name}</div>;
-    }
-
-    const ConnectedHelloMessage = connect<HelloMessageProps>()(HelloMessage);
-    ReactDOM.render(<HelloMessage name="Sebastian"/>, document.getElementById('content'));
-    ReactDOM.render(<ConnectedHelloMessage name="Sebastian"/>, document.getElementById('content'));
+interface TestState {
+    isLoaded: boolean;
+    state1: number;
 }
+class TestComponent extends Component<TestProp, TestState> { }
+const WrappedTestComponent = connect()(TestComponent);
+
+// return value of the connect()(TestComponent) is of the type TestComponent
+let ATestComponent: typeof TestComponent = null;
+ATestComponent = TestComponent;
+ATestComponent = WrappedTestComponent;
+
+let anElement: ReactElement<TestProp>;
+<TestComponent property1={42} />;
+<WrappedTestComponent property1={42} />;
+<ATestComponent property1={42} />;
+
+class NonComponent {}
+// this doesn't compile
+//connect()(NonComponent);
+
+// stateless functions
+interface HelloMessageProps { name: string; }
+function HelloMessage(props: HelloMessageProps) {
+    return <div>Hello {props.name}</div>;
+}
+let ConnectedHelloMessage = connect()(HelloMessage);
+ReactDOM.render(<HelloMessage name="Sebastian" />, document.getElementById('content'));
+ReactDOM.render(<ConnectedHelloMessage name="Sebastian" />, document.getElementById('content'));
 
 // stateless functions that uses mapStateToProps and mapDispatchToProps
 namespace TestStatelessFunctionWithMapArguments {
@@ -365,8 +343,6 @@ namespace TestStatelessFunctionWithMapArguments {
         mapStateToProps,
         mapDispatchToProps
     )(Greeting);
-
-    React.createElement(ConnectedGreeting, { name: 'hello', onClick: () => undefined });
 }
 
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/8787
@@ -398,7 +374,7 @@ namespace TestTOwnPropsInference {
     const ConnectedWithTypeHint = connect<StateProps, {}, OwnProps>(mapStateToPropsWithoutOwnProps)(OwnPropsComponent);
 
     // This compiles, which is bad.
-    // React.createElement(ConnectedWithoutOwnProps, { anything: 'goes!' });
+    React.createElement(ConnectedWithoutOwnProps, { anything: 'goes!' });
 
     // This compiles, as expected.
     React.createElement(ConnectedWithOwnProps, { own: 'string' });